Merge branch 'column-syncer' into column-metrics

Author: agnxsh

.github/workflows/ci.yml

@@ -224,10 +224,6 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Build with developer flags
-        run: |
-          make -j nimbus_beacon_node LOG_LEVEL=TRACE NIMFLAGS="-d:has_deposit_root_checks=1"
-
       - name: Build files with isMainModule
         run: |
           executables=(
@@ -240,6 +236,7 @@ jobs:
             "benchmarks/rest_api_benchmark"
             "tests/mocking/mock_genesis"
           )
+          make -j update
           source env.sh
           for executable in "${executables[@]}"; do
             nim c --passC:-fsyntax-only --noLinking:on -d:chronicles_log_level=TRACE "${executable}"

AllTests-mainnet.md

@@ -88,7 +88,6 @@ AllTests-mainnet
 + dependent_root                                                                             OK
 + get_beacon_proposer_index                                                                  OK
 + latest_block_root                                                                          OK
-+ merklizer state roundtrip                                                                  OK
 + process_slots                                                                              OK
 ```
 ## Beacon time
@@ -122,6 +121,7 @@ AllTests-mainnet
 ```
 ## Block processor [Preset: mainnet]
 ```diff
++ Invalidate block root [Preset: mainnet]                                                    OK
 + Reverse order block add & get [Preset: mainnet]                                            OK
 ```
 ## Block quarantine
@@ -168,13 +168,6 @@ AllTests-mainnet
 + Invalid Authorization Token [Beacon Node] [Preset: mainnet]                                OK
 + Missing Authorization header [Beacon Node] [Preset: mainnet]                               OK
 ```
-## DepositContractSnapshot
-```diff
-+ Migration                                                                                  OK
-+ SSZ                                                                                        OK
-+ depositCount                                                                               OK
-+ isValid                                                                                    OK
-```
 ## Discovery fork ID
 ```diff
 + Expected fork IDs                                                                          OK
@@ -542,14 +535,6 @@ AllTests-mainnet
 + Testing uints        inputs - invalid                                                      OK
 + Testing uints        inputs - valid                                                        OK
 ```
-## EIP-4881
-```diff
-+ deposit_cases                                                                              OK
-+ empty_root                                                                                 OK
-+ finalization                                                                               OK
-+ invalid_snapshot                                                                           OK
-+ snapshot_cases                                                                             OK
-```
 ## EIP-7594 Unit Tests
 ```diff
 + EIP-7594: Compute Matrix                                                                   OK
@@ -571,7 +556,6 @@ AllTests-mainnet
 ```
 ## Eth1 monitor
 ```diff
-+ Deposits chain                                                                             OK
 + Rewrite URLs                                                                               OK
 ```
 ## Eth2 specific discovery tests

CHANGELOG.md

@@ -1,3 +1,13 @@
+2025-05-08 v25.5.0
+==================
+
+Nimbus `v25.5.0` does not alter the beacon node, is a low-urgency release for nodes which don't use the Nimbus validator client with a non-Nimbus BN, and a high-urgency release for nodes which do use the Nimbus validator client with a non-Nimbus beacon node.
+
+### Fixes
+
+- fix missing Eth-Consensus-Version header in validator client publishBlindedBlockV2 beacon API requests:
+  https://github.com/status-im/nimbus-eth2/pull/7140
+
 2025-04-26 v25.4.1
 ==================
 

Makefile

@@ -234,8 +234,8 @@ local-testnet-minimal:
 		--signer-nodes 1 \
 		--remote-validators-count 512 \
 		--signer-type $(SIGNER_TYPE) \
-		--deneb-fork-epoch 0 \
 		--electra-fork-epoch 0 \
+		--fulu-fork-epoch 100000 \
 		--stop-at-epoch 6 \
 		--disable-htop \
 		--enable-payload-builder \
@@ -263,8 +263,8 @@ local-testnet-mainnet:
 	./scripts/launch_local_testnet.sh \
 		--data-dir $@ \
 		--nodes 2 \
-		--deneb-fork-epoch 0 \
 		--electra-fork-epoch 0 \
+		--fulu-fork-epoch 100000 \
 		--stop-at-epoch 6 \
 		--disable-htop \
 		--base-port $$(( $(MAINNET_TESTNET_BASE_PORT) + EXECUTOR_NUMBER * 400 + 0 )) \

README.md

@@ -130,7 +130,7 @@ _Alternatively, fire up our [experimental Vagrant instance with Nim pre-installe
 
 <!-- TODO: Is this up to date? -->
 
-The [generic instructions from the Nimbus repo](https://github.com/status-im/nimbus/#metric-visualisation) apply here as well.
+The [generic instructions from the Nimbus repo](https://github.com/status-im/nimbus-eth1/#metric-visualisation) apply here as well.
 
 Specific steps:
 

beacon_chain/beacon_chain_db.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).
@@ -14,8 +14,7 @@ import
   serialization, chronicles, snappy,
   eth/db/[kvstore, kvstore_sqlite3],
   ./networking/network_metadata, ./beacon_chain_db_immutable,
-  ./spec/[deposit_snapshots,
-          eth2_ssz_serialization,
+  ./spec/[eth2_ssz_serialization,
           eth2_merkleization,
           forks,
           presets,
@@ -27,7 +26,7 @@ from ./spec/datatypes/deneb import TrustedSignedBeaconBlock
 
 export
   phase0, altair, eth2_ssz_serialization, eth2_merkleization, kvstore,
-  kvstore_sqlite3, deposit_snapshots
+  kvstore_sqlite3
 
 logScope: topics = "bc_db"
 
@@ -980,38 +979,6 @@ proc putTailBlock*(db: BeaconChainDB, key: Eth2Digest) =
 proc putGenesisBlock*(db: BeaconChainDB, key: Eth2Digest) =
   db.keyValues.putRaw(subkey(kGenesisBlock), key)
 
-proc putDepositContractSnapshot*(
-    db: BeaconChainDB, snapshot: DepositContractSnapshot) =
-  db.withManyWrites:
-    db.keyValues.putSnappySSZ(subkey(kDepositContractSnapshot),
-                              snapshot)
-    # TODO: We currently store this redundant old snapshot in order
-    #       to allow the users to rollback to a previous version
-    #       of Nimbus without problems. It would be reasonable
-    #       to remove this in Nimbus 23.2
-    db.keyValues.putSnappySSZ(subkey(kOldDepositContractSnapshot),
-                              snapshot.toOldDepositContractSnapshot)
-
-proc hasDepositContractSnapshot*(db: BeaconChainDB): bool =
-  expectDb(subkey(kDepositContractSnapshot) in db.keyValues)
-
-proc getDepositContractSnapshot*(db: BeaconChainDB): Opt[DepositContractSnapshot] =
-  result.ok(default DepositContractSnapshot)
-  let r = db.keyValues.getSnappySSZ(
-    subkey(kDepositContractSnapshot), result.get)
-  if r != GetResult.found: result.err()
-
-proc getUpgradableDepositSnapshot*(db: BeaconChainDB): Option[OldDepositContractSnapshot] =
-  var dcs: OldDepositContractSnapshot
-  let oldKey = subkey(kOldDepositContractSnapshot)
-  if db.keyValues.getSnappySSZ(oldKey, dcs) != GetResult.found:
-    # Old record is not present in the current database.
-    # We need to take a look in the v0 database as well.
-    if db.v0.backend.getSnappySSZ(oldKey, dcs) != GetResult.found:
-      return
-
-  return some dcs
-
 proc getPhase0Block(
     db: BeaconChainDBV0, key: Eth2Digest): Opt[phase0.TrustedSignedBeaconBlock] =
   # We only store blocks that we trust in the database
@@ -1131,7 +1098,7 @@ proc getBlobSidecar*(db: BeaconChainDB, root: Eth2Digest, index: BlobIndex,
                      value: var BlobSidecar): bool =
   db.blobs.getSZSSZ(blobkey(root, index), value) == GetResult.found
 
-proc getDataColumnSidecarSZ*(db: BeaconChainDB, root: Eth2Digest, 
+proc getDataColumnSidecarSZ*(db: BeaconChainDB, root: Eth2Digest,
                              index: ColumnIndex, data: var seq[byte]): bool =
   let dataPtr = addr data # Short-lived
   func decode(data: openArray[byte]) =

beacon_chain/conf.nim

@@ -580,6 +580,34 @@ type
         defaultValue: false
         name: "dump" .}: bool
 
+      # Because certain EL (e.g., Geth) may return SYNCING/ACCEPTED even for
+      # execution payloads that have already been deemed INVALID in the past,
+      # this flag is needed to avoid optimistically importing beacon blocks
+      # that contain such payloads into fork choice when Nimbus is restarted.
+      # This helps manual recovery when the justified checkpoint is advanced
+      # optimistically based on attestations in blocks with invalid payloads,
+      # such as the botched Prague/Electra deployment onto the Holesky testnet.
+      #
+      # The recovery flow is as follows:
+      # (1) Upgrade to an EL version that correctly identifies the invalid block
+      # (2) Restart Nimbus with `--debug-invalidate-block-root` set to the first
+      #     block known to have an invalid execution payload. Multiple blocks
+      #     may be specified if necessary
+      # (3) If Nimbus is already synced to the canonical (but invalid) branch,
+      #     wait until the EL informs Nimbus that this head is INVALID.
+      #     Nimbus then rewinds back to the latest valid head
+      # (4) Restart Nimbus again, ensuring that `--debug-invalidate-block-root`
+      #     is set up correctly. Nimbus will re-discover the invalid branch,
+      #     but this time will not optimistically import it, preventing the
+      #     invalid branch to become canonical in its local fork choice
+      # (5) Wait for a different branch to become canonical, and keep the
+      #     `--debug-invalidate-block-root` flag present until finality has
+      #     advanced beyond the problematic chain segment
+      invalidBlockRoots* {.
+        hidden
+        desc: "List of beacon block roots that, if the EL responds with SYNCING/ACCEPTED, are treated as if their execution payload was INVALID"
+        name: "debug-invalidate-block-root" .}: seq[Eth2Digest]
+
       directPeers* {.
         desc: "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 (enr:-xx). Peering agreements are established out of band and must be reciprocal"
         name: "direct-peer" .}: seq[string]

beacon_chain/consensus_object_pools/blockchain_dag.nim

@@ -2439,8 +2439,6 @@ proc updateHead*(
         handler()
 
     # Policy: Retain back through Mainnet's second latest fork.
-    ConsensusFork.Capella.logForkUpgrade(
-      dag.vanityLogs.onUpgradeToCapella)
     ConsensusFork.Deneb.logForkUpgrade(
       dag.vanityLogs.onUpgradeToDeneb)
     ConsensusFork.Electra.logForkUpgrade(

beacon_chain/consensus_object_pools/vanity_logs/vanity_logs.nim

@@ -15,10 +15,6 @@ type
   LogProc* = proc() {.gcsafe, raises: [].}
 
   VanityLogs* = object
-    # Gets displayed on upgrade to Capella. May be displayed multiple times
-    # in case of chain reorgs around the upgrade.
-    onUpgradeToCapella*: LogProc
-
     # Gets displayed on when a BLS to execution change message for a validator
     # known by this node appears in a head block
     onKnownBlsToExecutionChange*: LogProc
@@ -41,7 +37,6 @@ type
 # Policy: Retain retired art files in the directory, but don't link them anymore
 
 proc capellaMono*()  = notice "\n" & staticRead("capella" / "mono.txt")
-proc capellaColor*() = notice "\n" & staticRead("capella" / "color.ans")
 proc capellaBlink*() = notice "\n" & staticRead("capella" / "blink.ans")
 
 proc denebMono*()  = notice "\n" & staticRead("deneb" / "mono.txt")