remove patch overrides

Cargo.toml

@@ -8,11 +8,7 @@ members = [
 ]
 default-members = ["bin/mev"]
 
-[patch."https://github.com/ralexstokes/ethereum-consensus"]
-ethereum-consensus = { git = "https://github.com/ralexstokes//ethereum-consensus", rev = "ef89b4a" }
-
-[patch."https://github.com/ralexstokes/ssz-rs"]
-ssz-rs = { git = "https://github.com/ralexstokes//ssz-rs", rev = "45ff6f1" }
-
-[patch."https://github.com/ralexstokes/beacon-api-client"]
-beacon-api-client = { git = "https://github.com/ralexstokes//beacon-api-client", rev = "53690a711e33614d59d4d44fb09762b4699e2a4e" }
+[workspace.dependencies]
+ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "e380108" }
+beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client", rev = "93d7e8c" }
+ssz_rs = "0.9.0"

mev-boost-rs/Cargo.toml

@@ -19,8 +19,8 @@ serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0.30"
 parking_lot = "0.12.1"
 
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
-beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client" }
+ethereum-consensus = { workspace = true }
+beacon-api-client = { workspace = true }
 
 mev-rs = { path = "../mev-rs" }
 

mev-build-rs/Cargo.toml

@@ -18,7 +18,7 @@ thiserror = "1.0.30"
 url = { version = "2.2.2", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
-beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client" }
+ethereum-consensus = { workspace = true }
+beacon-api-client = { workspace = true }
 
 mev-rs = { path = "../mev-rs" }

mev-build-rs/src/mempool_builder.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use beacon_api_client::{BeaconProposerRegistration, Client, ProposerDuty};
+use beacon_api_client::{mainnet::Client, BeaconProposerRegistration, ProposerDuty};
 use ethereum_consensus::{
     clock::{convert_timestamp_to_slot, get_current_unix_time_in_secs},
     crypto::SecretKey,
@@ -159,7 +159,8 @@ impl Builder {
             // TODO update method on Context
             .unwrap_or(self.context.min_genesis_time + self.context.genesis_delay);
         let slot =
-            convert_timestamp_to_slot(*timestamp, genesis_time, self.context.seconds_per_slot);
+            convert_timestamp_to_slot(*timestamp, genesis_time, self.context.seconds_per_slot)
+                .expect("after genesis");
         let coordinate = Coordinate { slot, parent_hash };
         let mut state = self.state.lock();
         tracing::trace!("at {coordinate:?}, inserting build job from engine API: {job:?}");

mev-build-rs/src/service.rs

@@ -98,7 +98,7 @@ impl Service {
         let block_provider = builder.clone();
         let engine_builder = builder.clone();
 
-        let current_epoch = clock.current_epoch();
+        let current_epoch = clock.current_epoch().expect("after genesis");
         builder.initialize(current_epoch).await;
 
         let clock = tokio::spawn(async move {

mev-relay-rs/Cargo.toml

@@ -19,8 +19,8 @@ http = "0.2.7"
 url = { version = "2.2.2", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
-beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client" }
+ethereum-consensus = { workspace = true }
+beacon-api-client = { workspace = true }
 
 mev-rs = { path = "../mev-rs" }
 mev-build-rs = { path = "../mev-build-rs" }

mev-relay-rs/src/relay.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use beacon_api_client::Client;
+use beacon_api_client::mainnet::Client;
 use ethereum_consensus::{
     builder::ValidatorRegistration,
     clock::get_current_unix_time_in_secs,

mev-relay-rs/src/service.rs

@@ -1,5 +1,5 @@
 use crate::relay::Relay;
-use beacon_api_client::Client;
+use beacon_api_client::mainnet::Client;
 use ethereum_consensus::{crypto::SecretKey, state_transition::Context};
 use futures::StreamExt;
 use mev_rs::{blinded_block_provider::Server as BlindedBlockProviderServer, Error, Network};
@@ -83,7 +83,7 @@ impl Service {
 
             tokio::pin!(slots);
 
-            let mut current_epoch = clock.current_epoch();
+            let mut current_epoch = clock.current_epoch().expect("after genesis");
             let mut next_epoch = false;
             while let Some(slot) = slots.next().await {
                 let epoch = clock.epoch_for(slot);

mev-rs/Cargo.toml

@@ -24,8 +24,8 @@ parking_lot = "0.12.1"
 
 anvil-rpc = { git = "https://github.com/foundry-rs/foundry", rev = "b45456717ffae1af65acdc71099f8cb95e6683a0", optional = true}
 reqwest = { version = "0.11.14", optional = true }
-serde_json = {version =  "1.0.92", optional = true }
+serde_json = { version =  "1.0.92", optional = true }
 
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
-beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client", optional = true }
-ssz-rs = { git = "https://github.com/ralexstokes/ssz-rs" }
+ssz_rs = { workspace = true }
+ethereum-consensus = { workspace = true }
+beacon-api-client = { workspace = true, optional = true }

mev-rs/src/blinded_block_provider/api/client.rs

@@ -7,7 +7,8 @@ use crate::{
 };
 use axum::http::StatusCode;
 use beacon_api_client::{
-    api_error_or_ok, ApiResult, Client as BeaconApiClient, Error as ApiError, VersionedValue,
+    api_error_or_ok, mainnet::Client as BeaconApiClient, ApiResult, Error as ApiError,
+    VersionedValue,
 };
 
 /// A `Client` for a service implementing the Builder APIs.

mev-rs/src/blinded_block_provider/api/server.rs

@@ -26,7 +26,7 @@ impl IntoResponse for Error {
     fn into_response(self) -> Response {
         let message = self.to_string();
         let code = StatusCode::BAD_REQUEST;
-        (code, Json(ApiError { code, message })).into_response()
+        (code, Json(ApiError::ErrorMessage { code, message })).into_response()
     }
 }
 

mev-rs/src/proposer_scheduler.rs

@@ -1,4 +1,6 @@
-use beacon_api_client::{BeaconProposerRegistration, Client, Error as ApiError, ProposerDuty};
+use beacon_api_client::{
+    mainnet::Client, BeaconProposerRegistration, Error as ApiError, ProposerDuty,
+};
 use ethereum_consensus::primitives::{BlsPublicKey, Epoch, Slot};
 use parking_lot::Mutex;
 use std::collections::HashMap;

mev-rs/src/validator_registry.rs

@@ -1,5 +1,7 @@
 use crate::{signing::verify_signed_builder_message, types::SignedValidatorRegistration};
-use beacon_api_client::{Client, Error as ApiError, StateId, ValidatorStatus, ValidatorSummary};
+use beacon_api_client::{
+    mainnet::Client, Error as ApiError, StateId, ValidatorStatus, ValidatorSummary,
+};
 use ethereum_consensus::{
     builder::ValidatorRegistration,
     primitives::{BlsPublicKey, ExecutionAddress, ValidatorIndex},

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.67"
+channel = "1.70.0"