Merge branch 'expose-blst-internals' into into-anchor

# Conflicts: # Cargo.lock # Cargo.toml # account_manager/src/validator/create.rs # account_manager/src/validator/recover.rs # beacon_node/http_api/src/block_id.rs # beacon_node/http_api/src/lib.rs # consensus/types/src/payload.rs # validator_client/doppelganger_service/src/lib.rs # validator_client/http_metrics/Cargo.toml # validator_client/validator_services/src/preparation_service.rs
2026-07-01 03:44:30 +00:00 · 2025-01-21 17:03:38 +01:00
parent 997991f551 a714c146f1
commit fb95134bd0
245 changed files with 5423 additions and 2361 deletions
--- a/common/account_utils/src/validator_definitions.rs
+++ b/common/account_utils/src/validator_definitions.rs
@@ -434,7 +434,7 @@ pub fn recursively_find_voting_keystores<P: AsRef<Path>>(
            && dir_entry
                .file_name()
                .to_str()
-                .map_or(false, is_voting_keystore)
+                .is_some_and(is_voting_keystore)
        {
            matches.push(dir_entry.path())
        }
--- a/common/eth2/src/lib.rs
+++ b/common/eth2/src/lib.rs
@@ -1324,9 +1324,9 @@ impl BeaconNodeHttpClient {
    }

    /// `POST v2/beacon/pool/attestations`
-    pub async fn post_beacon_pool_attestations_v2<E: EthSpec>(
+    pub async fn post_beacon_pool_attestations_v2(
        &self,
-        attestations: &[Attestation<E>],
+        attestations: &[SingleAttestation],
        fork_name: ForkName,
    ) -> Result<(), Error> {
        let mut path = self.eth_path(V2)?;
--- a/common/eth2/src/types.rs
+++ b/common/eth2/src/types.rs
@@ -1057,6 +1057,9 @@ impl ForkVersionDeserialize for SsePayloadAttributes {
            ForkName::Electra => serde_json::from_value(value)
                .map(Self::V3)
                .map_err(serde::de::Error::custom),
+            ForkName::Fulu => serde_json::from_value(value)
+                .map(Self::V3)
+                .map_err(serde::de::Error::custom),
            ForkName::Base | ForkName::Altair => Err(serde::de::Error::custom(format!(
                "SsePayloadAttributes deserialization for {fork_name} not implemented"
            ))),
@@ -1089,6 +1092,7 @@ impl ForkVersionDeserialize for SseExtendedPayloadAttributes {
 #[serde(bound = "E: EthSpec", untagged)]
 pub enum EventKind<E: EthSpec> {
    Attestation(Box<Attestation<E>>),
+    SingleAttestation(Box<SingleAttestation>),
    Block(SseBlock),
    BlobSidecar(SseBlobSidecar),
    FinalizedCheckpoint(SseFinalizedCheckpoint),
@@ -1115,6 +1119,7 @@ impl<E: EthSpec> EventKind<E> {
            EventKind::Block(_) => "block",
            EventKind::BlobSidecar(_) => "blob_sidecar",
            EventKind::Attestation(_) => "attestation",
+            EventKind::SingleAttestation(_) => "single_attestation",
            EventKind::VoluntaryExit(_) => "voluntary_exit",
            EventKind::FinalizedCheckpoint(_) => "finalized_checkpoint",
            EventKind::ChainReorg(_) => "chain_reorg",
@@ -1137,6 +1142,11 @@ impl<E: EthSpec> EventKind<E> {
            "attestation" => Ok(EventKind::Attestation(serde_json::from_str(data).map_err(
                |e| ServerError::InvalidServerSentEvent(format!("Attestation: {:?}", e)),
            )?)),
+            "single_attestation" => Ok(EventKind::SingleAttestation(
+                serde_json::from_str(data).map_err(|e| {
+                    ServerError::InvalidServerSentEvent(format!("SingleAttestation: {:?}", e))
+                })?,
+            )),
            "block" => Ok(EventKind::Block(serde_json::from_str(data).map_err(
                |e| ServerError::InvalidServerSentEvent(format!("Block: {:?}", e)),
            )?)),
@@ -1231,6 +1241,7 @@ pub enum EventTopic {
    Block,
    BlobSidecar,
    Attestation,
+    SingleAttestation,
    VoluntaryExit,
    FinalizedCheckpoint,
    ChainReorg,
@@ -1256,6 +1267,7 @@ impl FromStr for EventTopic {
            "block" => Ok(EventTopic::Block),
            "blob_sidecar" => Ok(EventTopic::BlobSidecar),
            "attestation" => Ok(EventTopic::Attestation),
+            "single_attestation" => Ok(EventTopic::SingleAttestation),
            "voluntary_exit" => Ok(EventTopic::VoluntaryExit),
            "finalized_checkpoint" => Ok(EventTopic::FinalizedCheckpoint),
            "chain_reorg" => Ok(EventTopic::ChainReorg),
@@ -1282,6 +1294,7 @@ impl fmt::Display for EventTopic {
            EventTopic::Block => write!(f, "block"),
            EventTopic::BlobSidecar => write!(f, "blob_sidecar"),
            EventTopic::Attestation => write!(f, "attestation"),
+            EventTopic::SingleAttestation => write!(f, "single_attestation"),
            EventTopic::VoluntaryExit => write!(f, "voluntary_exit"),
            EventTopic::FinalizedCheckpoint => write!(f, "finalized_checkpoint"),
            EventTopic::ChainReorg => write!(f, "chain_reorg"),
@@ -1840,14 +1853,10 @@ impl<E: EthSpec> PublishBlockRequest<E> {
 impl<E: EthSpec> TryFrom<Arc<SignedBeaconBlock<E>>> for PublishBlockRequest<E> {
    type Error = &'static str;
    fn try_from(block: Arc<SignedBeaconBlock<E>>) -> Result<Self, Self::Error> {
-        match *block {
-            SignedBeaconBlock::Base(_)
-            | SignedBeaconBlock::Altair(_)
-            | SignedBeaconBlock::Bellatrix(_)
-            | SignedBeaconBlock::Capella(_) => Ok(PublishBlockRequest::Block(block)),
-            SignedBeaconBlock::Deneb(_) | SignedBeaconBlock::Electra(_) => Err(
-                "post-Deneb block contents cannot be fully constructed from just the signed block",
-            ),
+        if block.message().fork_name_unchecked().deneb_enabled() {
+            Err("post-Deneb block contents cannot be fully constructed from just the signed block")
+        } else {
+            Ok(PublishBlockRequest::Block(block))
        }
    }
 }
@@ -1951,16 +1960,18 @@ impl<E: EthSpec> ForkVersionDeserialize for FullPayloadContents<E> {
        value: Value,
        fork_name: ForkName,
    ) -> Result<Self, D::Error> {
-        match fork_name {
-            ForkName::Bellatrix | ForkName::Capella => serde_json::from_value(value)
-                .map(Self::Payload)
-                .map_err(serde::de::Error::custom),
-            ForkName::Deneb | ForkName::Electra => serde_json::from_value(value)
+        if fork_name.deneb_enabled() {
+            serde_json::from_value(value)
                .map(Self::PayloadAndBlobs)
-                .map_err(serde::de::Error::custom),
-            ForkName::Base | ForkName::Altair => Err(serde::de::Error::custom(format!(
+                .map_err(serde::de::Error::custom)
+        } else if fork_name.bellatrix_enabled() {
+            serde_json::from_value(value)
+                .map(Self::Payload)
+                .map_err(serde::de::Error::custom)
+        } else {
+            Err(serde::de::Error::custom(format!(
                "FullPayloadContents deserialization for {fork_name} not implemented"
-            ))),
+            )))
        }
    }
 }
--- a/common/eth2_network_config/built_in_network_configs/chiado/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/chiado/config.yaml
@@ -15,7 +15,6 @@ TERMINAL_TOTAL_DIFFICULTY: 231707791542740786049188744689299064356246512
 TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000
 TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615

-
 # Genesis
 # ---------------------------------------------------------------
 # *CUSTOM
@@ -27,7 +26,6 @@ GENESIS_FORK_VERSION: 0x0000006f
 # *CUSTOM
 GENESIS_DELAY: 300

-
 # Forking
 # ---------------------------------------------------------------
 # Some forks are disabled for now:
@@ -49,6 +47,9 @@ DENEB_FORK_EPOCH: 516608 # Wed Jan 31 2024 18:15:40 GMT+0000
 # Electra
 ELECTRA_FORK_VERSION: 0x0500006f
 ELECTRA_FORK_EPOCH: 18446744073709551615
+# Fulu
+FULU_FORK_VERSION: 0x0600006f
+FULU_FORK_EPOCH: 18446744073709551615

 # Time parameters
 # ---------------------------------------------------------------
@@ -63,7 +64,6 @@ SHARD_COMMITTEE_PERIOD: 256
 # 2**10 (= 1024) ~1.4 hour
 ETH1_FOLLOW_DISTANCE: 1024

-
 # Validator cycle
 # ---------------------------------------------------------------
 # 2**2 (= 4)
@@ -90,7 +90,6 @@ REORG_PARENT_WEIGHT_THRESHOLD: 160
 # `2` epochs
 REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2

-
 # Deposit contract
 # ---------------------------------------------------------------
 # xDai Mainnet
@@ -136,9 +135,12 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `uint64(6)`
+MAX_BLOBS_PER_BLOCK: 6

 # DAS
-CUSTODY_REQUIREMENT: 4
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
-SAMPLES_PER_SLOT: 8
+NUMBER_OF_CUSTODY_GROUPS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 4
--- a/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml
@@ -23,7 +23,6 @@ GENESIS_FORK_VERSION: 0x00000064
 # 6000 seconds (100 minutes)
 GENESIS_DELAY: 6000

-
 # Forking
 # ---------------------------------------------------------------
 # Some forks are disabled for now:
@@ -45,7 +44,9 @@ DENEB_FORK_EPOCH: 889856 # 2024-03-11T18:30:20.000Z
 # Electra
 ELECTRA_FORK_VERSION: 0x05000064
 ELECTRA_FORK_EPOCH: 18446744073709551615
-
+# Fulu
+FULU_FORK_VERSION: 0x06000064
+FULU_FORK_EPOCH: 18446744073709551615

 # Time parameters
 # ---------------------------------------------------------------
@@ -60,7 +61,6 @@ SHARD_COMMITTEE_PERIOD: 256
 # 2**10 (= 1024) ~1.4 hour
 ETH1_FOLLOW_DISTANCE: 1024

-
 # Validator cycle
 # ---------------------------------------------------------------
 # 2**2 (= 4)
@@ -76,7 +76,6 @@ MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 2
 # 2**12 (= 4096)
 CHURN_LIMIT_QUOTIENT: 4096

-
 # Fork choice
 # ---------------------------------------------------------------
 # 40%
@@ -119,9 +118,12 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `uint64(6)`
+MAX_BLOBS_PER_BLOCK: 6

 # DAS
-CUSTODY_REQUIREMENT: 4
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
-SAMPLES_PER_SLOT: 8
+NUMBER_OF_CUSTODY_GROUPS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 4
--- a/common/eth2_network_config/built_in_network_configs/holesky/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/holesky/config.yaml
@@ -12,7 +12,6 @@ GENESIS_FORK_VERSION: 0x01017000
 # Genesis delay 5 mins
 GENESIS_DELAY: 300

-
 # Forking
 # ---------------------------------------------------------------
 # Some forks are disabled for now:
@@ -37,6 +36,9 @@ DENEB_FORK_EPOCH: 29696
 # Electra
 ELECTRA_FORK_VERSION: 0x06017000
 ELECTRA_FORK_EPOCH: 18446744073709551615
+# Fulu
+FULU_FORK_VERSION: 0x07017000
+FULU_FORK_EPOCH: 18446744073709551615

 # Time parameters
 # ---------------------------------------------------------------
@@ -51,7 +53,6 @@ SHARD_COMMITTEE_PERIOD: 256
 # 2**11 (= 2,048) Eth1 blocks ~8 hours
 ETH1_FOLLOW_DISTANCE: 2048

-
 # Validator cycle
 # ---------------------------------------------------------------
 # 2**2 (= 4)
@@ -123,9 +124,12 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `uint64(6)`
+MAX_BLOBS_PER_BLOCK: 6

 # DAS
-CUSTODY_REQUIREMENT: 4
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
-SAMPLES_PER_SLOT: 8
+NUMBER_OF_CUSTODY_GROUPS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 4
--- a/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml
@@ -18,8 +18,6 @@ TERMINAL_TOTAL_DIFFICULTY: 58750000000000000000000
 TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000
 TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615

-
-
 # Genesis
 # ---------------------------------------------------------------
 # `2**14` (= 16,384)
@@ -31,7 +29,6 @@ GENESIS_FORK_VERSION: 0x00000000
 # 604800 seconds (7 days)
 GENESIS_DELAY: 604800

-
 # Forking
 # ---------------------------------------------------------------
 # Some forks are disabled for now:
@@ -40,23 +37,25 @@ GENESIS_DELAY: 604800

 # Altair
 ALTAIR_FORK_VERSION: 0x01000000
-ALTAIR_FORK_EPOCH: 74240  # Oct 27, 2021, 10:56:23am UTC
+ALTAIR_FORK_EPOCH: 74240 # Oct 27, 2021, 10:56:23am UTC
 # Bellatrix
 BELLATRIX_FORK_VERSION: 0x02000000
-BELLATRIX_FORK_EPOCH: 144896  # Sept 6, 2022, 11:34:47am UTC
+BELLATRIX_FORK_EPOCH: 144896 # Sept 6, 2022, 11:34:47am UTC
 # Capella
 CAPELLA_FORK_VERSION: 0x03000000
-CAPELLA_FORK_EPOCH: 194048  # April 12, 2023, 10:27:35pm UTC
+CAPELLA_FORK_EPOCH: 194048 # April 12, 2023, 10:27:35pm UTC
 # Deneb
 DENEB_FORK_VERSION: 0x04000000
-DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
+DENEB_FORK_EPOCH: 269568 # March 13, 2024, 01:55:35pm UTC
 # Electra
 ELECTRA_FORK_VERSION: 0x05000000
 ELECTRA_FORK_EPOCH: 18446744073709551615
+# Fulu
+FULU_FORK_VERSION: 0x06000000
+FULU_FORK_EPOCH: 18446744073709551615
 # PeerDAS
 EIP7594_FORK_EPOCH: 18446744073709551615

-
 # Time parameters
 # ---------------------------------------------------------------
 # 12 seconds
@@ -70,7 +69,6 @@ SHARD_COMMITTEE_PERIOD: 256
 # 2**11 (= 2,048) Eth1 blocks ~8 hours
 ETH1_FOLLOW_DISTANCE: 2048

-
 # Validator cycle
 # ---------------------------------------------------------------
 # 2**2 (= 4)
@@ -97,7 +95,6 @@ REORG_PARENT_WEIGHT_THRESHOLD: 160
 # `2` epochs
 REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2

-
 # Deposit contract
 # ---------------------------------------------------------------
 # Ethereum PoW Mainnet
@@ -105,7 +102,6 @@ DEPOSIT_CHAIN_ID: 1
 DEPOSIT_NETWORK_ID: 1
 DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa

-
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
@@ -145,9 +141,12 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `uint64(6)`
+MAX_BLOBS_PER_BLOCK: 6

 # DAS
-CUSTODY_REQUIREMENT: 4
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
-SAMPLES_PER_SLOT: 8
+NUMBER_OF_CUSTODY_GROUPS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 4
--- a/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml
@@ -119,9 +119,12 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `uint64(6)`
+MAX_BLOBS_PER_BLOCK: 6

 # DAS
-CUSTODY_REQUIREMENT: 4
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
-SAMPLES_PER_SLOT: 8
+NUMBER_OF_CUSTODY_GROUPS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 4
--- a/common/filesystem/Cargo.toml
+++ b/common/filesystem/Cargo.toml
@@ -3,7 +3,6 @@ name = "filesystem"
 version = "0.1.0"
 authors = ["Mark Mackey <mark@sigmaprime.io>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
--- a/common/lighthouse_version/src/lib.rs
+++ b/common/lighthouse_version/src/lib.rs
@@ -48,6 +48,22 @@ pub fn version_with_platform() -> String {
    format!("{}/{}-{}", VERSION, Target::arch(), Target::os())
 }

+/// Returns semantic versioning information only.
+///
+/// ## Example
+///
+/// `1.5.1`
+pub fn version() -> &'static str {
+    "6.0.1"
+}
+
+/// Returns the name of the current client running.
+///
+/// This will usually be "Lighthouse"
+pub fn client_name() -> &'static str {
+    "Lighthouse"
+}
+
 #[cfg(test)]
 mod test {
    use super::*;
@@ -64,4 +80,14 @@ mod test {
            VERSION
        );
    }
+
+    #[test]
+    fn semantic_version_formatting() {
+        let re = Regex::new(r"^[0-9]+\.[0-9]+\.[0-9]+").unwrap();
+        assert!(
+            re.is_match(version()),
+            "semantic version doesn't match regex: {}",
+            version()
+        );
+    }
 }
--- a/common/logging/src/lib.rs
+++ b/common/logging/src/lib.rs
@@ -205,7 +205,7 @@ impl TimeLatch {
    pub fn elapsed(&mut self) -> bool {
        let now = Instant::now();

-        let is_elapsed = self.0.map_or(false, |elapse_time| now > elapse_time);
+        let is_elapsed = self.0.is_some_and(|elapse_time| now > elapse_time);

        if is_elapsed || self.0.is_none() {
            self.0 = Some(now + LOG_DEBOUNCE_INTERVAL);