@@ -433,7 +433,7 @@ func New(
433433 // this line is used by starport scaffolding # stargate/app/storeKey
434434 )
435435 tkeys := sdk .NewTransientStoreKeys (paramstypes .TStoreKey , evmtypes .TransientStoreKey )
436- memKeys := sdk .NewMemoryStoreKeys (capabilitytypes .MemStoreKey , dexmoduletypes .MemStoreKey , banktypes .DeferredCacheStoreKey , evmtypes . MemStoreKey , oracletypes .MemStoreKey )
436+ memKeys := sdk .NewMemoryStoreKeys (capabilitytypes .MemStoreKey , dexmoduletypes .MemStoreKey , banktypes .DeferredCacheStoreKey , oracletypes .MemStoreKey )
437437
438438 app := & App {
439439 BaseApp : bApp ,
@@ -622,7 +622,7 @@ func New(
622622 panic (fmt .Sprintf ("error while creating receipt store: %s" , err ))
623623 }
624624 }
625- app .EvmKeeper = * evmkeeper .NewKeeper (keys [evmtypes .StoreKey ], memKeys [ evmtypes . MemStoreKey ],
625+ app .EvmKeeper = * evmkeeper .NewKeeper (keys [evmtypes .StoreKey ],
626626 tkeys [evmtypes .TransientStoreKey ], app .GetSubspace (evmtypes .ModuleName ), app .receiptStore , app .BankKeeper ,
627627 & app .AccountKeeper , & app .StakingKeeper , app .TransferKeeper ,
628628 wasmkeeper .NewDefaultPermissionKeeper (app .WasmKeeper ), & app .WasmKeeper )
@@ -1589,6 +1589,7 @@ func (app *App) ProcessBlock(ctx sdk.Context, txs [][]byte, req BlockProcessRequ
15891589 beginBlockResp := app .BeginBlock (ctx , beginBlockReq )
15901590 events = append (events , beginBlockResp .Events ... )
15911591
1592+ evmTxs := make ([]* evmtypes.MsgEVMTransaction , len (txs )) // nil for non-EVM txs
15921593 txResults := make ([]* abci.ExecTxResult , len (txs ))
15931594 typedTxs := app .DecodeTransactionsConcurrently (ctx , txs )
15941595
@@ -1598,6 +1599,11 @@ func (app *App) ProcessBlock(ctx sdk.Context, txs [][]byte, req BlockProcessRequ
15981599 prioritizedResults , ctx := app .ExecuteTxsConcurrently (ctx , prioritizedTxs , prioritizedTypedTxs , prioritizedIndices )
15991600 for relativePrioritizedIndex , originalIndex := range prioritizedIndices {
16001601 txResults [originalIndex ] = prioritizedResults [relativePrioritizedIndex ]
1602+ if emsg := evmtypes .GetEVMTransactionMessage (prioritizedTypedTxs [relativePrioritizedIndex ]); emsg != nil && ! emsg .IsAssociateTx () {
1603+ evmTxs [originalIndex ] = emsg
1604+ } else {
1605+ evmTxs [originalIndex ] = nil
1606+ }
16011607 }
16021608
16031609 // Finalize all Bank Module Transfers here so that events are included for prioritiezd txs
@@ -1610,8 +1616,14 @@ func (app *App) ProcessBlock(ctx sdk.Context, txs [][]byte, req BlockProcessRequ
16101616 otherResults , ctx := app .ExecuteTxsConcurrently (ctx , otherTxs , otherTypedTxs , otherIndices )
16111617 for relativeOtherIndex , originalIndex := range otherIndices {
16121618 txResults [originalIndex ] = otherResults [relativeOtherIndex ]
1619+ if emsg := evmtypes .GetEVMTransactionMessage (otherTypedTxs [relativeOtherIndex ]); emsg != nil && ! emsg .IsAssociateTx () {
1620+ evmTxs [originalIndex ] = emsg
1621+ } else {
1622+ evmTxs [originalIndex ] = nil
1623+ }
16131624 }
16141625 app .EvmKeeper .SetTxResults (txResults )
1626+ app .EvmKeeper .SetMsgs (evmTxs )
16151627
16161628 // Finalize all Bank Module Transfers here so that events are included
16171629 lazyWriteEvents := app .BankKeeper .WriteDeferredBalances (ctx )
0 commit comments