Skip to content

Commit 757626b

Browse files
committed
chore: re-point evm pin at merged audit-fixes and adapt revert-outbound mocks
Pin moves off the PR-branch commit onto evm audit-fixes (89c7e52b), which carries v0.6.0 plus every merged audit fix. build_revert_outbound_test.go arrived after this branch was opened and mocked the pre-v0.6.0 CallEVM signature: v0.6.0 inserts stateDB, so the mock needed NewStateDB and the method-name matcher moved to index 8.
1 parent 3d0ee35 commit 757626b

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ replace (
1717
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.1.4
1818
github.com/CosmWasm/wasmd => github.com/CosmWasm/wasmd v0.55.0 // Keep v0.55.0
1919
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.10 // Use stable v0.50.10
20-
github.com/cosmos/evm => github.com/pushchain/evm v1.0.0-rc2.0.20260826094145-9031914c3154
20+
github.com/cosmos/evm => github.com/pushchain/evm v1.0.0-rc2.0.20260826155700-89c7e52be541
2121
github.com/ethereum/go-ethereum => github.com/cosmos/go-ethereum v0.0.0-20250806193535-2fc7571efa91
2222
github.com/spf13/viper => github.com/spf13/viper v1.17.0
2323
github.com/strangelove-ventures/tokenfactory => github.com/strangelove-ventures/tokenfactory v0.50.7-wasmvm2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,8 +1765,8 @@ github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b h1
17651765
github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b/go.mod h1:HRuvtXLZ4WkaB1MItToVH2e8ZwKwZPY5/Rcby+CvvLY=
17661766
github.com/prysmaticlabs/prysm/v5 v5.3.0 h1:7Lr8ndapBTZg00YE+MgujN6+yvJR6Bdfn28ZDSJ00II=
17671767
github.com/prysmaticlabs/prysm/v5 v5.3.0/go.mod h1:r1KhlduqDMIGZ1GhR5pjZ2Ko8Q89noTDYTRoPKwf1+c=
1768-
github.com/pushchain/evm v1.0.0-rc2.0.20260826094145-9031914c3154 h1:1H5DVWHe2Cm/ygixhEPtkSDPCMAMUv9pGevtxyTy3Jo=
1769-
github.com/pushchain/evm v1.0.0-rc2.0.20260826094145-9031914c3154/go.mod h1:QuenX5DgRhWeYdIg0J/p65cyS/ntpgnzpZOIajZ/SHk=
1768+
github.com/pushchain/evm v1.0.0-rc2.0.20260826155700-89c7e52be541 h1:Ols8viNso7TAphC5MYbl+GrmMuFVKvvfn8uzeGEnV0Q=
1769+
github.com/pushchain/evm v1.0.0-rc2.0.20260826155700-89c7e52be541/go.mod h1:QuenX5DgRhWeYdIg0J/p65cyS/ntpgnzpZOIajZ/SHk=
17701770
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
17711771
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
17721772
github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg=

x/uexecutor/keeper/build_revert_outbound_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ func expectGasFeeCall(t *testing.T, f *testFixture, gasFee, gasPrice, gasLimit *
7070
)
7171
require.NoError(t, err)
7272

73+
// cosmos/evm v0.6.0: GetGasFeeInfoForRevertOutbound builds the StateDB itself
74+
// and passes it into CallEVM, so the mock must expect that call too.
75+
f.mockEVMKeeper.EXPECT().NewStateDB(gomock.Any()).Return(nil).AnyTimes()
7376
f.mockEVMKeeper.EXPECT().
7477
CallEVM(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
75-
gomock.Eq("getOutboundTxGasAndFees"), gomock.Any(), gomock.Any()).
78+
gomock.Any(), gomock.Any(), gomock.Eq("getOutboundTxGasAndFees"), gomock.Any(), gomock.Any()).
7679
Return(&evmtypes.MsgEthereumTxResponse{Ret: packed}, nil).
7780
AnyTimes()
7881
}
@@ -151,9 +154,12 @@ func TestBuildRevertOutbound_GasFeeLookupFails(t *testing.T) {
151154
GetTokenConfig(gomock.Any(), revertSourceChain, revertAssetAddr).
152155
Return(revertTestTokenConfig(), nil).
153156
AnyTimes()
157+
// cosmos/evm v0.6.0: GetGasFeeInfoForRevertOutbound builds the StateDB itself
158+
// and passes it into CallEVM, so the mock must expect that call too.
159+
f.mockEVMKeeper.EXPECT().NewStateDB(gomock.Any()).Return(nil).AnyTimes()
154160
f.mockEVMKeeper.EXPECT().
155161
CallEVM(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
156-
gomock.Eq("getOutboundTxGasAndFees"), gomock.Any(), gomock.Any()).
162+
gomock.Any(), gomock.Any(), gomock.Eq("getOutboundTxGasAndFees"), gomock.Any(), gomock.Any()).
157163
Return(nil, errors.New("execution reverted: ZeroGasPrice")).
158164
AnyTimes()
159165

0 commit comments

Comments
 (0)