Add ConsensusHash to header

state/execution.go

@@ -187,7 +187,7 @@ func (s *State) ValidateBlock(block *types.Block) error {
 func (s *State) validateBlock(block *types.Block) error {
 	// Basic block validation.
 	err := block.ValidateBasic(s.ChainID, s.LastBlockHeight,
-		s.LastBlockTotalTx, s.LastBlockID, s.LastBlockTime, s.AppHash)
+		s.LastBlockTotalTx, s.LastBlockID, s.LastBlockTime, s.AppHash, s.Params.Hash())
 	if err != nil {
 		return err
 	}

state/execution_test.go

@@ -120,7 +120,7 @@ func makeBlock(height int64, state *State) *types.Block {
 	block, _ := types.MakeBlock(height, chainID,
 		makeTxs(height), state.LastBlockTotalTx,
 		new(types.Commit), prevBlockID, valHash,
-		state.AppHash, testPartSize)
+		state.AppHash, state.Params.Hash(), testPartSize)
 	return block
 }
 

state/state.go

@@ -269,8 +269,9 @@ func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader typ
 
 }
 
-// applyChanges returns a new param set, overriding any
-// parameter that is non-zero in argument
+// applyChanges returns new ConsensusParams
+// whose fields are set to any non-zero fields of c.
+// If c is nil, it returns p unmodified, as it was passed in.
 func applyChanges(p types.ConsensusParams,
 	c *abci.ConsensusParams) types.ConsensusParams {