From 981e663880151ac10bc294a7afe6965c065bd06b Mon Sep 17 00:00:00 2001 From: Dev Bear Date: Fri, 11 Nov 2022 16:58:09 -0500 Subject: [PATCH 1/2] fix math --- x/evm/keeper/state_transition.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index c3b225774f..06c6d6678c 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -1,7 +1,6 @@ package keeper import ( - "math" "math/big" sdkmath "cosmossdk.io/math" @@ -241,8 +240,10 @@ func (k *Keeper) ApplyTransaction(ctx sdk.Context, tx *ethtypes.Transaction) (*t cumulativeGasUsed := res.GasUsed if ctx.BlockGasMeter() != nil { limit := ctx.BlockGasMeter().Limit() - consumed := ctx.BlockGasMeter().GasConsumed() - cumulativeGasUsed = uint64(math.Min(float64(cumulativeGasUsed+consumed), float64(limit))) + cumulativeGasUsed += ctx.BlockGasMeter().GasConsumed() + if cumulativeGasUsed > limit { + cumulativeGasUsed = limit + } } var contractAddr common.Address From 179216d1414f85e6a1ee76b5ba407f93ab7f6add Mon Sep 17 00:00:00 2001 From: Dev Bear Date: Tue, 15 Nov 2022 13:39:01 -0500 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c87967620c..4c3f523d3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (deps) [#1168](https://github.com/evmos/ethermint/pull/1168) Upgrade Cosmos SDK to `v0.46`. * (feemarket) [#1194](https://github.com/evmos/ethermint/pull/1194) Apply feemarket to native cosmos tx. * (eth) [#1346](https://github.com/evmos/ethermint/pull/1346) Added support for `sdk.Dec` and `ed25519` type on eip712. +* (evm) [#1452](https://github.com/evmos/ethermint/pull/1452) Simplify Gas Math in `ApplyTransaction`. ### API Breaking