fix datarace due to prepare proposal

Author: Ganesha Upadhyaya

block/manager.go

@@ -606,7 +606,7 @@ func (m *Manager) publishBlock(ctx context.Context) error {
 		block = pendingBlock
 	} else {
 		m.logger.Info("Creating and publishing block", "height", newHeight)
-		block, err = m.createBlock(ctx, newHeight, lastCommit, lastHeaderHash)
+		block, err = m.createBlock(newHeight, lastCommit, lastHeaderHash)
 		if err != nil {
 			return nil
 		}
@@ -759,10 +759,10 @@ func (m *Manager) getLastBlockTime() time.Time {
 	return m.lastState.LastBlockTime
 }
 
-func (m *Manager) createBlock(ctx context.Context, height uint64, lastCommit *types.Commit, lastHeaderHash types.Hash) (*types.Block, error) {
+func (m *Manager) createBlock(height uint64, lastCommit *types.Commit, lastHeaderHash types.Hash) (*types.Block, error) {
 	m.lastStateMtx.RLock()
 	defer m.lastStateMtx.RUnlock()
-	return m.executor.CreateBlock(ctx, height, lastCommit, lastHeaderHash, m.lastState)
+	return m.executor.CreateBlock(height, lastCommit, lastHeaderHash, m.lastState)
 }
 
 func (m *Manager) applyBlock(ctx context.Context, block *types.Block) (types.State, *abci.ResponseFinalizeBlock, error) {

go.mod

@@ -1,6 +1,8 @@
 module github.com/rollkit/rollkit
 
-go 1.21
+go 1.21.1
+
+toolchain go1.21.4
 
 require (
 	github.com/celestiaorg/go-header v0.4.1

node/full_client_test.go

@@ -829,6 +829,8 @@ func TestStatus(t *testing.T) {
 
 	app := &mocks.Application{}
 	app.On("InitChain", mock.Anything, mock.Anything).Return(&abci.ResponseInitChain{}, nil)
+	app.On("PrepareProposal", mock.Anything, mock.Anything).Return(prepareProposalResponse).Maybe()
+	app.On("ProcessProposal", mock.Anything, mock.Anything).Return(&abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}, nil)
 	key, _, _ := crypto.GenerateEd25519Key(crand.Reader)
 	genesisValidators, signingKey := types.GetGenesisValidatorSetWithSigner()
 	pubKey := genesisValidators[0].PubKey
@@ -1000,10 +1002,9 @@ func TestNetInfo(t *testing.T) {
 	require := require.New(t)
 
 	mockApp, rpc := getRPC(t)
-	mockApp.On("BeginBlock", mock.Anything).Return(abci.ResponseBeginBlock{})
-	mockApp.On("CheckTx", mock.Anything).Return(abci.ResponseCheckTx{})
-	mockApp.On("EndBlock", mock.Anything).Return(abci.ResponseEndBlock{})
-	mockApp.On("Commit", mock.Anything).Return(abci.ResponseCommit{})
+	mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
+	mockApp.On("CheckTx", mock.Anything, mock.Anything).Return(&abci.ResponseCheckTx{}, nil)
+	mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
 
 	err := rpc.node.Start()
 	require.NoError(err)

node/full_node_test.go

@@ -44,6 +44,8 @@ func setupMockApplication() *mocks.Application {
 	app := &mocks.Application{}
 	app.On("InitChain", mock.Anything, mock.Anything).Return(&abci.ResponseInitChain{}, nil)
 	app.On("CheckTx", mock.Anything, mock.Anything).Return(&abci.ResponseCheckTx{}, nil)
+	app.On("PrepareProposal", mock.Anything, mock.Anything).Return(prepareProposalResponse).Maybe()
+	app.On("ProcessProposal", mock.Anything, mock.Anything).Return(&abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}, nil)
 	return app
 }
 

state/executor.go

@@ -89,7 +89,7 @@ func (e *BlockExecutor) InitChain(genesis *cmtypes.GenesisDoc) (*abci.ResponseIn
 }
 
 // CreateBlock reaps transactions from mempool and builds a block.
-func (e *BlockExecutor) CreateBlock(ctx context.Context, height uint64, lastCommit *types.Commit, lastHeaderHash types.Hash, state types.State) (*types.Block, error) {
+func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, lastHeaderHash types.Hash, state types.State) (*types.Block, error) {
 	maxBytes := state.ConsensusParams.Block.MaxBytes
 	emptyMaxBytes := maxBytes == -1
 	if emptyMaxBytes {
@@ -131,7 +131,7 @@ func (e *BlockExecutor) CreateBlock(ctx context.Context, height uint64, lastComm
 	}
 
 	rpp, err := e.proxyApp.PrepareProposal(
-		ctx,
+		context.TODO(),
 		&abci.RequestPrepareProposal{
 			MaxTxBytes: maxBytes,
 			Txs:        mempoolTxs.ToSliceOfBytes(),

state/executor_test.go

@@ -61,7 +61,7 @@ func doTestCreateBlock(t *testing.T) {
 	state.ConsensusParams.Block.MaxGas = 100000
 
 	// empty block
-	block, err := executor.CreateBlock(context.Background(), 1, &types.Commit{}, []byte{}, state)
+	block, err := executor.CreateBlock(1, &types.Commit{}, []byte{}, state)
 	require.NoError(err)
 	require.NotNil(block)
 	assert.Empty(block.Data.Txs)
@@ -70,7 +70,7 @@ func doTestCreateBlock(t *testing.T) {
 	// one small Tx
 	err = mpool.CheckTx([]byte{1, 2, 3, 4}, func(r *abci.ResponseCheckTx) {}, mempool.TxInfo{})
 	require.NoError(err)
-	block, err = executor.CreateBlock(context.Background(), 2, &types.Commit{}, []byte{}, state)
+	block, err = executor.CreateBlock(2, &types.Commit{}, []byte{}, state)
 	require.NoError(err)
 	require.NotNil(block)
 	assert.Equal(uint64(2), block.Height())
@@ -81,7 +81,7 @@ func doTestCreateBlock(t *testing.T) {
 	require.NoError(err)
 	err = mpool.CheckTx(make([]byte, 100), func(r *abci.ResponseCheckTx) {}, mempool.TxInfo{})
 	require.NoError(err)
-	block, err = executor.CreateBlock(context.Background(), 3, &types.Commit{}, []byte{}, state)
+	block, err = executor.CreateBlock(3, &types.Commit{}, []byte{}, state)
 	require.NoError(err)
 	require.NotNil(block)
 	assert.Len(block.Data.Txs, 2)
@@ -164,7 +164,7 @@ func doTestApplyBlock(t *testing.T) {
 
 	err = mpool.CheckTx([]byte{1, 2, 3, 4}, func(r *abci.ResponseCheckTx) {}, mempool.TxInfo{})
 	require.NoError(err)
-	block, err := executor.CreateBlock(context.Background(), 1, &types.Commit{Signatures: []types.Signature{types.Signature([]byte{1, 1, 1})}}, []byte{}, state)
+	block, err := executor.CreateBlock(1, &types.Commit{Signatures: []types.Signature{types.Signature([]byte{1, 1, 1})}}, []byte{}, state)
 	require.NoError(err)
 	require.NotNil(block)
 	assert.Equal(uint64(1), block.Height())
@@ -194,7 +194,7 @@ func doTestApplyBlock(t *testing.T) {
 	require.NoError(mpool.CheckTx([]byte{5, 6, 7, 8, 9}, func(r *abci.ResponseCheckTx) {}, mempool.TxInfo{}))
 	require.NoError(mpool.CheckTx([]byte{1, 2, 3, 4, 5}, func(r *abci.ResponseCheckTx) {}, mempool.TxInfo{}))
 	require.NoError(mpool.CheckTx(make([]byte, 90), func(r *abci.ResponseCheckTx) {}, mempool.TxInfo{}))
-	block, err = executor.CreateBlock(context.Background(), 2, &types.Commit{Signatures: []types.Signature{types.Signature([]byte{1, 1, 1})}}, []byte{}, newState)
+	block, err = executor.CreateBlock(2, &types.Commit{Signatures: []types.Signature{types.Signature([]byte{1, 1, 1})}}, []byte{}, newState)
 	require.NoError(err)
 	require.NotNil(block)
 	assert.Equal(uint64(2), block.Height())

store/types.go

@@ -26,7 +26,7 @@ type Store interface {
 	// SaveBlockResponses saves block responses (events, tx responses, validator set updates, etc) in Store.
 	SaveBlockResponses(height uint64, responses *abci.ResponseFinalizeBlock) error
 
-	// LoadBlockResponses returns block results at given height, or error if it's not found in Store.
+	// GetBlockResponses returns block results at given height, or error if it's not found in Store.
 	GetBlockResponses(height uint64) (*abci.ResponseFinalizeBlock, error)
 
 	// GetCommit returns commit for a block at given height, or error if it's not found in Store.