glamsterdam-devnet-8

Cargo.toml

@@ -19,6 +19,7 @@ members = [
     "boot_node",
     "common/account_utils",
     "common/axum_utils",
+    "common/builder_types",
     "common/clap_utils",
     "common/deposit_contract",
     "common/directory",
@@ -77,6 +78,7 @@ members = [
     "testing/web3signer_tests",
     "validator_client",
     "validator_client/beacon_node_fallback",
+    "validator_client/builder_store",
     "validator_client/doppelganger_service",
     "validator_client/graffiti_file",
     "validator_client/http_api",
@@ -118,6 +120,9 @@ beacon_processor = { path = "beacon_node/beacon_processor" }
 bincode = "1"
 bitvec = "1"
 bls = { path = "crypto/bls" }
+builder_client = { path = "beacon_node/builder_client" }
+builder_store = { path = "validator_client/builder_store" }
+builder_types = { path = "common/builder_types" }
 byteorder = "1"
 bytes = "1.11.1"
 cargo_metadata = "0.19"

beacon_node/beacon_chain/Cargo.toml

@@ -24,6 +24,7 @@ alloy-primitives = { workspace = true }
 arbitrary = { workspace = true, optional = true }
 bitvec = { workspace = true }
 bls = { workspace = true }
+builder_client = { workspace = true }
 educe = { workspace = true }
 eth2 = { workspace = true, features = ["lighthouse", "network"] }
 eth2_network_config = { workspace = true }

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -89,6 +89,7 @@ use crate::{
     CachedHead, metrics,
 };
 use bls::{PublicKey, PublicKeyBytes, Signature};
+use builder_client::Builders;
 use eth2::beacon_response::ForkVersionedResponse;
 use eth2::types::{
     EventKind, PtcDuty, SseBlobSidecar, SseBlock, SseDataColumnSidecar,
@@ -456,6 +457,9 @@ pub struct BeaconChain<T: BeaconChainTypes> {
     pub execution_layer: Option<ExecutionLayer<T::EthSpec>>,
     /// Client for the EIP-8025 proof engine, if one is configured.
     pub proof_engine: Option<Arc<ProofEngine>>,
+    /// Orchestrates direct builder bid requests and preference submissions over the Gloas Builder
+    /// API. Present only when the Gloas fork is scheduled.
+    pub builders: Option<Arc<Builders>>,
     /// Stores information about the canonical head and finalized/justified checkpoints of the
     /// chain. Also contains the fork choice struct, for computing the canonical head.
     pub canonical_head: CanonicalHead<T>,
@@ -6644,7 +6648,14 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             };
 
             let target_gas_limit = if prepare_slot_fork.gloas_enabled() {
-                let proposer_gas_limit = execution_layer.get_proposer_gas_limit(proposer).await;
+                let proposer_gas_limit = execution_layer
+                    .get_proposer_gas_limit(proposer)
+                    .await
+                    .or_else(|| {
+                        self.spec.get_scheduled_gas_limit(
+                            prepare_slot.epoch(T::EthSpec::slots_per_epoch()),
+                        )
+                    });
                 if proposer_gas_limit.is_none() {
                     warn!(
                         %proposer,