Merge pull request #651 from input-output-hk/etcm-41-istanbul-config

[ETCM-41] Add Istanbul fork configuration

Author: Michał Mrożek

src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainTestConfig.scala

@@ -19,6 +19,7 @@ trait BlockchainTestConfig extends BlockchainConfig {
   val eip161BlockNumber: BigInt = Long.MaxValue
   val byzantiumBlockNumber: BigInt = Long.MaxValue
   val constantinopleBlockNumber: BigInt = Long.MaxValue
+  val istanbulBlockNumber: BigInt = Long.MaxValue
   // unused
   override val maxCodeSize: Option[BigInt] = None
   override val difficultyBombPauseBlockNumber: BigInt = 3000000

src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala

@@ -32,6 +32,7 @@ class ECIP1017Test extends FlatSpec with Matchers {
       override val eip161BlockNumber: BigInt = Long.MaxValue
       override val byzantiumBlockNumber: BigInt = Long.MaxValue
       override val constantinopleBlockNumber: BigInt = Long.MaxValue
+      override val istanbulBlockNumber: BigInt = Long.MaxValue
       override val customGenesisFileOpt: Option[String] = None
       override val daoForkConfig: Option[DaoForkConfig] = None
       override val difficultyBombPauseBlockNumber: BigInt = Long.MaxValue

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -35,6 +35,7 @@ class ForksTest extends FlatSpec with Matchers {
       override val difficultyBombRemovalBlockNumber: BigInt = Long.MaxValue
       override val byzantiumBlockNumber: BigInt = Long.MaxValue
       override val constantinopleBlockNumber: BigInt = Long.MaxValue
+      override val istanbulBlockNumber: BigInt = Long.MaxValue
       override val accountStartNonce: UInt256 = UInt256.Zero
       override val daoForkConfig: Option[DaoForkConfig] = None
       override val gasTieBreaker: Boolean = false

src/main/resources/chains/base.conf

@@ -74,6 +74,10 @@
   # https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1716.md
   petersburg-block-number = "1000000000000000000"
 
+  # Istanbul fork block number (ETH only)
+  # https://eips.ethereum.org/EIPS/eip-1679
+  istanbul-block-number = "1000000000000000000"
+
   # DAO fork configuration (Ethereum HF/Classic split)
   # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
   dao {

src/main/resources/chains/eth.conf

@@ -41,6 +41,10 @@
   # https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1716.md
   petersburg-block-number = "7280000"
 
+  # Istanbul fork block number (ETH only)
+  # https://eips.ethereum.org/EIPS/eip-1679
+  istanbul-block-number = "9069000"
+
   monetary-policy {
 
     # Setting era-duration for eth and ropsten chain to big number is necessery to ensure

src/main/scala/io/iohk/ethereum/extvm/VMServer.scala

@@ -184,6 +184,7 @@ class VMServer(messageHandler: MessageHandler)
       eip161BlockNumber = conf.eip161BlockNumber,
       byzantiumBlockNumber = BigInt(4370000), //TODO include byzantium block number in protobuf
       constantinopleBlockNumber = BigInt(10000000), //TODO include constantinople block number in protobuf
+      istanbulBlockNumber = BigInt(10000000), //TODO include istanbul block number in protobuf
       maxCodeSize = if (conf.maxCodeSize.isEmpty) None else Some(bigintFromGByteString(conf.maxCodeSize)),
       accountStartNonce = conf.accountStartNonce,
       atlantisBlockNumber = BigInt(8772000),  //TODO include atlantis block number in protobuf

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

@@ -73,6 +73,7 @@ class TestService(
       override val eip161BlockNumber: BigInt = testLedgerWrapper.blockchainConfig.eip161BlockNumber
       override val byzantiumBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.byzantiumBlockNumber
       override val constantinopleBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.constantinopleBlockNumber
+      override val istanbulBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.istanbulBlockNumber
       override val maxCodeSize: Option[BigInt] = testLedgerWrapper.blockchainConfig.maxCodeSize
       override val difficultyBombPauseBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.difficultyBombPauseBlockNumber
       override val difficultyBombContinueBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.difficultyBombContinueBlockNumber

src/main/scala/io/iohk/ethereum/utils/Config.scala

@@ -348,6 +348,7 @@ trait BlockchainConfig {
   val eip161BlockNumber: BigInt
   val byzantiumBlockNumber: BigInt
   val constantinopleBlockNumber: BigInt
+  val istanbulBlockNumber: BigInt
   val maxCodeSize: Option[BigInt]
   val difficultyBombPauseBlockNumber: BigInt
   val difficultyBombContinueBlockNumber: BigInt
@@ -389,6 +390,7 @@ object BlockchainConfig {
       override val eip161BlockNumber: BigInt = BigInt(blockchainConfig.getString("eip161-block-number"))
       override val byzantiumBlockNumber: BigInt = BigInt(blockchainConfig.getString("byzantium-block-number"))
       override val constantinopleBlockNumber: BigInt = BigInt(blockchainConfig.getString("constantinople-block-number"))
+      override val istanbulBlockNumber: BigInt = BigInt(blockchainConfig.getString("istanbul-block-number"))
       override val maxCodeSize: Option[BigInt] = Try(BigInt(blockchainConfig.getString("max-code-size"))).toOption
       override val difficultyBombPauseBlockNumber: BigInt = BigInt(blockchainConfig.getString("difficulty-bomb-pause-block-number"))
       override val difficultyBombContinueBlockNumber: BigInt = BigInt(blockchainConfig.getString("difficulty-bomb-continue-block-number"))

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

@@ -3,23 +3,27 @@ package io.iohk.ethereum.vm
 import io.iohk.ethereum.domain.UInt256
 import io.iohk.ethereum.utils.BlockchainConfig
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EtcForks.{Agharta, Atlantis, BeforeAtlantis, EtcFork, Phoenix}
-import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.{BeforeByzantium, Byzantium, Constantinople, Petersburg}
+import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.{BeforeByzantium, Byzantium, Constantinople, Istanbul, Petersburg}
 
 /**
   * A subset of [[io.iohk.ethereum.utils.BlockchainConfig]] that is required for instantiating an [[EvmConfig]]
   * Note that `accountStartNonce` is required for a [[WorldStateProxy]] implementation that is used
   * by a given VM
   */
+// FIXME manage etc/eth forks in a more sophisticated way
 case class BlockchainConfigForEvm(
+  // ETH forks
   frontierBlockNumber: BigInt,
   homesteadBlockNumber: BigInt,
   eip150BlockNumber: BigInt,
   eip160BlockNumber: BigInt,
   eip161BlockNumber: BigInt,
   byzantiumBlockNumber: BigInt,
   constantinopleBlockNumber: BigInt,
+  istanbulBlockNumber: BigInt,
   maxCodeSize: Option[BigInt],
   accountStartNonce: UInt256,
+  // ETC forks
   atlantisBlockNumber: BigInt,
   aghartaBlockNumber: BigInt,
   petersburgBlockNumber: BigInt,
@@ -37,8 +41,8 @@ case class BlockchainConfigForEvm(
     case _ if blockNumber < byzantiumBlockNumber => BeforeByzantium
     case _ if blockNumber < constantinopleBlockNumber => Byzantium
     case _ if blockNumber < petersburgBlockNumber => Constantinople
-    case _ if blockNumber >= petersburgBlockNumber => Petersburg
-    // TODO add Istanbul
+    case _ if blockNumber < istanbulBlockNumber => Petersburg
+    case _ if blockNumber >= istanbulBlockNumber => Istanbul
   }
 }
 
@@ -65,6 +69,7 @@ object BlockchainConfigForEvm {
       eip161BlockNumber = eip161BlockNumber,
       byzantiumBlockNumber = byzantiumBlockNumber,
       constantinopleBlockNumber = constantinopleBlockNumber,
+      istanbulBlockNumber = istanbulBlockNumber,
       maxCodeSize = maxCodeSize,
       accountStartNonce = accountStartNonce,
       atlantisBlockNumber = atlantisBlockNumber,

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

@@ -36,6 +36,7 @@ object EvmConfig {
       blockchainConfig.eip161BlockNumber -> PostEIP161ConfigBuilder,
       blockchainConfig.byzantiumBlockNumber -> ByzantiumConfigBuilder,
       blockchainConfig.constantinopleBlockNumber -> ConstantinopleConfigBuilder,
+      blockchainConfig.istanbulBlockNumber -> IstanbulConfigBuilder,
       blockchainConfig.atlantisBlockNumber -> AtlantisConfigBuilder,
       blockchainConfig.aghartaBlockNumber -> AghartaConfigBuilder,
       blockchainConfig.petersburgBlockNumber -> PetersburgConfigBuilder,
@@ -99,6 +100,8 @@ object EvmConfig {
 
   val PetersburgConfigBuilder: EvmConfigBuilder = config => ConstantinopleConfigBuilder(config)
 
+  val IstanbulConfigBuilder: EvmConfigBuilder = config => PhoenixConfigBuilder(config)
+
   // Ethereum classic forks only
   val AtlantisConfigBuilder: EvmConfigBuilder = config => PostEIP160ConfigBuilder(config).copy(
     feeSchedule = new FeeSchedule.AtlantisFeeSchedule,

src/test/scala/io/iohk/ethereum/consensus/BlockGeneratorSpec.scala

@@ -150,6 +150,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
       override val eip106BlockNumber: BigInt = Long.MaxValue
       override val byzantiumBlockNumber: BigInt = Long.MaxValue
       override val constantinopleBlockNumber: BigInt = Long.MaxValue
+      override val istanbulBlockNumber: BigInt = Long.MaxValue
       override val chainId: Byte = 0x3d.toByte
       override val networkId: Int = 1
       override val customGenesisFileOpt: Option[String] = Some("test-genesis.json")
@@ -321,6 +322,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
       override val eip106BlockNumber: BigInt = Long.MaxValue
       override val byzantiumBlockNumber: BigInt = Long.MaxValue
       override val constantinopleBlockNumber: BigInt = Long.MaxValue
+      override val istanbulBlockNumber: BigInt = Long.MaxValue
       override val chainId: Byte = 0x3d.toByte
       override val customGenesisFileOpt: Option[String] = Some("test-genesis.json")
       override val monetaryPolicyConfig: MonetaryPolicyConfig =

src/test/scala/io/iohk/ethereum/consensus/validators/BlockHeaderValidatorSpec.scala

@@ -358,7 +358,8 @@ class BlockHeaderValidatorSpec
       override val difficultyBombContinueBlockNumber: BigInt = 5000000
       override val difficultyBombRemovalBlockNumber: BigInt = 5900000
       override val byzantiumBlockNumber: BigInt = 4370000
-      override val constantinopleBlockNumber: BigInt = 10000000  //todo
+      override val constantinopleBlockNumber: BigInt = 7280000
+      override val istanbulBlockNumber: BigInt = 9069000
 
       override val daoForkConfig: Option[DaoForkConfig] = Some(new DaoForkConfig {
         override val blockExtraData: Option[ByteString] = if(supportsDaoFork) Some(ProDaoForkBlock.header.extraData) else None

src/test/scala/io/iohk/ethereum/extvm/VMClientSpec.scala

@@ -173,6 +173,7 @@ class VMClientSpec extends FlatSpec with Matchers with MockFactory {
       eip161BlockNumber = 0,
       byzantiumBlockNumber = 0,
       constantinopleBlockNumber = 0,
+      istanbulBlockNumber = 0,
       maxCodeSize = None,
       accountStartNonce = 0,
       atlantisBlockNumber = 0,

src/test/scala/io/iohk/ethereum/jsonrpc/EthServiceSpec.scala

@@ -884,6 +884,7 @@ class EthServiceSpec extends FlatSpec with Matchers with ScalaFutures with MockF
       override val eip106BlockNumber: BigInt = 0
       override val byzantiumBlockNumber: BigInt = 0
       override val constantinopleBlockNumber: BigInt = 0
+      override val istanbulBlockNumber: BigInt = 0
       override val difficultyBombPauseBlockNumber: BigInt = 0
       override val difficultyBombContinueBlockNumber: BigInt = 0
       override val difficultyBombRemovalBlockNumber: BigInt = 0

src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala

@@ -431,6 +431,7 @@ class PersonalServiceSpec extends FlatSpec with Matchers with MockFactory with S
       override val eip106BlockNumber: BigInt = 0
       override val byzantiumBlockNumber: BigInt = 0
       override val constantinopleBlockNumber: BigInt = 0
+      override val istanbulBlockNumber: BigInt = 0
       override val difficultyBombPauseBlockNumber: BigInt = 0
       override val difficultyBombContinueBlockNumber: BigInt = 0
       override val difficultyBombRemovalBlockNumber: BigInt = Long.MaxValue

src/test/scala/io/iohk/ethereum/ledger/LedgerTestSetup.scala

@@ -201,6 +201,7 @@ trait DaoForkTestSetup extends TestSetup with MockFactory {
     override val eip150BlockNumber: BigInt = blockchainConfig.eip150BlockNumber
     override val byzantiumBlockNumber: BigInt = blockchainConfig.byzantiumBlockNumber
     override val constantinopleBlockNumber: BigInt = blockchainConfig.constantinopleBlockNumber
+    override val istanbulBlockNumber: BigInt = blockchainConfig.istanbulBlockNumber
     override val chainId: Byte = 0x01.toByte
     override  val networkId: Int = 1
     override val difficultyBombContinueBlockNumber: BigInt = blockchainConfig.difficultyBombContinueBlockNumber

src/test/scala/io/iohk/ethereum/ledger/StxLedgerSpec.scala

@@ -114,6 +114,7 @@ trait ScenarioSetup extends EphemBlockchainTestSetup {
     override val eip106BlockNumber: BigInt = 0
     override val byzantiumBlockNumber: BigInt = 0
     override val constantinopleBlockNumber: BigInt = 0
+    override val istanbulBlockNumber: BigInt = 0
     override val difficultyBombPauseBlockNumber: BigInt = 0
     override val difficultyBombContinueBlockNumber: BigInt = 0
     override val difficultyBombRemovalBlockNumber: BigInt = Long.MaxValue

src/test/scala/io/iohk/ethereum/network/handshaker/EtcHandshakerSpec.scala

@@ -184,6 +184,7 @@ class EtcHandshakerSpec extends FlatSpec with Matchers  {
       override val eip106BlockNumber: BigInt = 0
       override val byzantiumBlockNumber: BigInt = 0
       override val constantinopleBlockNumber: BigInt = 0
+      override val istanbulBlockNumber: BigInt = 0
       override val difficultyBombPauseBlockNumber: BigInt = 0
       override val difficultyBombContinueBlockNumber: BigInt = 0
       override val difficultyBombRemovalBlockNumber: BigInt = Long.MaxValue

src/test/scala/io/iohk/ethereum/vm/Fixtures.scala

@@ -5,6 +5,7 @@ object Fixtures {
   val ConstantinopleBlockNumber = 200
   val PetersburgBlockNumber = 400
   val PhoenixBlockNumber = 600
+  val IstanbulBlockNumber = 600
 
   val blockchainConfig = BlockchainConfigForEvm(
     // block numbers are irrelevant
@@ -15,6 +16,7 @@ object Fixtures {
     eip161BlockNumber = 0,
     byzantiumBlockNumber = 0,
     constantinopleBlockNumber = ConstantinopleBlockNumber,
+    istanbulBlockNumber = IstanbulBlockNumber,
     maxCodeSize = None,
     accountStartNonce = 0,
     atlantisBlockNumber = 0,

src/test/scala/io/iohk/ethereum/vm/VMSpec.scala

@@ -153,6 +153,7 @@ class VMSpec extends WordSpec with PropertyChecks with Matchers {
       eip161BlockNumber = Long.MaxValue,
       byzantiumBlockNumber = Long.MaxValue,
       constantinopleBlockNumber = Long.MaxValue,
+      istanbulBlockNumber = Long.MaxValue,
       maxCodeSize = Some(16),
       accountStartNonce = 0,
       atlantisBlockNumber = Long.MaxValue,