[ETCM-856] fix fork block number handling in tests

Author: Aurélien Richez

src/main/resources/conf/testmode.conf

@@ -48,7 +48,11 @@ mantis {
     }
   }
 
-  network.rpc {
-    apis = "eth,web3,net,personal,mantis,test,iele,debug,qa,checkpointing"
+  network {
+    rpc {
+      apis = "eth,web3,net,personal,mantis,test,iele,debug,qa,checkpointing"
+    }
+    automatic-port-forwarding = false
   }
+
 }

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

@@ -89,16 +89,16 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
           constantinopleForkBlock <- optionalQuantity(blockchainParamsJson \ "constantinopleForkBlock")
           istanbulForkBlock <- optionalQuantity(blockchainParamsJson \ "istanbulForkBlock")
         } yield BlockchainParams(
-          eIP150ForkBlock.getOrElse(0),
-          eIP158ForkBlock.getOrElse(0),
-          accountStartNonce.getOrElse(0),
-          allowFutureBlocks,
-          blockReward.getOrElse(0),
-          byzantiumForkBlock.getOrElse(0),
-          homesteadForkBlock.getOrElse(0),
-          0,
-          constantinopleForkBlock.getOrElse(0),
-          istanbulForkBlock.getOrElse(0)
+          EIP150ForkBlock = eIP150ForkBlock,
+          EIP158ForkBlock = eIP158ForkBlock,
+          accountStartNonce = accountStartNonce.getOrElse(0),
+          allowFutureBlocks = allowFutureBlocks,
+          blockReward = blockReward.getOrElse(0),
+          byzantiumForkBlock = byzantiumForkBlock,
+          homesteadForkBlock = homesteadForkBlock,
+          maximumExtraDataSize = 0,
+          constantinopleForkBlock = constantinopleForkBlock,
+          istanbulForkBlock = istanbulForkBlock
         )
       }
 

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

@@ -35,16 +35,16 @@ object TestService {
       mixHash: ByteString
   )
   case class BlockchainParams(
-      EIP150ForkBlock: BigInt,
-      EIP158ForkBlock: BigInt,
+      EIP150ForkBlock: Option[BigInt],
+      EIP158ForkBlock: Option[BigInt],
       accountStartNonce: BigInt,
       allowFutureBlocks: Boolean,
       blockReward: BigInt,
-      byzantiumForkBlock: BigInt,
-      homesteadForkBlock: BigInt,
+      byzantiumForkBlock: Option[BigInt],
+      homesteadForkBlock: Option[BigInt],
       maximumExtraDataSize: BigInt,
-      constantinopleForkBlock: BigInt,
-      istanbulForkBlock: BigInt
+      constantinopleForkBlock: Option[BigInt],
+      istanbulForkBlock: Option[BigInt]
   )
 
   case class ChainParams(
@@ -155,19 +155,44 @@ class TestService(
     // load the new genesis
     val genesisDataLoader = new GenesisDataLoader(blockchain, newBlockchainConfig)
     genesisDataLoader.loadGenesisData(genesisData)
+
     //save account codes to world state
     storeGenesisAccountCodes(genesisData.alloc)
     storeGenesisAccountStorageData(genesisData.alloc)
 
     // update test ledger with new config
     testLedgerWrapper.blockchainConfig = newBlockchainConfig
+    consensus.blockchainConfig = newBlockchainConfig
 
     accountAddresses = genesisData.alloc.keys.toList
     accountRangeOffset = 0
 
     SetChainParamsResponse().rightNow
   }
 
+  private def buildNewConfig(blockchainParams: BlockchainParams) = {
+    val byzantiumBlockNumber: BigInt = blockchainParams.byzantiumForkBlock.getOrElse(Int.MaxValue)
+    val istanbulForkBlockNumber: BigInt = blockchainParams.istanbulForkBlock.getOrElse(Int.MaxValue)
+
+    // For block number which are not specified by retesteth, we try to align the number to another fork
+    testLedgerWrapper.blockchainConfig.copy(
+      homesteadBlockNumber = blockchainParams.homesteadForkBlock.getOrElse(Int.MaxValue),
+      eip150BlockNumber = blockchainParams.EIP150ForkBlock.getOrElse(Int.MaxValue),
+      eip160BlockNumber = byzantiumBlockNumber,
+      eip161BlockNumber = byzantiumBlockNumber,
+      byzantiumBlockNumber = byzantiumBlockNumber,
+      constantinopleBlockNumber = blockchainParams.constantinopleForkBlock.getOrElse(Int.MaxValue),
+      petersburgBlockNumber = istanbulForkBlockNumber,
+      aghartaBlockNumber = istanbulForkBlockNumber,
+      istanbulBlockNumber = istanbulForkBlockNumber,
+      atlantisBlockNumber = istanbulForkBlockNumber,
+      phoenixBlockNumber = istanbulForkBlockNumber,
+      accountStartNonce = UInt256(blockchainParams.accountStartNonce),
+      networkId = 1,
+      bootstrapNodes = Set()
+    )
+  }
+
   private def storeGenesisAccountCodes(accounts: Map[String, GenesisAccount]): Unit =
     accounts
       .collect { case (_, GenesisAccount(_, _, Some(code), _, _)) => code }

src/main/scala/io/iohk/ethereum/testmode/TestmodeConsensus.scala

@@ -20,7 +20,7 @@ import io.iohk.ethereum.consensus.pow.validators.ValidatorsExecutor
 class TestmodeConsensus(
     override val vm: VMImpl,
     blockchain: BlockchainImpl,
-    blockchainConfig: BlockchainConfig,
+    var blockchainConfig: BlockchainConfig,
     consensusConfig: ConsensusConfig,
     override val difficultyCalculator: DifficultyCalculator,
     var blockTimestamp: Long = 0
@@ -68,14 +68,14 @@ class TestmodeConsensus(
 
   override def validators: Validators = ValidatorsExecutor.apply(blockchainConfig, Protocol.MockedPow)
 
-  override val blockPreparator: BlockPreparator = new BlockPreparator(
+  override def blockPreparator: BlockPreparator = new BlockPreparator(
     vm = vm,
     signedTxValidator = validators.signedTransactionValidator,
     blockchain = blockchain,
     blockchainConfig = blockchainConfig
   )
 
-  override val blockGenerator =
+  override def blockGenerator =
     new NoOmmersBlockGenerator(
       blockchain,
       blockchainConfig,