re-add gasSLoad, used by SSTORE

gballet · Feb 2, 2022 · 49b3f85 · 49b3f85
1 parent b81459a
commit 49b3f85
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go
@@ -156,6 +156,19 @@ func gasExtCodeCopy(evm *EVM, contract *Contract, stack *Stack, mem *Memory, mem
 	return usedGas + statelessGas, err
 }
 
+func gasSLoad(evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
+	usedGas := uint64(0)
+
+	if evm.chainConfig.IsCancun(evm.Context.BlockNumber) {
+		where := stack.Back(0)
+		addr := contract.Address()
+		index := trieUtils.GetTreeKeyStorageSlot(addr[:], where)
+		usedGas += evm.Accesses.TouchAddressOnReadAndComputeGas(index)
+	}
+
+	return usedGas, nil
+}
+
 func gasSStore(evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
 	// Apply the witness access costs, err is nil
 	accessGas, _ := gasSLoad(evm, contract, stack, mem, memorySize)