feat: add the ability to skip the relayer public key check

Author: aimxhaisse

config.example.toml

@@ -40,6 +40,9 @@ timeout_register_validator_ms = 3000
 # Whether to skip signature verification of headers against the relay pubkey
 # OPTIONAL, DEFAULT: false
 skip_sigverify = false
+# Whether to skip the public key of the PBS relayer. Useful if the relayer is a local pre-confirmation module.
+# OPTIONAL, DEFAULT: false
+skip_relayer_pubkey_check = false
 # Minimum bid in ETH that will be accepted from `get_header`
 # Can be specified as a float or a string for extra precision (e.g. "0.01")
 # OPTIONAL, DEFAULT: 0.0

crates/common/src/config/pbs.rs

@@ -83,6 +83,8 @@ pub struct PbsConfig {
     /// Whether to skip the relay signature verification
     #[serde(default = "default_bool::<false>")]
     pub skip_sigverify: bool,
+    /// Whether to skip the relay pubkey verification
+    pub skip_relayer_pubkey_check: bool,
     /// Minimum bid that will be accepted from get_header
     #[serde(rename = "min_bid_eth", with = "as_eth_str", default = "default_u256")]
     pub min_bid_wei: U256,

crates/pbs/src/mev_boost/get_header.rs

@@ -91,6 +91,7 @@ pub async fn get_header<S: BuilderApiState>(
             max_timeout_ms,
             ValidationContext {
                 skip_sigverify: state.pbs_config().skip_sigverify,
+                skip_relayer_pubkey_check: state.pbs_config().skip_relayer_pubkey_check,
                 min_bid_wei: state.pbs_config().min_bid_wei,
                 extra_validation_enabled: state.extra_validation_enabled(),
                 parent_block: parent_block.clone(),
@@ -265,6 +266,7 @@ struct RequestContext {
 #[derive(Clone)]
 struct ValidationContext {
     skip_sigverify: bool,
+    skip_relayer_pubkey_check: bool,
     min_bid_wei: U256,
     extra_validation_enabled: bool,
     parent_block: Arc<RwLock<Option<Block>>>,
@@ -349,6 +351,7 @@ async fn send_one_get_header(
         relay.pubkey(),
         params.parent_hash,
         validation.skip_sigverify,
+        validation.skip_relayer_pubkey_check,
         validation.min_bid_wei,
         params.slot,
     )?;
@@ -371,6 +374,7 @@ fn validate_header(
     expected_relay_pubkey: BlsPublicKey,
     parent_hash: B256,
     skip_sig_verify: bool,
+    skip_relayer_pubkey_check: bool,
     minimum_bid_wei: U256,
     slot: u64,
 ) -> Result<(), ValidationError> {
@@ -398,7 +402,7 @@ fn validate_header(
         return Err(ValidationError::BidTooLow { min: minimum_bid_wei, got: value });
     }
 
-    if expected_relay_pubkey != received_relay_pubkey {
+    if !skip_relayer_pubkey_check && expected_relay_pubkey != received_relay_pubkey {
         return Err(ValidationError::PubkeyMismatch {
             expected: expected_relay_pubkey,
             got: received_relay_pubkey,
@@ -410,7 +414,7 @@ fn validate_header(
         return Err(ValidationError::TimestampMismatch {
             expected: expected_timestamp,
             got: signed_header.message.header.timestamp,
-        })
+        });
     }
 
     if !skip_sig_verify {
@@ -489,6 +493,7 @@ mod tests {
                 BlsPublicKey::default(),
                 parent_hash,
                 false,
+                false,
                 min_bid,
                 slot,
             ),
@@ -504,6 +509,7 @@ mod tests {
                 BlsPublicKey::default(),
                 parent_hash,
                 false,
+                false,
                 min_bid,
                 slot,
             ),
@@ -522,6 +528,7 @@ mod tests {
                 BlsPublicKey::default(),
                 parent_hash,
                 false,
+                false,
                 min_bid,
                 slot,
             ),
@@ -537,6 +544,7 @@ mod tests {
                 BlsPublicKey::default(),
                 parent_hash,
                 false,
+                false,
                 min_bid,
                 slot,
             ),
@@ -554,6 +562,7 @@ mod tests {
                 BlsPublicKey::default(),
                 parent_hash,
                 false,
+                false,
                 min_bid,
                 slot,
             ),
@@ -562,24 +571,52 @@ mod tests {
 
         let expected = timestamp_of_slot_start_sec(slot, chain);
         assert_eq!(
-            validate_header(&mock_header, chain, pubkey, parent_hash, false, min_bid, slot,),
+            validate_header(&mock_header, chain, pubkey, parent_hash, false, false, min_bid, slot,),
             Err(ValidationError::TimestampMismatch { expected, got: 0 })
         );
 
         mock_header.message.header.timestamp = expected;
 
         assert!(matches!(
-            validate_header(&mock_header, chain, pubkey, parent_hash, false, min_bid, slot),
+            validate_header(&mock_header, chain, pubkey, parent_hash, false, false, min_bid, slot),
             Err(ValidationError::Sigverify(_))
         ));
-        assert!(
-            validate_header(&mock_header, chain, pubkey, parent_hash, true, min_bid, slot).is_ok()
-        );
+        assert!(validate_header(
+            &mock_header,
+            chain,
+            pubkey,
+            parent_hash,
+            true,
+            false,
+            min_bid,
+            slot
+        )
+        .is_ok());
+
+        assert!(validate_header(
+            &mock_header,
+            chain,
+            BlsPublicKey::default(),
+            parent_hash,
+            true,
+            true,
+            min_bid,
+            slot
+        )
+        .is_ok());
 
         mock_header.signature = sign_builder_message(chain, &secret_key, &mock_header.message);
 
-        assert!(
-            validate_header(&mock_header, chain, pubkey, parent_hash, false, min_bid, slot).is_ok()
+        assert!(validate_header(
+            &mock_header,
+            chain,
+            pubkey,
+            parent_hash,
+            false,
+            false,
+            min_bid,
+            slot
         )
+        .is_ok());
     }
 }

tests/tests/pbs_integration.rs

@@ -33,6 +33,7 @@ fn get_pbs_static_config(port: u16) -> PbsConfig {
         timeout_get_payload_ms: u64::MAX,
         timeout_register_validator_ms: u64::MAX,
         skip_sigverify: false,
+        skip_relayer_pubkey_check: false,
         min_bid_wei: U256::ZERO,
         late_in_slot_time_ms: u64::MAX,
         relay_monitors: vec![],