Skip to content
This repository was archived by the owner on Apr 4, 2024. It is now read-only.

Commit b70cabc

Browse files
author
HuangYi
committed
Update cosmos-sdk v0.46
prepare for implementing cosmos-sdk feemarket and tx prioritization changelog refactor cmd use sdkmath fix lint fix unit tests fix unit test genesis fix unit tests fix unit test env setup fix unit tests fix unit tests register PrivKey impl fix extension options fix lint fix unit tests make HandlerOption.Validate private gofumpt fix msg response decoding fix sim test bump cosmos-sdk version fix sim test
1 parent 0987ed9 commit b70cabc

86 files changed

Lines changed: 1311 additions & 672 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
4343
* (deps) [\#1159](https://github.com/evmos/ethermint/pull/1159) Bump Geth version to `v1.10.19`.
4444
* (deps) [#1167](https://github.com/evmos/ethermint/pull/1167) Upgrade ibc-go to v4.
4545
* (evm) [\#1174](https://github.com/evmos/ethermint/pull/1174) Don't allow eth txs with 0 in mempool.
46+
* (deps) [#1168](https://github.com/evmos/ethermint/pull/1168) Upgrade cosmos-sdk to v0.46.
4647

4748
### Improvements
4849

‎app/ante/ante_test.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"math/big"
66
"strings"
77

8+
sdkmath "cosmossdk.io/math"
9+
810
"github.com/cosmos/cosmos-sdk/types/tx/signing"
911

1012
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -274,7 +276,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
274276

275277
expFee := txData.Fee()
276278
invalidFee := new(big.Int).Add(expFee, big.NewInt(1))
277-
invalidFeeAmount := sdk.Coins{sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewIntFromBigInt(invalidFee))}
279+
invalidFeeAmount := sdk.Coins{sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewIntFromBigInt(invalidFee))}
278280
txBuilder.SetFeeAmount(invalidFeeAmount)
279281
return txBuilder.GetTx()
280282
}, false, false, false,
@@ -299,7 +301,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
299301
"success - DeliverTx EIP712 signed Cosmos Tx with MsgSend",
300302
func() sdk.Tx {
301303
from := acc.GetAddress()
302-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
304+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
303305
gas := uint64(200000)
304306
txBuilder := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "ethermint_9000-1", gas, amount)
305307
return txBuilder.GetTx()
@@ -309,7 +311,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
309311
"success - DeliverTx EIP712 signed Cosmos Tx with DelegateMsg",
310312
func() sdk.Tx {
311313
from := acc.GetAddress()
312-
coinAmount := sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20))
314+
coinAmount := sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20))
313315
amount := sdk.NewCoins(coinAmount)
314316
gas := uint64(200000)
315317
txBuilder := suite.CreateTestEIP712TxBuilderMsgDelegate(from, privKey, "ethermint_9000-1", gas, amount)
@@ -320,7 +322,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
320322
"fails - DeliverTx EIP712 signed Cosmos Tx with wrong Chain ID",
321323
func() sdk.Tx {
322324
from := acc.GetAddress()
323-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
325+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
324326
gas := uint64(200000)
325327
txBuilder := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "ethermint_9002-1", gas, amount)
326328
return txBuilder.GetTx()
@@ -330,19 +332,19 @@ func (suite AnteTestSuite) TestAnteHandler() {
330332
"fails - DeliverTx EIP712 signed Cosmos Tx with different gas fees",
331333
func() sdk.Tx {
332334
from := acc.GetAddress()
333-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
335+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
334336
gas := uint64(200000)
335337
txBuilder := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "ethermint_9001-1", gas, amount)
336338
txBuilder.SetGasLimit(uint64(300000))
337-
txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(30))))
339+
txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(30))))
338340
return txBuilder.GetTx()
339341
}, false, false, false,
340342
},
341343
{
342344
"fails - DeliverTx EIP712 signed Cosmos Tx with empty signature",
343345
func() sdk.Tx {
344346
from := acc.GetAddress()
345-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
347+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
346348
gas := uint64(200000)
347349
txBuilder := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "ethermint_9001-1", gas, amount)
348350
sigsV2 := signing.SignatureV2{}
@@ -354,7 +356,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
354356
"fails - DeliverTx EIP712 signed Cosmos Tx with invalid sequence",
355357
func() sdk.Tx {
356358
from := acc.GetAddress()
357-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
359+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
358360
gas := uint64(200000)
359361
txBuilder := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "ethermint_9001-1", gas, amount)
360362
nonce, err := suite.app.AccountKeeper.GetSequence(suite.ctx, acc.GetAddress())
@@ -374,7 +376,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
374376
"fails - DeliverTx EIP712 signed Cosmos Tx with invalid signMode",
375377
func() sdk.Tx {
376378
from := acc.GetAddress()
377-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
379+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
378380
gas := uint64(200000)
379381
txBuilder := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "ethermint_9001-1", gas, amount)
380382
nonce, err := suite.app.AccountKeeper.GetSequence(suite.ctx, acc.GetAddress())

‎app/ante/eip712.go‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1111
"github.com/cosmos/cosmos-sdk/types/tx/signing"
1212
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
13-
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
13+
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
1414
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
1515

1616
ethcrypto "github.com/ethereum/go-ethereum/crypto"
@@ -171,7 +171,7 @@ func VerifySignature(
171171
Amount: tx.GetFee(),
172172
Gas: tx.GetGas(),
173173
},
174-
msgs, tx.GetMemo(),
174+
msgs, tx.GetMemo(), tx.GetTip(),
175175
)
176176

177177
signerChainID, err := ethermint.ParseChainID(signerData.ChainID)
@@ -188,13 +188,7 @@ func VerifySignature(
188188
return sdkerrors.Wrap(sdkerrors.ErrUnknownExtensionOptions, "tx doesnt contain expected amount of extension options")
189189
}
190190

191-
var optIface ethermint.ExtensionOptionsWeb3TxI
192-
193-
if err := ethermintCodec.UnpackAny(opts[0], &optIface); err != nil {
194-
return sdkerrors.Wrap(err, "failed to proto-unpack ExtensionOptionsWeb3Tx")
195-
}
196-
197-
extOpt, ok := optIface.(*ethermint.ExtensionOptionsWeb3Tx)
191+
extOpt, ok := opts[0].GetCachedValue().(*ethermint.ExtensionOptionsWeb3Tx)
198192
if !ok {
199193
return sdkerrors.Wrap(sdkerrors.ErrInvalidChainID, "unknown extension option")
200194
}

‎app/ante/eth.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"math/big"
66
"strconv"
77

8+
sdkmath "cosmossdk.io/math"
9+
810
sdk "github.com/cosmos/cosmos-sdk/types"
911
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1012
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
@@ -129,7 +131,7 @@ func (avd EthAccountVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx
129131
"the sender is not EOA: address %s, codeHash <%s>", fromAddr, acct.CodeHash)
130132
}
131133

132-
if err := evmkeeper.CheckSenderBalance(sdk.NewIntFromBigInt(acct.Balance), txData); err != nil {
134+
if err := evmkeeper.CheckSenderBalance(sdkmath.NewIntFromBigInt(acct.Balance), txData); err != nil {
133135
return ctx, sdkerrors.Wrap(err, "failed to check sender balance")
134136
}
135137

@@ -447,7 +449,7 @@ func (vbd EthValidateBasicDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simu
447449
return ctx, sdkerrors.Wrap(ethtypes.ErrTxTypeNotSupported, "dynamic fee tx not supported")
448450
}
449451

450-
txFee = txFee.Add(sdk.NewCoin(params.EvmDenom, sdk.NewIntFromBigInt(txData.Fee())))
452+
txFee = txFee.Add(sdk.NewCoin(params.EvmDenom, sdkmath.NewIntFromBigInt(txData.Fee())))
451453
}
452454

453455
authInfo := protoTx.AuthInfo

‎app/ante/eth_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ante_test
22

33
import (
4+
"math"
45
"math/big"
56

67
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -234,25 +235,25 @@ func (suite AnteTestSuite) TestEthGasConsumeDecorator() {
234235
expPass bool
235236
expPanic bool
236237
}{
237-
{"invalid transaction type", &invalidTx{}, 0, func() {}, false, false},
238+
{"invalid transaction type", &invalidTx{}, math.MaxUint64, func() {}, false, false},
238239
{
239240
"sender not found",
240241
evmtypes.NewTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, nil, nil, nil),
241-
0,
242+
math.MaxUint64,
242243
func() {},
243244
false, false,
244245
},
245246
{
246247
"gas limit too low",
247248
tx,
248-
0,
249+
math.MaxUint64,
249250
func() {},
250251
false, false,
251252
},
252253
{
253254
"not enough balance for fees",
254255
tx2,
255-
0,
256+
math.MaxUint64,
256257
func() {},
257258
false, false,
258259
},

‎app/ante/fee_market_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ante_test
33
import (
44
"math/big"
55

6+
sdkmath "cosmossdk.io/math"
67
sdk "github.com/cosmos/cosmos-sdk/types"
78
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
89
ethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -31,9 +32,9 @@ func (suite AnteTestSuite) TestGasWantedDecorator() {
3132
testMsg := banktypes.MsgSend{
3233
FromAddress: "evmos1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ptzkucp",
3334
ToAddress: "evmos1dx67l23hz9l0k9hcher8xz04uj7wf3yu26l2yn",
34-
Amount: sdk.Coins{sdk.Coin{Amount: sdk.NewInt(10), Denom: denom}},
35+
Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}},
3536
}
36-
txBuilder := suite.CreateTestCosmosTxBuilder(sdk.NewInt(10), "stake", &testMsg)
37+
txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(10), "stake", &testMsg)
3738
return txBuilder.GetTx()
3839
},
3940
},
@@ -67,7 +68,7 @@ func (suite AnteTestSuite) TestGasWantedDecorator() {
6768
"EIP712 message",
6869
200000,
6970
func() sdk.Tx {
70-
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdk.NewInt(20)))
71+
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(20)))
7172
gas := uint64(200000)
7273
acc := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, from.Bytes())
7374
suite.Require().NoError(acc.SetSequence(1))

‎app/ante/fees_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ante_test
33
import (
44
"math/big"
55

6+
sdkmath "cosmossdk.io/math"
67
sdk "github.com/cosmos/cosmos-sdk/types"
78
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
89
ethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -25,7 +26,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
2526
testMsg := banktypes.MsgSend{
2627
FromAddress: "evmos1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ptzkucp",
2728
ToAddress: "evmos1dx67l23hz9l0k9hcher8xz04uj7wf3yu26l2yn",
28-
Amount: sdk.Coins{sdk.Coin{Amount: sdk.NewInt(10), Denom: denom}},
29+
Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}},
2930
}
3031

3132
testCases := []struct {
@@ -49,7 +50,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
4950
params.MinGasPrice = sdk.ZeroDec()
5051
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
5152

52-
txBuilder := s.CreateTestCosmosTxBuilder(sdk.NewInt(0), denom, &testMsg)
53+
txBuilder := s.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg)
5354
return txBuilder.GetTx()
5455
},
5556
true,
@@ -62,7 +63,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
6263
params.MinGasPrice = sdk.ZeroDec()
6364
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
6465

65-
txBuilder := s.CreateTestCosmosTxBuilder(sdk.NewInt(10), denom, &testMsg)
66+
txBuilder := s.CreateTestCosmosTxBuilder(sdkmath.NewInt(10), denom, &testMsg)
6667
return txBuilder.GetTx()
6768
},
6869
true,
@@ -75,7 +76,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
7576
params.MinGasPrice = sdk.NewDec(10)
7677
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
7778

78-
txBuilder := s.CreateTestCosmosTxBuilder(sdk.NewInt(10), denom, &testMsg)
79+
txBuilder := s.CreateTestCosmosTxBuilder(sdkmath.NewInt(10), denom, &testMsg)
7980
return txBuilder.GetTx()
8081
},
8182
true,
@@ -88,7 +89,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
8889
params.MinGasPrice = sdk.NewDec(10)
8990
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
9091

91-
txBuilder := s.CreateTestCosmosTxBuilder(sdk.NewInt(0), denom, &testMsg)
92+
txBuilder := s.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg)
9293
return txBuilder.GetTx()
9394
},
9495
false,
@@ -101,7 +102,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
101102
params.MinGasPrice = sdk.NewDec(10)
102103
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
103104

104-
txBuilder := s.CreateTestCosmosTxBuilder(sdk.NewInt(10), "stake", &testMsg)
105+
txBuilder := s.CreateTestCosmosTxBuilder(sdkmath.NewInt(10), "stake", &testMsg)
105106
return txBuilder.GetTx()
106107
},
107108
false,
@@ -160,9 +161,9 @@ func (s AnteTestSuite) TestEthMinGasPriceDecorator() {
160161
testMsg := banktypes.MsgSend{
161162
FromAddress: "evmos1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ptzkucp",
162163
ToAddress: "evmos1dx67l23hz9l0k9hcher8xz04uj7wf3yu26l2yn",
163-
Amount: sdk.Coins{sdk.Coin{Amount: sdk.NewInt(10), Denom: denom}},
164+
Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}},
164165
}
165-
txBuilder := s.CreateTestCosmosTxBuilder(sdk.NewInt(0), denom, &testMsg)
166+
txBuilder := s.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg)
166167
return txBuilder.GetTx()
167168
},
168169
false,
@@ -291,7 +292,7 @@ func (s AnteTestSuite) TestEthMinGasPriceDecorator() {
291292
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
292293

293294
feemarketParams := s.app.FeeMarketKeeper.GetParams(s.ctx)
294-
feemarketParams.BaseFee = sdk.NewInt(10)
295+
feemarketParams.BaseFee = sdkmath.NewInt(10)
295296
s.app.FeeMarketKeeper.SetParams(s.ctx, feemarketParams)
296297

297298
msg := s.BuildTestEthTx(from, to, nil, make([]byte, 0), nil, big.NewInt(1000), big.NewInt(0), &emptyAccessList)
@@ -308,7 +309,7 @@ func (s AnteTestSuite) TestEthMinGasPriceDecorator() {
308309
s.app.FeeMarketKeeper.SetParams(s.ctx, params)
309310

310311
feemarketParams := s.app.FeeMarketKeeper.GetParams(s.ctx)
311-
feemarketParams.BaseFee = sdk.NewInt(10)
312+
feemarketParams.BaseFee = sdkmath.NewInt(10)
312313
s.app.FeeMarketKeeper.SetParams(s.ctx, feemarketParams)
313314

314315
msg := s.BuildTestEthTx(from, to, nil, make([]byte, 0), nil, big.NewInt(1000), big.NewInt(101), &emptyAccessList)

‎app/ante/handler_options.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ import (
1717
// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
1818
// channel keeper, EVM Keeper and Fee Market Keeper.
1919
type HandlerOptions struct {
20-
AccountKeeper evmtypes.AccountKeeper
21-
BankKeeper evmtypes.BankKeeper
22-
IBCKeeper *ibckeeper.Keeper
23-
FeeMarketKeeper evmtypes.FeeMarketKeeper
24-
EvmKeeper EVMKeeper
25-
FeegrantKeeper ante.FeegrantKeeper
26-
SignModeHandler authsigning.SignModeHandler
27-
SigGasConsumer func(meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params) error
28-
MaxTxGasWanted uint64
20+
AccountKeeper evmtypes.AccountKeeper
21+
BankKeeper evmtypes.BankKeeper
22+
IBCKeeper *ibckeeper.Keeper
23+
FeeMarketKeeper evmtypes.FeeMarketKeeper
24+
EvmKeeper EVMKeeper
25+
FeegrantKeeper ante.FeegrantKeeper
26+
SignModeHandler authsigning.SignModeHandler
27+
SigGasConsumer func(meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params) error
28+
MaxTxGasWanted uint64
29+
ExtensionOptionChecker ante.ExtensionOptionChecker
30+
TxFeeChecker ante.TxFeeChecker
2931
}
3032

3133
func (options HandlerOptions) validate() error {
@@ -67,14 +69,13 @@ func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
6769
return sdk.ChainAnteDecorators(
6870
RejectMessagesDecorator{}, // reject MsgEthereumTxs
6971
ante.NewSetUpContextDecorator(),
70-
ante.NewRejectExtensionOptionsDecorator(),
71-
ante.NewMempoolFeeDecorator(),
72+
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
7273
NewMinGasPriceDecorator(options.FeeMarketKeeper, options.EvmKeeper),
7374
ante.NewValidateBasicDecorator(),
7475
ante.NewTxTimeoutHeightDecorator(),
7576
ante.NewValidateMemoDecorator(options.AccountKeeper),
7677
ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
77-
ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
78+
ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
7879
// SetPubKeyDecorator must be called before all signature verification decorators
7980
ante.NewSetPubKeyDecorator(options.AccountKeeper),
8081
ante.NewValidateSigCountDecorator(options.AccountKeeper),
@@ -92,13 +93,12 @@ func newCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
9293
ante.NewSetUpContextDecorator(),
9394
// NOTE: extensions option decorator removed
9495
// ante.NewRejectExtensionOptionsDecorator(),
95-
ante.NewMempoolFeeDecorator(),
9696
NewMinGasPriceDecorator(options.FeeMarketKeeper, options.EvmKeeper),
9797
ante.NewValidateBasicDecorator(),
9898
ante.NewTxTimeoutHeightDecorator(),
9999
ante.NewValidateMemoDecorator(options.AccountKeeper),
100100
ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
101-
ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
101+
ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
102102
// SetPubKeyDecorator must be called before all signature verification decorators
103103
ante.NewSetPubKeyDecorator(options.AccountKeeper),
104104
ante.NewValidateSigCountDecorator(options.AccountKeeper),

0 commit comments

Comments
 (0)