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

format instant change proofs correctly
openethereum · Aug 8, 2017 · e7a7bd6 · e7a7bd6
2 parents 80db434 + e43b108
commit e7a7bd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ethcore/src/engines/authority_round/mod.rs b/ethcore/src/engines/authority_round/mod.rs
@@ -690,6 +690,7 @@ impl Engine for AuthorityRound {
 
 		// apply immediate transitions.
 		if let Some(change) = self.validators.is_epoch_end(first, chain_head) {
+			let change = combine_proofs(chain_head.number(), &change, &[]);
 			return Some(change)
 		}
 

diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
@@ -643,6 +643,7 @@ impl Engine for Tendermint {
 		let first = chain_head.number() == 0;
 
 		if let Some(change) = self.validators.is_epoch_end(first, chain_head) {
+			let change = combine_proofs(chain_head.number(), &change, &[]);
 			return Some(change)
 		} else if let Some(pending) = transition_store(chain_head.hash()) {
 			let signal_number = chain_head.number();