refactor: Baseapp audit changes (cosmos#14379)

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

baseapp/abci.go

@@ -52,10 +52,10 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC
 	}
 
 	// initialize states with a correct header
-	app.setDeliverState(initHeader)
-	app.setCheckState(initHeader)
-	app.setPrepareProposalState(initHeader)
-	app.setProcessProposalState(initHeader)
+	app.setState(runTxModeDeliver, initHeader)
+	app.setState(runTxModeCheck, initHeader)
+	app.setState(runTxPrepareProposal, initHeader)
+	app.setState(runTxProcessProposal, initHeader)
 
 	// Store the consensus params in the BaseApp's paramstore. Note, this must be
 	// done after the deliver state and context have been set as it's persisted
@@ -162,7 +162,7 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 	// already be initialized in InitChain. Otherwise app.deliverState will be
 	// nil, since it is reset on Commit.
 	if app.deliverState == nil {
-		app.setDeliverState(req.Header)
+		app.setState(runTxModeDeliver, req.Header)
 	} else {
 		// In the first block, app.deliverState.ctx will already be initialized
 		// by InitChain. Context is now updated with Header information.
@@ -277,7 +277,7 @@ func (app *BaseApp) PrepareProposal(req abci.RequestPrepareProposal) (resp abci.
 // that all transactions are valid. If all transactions are valid, then we inform
 // Tendermint that the Status is ACCEPT. However, the application is also able
 // to implement optimizations such as executing the entire proposed block
-// immediately. It may even execute the block in parallel.
+// immediately.
 //
 // If a panic is detected during execution of an application's ProcessProposal
 // handler, it will be recovered and we will reject the proposal.
@@ -423,9 +423,9 @@ func (app *BaseApp) Commit() abci.ResponseCommit {
 	//
 	// NOTE: This is safe because Tendermint holds a lock on the mempool for
 	// Commit. Use the header from this latest block.
-	app.setCheckState(header)
-	app.setPrepareProposalState(header)
-	app.setProcessProposalState(header)
+	app.setState(runTxModeCheck, header)
+	app.setState(runTxPrepareProposal, header)
+	app.setState(runTxProcessProposal, header)
 
 	// empty/reset the deliver state
 	app.deliverState = nil

baseapp/baseapp.go

@@ -350,11 +350,11 @@ func (app *BaseApp) Init() error {
 	emptyHeader := tmproto.Header{}
 
 	// needed for the export command which inits from store but never calls initchain
-	app.setCheckState(emptyHeader)
+	app.setState(runTxModeCheck, emptyHeader)
 
 	// needed for ABCI Replay Blocks mode which calls Prepare/Process proposal (InitChain is not called)
-	app.setPrepareProposalState(emptyHeader)
-	app.setProcessProposalState(emptyHeader)
+	app.setState(runTxPrepareProposal, emptyHeader)
+	app.setState(runTxProcessProposal, emptyHeader)
 	app.Seal()
 
 	if app.cms == nil {
@@ -402,49 +402,32 @@ func (app *BaseApp) Seal() { app.sealed = true }
 // IsSealed returns true if the BaseApp is sealed and false otherwise.
 func (app *BaseApp) IsSealed() bool { return app.sealed }
 
-// setCheckState sets the BaseApp's checkState with a branched multi-store
-// (i.e. a CacheMultiStore) and a new Context with the same multi-store branch,
-// provided header, and minimum gas prices set. It is set on InitChain and reset
-// on Commit.
-func (app *BaseApp) setCheckState(header tmproto.Header) {
+// setState sets the BaseApp's state for the corresponding mode with a branched
+// multi-store (i.e. a CacheMultiStore) and a new Context with the same
+// multi-store branch, and provided header.
+func (app *BaseApp) setState(mode runTxMode, header tmproto.Header) {
 	ms := app.cms.CacheMultiStore()
-	app.checkState = &state{
-		ms:  ms,
-		ctx: sdk.NewContext(ms, header, true, app.logger).WithMinGasPrices(app.minGasPrices),
-	}
-}
-
-// setDeliverState sets the BaseApp's deliverState with a branched multi-store
-// (i.e. a CacheMultiStore) and a new Context with the same multi-store branch,
-// and provided header. It is set on InitChain and BeginBlock and set to nil on
-// Commit.
-func (app *BaseApp) setDeliverState(header tmproto.Header) {
-	ms := app.cms.CacheMultiStore()
-	app.deliverState = &state{
-		ms:  ms,
-		ctx: sdk.NewContext(ms, header, false, app.logger),
-	}
-}
-
-// setPrepareProposalState sets the BaseApp's prepareProposalState with a
-// branched multi-store (i.e. a CacheMultiStore) and a new Context with the
-// same multi-store branch, and provided header. It is set on InitChain and Commit.
-func (app *BaseApp) setPrepareProposalState(header tmproto.Header) {
-	ms := app.cms.CacheMultiStore()
-	app.prepareProposalState = &state{
+	baseState := &state{
 		ms:  ms,
 		ctx: sdk.NewContext(ms, header, false, app.logger),
 	}
-}
 
-// setProcessProposalState sets the BaseApp's processProposalState with a
-// branched multi-store (i.e. a CacheMultiStore) and a new Context with the
-// same multi-store branch, and provided header. It is set on InitChain and Commit.
-func (app *BaseApp) setProcessProposalState(header tmproto.Header) {
-	ms := app.cms.CacheMultiStore()
-	app.processProposalState = &state{
-		ms:  ms,
-		ctx: sdk.NewContext(ms, header, false, app.logger),
+	switch mode {
+	case runTxModeCheck:
+		// Minimum gas prices are also set. It is set on InitChain and reset on Commit.
+		baseState.ctx = baseState.ctx.WithIsCheckTx(true).WithMinGasPrices(app.minGasPrices)
+		app.checkState = baseState
+	case runTxModeDeliver:
+		// It is set on InitChain and BeginBlock and set to nil on Commit.
+		app.deliverState = baseState
+	case runTxPrepareProposal:
+		// It is set on InitChain and Commit.
+		app.prepareProposalState = baseState
+	case runTxProcessProposal:
+		// It is set on InitChain and Commit.
+		app.processProposalState = baseState
+	default:
+		panic(fmt.Sprintf("invalid runTxMode for setState: %d", mode))
 	}
 }
 
@@ -552,7 +535,8 @@ func validateBasicTxMsgs(msgs []sdk.Msg) error {
 }
 
 // Returns the application's deliverState if app is in runTxModeDeliver,
-// otherwise it returns the application's checkstate.
+// prepareProposalState if app is in runTxPrepareProposal, processProposalState
+// if app is in runTxProcessProposal, and checkState otherwise.
 func (app *BaseApp) getState(mode runTxMode) *state {
 	switch mode {
 	case runTxModeDeliver: