[ETCM-912] Add accessedAddresses and accessedStorageKeys to ProgramState

Author: lukasz-golebiewski

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

@@ -63,18 +63,22 @@ object PrecompiledContracts {
 
   private def getContract(context: ProgramContext[_, _]): Option[PrecompiledContract] =
     context.recipientAddr.flatMap { addr =>
-      val ethFork = context.evmConfig.blockchainConfig.ethForkForBlockNumber(context.blockHeader.number)
-      val etcFork = context.evmConfig.blockchainConfig.etcForkForBlockNumber(context.blockHeader.number)
-
-      if (ethFork >= EthForks.Istanbul || etcFork >= EtcForks.Phoenix) {
-        istanbulPhoenixContracts.get(addr)
-      } else if (ethFork >= EthForks.Byzantium || etcFork >= EtcForks.Atlantis) {
-        // byzantium and atlantis hard fork introduce the same set of precompiled contracts
-        byzantiumAtlantisContracts.get(addr)
-      } else
-        contracts.get(addr)
+      getContracts(context).get(addr)
     }
 
+  def getContracts(context: ProgramContext[_, _]): Map[Address, PrecompiledContract] = {
+    val ethFork = context.evmConfig.blockchainConfig.ethForkForBlockNumber(context.blockHeader.number)
+    val etcFork = context.evmConfig.blockchainConfig.etcForkForBlockNumber(context.blockHeader.number)
+
+    if (ethFork >= EthForks.Istanbul || etcFork >= EtcForks.Phoenix) {
+      istanbulPhoenixContracts
+    } else if (ethFork >= EthForks.Byzantium || etcFork >= EtcForks.Atlantis) {
+      // byzantium and atlantis hard fork introduce the same set of precompiled contracts
+      byzantiumAtlantisContracts
+    } else
+      contracts
+  }
+
   sealed trait PrecompiledContract {
     protected def exec(inputData: ByteString): Option[ByteString]
     protected def gas(inputData: ByteString, etcFork: EtcFork, ethFork: EthFork): BigInt

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

@@ -19,7 +19,12 @@ object ProgramState {
       world = context.world,
       staticCtx = context.staticCtx,
       addressesToDelete = context.initialAddressesToDelete,
-      originalWorld = context.originalWorld
+      originalWorld = context.originalWorld,
+      accessedAddresses = PrecompiledContracts.getContracts(context).keySet ++ Set(
+        context.originAddr,
+        context.recipientAddr.getOrElse(context.callerAddr)
+      ),
+      accessedStorageKeys = Set.empty
     )
 }
 
@@ -58,7 +63,9 @@ case class ProgramState[W <: WorldStateProxy[W, S], S <: Storage[S]](
     halted: Boolean = false,
     staticCtx: Boolean = false,
     error: Option[ProgramError] = None,
-    originalWorld: W
+    originalWorld: W,
+    accessedAddresses: Set[Address],
+    accessedStorageKeys: Set[(Address, BigInt)]
 ) {
 
   def config: EvmConfig = env.evmConfig
@@ -126,6 +133,12 @@ case class ProgramState[W <: WorldStateProxy[W, S], S <: Storage[S]](
   def revert(data: ByteString): ProgramState[W, S] =
     copy(error = Some(RevertOccurs), returnData = data, halted = true)
 
+  def addAccessedAddress(addr: Address): ProgramState[W, S] =
+    copy(accessedAddresses = accessedAddresses.+(addr))
+
+  def addAccessedStorageKey(addr: Address, storageKey: BigInt): ProgramState[W, S] =
+    copy(accessedStorageKeys = accessedStorageKeys.+((addr, storageKey)))
+
   def toResult: ProgramResult[W, S] =
     ProgramResult[W, S](
       returnData,