patcher

Author: mmsqe

app/app.go

@@ -810,14 +810,15 @@ func NewEthermintApp(
 	app.ScopedTransferKeeper = scopedTransferKeeper
 
 	executor := cast.ToString(appOpts.Get(server.FlagBlockSTMExecutor))
+	app.SetTxResponsePatcher(evmtypes.EvmTxResponsePatcher{})
 	switch executor {
 	case config.BlockExecutorBlockSTM:
 		sdk.SetAddrCacheEnabled(false)
 		workers := cast.ToInt(appOpts.Get(server.FlagBlockSTMWorkers))
 		preEstimate := cast.ToBool(appOpts.Get(server.FlagBlockSTMPreEstimate))
 		app.SetTxExecutor(STMTxExecutor(app.GetStoreKeys(), workers, preEstimate, app.EvmKeeper, txConfig.TxDecoder()))
 	case "", config.BlockExecutorSequential:
-		app.SetTxExecutor(DefaultTxExecutor)
+		app.SetTxExecutor(baseapp.DefaultTxExecutor)
 	default:
 		panic(fmt.Errorf("unknown EVM block executor: %s", executor))
 	}

app/executor.go

@@ -22,19 +22,6 @@ import (
 	blockstm "github.com/crypto-org-chain/go-block-stm"
 )
 
-func DefaultTxExecutor(_ context.Context,
-	txs [][]byte,
-	ms storetypes.MultiStore,
-	deliverTxWithMultiStore func(int, sdk.Tx, storetypes.MultiStore, map[string]any) *abci.ExecTxResult,
-) ([]*abci.ExecTxResult, error) {
-	blockSize := len(txs)
-	results := make([]*abci.ExecTxResult, blockSize)
-	for i := 0; i < blockSize; i++ {
-		results[i] = deliverTxWithMultiStore(i, nil, ms, nil)
-	}
-	return evmtypes.PatchTxResponses(results), nil
-}
-
 type evmKeeper interface {
 	GetParams(ctx sdk.Context) evmtypes.Params
 }
@@ -62,6 +49,7 @@ func STMTxExecutor(
 		txs [][]byte,
 		ms storetypes.MultiStore,
 		deliverTxWithMultiStore func(int, sdk.Tx, storetypes.MultiStore, map[string]any) *abci.ExecTxResult,
+		patcher baseapp.TxResponsePatcher,
 	) ([]*abci.ExecTxResult, error) {
 		blockSize := len(txs)
 		if blockSize == 0 {
@@ -115,7 +103,7 @@ func STMTxExecutor(
 			return nil, err
 		}
 
-		return evmtypes.PatchTxResponses(results), nil
+		return patcher.Patch(results), nil
 	}
 }
 

x/evm/types/response.go

@@ -9,6 +9,12 @@ import (
 	proto "github.com/cosmos/gogoproto/proto"
 )
 
+type EvmTxResponsePatcher struct{}
+
+func (p EvmTxResponsePatcher) Patch(input []*abci.ExecTxResult) []*abci.ExecTxResult {
+	return PatchTxResponses(input)
+}
+
 // PatchTxResponses fills the evm tx index and log indexes in the tx result
 func PatchTxResponses(input []*abci.ExecTxResult) []*abci.ExecTxResult {
 	var (