Revert "fix: remove setting of finalizeBlockState in FinalizeBlock + …

…fix initialHeight + add ProcessProposal in tests/sims (#16794)"

This reverts commit 0fd6227.

baseapp/abci.go

@@ -45,15 +45,13 @@ func (app *BaseApp) InitChain(req *abci.RequestInitChain) (*abci.ResponseInitCha
 	// On a new chain, we consider the init chain block height as 0, even though
 	// req.InitialHeight is 1 by default.
 	initHeader := cmtproto.Header{ChainID: req.ChainId, Time: req.Time}
+	app.initialHeight = req.InitialHeight
 
 	app.logger.Info("InitChain", "initialHeight", req.InitialHeight, "chainID", req.ChainId)
 
 	// Set the initial height, which will be used to determine if we are proposing
 	// or processing the first block or not.
 	app.initialHeight = req.InitialHeight
-	if app.initialHeight == 0 { // If initial height is 0, set it to 1
-		app.initialHeight = 1
-	}
 
 	// if req.InitialHeight is > 1, then we set the initial version on all stores
 	if req.InitialHeight > 1 {
@@ -677,32 +675,46 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.Respons
 		AppHash:            app.LastCommitID().Hash,
 	}
 
-	// app.finalizeBlockState.ctx will already be initialized
-	// by InitChain or by ProcessProposal. Context is now updated with Header information.
+	// Initialize the FinalizeBlock state. If this is the first block, it should
+	// already be initialized in InitChain. Otherwise app.finalizeBlockState will be
+	// nil, since it is reset on Commit.
+	if app.finalizeBlockState == nil {
+		app.setState(execModeFinalize, header)
+	} else {
+		// In the first block, app.finalizeBlockState.ctx will already be initialized
+		// by InitChain. Context is now updated with Header information.
+		app.finalizeBlockState.ctx = app.finalizeBlockState.ctx.
+			WithBlockHeader(header).
+			WithBlockHeight(req.Height).
+			WithHeaderInfo(coreheader.Info{
+				ChainID: app.chainID,
+				Height:  req.Height,
+				Time:    req.Time,
+				Hash:    req.Hash,
+				AppHash: app.LastCommitID().Hash,
+			})
+	}
+
+	gasMeter := app.getBlockGasMeter(app.finalizeBlockState.ctx)
+
 	app.finalizeBlockState.ctx = app.finalizeBlockState.ctx.
-		WithBlockHeader(header).
+		WithBlockGasMeter(gasMeter).
 		WithHeaderHash(req.Hash).
+		WithConsensusParams(app.GetConsensusParams(app.finalizeBlockState.ctx)).
+		WithVoteInfos(req.DecidedLastCommit.Votes).
+		WithExecMode(sdk.ExecModeFinalize).
 		WithHeaderInfo(coreheader.Info{
 			ChainID: app.chainID,
 			Height:  req.Height,
 			Time:    req.Time,
 			Hash:    req.Hash,
 			AppHash: app.LastCommitID().Hash,
-		}).
-		WithConsensusParams(app.GetConsensusParams(app.finalizeBlockState.ctx)).
-		WithVoteInfos(req.DecidedLastCommit.Votes).
-		WithExecMode(sdk.ExecModeFinalize).
-		WithCometInfo(cometInfo{
-			Misbehavior:     req.Misbehavior,
-			ValidatorsHash:  req.NextValidatorsHash,
-			ProposerAddress: req.ProposerAddress,
-			LastCommit:      req.DecidedLastCommit,
-		})
-
-	gasMeter := app.getBlockGasMeter(app.finalizeBlockState.ctx)
-
-	app.finalizeBlockState.ctx = app.finalizeBlockState.ctx.
-		WithBlockGasMeter(gasMeter)
+		}).WithCometInfo(cometInfo{
+		Misbehavior:     req.Misbehavior,
+		ValidatorsHash:  req.NextValidatorsHash,
+		ProposerAddress: req.ProposerAddress,
+		LastCommit:      req.DecidedLastCommit,
+	})
 
 	if app.checkState != nil {
 		app.checkState.ctx = app.checkState.ctx.

baseapp/abci_test.go

@@ -164,8 +164,6 @@ func TestABCI_InitChain(t *testing.T) {
 	require.Equal(t, value, resQ.Value)
 
 	// commit and ensure we can still query
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: app.LastBlockHeight() + 1})
-	require.NoError(t, err)
 	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: app.LastBlockHeight() + 1})
 	require.NoError(t, err)
 	_, err = app.Commit()
@@ -580,12 +578,6 @@ func TestABCI_FinalizeBlock_DeliverTx(t *testing.T) {
 			txs = append(txs, txBytes)
 		}
 
-		_, err := suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{
-			Height: int64(blockN) + 1,
-			Txs:    txs,
-		})
-		require.NoError(t, err)
-
 		res, err := suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{
 			Height: int64(blockN) + 1,
 			Txs:    txs,
@@ -737,8 +729,6 @@ func TestABCI_Query_SimulateTx(t *testing.T) {
 		require.Equal(t, result.Events, simRes.Result.Events)
 		require.True(t, bytes.Equal(result.Data, simRes.Result.Data))
 
-		_, err = suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{Height: count})
-		require.NoError(t, err)
 		_, err = suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{Height: count})
 		require.NoError(t, err)
 		_, err = suite.baseApp.Commit()
@@ -907,10 +897,6 @@ func TestABCI_TxGasLimits(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	_, err = suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{
-		Height: 1,
-	})
-	require.NoError(t, err)
 	_, err = suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{
 		Height: 1,
 	})
@@ -948,12 +934,6 @@ func TestABCI_TxGasLimits(t *testing.T) {
 	}
 
 	// Deliver the txs
-	_, err = suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{
-		Height: 2,
-		Txs:    txs,
-	})
-	require.NoError(t, err)
-
 	res, err := suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{
 		Height: 2,
 		Txs:    txs,
@@ -1319,9 +1299,7 @@ func TestPrepareCheckStateCalledWithCheckState(t *testing.T) {
 		wasPrepareCheckStateCalled = true
 	})
 
-	_, err := app.ProcessProposal(&abci.RequestProcessProposal{Height: 1})
-	require.NoError(t, err)
-	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
+	_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
 	require.NoError(t, err)
 	_, err = app.Commit()
 	require.NoError(t, err)
@@ -1345,9 +1323,7 @@ func TestPrecommiterCalledWithDeliverState(t *testing.T) {
 		wasPrecommiterCalled = true
 	})
 
-	_, err := app.ProcessProposal(&abci.RequestProcessProposal{Height: 1})
-	require.NoError(t, err)
-	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
+	_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
 	require.NoError(t, err)
 	_, err = app.Commit()
 	require.NoError(t, err)

baseapp/baseapp_test.go

@@ -138,13 +138,7 @@ func NewBaseAppSuiteWithSnapshots(t *testing.T, cfg SnapshotsConfig, opts ...fun
 			txs = append(txs, txBytes)
 		}
 
-		_, err := suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{
-			Height: height,
-			Txs:    txs,
-		})
-		require.NoError(t, err)
-
-		_, err = suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{
+		_, err := suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{
 			Height: height,
 			Txs:    txs,
 		})
@@ -196,17 +190,13 @@ func TestLoadVersion(t *testing.T) {
 	require.Equal(t, emptyCommitID, lastID)
 
 	// execute a block, collect commit ID
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 1})
-	require.NoError(t, err)
 	res, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
 	require.NoError(t, err)
 	commitID1 := storetypes.CommitID{Version: 1, Hash: res.AppHash}
 	_, err = app.Commit()
 	require.NoError(t, err)
 
 	// execute a block, collect commit ID
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 2})
-	require.NoError(t, err)
 	res, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 2})
 	require.NoError(t, err)
 	commitID2 := storetypes.CommitID{Version: 2, Hash: res.AppHash}
@@ -230,8 +220,6 @@ func TestLoadVersion(t *testing.T) {
 
 	testLoadVersionHelper(t, app, int64(1), commitID1)
 
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 2})
-	require.NoError(t, err)
 	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 2})
 	require.NoError(t, err)
 	_, err = app.Commit()
@@ -320,8 +308,6 @@ func TestSetLoader(t *testing.T) {
 			require.Nil(t, err)
 
 			// "execute" one block
-			_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 2})
-			require.NoError(t, err)
 			res, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 2})
 			require.NoError(t, err)
 			require.NotNil(t, res.AppHash)
@@ -371,8 +357,6 @@ func TestLoadVersionInvalid(t *testing.T) {
 	err = app.LoadVersion(-1)
 	require.Error(t, err)
 
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 1})
-	require.NoError(t, err)
 	res, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
 	require.NoError(t, err)
 	commitID1 := storetypes.CommitID{Version: 1, Hash: res.AppHash}
@@ -592,15 +576,11 @@ func TestABCI_CreateQueryContext(t *testing.T) {
 	name := t.Name()
 	app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil)
 
-	_, err := app.ProcessProposal(&abci.RequestProcessProposal{Height: 1})
-	require.NoError(t, err)
-	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
+	_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
 	require.NoError(t, err)
 	_, err = app.Commit()
 	require.NoError(t, err)
 
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 2})
-	require.NoError(t, err)
 	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 2})
 	require.NoError(t, err)
 	_, err = app.Commit()
@@ -686,8 +666,6 @@ func TestLoadVersionPruning(t *testing.T) {
 	// Commit seven blocks, of which 7 (latest) is kept in addition to 6, 5
 	// (keep recent) and 3 (keep every).
 	for i := int64(1); i <= 7; i++ {
-		_, err := app.ProcessProposal(&abci.RequestProcessProposal{Height: i})
-		require.NoError(t, err)
 		res, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: i})
 		require.NoError(t, err)
 		_, err = app.Commit()

baseapp/msg_service_router_test.go

@@ -115,8 +115,6 @@ func TestMsgService(t *testing.T) {
 		app.MsgServiceRouter(),
 		testdata.MsgServerImpl{},
 	)
-	_, err = app.ProcessProposal(&abci.RequestProcessProposal{Height: 1})
-	require.NoError(t, err)
 	_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1})
 	require.NoError(t, err)
 

baseapp/streaming_test.go

@@ -69,7 +69,7 @@ func TestABCI_MultiListener_StateChanges(t *testing.T) {
 		var expectedChangeSet []*storetypes.StoreKVPair
 
 		// create final block context state
-		_, err := suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{Height: int64(blockN) + 1, Txs: txs})
+		_, err := suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{Height: int64(blockN) + 1, Txs: txs})
 		require.NoError(t, err)
 
 		for i := 0; i < txPerHeight; i++ {
@@ -133,7 +133,6 @@ func Test_Ctx_with_StreamingManager(t *testing.T) {
 
 	for blockN := 0; blockN < nBlocks; blockN++ {
 
-		suite.baseApp.ProcessProposal(&abci.RequestProcessProposal{Height: int64(blockN) + 1})
 		suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{Height: int64(blockN) + 1})
 
 		ctx := getFinalizeBlockStateCtx(suite.baseApp)

server/mock/app_test.go

@@ -60,7 +60,7 @@ func TestInitApp(t *testing.T) {
 	require.Equal(t, []byte("bar"), qres.Value)
 }
 
-func TestFinalizeBlock(t *testing.T) {
+func TestDeliverTx(t *testing.T) {
 	app := SetupApp(t)
 
 	key := "my-special-key"
@@ -72,13 +72,6 @@ func TestFinalizeBlock(t *testing.T) {
 	tx := NewTx(key, value, randomAccounts[0].Address)
 	txBytes := tx.GetSignBytes()
 
-	_, err := app.ProcessProposal(&abci.RequestProcessProposal{
-		Hash:   []byte("apphash"),
-		Height: 1,
-		Txs:    [][]byte{txBytes},
-	})
-	require.NoError(t, err)
-
 	res, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
 		Hash:   []byte("apphash"),
 		Height: 1,

simapp/test_helpers.go

@@ -70,6 +70,7 @@ func NewSimappWithCustomOptions(t *testing.T, isCheckTx bool, options SetupOptio
 		Address: acc.GetAddress().String(),
 		Coins:   sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100000000000000))),
 	}
+
 	app := NewSimApp(options.Logger, options.DB, nil, true, options.AppOpts)
 	genesisState := app.DefaultGenesis()
 	genesisState, err = simtestutil.GenesisStateWithValSet(app.AppCodec(), genesisState, valSet, []authtypes.GenesisAccount{acc}, balance)

tests/e2e/server/export_test.go

@@ -95,10 +95,6 @@ func TestExportCmd_Height(t *testing.T) {
 
 			// Fast forward to block `tc.fastForward`.
 			for i := int64(2); i <= tc.fastForward; i++ {
-				app.ProcessProposal(&abci.RequestProcessProposal{
-					Height: i,
-				})
-
 				app.FinalizeBlock(&abci.RequestFinalizeBlock{
 					Height: i,
 				})