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

Dedicated Commit object

Browse Source 
Restores sig aggregation API.
This commit is contained in:
Luke Parker
2022-10-17 03:15:13 -04:00
parent b993ff1cc8
commit 6155d12160
3 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,15 +253,19 @@ impl<N: Network + 'static> TendermintMachine<N> {
match machine.message(msg.msg).await {
Ok(None) => (),
Ok(Some(block)) => {
let sigs = machine
.log
.precommitted
.iter()
.filter_map(|(k, (id, sig))| {
Some((*k, sig.clone())).filter(|_| id == &block.id())
})
.collect();
let proposal = machine.network.write().await.add_block(block, sigs);
let mut validators = vec![];
let mut sigs = vec![];
for (v, sig) in machine.log.precommitted.iter().filter_map(|(k, (id, sig))| {
Some((*k, sig.clone())).filter(|_| id == &block.id())
}) {
validators.push(v);
sigs.push(sig);
}
let proposal = machine.network.write().await.add_block(
block,
Commit { validators, signature: N::SignatureScheme::aggregate(&sigs) },
);
machine.reset(proposal).await
}
Err(TendermintError::Malicious(validator)) => {
@@ -400,13 +404,13 @@ impl<N: Network + 'static> TendermintMachine<N> {
if self.step == Step::Prevote {
let (participation, weight) = self.log.message_instances(self.round, Data::Prevote(None));
// 34-35
if participation > self.weights.threshold() {
if participation >= self.weights.threshold() {
let timeout = self.timeout(Step::Prevote);
self.timeouts.entry(Step::Prevote).or_insert(timeout);
}
// 44-46
if weight > self.weights.threshold() {
if weight >= self.weights.threshold() {
debug_assert!(self.broadcast(Data::Precommit(None)).await.is_none());
}
}