Skip to content

Commit 47468ef

Browse files
codchencodchen
committed
test
1 parent 0296449 commit 47468ef

File tree

10 files changed

+35
-33
lines changed

10 files changed

+35
-33
lines changed

Diff for: ‎aclmapping/evm/mappings.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TransactionDependencyGenerator(_ aclkeeper.Keeper, evmKeeper evmkeeper.Keep
3838
return []sdkacltypes.AccessOperation{*acltypes.CommitAccessOp()}, nil
3939
}
4040

41-
if err := ante.Preprocess(ctx, evmMsg); err != nil {
41+
if err := ante.Preprocess(ctx, evmMsg, evmKeeper.ChainID(ctx)); err != nil {
4242
return []sdkacltypes.AccessOperation{}, err
4343
}
4444
ops := []sdkacltypes.AccessOperation{}

Diff for: ‎app/app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ func (app *App) DecodeTransactionsConcurrently(ctx sdk.Context, txs [][]byte) []
16841684
} else {
16851685
if isEVM, _ := evmante.IsEVMMessage(typedTx); isEVM {
16861686
msg := evmtypes.MustGetEVMTransactionMessage(typedTx)
1687-
if err := evmante.Preprocess(ctx, msg); err != nil {
1687+
if err := evmante.Preprocess(ctx, msg, app.EvmKeeper.ChainID(ctx)); err != nil {
16881688
ctx.Logger().Error(fmt.Sprintf("error preprocessing EVM tx due to %s", err))
16891689
typedTxs[idx] = nil
16901690
return

Diff for: ‎precompiles/bank/bank_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestRun(t *testing.T) {
148148

149149
// send the transaction
150150
msgServer := keeper.NewMsgServerImpl(k)
151-
ante.Preprocess(ctx, req)
151+
ante.Preprocess(ctx, req, k.ChainID(ctx))
152152
ctx = ctx.WithEventManager(sdk.NewEventManager())
153153
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
154154
return ctx, nil

Diff for: ‎precompiles/distribution/distribution_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestWithdraw(t *testing.T) {
8989

9090
msgServer := keeper.NewMsgServerImpl(k)
9191

92-
ante.Preprocess(ctx, req)
92+
ante.Preprocess(ctx, req, k.ChainID(ctx))
9393
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
9494
require.Nil(t, err)
9595
require.Empty(t, res.VmError)
@@ -120,7 +120,7 @@ func TestWithdraw(t *testing.T) {
120120
req, err = evmtypes.NewMsgEVMTransaction(txwrapper)
121121
require.Nil(t, err)
122122

123-
ante.Preprocess(ctx, req)
123+
ante.Preprocess(ctx, req, k.ChainID(ctx))
124124
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
125125
require.Nil(t, err)
126126
require.Empty(t, res.VmError)
@@ -144,7 +144,7 @@ func TestWithdraw(t *testing.T) {
144144
req, err = evmtypes.NewMsgEVMTransaction(txwrapper)
145145
require.Nil(t, err)
146146

147-
ante.Preprocess(ctx, req)
147+
ante.Preprocess(ctx, req, k.ChainID(ctx))
148148
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
149149
require.Nil(t, err)
150150
require.Empty(t, res.VmError)
@@ -224,7 +224,7 @@ func delegate(ctx sdk.Context,
224224
require.Nil(t, k.BankKeeper().MintCoins(ctx, evmtypes.ModuleName, sdk.NewCoins(sdk.NewCoin(k.GetBaseDenom(ctx), sdk.NewInt(200000000)))))
225225
require.Nil(t, k.BankKeeper().SendCoinsFromModuleToAccount(ctx, evmtypes.ModuleName, seiAddr, amt))
226226

227-
ante.Preprocess(ctx, req)
227+
ante.Preprocess(ctx, req, k.ChainID(ctx))
228228
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
229229
require.Nil(t, err)
230230
require.Empty(t, res.VmError)
@@ -268,7 +268,7 @@ func setWithdrawAddressAndWithdraw(
268268
req, err := evmtypes.NewMsgEVMTransaction(txwrapper)
269269
require.Nil(t, err)
270270

271-
ante.Preprocess(ctx, req)
271+
ante.Preprocess(ctx, req, k.ChainID(ctx))
272272
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
273273
require.Nil(t, err)
274274
require.Empty(t, res.VmError)
@@ -297,7 +297,7 @@ func setWithdrawAddressAndWithdraw(
297297
r, err := evmtypes.NewMsgEVMTransaction(txwrapper)
298298
require.Nil(t, err)
299299

300-
ante.Preprocess(ctx, r)
300+
ante.Preprocess(ctx, r, k.ChainID(ctx))
301301
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), r)
302302
require.Nil(t, err)
303303
require.Empty(t, res.VmError)

Diff for: ‎precompiles/gov/gov_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func TestGovPrecompile(t *testing.T) {
180180
tt.setup(ctx, k, evmAddr, seiAddr)
181181

182182
msgServer := keeper.NewMsgServerImpl(k)
183-
ante.Preprocess(ctx, req)
183+
ante.Preprocess(ctx, req, k.ChainID(ctx))
184184
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
185185
if tt.wantErr {
186186
require.NotEmpty(t, res.VmError)

Diff for: ‎precompiles/staking/staking_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestStaking(t *testing.T) {
8383

8484
msgServer := keeper.NewMsgServerImpl(k)
8585

86-
ante.Preprocess(ctx, req)
86+
ante.Preprocess(ctx, req, k.ChainID(ctx))
8787
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
8888
require.Nil(t, err)
8989
require.Empty(t, res.VmError)
@@ -110,7 +110,7 @@ func TestStaking(t *testing.T) {
110110
req, err = evmtypes.NewMsgEVMTransaction(txwrapper)
111111
require.Nil(t, err)
112112

113-
ante.Preprocess(ctx, req)
113+
ante.Preprocess(ctx, req, k.ChainID(ctx))
114114
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
115115
require.Nil(t, err)
116116
require.Empty(t, res.VmError)
@@ -137,7 +137,7 @@ func TestStaking(t *testing.T) {
137137
req, err = evmtypes.NewMsgEVMTransaction(txwrapper)
138138
require.Nil(t, err)
139139

140-
ante.Preprocess(ctx, req)
140+
ante.Preprocess(ctx, req, k.ChainID(ctx))
141141
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
142142
require.Nil(t, err)
143143
require.Empty(t, res.VmError)
@@ -191,7 +191,7 @@ func TestStakingError(t *testing.T) {
191191

192192
msgServer := keeper.NewMsgServerImpl(k)
193193

194-
ante.Preprocess(ctx, req)
194+
ante.Preprocess(ctx, req, k.ChainID(ctx))
195195
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
196196
require.Nil(t, err)
197197
require.NotEmpty(t, res.VmError)
@@ -214,7 +214,7 @@ func TestStakingError(t *testing.T) {
214214
req, err = evmtypes.NewMsgEVMTransaction(txwrapper)
215215
require.Nil(t, err)
216216

217-
ante.Preprocess(ctx, req)
217+
ante.Preprocess(ctx, req, k.ChainID(ctx))
218218
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
219219
require.Nil(t, err)
220220
require.NotEmpty(t, res.VmError)

Diff for: ‎x/evm/ante/preprocess.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func NewEVMPreprocessDecorator(evmKeeper *evmkeeper.Keeper, accountKeeper *accou
5858
//nolint:revive
5959
func (p *EVMPreprocessDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) {
6060
msg := evmtypes.MustGetEVMTransactionMessage(tx)
61-
if err := Preprocess(ctx, msg); err != nil {
61+
if err := Preprocess(ctx, msg, p.evmKeeper.ChainID(ctx)); err != nil {
6262
return ctx, err
6363
}
6464

@@ -118,7 +118,7 @@ func (p *EVMPreprocessDecorator) IsAccountBalancePositive(ctx sdk.Context, seiAd
118118
}
119119

120120
// stateless
121-
func Preprocess(ctx sdk.Context, msgEVMTransaction *evmtypes.MsgEVMTransaction) error {
121+
func Preprocess(ctx sdk.Context, msgEVMTransaction *evmtypes.MsgEVMTransaction, chainID *big.Int) error {
122122
if msgEVMTransaction.Derived != nil {
123123
if msgEVMTransaction.Derived.PubKey == nil {
124124
// this means the message has `Derived` set from the outside, in which case we should reject
@@ -152,7 +152,9 @@ func Preprocess(ctx sdk.Context, msgEVMTransaction *evmtypes.MsgEVMTransaction)
152152
}
153153

154154
ethTx := ethtypes.NewTx(txData.AsEthereumData())
155-
chainID := ethTx.ChainId()
155+
if ethTx.Type() != ethtypes.LegacyTxType {
156+
chainID = ethTx.ChainId()
157+
}
156158
chainCfg := evmtypes.DefaultChainConfig()
157159
ethCfg := chainCfg.EthereumConfig(chainID)
158160
version := GetVersion(ctx, ethCfg)
@@ -171,7 +173,7 @@ func Preprocess(ctx sdk.Context, msgEVMTransaction *evmtypes.MsgEVMTransaction)
171173
}
172174
evmAddr, seiAddr, seiPubkey, err := helpers.GetAddresses(V, R, S, txHash)
173175
if err != nil {
174-
return err
176+
return sdkerrors.ErrInvalidChainID
175177
}
176178
msgEVMTransaction.Derived = &derived.Derived{
177179
SenderEVMAddr: evmAddr,

Diff for: ‎x/evm/artifacts/native/artifacts_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestSimple(t *testing.T) {
6363

6464
msgServer := keeper.NewMsgServerImpl(k)
6565

66-
ante.Preprocess(ctx, req)
66+
ante.Preprocess(ctx, req, k.ChainID(ctx))
6767
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
6868
require.Nil(t, err)
6969
require.Empty(t, res.VmError)
@@ -97,7 +97,7 @@ func TestSimple(t *testing.T) {
9797
require.Nil(t, err)
9898
req, err = types.NewMsgEVMTransaction(txwrapper)
9999
require.Nil(t, err)
100-
ante.Preprocess(ctx, req)
100+
ante.Preprocess(ctx, req, k.ChainID(ctx))
101101
res, err = msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
102102
require.Nil(t, err)
103103
require.Empty(t, res.VmError)

Diff for: ‎x/evm/client/wasm/query_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ func deployContract(t *testing.T, ctx sdk.Context, k *keeper.Keeper, path string
556556

557557
msgServer := keeper.NewMsgServerImpl(k)
558558

559-
ante.Preprocess(ctx, req)
559+
ante.Preprocess(ctx, req, k.ChainID(ctx))
560560
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
561561
return ctx, nil
562562
})
@@ -620,7 +620,7 @@ func TestHandleStaticCall(t *testing.T) {
620620
require.Nil(t, err)
621621
req, err := evmtypes.NewMsgEVMTransaction(txwrapper)
622622
require.Nil(t, err)
623-
ante.Preprocess(ctx, req)
623+
ante.Preprocess(ctx, req, k.ChainID(ctx))
624624
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
625625
return ctx, nil
626626
})

Diff for: ‎x/evm/keeper/msg_server_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestEVMTransaction(t *testing.T) {
8383
msgServer := keeper.NewMsgServerImpl(k)
8484

8585
// Deploy Simple Storage contract
86-
ante.Preprocess(ctx, req)
86+
ante.Preprocess(ctx, req, k.ChainID(ctx))
8787
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
8888
return ctx, nil
8989
})
@@ -122,7 +122,7 @@ func TestEVMTransaction(t *testing.T) {
122122
require.Nil(t, err)
123123
req, err = types.NewMsgEVMTransaction(txwrapper)
124124
require.Nil(t, err)
125-
ante.Preprocess(ctx, req)
125+
ante.Preprocess(ctx, req, k.ChainID(ctx))
126126
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
127127
return ctx, nil
128128
})
@@ -174,7 +174,7 @@ func TestEVMTransactionError(t *testing.T) {
174174

175175
msgServer := keeper.NewMsgServerImpl(k)
176176

177-
ante.Preprocess(ctx, req)
177+
ante.Preprocess(ctx, req, k.ChainID(ctx))
178178
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
179179
return ctx, nil
180180
})
@@ -230,7 +230,7 @@ func TestEVMTransactionInsufficientGas(t *testing.T) {
230230
msgServer := keeper.NewMsgServerImpl(k)
231231

232232
// Deploy Simple Storage contract with insufficient gas
233-
ante.Preprocess(ctx, req)
233+
ante.Preprocess(ctx, req, k.ChainID(ctx))
234234
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
235235
return ctx, nil
236236
})
@@ -278,7 +278,7 @@ func TestEVMDynamicFeeTransaction(t *testing.T) {
278278
msgServer := keeper.NewMsgServerImpl(k)
279279

280280
// Deploy Simple Storage contract
281-
ante.Preprocess(ctx, req)
281+
ante.Preprocess(ctx, req, k.ChainID(ctx))
282282
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
283283
return ctx, nil
284284
})
@@ -336,7 +336,7 @@ func TestEVMPrecompiles(t *testing.T) {
336336
msgServer := keeper.NewMsgServerImpl(k)
337337

338338
// Deploy SendAll contract
339-
ante.Preprocess(ctx, req)
339+
ante.Preprocess(ctx, req, k.ChainID(ctx))
340340
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
341341
return ctx, nil
342342
})
@@ -387,7 +387,7 @@ func TestEVMPrecompiles(t *testing.T) {
387387
require.Nil(t, err)
388388
req, err = types.NewMsgEVMTransaction(txwrapper)
389389
require.Nil(t, err)
390-
ante.Preprocess(ctx, req)
390+
ante.Preprocess(ctx, req, k.ChainID(ctx))
391391
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
392392
return ctx, nil
393393
})
@@ -413,7 +413,7 @@ func TestEVMAssociateTx(t *testing.T) {
413413
require.Nil(t, err)
414414
msgServer := keeper.NewMsgServerImpl(k)
415415

416-
ante.Preprocess(ctx, req)
416+
ante.Preprocess(ctx, req, k.ChainID(ctx))
417417
res, err := msgServer.EVMTransaction(sdk.WrapSDKContext(ctx), req)
418418
require.Nil(t, err)
419419
require.Equal(t, types.MsgEVMTransactionResponse{}, *res)
@@ -456,7 +456,7 @@ func TestEVMBlockEnv(t *testing.T) {
456456
msgServer := keeper.NewMsgServerImpl(k)
457457

458458
// Deploy Simple Storage contract
459-
ante.Preprocess(ctx, req)
459+
ante.Preprocess(ctx, req, k.ChainID(ctx))
460460
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
461461
return ctx, nil
462462
})
@@ -499,7 +499,7 @@ func TestEVMBlockEnv(t *testing.T) {
499499
require.Nil(t, err)
500500
req, err = types.NewMsgEVMTransaction(txwrapper)
501501
require.Nil(t, err)
502-
ante.Preprocess(ctx, req)
502+
ante.Preprocess(ctx, req, k.ChainID(ctx))
503503
ctx, err = ante.NewEVMFeeCheckDecorator(k).AnteHandle(ctx, mockTx{msgs: []sdk.Msg{req}}, false, func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) {
504504
return ctx, nil
505505
})

0 commit comments

Comments
 (0)