Merge branch 'unstable' into column-syncer

Author: agnxsh

CHANGELOG.md

@@ -1,7 +1,20 @@
+2025-04-26 v25.4.1
+==================
+
+Nimbus `v25.4.1` is a high-urgency release for Ethereum and Gnosis mainnets due to their Pectra hardforks.
+
+### Fixes
+
+- fix potential missed MEV blocks starting with Electra builder API:
+  https://github.com/status-im/nimbus-eth2/pull/7103
+
+- fix `single_attestation` SSE beacon API stream subscription:
+  https://github.com/status-im/nimbus-eth2/pull/7107
+
 2025-04-21 v25.4.0
 ==================
 
-Nimbus `v25.4.0` is a high-urgency release for Ethereum Foundation and Gnosis mainnets due to their Pectra hardforks.
+Nimbus `v25.4.0` is a high-urgency release for Ethereum and Gnosis mainnets due to their Pectra hardforks.
 
 ### Improvements
 

Makefile

@@ -235,7 +235,7 @@ local-testnet-minimal:
 		--remote-validators-count 512 \
 		--signer-type $(SIGNER_TYPE) \
 		--deneb-fork-epoch 0 \
-		--electra-fork-epoch 2 \
+		--electra-fork-epoch 0 \
 		--stop-at-epoch 6 \
 		--disable-htop \
 		--enable-payload-builder \
@@ -264,7 +264,7 @@ local-testnet-mainnet:
 		--data-dir $@ \
 		--nodes 2 \
 		--deneb-fork-epoch 0 \
-		--electra-fork-epoch 2 \
+		--electra-fork-epoch 0 \
 		--stop-at-epoch 6 \
 		--disable-htop \
 		--base-port $$(( $(MAINNET_TESTNET_BASE_PORT) + EXECUTOR_NUMBER * 400 + 0 )) \

beacon_chain/era_db.nim

@@ -421,8 +421,8 @@ proc getPartialState(
   try:
     readSszBytes(tmp.toOpenArray(0, partialBytes - 1), output)
     true
-  except CatchableError:
-    # TODO log?
+  except CatchableError as exc:
+    error "Failed to parse partial beacon state", slot = slot, msg = exc.msg
     false
 
 iterator getBlockIds*(

beacon_chain/fork_choice/fork_choice.nim

@@ -9,7 +9,7 @@
 
 import
   # Standard library
-  std/[sequtils, tables],
+  std/tables,
   # Status libraries
   results, chronicles,
   # Internal
@@ -19,6 +19,7 @@ import
   ./fork_choice_types, ./proto_array,
   ../consensus_object_pools/[spec_cache, blockchain_dag]
 
+from std/sequtils import keepItIf
 export results, fork_choice_types
 export proto_array.len
 
@@ -487,7 +488,7 @@ when isMainModule:
     echo "    fork_choice compute_deltas - test zero votes"
 
     const validator_count = 16
-    var deltas = newSeqUninitialized[Delta](validator_count)
+    var deltas = newSeqUninit[Delta](validator_count)
 
     var indices: Table[Eth2Digest, Index]
     var votes: seq[VoteTracker]
@@ -518,7 +519,7 @@ when isMainModule:
     const
       Balance = Gwei(42)
       validator_count = 16
-    var deltas = newSeqUninitialized[Delta](validator_count)
+    var deltas = newSeqUninit[Delta](validator_count)
 
     var indices: Table[Eth2Digest, Index]
     var votes: seq[VoteTracker]
@@ -557,7 +558,7 @@ when isMainModule:
     const
       Balance = Gwei(42)
       validator_count = 16
-    var deltas = newSeqUninitialized[Delta](validator_count)
+    var deltas = newSeqUninit[Delta](validator_count)
 
     var indices: Table[Eth2Digest, Index]
     var votes: seq[VoteTracker]
@@ -594,7 +595,7 @@ when isMainModule:
       Balance = Gwei(42)
       validator_count = 16
       TotalDeltas = Delta(Balance * validator_count)
-    var deltas = newSeqUninitialized[Delta](validator_count)
+    var deltas = newSeqUninit[Delta](validator_count)
 
     var indices: Table[Eth2Digest, Index]
     var votes: seq[VoteTracker]
@@ -642,7 +643,7 @@ when isMainModule:
     indices.add fakeHash(1), 0
 
     # 2 validators
-    var deltas = newSeqUninitialized[Delta](2)
+    var deltas = newSeqUninit[Delta](2)
     let old_balances = @[Balance, Balance]
     let new_balances = @[Balance, Balance]
 
@@ -681,7 +682,7 @@ when isMainModule:
       validator_count = 16
       TotalOldDeltas = Delta(OldBalance * validator_count)
       TotalNewDeltas = Delta(NewBalance * validator_count)
-    var deltas = newSeqUninitialized[Delta](validator_count)
+    var deltas = newSeqUninit[Delta](validator_count)
 
     var indices: Table[Eth2Digest, Index]
     var votes: seq[VoteTracker]
@@ -730,7 +731,7 @@ when isMainModule:
     indices.add fakeHash(2), 1
 
     # 1 validator at the start, 2 at the end
-    var deltas = newSeqUninitialized[Delta](2)
+    var deltas = newSeqUninit[Delta](2)
     let old_balances = @[Balance]
     let new_balances = @[Balance, Balance]
 
@@ -769,7 +770,7 @@ when isMainModule:
     indices.add fakeHash(2), 1
 
     # 2 validator at the start, 1 at the end
-    var deltas = newSeqUninitialized[Delta](2)
+    var deltas = newSeqUninit[Delta](2)
     let old_balances = @[Balance, Balance]
     let new_balances = @[Balance]
 

beacon_chain/gossip_processing/gossip_validation.nim

@@ -52,7 +52,7 @@ type
 template errIgnore*(msg: cstring): untyped =
   err((ValidationResult.Ignore, cstring msg))
 template errReject*(msg: cstring): untyped =
-  err((ValidationResult.Reject, cstring msg))
+  err((ValidationResult.Reject, msg))
 
 # Internal checks
 # ----------------------------------------------------------------
@@ -206,7 +206,7 @@ func check_blob_sidecar_inclusion_proof(
     blob_sidecar: deneb.BlobSidecar): Result[void, ValidationError] =
   let res = blob_sidecar.verify_blob_sidecar_inclusion_proof()
   if res.isErr:
-    return errReject(res.error)
+    return errReject(cstring res.error)
 
   ok()
 

beacon_chain/light_client.nim

@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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).
@@ -434,10 +434,8 @@ proc updateGossipStatus*(
     if gossipFork >= ConsensusFork.Altair:
       let forkDigest = lightClient.forkDigests[].atConsensusFork(gossipFork)
       lightClient.network.subscribe(
-        getLightClientFinalityUpdateTopic(forkDigest),
-        basicParams)
+        getLightClientFinalityUpdateTopic(forkDigest), basicParams())
       lightClient.network.subscribe(
-        getLightClientOptimisticUpdateTopic(forkDigest),
-        basicParams)
+        getLightClientOptimisticUpdateTopic(forkDigest), basicParams())
 
   lightClient.gossipState = targetGossipState

beacon_chain/networking/eth2_network.nim

@@ -2635,15 +2635,13 @@ proc broadcast(node: Eth2Node, topic: string, msg: auto):
   broadcast(node, topic, gossipEncode(msg))
 
 proc subscribeAttestationSubnets*(
-    node: Eth2Node, subnets: AttnetBits, forkDigest: ForkDigest) =
+    node: Eth2Node, subnets: AttnetBits, forkDigest: ForkDigest,
+    topicParams: TopicParams) =
   # https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.0/specs/phase0/p2p-interface.md#attestations-and-aggregation
-  # Nimbus won't score attestation subnets for now, we just rely on block and
-  # aggregate which are more stable and reliable
-
   for subnet_id, enabled in subnets:
     if enabled:
       node.subscribe(getAttestationTopic(
-        forkDigest, SubnetId(subnet_id)), TopicParams.init()) # don't score attestation subnets for now
+        forkDigest, SubnetId(subnet_id)), topicParams)
 
 proc unsubscribeAttestationSubnets*(
     node: Eth2Node, subnets: AttnetBits, forkDigest: ForkDigest) =