fix some bugs when validators change (ethereum#58)

* fix some bugs when validators change * fix epochHeight Co-authored-by: Qi Zhou <[email protected]>
zhiqiangxu · Mar 18, 2022 · 74f9497 · 74f9497
1 parent 27675ad
commit 74f9497
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/consensus/tendermint/adapter/store.go b/consensus/tendermint/adapter/store.go
@@ -178,7 +178,7 @@ func updateState(
 		if len(nextValidators) != len(nextVotingPowers) {
 			panic("len(nextValidators) != len(nextVotingPowers)")
 		}
-		nValSet = types.NewValidatorSet(nextValidators, nextVotingPowers, nValSet.ProposerReptition)
+		nValSet = types.NewValidatorSet(nextValidators, nextVotingPowers, state.Validators.ProposerReptition)
 	} else {
 		nValSet = state.Validators.Copy()
 		// Update validator proposer priority and set state variables.

diff --git a/consensus/tendermint/tendermint.go b/consensus/tendermint/tendermint.go
@@ -406,7 +406,7 @@ func (c *Tendermint) getEpochHeader(chain consensus.ChainHeaderReader, header *t
 	checkpoint := (number % c.config.Epoch) == 0
 	var epochHeight uint64
 	if checkpoint {
-		epochHeight -= c.config.Epoch
+		epochHeight = number - c.config.Epoch
 	} else {
 		epochHeight = number - (number % c.config.Epoch)
 	}