From 9528a22b375fb54b26eb3a059ff43f31dcca5421 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Tue, 1 Mar 2022 16:57:54 -0500 Subject: [PATCH] use abci responses for hash creation --- internal/state/execution.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/state/execution.go b/internal/state/execution.go index f457acb4e..fb64fc0a0 100644 --- a/internal/state/execution.go +++ b/internal/state/execution.go @@ -253,7 +253,7 @@ func (blockExec *BlockExecutor) ApplyBlock( } // Update the state with the block and responses. - state, err = updateState(state, blockID, &block.Header, abciResponses, validatorUpdates) + state, err = updateState(state, blockID, &block.Header, finalizeBlockResponse, validatorUpdates) if err != nil { return state, fmt.Errorf("commit failed for application: %w", err) } @@ -444,7 +444,7 @@ func updateState( state State, blockID types.BlockID, header *types.Header, - abciResponses *tmstate.ABCIResponses, + finalizeBlockResponse *abci.ResponseFinalizeBlock, validatorUpdates []*types.Validator, ) (State, error) { @@ -469,9 +469,9 @@ func updateState( // Update the params with the latest abciResponses. nextParams := state.ConsensusParams lastHeightParamsChanged := state.LastHeightConsensusParamsChanged - if abciResponses.FinalizeBlock.ConsensusParamUpdates != nil { + if finalizeBlockResponse.ConsensusParamUpdates != nil { // NOTE: must not mutate state.ConsensusParams - nextParams = state.ConsensusParams.UpdateConsensusParams(abciResponses.FinalizeBlock.ConsensusParamUpdates) + nextParams = state.ConsensusParams.UpdateConsensusParams(finalizeBlockResponse.ConsensusParamUpdates) err := nextParams.ValidateConsensusParams() if err != nil { return state, fmt.Errorf("error updating consensus params: %w", err) @@ -500,7 +500,7 @@ func updateState( LastHeightValidatorsChanged: lastHeightValsChanged, ConsensusParams: nextParams, LastHeightConsensusParamsChanged: lastHeightParamsChanged, - LastResultsHash: ABCIResponsesResultsHash(abciResponses), + LastResultsHash: ABCIResponsesResultsHash(&tmstate.ABCIResponses{finalizeBlockResponse}), AppHash: nil, }, nil }