Fix blobSchedule fallback (#3977)

jangko · web-flow · commit bd9eb5cb74a0 · 2026-02-13T05:19:24.000+07:00
* Fix blobSchedule fallback

Failing hive tests for bal-devnet-2 indicate that blobSchedule
should not fallback to forks without time activation field.

* Lint
diff --git a/execution_chain/common/chain_config.nim b/execution_chain/common/chain_config.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2021-2025 Status Research & Development GmbH
+# Copyright (c) 2021-2026 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -394,31 +394,16 @@ proc validateChainConfig(conf: ChainConfig): bool =
     if cur.time.isSome:
       lastTimeBasedFork = cur
 
-func numBPOForks(): int {.compileTime.} =
-  for x in Prague..HardFork.high:
-    if toLowerAscii($x).startsWith("bpo"):
-      inc result
-
-func getBPOForks(N: static[int]): array[N, HardFork] {.compileTime.} =
-  var i = 0
-  for x in Prague..HardFork.high:
-    if toLowerAscii($x).startsWith("bpo"):
-      result[i] = x
-      inc i
-
-func getRegularForks(N: static[int]): array[N, HardFork] {.compileTime.} =
-  var i = 0
-  for x in Prague..HardFork.high:
-    if not toLowerAscii($x).startsWith("bpo"):
-      result[i] = x
-      inc i
+macro blobScheduleActivation(conf: typed): untyped =
+  # Automated blob schedule parser generator
+  var res = nnkBracket.newTree
+  for fork in Cancun..HardFork.high:
+    let activationName = BlobScheduleTable[fork] & "Time"
+    let fieldIdent = newIdentNode(activationName)
+    res.add quote do:
+      `conf`.`fieldIdent`
 
-const
-  NumForksWithBlobSchedule = HardFork.high.int - Prague.int + 1 # minus Cancun, but cardinal + 1
-  NumBPOForks = numBPOForks()
-  NumRegularForks = NumForksWithBlobSchedule - NumBPOForks
-  BPOForks = getBPOForks(NumBPOForks)
-  RegularForks = getRegularForks(NumRegularForks)
+  res
 
 proc configureBlobSchedule(conf: ChainConfig) =
   if conf.blobSchedule[Cancun].isNone:
@@ -427,20 +412,19 @@ proc configureBlobSchedule(conf: ChainConfig) =
     if conf.blobSchedule[Cancun].value.baseFeeUpdateFraction == 0:
       conf.blobSchedule[Cancun].value.baseFeeUpdateFraction = 3_338_477'u64
 
-  template setBlobScheduleWithFallback(forks) =
-    var prevFork = Cancun
-    for fork in forks:
-      if conf.blobSchedule[fork].isNone:
-        conf.blobSchedule[fork] = conf.blobSchedule[prevFork]
-      if conf.blobSchedule[fork].value.baseFeeUpdateFraction == 0:
-        # Set fallback to Cancun's baseFeeUpdateFraction and prevent division by zero
-        warn "baseFeeUpdateFraction not set, fallback to Cancun's", fork=fork
-        conf.blobSchedule[fork].value.baseFeeUpdateFraction = 3_338_477'u64
+  let blobScheduleTime: array[Cancun..HardFork.high, Opt[EthTime]] = blobScheduleActivation(conf)
+
+  var prevFork = Cancun
+  for fork in Prague..HardFork.high:
+    if conf.blobSchedule[fork].isNone:
+      conf.blobSchedule[fork] = conf.blobSchedule[prevFork]
+    if conf.blobSchedule[fork].value.baseFeeUpdateFraction == 0:
+      # Set fallback to Cancun's baseFeeUpdateFraction and prevent division by zero
+      warn "baseFeeUpdateFraction not set, fallback to Cancun's", fork=fork
+      conf.blobSchedule[fork].value.baseFeeUpdateFraction = 3_338_477'u64
+    if blobScheduleTime[fork].isSome:
       prevFork = fork
 
-  setBlobScheduleWithFallback(RegularForks)
-  setBlobScheduleWithFallback(BPOForks)
-
 proc parseGenesis*(data: string): Genesis
      {.gcsafe.} =
   try:
diff --git a/tests/customgenesis/blobschedule_amsterdam_fallback.json b/tests/customgenesis/blobschedule_amsterdam_fallback.json
@@ -31,15 +31,16 @@
         "target": 9,
         "max": 12,
         "baseFeeUpdateFraction": 5008888
-      },      
+      },
+      "bpo2": {
+        "target": 10,
+        "max": 13,
+        "baseFeeUpdateFraction": 5009999
+      },
     },
     "depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
     "pragueTime": 0,
     "osakaTime": 1748362704,
     "bpo1Time": 1748461008,
-    "bpo2Time": 1748559312,
-    "bpo3Time": 1748657616,
-    "bpo4Time": 1748755920,
-    "bpo5Time": 1748872656
   }
 }
diff --git a/tests/customgenesis/blobschedule_cancun_osaka.json b/tests/customgenesis/blobschedule_cancun_osaka.json
@@ -13,6 +13,9 @@
     "muirGlacierBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
+    "cancunTime": 0,
+    "pragueTime": 0,
+    "osakaTime": 0,
     "blobSchedule": {
       "cancun": {
         "target": 3,
diff --git a/tests/customgenesis/blobschedule_cancun_prague.json b/tests/customgenesis/blobschedule_cancun_prague.json
@@ -13,6 +13,9 @@
     "muirGlacierBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
+    "cancunTime": 0,
+    "pragueTime": 0,
+    "osakaTime": 0,
     "blobSchedule": {
       "cancun": {
         "target": 3,
diff --git a/tests/customgenesis/blobschedule_nobasefee.json b/tests/customgenesis/blobschedule_nobasefee.json
@@ -13,6 +13,8 @@
     "muirGlacierBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
+    "cancunTime": 0,
+    "pragueTime": 0,
     "blobSchedule": {
       "cancun": {
         "target": 3,
diff --git a/tests/customgenesis/blobschedule_prague.json b/tests/customgenesis/blobschedule_prague.json
@@ -13,6 +13,8 @@
     "muirGlacierBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
+    "cancunTime": 0,
+    "pragueTime": 0,    
     "blobSchedule": {
       "prague": {
         "target": 6,
diff --git a/tests/test_genesis.nim b/tests/test_genesis.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2019-2025 Status Research & Development GmbH
+# Copyright (c) 2019-2026 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -174,7 +174,7 @@ proc customGenesisTest() =
       validateBlobSchedule(cg, Prague, 6, 9, 5007716)
       validateBlobSchedule(cg, Osaka, 6, 9, 5007716) # fallback to Prague
       validateBlobSchedule(cg, Bpo1, 9, 12, 5008888)
-      validateBlobSchedule(cg, Amsterdam, 6, 9, 5007716) # fallback to Osaka, not Bpo1
+      validateBlobSchedule(cg, Amsterdam, 9, 12, 5008888) # fallback to bpo1, not Bpo2
 
 
 proc genesisMain() =
