Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

fix(evm): Simplify Gas Math #1452

Merged
merged 6 commits into from
Nov 18, 2022
Merged

fix(evm): Simplify Gas Math #1452

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
981e663
fix math
Nov 11, 2022
bab2010
Merge branch 'main' into itsdevbear/fix-absolutely-cooked-math
Nov 15, 2022
179216d
changelog
Nov 15, 2022
00df7a0
Merge branch 'main' into itsdevbear/fix-absolutely-cooked-math
Nov 16, 2022
e578a05
Merge branch 'main' into itsdevbear/fix-absolutely-cooked-math
Nov 17, 2022
4cb116d
Merge branch 'main' into itsdevbear/fix-absolutely-cooked-math
Nov 18, 2022
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
7 changes: 4 additions & 3 deletions x/evm/keeper/state_transition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package keeper

import (
"math"
"math/big"

sdkmath "cosmossdk.io/math"
Expand Down Expand Up @@ -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
Expand Down