PR feedback

Author: realbigsean

beacon_node/http_api/src/lib.rs

@@ -2397,12 +2397,10 @@ pub fn serve<T: BeaconChainTypes>(
         .and(warp::path::end())
         .and(not_while_syncing_filter.clone())
         .and(chain_filter.clone())
-        .and(warp::addr::remote())
         .and(log_filter.clone())
         .and(warp::body::json())
         .and_then(
             |chain: Arc<BeaconChain<T>>,
-             client_addr: Option<SocketAddr>,
              log: Logger,
              preparation_data: Vec<ProposerPreparationData>| {
                 blocking_json_task(move || {
@@ -2419,9 +2417,6 @@ pub fn serve<T: BeaconChainTypes>(
                         log,
                         "Received proposer preparation data";
                         "count" => preparation_data.len(),
-                        "client" => client_addr
-                            .map(|a| a.to_string())
-                            .unwrap_or_else(|| "unknown".to_string()),
                     );
 
                     execution_layer
@@ -2450,12 +2445,10 @@ pub fn serve<T: BeaconChainTypes>(
         .and(warp::path("register_validator"))
         .and(warp::path::end())
         .and(chain_filter.clone())
-        .and(warp::addr::remote())
         .and(log_filter.clone())
         .and(warp::body::json())
         .and_then(
             |chain: Arc<BeaconChain<T>>,
-             client_addr: Option<SocketAddr>,
              log: Logger,
              register_val_data: Vec<SignedValidatorRegistrationData>| {
                 blocking_json_task(move || {
@@ -2472,9 +2465,6 @@ pub fn serve<T: BeaconChainTypes>(
                         log,
                         "Received register validator request";
                         "count" => register_val_data.len(),
-                        "client" => client_addr
-                            .map(|a| a.to_string())
-                            .unwrap_or_else(|| "unknown".to_string()),
                     );
 
                     let preparation_data = register_val_data
@@ -2491,11 +2481,11 @@ pub fn serve<T: BeaconChainTypes>(
                         })
                         .collect::<Vec<_>>();
 
-debug!(
-    log,
-    "Resolved validator request pubkeys";
-    "count" => preparation_data.len()
-);
+                    debug!(
+                        log,
+                        "Resolved validator request pubkeys";
+                        "count" => preparation_data.len()
+                    );
 
                     // Update the prepare beacon proposer cache based on this request.
                     execution_layer

consensus/types/src/application_domain.rs

@@ -1,3 +1,7 @@
+/// This value is an application index of 0 with the bitmask applied (so it's equivalent to the bit mask).
+/// Little endian hex: 0x00000001, Binary: 1000000000000000000000000
+pub const APPLICATION_DOMAIN_BUILDER: u32 = 16777216;
+
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum ApplicationDomain {
     Builder,
@@ -6,9 +10,7 @@ pub enum ApplicationDomain {
 impl ApplicationDomain {
     pub fn get_domain_constant(&self) -> u32 {
         match self {
-            // This value is an application index of 0 with the bitmask applied (so it's equivalent to the bit mask).
-            // Little endian hex: 0x00000001, Binary: 1000000000000000000000000
-            ApplicationDomain::Builder => 16777216,
+            ApplicationDomain::Builder => APPLICATION_DOMAIN_BUILDER,
         }
     }
 }

consensus/types/src/chain_spec.rs

@@ -1,4 +1,4 @@
-use crate::application_domain::ApplicationDomain;
+use crate::application_domain::{ApplicationDomain, APPLICATION_DOMAIN_BUILDER};
 use crate::*;
 use eth2_serde_utils::quoted_u64::MaybeQuoted;
 use int_to_bytes::int_to_bytes4;
@@ -588,7 +588,7 @@ impl ChainSpec {
             /*
              * Application specific
              */
-            domain_application_mask: 16777216, // Little endian hex: 0x00000001, Binary: 1000000000000000000000000
+            domain_application_mask: APPLICATION_DOMAIN_BUILDER,
         }
     }
 
@@ -791,7 +791,7 @@ impl ChainSpec {
             /*
              * Application specific
              */
-            domain_application_mask: 16777216, // Little endian hex: 0x00000001, Binary: 1000000000000000000000000
+            domain_application_mask: APPLICATION_DOMAIN_BUILDER,
         }
     }
 }

validator_client/src/preparation_service.rs

@@ -483,7 +483,7 @@ impl<T: SlotClock + 'static, E: EthSpec> PreparationService<T, E> {
 
             match self
                 .beacon_nodes
-                .first_success(RequireSynced::No, |beacon_node| async move {
+                .first_success(RequireSynced::Yes, |beacon_node| async move {
                     beacon_node
                         .post_validator_register_validator(signed_ref)
                         .await

validator_client/src/signing_method.rs

@@ -30,6 +30,7 @@ pub enum Error {
     ShuttingDown,
     TokioJoin(String),
     MergeForkNotSupported,
+    GenesisForkVersionRequired,
 }
 
 /// Enumerates all messages that can be signed by a validator.
@@ -207,6 +208,14 @@ impl SigningMethod {
                 // Determine the Web3Signer message type.
                 let message_type = object.message_type();
 
+                if matches!(
+                    object,
+                    Web3SignerObject::Deposit { .. } | Web3SignerObject::ValidatorRegistration(_)
+                ) && fork_info.is_some()
+                {
+                    return Err(Error::GenesisForkVersionRequired);
+                }
+
                 let request = SigningRequest {
                     message_type,
                     fork_info,