core/vm: witness write event for SSTORE (ethereum#80)

* core/vm: witness write event for SSTORE * remove TODO that is addressed by this branch
jwasinger · Feb 11, 2022 · 7af62ef · 7af62ef
1 parent 1a98ca7
commit 7af62ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -608,7 +608,6 @@ func opSload(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]by
 
 	if interpreter.evm.chainConfig.IsCancun(interpreter.evm.Context.BlockNumber) {
 		index := trieUtils.GetTreeKeyStorageSlot(scope.Contract.Address().Bytes(), loc)
-		// TODO SSTORE write events
 		interpreter.evm.Accesses.SetLeafValue(index, val.Bytes())
 	}
 	loc.SetBytes(val.Bytes())

diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go
@@ -52,6 +52,12 @@ func makeGasSStoreFunc(clearingRefund uint64) gasFunc {
 		}
 		value := common.Hash(y.Bytes32())
 
+		if evm.chainConfig.IsCancun(evm.Context.BlockNumber) {
+			addr := contract.Address()
+			index := trieUtils.GetTreeKeyStorageSlot(addr[:], x)
+			cost += evm.Accesses.TouchAddressOnWriteAndComputeGas(index)
+		}
+
 		if current == value { // noop (1)
 			// EIP 2200 original clause:
 			//		return params.SloadGasEIP2200, nil