Add bundler config

bin/bundler.rs

@@ -7,7 +7,7 @@ use anyhow::Result;
 use clap::Parser;
 use expanded_pathbuf::ExpandedPathBuf;
 use jsonrpsee::{core::server::rpc_module::Methods, server::ServerBuilder, tracing::info};
-use std::{future::pending, panic};
+use std::{future::pending, net::SocketAddr, panic};
 
 #[derive(Parser)]
 #[clap(
@@ -31,6 +31,13 @@ pub struct Opt {
 
     #[clap(long, default_value = "127.0.0.1:4337")]
     pub rpc_listen_address: String,
+
+    // execution client rpc endpoint
+    #[clap(long)]
+    pub network: SocketAddr,
+
+    #[clap(flatten)]
+    pub bundler_opts: aa_bundler::bundler::bundler::BundlerOpts,
 }
 
 fn main() -> Result<()> {

src/bundler/bundler.rs

@@ -1,5 +1,37 @@
+use std::str::FromStr;
+
+use clap::Parser;
+use ethereum_types::U256;
+use ethers::types::Address;
+
 use crate::models::wallet::Wallet;
 
+#[derive(Debug, Parser, PartialEq)]
+pub struct BundlerOpts {
+    #[clap(long, value_parser=parse_address)]
+    pub beneficiary: Address,
+
+    #[clap(long, default_value = "1", value_parser=parse_u256)]
+    pub gas_factor: U256,
+
+    #[clap(long, value_parser=parse_u256)]
+    pub min_balance: U256,
+
+    #[clap(long, value_parser=parse_address)]
+    pub entry_point: Address,
+
+    #[clap(long, value_parser=parse_address)]
+    pub helper: Address,
+}
+
+fn parse_address(s: &str) -> Result<Address, String> {
+    Address::from_str(s).map_err(|_| format!("Adress {} is not a valid address", s))
+}
+
+fn parse_u256(s: &str) -> Result<U256, String> {
+    U256::from_str_radix(s, 10).map_err(|_| format!("{} is not a valid U256", s))
+}
+
 pub struct Bundler {
     pub wallet: Wallet,
 }
@@ -9,3 +41,39 @@ impl Bundler {
         Self { wallet }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::BundlerOpts;
+    use clap::Parser;
+    use ethereum_types::{Address, U256};
+    use std::str::FromStr;
+
+    #[test]
+    fn test_bundle_opt() {
+        let args = vec![
+            "bundleropts",
+            "--beneficiary",
+            "0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990",
+            "--gas-factor",
+            "600",
+            "--min-balance",
+            "1",
+            "--entry-point",
+            "0x0000000000000000000000000000000000000000",
+            "--helper",
+            "0x0000000000000000000000000000000000000000",
+        ];
+        assert_eq!(
+            BundlerOpts {
+                beneficiary: Address::from_str("0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990")
+                    .unwrap(),
+                gas_factor: U256::from(600),
+                min_balance: U256::from(1),
+                entry_point: Address::from([0; 20]),
+                helper: Address::from([0; 20])
+            },
+            BundlerOpts::try_parse_from(args).unwrap()
+        );
+    }
+}