filling fixes

Signed-off-by: Ignacio Hagopian <[email protected]>
gballet · Oct 15, 2024 · 9635cc1 · 9635cc1
1 parent 4b91d84
commit 9635cc1
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 41 deletions.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -817,18 +817,21 @@ func opCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt
 	if interpreter.evm.chainRules.IsEIP4762 && !transfersValue && !chargeCallVariantEIP4762(interpreter.evm, scope) {
 		return nil, ErrOutOfGas
 	}
-	memSize, err := getMemSize(interpreter.table[CALL], scope.Stack)
-	if err != nil {
-		return nil, err
-	}
-	dynamicCost, err := gasCall(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
-	if err != nil || !scope.Contract.UseGas(dynamicCost) {
-		return nil, ErrOutOfGas
-	}
-	if memSize > 0 {
-		scope.Memory.Resize(memSize)
+	if interpreter.evm.chainRules.IsEIP4762 {
+		memSize, err := getMemSize(interpreter.table[CALL], scope.Stack)
+		if err != nil {
+			return nil, err
+		}
+		dynamicCost, err := gasCall(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
+		if err != nil || !scope.Contract.UseGas(dynamicCost) {
+			return nil, ErrOutOfGas
+		}
+		if memSize > 0 {
+			scope.Memory.Resize(memSize)
+		}
 	}
 
+	var err error
 	interpreter.evm.callGasTemp, err = callGas(interpreter.evm.chainRules.IsEIP150, scope.Contract.Gas, 0, scope.Stack.Back(0))
 	if err != nil {
 		return nil, err
@@ -881,17 +884,20 @@ func opCallCode(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([
 	if interpreter.evm.chainRules.IsEIP4762 && !chargeCallVariantEIP4762(interpreter.evm, scope) {
 		return nil, ErrOutOfGas
 	}
-	memSize, err := getMemSize(interpreter.table[CALLCODE], scope.Stack)
-	if err != nil {
-		return nil, err
-	}
-	dynamicCost, err := gasCallCode(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
-	if err != nil || !scope.Contract.UseGas(dynamicCost) {
-		return nil, ErrOutOfGas
-	}
-	if memSize > 0 {
-		scope.Memory.Resize(memSize)
+	if interpreter.evm.chainRules.IsEIP4762 {
+		memSize, err := getMemSize(interpreter.table[CALLCODE], scope.Stack)
+		if err != nil {
+			return nil, err
+		}
+		dynamicCost, err := gasCallCode(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
+		if err != nil || !scope.Contract.UseGas(dynamicCost) {
+			return nil, ErrOutOfGas
+		}
+		if memSize > 0 {
+			scope.Memory.Resize(memSize)
+		}
 	}
+	var err error
 	interpreter.evm.callGasTemp, err = callGas(interpreter.evm.chainRules.IsEIP150, scope.Contract.Gas, 0, scope.Stack.Back(0))
 	if err != nil {
 		return nil, err
@@ -938,17 +944,20 @@ func opDelegateCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext
 	if interpreter.evm.chainRules.IsEIP4762 && !chargeCallVariantEIP4762(interpreter.evm, scope) {
 		return nil, ErrOutOfGas
 	}
-	memSize, err := getMemSize(interpreter.table[DELEGATECALL], scope.Stack)
-	if err != nil {
-		return nil, err
-	}
-	dynamicCost, err := gasDelegateCall(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
-	if err != nil || !scope.Contract.UseGas(dynamicCost) {
-		return nil, ErrOutOfGas
-	}
-	if memSize > 0 {
-		scope.Memory.Resize(memSize)
+	if interpreter.evm.chainRules.IsEIP4762 {
+		memSize, err := getMemSize(interpreter.table[DELEGATECALL], scope.Stack)
+		if err != nil {
+			return nil, err
+		}
+		dynamicCost, err := gasDelegateCall(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
+		if err != nil || !scope.Contract.UseGas(dynamicCost) {
+			return nil, ErrOutOfGas
+		}
+		if memSize > 0 {
+			scope.Memory.Resize(memSize)
+		}
 	}
+	var err error
 	interpreter.evm.callGasTemp, err = callGas(interpreter.evm.chainRules.IsEIP150, scope.Contract.Gas, 0, scope.Stack.Back(0))
 	if err != nil {
 		return nil, err
@@ -989,17 +998,20 @@ func opStaticCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 		return nil, ErrOutOfGas
 	}
 
-	memSize, err := getMemSize(interpreter.table[STATICCALL], scope.Stack)
-	if err != nil {
-		return nil, err
-	}
-	dynamicCost, err := gasCall(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
-	if err != nil || !scope.Contract.UseGas(dynamicCost) {
-		return nil, ErrOutOfGas
-	}
-	if memSize > 0 {
-		scope.Memory.Resize(memSize)
+	if interpreter.evm.chainRules.IsEIP4762 {
+		memSize, err := getMemSize(interpreter.table[STATICCALL], scope.Stack)
+		if err != nil {
+			return nil, err
+		}
+		dynamicCost, err := gasStaticCall(interpreter.evm, scope.Contract, scope.Stack, scope.Memory, memSize)
+		if err != nil || !scope.Contract.UseGas(dynamicCost) {
+			return nil, ErrOutOfGas
+		}
+		if memSize > 0 {
+			scope.Memory.Resize(memSize)
+		}
 	}
+	var err error
 	interpreter.evm.callGasTemp, err = callGas(interpreter.evm.chainRules.IsEIP150, scope.Contract.Gas, 0, scope.Stack.Back(0))
 	if err != nil {
 		return nil, err

diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
@@ -234,7 +234,7 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 				logged = true
 			}
 			// TODO(hack): remove if conditions
-			if op != CALL && op != CALLCODE && op != DELEGATECALL && op != STATICCALL && memorySize > 0 {
+			if (!in.evm.chainRules.IsEIP4762 || (op != CALL && op != CALLCODE && op != DELEGATECALL && op != STATICCALL)) && memorySize > 0 {
 				mem.Resize(memorySize)
 			}
 		} else if debug {