Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-03-12 09:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

When resetting, use the end time of the round which was committed to

Browse source 
The machine reset to the end time of the current round. For a delayed 
network connection, a machine may move ahead in rounds and only later 
realize a prior round succeeded. Despite acknowledging that round's 
success, it would maintain its delay when moving to the next block, 
bricking it.

Done by tracking the end time for each round as they occur.
This commit is contained in:
Luke Parker 2022-10-24 04:48:17 -04:00
parent 78fa292230
commit b9c091c5d0
No known key found for this signature in database
GPG key ID: F9F1386DB1E119B6
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
substrate/tendermint/src/lib.rs
View file

@ -105,6 +105,7 @@ pub struct TendermintMachine<N: Network> {
log: MessageLog<N>,
round: Round,
end_time: HashMap<Round, Instant>,
step: Step,
locked: Option<(Round, <N::Block as Block>::Id)>,
@ -169,8 +170,10 @@ impl<N: Network + 'static> TendermintMachine<N> {
fn round(&mut self, round: Round) -> bool {
// Correct the start time
for _ in self.round.0 .. round.0 {
self.start_time = self.timeout(Step::Precommit);
for r in self.round.0 .. round.0 {
let end = self.timeout(Step::Precommit);
self.end_time.insert(Round(r), end);
self.start_time = end;
}
// 11-13
@ -178,15 +181,16 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.timeouts = HashMap::new();
self.round = round;
self.end_time.insert(round, self.timeout(Step::Precommit));
self.step = Step::Propose;
self.round_propose()
}
// 53-54
async fn reset(&mut self, proposal: N::Block) {
async fn reset(&mut self, end_round: Round, proposal: N::Block) {
// Wait for the next block interval
let round_end = self.timeout(Step::Precommit);
sleep(round_end - Instant::now()).await;
let round_end = self.end_time[&end_round];
sleep(round_end.saturating_duration_since(Instant::now())).await;
self.number.0 += 1;
self.start_time = round_end;
@ -195,6 +199,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.queue = self.queue.drain(..).filter(|msg| msg.1.number == self.number).collect();
self.log = MessageLog::new(self.network.read().await.weights());
self.end_time = HashMap::new();
self.locked = None;
self.valid = None;
@ -241,6 +246,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
log: MessageLog::new(weights),
round: Round(0),
end_time: HashMap::new(),
step: Step::Propose,
locked: None,
@ -319,7 +325,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
debug_assert!(machine.network.read().await.verify_commit(block.id(), &commit));
let proposal = machine.network.write().await.add_block(block, commit).await;
machine.reset(proposal).await;
machine.reset(msg.round, proposal).await;
}
Err(TendermintError::Malicious(validator)) => {
machine.network.write().await.slash(validator).await;