Merge branch 'column-syncer' into column-metrics

Author: agnxsh

.github/workflows/ci.yml

@@ -89,23 +89,6 @@ jobs:
           7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
           mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
 
-      - name: Restore Nim DLLs dependencies (Windows) from cache
-        if: runner.os == 'Windows'
-        id: windows-dlls-cache
-        uses: actions/cache@v4
-        with:
-          path: external/dlls-${{ matrix.target.cpu }}
-          key: 'dlls-${{ matrix.target.cpu }}'
-
-      - name: Install DLLs dependencies (Windows)
-        if: >
-          steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
-          runner.os == 'Windows'
-        run: |
-          mkdir -p external
-          curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
-          7z x -y external/windeps.zip -oexternal/dlls-${{ matrix.target.cpu }}
-
       - name: Path to cached dependencies (Windows)
         if: >
           runner.os == 'Windows'
@@ -227,7 +210,6 @@ jobs:
       - name: Build files with isMainModule
         run: |
           executables=(
-            "beacon_chain/el/deposit_contract"
             "beacon_chain/fork_choice/fork_choice"
             "beacon_chain/fork_choice/proto_array"
             "beacon_chain/networking/network_metadata_downloads"

AllTests-mainnet.md

@@ -56,7 +56,6 @@ TOOLS_CORE_CUSTOMCOMPILE := \
 	libnimbus_lc.a
 
 TOOLS_CORE := \
-	deposit_contract \
 	resttest \
 	mev_mock \
 	ncli \
@@ -80,7 +79,6 @@ TOOLS := $(TOOLS_CORE) nimbus_beacon_node
 
 TOOLS_DIRS := \
 	beacon_chain \
-	beacon_chain/el \
 	ncli \
 	research \
 	tools
@@ -566,34 +564,6 @@ define CONNECT_TO_NETWORK_WITH_LIGHT_CLIENT
 		--trusted-block-root="$(LC_TRUSTED_BLOCK_ROOT)"
 endef
 
-define MAKE_DEPOSIT_DATA
-	build/nimbus_beacon_node deposits createTestnetDeposits \
-		--network=$(1) \
-		--new-wallet-file=build/data/shared_$(1)_$(NODE_ID)/wallet.json \
-		--out-validators-dir=build/data/shared_$(1)_$(NODE_ID)/validators \
-		--out-secrets-dir=build/data/shared_$(1)_$(NODE_ID)/secrets \
-		--out-deposits-file=$(1)-deposits_data-$$(date +"%Y%m%d%H%M%S").json \
-		--count=$(VALIDATORS)
-endef
-
-define MAKE_DEPOSIT
-	build/nimbus_beacon_node deposits createTestnetDeposits \
-		--network=$(1) \
-		--out-deposits-file=nbc-$(1)-deposits.json \
-		--new-wallet-file=build/data/shared_$(1)_$(NODE_ID)/wallet.json \
-		--out-validators-dir=build/data/shared_$(1)_$(NODE_ID)/validators \
-		--out-secrets-dir=build/data/shared_$(1)_$(NODE_ID)/secrets \
-		--count=$(VALIDATORS)
-
-	build/deposit_contract sendDeposits \
-		$(2) \
-		--deposit-contract=$$(cat vendor/$(1)/metadata/deposit_contract.txt) \
-		--deposits-file=nbc-$(1)-deposits.json \
-		--min-delay=$(DEPOSITS_DELAY) \
-		--max-delay=$(DEPOSITS_DELAY) \
-		--ask-for-key
-endef
-
 define CLEAN_NETWORK
 	rm -rf build/data/shared_$(1)*/db
 	rm -rf build/data/shared_$(1)*/dump
@@ -623,27 +593,19 @@ sepolia-dev: | sepolia-build
 	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,sepolia,nimbus_beacon_node,$(SEPOLIA_WEB3_URL))
 endif
 
-sepolia-dev-deposit: | sepolia-build deposit_contract
-	$(call MAKE_DEPOSIT,sepolia,$(SEPOLIA_WEB3_URL))
-
 clean-sepolia:
 	$(call CLEAN_NETWORK,sepolia)
 
 ###
 ### Gnosis chain binary
 ###
 
-# TODO The `-d:gnosisChainBinary` override can be removed if the web3 library
-#      gains support for multiple "Chain Profiles" that consist of a set of
-#      consensus object (such as blocks and transactions) that are specific
-#      to the chain.
 gnosis-build gnosis-chain-build: | build deps
 	+ echo -e $(BUILD_MSG) "build/nimbus_beacon_node_gnosis" && \
 		MAKE="$(MAKE)" V="$(V)" $(ENV_SCRIPT) scripts/compile_nim_program.sh \
 			nimbus_beacon_node_gnosis \
 			beacon_chain/nimbus_beacon_node.nim \
 			$(NIM_PARAMS) \
-			-d:gnosisChainBinary \
 			-d:const_preset=gnosis \
 			&& \
 		echo -e $(BUILD_END_MSG) "build/nimbus_beacon_node_gnosis"
@@ -654,7 +616,6 @@ gnosis-vc-build: | build deps
 			nimbus_validator_client_gnosis \
 			beacon_chain/nimbus_validator_client.nim \
 			$(NIM_PARAMS) \
-			-d:gnosisChainBinary \
 			-d:const_preset=gnosis \
 			&& \
 		echo -e $(BUILD_END_MSG) "build/nimbus_validator_client_gnosis"
@@ -670,9 +631,6 @@ gnosis-dev: | gnosis-build
 	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,gnosis,nimbus_beacon_node_gnosis,$(GNOSIS_WEB3_URLS))
 endif
 
-gnosis-dev-deposit: | gnosis-build deposit_contract
-	$(call MAKE_DEPOSIT,gnosis,$(GNOSIS_WEB3_URLS))
-
 clean-gnosis:
 	$(call CLEAN_NETWORK,gnosis)
 
@@ -690,10 +648,6 @@ gnosis-chain-dev: | gnosis-build
 	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,gnosis-chain,nimbus_beacon_node_gnosis,$(GNOSIS_WEB3_URLS))
 endif
 
-gnosis-chain-dev-deposit: | gnosis-build deposit_contract
-	echo `gnosis-chain-dev-deposit` is deprecated, use `gnosis-chain-dev-deposit` instead
-	$(call MAKE_DEPOSIT,gnosis-chain,$(GNOSIS_WEB3_URLS))
-
 clean-gnosis-chain:
 	$(call CLEAN_NETWORK,gnosis-chain)
 

ConsensusSpecPreset-mainnet.md

@@ -23,9 +23,9 @@ import
   ./el/el_manager,
   ./consensus_object_pools/[
     blockchain_dag, blob_quarantine, block_quarantine, consensus_manager,
-    data_column_quarantine, attestation_pool, sync_committee_msg_pool, validator_change_pool,
+    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],
@@ -56,6 +56,7 @@ type
     phase0AttSlashQueue*: AsyncEventQueue[phase0.AttesterSlashing]
     electraAttSlashQueue*: AsyncEventQueue[electra.AttesterSlashing]
     blobSidecarQueue*: AsyncEventQueue[BlobSidecarInfoObject]
+    columnSidecarQueue*: AsyncEventQueue[DataColumnSidecar]
     finalQueue*: AsyncEventQueue[FinalizationInfoObject]
     reorgQueue*: AsyncEventQueue[ReorgInfoObject]
     contribQueue*: AsyncEventQueue[SignedContributionAndProof]
@@ -81,7 +82,7 @@ type
     list*: ChainListRef
     quarantine*: ref Quarantine
     blobQuarantine*: ref BlobQuarantine
-    dataColumnQuarantine*: ref DataColumnQuarantine
+    dataColumnQuarantine*: ref ColumnQuarantine
     attestationPool*: ref AttestationPool
     syncCommitteeMsgPool*: ref SyncCommitteeMsgPool
     lightClientPool*: ref LightClientPool

ConsensusSpecPreset-minimal.md

@@ -374,7 +374,7 @@ type
         name: "genesis-state-url" .}: Option[Uri]
 
       finalizedDepositTreeSnapshot* {.
-        desc: "SSZ file specifying a recent finalized EIP-4881 deposit tree snapshot"
+        hidden
         name: "finalized-deposit-tree-snapshot" .}: Option[InputFile]
 
       finalizedCheckpointBlock* {.

Makefile

@@ -4,7 +4,7 @@ This folder holds the various consensus object pools needed for a blockchain cli
 
 Object in those pools have passed the "gossip validation" filter according
 to specs:
-- blocks: https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/phase0/p2p-interface.md#beacon_block
+- blocks: https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/phase0/p2p-interface.md#beacon_block
 - aggregate attestations: https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/phase0/p2p-interface.md#beacon_aggregate_and_proof
 - unaggregated attestation: https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/phase0/p2p-interface.md#beacon_attestation_subnet_id
 - voluntary exits: https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/phase0/p2p-interface.md#voluntary_exit