absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-10 21:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish timeouts

Browse Source
This commit is contained in:
Luke Parker
2022-10-16 09:09:14 -04:00
parent 3b2352baed
commit c53c15fd95
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
substrate/tendermint/src/lib.rs
View File

@@ -100,8 +100,10 @@ impl<N: Network + 'static> TendermintMachine<N> {
#[async_recursion::async_recursion] #[async_recursion::async_recursion]
async fn broadcast(&mut self, data: Data<N::Block>) -> Option<N::Block> { async fn broadcast(&mut self, data: Data<N::Block>) -> Option<N::Block> {
let step = data.step();
let msg = Message { sender: self.proposer, number: self.number, round: self.round, data }; let msg = Message { sender: self.proposer, number: self.number, round: self.round, data };
let res = self.message(msg.clone()).await.unwrap(); let res = self.message(msg.clone()).await.unwrap();
self.step = step; // TODO: Before or after the above handling call?
self.network.write().await.broadcast(msg).await; self.network.write().await.broadcast(msg).await;
res res
} }
@@ -122,13 +124,15 @@ impl<N: Network + 'static> TendermintMachine<N> {
// 11-13 // 11-13
async fn round(&mut self, round: Round) { async fn round(&mut self, round: Round) {
// Clear timeouts
self.timeouts = HashMap::new();
// Correct the start time // Correct the start time
for _ in self.round.0 .. round.0 { for _ in self.round.0 .. round.0 {
self.start_time = self.timeout(Step::Precommit); self.start_time = self.timeout(Step::Precommit);
} }
self.round = round; self.round = round;
self.step = Step::Propose;
self.round_propose().await; self.round_propose().await;
} }
@@ -143,8 +147,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.locked = None; self.locked = None;
self.valid = None; self.valid = None;
self.timeouts = HashMap::new();
self.round(Round(0)).await; self.round(Round(0)).await;
} }
@@ -179,7 +181,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
timeouts: HashMap::new(), timeouts: HashMap::new(),
}; };
dbg!("Proposing");
machine.round_propose().await; machine.round_propose().await;
loop { loop {
@@ -191,18 +192,18 @@ impl<N: Network + 'static> TendermintMachine<N> {
}; };
// Propose timeout // Propose timeout
if t1 { if t1 && (machine.step == Step::Propose) {
todo!() debug_assert!(machine.broadcast(Data::Prevote(None)).await.is_none());
} }
// Prevote timeout // Prevote timeout
if t2 { if t2 && (machine.step == Step::Prevote) {
todo!() debug_assert!(machine.broadcast(Data::Precommit(None)).await.is_none());
} }
// Precommit timeout // Precommit timeout
if t3 { if t3 {
todo!() machine.round(Round(machine.round.0 + 1)).await;
} }
// If there's a message, handle it // If there's a message, handle it
@@ -288,7 +289,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
} else if msg.round.0 > self.round.0 { } else if msg.round.0 > self.round.0 {
// 55-56 // 55-56
if self.log.round_participation(self.round) > self.weights.fault_thresold() { if self.log.round_participation(self.round) > self.weights.fault_thresold() {
self.round(msg.round); self.round(msg.round).await;
} else { } else {
return Ok(None); return Ok(None);
} }
@@ -316,7 +317,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
}))) })))
.await .await
.is_none()); .is_none());
self.step = Step::Prevote;
} else { } else {
Err(TendermintError::Malicious(msg.sender))?; Err(TendermintError::Malicious(msg.sender))?;
} }
@@ -333,7 +333,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.locked.as_ref().map(|locked| locked.1.id()) == Some(block.id())))) self.locked.as_ref().map(|locked| locked.1.id()) == Some(block.id()))))
.await .await
.is_none()); .is_none());
self.step = Step::Prevote;
} }
} }
} }
@@ -350,10 +349,10 @@ impl<N: Network + 'static> TendermintMachine<N> {
// 44-46 // 44-46
if weight > self.weights.threshold() { if weight > self.weights.threshold() {
debug_assert!(self.broadcast(Data::Precommit(None)).await.is_none()); debug_assert!(self.broadcast(Data::Precommit(None)).await.is_none());
self.step = Step::Precommit;
} }
} }
// 36-43
if (self.valid.is_none()) && ((self.step == Step::Prevote) || (self.step == Step::Precommit)) { if (self.valid.is_none()) && ((self.step == Step::Prevote) || (self.step == Step::Precommit)) {
if let Some(proposal) = proposal { if let Some(proposal) = proposal {
debug_assert!(matches!(proposal, Data::Proposal(..))); debug_assert!(matches!(proposal, Data::Proposal(..)));
@@ -362,7 +361,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.valid = Some((self.round, block.clone())); self.valid = Some((self.round, block.clone()));
if self.step == Step::Prevote { if self.step == Step::Prevote {
self.locked = self.valid.clone(); self.locked = self.valid.clone();
self.step = Step::Precommit;
return Ok(self.broadcast(Data::Precommit(Some(block.id()))).await); return Ok(self.broadcast(Data::Precommit(Some(block.id()))).await);
} }
} }