fix smb caused by evm AnteErr tx (#3205)

Author: LeoGuo621

libs/cosmos-sdk/baseapp/baseapp.go

@@ -703,7 +703,7 @@ func (app *BaseApp) getContextForTx(mode runTxMode, txBytes []byte) sdk.Context
 			// and there is a small probability that NeedUpdateTXCounter() will be wrong
 			// due to concurrent reading and writing of pm.txIndexMpUpdateTXCounter (slice),
 			// but such tx will be rerun, so this case can be ignored.
-			NeedUpdateTXCounter: app.parallelTxManage.NeedUpdateTXCounter(),
+			HaveCosmosTxInBlock: app.parallelTxManage.NeedUpdateTXCounter(),
 			CosmosIndexInBlock:  app.parallelTxManage.txByteMpCosmosIndex[string(txBytes)],
 		})
 		app.parallelTxManage.txByteMpCMIndexLock.RUnlock()

libs/cosmos-sdk/baseapp/baseapp_parallel.go

@@ -255,7 +255,7 @@ func (app *BaseApp) runTxs() []*abci.ResponseDeliverTx {
 
 			if res.paraMsg.AnteErr != nil {
 				res.msIsNil = true
-				pm.handleAnteErrTx(res.paraMsg.NeedUpdateTXCounter)
+				pm.handleAnteErrTx(pm.txIndexMpUpdateTXCounter[pm.upComingTxIndex])
 			}
 
 			pm.deliverTxs[pm.upComingTxIndex] = &res.resp
@@ -852,11 +852,11 @@ func (pm *parallelTxManager) NeedUpdateTXCounter() bool {
 
 // When an AnteErr tx is encountered, this tx will be discarded,
 // and the cosmosIndex of the remaining tx needs to be corrected.
-func (pm *parallelTxManager) handleAnteErrTx(needUpdateTXCounter bool) {
+func (pm *parallelTxManager) handleAnteErrTx(curTxNeedUpdateTXCounter bool) {
 	pm.haveAnteErrTx = true
 	pm.txIndexMpUpdateTXCounter[pm.upComingTxIndex] = false
 
-	if needUpdateTXCounter {
+	if curTxNeedUpdateTXCounter {
 		pm.cosmosTxIndexInBlock--
 		pm.txByteMpCMIndexLock.Lock()
 		for index, tx := range pm.txs {

libs/cosmos-sdk/types/context.go

@@ -92,8 +92,8 @@ func (c *Context) IsDeliverWithSerial() bool {
 }
 
 func (c *Context) UseParamCache() bool {
-	// NeedUpdateTXCounter of E2C tx also is true.
-	return c.isDeliverWithSerial || (c.paraMsg != nil && !c.paraMsg.NeedUpdateTXCounter) || c.checkTx
+	// c.paraMsg.HaveCosmosTxInBlock is also true when there are only E2C txs in a block
+	return c.isDeliverWithSerial || (c.paraMsg != nil && !c.paraMsg.HaveCosmosTxInBlock) || c.checkTx
 }
 
 func (c *Context) IsCheckTx() bool             { return c.checkTx }

libs/cosmos-sdk/types/utils.go

@@ -96,7 +96,7 @@ func NewDB(name, dir string) (db dbm.DB, err error) {
 
 type ParaMsg struct {
 	UseCurrentState     bool
-	NeedUpdateTXCounter bool
+	HaveCosmosTxInBlock bool
 	AnteErr             error
 	RefundFee           Coins
 	LogIndex            int