bump lighthouse types to v8.1.3

Author: JasonVranek

Cargo.lock

@@ -42,17 +42,18 @@ derive_more = { version = "2.0.1", features = ["deref", "display", "from", "into
 docker-compose-types = "0.16.0"
 docker-image = "0.2.1"
 ethereum_serde_utils = "0.7.0"
-ethereum_ssz = "0.9"
-ethereum_ssz_derive = "0.9"
+ethereum_ssz = "0.10"
+ethereum_ssz_derive = "0.10"
 eyre = "0.6.12"
 futures = "0.3.30"
 headers = "0.4.0"
 indexmap = "2.2.6"
 jsonwebtoken = { version = "9.3.1", default-features = false }
 lazy_static = "1.5.0"
-lh_eth2 = { package = "eth2", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
-lh_eth2_keystore = { package = "eth2_keystore", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
-lh_types = { package = "types", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
+lh_eth2 = { package = "eth2", git = "https://github.com/sigp/lighthouse", tag = "v8.1.3", features = ["events"] }
+lh_eth2_keystore = { package = "eth2_keystore", git = "https://github.com/sigp/lighthouse", tag = "v8.1.3" }
+lh_bls = { package = "bls", git = "https://github.com/sigp/lighthouse", tag = "v8.1.3" }
+lh_types = { package = "types", git = "https://github.com/sigp/lighthouse", tag = "v8.1.3" }
 notify = "8.2.0"
 parking_lot = "0.12.3"
 pbkdf2 = "0.12.2"
@@ -79,8 +80,8 @@ tracing = "0.1.40"
 tracing-appender = "0.2.3"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 tracing-test = { version = "0.2.5", features = ["no-env-filter"] }
-tree_hash = "^0.10"
-tree_hash_derive = "0.9"
+tree_hash = "0.12"
+tree_hash_derive = "0.12"
 typenum = "1.17.0"
 unicode-normalization = "0.1.24"
 url = { version = "2.5.0", features = ["serde"] }

Cargo.toml

@@ -27,6 +27,7 @@ eyre.workspace = true
 futures.workspace = true
 jsonwebtoken.workspace = true
 lazy_static.workspace = true
+lh_bls.workspace = true
 lh_eth2.workspace = true
 lh_eth2_keystore.workspace = true
 lh_types.workspace = true

crates/common/Cargo.toml

@@ -41,15 +41,17 @@ pub struct RuntimeMuxConfig {
     pub relays: Vec<RelayClient>,
 }
 
+/// Lookup tables produced by [`PbsMuxes::validate_and_fill`]:
+/// (pubkey → mux, registry-loader → mux).
+pub type MuxLookups =
+    (HashMap<BlsPublicKey, RuntimeMuxConfig>, HashMap<MuxKeysLoader, RuntimeMuxConfig>);
+
 impl PbsMuxes {
     pub async fn validate_and_fill(
         self,
         chain: Chain,
         default_pbs: &PbsConfig,
-    ) -> eyre::Result<(
-        HashMap<BlsPublicKey, RuntimeMuxConfig>,
-        HashMap<MuxKeysLoader, RuntimeMuxConfig>,
-    )> {
+    ) -> eyre::Result<MuxLookups> {
         let http_timeout = Duration::from_secs(default_pbs.http_timeout_seconds);
 
         let mut muxes = self.muxes;

crates/common/src/config/mux.rs

@@ -23,8 +23,8 @@ use super::{
 use crate::{
     commit::client::SignerClient,
     config::{
-        CONFIG_ENV, MODULE_JWT_ENV, MuxKeysLoader, PBS_IMAGE_DEFAULT, PBS_SERVICE_NAME, PbsMuxes,
-        SIGNER_URL_ENV, load_env_var, load_file_from_env,
+        CONFIG_ENV, MODULE_JWT_ENV, MuxKeysLoader, MuxLookups, PBS_IMAGE_DEFAULT, PBS_SERVICE_NAME,
+        PbsMuxes, SIGNER_URL_ENV, load_env_var, load_file_from_env,
     },
     pbs::{
         DEFAULT_PBS_PORT, DEFAULT_REGISTRY_REFRESH_SECONDS, DefaultTimeout, LATE_IN_SLOT_TIME_MS,
@@ -290,9 +290,9 @@ pub async fn load_pbs_config(config_path: Option<PathBuf>) -> Result<(PbsModuleC
     let mut all_relays = HashMap::with_capacity(relay_clients.len());
 
     // Validate the muxes and build the lookup tables
-    let (mux_lookup, registry_muxes) = match config.muxes {
+    let (mux_lookup, registry_muxes): (Option<_>, Option<_>) = match config.muxes {
         Some(muxes) => {
-            let (mux_lookup, registry_muxes) =
+            let (mux_lookup, registry_muxes): MuxLookups =
                 muxes.validate_and_fill(config.chain, &config.pbs.pbs_config).await?;
             (Some(mux_lookup), Some(registry_muxes))
         }
@@ -371,9 +371,9 @@ pub async fn load_pbs_custom_config<T: DeserializeOwned>() -> Result<(PbsModuleC
     let mut all_relays = HashMap::with_capacity(relay_clients.len());
 
     // Validate the muxes and build the lookup tables
-    let (mux_lookup, registry_muxes) = match cb_config.muxes {
+    let (mux_lookup, registry_muxes): (Option<_>, Option<_>) = match cb_config.muxes {
         Some(muxes) => {
-            let (mux_lookup, registry_muxes) = muxes
+            let (mux_lookup, registry_muxes): MuxLookups = muxes
                 .validate_and_fill(cb_config.chain, &cb_config.pbs.static_config.pbs_config)
                 .await?;
             (Some(mux_lookup), Some(registry_muxes))

crates/common/src/config/pbs.rs

@@ -1,29 +1,29 @@
 use alloy::primitives::{B256, U256, b256};
+use lh_eth2::ForkVersionedResponse;
+pub use lh_types::ForkName;
 use lh_types::{BlindedPayload, ExecPayload, MainnetEthSpec};
-pub use lh_types::{ForkName, ForkVersionedResponse};
 use serde::{Deserialize, Serialize};
 
 use crate::types::BlsPublicKey;
 
 pub const EMPTY_TX_ROOT_HASH: B256 =
     b256!("7ffe241ea60187fdb0187bfa22de35d1f9bed7ab061d9401fd47e34a54fbede1");
 
-pub type ExecutionRequests = lh_types::execution_requests::ExecutionRequests<MainnetEthSpec>;
+pub type ExecutionRequests = lh_types::ExecutionRequests<MainnetEthSpec>;
 
 /// Request object of POST `/eth/v1/builder/blinded_blocks`
-pub type SignedBlindedBeaconBlock =
-    lh_types::signed_beacon_block::SignedBlindedBeaconBlock<MainnetEthSpec>;
+pub type SignedBlindedBeaconBlock = lh_types::SignedBlindedBeaconBlock<MainnetEthSpec>;
 pub type BlindedBeaconBlock<'a> =
-    lh_types::beacon_block::BeaconBlockRef<'a, MainnetEthSpec, BlindedPayload<MainnetEthSpec>>;
+    lh_types::BeaconBlockRef<'a, MainnetEthSpec, BlindedPayload<MainnetEthSpec>>;
 pub type BlindedBeaconBlockElectra =
-    lh_types::beacon_block::BeaconBlockElectra<MainnetEthSpec, BlindedPayload<MainnetEthSpec>>;
+    lh_types::BeaconBlockElectra<MainnetEthSpec, BlindedPayload<MainnetEthSpec>>;
 pub type BlindedBeaconBlockFulu =
-    lh_types::beacon_block::BeaconBlockFulu<MainnetEthSpec, BlindedPayload<MainnetEthSpec>>;
+    lh_types::BeaconBlockFulu<MainnetEthSpec, BlindedPayload<MainnetEthSpec>>;
 
 pub type BlobsBundle = lh_eth2::types::BlobsBundle<MainnetEthSpec>;
 pub type PayloadAndBlobs = lh_eth2::types::ExecutionPayloadAndBlobs<MainnetEthSpec>;
 /// Response object of POST `/eth/v1/builder/blinded_blocks`
-pub type SubmitBlindedBlockResponse = lh_types::ForkVersionedResponse<PayloadAndBlobs>;
+pub type SubmitBlindedBlockResponse = ForkVersionedResponse<PayloadAndBlobs>;
 
 pub type ExecutionPayloadHeader = lh_types::ExecutionPayloadHeader<MainnetEthSpec>;
 pub type ExecutionPayloadHeaderElectra = lh_types::ExecutionPayloadHeaderElectra<MainnetEthSpec>;
@@ -32,15 +32,15 @@ pub type ExecutionPayloadHeaderRef<'a> = lh_types::ExecutionPayloadHeaderRef<'a,
 pub type ExecutionPayload = lh_types::ExecutionPayload<MainnetEthSpec>;
 pub type ExecutionPayloadElectra = lh_types::ExecutionPayloadElectra<MainnetEthSpec>;
 pub type ExecutionPayloadFulu = lh_types::ExecutionPayloadFulu<MainnetEthSpec>;
-pub type SignedBuilderBid = lh_types::builder_bid::SignedBuilderBid<MainnetEthSpec>;
-pub type BuilderBid = lh_types::builder_bid::BuilderBid<MainnetEthSpec>;
-pub type BuilderBidElectra = lh_types::builder_bid::BuilderBidElectra<MainnetEthSpec>;
+pub type SignedBuilderBid = lh_types::SignedBuilderBid<MainnetEthSpec>;
+pub type BuilderBid = lh_types::BuilderBid<MainnetEthSpec>;
+pub type BuilderBidElectra = lh_types::BuilderBidElectra<MainnetEthSpec>;
 
 /// Response object of GET
 /// `/eth/v1/builder/header/{slot}/{parent_hash}/{pubkey}`
-pub type GetHeaderResponse = lh_types::ForkVersionedResponse<SignedBuilderBid>;
+pub type GetHeaderResponse = ForkVersionedResponse<SignedBuilderBid>;
 
-pub type KzgCommitments = lh_types::beacon_block_body::KzgCommitments<MainnetEthSpec>;
+pub type KzgCommitments = lh_types::KzgCommitments<MainnetEthSpec>;
 
 /// Response params of GET
 /// `/eth/v1/builder/header/{slot}/{parent_hash}/{pubkey}`

crates/common/src/pbs/types/mod.rs

@@ -8,10 +8,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{constants::APPLICATION_BUILDER_DOMAIN, signature::compute_domain};
 
-pub type BlsPublicKeyBytes = lh_types::PublicKeyBytes;
-pub type BlsPublicKey = lh_types::PublicKey;
-pub type BlsSignature = lh_types::Signature;
-pub type BlsSecretKey = lh_types::SecretKey;
+pub type BlsPublicKeyBytes = lh_bls::PublicKeyBytes;
+pub type BlsPublicKey = lh_bls::PublicKey;
+pub type BlsSignature = lh_bls::Signature;
+pub type BlsSecretKey = lh_bls::SecretKey;
 
 #[derive(Clone, Debug, Display, PartialEq, Eq, Hash, Deref, From, Into, Serialize, Deserialize)]
 #[into(owned, ref, ref_mut)]

crates/common/src/types.rs

@@ -395,8 +395,7 @@ async fn send_one_get_header(
     match &get_header_response.data.message.header() {
         ExecutionPayloadHeaderRef::Bellatrix(_) |
         ExecutionPayloadHeaderRef::Capella(_) |
-        ExecutionPayloadHeaderRef::Deneb(_) |
-        ExecutionPayloadHeaderRef::Gloas(_) => {
+        ExecutionPayloadHeaderRef::Deneb(_) => {
             return Err(PbsError::Validation(ValidationError::UnsupportedFork))
         }
         ExecutionPayloadHeaderRef::Electra(res) => {