feat: support all available chains

silius-rs · Dec 26, 2023 · 9962fe1 · 9962fe1
1 parent 102e8d8
commit 9962fe1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/bin/silius/src/bundler.rs b/bin/silius/src/bundler.rs
@@ -4,7 +4,7 @@ use crate::{
     },
     utils::unwrap_path_or_home,
 };
-use alloy_chains::Chain;
+use alloy_chains::{Chain, NamedChain};
 use ethers::{providers::Middleware, types::Address};
 use parking_lot::RwLock;
 use silius_contracts::EntryPoint;
@@ -63,7 +63,7 @@ where
         uopool_args.clone(),
         eth_client.clone(),
         block_streams,
-        common_args.chain.clone(),
+        common_args.chain,
         common_args.entry_points.clone(),
     )
     .await?;
@@ -90,7 +90,7 @@ where
 pub async fn launch_bundling<M>(
     args: BundlerArgs,
     eth_client: Arc<M>,
-    chain: Option<String>,
+    chain: Option<NamedChain>,
     entry_points: Vec<Address>,
     uopool_grpc_listen_address: String,
 ) -> eyre::Result<()>
@@ -149,7 +149,7 @@ pub async fn launch_uopool<M>(
     args: UoPoolArgs,
     eth_client: Arc<M>,
     block_streams: Vec<BlockStream>,
-    chain: Option<String>,
+    chain: Option<NamedChain>,
     entry_points: Vec<Address>,
 ) -> eyre::Result<()>
 where
@@ -483,12 +483,15 @@ pub fn create_wallet(args: CreateWalletArgs) -> eyre::Result<()> {
     Ok(())
 }
 
-async fn check_connected_chain<M>(eth_client: Arc<M>, chain: Option<String>) -> eyre::Result<String>
+async fn check_connected_chain<M>(
+    eth_client: Arc<M>,
+    chain: Option<NamedChain>,
+) -> eyre::Result<String>
 where
     M: Middleware + Clone + 'static,
 {
     if let Some(chain) = chain {
-        let chain = Chain::from_str(chain.as_str())?;
+        let chain: Chain = chain.into();
 
         let chain_id = eth_client.get_chainid().await?.as_u64();
         if chain.id() != chain_id {

diff --git a/bin/silius/src/cli/args.rs b/bin/silius/src/cli/args.rs
@@ -1,6 +1,7 @@
 use crate::utils::{
     parse_address, parse_enr, parse_send_bundle_mode, parse_u256, parse_uopool_mode,
 };
+use alloy_chains::NamedChain;
 use clap::{Parser, ValueEnum};
 use discv5::Enr;
 use ethers::types::{Address, U256};
@@ -12,7 +13,6 @@ use silius_primitives::{
         bundler::BUNDLE_INTERVAL,
         grpc::{BUNDLER_PORT, MEMPOOL_PORT},
         rpc::{HTTP_PORT, WS_PORT},
-        supported_chains::SUPPORTED_NAMED_CHAINS,
     },
     UoPoolMode,
 };
@@ -111,15 +111,15 @@ pub struct UoPoolArgs {
 }
 
 /// Common CLI args for bundler and uopool
-#[derive(Debug, Clone, Parser)]
+#[derive(Debug, Clone, Parser, PartialEq)]
 pub struct BundlerAndUoPoolArgs {
     /// Ethereum execution client RPC endpoint.
     #[clap(long, default_value = "http://127.0.0.1:8545")]
     pub eth_client_address: String,
 
     /// Chain information.
-    #[clap(long, value_parser = SUPPORTED_NAMED_CHAINS)]
-    pub chain: Option<String>,
+    #[clap(long)]
+    pub chain: Option<NamedChain>,
 
     /// Entry point addresses.
     #[clap(long, value_delimiter=',', value_parser=parse_address)]
@@ -328,6 +328,29 @@ mod tests {
         );
     }
 
+    #[test]
+    fn bundler_and_uopool_args() {
+        let args = vec![
+            "bundleranduopoolargs",
+            "--eth-client-address",
+            "http://127.0.0.1:8545",
+            "--chain",
+            "holesky",
+            "--entry-points",
+            "0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990",
+        ];
+        assert_eq!(
+            BundlerAndUoPoolArgs {
+                eth_client_address: String::from("http://127.0.0.1:8545"),
+                chain: Some(NamedChain::Holesky),
+                entry_points: vec![
+                    Address::from_str("0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990").unwrap()
+                ],
+            },
+            BundlerAndUoPoolArgs::try_parse_from(args).unwrap()
+        );
+    }
+
     #[test]
     fn rpc_args_when_http_and_ws_flag() {
         let args = vec![

diff --git a/crates/primitives/src/constants.rs b/crates/primitives/src/constants.rs
@@ -80,7 +80,6 @@ pub mod flashbots_relay_endpoints {
 /// Supported chains
 pub mod supported_chains {
     pub const SUPPORTED_CHAINS: [u64; 5] = [MAINNET, GOERLI, SEPOLIA, DEV, MUMBAI];
-    pub const SUPPORTED_NAMED_CHAINS: [&str; 5] = ["mainnet", "goerli", "sepolia", "dev", "mumbai"];
 
     // dev
     pub const DEV: u64 = 1337;