deep-stack/laconicd-deprecated
5
0
Fork 0
forked from cerc-io/laconicd-deprecated
Code Pull Requests Activity

ante: fix fee check (#597)

Browse Source 
* ante: fix fee check

* changelog

* comment
This commit is contained in:
Federico Kunze 2020-11-16 14:09:40 +01:00 committed by GitHub
parent 26b3af7a26
commit 73e5eb5e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -53,6 +53,7 @@ corresponding Ethereum API namespace:
### Bug Fixes ### Bug Fixes
* (ante) [\#597](https://github.com/cosmos/ethermint/pull/597) Fix incorrect fee check on `AnteHandler`.
* (evm) [\#583](https://github.com/cosmos/ethermint/pull/583) Fixes incorrect resetting of tx count and block bloom during `BeginBlock`, as well as gas consumption. * (evm) [\#583](https://github.com/cosmos/ethermint/pull/583) Fixes incorrect resetting of tx count and block bloom during `BeginBlock`, as well as gas consumption.
* (crypto) [\#577](https://github.com/cosmos/ethermint/pull/577) Fix `BIP44HDPath` that did not prepend `m/` to the path. This now uses the `DefaultBaseDerivationPath` variable from go-ethereum to ensure addresses are consistent. * (crypto) [\#577](https://github.com/cosmos/ethermint/pull/577) Fix `BIP44HDPath` that did not prepend `m/` to the path. This now uses the `DefaultBaseDerivationPath` variable from go-ethereum to ensure addresses are consistent.

11
app/ante/eth.go
View File

@ -100,20 +100,21 @@ func (emfd EthMempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
evmDenom := emfd.evmKeeper.GetParams(ctx).EvmDenom evmDenom := emfd.evmKeeper.GetParams(ctx).EvmDenom
// fee = GP * GL // fee = gas price * gas limit
fee := sdk.NewInt64DecCoin(evmDenom, msgEthTx.Fee().Int64()) fee := sdk.NewInt64DecCoin(evmDenom, msgEthTx.Fee().Int64())
minGasPrices := ctx.MinGasPrices() minGasPrices := ctx.MinGasPrices()
minFees := minGasPrices.AmountOf(evmDenom).MulInt64(int64(msgEthTx.Data.GasLimit))
// check that fee provided is greater than the minimum // check that fee provided is greater than the minimum defined by the validator node
// NOTE: we only check if aphotons are present in min gas prices. It is up to the // NOTE: we only check if the evm denom tokens are present in min gas prices. It is up to the
// sender if they want to send additional fees in other denominations. // sender if they want to send additional fees in other denominations.
var hasEnoughFees bool var hasEnoughFees bool
if fee.Amount.GTE(minGasPrices.AmountOf(evmDenom)) { if fee.Amount.GTE(minFees) {
hasEnoughFees = true hasEnoughFees = true
} }
// reject transaction if minimum gas price is positive and the transaction does not // reject transaction if minimum gas price is not zero and the transaction does not
// meet the minimum fee // meet the minimum fee
if !ctx.MinGasPrices().IsZero() && !hasEnoughFees { if !ctx.MinGasPrices().IsZero() && !hasEnoughFees {
return ctx, sdkerrors.Wrap( return ctx, sdkerrors.Wrap(