charge proper warm costs (#497)

Signed-off-by: Ignacio Hagopian <[email protected]>
gballet · Sep 13, 2024 · 218365f · 218365f
1 parent 219510d
commit 218365f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/core/vm/operations_verkle.go b/core/vm/operations_verkle.go
@@ -50,7 +50,7 @@ func gasBalance4762(evm *EVM, contract *Contract, stack *Stack, mem *Memory, mem
 func gasExtCodeSize4762(evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
 	address := stack.peek().Bytes20()
 	if _, isPrecompile := evm.precompile(address); isPrecompile {
-		return 0, nil
+		return params.WarmStorageReadCostEIP2929, nil
 	}
 	wgas := evm.Accesses.TouchBasicData(address[:], false)
 	if wgas == 0 {
@@ -62,7 +62,7 @@ func gasExtCodeSize4762(evm *EVM, contract *Contract, stack *Stack, mem *Memory,
 func gasExtCodeHash4762(evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
 	address := stack.peek().Bytes20()
 	if _, isPrecompile := evm.precompile(address); isPrecompile || evm.isSystemContract(address) {
-		return 0, nil
+		return params.WarmStorageReadCostEIP2929, nil
 	}
 	codehashgas := evm.Accesses.TouchCodeHash(address[:], false)
 	if codehashgas == 0 {
@@ -79,6 +79,10 @@ func makeCallVariantGasEIP4762(oldCalculator gasFunc) gasFunc {
 		}
 		target := common.Address(stack.Back(1).Bytes20())
 		if _, isPrecompile := evm.precompile(target); isPrecompile {
+			var overflow bool
+			if gas, overflow = math.SafeAdd(gas, params.WarmStorageReadCostEIP2929); overflow {
+				return 0, ErrGasUintOverflow
+			}
 			return gas, nil
 		}
 		// The charging for the value transfer is done BEFORE subtracting
@@ -138,14 +142,17 @@ func gasExtCodeCopyEIP4762(evm *EVM, contract *Contract, stack *Stack, mem *Memo
 	addr := common.Address(stack.peek().Bytes20())
 
 	if _, isPrecompile := evm.precompile(addr); isPrecompile {
+		var overflow bool
+		if gas, overflow = math.SafeAdd(gas, params.WarmStorageReadCostEIP2929); overflow {
+			return 0, ErrGasUintOverflow
+		}
 		return gas, nil
 	}
 	wgas := evm.Accesses.TouchBasicData(addr[:], false)
 	if wgas == 0 {
 		wgas = params.WarmStorageReadCostEIP2929
 	}
 	var overflow bool
-	// We charge (cold-warm), since 'warm' is already charged as constantGas
 	if gas, overflow = math.SafeAdd(gas, wgas); overflow {
 		return 0, ErrGasUintOverflow
 	}