grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6241 from paritytech/poa-proof-fix

Browse Source 
format instant change proofs correctly
This commit is contained in:
Marek Kotewicz 2017-08-08 20:58:26 +02:00 committed by GitHub
commit e7a7bd6695
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethcore/src/engines/authority_round/mod.rs
View File

@ -690,6 +690,7 @@ impl Engine for AuthorityRound {
// apply immediate transitions. // apply immediate transitions.
if let Some(change) = self.validators.is_epoch_end(first, chain_head) { if let Some(change) = self.validators.is_epoch_end(first, chain_head) {
let change = combine_proofs(chain_head.number(), &change, &[]);
return Some(change) return Some(change)
} }

1
ethcore/src/engines/tendermint/mod.rs
View File

@ -643,6 +643,7 @@ impl Engine for Tendermint {
let first = chain_head.number() == 0; let first = chain_head.number() == 0;
if let Some(change) = self.validators.is_epoch_end(first, chain_head) { if let Some(change) = self.validators.is_epoch_end(first, chain_head) {
let change = combine_proofs(chain_head.number(), &change, &[]);
return Some(change) return Some(change)
} else if let Some(pending) = transition_store(chain_head.hash()) { } else if let Some(pending) = transition_store(chain_head.hash()) {
let signal_number = chain_head.number(); let signal_number = chain_head.number();