Use only lighthouse types in the mock builder (sigp#4793)

- only use LH types to avoid build issues
- use warp instead of axum for the server to avoid importing the dep

- wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency
- this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate
- or maybe we can look into using reth types for the engine api if they are in their own crate

Co-authored-by: realbigsean <[email protected]>

beacon_node/execution_layer/Cargo.toml

@@ -41,11 +41,6 @@ lazy_static = { workspace = true }
 ethers-core = { workspace = true }
 builder_client = { path = "../builder_client" }
 fork_choice = { workspace = true }
-mev-rs = { git = "https://github.com/ralexstokes/mev-rs", rev = "216657016d5c0889b505857c89ae42c7aa2764af" }
-axum = "0.6"
-hyper = "0.14"
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "e380108" }
-ssz_rs = "0.9.0"
 tokio-stream = { workspace = true }
 strum = { workspace = true }
 keccak-hash = "0.10.0"

beacon_node/execution_layer/src/test_utils/mod.rs

@@ -25,7 +25,7 @@ use warp::{http::StatusCode, Filter, Rejection};
 use crate::EngineCapabilities;
 pub use execution_block_generator::{generate_pow_block, Block, ExecutionBlockGenerator};
 pub use hook::Hook;
-pub use mock_builder::{Context as MockBuilderContext, MockBuilder, MockBuilderServer, Operation};
+pub use mock_builder::{MockBuilder, Operation};
 pub use mock_execution_layer::MockExecutionLayer;
 
 pub const DEFAULT_TERMINAL_DIFFICULTY: u64 = 6400;

beacon_node/http_api/tests/tests.rs

@@ -265,11 +265,7 @@ impl ApiTester {
 
         // Start the mock builder service prior to building the chain out.
         harness.runtime.task_executor.spawn(
-            async move {
-                if let Err(e) = mock_builder_server.await {
-                    panic!("error in mock builder server: {e:?}");
-                }
-            },
+            async move { mock_builder_server.await },
             "mock_builder_server",
         );
 

consensus/types/src/builder_bid.rs

@@ -21,7 +21,7 @@ pub struct BuilderBid<E: EthSpec, Payload: AbstractExecPayload<E>> {
     pub pubkey: PublicKeyBytes,
     #[serde(skip)]
     #[tree_hash(skip_hashing)]
-    _phantom_data: PhantomData<E>,
+    pub _phantom_data: PhantomData<E>,
 }
 
 impl<E: EthSpec, Payload: AbstractExecPayload<E>> SignedRoot for BuilderBid<E, Payload> {}

consensus/types/src/validator_registration_data.rs

@@ -21,3 +21,17 @@ pub struct ValidatorRegistrationData {
 }
 
 impl SignedRoot for ValidatorRegistrationData {}
+
+impl SignedValidatorRegistrationData {
+    pub fn verify_signature(&self, spec: &ChainSpec) -> bool {
+        self.message
+            .pubkey
+            .decompress()
+            .map(|pubkey| {
+                let domain = spec.get_builder_domain();
+                let message = self.message.signing_root(domain);
+                self.signature.verify(&pubkey, message)
+            })
+            .unwrap_or(false)
+    }
+}

validator_client/Cargo.toml

@@ -56,7 +56,7 @@ itertools = { workspace = true }
 monitoring_api = { workspace = true }
 sensitive_url = { workspace = true }
 task_executor = { workspace = true }
-reqwest = { workspace = true }
+reqwest = { workspace = true, features = ["native-tls"] }
 url = { workspace = true }
 malloc_utils = { workspace = true }
 sysinfo = { workspace = true }

validator_client/src/http_api/tests/keystores.rs

@@ -2146,7 +2146,7 @@ async fn import_remotekey_web3signer_enabled() {
         assert_eq!(tester.vals_total(), 1);
         assert_eq!(tester.vals_enabled(), 1);
         let vals = tester.initialized_validators.read();
-        let web3_vals = vals.validator_definitions().clone();
+        let web3_vals = vals.validator_definitions();
 
         // Import remotekeys.
         let import_res = tester
@@ -2164,7 +2164,7 @@ async fn import_remotekey_web3signer_enabled() {
         assert_eq!(tester.vals_total(), 1);
         assert_eq!(tester.vals_enabled(), 1);
         let vals = tester.initialized_validators.read();
-        let remote_vals = vals.validator_definitions().clone();
+        let remote_vals = vals.validator_definitions();
 
         // Web3signer should not be overwritten since it is enabled.
         assert!(web3_vals == remote_vals);