diff --git a/state/execution.go b/state/execution.go index cba139963..b989e0291 100644 --- a/state/execution.go +++ b/state/execution.go @@ -242,7 +242,7 @@ func (s *State) MakeBlock(height int64, txs []types.Tx, commit *types.Commit) (* block.LastBlockID = s.LastBlockID block.ValidatorsHash = s.Validators.Hash() block.AppHash = s.AppHash - block.ConsensusHash = s.LastConsensusParams.Hash() + block.ConsensusHash = s.ConsensusParams.Hash() block.LastResultsHash = s.LastResultsHash return block, block.MakePartSet(s.ConsensusParams.BlockGossip.BlockPartSizeBytes) @@ -279,8 +279,8 @@ func (s *State) validateBlock(b *types.Block) error { if !bytes.Equal(b.AppHash, s.AppHash) { return fmt.Errorf("Wrong Block.Header.AppHash. Expected %X, got %v", s.AppHash, b.AppHash) } - if !bytes.Equal(b.ConsensusHash, s.LastConsensusParams.Hash()) { - return fmt.Errorf("Wrong Block.Header.ConsensusHash. Expected %X, got %v", s.LastConsensusParams.Hash(), b.ConsensusHash) + if !bytes.Equal(b.ConsensusHash, s.ConsensusParams.Hash()) { + return fmt.Errorf("Wrong Block.Header.ConsensusHash. Expected %X, got %v", s.ConsensusParams.Hash(), b.ConsensusHash) } if !bytes.Equal(b.LastResultsHash, s.LastResultsHash) { return fmt.Errorf("Wrong Block.Header.LastResultsHash. Expected %X, got %v", s.LastResultsHash, b.LastResultsHash) diff --git a/state/state.go b/state/state.go index 164718226..0dd105cbe 100644 --- a/state/state.go +++ b/state/state.go @@ -71,7 +71,6 @@ type State struct { // Consensus parameters used for validating blocks. // Changes returned by EndBlock and updated after Commit. ConsensusParams types.ConsensusParams - LastConsensusParams types.ConsensusParams LastHeightConsensusParamsChanged int64 // Merkle root of the results from executing prev block @@ -146,7 +145,6 @@ func (s *State) Copy() *State { LastHeightValidatorsChanged: s.LastHeightValidatorsChanged, ConsensusParams: s.ConsensusParams, - LastConsensusParams: s.LastConsensusParams, LastHeightConsensusParamsChanged: s.LastHeightConsensusParamsChanged, AppHash: s.AppHash, @@ -374,7 +372,6 @@ func (s *State) setBlockAndValidators(height int64, s.LastValidators = s.Validators.Copy() s.Validators = valSet - s.LastConsensusParams = s.ConsensusParams s.ConsensusParams = params s.LastResultsHash = resultsHash @@ -501,7 +498,6 @@ func MakeGenesisState(db dbm.DB, genDoc *types.GenesisDoc) (*State, error) { LastHeightValidatorsChanged: 1, ConsensusParams: *genDoc.ConsensusParams, - LastConsensusParams: types.ConsensusParams{}, LastHeightConsensusParamsChanged: 1, AppHash: genDoc.AppHash,