From 06badab596167f46b82b815fec03e8c488b2bc1d Mon Sep 17 00:00:00 2001 From: Matthieu Vachon Date: Mon, 11 Sep 2023 11:21:45 -0400 Subject: [PATCH] Inverted `GasChangeCallLeftOverRefunded` and `GasChangeCallLeftOverReturned` --- core/vm/evm.go | 10 +++++----- core/vm/instructions.go | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/vm/evm.go b/core/vm/evm.go index 17f9b9bb25..c4058b0909 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -186,7 +186,7 @@ func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas evm.Config.Tracer.CaptureEnter(CALL, caller.Address(), addr, input, gas, value) evm.Config.Tracer.OnGasChange(0, gas, GasChangeCallInitialBalance) defer func(startGas uint64) { - evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverRefunded) + evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverReturned) evm.Config.Tracer.CaptureExit(ret, startGas-gas, err) }(gas) } @@ -261,7 +261,7 @@ func (evm *EVM) CallCode(caller ContractRef, addr common.Address, input []byte, evm.Config.Tracer.CaptureEnter(CALLCODE, caller.Address(), addr, input, gas, value) evm.Config.Tracer.OnGasChange(0, gas, GasChangeCallInitialBalance) defer func(startGas uint64) { - evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverRefunded) + evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverReturned) evm.Config.Tracer.CaptureExit(ret, startGas-gas, err) }(gas) } @@ -318,7 +318,7 @@ func (evm *EVM) DelegateCall(caller ContractRef, addr common.Address, input []by evm.Config.Tracer.CaptureEnter(DELEGATECALL, caller.Address(), addr, input, gas, parent.value) evm.Config.Tracer.OnGasChange(0, gas, GasChangeCallInitialBalance) defer func(startGas uint64) { - evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverRefunded) + evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverReturned) evm.Config.Tracer.CaptureExit(ret, startGas-gas, err) }(gas) } @@ -362,7 +362,7 @@ func (evm *EVM) StaticCall(caller ContractRef, addr common.Address, input []byte evm.Config.Tracer.CaptureEnter(STATICCALL, caller.Address(), addr, input, gas, nil) evm.Config.Tracer.OnGasChange(0, gas, GasChangeCallInitialBalance) defer func(startGas uint64) { - evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverRefunded) + evm.Config.Tracer.OnGasChange(leftOverGas, 0, GasChangeCallLeftOverReturned) evm.Config.Tracer.CaptureExit(ret, startGas-gas, err) }(gas) } @@ -437,7 +437,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64, evm.Config.Tracer.CaptureEnter(typ, caller.Address(), address, codeAndHash.code, gas, value) evm.Config.Tracer.OnGasChange(0, gas, GasChangeCallInitialBalance) defer func() { - evm.Config.Tracer.OnGasChange(leftoverGas, 0, GasChangeCallLeftOverRefunded) + evm.Config.Tracer.OnGasChange(leftoverGas, 0, GasChangeCallLeftOverReturned) evm.Config.Tracer.CaptureExit(ret, gas-leftoverGas, err) }() } diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 42e55fcfa9..1146856cb0 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -614,7 +614,7 @@ func opCreate(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]b scope.Stack.push(&stackvalue) if interpreter.evm.Config.Tracer != nil { - interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverReturned) + interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverRefunded) } scope.Contract.Gas += returnGas @@ -659,7 +659,7 @@ func opCreate2(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([] scope.Stack.push(&stackvalue) if interpreter.evm.Config.Tracer != nil { - interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverReturned) + interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverRefunded) } scope.Contract.Gas += returnGas @@ -709,7 +709,7 @@ func opCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt } if interpreter.evm.Config.Tracer != nil { - interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverReturned) + interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverRefunded) } scope.Contract.Gas += returnGas @@ -749,7 +749,7 @@ func opCallCode(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([ } if interpreter.evm.Config.Tracer != nil { - interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverReturned) + interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverRefunded) } scope.Contract.Gas += returnGas @@ -782,7 +782,7 @@ func opDelegateCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext } if interpreter.evm.Config.Tracer != nil { - interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverReturned) + interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverRefunded) } scope.Contract.Gas += returnGas @@ -815,7 +815,7 @@ func opStaticCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) } if interpreter.evm.Config.Tracer != nil { - interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverReturned) + interpreter.evm.Config.Tracer.OnGasChange(scope.Contract.Gas, scope.Contract.Gas+returnGas, GasChangeCallLeftOverRefunded) } scope.Contract.Gas += returnGas