feat(sidecar): constraints client

bolt-boost/src/types.rs

@@ -1,11 +1,12 @@
 use alloy::{
     consensus::TxEnvelope,
     eips::eip2718::{Decodable2718, Eip2718Error},
-    primitives::{Bytes, TxHash, B256},
+    primitives::{keccak256, Bytes, TxHash, B256},
     rpc::types::beacon::{BlsPublicKey, BlsSignature},
+    signers::k256::sha2::{Digest, Sha256},
 };
 use axum::http::HeaderMap;
-use commit_boost::prelude::tree_hash::{self, MerkleHasher, TreeHash, TreeHashType};
+use commit_boost::prelude::tree_hash;
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
@@ -14,7 +15,8 @@ use std::ops::Deref;
 use cb_common::{
     constants::COMMIT_BOOST_DOMAIN,
     pbs::{DenebSpec, EthSpec, SignedExecutionPayloadHeader, Transaction, VersionedResponse},
-    signature::verify_signed_message,
+    signature::{compute_domain, compute_signing_root},
+    signer::schemes::bls::verify_bls_signature,
     types::Chain,
 };
 
@@ -42,8 +44,10 @@ impl SignedConstraints {
     /// The `chain` and `COMMIT_BOOST_DOMAIN` are used to compute the signing root.
     #[allow(unused)]
     pub fn verify_signature(&self, chain: Chain, pubkey: &BlsPublicKey) -> bool {
-        verify_signed_message(chain, pubkey, &self.message, &self.signature, COMMIT_BOOST_DOMAIN)
-            .is_ok()
+        let domain = compute_domain(chain, COMMIT_BOOST_DOMAIN);
+        let signing_root = compute_signing_root(self.message.digest(), domain);
+
+        verify_bls_signature(pubkey, &signing_root, &self.signature).is_ok()
     }
 }
 
@@ -56,47 +60,18 @@ pub struct ConstraintsMessage {
 }
 
 impl ConstraintsMessage {
-    /// Returns the total number of leaves in the tree.
-    fn total_leaves(&self) -> usize {
-        4 + self.transactions.len()
-    }
-}
-
-impl TreeHash for ConstraintsMessage {
-    fn tree_hash_type() -> TreeHashType {
-        TreeHashType::Container
-    }
-
-    fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
-        unreachable!("ConstraintsMessage should never be packed.")
-    }
-
-    fn tree_hash_packing_factor() -> usize {
-        unreachable!("ConstraintsMessage should never be packed.")
-    }
-
-    fn tree_hash_root(&self) -> HashTreeRoot {
-        let mut hasher = MerkleHasher::with_leaves(self.total_leaves());
-
-        hasher
-            .write(&self.validator_index.to_le_bytes())
-            .expect("Should write validator index bytes");
-        hasher.write(&self.slot.to_le_bytes()).expect("Should write slot bytes");
-        hasher.write(&(self.top as u8).to_le_bytes()).expect("Should write top flag");
-
-        for transaction in &self.transactions {
-            hasher
-                .write(
-                    Transaction::<<DenebSpec as EthSpec>::MaxBytesPerTransaction>::from(
-                        transaction.to_vec(),
-                    )
-                    .tree_hash_root()
-                    .as_bytes(),
-                )
-                .expect("Should write transaction root");
+    /// Returns the digest of this message.
+    pub fn digest(&self) -> [u8; 32] {
+        let mut hasher = Sha256::new();
+        hasher.update(self.validator_index.to_le_bytes());
+        hasher.update(self.slot.to_le_bytes());
+        hasher.update((self.top as u8).to_le_bytes());
+
+        for constraint in &self.transactions {
+            hasher.update(keccak256(constraint));
         }
 
-        hasher.finish().unwrap()
+        hasher.finalize().into()
     }
 }
 

bolt-sidecar/.env.example

@@ -3,12 +3,12 @@
 BOLT_SIDECAR_EXECUTION_API_URL=http://localhost:4485
 BOLT_SIDECAR_BEACON_API_URL=http://localhost:4400
 BOLT_SIDECAR_ENGINE_API_URL=http://localhost:4451
-BOLT_SIDECAR_MEVBOOST_URL=http://localhost:19550
+BOLT_SIDECAR_CONSTRAINTS_URL=http://localhost:19550
 BOLT_SIDECAR_CB_SIGNER_URL=http://localhost:19551
 
 # server ports
 BOLT_SIDECAR_PORT=8000
-BOLT_SIDECAR_MEVBOOST_PROXY_PORT=18551
+BOLT_SIDECAR_CONSTRAINTS_PROXY_PORT=18551
 
 # commitment limits 
 BOLT_SIDECAR_MAX_COMMITMENTS=128

bolt-sidecar/Cargo.toml

@@ -69,8 +69,8 @@ metrics-exporter-prometheus = { version = "0.15.3", features = [
 ] }
 
 # commit-boost
-commit-boost = { git = "https://github.com/Commit-Boost/commit-boost-client" }
-cb-common = { git = "https://github.com/Commit-Boost/commit-boost-client" }
+commit-boost = { git = "https://github.com/Commit-Boost/commit-boost-client", rev = "45ce8f1"}
+cb-common = { git = "https://github.com/Commit-Boost/commit-boost-client", rev = "45ce8f1" }
 
 [dev-dependencies]
 alloy-node-bindings = "0.2.0"

bolt-sidecar/README.md

@@ -11,7 +11,7 @@ The sidecar is responsible for:
 3. Implementing pricing strategies
 4. Building a block template & simulation
 5. Communicating constraints to the downstream PBS pipeline
-6. Verifying any incoming builder bids from mev-boost
+6. Verifying any incoming builder bids from constraints client
 7. Dealing with PBS failures by falling back to the local template
 
 ### Local Block Template
@@ -38,4 +38,4 @@ in case a fallback block is required.
 
 ## Running
 
-- We require Anvil to be installed in the $PATH for running tests
+-   We require Anvil to be installed in the $PATH for running tests

bolt-sidecar/src/api/builder.rs

@@ -26,7 +26,7 @@ use super::spec::{
     STATUS_PATH,
 };
 use crate::{
-    client::mevboost::MevBoostClient,
+    client::constraints_client::ConstraintsClient,
     primitives::{GetPayloadResponse, PayloadFetcher, SignedBuilderBid},
     telemetry::ApiMetrics,
 };
@@ -63,15 +63,15 @@ where
         Self { proxy_target, local_payload: Mutex::new(None), payload_fetcher }
     }
 
-    /// Gets the status. Just forwards the request to mev-boost and returns the status.
+    /// Gets the status. Just forwards the request to constraints client and returns the status.
     pub async fn status(State(server): State<Arc<BuilderProxyServer<T, P>>>) -> StatusCode {
         let start = std::time::Instant::now();
         debug!("Received status request");
 
         let status = match server.proxy_target.status().await {
             Ok(status) => status,
             Err(error) => {
-                error!(%error, "Failed to get status from mev-boost");
+                error!(%error, "Failed to get status from constraints client");
                 StatusCode::INTERNAL_SERVER_ERROR
             }
         };
@@ -82,7 +82,7 @@ where
         status
     }
 
-    /// Registers the validators. Just forwards the request to mev-boost
+    /// Registers the validators. Just forwards the request to constraints client
     /// and returns the status.
     ///
     /// TODO: intercept this to register Bolt validators on-chain as well.
@@ -96,7 +96,7 @@ where
     }
 
     /// Gets the header. NOTE: converts this request to a get_header_with_proofs
-    /// request to the modified mev-boost.
+    /// request to the modified constraints client.
     ///
     /// In case of a builder or relay failure, we return the locally built block header
     /// and store the actual payload so we can return it later.
@@ -203,11 +203,11 @@ where
             .await
             .map(Json)
             .map_err(|e| {
-                error!(elapsed = ?start.elapsed(), error = %e, "Failed to get payload from mev-boost");
+                error!(elapsed = ?start.elapsed(), error = %e, "Failed to get payload from constraints client");
                 e
             })?;
 
-        info!(elapsed = ?start.elapsed(), "Returning payload from mev-boost");
+        info!(elapsed = ?start.elapsed(), "Returning payload from constraints client");
         ApiMetrics::increment_remote_blocks_proposed();
 
         Ok(payload)
@@ -217,8 +217,8 @@ where
 /// Configuration for the builder proxy.
 #[derive(Debug, Clone)]
 pub struct BuilderProxyConfig {
-    /// The URL of the target mev-boost server.
-    pub mevboost_url: Url,
+    /// The URL of the target constraints client server.
+    pub constraints_url: Url,
     /// The port on which the builder proxy should listen.
     pub server_port: u16,
 }
@@ -233,11 +233,11 @@ where
 {
     info!(
         port = config.server_port,
-        target = config.mevboost_url.to_string(),
+        target = config.constraints_url.to_string(),
         "Starting builder proxy..."
     );
 
-    let mev_boost = MevBoostClient::new(config.mevboost_url);
+    let mev_boost = ConstraintsClient::new(config.constraints_url);
     let server = Arc::new(BuilderProxyServer::new(mev_boost, payload_fetcher));
 
     let router = Router::new()

bolt-sidecar/src/api/commitments/handlers.rs

@@ -52,7 +52,10 @@ pub async fn rpc_entrypoint(
 
             // Parse the inclusion request from the parameters
             let mut inclusion_request: InclusionRequest = serde_json::from_value(request_json)
-                .map_err(|e| RejectionError::ValidationFailed(e.to_string()))?;
+                .map_err(|e| RejectionError::ValidationFailed(e.to_string()))
+                .inspect_err(|e| error!("Failed to parse inclusion request: {:?}", e))?;
+
+            debug!(?inclusion_request, "New inclusion request");
 
             // Set the signature here for later processing
             inclusion_request.set_signature(signature);

bolt-sidecar/src/api/spec.rs

@@ -9,7 +9,10 @@ use ethereum_consensus::{
 };
 use serde::{Deserialize, Serialize, Serializer};
 
-use crate::primitives::{BatchedSignedConstraints, GetPayloadResponse, SignedBuilderBid};
+use crate::primitives::{
+    BatchedSignedConstraints, GetPayloadResponse, SignedBuilderBid, SignedDelegation,
+    SignedRevocation,
+};
 
 use super::builder::GetHeaderParams;
 
@@ -22,7 +25,11 @@ pub const GET_HEADER_PATH: &str = "/eth/v1/builder/header/:slot/:parent_hash/:pu
 /// The path to the builder API get payload endpoint.
 pub const GET_PAYLOAD_PATH: &str = "/eth/v1/builder/blinded_blocks";
 /// The path to the constraints API submit constraints endpoint.
-pub const CONSTRAINTS_PATH: &str = "/eth/v1/builder/constraints";
+pub const SUBMIT_CONSTRAINTS_PATH: &str = "/constraints/v1/builder/constraints";
+/// The path to the constraints API delegate endpoint.
+pub const DELEGATE_PATH: &str = "/constraints/v1/builder/delegate";
+/// The path to the constraints API revoke endpoint.
+pub const REVOKE_PATH: &str = "/constraints/v1/builder/revoke";
 
 /// A response object for errors.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -52,6 +59,10 @@ pub enum BuilderApiError {
     FailedGettingPayload(ErrorResponse),
     #[error("Failed submitting constraints: {0:?}")]
     FailedSubmittingConstraints(ErrorResponse),
+    #[error("Failed to delegate constraint submission rights: {0:?}")]
+    FailedDelegating(ErrorResponse),
+    #[error("Failed to revoke constraint submission rights: {0:?}")]
+    FailedRevoking(ErrorResponse),
     #[error("Failed to fetch local payload for slot {0}")]
     FailedToFetchLocalPayload(u64),
     #[error("Axum error: {0:?}")]
@@ -85,6 +96,12 @@ impl IntoResponse for BuilderApiError {
             BuilderApiError::FailedSubmittingConstraints(error) => {
                 (StatusCode::from_u16(error.code).unwrap(), Json(error)).into_response()
             }
+            BuilderApiError::FailedDelegating(error) => {
+                (StatusCode::from_u16(error.code).unwrap(), Json(error)).into_response()
+            }
+            BuilderApiError::FailedRevoking(error) => {
+                (StatusCode::from_u16(error.code).unwrap(), Json(error)).into_response()
+            }
             BuilderApiError::AxumError(err) => {
                 (StatusCode::BAD_REQUEST, err.to_string()).into_response()
             }
@@ -142,15 +159,21 @@ pub trait BuilderApi {
 #[async_trait::async_trait]
 /// Implements the constraints API as defines in <https://chainbound.github.io/bolt-docs/api/builder-api>
 pub trait ConstraintsApi: BuilderApi {
-    /// Implements: <https://chainbound.github.io/bolt-docs/api/builder-api#ethv1builderconstraints>
+    /// Implements: <https://chainbound.github.io/bolt-docs/api/builder#constraints>
     async fn submit_constraints(
         &self,
         constraints: &BatchedSignedConstraints,
     ) -> Result<(), BuilderApiError>;
 
-    /// Implements: <https://chainbound.github.io/bolt-docs/api/builder-api#ethv1builderheader_with_proofsslotparent_hashpubkey>
+    /// Implements: <https://chainbound.github.io/bolt-docs/api/builder#get_header_with_proofs>
     async fn get_header_with_proofs(
         &self,
         params: GetHeaderParams,
     ) -> Result<VersionedValue<SignedBuilderBid>, BuilderApiError>;
+
+    /// Implements: <https://chainbound.github.io/bolt-docs/api/builder#delegate>
+    async fn delegate(&self, signed_data: SignedDelegation) -> Result<(), BuilderApiError>;
+
+    /// Implements: <https://chainbound.github.io/bolt-docs/api/builder#revoke>
+    async fn revoke(&self, signed_data: SignedRevocation) -> Result<(), BuilderApiError>;
 }

bolt-sidecar/src/builder/mod.rs

@@ -102,7 +102,7 @@ impl LocalBuilder {
         // the current head of the chain
         let block = self.fallback_builder.build_fallback_payload(slot, &transactions).await?;
 
-        // NOTE: we use a big value for the bid to ensure it gets chosen by mev-boost.
+        // NOTE: we use a big value for the bid to ensure it gets chosen by constraints client.
         // the client has no way to actually verify this, and we don't need to trust
         // an external relay as this block is self-built, so the fake bid value is fine.
         //