[ETCM-1015] Add ecip1103 to ForkBlockNumbers

Author: lukasz-golebiewski

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

@@ -50,7 +50,8 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
         ecip1098BlockNumber = Long.MaxValue,
         ecip1097BlockNumber = Long.MaxValue,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue
       ),
       customGenesisFileOpt = None,
       customGenesisJsonOpt = None,

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

@@ -43,7 +43,8 @@ class ForksTest extends AnyFlatSpec with Matchers {
         ecip1098BlockNumber = Long.MaxValue,
         ecip1097BlockNumber = Long.MaxValue,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue,
       ),
       chainId = 0x3d.toByte,
       monetaryPolicyConfig = MonetaryPolicyConfig(5000000, 0.2, 5000000000000000000L, 3000000000000000000L),

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

@@ -209,35 +209,37 @@ class TestService(
     SetChainParamsResponse().rightNow
   }
 
-  val neverOccuringBlock: Int = Int.MaxValue
+  val neverOccurringBlock: Int = Int.MaxValue
+
   private def buildNewConfig(blockchainParams: BlockchainParams) = {
-    val byzantiumBlockNumber: BigInt = blockchainParams.byzantiumForkBlock.getOrElse(neverOccuringBlock)
-    val istanbulForkBlockNumber: BigInt = blockchainParams.istanbulForkBlock.getOrElse(neverOccuringBlock)
+    val byzantiumBlockNumber: BigInt = blockchainParams.byzantiumForkBlock.getOrElse(neverOccurringBlock)
+    val istanbulForkBlockNumber: BigInt = blockchainParams.istanbulForkBlock.getOrElse(neverOccurringBlock)
 
     // For block number which are not specified by retesteth, we try to align the number to another fork
     currentConfig.copy(
       forkBlockNumbers = ForkBlockNumbers(
         frontierBlockNumber = 0,
-        homesteadBlockNumber = blockchainParams.homesteadForkBlock.getOrElse(neverOccuringBlock),
-        eip106BlockNumber = neverOccuringBlock,
-        eip150BlockNumber = blockchainParams.EIP150ForkBlock.getOrElse(neverOccuringBlock),
+        homesteadBlockNumber = blockchainParams.homesteadForkBlock.getOrElse(neverOccurringBlock),
+        eip106BlockNumber = neverOccurringBlock,
+        eip150BlockNumber = blockchainParams.EIP150ForkBlock.getOrElse(neverOccurringBlock),
         eip155BlockNumber = byzantiumBlockNumber,
         eip160BlockNumber = byzantiumBlockNumber,
         eip161BlockNumber = byzantiumBlockNumber,
-        difficultyBombPauseBlockNumber = neverOccuringBlock,
-        difficultyBombContinueBlockNumber = neverOccuringBlock,
-        difficultyBombRemovalBlockNumber = neverOccuringBlock,
+        difficultyBombPauseBlockNumber = neverOccurringBlock,
+        difficultyBombContinueBlockNumber = neverOccurringBlock,
+        difficultyBombRemovalBlockNumber = neverOccurringBlock,
         byzantiumBlockNumber = byzantiumBlockNumber,
         ecip1049BlockNumber = None,
-        ecip1097BlockNumber = neverOccuringBlock,
-        ecip1098BlockNumber = neverOccuringBlock,
-        constantinopleBlockNumber = blockchainParams.constantinopleForkBlock.getOrElse(neverOccuringBlock),
+        ecip1097BlockNumber = neverOccurringBlock,
+        ecip1098BlockNumber = neverOccurringBlock,
+        constantinopleBlockNumber = blockchainParams.constantinopleForkBlock.getOrElse(neverOccurringBlock),
         petersburgBlockNumber = istanbulForkBlockNumber,
         aghartaBlockNumber = istanbulForkBlockNumber,
         istanbulBlockNumber = istanbulForkBlockNumber,
         atlantisBlockNumber = istanbulForkBlockNumber,
         phoenixBlockNumber = istanbulForkBlockNumber,
-        ecip1099BlockNumber = neverOccuringBlock
+        ecip1099BlockNumber = neverOccurringBlock,
+        ecip1103BlockNumber = neverOccurringBlock
       ),
       accountStartNonce = UInt256(blockchainParams.accountStartNonce),
       networkId = 1,

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

@@ -59,16 +59,17 @@ case class ForkBlockNumbers(
     ecip1098BlockNumber: BigInt,
     ecip1097BlockNumber: BigInt,
     ecip1049BlockNumber: Option[BigInt],
-    ecip1099BlockNumber: BigInt
+    ecip1099BlockNumber: BigInt,
+    ecip1103BlockNumber: BigInt
 ) {
   def all: List[BigInt] = this.productIterator.toList.flatMap {
     case i: BigInt => Some(i)
     case i: Option[_] =>
       i.flatMap {
         case n if n.isInstanceOf[BigInt] => Some(n.asInstanceOf[BigInt])
-        case n                           => None
+        case _                           => None
       }
-    case default => None
+    case _ => None
   }
 }
 
@@ -139,6 +140,8 @@ object BlockchainConfig {
     val allowedMinersPublicKeys = readPubKeySet(blockchainConfig, "allowed-miners")
 
     val ecip1099BlockNumber: BigInt = BigInt(blockchainConfig.getString("ecip1099-block-number"))
+    val ecip1103BlockNumber: BigInt = BigInt(blockchainConfig.getString("ecip1103-block-number"))
+
     val capabilities: List[Capability] =
       blockchainConfig.getStringList("capabilities").asScala.toList.map(Capability.parseUnsafe)
 
@@ -165,7 +168,8 @@ object BlockchainConfig {
         ecip1098BlockNumber = ecip1098BlockNumber,
         ecip1097BlockNumber = ecip1097BlockNumber,
         ecip1049BlockNumber = ecip1049BlockNumber,
-        ecip1099BlockNumber = ecip1099BlockNumber
+        ecip1099BlockNumber = ecip1099BlockNumber,
+        ecip1103BlockNumber = ecip1103BlockNumber
       ),
       treasuryAddress = treasuryAddress,
       maxCodeSize = maxCodeSize,

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

@@ -245,7 +245,8 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
         ecip1098BlockNumber = Long.MaxValue,
         ecip1097BlockNumber = Long.MaxValue,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue
       )
     )
 
@@ -314,7 +315,8 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
         ecip1098BlockNumber = Long.MaxValue,
         ecip1097BlockNumber = Long.MaxValue,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue
       ),
       chainId = 0x3d.toByte,
       networkId = 1,
@@ -697,7 +699,8 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
         ecip1098BlockNumber = Long.MaxValue,
         ecip1097BlockNumber = Long.MaxValue,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue
       ),
       chainId = 0x3d.toByte,
       networkId = 1,

src/test/scala/io/iohk/ethereum/consensus/pow/validators/EthashBlockHeaderValidatorSpec.scala

@@ -405,7 +405,8 @@ class EthashBlockHeaderValidatorSpec
         ecip1098BlockNumber = Long.MaxValue,
         ecip1097BlockNumber = Long.MaxValue,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue
       ),
       daoForkConfig = Some(new DaoForkConfig {
         override val blockExtraData: Option[ByteString] =

src/test/scala/io/iohk/ethereum/consensus/pow/validators/RestrictedEthashBlockHeaderValidatorSpec.scala

@@ -96,7 +96,8 @@ class RestrictedEthashBlockHeaderValidatorSpec
           ecip1098BlockNumber = Long.MaxValue,
           ecip1097BlockNumber = Long.MaxValue,
           ecip1099BlockNumber = Long.MaxValue,
-          ecip1049BlockNumber = None
+          ecip1049BlockNumber = None,
+          ecip1103BlockNumber = Long.MaxValue
         ),
         daoForkConfig = None,
         // unused

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

@@ -435,7 +435,8 @@ class PersonalServiceSpec
         ecip1098BlockNumber = 0,
         ecip1097BlockNumber = 0,
         ecip1099BlockNumber = Long.MaxValue,
-        ecip1049BlockNumber = None
+        ecip1049BlockNumber = None,
+        ecip1103BlockNumber = Long.MaxValue,
       ),
       customGenesisFileOpt = None,
       customGenesisJsonOpt = None,

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

@@ -142,7 +142,8 @@ trait ScenarioSetup extends EphemBlockchainTestSetup {
       ecip1098BlockNumber = 0,
       ecip1097BlockNumber = 0,
       ecip1099BlockNumber = Long.MaxValue,
-      ecip1049BlockNumber = None
+      ecip1049BlockNumber = None,
+      ecip1103BlockNumber = Long.MaxValue
     ),
     chainId = 0x03.toByte,
     networkId = 1,