Skip to content

Commit

Permalink
update gas tip cap param range (#1884)
Browse files Browse the repository at this point in the history
* update gas tip cap param range

* unit test
  • Loading branch information
blindchaser authored Oct 8, 2024
1 parent b9199c6 commit c613181
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
3 changes: 3 additions & 0 deletions x/evm/ante/fee.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ func (fc EVMFeeCheckDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b
if txData.GetGasFeeCap().Cmp(fc.getMinimumFee(ctx)) < 0 {
return ctx, sdkerrors.ErrInsufficientFee
}
if txData.GetGasTipCap().Sign() < 0 {
return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "gas fee cap cannot be negative")
}

// if EVM version is Cancun or later, and the transaction contains at least one blob, we need to
// make sure the transaction carries a non-zero blob fee cap.
Expand Down
37 changes: 37 additions & 0 deletions x/evm/ante/fee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,24 @@ func TestEVMFeeCheckDecorator(t *testing.T) {
return ctx, nil
})
require.NotNil(t, err)

// should fail because of negative gas tip cap
txData.GasTipCap = big.NewInt(-1)
txData.GasFeeCap = big.NewInt(10000000000000)
tx, err = ethtypes.SignTx(ethtypes.NewTx(&txData), signer, key)
require.Nil(t, err)
typedTx = newDynamicFeeTxWithoutValidation(tx)
msg, err = types.NewMsgEVMTransaction(typedTx)
require.Nil(t, err)
ctx, err = preprocessor.AnteHandle(ctx, mockTx{msgs: []sdk.Msg{msg}}, false, func(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) {
return ctx, nil
})
require.Nil(t, err)
_, err = handler.AnteHandle(ctx, mockTx{msgs: []sdk.Msg{msg}}, false, func(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) {
return ctx, nil
})
require.NotNil(t, err)
require.Contains(t, err.Error(), "gas fee cap cannot be negative")
}

func TestCalculatePriorityScenarios(t *testing.T) {
Expand Down Expand Up @@ -227,3 +245,22 @@ func TestCalculatePriorityScenarios(t *testing.T) {
})
}
}

func newDynamicFeeTxWithoutValidation(tx *ethtypes.Transaction) *ethtx.DynamicFeeTx {
txData := &ethtx.DynamicFeeTx{
Nonce: tx.Nonce(),
Data: tx.Data(),
GasLimit: tx.Gas(),
}

v, r, s := tx.RawSignatureValues()
ethtx.SetConvertIfPresent(tx.To(), func(to *common.Address) string { return to.Hex() }, txData.SetTo)
ethtx.SetConvertIfPresent(tx.Value(), sdk.NewIntFromBigInt, txData.SetAmount)
ethtx.SetConvertIfPresent(tx.GasFeeCap(), sdk.NewIntFromBigInt, txData.SetGasFeeCap)
ethtx.SetConvertIfPresent(tx.GasTipCap(), sdk.NewIntFromBigInt, txData.SetGasTipCap)
al := tx.AccessList()
ethtx.SetConvertIfPresent(&al, ethtx.NewAccessList, txData.SetAccesses)

txData.SetSignatureValues(tx.ChainId(), v, r, s)
return txData
}

0 comments on commit c613181

Please sign in to comment.