re-wire

skip-mev · Nov 15, 2023 · cb00ab4 · cb00ab4
1 parent f98ba34
commit cb00ab4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/x/feemarket/ante/ante.go b/x/feemarket/ante/ante.go
@@ -42,7 +42,6 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 			options.BaseOptions.BankKeeper,
 			options.BaseOptions.FeegrantKeeper,
 			options.FeeMarketKeeper,
-			TxFeeChecker(options.BaseOptions.TxFeeChecker),
 		),
 		authante.NewSetPubKeyDecorator(options.BaseOptions.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
 		authante.NewValidateSigCountDecorator(options.BaseOptions.AccountKeeper),

diff --git a/x/feemarket/ante/expected_keepers.go b/x/feemarket/ante/expected_keepers.go
@@ -31,5 +31,5 @@ type BankKeeper interface {
 // FeeMarketKeeper defines the expected feemarket keeper.
 type FeeMarketKeeper interface {
 	GetState(ctx sdk.Context) (feemarkettypes.State, error)
-	GetMinGasPrices(ctx sdk.Context) (sdk.DecCoins, error)
+	GetMinGasPrices(ctx sdk.Context) (sdk.Coins, error)
 }
diff --git a/x/feemarket/ante/fee.go b/x/feemarket/ante/fee.go
@@ -54,11 +54,12 @@ func (dfd FeeMarketDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
 		return ctx, errorsmod.Wrapf(err, "unable to get fee market state")
 	}
 
-	ctx = ctx.WithMinGasPrices(minGasPrice)
+	minGasPricesDec := sdk.NewDecCoinsFromCoins(minGasPrices...)
+	ctx = ctx.WithMinGasPrices(minGasPricesDec)
 
 	fee := feeTx.GetFee()
 	if !simulate {
-		fee, priority, err = checkTxFees(ctx, minGasPrice, tx)
+		fee, priority, err = checkTxFees(ctx, minGasPricesDec, tx)
 		if err != nil {
 			return ctx, err
 		}