This commit is contained in:
William Banfield
2022-02-14 17:10:15 -05:00
parent 0b71547719
commit b32b4a719b
2 changed files with 12 additions and 3 deletions

View File

@@ -1516,7 +1516,7 @@ func (cs *State) defaultDoPrevote(ctx context.Context, height int64, round int32
liveness properties. Please see `PrepareProosal`-`ProcessProposal` coherence and determinism
properties in the ABCI++ specification.
*/
stateMachineValidBlock, err := cs.blockExec.ProcessProposal(ctx, cs.ProposalBlock)
stateMachineValidBlock, err := cs.blockExec.ProcessProposal(ctx, cs.ProposalBlock, cs.state.InitialHeight)
if err != nil {
panic(fmt.Sprintf(
"state machine returned an error (%v) when calling ProcessProposal", err,

View File

@@ -151,10 +151,19 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
func (blockExec *BlockExecutor) ProcessProposal(
ctx context.Context,
block *types.Block,
initialHeight int64,
) (bool, error) {
ep, err := block.Evidence.ToProto()
if err != nil {
return false, err
}
req := abci.RequestProcessProposal{
Txs: block.Data.Txs.ToSliceOfBytes(),
Header: *block.Header.ToProto(),
Hash: block.Header.Hash(),
Header: *block.Header.ToProto(),
Txs: block.Data.Txs.ToSliceOfBytes(),
LastCommitInfo: getBeginBlockValidatorInfo(block, blockExec.store, initialHeight),
ByzantineValidators: ep.Evidence,
}
resp, err := blockExec.proxyApp.ProcessProposal(ctx, req)