Merge branch 'unstable' into column-syncer

agnxsh · web-flow · commit 00c22d0c1f80 · 2025-03-31T16:25:46.000+05:30
diff --git a/AllTests-mainnet.md b/AllTests-mainnet.md
@@ -11,6 +11,7 @@ AllTests-mainnet
 + Attestations with disjoint comittee bits and equal data into single on-chain aggregate [Pr OK
 + Can add and retrieve simple electra attestations [Preset: mainnet]                         OK
 + Working with electra aggregates [Preset: mainnet]                                          OK
++ simple add and get with electra nonzero committee [Preset: mainnet]                        OK
 ```
 ## Attestation pool processing [Preset: mainnet]
 ```diff
diff --git a/beacon_chain/conf.nim b/beacon_chain/conf.nim
@@ -576,7 +576,7 @@ type
         name: "discv5" .}: bool
 
       dumpEnabled* {.
-        desc: "Write SSZ dumps of blocks, attestations and states to data dir"
+        desc: "Write SSZ dumps of blocks and states to data dir"
         defaultValue: false
         name: "dump" .}: bool
 
diff --git a/beacon_chain/consensus_object_pools/attestation_pool.nim b/beacon_chain/consensus_object_pools/attestation_pool.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).
@@ -8,7 +8,6 @@
 {.push raises: [].}
 
 import
-  std/algorithm,
   # Status libraries
   metrics,
   chronicles, stew/byteutils,
@@ -19,6 +18,7 @@ import
   ../fork_choice/fork_choice,
   ../beacon_clock
 
+from std/algorithm import sort
 from std/sequtils import keepItIf, maxIndex
 
 export blockchain_dag, fork_choice
@@ -66,6 +66,10 @@ type
     ## voted on different states - this map keeps track of each vote keyed by
     ## getAttestationCandidateKey()
 
+  CandidateIdxType {.pure.} = enum
+    phase0Idx
+    electraIdx
+
   AttestationPool* = object
     ## The attestation pool keeps track of all attestations that potentially
     ## could be added to a block during block production.
@@ -198,11 +202,12 @@ proc addForkChoiceVotes(
       # hopefully the fork choice will heal itself over time.
       error "Couldn't add attestation to fork choice, bug?", err = v.error()
 
-func candidateIdx(pool: AttestationPool, slot: Slot,
-  isElectra: bool = false): Opt[int] =
+func candidateIdx(
+    pool: AttestationPool, slot: Slot, candidateIdxType: CandidateIdxType):
+    Opt[int] =
   static: doAssert pool.phase0Candidates.len == pool.electraCandidates.len
 
-  let poolLength = if isElectra:
+  let poolLength = if candidateIdxtype == CandidateIdxType.electraIdx:
     pool.electraCandidates.lenu64 else: pool.phase0Candidates.lenu64
 
   if slot >= pool.startingSlot and
@@ -413,6 +418,11 @@ proc addAttestation(
 
   true
 
+func getAttestationCandidateKey(
+    attestationDataRoot: Eth2Digest, committee_index: CommitteeIndex):
+    Eth2Digest =
+  hash_tree_root([attestationDataRoot, hash_tree_root(committee_index.uint64)])
+
 func getAttestationCandidateKey(
     data: AttestationData,
     committee_index: Opt[CommitteeIndex]): Eth2Digest =
@@ -424,13 +434,7 @@ func getAttestationCandidateKey(
     # i.e. no committees selected, so it can't be an actual Electra attestation
     hash_tree_root(data)
   else:
-    hash_tree_root([hash_tree_root(data),
-                    hash_tree_root(committee_index.get.uint64)])
-
-func getAttestationCandidateKey(
-    attestationDataRoot: Eth2Digest, committee_index: CommitteeIndex):
-    Eth2Digest =
-  hash_tree_root([attestationDataRoot, hash_tree_root(committee_index.uint64)])
+    getAttestationCandidateKey(hash_tree_root(data), committee_index.get)
 
 proc addAttestation*(
     pool: var AttestationPool,
@@ -450,7 +454,14 @@ proc addAttestation*(
 
   updateCurrent(pool, wallTime.slotOrZero)
 
-  let candidateIdx = pool.candidateIdx(attestation.data.slot)
+  when kind(typeof(attestation)) == ConsensusFork.Electra:
+    let candidateIdx = pool.candidateIdx(
+      attestation.data.slot, CandidateIdxType.electraIdx)
+  elif kind(typeof(attestation)) == ConsensusFork.Phase0:
+    let candidateIdx = pool.candidateIdx(
+      attestation.data.slot, CandidateIdxType.phase0Idx)
+  else:
+    static: doAssert false
   if candidateIdx.isNone:
     debug "Skipping old attestation for block production",
       startingSlot = pool.startingSlot
@@ -464,14 +475,20 @@ proc addAttestation*(
   #      creating an unnecessary AttestationEntry on the hot path and avoiding
   #      multiple lookups
   template addAttToPool(attCandidates: untyped, entry: untyped, committee_index: untyped) =
-    let attestation_data_root = getAttestationCandidateKey(entry.data, committee_index)
-
-    attCandidates[candidateIdx.get()].withValue(attestation_data_root, entry) do:
+    # `AttestationData.index == 0` in Electra, but the attestation pool always
+    # represents an AttestationEntry regardless as having the actual committee
+    # index. The entry, therefore, is not the same as the AttestationData, and
+    # thus cannot function as the basis for deriving the hashtable key for the
+    # entry. Instead use the (correctly data.index == 0) attestation passed to
+    # addAttestation.
+    let candidate_key = getAttestationCandidateKey(attestation.data, committee_index)
+
+    attCandidates[candidateIdx.get()].withValue(candidate_key, entry) do:
       if not addAttestation(entry[], attestation, index_in_committee, signature):
         return
     do:
       if not addAttestation(
-          attCandidates[candidateIdx.get()].mgetOrPut(attestation_data_root, entry),
+          attCandidates[candidateIdx.get()].mgetOrPut(candidate_key, entry),
           attestation, index_in_committee, signature):
         # Returns from overall function, not only template
         return
@@ -540,7 +557,7 @@ func covers*(
   ## the existing aggregates, making it redundant
   ## the `var` attestation pool is needed to use `withValue`, else Table becomes
   ## unusably inefficient
-  let candidateIdx = pool.candidateIdx(data.slot)
+  let candidateIdx = pool.candidateIdx(data.slot, CandidateIdxType.phase0Idx)
   if candidateIdx.isNone:
     return false
 
@@ -558,7 +575,7 @@ func covers*(
   ## the existing aggregates, making it redundant
   ## the `var` attestation pool is needed to use `withValue`, else Table becomes
   ## unusably inefficient
-  let candidateIdx = pool.candidateIdx(data.slot)
+  let candidateIdx = pool.candidateIdx(data.slot, CandidateIdxType.electraIdx)
   if candidateIdx.isNone:
     return false
 
@@ -593,7 +610,8 @@ iterator attestations*(
     committee_index: Opt[CommitteeIndex]): phase0.Attestation =
   let candidateIndices =
     if slot.isSome():
-      let candidateIdx = pool.candidateIdx(slot.get())
+      let candidateIdx = pool.candidateIdx(
+        slot.get(), CandidateIdxType.phase0Idx)
       if candidateIdx.isSome():
         candidateIdx.get() .. candidateIdx.get()
       else:
@@ -622,7 +640,8 @@ iterator electraAttestations*(
     committee_index: Opt[CommitteeIndex]): electra.Attestation =
   let candidateIndices =
     if slot.isSome():
-      let candidateIdx = pool.candidateIdx(slot.get(), true)
+      let candidateIdx = pool.candidateIdx(
+        slot.get(), CandidateIdxType.electraIdx)
       if candidateIdx.isSome():
         candidateIdx.get() .. candidateIdx.get()
       else:
@@ -795,7 +814,7 @@ proc getAttestationsForBlock*(pool: var AttestationPool,
 
     let
       slot = Slot(maxAttestationSlot - i)
-      candidateIdx = pool.candidateIdx(slot)
+      candidateIdx = pool.candidateIdx(slot, CandidateIdxType.phase0Idx)
 
     if candidateIdx.isNone():
       # Passed the collection horizon - shouldn't happen because it's based on
@@ -931,7 +950,7 @@ proc getElectraAttestationsForBlock*(
 
     let
       slot = Slot(maxAttestationSlot - i)
-      candidateIdx = pool.candidateIdx(slot)
+      candidateIdx = pool.candidateIdx(slot, CandidateIdxType.electraIdx)
 
     if candidateIdx.isNone():
       # Passed the collection horizon - shouldn't happen because it's based on
@@ -1096,7 +1115,7 @@ func getElectraAggregatedAttestation*(
     Opt[electra.Attestation] =
 
   let
-    candidateIdx = pool.candidateIdx(slot)
+    candidateIdx = pool.candidateIdx(slot, CandidateIdxType.electraIdx)
   if candidateIdx.isNone:
     return Opt.none(electra.Attestation)
 
@@ -1124,7 +1143,7 @@ func getElectraAggregatedAttestation*(
   # be used here, because otherwise they wouldn't have the same value. It thus
   # leaves the cross-committee aggregation for getElectraAttestationsForBlock,
   # which does do this.
-  let candidateIdx = pool.candidateIdx(slot)
+  let candidateIdx = pool.candidateIdx(slot, CandidateIdxType.electraIdx)
   if candidateIdx.isNone:
     return Opt.none(electra.Attestation)
 
@@ -1147,7 +1166,7 @@ func getPhase0AggregatedAttestation*(
     pool: var AttestationPool, slot: Slot, attestation_data_root: Eth2Digest):
     Opt[phase0.Attestation] =
   let
-    candidateIdx = pool.candidateIdx(slot)
+    candidateIdx = pool.candidateIdx(slot, CandidateIdxType.phase0Idx)
   if candidateIdx.isNone:
     return Opt.none(phase0.Attestation)
 
@@ -1168,7 +1187,7 @@ func getPhase0AggregatedAttestation*(
   ## Select the attestation that has the most votes going for it in the given
   ## slot/index
   ## https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/phase0/validator.md#construct-aggregate
-  let candidateIdx = pool.candidateIdx(slot)
+  let candidateIdx = pool.candidateIdx(slot, CandidateIdxType.phase0Idx)
   if candidateIdx.isNone:
     return Opt.none(phase0.Attestation)
 
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
@@ -536,6 +536,7 @@ proc initFullNode(
     syncManager = newSyncManager[Peer, PeerId](
       node.network.peerPool,
       dag.cfg.DENEB_FORK_EPOCH,
+      dag.cfg.FULU_FORK_EPOCH,
       dag.cfg.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS,
       dag.cfg.MAX_BLOBS_PER_BLOCK_ELECTRA,
       SyncQueueKind.Forward, getLocalHeadSlot,
@@ -547,6 +548,7 @@ proc initFullNode(
     backfiller = newSyncManager[Peer, PeerId](
       node.network.peerPool,
       dag.cfg.DENEB_FORK_EPOCH,
+      dag.cfg.FULU_FORK_EPOCH,
       dag.cfg.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS,
       dag.cfg.MAX_BLOBS_PER_BLOCK_ELECTRA,
       SyncQueueKind.Backward, getLocalHeadSlot,
@@ -563,6 +565,7 @@ proc initFullNode(
     untrustedManager = newSyncManager[Peer, PeerId](
       node.network.peerPool,
       dag.cfg.DENEB_FORK_EPOCH,
+      dag.cfg.FULU_FORK_EPOCH,
       dag.cfg.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS,
       dag.cfg.MAX_BLOBS_PER_BLOCK_ELECTRA,
       SyncQueueKind.Backward, getLocalHeadSlot,
diff --git a/beacon_chain/sync/sync_manager.nim b/beacon_chain/sync/sync_manager.nim
@@ -56,6 +56,7 @@ type
   SyncManager*[A, B] = ref object
     pool: PeerPool[A, B]
     DENEB_FORK_EPOCH: Epoch
+    FULU_FORK_EPOCH: Epoch
     MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: uint64
     MAX_BLOBS_PER_BLOCK_ELECTRA: uint64
     responseTimeout: chronos.Duration
@@ -142,6 +143,7 @@ proc initQueue[A, B](man: SyncManager[A, B]) =
 proc newSyncManager*[A, B](
     pool: PeerPool[A, B],
     denebEpoch: Epoch,
+    fuluEpoch: Epoch,
     minEpochsForBlobSidecarsRequests: uint64,
     maxBlobsPerBlockElectra: uint64,
     direction: SyncQueueKind,
@@ -171,6 +173,7 @@ proc newSyncManager*[A, B](
   var res = SyncManager[A, B](
     pool: pool,
     DENEB_FORK_EPOCH: denebEpoch,
+    FULU_FORK_EPOCH: fuluEpoch,
     MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: minEpochsForBlobSidecarsRequests,
     MAX_BLOBS_PER_BLOCK_ELECTRA: maxBlobsPerBlockElectra,
     getLocalHeadSlot: getLocalHeadSlotCb,
@@ -212,7 +215,7 @@ proc shouldGetBlobs[A, B](man: SyncManager[A, B], s: Slot): bool =
   let
     wallEpoch = man.getLocalWallSlot().epoch
     epoch = s.epoch()
-  (epoch >= man.DENEB_FORK_EPOCH) and
+  (epoch >= man.DENEB_FORK_EPOCH) and (epoch < man.FULU_FORK_EPOCH) and
   (wallEpoch < man.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS or
    epoch >=  wallEpoch - man.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS)
 
diff --git a/beacon_chain/sync/sync_queue.nim b/beacon_chain/sync/sync_queue.nim
@@ -692,7 +692,7 @@ iterator blocks(
 proc push*[T](sq: SyncQueue[T], sr: SyncRequest[T]) =
   ## Push failed request back to queue.
   let pos = sq.find(sr).valueOr:
-    debug "Request is no more relevant", request = sr
+    debug "Request is not relevant anymore", request = sr
     return
   sq.del(pos)
 
@@ -768,7 +768,7 @@ proc push*[T](
 
   template findPosition(sq, sr: untyped): SyncPosition =
     sq.find(sr).valueOr:
-      debug "Request is no more relevant",
+      debug "Request is not relevant anymore",
             request = sr, sync_ident = sq.ident, topics = "syncman"
       # Request is not in queue anymore, probably reset happened.
       return
@@ -790,7 +790,7 @@ proc push*[T](
             let res = await sq.waitForChanges()
             if res:
               # SyncQueue reset happen
-              debug "Request is no more relevant, reset happen",
+              debug "Request is not relevant anymore, reset has happened",
                     request = sr,
                     sync_ident = sq.ident,
                     topics = "syncman"
diff --git a/beacon_chain/validator_client/block_service.nim b/beacon_chain/validator_client/block_service.nim
@@ -387,7 +387,7 @@ proc addOrReplaceProposers*(vc: ValidatorClientRef, epoch: Epoch,
 
           for task in epochDuties.duties:
             if task notin duties:
-              # Task is no more relevant, so cancel it.
+              # Task is not relevant anymore, so cancel it.
               debug "Cancelling running proposal duty tasks",
                     slot = task.duty.slot,
                     pubkey = shortLog(task.duty.pubkey)
diff --git a/docs/the_nimbus_book/src/options.md b/docs/the_nimbus_book/src/options.md
@@ -116,7 +116,7 @@ The following options are available:
                                keys of the validators what to sign and when) and load the validators in the
                                beacon node itself [=true].
      --discv5                  Enable Discovery v5 [=true].
-     --dump                    Write SSZ dumps of blocks, attestations and states to data dir [=false].
+     --dump                    Write SSZ dumps of blocks and states to data dir [=false].
      --direct-peer             The list of privileged, secure and known peers to connect and maintain the
                                connection to. This requires a not random netkey-file. In the multiaddress
                                format like: /ip4/<address>/tcp/<port>/p2p/<peerId-public-key>, or enr format
diff --git a/scripts/geth_binaries.sh b/scripts/geth_binaries.sh
@@ -19,7 +19,7 @@ source "${SCRIPTS_DIR}/bash_utils.sh"
 
 download_geth_stable() {
   if [[ ! -e "${STABLE_GETH_BINARY}" ]]; then
-    GETH_VERSION="1.15.5-4263936a"  # https://geth.ethereum.org/downloads
+    GETH_VERSION="1.15.6-19d2b4c8"  # https://geth.ethereum.org/downloads
     GETH_URL="https://gethstore.blob.core.windows.net/builds/"
 
     case "${OS}-${ARCH}" in
diff --git a/tests/test_attestation_pool.nim b/tests/test_attestation_pool.nim
diff --git a/tests/test_mev_calls.nim b/tests/test_mev_calls.nim
diff --git a/vendor/hoodi b/vendor/hoodi
diff --git a/vendor/nim-snappy b/vendor/nim-snappy
