adjust

x/feemarket/ante/fee.go

@@ -6,6 +6,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
+	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
@@ -209,6 +210,13 @@ func (dfd feeMarketCheckDecorator) EscrowFunds(ctx sdk.Context, sdkTx sdk.Tx, pr
 		return sdkerrors.ErrUnknownAddress.Wrapf("fee payer address: %s does not exist", deductFeesFrom)
 	}
 
+	// fork gas and don't count escrow cost
+	cacheGas := ctx.GasMeter().GasConsumed()
+	defer func() {
+		ctx = ctx.WithGasMeter(storetypes.NewGasMeter(ctx.GasMeter().Limit()))
+		ctx.GasMeter().ConsumeGas(cacheGas, "escrow gas reset")
+	}()
+
 	return escrow(dfd.bankKeeper, ctx, deductFeesFromAcc, sdk.NewCoins(providedFee))
 }
 

x/feemarket/post/fee.go

@@ -3,10 +3,9 @@ package post
 import (
 	"fmt"
 
-	"cosmossdk.io/math"
-
 	errorsmod "cosmossdk.io/errors"
-
+	"cosmossdk.io/math"
+	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -15,9 +14,6 @@ import (
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 )
 
-// BankSendGasConsumption is the gas consumption of the bank sends that occur during feemarket handler execution.
-const BankSendGasConsumption = 12490
-
 // FeeMarketDeductDecorator deducts fees from the fee payer based off of the current state of the feemarket.
 // The fee payer is the fee granter (if specified) or first signer of the tx.
 // If the fee payer does not have the funds to pay for the fees, return an InsufficientFunds error.
@@ -140,11 +136,6 @@ func (dfd FeeMarketDeductDecorator) PostHandle(ctx sdk.Context, tx sdk.Tx, simul
 		return ctx, errorsmod.Wrapf(err, "unable to set fee market state")
 	}
 
-	if simulate {
-		// consume the gas that would be consumed during normal execution
-		ctx.GasMeter().ConsumeGas(BankSendGasConsumption, "simulation send gas consumption")
-	}
-
 	return next(ctx, tx, simulate, success)
 }
 
@@ -158,6 +149,13 @@ func (dfd FeeMarketDeductDecorator) PayOutFeeAndTip(ctx sdk.Context, fee, tip sd
 
 	var events sdk.Events
 
+	// fork gas and don't count payout cost
+	cacheGas := ctx.GasMeter().GasConsumed()
+	defer func() {
+		ctx = ctx.WithGasMeter(storetypes.NewGasMeter(ctx.GasMeter().Limit()))
+		ctx.GasMeter().ConsumeGas(cacheGas, "gas deduction reset")
+	}()
+
 	// deduct the fees and tip
 	if !fee.IsNil() {
 		err := DeductCoins(dfd.bankKeeper, ctx, sdk.NewCoins(fee), params.DistributeFees)

x/feemarket/post/fee_test.go

@@ -154,7 +154,7 @@ func TestPostHandleMock(t *testing.T) {
 		baseDenom              = "stake"
 		resolvableDenom        = "atom"
 		expectedConsumedGas    = 10631
-		expectedConsumedSimGas = expectedConsumedGas + post.BankSendGasConsumption
+		expectedConsumedSimGas = expectedConsumedGas
 		gasLimit               = expectedConsumedSimGas
 	)
 
@@ -539,7 +539,7 @@ func TestPostHandle(t *testing.T) {
 	const (
 		baseDenom           = "stake"
 		resolvableDenom     = "atom"
-		expectedConsumedGas = 36650
+		expectedConsumedGas = 24160
 
 		expectedConsumedGasResolve = 36524 // slight difference due to denom resolver