Make GenesisDataLoader compute the storage hash instead of taking it as argument.

Author: Aurélien Richez

src/main/scala/io/iohk/ethereum/blockchain/data/GenesisDataLoader.scala

@@ -2,11 +2,9 @@ package io.iohk.ethereum.blockchain.data
 
 import java.io.FileNotFoundException
 import akka.util.ByteString
-import io.iohk.ethereum.blockchain.data.GenesisDataLoader.JsonSerializers.{
-  ByteStringJsonSerializer,
-  UInt256JsonSerializer
-}
-import io.iohk.ethereum.db.storage.MptStorage
+import io.iohk.ethereum.blockchain.data.GenesisDataLoader.JsonSerializers.{ByteStringJsonSerializer, UInt256JsonSerializer}
+import io.iohk.ethereum.db.dataSource.EphemDataSource
+import io.iohk.ethereum.db.storage.{ArchiveNodeStorage, MptStorage, NodeStorage, SerializingMptStorage}
 import io.iohk.ethereum.db.storage.StateStorage.GenesisDataLoad
 import io.iohk.ethereum.rlp.RLPList
 import io.iohk.ethereum.utils.BlockchainConfig
@@ -86,14 +84,14 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
     } yield ()
   }
 
-  def loadGenesisData(genesisData: GenesisData, storageRootHashes: Map[Address, ByteString] = Map.empty): Try[Unit] = {
+  def loadGenesisData(genesisData: GenesisData): Try[Unit] = {
     import MerklePatriciaTrie.defaultByteArraySerializable
 
     val stateStorage = blockchain.getStateStorage
     val storage = stateStorage.getReadOnlyStorage
     val initalRootHash = MerklePatriciaTrie.EmptyRootHash
 
-    val stateMptRootHash = getGenesisStateRoot(genesisData, initalRootHash, storage, storageRootHashes)
+    val stateMptRootHash = getGenesisStateRoot(genesisData, initalRootHash, storage)
     val header: BlockHeader = prepareHeader(genesisData, stateMptRootHash)
 
     log.debug(s"Prepared genesis header: $header")
@@ -125,8 +123,7 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
   private def getGenesisStateRoot(
       genesisData: GenesisData,
       initalRootHash: Array[Byte],
-      storage: MptStorage,
-      storageRootHashes: Map[Address, ByteString]
+      storage: MptStorage
   ) = {
     import MerklePatriciaTrie.defaultByteArraySerializable
 
@@ -142,14 +139,25 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
               .getOrElse(blockchainConfig.accountStartNonce),
             balance = genesisAccount.balance,
             codeHash = genesisAccount.code.map(codeValue => crypto.kec256(codeValue)).getOrElse(Account.EmptyCodeHash),
-            storageRoot = storageRootHashes.getOrElse(Address(Hex.decode(paddedAddress)), Account.EmptyStorageRootHash)
+            storageRoot = genesisAccount.storage.map(computeStorageRootHash).getOrElse(Account.EmptyStorageRootHash)
           )
         )
         .getRootHash
       stateRoot
     }
   }
 
+  private def computeStorageRootHash(storage: Map[UInt256, UInt256]): ByteString = {
+    val emptyTrie = EthereumUInt256Mpt.storageMpt(
+      ByteString(MerklePatriciaTrie.EmptyRootHash),
+      new SerializingMptStorage(new ArchiveNodeStorage(new NodeStorage(EphemDataSource())))
+    )
+
+    val storageTrie = storage.foldLeft(emptyTrie)((trie, tuple) => trie.put(tuple._1, tuple._2))
+
+    ByteString(storageTrie.getRootHash)
+  }
+
   private def prepareHeader(genesisData: GenesisData, stateMptRootHash: Array[Byte]) =
     BlockHeader(
       parentHash = zeros(hashLength),

src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala

@@ -157,14 +157,10 @@ class TestService(
 
     //save account codes to world state
     storeGenesisAccountCodes(newBlockchainConfig, genesisData.alloc)
-    val storesRootHash = storeGenesisAccountStorageData(newBlockchainConfig, genesisData.alloc)
+    storeGenesisAccountStorageData(newBlockchainConfig, genesisData.alloc)
     // update test ledger with new config
     testLedgerWrapper.blockchainConfig = newBlockchainConfig
 
-    // remove current genesis (Try because it may not exist)
-    Try(blockchain.removeBlock(blockchain.genesisHeader.hash, withState = false))
-    genesisDataLoader.loadGenesisData(genesisData, storesRootHash)
-
     accountAddresses = genesisData.alloc.keys.toList
     accountRangeOffset = 0
 
@@ -185,7 +181,7 @@ class TestService(
     InMemoryWorldStateProxy.persistState(worldToPersist)
   }
 
-  private def storeGenesisAccountStorageData(config: BlockchainConfig, accounts: Map[String, GenesisAccount]) = {
+  private def storeGenesisAccountStorageData(config: BlockchainConfig, accounts: Map[String, GenesisAccount]): Unit = {
     val genesisBlock = blockchain.getBlockByNumber(0).get
     val world =
       blockchain.getWorldStateProxy(0, UInt256.Zero, genesisBlock.header.stateRoot, false, config.ethCompatibleStorage)
@@ -203,9 +199,7 @@ class TestService(
       updatedWorld
     })
 
-    InMemoryWorldStateProxy.persistState(worldToPersist).contractStorages.map { case (address, values) =>
-      address -> ByteString(values.inner.getRootHash)
-    }
+    InMemoryWorldStateProxy.persistState(worldToPersist)
   }
 
   def mineBlocks(request: MineBlocksRequest): ServiceResponse[MineBlocksResponse] = {