update quarantine and supernode behaviour

beacon_chain/consensus_object_pools/blob_quarantine.nim

@@ -484,15 +484,7 @@ func hasSidecars*[A: SomeDataColumnSidecar, B: OnDataColumnSidecarCallback](
   if isNil(node):
     return false
 
-  let
-    supernode = (len(quarantine.custodyColumns) == NUMBER_OF_COLUMNS)
-    columnsCount =
-      if supernode:
-        (NUMBER_OF_COLUMNS div 2 + 1)
-      else:
-        len(quarantine.custodyColumns)
-
-  if node[].value.count < columnsCount:
+  if node[].value.count < len(quarantine.custodyColumns):
     # Quarantine does not hold enough column sidecars.
     return false
   true
@@ -579,13 +571,8 @@ proc popSidecars*[A: SomeDataColumnSidecar, B: OnDataColumnSidecarCallback](
 
   let
     supernode = (len(quarantine.custodyColumns) == NUMBER_OF_COLUMNS)
-    columnsCount =
-      if supernode:
-        (NUMBER_OF_COLUMNS div 2 + 1)
-      else:
-        len(quarantine.custodyColumns)
 
-  if node[].value.count < columnsCount:
+  if node[].value.count < len(quarantine.custodyColumns):
     # Quarantine does not hold enough column sidecars.
     return Opt.none(seq[ref A])
 
@@ -597,18 +584,11 @@ proc popSidecars*[A: SomeDataColumnSidecar, B: OnDataColumnSidecarCallback](
   var sidecars: seq[ref A]
   if supernode:
     for sidecar in node[].value.sidecars:
-      # Supernode could have some of the columns not filled.
-      if not(sidecar.isEmpty()):
-        doAssert(sidecar.isLoaded(),
-          "Record should only have loaded values, but it is `" &
+      doAssert(not(sidecar.isEmpty()), "Record should not have empty values")
+      doAssert(sidecar.isLoaded(),
+        "Record should only have loaded values, but it is `" &
             $sidecar.kind & "`")
-        sidecars.add(sidecar.data)
-      if len(sidecars) >= (NUMBER_OF_COLUMNS div 2 + 1):
-        break
-
-    doAssert(len(sidecars) >= (NUMBER_OF_COLUMNS div 2 + 1),
-      "Incorrect amount of sidecars in record for supernode - " &
-        $len(sidecars))
+      sidecars.add(sidecar.data)
   else:
     for cindex in quarantine.custodyColumns:
       let index = quarantine.getIndex(cindex)
@@ -703,33 +683,22 @@ func fetchMissingSidecars*[A: SomeDataColumnSidecar, B: OnDataColumnSidecarCallb
 
   let
     supernode = (len(quarantine.custodyColumns) == NUMBER_OF_COLUMNS)
-    columnsCount =
-      if supernode:
-        (NUMBER_OF_COLUMNS div 2)
-      else:
-        len(quarantine.custodyColumns)
 
   if supernode:
     if isNil(node):
+      # We do not have any columns yet, so we push all columns peer could
+      # provide.
       for column in peerMap.items():
-        if len(res) > columnsCount:
-          # We don't need to request more than (NUMBER_OF_COLUMNS div 2)
-          # columns.
-          break
         res.incl(column)
     else:
-      if node[].value.count > columnsCount:
-        # We already have enough columns for reconstruction.
+      if node[].value.count == len(quarantine.custodyColumns):
+        # We already have all columns.
         return
           DataColumnsByRootIdentifier(
             block_root: blockRoot,
             indices: DataColumnIndices(default(seq[ColumnIndex])))
 
       for column in peerMap.items():
-        if node[].value.count + len(res) > columnsCount:
-          # We don't need to request more than (NUMBER_OF_COLUMNS div 2)
-          # columns.
-          break
         let index = quarantine.getIndex(column)
         if (index == -1) or node[].value.sidecars[index].isEmpty():
           res.incl(column)
@@ -770,7 +739,7 @@ func getMissingColumnsMap*[A: SomeDataColumnSidecar, B: OnDataColumnSidecarCallb
       for index in 0 ..< NUMBER_OF_COLUMNS:
         res.incl(ColumnIndex(index))
     else:
-      if len(node[].value.sidecars) > NUMBER_OF_COLUMNS div 2:
+      if node[].value.count >= NUMBER_OF_COLUMNS:
         return res
       for index in 0 ..< NUMBER_OF_COLUMNS:
         if node[].value.sidecars[index].isEmpty():

beacon_chain/el/el_getblobs_service.nim

@@ -73,16 +73,13 @@ proc attemptGetBlobs*(
               flat_proof)
             # Send notification to event stream
             # and add these columns to column quarantine
-            const MaxColsPerPut = (NUMBER_OF_COLUMNS div 2) + 1
             var batch =
-              newSeqOfCap[ref fulu.DataColumnSidecar](MaxColsPerPut)
+              newSeqOfCap[ref fulu.DataColumnSidecar](NUMBER_OF_COLUMNS)
 
             for col in recovered_columns:
               if col.index notin self.dataColumnQuarantine[].custodyColumns:
                 continue
               batch.add newClone(col)
-              if batch.len == MaxColsPerPut:
-                break
 
             if batch.len > 0:
               debug "Added data columns from EL blobpool to quarantine",

beacon_chain/spec/column_map.nim

@@ -106,6 +106,6 @@ func `$`*(a: ColumnMap): string =
   "[" & a.items().toSeq().mapIt($it).join(", ") & "]"
 
 func shortLog*(a: ColumnMap): string =
-  if len(a) > NUMBER_OF_COLUMNS div 2:
+  if len(a) == NUMBER_OF_COLUMNS:
     return "[supernode]"
   $a

tests/test_column_map.nim

@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2025 Status Research & Development GmbH
+# Copyright (c) 2025-2026 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -103,9 +103,9 @@ suite "ColumnMap test suite":
           vector[2]
 
   test "supernode test":
-    for max in ((NUMBER_OF_COLUMNS div 2) + 1) ..< NUMBER_OF_COLUMNS:
+    block:
       var columns: seq[ColumnIndex]
-      for i in 0 ..< max:
+      for i in 0 ..< NUMBER_OF_COLUMNS:
         columns.add(ColumnIndex(i))
       let map = ColumnMap.init(columns)
       check:

tests/test_quarantine.nim

@@ -1394,14 +1394,14 @@ suite "ColumnQuarantine data structure test suite " & preset():
       sidecars1 =
         block:
           var res: seq[ref fulu.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genFuluDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 1, proposer_index = 5)))
           res
       sidecars2 =
         block:
           var res: seq[ref fulu.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genFuluDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 1, proposer_index = 6)))
           res
@@ -1564,14 +1564,14 @@ suite "ColumnQuarantine data structure test suite " & preset():
       sidecars1 =
         block:
           var res: seq[ref fulu.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genFuluDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 1, proposer_index = 5)))
           res
       sidecars2 =
         block:
           var res: seq[ref fulu.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genFuluDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 2, proposer_index = 50)))
           res
@@ -1582,18 +1582,16 @@ suite "ColumnQuarantine data structure test suite " & preset():
       missing: DataColumnsByRootIdentifier
     ): bool =
       const ExpectedVectors = [
-        (@[63, 64, 65, 66, 95, 96, 97, 98], 0 .. 57),
-        (@[63, 64, 65, 66, 95, 96, 97], 58 .. 58),
-        (@[63, 64, 65, 66, 95, 96], 59 .. 59),
-        (@[63, 64, 65, 66, 95], 60 .. 60),
-        (@[63, 64, 65, 66], 61 .. 61),
-        (@[63, 64, 65], 62 .. 62),
-        (@[63, 64], 63 .. 63),
-        (@[64], 64 .. 64),
-        (@[], 65 .. 65)
+        (@[63, 64, 65, 66, 95, 96, 97, 98], 0 .. 63),
+        (@[64, 65, 66, 95, 96, 97, 98], 64 .. 64),
+        (@[65, 66, 95, 96, 97, 98], 65 .. 65),
+        (@[66, 95, 96, 97, 98], 66 .. 66),
+        (@[95, 96, 97, 98], 67 .. 95),
+        (@[96, 97, 98], 96 .. 96),
+        (@[97, 98], 97 .. 97),
+        (@[98], 98 .. 98),
+        (@[], 99 .. 127)
       ]
-
-      doAssert(index in 0 .. 65)
       for expect in ExpectedVectors:
         if index in expect[1]:
           if len(expect[0]) != len(missing.indices):
@@ -1606,7 +1604,7 @@ suite "ColumnQuarantine data structure test suite " & preset():
           return true
       false
 
-    for i in 0 ..< len(sidecars1) + 1:
+    for i in 0 ..< len(sidecars1):
       let
         missing1 = bq.fetchMissingSidecars(broot1)
         missing2 = bq.fetchMissingSidecars(broot2)
@@ -1619,12 +1617,7 @@ suite "ColumnQuarantine data structure test suite " & preset():
         compareSidecars(
           broot2,
           sidecars2.toOpenArray(i, len(sidecars2) - 1), missing2) == true
-        checkSupernodeExpected(
-          broot1,
-          i, missing3) == true
-
-      if i >= len(sidecars1):
-        break
+        checkSupernodeExpected(broot1, i, missing3) == true
 
       bq.put(broot1, sidecars1[i])
       bq.put(broot2, sidecars2[i])
@@ -2571,12 +2564,9 @@ suite "ColumnQuarantine data structure test suite " & preset():
               finish = len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           of "supernode":
-            # In case of super node quarantine returns
-            # NUMBER_OF_COLUMNS div 2 + 1 columns which is enough for
-            # rebuild.
             let
               start = 0
-              finish = len(custodyColumns) div 2 + 1
+              finish = len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           else:
             raiseAssert "inaccessible"
@@ -2588,12 +2578,9 @@ suite "ColumnQuarantine data structure test suite " & preset():
               finish = start + len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           of "supernode":
-            # In case of super node quarantine returns
-            # NUMBER_OF_COLUMNS div 2 + 1 columns which is enough for
-            # rebuild.
             let
               start = len(custodyColumns)
-              finish = start + len(custodyColumns) div 2 + 1
+              finish = start + len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           else:
             raiseAssert "inaccessible"
@@ -3092,14 +3079,14 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
       sidecars1 =
         block:
           var res: seq[ref gloas.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genGloasDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 1)))
           res
       sidecars2 =
         block:
           var res: seq[ref gloas.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genGloasDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 1)))
           res
@@ -3262,14 +3249,14 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
       sidecars1 =
         block:
           var res: seq[ref gloas.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genGloasDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 1)))
           res
       sidecars2 =
         block:
           var res: seq[ref gloas.DataColumnSidecar]
-          for i in 0 ..< (len(custodyColumns) div 2 + 1):
+          for i in 0 ..< len(custodyColumns):
             res.add(newClone(genGloasDataColumnSidecar(
               index = int(custodyColumns[i]), slot = 2)))
           res
@@ -3280,18 +3267,17 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
       missing: DataColumnsByRootIdentifier
     ): bool =
       const ExpectedVectors = [
-        (@[63, 64, 65, 66, 95, 96, 97, 98], 0 .. 57),
-        (@[63, 64, 65, 66, 95, 96, 97], 58 .. 58),
-        (@[63, 64, 65, 66, 95, 96], 59 .. 59),
-        (@[63, 64, 65, 66, 95], 60 .. 60),
-        (@[63, 64, 65, 66], 61 .. 61),
-        (@[63, 64, 65], 62 .. 62),
-        (@[63, 64], 63 .. 63),
-        (@[64], 64 .. 64),
-        (@[], 65 .. 65)
+        (@[63, 64, 65, 66, 95, 96, 97, 98], 0 .. 63),
+        (@[64, 65, 66, 95, 96, 97, 98], 64 .. 64),
+        (@[65, 66, 95, 96, 97, 98], 65 .. 65),
+        (@[66, 95, 96, 97, 98], 66 .. 66),
+        (@[95, 96, 97, 98], 67 .. 95),
+        (@[96, 97, 98], 96 .. 96),
+        (@[97, 98], 97 .. 97),
+        (@[98], 98 .. 98),
+        (@[], 99 .. 127)
       ]
 
-      doAssert(index in 0 .. 65)
       for expect in ExpectedVectors:
         if index in expect[1]:
           if len(expect[0]) != len(missing.indices):
@@ -3304,7 +3290,7 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
           return true
       false
 
-    for i in 0 ..< len(sidecars1) + 1:
+    for i in 0 ..< len(sidecars1):
       let
         missing1 = bq.fetchMissingSidecars(broot1)
         missing2 = bq.fetchMissingSidecars(broot2)
@@ -3321,9 +3307,6 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
           broot1,
           i, missing3) == true
 
-      if i >= len(sidecars1):
-        break
-
       bq.put(broot1, sidecars1[i])
       bq.put(broot2, sidecars2[i])
 
@@ -4230,12 +4213,11 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
               finish = len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           of "supernode":
-            # In case of super node quarantine returns
-            # NUMBER_OF_COLUMNS div 2 + 1 columns which is enough for
-            # rebuild.
+            # In case of super node quarantine returns all
+            # NUMBER_OF_COLUMNS columns.
             let
               start = 0
-              finish = len(custodyColumns) div 2 + 1
+              finish = len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           else:
             raiseAssert "inaccessible"
@@ -4247,12 +4229,11 @@ suite "GloasColumnQuarantine data structure test suite " & preset():
               finish = start + len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           of "supernode":
-            # In case of super node quarantine returns
-            # NUMBER_OF_COLUMNS div 2 + 1 columns which is enough for
-            # rebuild.
+            # In case of super node quarantine returns all
+            # NUMBER_OF_COLUMNS columns.
             let
               start = len(custodyColumns)
-              finish = start + len(custodyColumns) div 2 + 1
+              finish = start + len(custodyColumns)
             sidecars.toOpenArray(start, finish - 1).mapIt(it.sidecar)
           else:
             raiseAssert "inaccessible"