From e0a72064a231680f6b48ef039214bd338ba9b177 Mon Sep 17 00:00:00 2001
From: Igor Grahovac <igor.grahovac@iohk.io>
Date: Thu, 15 Apr 2021 10:07:35 +0200
Subject: [PATCH] ETCM-697: Added zero fork blocks to testmode config

---
 src/main/resources/conf/testmode.conf         | 26 +++++++++++++++++++
 .../iohk/ethereum/jsonrpc/TestService.scala   | 12 ++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/conf/testmode.conf b/src/main/resources/conf/testmode.conf
index 3c94c161a9..ed51fd2d56 100644
--- a/src/main/resources/conf/testmode.conf
+++ b/src/main/resources/conf/testmode.conf
@@ -18,7 +18,33 @@ mantis {
     test {
         chain-id = 1
 
+        frontier-block-number = 0
+
+        homestead-block-number = 0
+
+        eip106-block-number = 0
+
+        eip150-block-number = 0
+
+        eip155-block-number = 0
+
+        eip160-block-number = 0
+
+        eip161-block-number = 0
+
+        byzantium-block-number = 0
+
+        constantinople-block-number = 0
+
         istanbul-block-number = 0
+
+        atlantis-block-number = 0
+
+        agharta-block-number = 0
+
+        phoenix-block-number = 0
+
+        petersburg-block-number = 0
     }
   }
 
diff --git a/src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala b/src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala
index c03612b0fe..64909cdf15 100644
--- a/src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala
+++ b/src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala
@@ -17,7 +17,6 @@ import monix.eval.Task
 import monix.execution.Scheduler
 import org.bouncycastle.util.encoders.Hex
 import io.iohk.ethereum.jsonrpc.JsonMethodsImplicits._
-
 import io.iohk.ethereum.rlp.RLPList
 
 import scala.concurrent.duration._
@@ -74,7 +73,7 @@ object TestService {
       maxResults: BigInt
   )
 
-  case class StorageEntry(key: ByteString, value: ByteString)
+  case class StorageEntry(key: String, value: String)
 
   case class SetChainParamsRequest(chainParams: ChainParams)
   case class SetChainParamsResponse()
@@ -98,7 +97,7 @@ object TestService {
   case class AccountsInRangeResponse(addressMap: Map[ByteString, ByteString], nextKey: ByteString)
 
   case class StorageRangeRequest(parameters: StorageRangeParams)
-  case class StorageRangeResponse(complete: Boolean, storage: Map[ByteString, StorageEntry])
+  case class StorageRangeResponse(complete: Boolean, storage: Map[String, StorageEntry])
 
   case class GetLogHashRequest(transactionHash: ByteString)
   case class GetLogHashResponse(logHash: ByteString)
@@ -339,7 +338,12 @@ class TestService(
       Right(
         StorageRangeResponse(
           complete = true,
-          storage = Map(request.parameters.address -> StorageEntry(ByteString(""), ByteString("")))
+          storage = Map(
+            encodeAsHex(request.parameters.address).values -> StorageEntry(
+              encodeAsHex(request.parameters.begin).values,
+              encodeAsHex(storage).values
+            )
+          )
         )
       )
     )