ETCM-697: Fixed issue related to genesis data loading

Author: Igor Grahovac

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

@@ -90,13 +90,13 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
     val initalRootHash = MerklePatriciaTrie.EmptyRootHash
 
     val stateMptRootHash = genesisData.alloc.zipWithIndex.foldLeft(initalRootHash) {
-      case (rootHash, (((address, genesisAccount), idx))) =>
+      case (rootHash, ((address, genesisAccount), _)) =>
         val mpt = MerklePatriciaTrie[Array[Byte], Account](rootHash, storage)
         val paddedAddress = address.reverse.padTo(addressLength, "0").reverse.mkString
         val stateRoot = mpt
           .put(
             crypto.kec256(Hex.decode(paddedAddress)),
-            Account(nonce = genesisAccount.nonce, balance = genesisAccount.balance, codeHash = genesisAccount.code)
+            Account(nonce = genesisAccount.nonce, balance = genesisAccount.balance)
           )
           .getRootHash
         stateRoot

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

@@ -30,7 +30,7 @@ trait JsonMethodsImplicits {
   def encodeAsHex(input: BigInt): JString =
     JString(s"0x${input.toString(16)}")
 
-  protected def decode(s: String): Array[Byte] = {
+  def decode(s: String): Array[Byte] = {
     val stripped = s.replaceFirst("^0x", "")
     val normalized = if (stripped.length % 2 == 1) "0" + stripped else stripped
     Hex.decode(normalized)

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

@@ -74,11 +74,14 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
     private def extractGenesis(genesisJson: JValue): Either[JsonRpcError, GenesisParams] = {
       for {
         author <- extractBytes((genesisJson \ "author").extract[String])
+        difficulty = (genesisJson \ "difficulty").extractOrElse("0")
         extraData <- extractBytes((genesisJson \ "extraData").extract[String])
         gasLimit <- extractQuantity(genesisJson \ "gasLimit")
         parentHash <- extractBytes((genesisJson \ "parentHash").extractOrElse(""))
         timestamp <- extractBytes((genesisJson \ "timestamp").extract[String])
-      } yield GenesisParams(author, extraData, gasLimit, parentHash, timestamp)
+        nonce <- extractBytes((genesisJson \ "nonce").extract[String])
+        mixHash <- extractBytes((genesisJson \ "mixHash").extract[String])
+      } yield GenesisParams(author, difficulty, extraData, gasLimit, parentHash, timestamp, nonce, mixHash)
     }
 
     def decodeJson(params: Option[JArray]): Either[JsonRpcError, SetChainParamsRequest] =

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

@@ -23,10 +23,13 @@ import scala.util.{Failure, Success, Try}
 object TestService {
   case class GenesisParams(
       author: ByteString,
+      difficulty: String,
       extraData: ByteString,
       gasLimit: BigInt,
       parentHash: ByteString,
-      timestamp: ByteString
+      timestamp: ByteString,
+      nonce: ByteString,
+      mixHash: ByteString
   )
   case class BlockchainParams(
       EIP150ForkBlock: BigInt,
@@ -89,9 +92,9 @@ class TestService(
     )
 
     val genesisData = GenesisData(
-      nonce = ByteString(Hex.decode("00")),
-      mixHash = None,
-      difficulty = "0",
+      nonce = request.chainParams.genesis.nonce,
+      mixHash = Some(request.chainParams.genesis.mixHash),
+      difficulty = request.chainParams.genesis.difficulty,
       extraData = request.chainParams.genesis.extraData,
       gasLimit = "0x" + request.chainParams.genesis.gasLimit.toString(16),
       coinbase = request.chainParams.genesis.author,
@@ -159,8 +162,8 @@ class TestService(
   private def handleResult(blockImportResult: BlockImportResult): ServiceResponse[ImportRawBlockResponse] = {
     blockImportResult match {
       case BlockImportedToTop(blockImportData) => {
-        consensus.blockTimestamp += 1
-        Task.now(Right(ImportRawBlockResponse(ByteStringUtils.hash2string(blockImportData.head.block.hash))))
+        val blockHash = s"0x${ByteStringUtils.hash2string(blockImportData.head.block.header.hash)}"
+        Task.now(Right(ImportRawBlockResponse(blockHash)))
       }
       case _ => Task.now(Left(JsonRpcError(-1, "block validation failed!", None)))
     }