forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-14 16:03:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use leftOverGas instead of gas as it's sure to respect Go rules for defer to have latest returned value

Browse source
This commit is contained in:
Matthieu Vachon 2023-07-27 15:37:09 -04:00
parent 4e834c10d0
commit 9af0334dff
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/vm/evm.go
View file

@ -178,13 +178,13 @@ func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas
if evm.depth == 0 { if evm.depth == 0 {
tracer.CaptureStart(caller.Address(), addr, false, input, gas, value) tracer.CaptureStart(caller.Address(), addr, false, input, gas, value)
defer func(startGas uint64) { // Lazy evaluation of the parameters defer func(startGas uint64) { // Lazy evaluation of the parameters
tracer.CaptureEnd(ret, startGas-gas, err) tracer.CaptureEnd(ret, startGas-leftOverGas, err)
}(gas) }(gas)
} else { } else {
// Handle tracer events for entering and exiting a call frame // Handle tracer events for entering and exiting a call frame
tracer.CaptureEnter(CALL, caller.Address(), addr, input, gas, value) tracer.CaptureEnter(CALL, caller.Address(), addr, input, gas, value)
defer func(startGas uint64) { defer func(startGas uint64) {
tracer.CaptureExit(ret, startGas-gas, err) tracer.CaptureExit(ret, startGas-leftOverGas, err)
}(gas) }(gas)
} }
} }
@ -253,7 +253,7 @@ func (evm *EVM) CallCode(caller ContractRef, addr common.Address, input []byte,
if tracer := evm.Config.Tracer; tracer != nil { if tracer := evm.Config.Tracer; tracer != nil {
tracer.CaptureEnter(CALLCODE, caller.Address(), addr, input, gas, value) tracer.CaptureEnter(CALLCODE, caller.Address(), addr, input, gas, value)
defer func(startGas uint64) { defer func(startGas uint64) {
tracer.CaptureExit(ret, startGas-gas, err) tracer.CaptureExit(ret, startGas-leftOverGas, err)
}(gas) }(gas)
} }
@ -305,7 +305,7 @@ func (evm *EVM) DelegateCall(caller ContractRef, addr common.Address, input []by
// DELEGATECALL inherits value from parent call // DELEGATECALL inherits value from parent call
tracer.CaptureEnter(DELEGATECALL, caller.Address(), addr, input, gas, parent.value) tracer.CaptureEnter(DELEGATECALL, caller.Address(), addr, input, gas, parent.value)
defer func(startGas uint64) { defer func(startGas uint64) {
tracer.CaptureExit(ret, startGas-gas, err) tracer.CaptureExit(ret, startGas-leftOverGas, err)
}(gas) }(gas)
} }
@ -344,7 +344,7 @@ func (evm *EVM) StaticCall(caller ContractRef, addr common.Address, input []byte
if tracer := evm.Config.Tracer; tracer != nil { if tracer := evm.Config.Tracer; tracer != nil {
tracer.CaptureEnter(STATICCALL, caller.Address(), addr, input, gas, nil) tracer.CaptureEnter(STATICCALL, caller.Address(), addr, input, gas, nil)
defer func(startGas uint64) { defer func(startGas uint64) {
tracer.CaptureExit(ret, startGas-gas, err) tracer.CaptureExit(ret, startGas-leftOverGas, err)
}(gas) }(gas)
} }