Skip to content

Commit aa0aca9

Browse files
[EVM] Add tx hash to context for evm info (#1563)
add tx hash to context
1 parent df899bb commit aa0aca9

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,15 @@ require (
346346
replace (
347347
github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.1.0
348348
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
349-
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.81-seiv2
349+
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.82-seiv2
350350
github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.1.9
351351
github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.3.0
352352
github.com/ethereum/go-ethereum => github.com/sei-protocol/go-ethereum v1.13.5-sei-15
353353
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
354354
github.com/sei-protocol/sei-db => github.com/sei-protocol/sei-db v0.0.35
355355
// Latest goleveldb is broken, we have to stick to this version
356356
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
357-
github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.42-seiv2
357+
github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.43-seiv2
358358
github.com/tendermint/tm-db => github.com/sei-protocol/tm-db v0.0.4
359359
google.golang.org/grpc => google.golang.org/grpc v1.33.2
360360
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,16 +1347,16 @@ github.com/sei-protocol/go-ethereum v1.13.5-sei-15 h1:VSFQrbWnSDCPCQzsYDW3k07EP3
13471347
github.com/sei-protocol/go-ethereum v1.13.5-sei-15/go.mod h1:kcRZmuzRn1lVejiFNTz4l4W7imnpq1bDAnuKS/RyhbQ=
13481348
github.com/sei-protocol/goutils v0.0.2 h1:Bfa7Sv+4CVLNM20QcpvGb81B8C5HkQC/kW1CQpIbXDA=
13491349
github.com/sei-protocol/goutils v0.0.2/go.mod h1:iYE2DuJfEnM+APPehr2gOUXfuLuPsVxorcDO+Tzq9q8=
1350-
github.com/sei-protocol/sei-cosmos v0.2.81-seiv2 h1:C9fUcLhUGWITAWuuug2dwTHkFiE+1BiolbWgxlDZUyc=
1351-
github.com/sei-protocol/sei-cosmos v0.2.81-seiv2/go.mod h1:ib/gp0gCxN7FXUZ40j5+x8BeyoI7AcX+rTvf53JoDsY=
1350+
github.com/sei-protocol/sei-cosmos v0.2.82-seiv2 h1:UyZp55yBCefGmcl48aCaZFkHb97+7jChfsd8+6Y77SE=
1351+
github.com/sei-protocol/sei-cosmos v0.2.82-seiv2/go.mod h1:HLpjyCHtzl7WbxXVpjWNrTCzFR/n6UTIzLQU1lWqvbo=
13521352
github.com/sei-protocol/sei-db v0.0.35 h1:BNHv0gtKE4J5kq1Mhxt9dpop3lI4W2I5WurgWYIYa4E=
13531353
github.com/sei-protocol/sei-db v0.0.35/go.mod h1:F/ZKZA8HJPcUzSZPA8yt6pfwlGriJ4RDR4eHKSGLStI=
13541354
github.com/sei-protocol/sei-iavl v0.1.9 h1:y4mVYftxLNRs6533zl7N0/Ch+CzRQc04JDfHolIxgBE=
13551355
github.com/sei-protocol/sei-iavl v0.1.9/go.mod h1:7PfkEVT5dcoQE+s/9KWdoXJ8VVVP1QpYYPLdxlkSXFk=
13561356
github.com/sei-protocol/sei-ibc-go/v3 v3.3.0 h1:/mjpTuCSEVDJ51nUDSHU92N0bRSwt49r1rmdC/lqgp8=
13571357
github.com/sei-protocol/sei-ibc-go/v3 v3.3.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA=
1358-
github.com/sei-protocol/sei-tendermint v0.2.42-seiv2 h1:1biDAPS50q188kjFoMyomQceHDJm+KYCyxAFoZ8bMIM=
1359-
github.com/sei-protocol/sei-tendermint v0.2.42-seiv2/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4=
1358+
github.com/sei-protocol/sei-tendermint v0.2.43-seiv2 h1:aSyMTWLcj3xsqMhIndipy9NJSgwwODmXnqmbnsab+nc=
1359+
github.com/sei-protocol/sei-tendermint v0.2.43-seiv2/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4=
13601360
github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY=
13611361
github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY=
13621362
github.com/sei-protocol/sei-wasmd v0.1.0 h1:YCJ8SzJYMUR6hYOtgfjETFmSX1qx6cfLCmRAav2KMIs=

x/evm/ante/sig.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func (svd *EVMSigVerifyDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulat
3434
ctx = ctx.WithIsEVM(true)
3535
ctx = ctx.WithEVMNonce(txNonce)
3636
ctx = ctx.WithEVMSenderAddress(evmAddr.Hex())
37+
ctx = ctx.WithEVMTxHash(ethTx.Hash().Hex())
3738

3839
if ctx.IsCheckTx() {
3940
if txNonce < nextNonce {

x/evm/ante/sig_test.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ func TestEVMSigVerifyDecorator(t *testing.T) {
4040
signer := ethtypes.MakeSigner(ethCfg, blockNum, uint64(ctx.BlockTime().Unix()))
4141
tx, err := ethtypes.SignTx(ethtypes.NewTx(&txData), signer, key)
4242
require.Nil(t, err)
43+
sender, err := signer.Sender(tx)
44+
require.Nil(t, err)
4345
typedTx, err := ethtx.NewLegacyTx(tx)
4446
require.Nil(t, err)
4547
msg, err := types.NewMsgEVMTransaction(typedTx)
@@ -52,11 +54,16 @@ func TestEVMSigVerifyDecorator(t *testing.T) {
5254
require.Nil(t, err)
5355

5456
// should return error because nonce is incorrect
55-
_, err = handler.AnteHandle(ctx, mockTx{msgs: []sdk.Msg{msg}}, false, func(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) {
57+
resCtx, err := handler.AnteHandle(ctx, mockTx{msgs: []sdk.Msg{msg}}, false, func(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) {
5658
return ctx, nil
5759
})
5860
require.NotNil(t, err)
5961

62+
require.Equal(t, uint64(1), resCtx.EVMNonce())
63+
require.Equal(t, sender.Hex(), resCtx.EVMSenderAddress())
64+
require.Equal(t, tx.Hash().Hex(), resCtx.EVMTxHash())
65+
require.Equal(t, true, resCtx.IsEVM())
66+
6067
// should return error if acc is not found (i.e. preprocess not called)
6168
txData.Nonce = 0
6269
tx, err = ethtypes.SignTx(ethtypes.NewTx(&txData), signer, key)

0 commit comments

Comments
 (0)