[ETCM-912] SSTORE gas changes

Author: lukasz-golebiewski

src/main/scala/io/iohk/ethereum/vm/OpCode.scala

@@ -726,7 +726,12 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
         0
     }
     val updatedStorage = state.storage.store(offset, newValue)
-    state.withStack(stack1).withStorage(updatedStorage).refundGas(refund).step()
+    state
+      .addAccessedStorageKey(state.ownAddress, offset)
+      .withStack(stack1)
+      .withStorage(updatedStorage)
+      .refundGas(refund)
+      .step()
   }
 
   protected def varGas[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): BigInt = {
@@ -740,7 +745,7 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
     val eip2200Enabled = isEip2200Enabled(etcFork, ethFork)
     val eip1283Enabled = isEip1283Enabled(ethFork)
 
-    if (eip2200Enabled && state.gas <= state.config.feeSchedule.G_callstipend) {
+    val originalCharge: BigInt = if (eip2200Enabled && state.gas <= state.config.feeSchedule.G_callstipend) {
       state.config.feeSchedule.G_callstipend + 1 // Out of gas error
     } else if (eip2200Enabled || eip1283Enabled) {
       if (currentValue == newValue.toBigInt) { // no-op
@@ -763,6 +768,8 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
       else
         state.config.feeSchedule.G_sreset
     }
+
+    originalCharge + OpCode.storageAccessCost(state, state.ownAddress, offset)(_ => 0, _.G_cold_account_access, _ => 0)
   }
 
   override protected def availableInContext[W <: WorldStateProxy[W, S], S <: Storage[S]]

src/test/scala/io/iohk/ethereum/vm/OpCodeFunSpec.scala

@@ -462,7 +462,11 @@ class OpCodeFunSpec extends AnyFunSuite with OpCodeTesting with Matchers with Sc
         val data = stateOut.storage.load(offset)
         data shouldEqual value.toBigInt
 
-        stateOut shouldEqual stateIn.withStack(stateOut.stack).withStorage(stateOut.storage).step()
+        stateOut shouldEqual stateIn
+          .addAccessedStorageKey(stateIn.ownAddress, offset)
+          .withStack(stateOut.stack)
+          .withStorage(stateOut.storage)
+          .step()
       }
     }
   }

src/test/scala/io/iohk/ethereum/vm/OpCodeGasSpecPostEip2929.scala

@@ -1,6 +1,7 @@
 package io.iohk.ethereum.vm
 
 import org.scalacheck.Arbitrary
+import org.scalacheck.Gen
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
@@ -196,4 +197,51 @@ class OpCodeGasSpecPostEip2929 extends AnyFunSuite with OpCodeTesting with Match
       }
     }
   }
+
+  test(SSTORE) { op =>
+    val storage = MockStorage.Empty.store(Zero, One)
+    val table = Table[UInt256, UInt256, Boolean, BigInt, BigInt](
+      ("offset", "value", "alreadyAccessed", "startGas", "expectedGasConsumption"),
+      (0, 1, true, G_callstipend + 1, G_sload),
+      (0, 1, false, G_sload + G_cold_account_access, G_sload + G_cold_account_access),
+      (0, 0, true, G_callstipend + 1, G_sload),
+      (0, 0, false, G_sload + G_cold_account_access, G_sload + G_cold_account_access),
+      (1, 0, true, G_callstipend + 1, G_sload),
+      (1, 0, false, G_sload + G_cold_account_access, G_sload + G_cold_account_access),
+      (1, 1, true, G_sset, G_sset),
+      (1, 1, false, G_sset + G_cold_account_access, G_sset + G_cold_account_access)
+    )
+
+    forAll(table) { (offset, value, alreadyAccessed, startGas, expectedGasConsumption) =>
+      val stackIn = Stack.empty().push(value).push(offset)
+      val stateIn = getProgramStateGen(
+        blockNumberGen = getUInt256Gen(Fixtures.MagnetoBlockNumber),
+        evmConfig = config
+      ).sample.get.withStack(stackIn).withStorage(storage).copy(gas = startGas)
+
+      val stateOut =
+        if (alreadyAccessed) op.execute(stateIn.addAccessedStorageKey(stateIn.ownAddress, offset))
+        else op.execute(stateIn)
+      verifyGas(expectedGasConsumption, stateIn, stateOut, allowOOG = false)
+    }
+
+    // test G_sreset
+    forAll(Arbitrary.arbitrary[Boolean]) { alreadyAccessed =>
+      val offset = 0
+      val value = 0
+      val expectedGasConsumption = if (alreadyAccessed) G_sreset else G_sreset + G_cold_account_access
+
+      val stackIn = Stack.empty().push(value).push(offset)
+      val stateIn = getProgramStateGen(
+        blockNumberGen = getUInt256Gen(Fixtures.MagnetoBlockNumber),
+        evmConfig = config,
+        storageGen = Gen.const(storage)
+      ).sample.get.withStack(stackIn).copy(gas = expectedGasConsumption)
+
+      val stateOut =
+        if (alreadyAccessed) op.execute(stateIn.addAccessedStorageKey(stateIn.ownAddress, offset))
+        else op.execute(stateIn)
+      verifyGas(expectedGasConsumption, stateIn, stateOut, allowOOG = false)
+    }
+  }
 }