From cbc2f9dd5e4cc6ff1bcc17de78f2a8c0d7ae269d Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Wed, 18 Oct 2023 20:05:28 -0600
Subject: [PATCH] patch up `mev-build-rs` to reflect Network type upgrade

---
 bin/mev/src/cmd/build.rs                     | 13 +++++++-----
 bin/mev/src/cmd/build/mod.rs                 | 21 --------------------
 mev-build-rs/src/reth_builder/service.rs     |  3 ---
 mev-build-rs/src/reth_builder/service_ext.rs | 12 ++++++-----
 4 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 bin/mev/src/cmd/build/mod.rs

diff --git a/bin/mev/src/cmd/build.rs b/bin/mev/src/cmd/build.rs
index 7d3fb9ae..bfb1daed 100644
--- a/bin/mev/src/cmd/build.rs
+++ b/bin/mev/src/cmd/build.rs
@@ -1,8 +1,8 @@
 use crate::cmd::config::Config;
 use anyhow::{anyhow, Result};
 use clap::Args;
-use ethereum_consensus::networks::Network;
 use mev_build_rs::reth_builder::Service;
+use tracing::info;
 
 #[derive(Debug, Args)]
 #[clap(about = "🛠️ building blocks since 2023")]
@@ -12,14 +12,17 @@ pub struct Command {
 }
 
 impl Command {
-    pub async fn execute(&self, network: Network) -> Result<()> {
+    pub async fn execute(&self) -> Result<()> {
         let config_file = &self.config_file;
 
         let config = Config::from_toml_file(config_file)?;
 
-        if let Some(mut config) = config.build {
-            config.network = network;
-            Ok(Service::from(config).spawn().await)
+        let network = config.network;
+        info!("configured for {network}");
+
+        if let Some(config) = config.build {
+            Service::from(network, config).spawn().await;
+            Ok(())
         } else {
             Err(anyhow!("missing boost config from file provided"))
         }
diff --git a/bin/mev/src/cmd/build/mod.rs b/bin/mev/src/cmd/build/mod.rs
deleted file mode 100644
index 43518faf..00000000
--- a/bin/mev/src/cmd/build/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-mod reth_ext;
-
-use anyhow::Result;
-use clap::Args;
-use reth_ext::{launch_reth_with, RethNodeExt};
-
-#[derive(Debug, Args)]
-#[clap(about = "🛠️ building blocks since 2023")]
-pub struct Command {
-    #[clap(env, default_value = "config.toml")]
-    config_file: String,
-}
-
-impl Command {
-    pub async fn execute(self) -> Result<()> {
-        let ext =
-            RethNodeExt { config_file: self.config_file.clone(), network: None, config: None };
-        launch_reth_with(ext).await;
-        Ok(())
-    }
-}
diff --git a/mev-build-rs/src/reth_builder/service.rs b/mev-build-rs/src/reth_builder/service.rs
index 85b91339..c2624003 100644
--- a/mev-build-rs/src/reth_builder/service.rs
+++ b/mev-build-rs/src/reth_builder/service.rs
@@ -6,7 +6,6 @@ use crate::reth_builder::{
 use ethereum_consensus::{
     clock::{Clock, SystemTimeProvider},
     crypto::SecretKey,
-    networks::Network,
     state_transition::Context,
 };
 use ethers::signers::{coins_bip39::English, MnemonicBuilder, Signer};
@@ -22,8 +21,6 @@ const DEFAULT_BID_PERCENT: f64 = 0.9;
 
 #[derive(Deserialize, Debug, Default, Clone)]
 pub struct Config {
-    #[serde(default)]
-    pub network: Network,
     pub secret_key: SecretKey,
     pub relays: Vec<String>,
     pub extra_data: String,
diff --git a/mev-build-rs/src/reth_builder/service_ext.rs b/mev-build-rs/src/reth_builder/service_ext.rs
index 08f22354..dcadc0b8 100644
--- a/mev-build-rs/src/reth_builder/service_ext.rs
+++ b/mev-build-rs/src/reth_builder/service_ext.rs
@@ -1,7 +1,7 @@
 use crate::reth_builder::{service::Service, Config, DeadlineBidder};
 use clap::{Args, Parser};
 use ethereum_consensus::{
-    networks::{self},
+    networks::{self, Network},
     state_transition::Context,
 };
 use reth::{
@@ -16,13 +16,15 @@ use tracing::warn;
 
 #[derive(Debug, Args)]
 pub struct ServiceExt {
+    #[clap(skip)]
+    network: Network,
     #[clap(skip)]
     config: Config,
 }
 
 impl ServiceExt {
-    pub fn from(config: Config) -> Self {
-        Self { config }
+    pub fn from(network: Network, config: Config) -> Self {
+        Self { network, config }
     }
 
     pub async fn spawn(self) {
@@ -30,7 +32,7 @@ impl ServiceExt {
         let task_executor = task_manager.executor();
         let ctx = CliContext { task_executor };
 
-        let network = &self.config.network;
+        let network = &self.network;
         let network_name = format!("{0}", network);
 
         let mut params =
@@ -73,7 +75,7 @@ impl RethNodeCommandConfig for ServiceExt {
         Tasks: reth::tasks::TaskSpawner + Clone + Unpin + 'static,
     {
         let build_config = self.config.clone();
-        let network = &build_config.network;
+        let network = &self.network;
         let context = Arc::new(Context::try_from(network)?);
         let clock = context.clock().unwrap_or_else(|| {
             let genesis_time = networks::typical_genesis_time(&context);