Skip to content

Always set gas meter for every transaction #2583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codchen merged 1 commit into from
Dec 11, 2025
Merged

Always set gas meter for every transaction #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions app/ante/cosmos_checktx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,22 @@ func CosmosCheckTxAnte(
) (returnCtx sdk.Context, returnErr error) {
oracleVote, err := CosmosStatelessChecks(tx, ctx.BlockHeight(), ctx.ConsensusParams())
if err != nil {
return ctx, err
return SetGasMeter(ctx, 0, pk), err
}

defer func() {
if r := recover(); r != nil {
returnErr = HandleOutofGas(r, tx.(GasTx).GetGas(), ctx.GasMeter().GasConsumed())
}
}()
gasMeter, isGasless, err := GetGasMeter(ctx.WithGasMeter(storetypes.NewNoConsumptionInfiniteGasMeter()), tx, oraclek, ek, pk)
ctx = ctx.WithGasMeter(storetypes.NewNoConsumptionInfiniteGasMeter())
isGasless, err := antedecorators.IsTxGasless(tx, ctx, oraclek, ek)
if err != nil {
return ctx, err
}
ctx = ctx.WithGasMeter(gasMeter)
if !isGasless {
ctx = SetGasMeter(ctx, tx.(GasTx).GetGas(), pk)
}

authParams := accountKeeper.GetParams(ctx)

Expand Down Expand Up @@ -236,21 +239,14 @@ func CosmosStatelessChecks(tx sdk.Tx, height int64, consensusParams *tmproto.Con
return oracleVote, nil
}

func GetGasMeter(
ctx sdk.Context, tx sdk.Tx, oracleKeeper oraclekeeper.Keeper,
evmKeeper *evmkeeper.Keeper,
paramsKeeper paramskeeper.Keeper,
) (sdk.GasMeter, bool, error) {
// TODO: may not be necessary for CheckTx
isGasless, err := antedecorators.IsTxGasless(tx, ctx, oracleKeeper, evmKeeper)
if err != nil {
return nil, false, err
}
if !isGasless {
cosmosGasParams := paramsKeeper.GetCosmosGasParams(ctx)
return storetypes.NewMultiplierGasMeter(tx.(GasTx).GetGas(), cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator), isGasless, nil
func SetGasMeter(ctx sdk.Context, gasLimit uint64, paramsKeeper paramskeeper.Keeper) sdk.Context {
cosmosGasParams := paramsKeeper.GetCosmosGasParams(ctx)

if ctx.BlockHeight() == 0 {
return ctx.WithGasMeter(storetypes.NewInfiniteMultiplierGasMeter(cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator))
}
return ctx.GasMeter(), isGasless, nil

return ctx.WithGasMeter(storetypes.NewMultiplierGasMeter(gasLimit, cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator))
}

func CheckAndChargeFees(ctx sdk.Context, tx sdk.Tx, accountKeeper authkeeper.AccountKeeper, bankKeeper bankkeeper.Keeper, feegrantKeeper *feegrantkeeper.Keeper, paramsKeeper paramskeeper.Keeper, isGasless bool) (priority int64, err error) {
Expand Down
10 changes: 7 additions & 3 deletions app/ante/cosmos_delivertx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
"github.com/sei-protocol/sei-chain/app/antedecorators"
evmkeeper "github.com/sei-protocol/sei-chain/x/evm/keeper"
oraclekeeper "github.com/sei-protocol/sei-chain/x/oracle/keeper"
)
Expand All @@ -24,19 +25,22 @@ func CosmosDeliverTxAnte(
feegrantKeeper *feegrantkeeper.Keeper,
) (returnCtx sdk.Context, returnErr error) {
if _, err := CosmosStatelessChecks(tx, ctx.BlockHeight(), ctx.ConsensusParams()); err != nil {
return ctx, err
return SetGasMeter(ctx, 0, pk), err
}

defer func() {
if r := recover(); r != nil {
returnErr = HandleOutofGas(r, tx.(GasTx).GetGas(), ctx.GasMeter().GasConsumed())
}
}()
gasMeter, _, err := GetGasMeter(ctx.WithGasMeter(storetypes.NewNoConsumptionInfiniteGasMeter()), tx, oraclek, ek, pk)
ctx = ctx.WithGasMeter(storetypes.NewNoConsumptionInfiniteGasMeter())
isGasless, err := antedecorators.IsTxGasless(tx, ctx, oraclek, ek)
if err != nil {
return ctx, err
}
ctx = ctx.WithGasMeter(gasMeter)
if !isGasless {
ctx = SetGasMeter(ctx, tx.(GasTx).GetGas(), pk)
}

authParams := accountKeeper.GetParams(ctx)

Expand Down
Loading