status-im · agnxsh · Jan 19, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025
diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim
@@ -25,10 +25,10 @@ import
     blockchain_dag, blob_quarantine, block_quarantine, consensus_manager,
     attestation_pool, sync_committee_msg_pool, validator_change_pool,
     blockchain_list],
-  ./spec/datatypes/[base, altair],
+  ./spec/datatypes/[base, altair, fulu],
   ./spec/eth2_apis/dynamic_fee_recipients,
   ./spec/signatures_batch,
-  ./sync/[sync_manager, request_manager, sync_types],
+  ./sync/[sync_manager, request_manager, sync_types, validator_custody],
   ./validators/[
     action_tracker, message_router, validator_monitor, validator_pool,
     keystore_management],
@@ -96,6 +96,7 @@ type
     eventBus*: EventBus
     vcProcess*: Process
     requestManager*: RequestManager
+    validatorCustody*: ValidatorCustodyRef
     syncManager*: SyncManager[Peer, PeerId]
     backfiller*: SyncManager[Peer, PeerId]
     untrustedManager*: SyncManager[Peer, PeerId]

diff --git a/beacon_chain/consensus_object_pools/blob_quarantine.nim b/beacon_chain/consensus_object_pools/blob_quarantine.nim
@@ -76,9 +76,12 @@ type
 
   BlobQuarantine* =
     SidecarQuarantine[BlobSidecar, OnBlobSidecarCallback]
+
   ColumnQuarantine* =
     SidecarQuarantine[DataColumnSidecar, OnDataColumnSidecarCallback]
 
+  ColumnQuarantineRef* = ref ColumnQuarantine
+
 func isEmpty[A](holder: SidecarHolder[A]): bool =
   holder.kind == SidecarHolderKind.Empty
 

diff --git a/beacon_chain/consensus_object_pools/block_pools_types.nim b/beacon_chain/consensus_object_pools/block_pools_types.nim
@@ -131,6 +131,15 @@ type
 
     era*: EraDB
 
+    eaSlot*: Slot
+      ## Earliest available slot is the earliest slot at which the BN can
+      ## guarantee serving blocks with sidecars.
+
+    erSlot*: Slot
+      ## Earliest refilled slot is the earliest slot at which excess
+      ## DataColumnSidecar downloading finishes, if erSlot = GENESIS_SLOT
+      ## we can deduce that validator custody is inactive.
+
     validatorMonitor*: ref ValidatorMonitor
 
     forkBlocks*: HashSet[KeyedBlockRef]
@@ -291,6 +300,7 @@ type
   BlockData* = object
     blck*: ForkedSignedBeaconBlock
     blob*: Opt[BlobSidecars]
+    dataColumn*: Opt[DataColumnSidecars]
 
   OnBlockAdded*[T: ForkyTrustedSignedBeaconBlock] = proc(
     blckRef: BlockRef, blck: T, epochRef: EpochRef,
@@ -397,14 +407,7 @@ func horizon*(dag: ChainDAGRef): Slot =
     GENESIS_SLOT
 
 func earliestAvailableSlot*(dag: ChainDAGRef): Slot =
-  if dag.backfill.slot < dag.tail.slot and
-      dag.backfill.slot != GENESIS_SLOT:
-    # When the BN is backfilling, backfill slot is the earliest
-    # persisted block.
-    dag.backfill.slot
-  else:
-    # When the BN has backfilled, tail moves progressively.
-    dag.tail.slot
+  max(dag.eaSlot, dag.erSlot)
 
 template epoch*(e: EpochRef): Epoch = e.key.epoch
 

diff --git a/beacon_chain/consensus_object_pools/block_quarantine.nim b/beacon_chain/consensus_object_pools/block_quarantine.nim
@@ -166,7 +166,7 @@ func cleanupUnviable(quarantine: var Quarantine) =
       break # Cannot modify while for-looping
     quarantine.unviable.del(toDel)
 
-func removeUnviableOrphanTree(
+proc removeUnviableOrphanTree(
     quarantine: var Quarantine,
     toCheck: var seq[Eth2Digest],
     tbl: var OrderedTable[(Eth2Digest, ValidatorSig), ForkedSignedBeaconBlock]
@@ -192,13 +192,15 @@ func removeUnviableOrphanTree(
 
     for k in toRemove:
       tbl.del k
+      info "FOO9 in removeUnviableOrphans",
+        blockRoot = shortLog(k[0])
       quarantine.unviable[k[0]] = ()
 
     toRemove.setLen(0)
 
   checked
 
-func removeUnviableSidecarlessTree(
+proc removeUnviableSidecarlessTree(
     quarantine: var Quarantine,
     toCheck: var seq[Eth2Digest],
     tbl: var OrderedTable[Eth2Digest, ForkedSignedBeaconBlock]) =
@@ -218,11 +220,16 @@ func removeUnviableSidecarlessTree(
 
     for k in toRemove:
       tbl.del k
-      quarantine.unviable[k] = ()
+      info "FOOA in removeUnviableSidecarlessTree",
+        blockRoot = shortLog(k)
+      #quarantine.unviable[k] = ()
 
     toRemove.setLen(0)
 
-func addUnviable*(quarantine: var Quarantine, root: Eth2Digest) =
+# TODO revert to func when addUnviable logging gone
+proc addUnviable*(quarantine: var Quarantine, root: Eth2Digest) =
+  info "FOO8 in addUnviable", blockRoot = shortLog(root), st = getStackTrace()
+
   # Unviable - don't try to download again!
   quarantine.missing.del(root)
 
@@ -236,7 +243,8 @@ func addUnviable*(quarantine: var Quarantine, root: Eth2Digest) =
 
   quarantine.unviable[root] = ()
 
-func cleanupOrphans(quarantine: var Quarantine, finalizedSlot: Slot) =
+# TODO revert to func when addUnviable logging gone
+proc cleanupOrphans(quarantine: var Quarantine, finalizedSlot: Slot) =
   var toDel: seq[(Eth2Digest, ValidatorSig)]
 
   for k, v in quarantine.orphans:
@@ -247,7 +255,8 @@ func cleanupOrphans(quarantine: var Quarantine, finalizedSlot: Slot) =
     quarantine.addUnviable k[0]
     quarantine.orphans.del k
 
-func cleanupSidecarless(quarantine: var Quarantine, finalizedSlot: Slot) =
+# TODO revert to func when addUnviable logging gone
+proc cleanupSidecarless(quarantine: var Quarantine, finalizedSlot: Slot) =
   var toDel: seq[Eth2Digest]
 
   for k, v in quarantine.sidecarless:
@@ -265,7 +274,8 @@ func clearAfterReorg*(quarantine: var Quarantine) =
   quarantine.missing.reset()
   quarantine.orphans.reset()
 
-func pruneAfterFinalization*(
+# TODO revert to func when addUnviable logging gone
+proc pruneAfterFinalization*(
     quarantine: var Quarantine,
     epoch: Epoch,
     needsBackfill: bool
@@ -276,14 +286,14 @@ func pruneAfterFinalization*(
         # Because Quarantine could be used as temporary storage for blocks which
         # do not have sidecars yet, we should not prune blocks which are behind
         # `MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS` epoch. Otherwise we will not
-        # be able to backfill this blocks properly.
+        # be able to backfill these blocks properly.
         if epoch < quarantine.cfg.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS:
           Epoch(0)
         else:
           epoch - quarantine.cfg.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS
       else:
         epoch
-    slot = (startEpoch + 1).start_slot()
+    slot = startEpoch.start_slot()
 
   quarantine.cleanupSidecarless(slot)
 
@@ -422,6 +432,14 @@ func popColumnless*(
 ): Opt[ForkedSignedBeaconBlock] {.deprecated.} =
   quarantine.popSidecarless(root)
 
+func getColumnless*(
+    quarantine: var Quarantine,
+    root: Eth2Digest): Opt[ForkedSignedBeaconBlock] =
+  try:
+    Opt.some(quarantine.sidecarless[root])
+  except KeyError:
+    Opt.none(ForkedSignedBeaconBlock)
+
 func popBlobless*(
     quarantine: var Quarantine,
     root: Eth2Digest

diff --git a/beacon_chain/consensus_object_pools/blockchain_list.nim b/beacon_chain/consensus_object_pools/blockchain_list.nim
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2018-2024 Status Research & Development GmbH
+# Copyright (c) 2018-2025 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).

diff --git a/beacon_chain/el/el_manager.nim b/beacon_chain/el/el_manager.nim
@@ -772,7 +772,6 @@ proc sendGetBlobsV2*(
     return err()
 
   let deadline = sleepAsync(GETBLOBS_TIMEOUT)
-
   var bestIdx: Opt[int]
 
   while true:

diff --git a/beacon_chain/el/engine_api_conversions.nim b/beacon_chain/el/engine_api_conversions.nim
@@ -232,11 +232,11 @@ func asConsensusType*(
     # The `mapIt` calls below are necessary only because we use different distinct
     # types for KZG commitments and Blobs in the `web3` and the `deneb` spec types.
     # Both are defined as `array[N, byte]` under the hood.
-    blobsBundle: deneb.BlobsBundle(
+    blobsBundle: fulu.BlobsBundleV2(
       commitments: KzgCommitments.init(
         payload.blobsBundle.commitments.mapIt(
           kzg_abi.KzgCommitment(bytes: it.data))),
-      proofs: KzgProofs.init(
+      proofs: KzgProofsV2.init(
         payload.blobsBundle.proofs.mapIt(
           kzg_abi.KzgProof(bytes: it.data))),
       blobs: Blobs.init(