mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-19 19:30:44 +00:00
core/state: return full warm cost in BasicDataGas and CodeHashGas
This commit is contained in:
parent
919b238c82
commit
33a0b911f5
1 changed files with 0 additions and 6 deletions
|
|
@ -314,9 +314,6 @@ func (ae *AccessEvents) CodeChunksRangeGas(contractAddr common.Address, startPC,
|
||||||
func (ae *AccessEvents) BasicDataGas(addr common.Address, isWrite bool, availableGas uint64, chargeWarmCosts bool) uint64 {
|
func (ae *AccessEvents) BasicDataGas(addr common.Address, isWrite bool, availableGas uint64, chargeWarmCosts bool) uint64 {
|
||||||
_, expected := ae.touchAddressAndChargeGas(addr, zeroTreeIndex, bintrie.BasicDataLeafKey, isWrite, availableGas)
|
_, expected := ae.touchAddressAndChargeGas(addr, zeroTreeIndex, bintrie.BasicDataLeafKey, isWrite, availableGas)
|
||||||
if expected == 0 && chargeWarmCosts {
|
if expected == 0 && chargeWarmCosts {
|
||||||
if availableGas < params.WarmStorageReadCostEIP2929 {
|
|
||||||
return availableGas
|
|
||||||
}
|
|
||||||
expected = params.WarmStorageReadCostEIP2929
|
expected = params.WarmStorageReadCostEIP2929
|
||||||
}
|
}
|
||||||
return expected
|
return expected
|
||||||
|
|
@ -330,9 +327,6 @@ func (ae *AccessEvents) BasicDataGas(addr common.Address, isWrite bool, availabl
|
||||||
func (ae *AccessEvents) CodeHashGas(addr common.Address, isWrite bool, availableGas uint64, chargeWarmCosts bool) uint64 {
|
func (ae *AccessEvents) CodeHashGas(addr common.Address, isWrite bool, availableGas uint64, chargeWarmCosts bool) uint64 {
|
||||||
_, expected := ae.touchAddressAndChargeGas(addr, zeroTreeIndex, bintrie.CodeHashLeafKey, isWrite, availableGas)
|
_, expected := ae.touchAddressAndChargeGas(addr, zeroTreeIndex, bintrie.CodeHashLeafKey, isWrite, availableGas)
|
||||||
if expected == 0 && chargeWarmCosts {
|
if expected == 0 && chargeWarmCosts {
|
||||||
if availableGas < params.WarmStorageReadCostEIP2929 {
|
|
||||||
return availableGas
|
|
||||||
}
|
|
||||||
expected = params.WarmStorageReadCostEIP2929
|
expected = params.WarmStorageReadCostEIP2929
|
||||||
}
|
}
|
||||||
return expected
|
return expected
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue