changed all println! to info!, different default output path

.gitignore

@@ -1,5 +1,2 @@
 # Rust
-/target
-
-# bundler wallets
-/src/res/bundler/0x*
+/target

Cargo.toml

@@ -11,6 +11,7 @@ anyhow = "1"
 async-trait = "0.1"
 bytes = { version = "1", features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
+dirs = "4.0"
 educe = { version = "0.4", features = ["Debug", "Default"] }
 ethereum-interfaces = { git = "https://github.com/ledgerwatch/interfaces" }
 ethereum-types = { version = "0.14", features = ["codec"] }

Makefile

@@ -1,5 +1,5 @@
 run-bundler:
-	cargo run -- --mnemonic-file ./src/res/bundler/0xF78bB01dFd478608F5738fB0560642b2806D295E
+	cargo run -- --mnemonic-file ${HOME}/.aa-bundler/0x129D197b2a989C6798601A49D89a4AEC822A17a3
 
 run-bundler-uopool:
 	cargo run --bin bundler-uopool
@@ -8,7 +8,7 @@ run-bundler-rpc:
 	cargo run --bin bundler-rpc
 
 run-create-wallet:
-	cargo run --bin create-wallet -- --output-folder ./src/res/bundler
+	cargo run --bin create-wallet -- --output-path ${HOME}/.aa-bundler
 
 cargo-fmt:
 	cargo fmt --all

README.md

@@ -15,13 +15,13 @@ For more information: https://hackmd.io/@Vid201/aa-bundler-rust
 Create wallet for bundler:
 
 ```bash
-cargo run --bin create-wallet -- --output-folder ./src/res/bundler
+cargo run --bin create-wallet -- --output-path ${HOME}/.aa-bundler
 ```
 
 Run bundler (with user operation pool and JSON-RPC API): 
 
 ```bash
-cargo run -- --mnemonic-file ./src/res/bundler/0xF78bB01dFd478608F5738fB0560642b2806D295E
+cargo run -- --mnemonic-file ${HOME}/.aa-bundler/0x129D197b2a989C6798601A49D89a4AEC822A17a3
 ```
 
 Run only user operation pool:

bin/bundler.rs

@@ -50,7 +50,7 @@ fn main() -> Result<()> {
                 info!("Starting AA - Bundler");
 
                 let wallet = Wallet::from_file(opt.mnemonic_file);
-                println!("{:?}", wallet.signer);
+                info!("{:?}", wallet.signer);
 
                 let bundler = Bundler::new(wallet);
 

bin/create-wallet.rs

@@ -1,25 +1,35 @@
 use aa_bundler::models::wallet::Wallet;
 use anyhow::Result;
 use clap::Parser;
+use dirs::home_dir;
 use expanded_pathbuf::ExpandedPathBuf;
+use jsonrpsee::tracing::info;
+use std::str::FromStr;
 
 #[derive(Parser)]
 #[clap(
     name = "aa-bundler-create-wallet",
     about = "Bundler's wallet creation for EIP-4337 Account Abstraction"
 )]
 pub struct Opt {
-    #[clap(long, default_value = "./src/res/bundler")]
-    pub output_folder: ExpandedPathBuf,
+    #[clap(long)]
+    pub output_path: Option<ExpandedPathBuf>,
 }
 
 fn main() -> Result<()> {
     let opt: Opt = Opt::parse();
 
     tracing_subscriber::fmt::init();
 
-    let wallet = Wallet::new(opt.output_folder);
-    println!("{:?}", wallet.signer);
+    let path = if let Some(output_path) = opt.output_path {
+        output_path
+    } else {
+        ExpandedPathBuf::from_str(home_dir().unwrap().join(".aa-bundler").to_str().unwrap())
+            .unwrap()
+    };
+
+    let wallet = Wallet::new(path);
+    info!("{:?}", wallet.signer);
 
     Ok(())
 }

src/models/wallet.rs

@@ -3,6 +3,7 @@ use ethers::{
     signers::{coins_bip39::English, MnemonicBuilder},
 };
 use expanded_pathbuf::ExpandedPathBuf;
+use std::fs;
 
 pub struct Wallet {
     pub signer: ethers::signers::Wallet<SigningKey>,
@@ -12,6 +13,8 @@ impl Wallet {
     pub fn new(output_path: ExpandedPathBuf) -> Self {
         let mut rng = rand::thread_rng();
 
+        fs::create_dir_all(output_path.to_path_buf()).unwrap();
+
         Self {
             signer: MnemonicBuilder::<English>::default()
                 .write_to(output_path.to_path_buf())

src/rpc/eth.rs

@@ -1,7 +1,7 @@
 use crate::{rpc::eth_api::EthApiServer, types::user_operation::UserOperation};
 use async_trait::async_trait;
 use ethereum_types::{Address, U64};
-use jsonrpsee::core::RpcResult;
+use jsonrpsee::{core::RpcResult, tracing::info};
 
 pub struct EthApiServerImpl {
     pub call_gas_limit: u64,
@@ -22,8 +22,8 @@ impl EthApiServer for EthApiServerImpl {
         user_operation: UserOperation,
         entry_point: Address,
     ) -> RpcResult<bool> {
-        println!("{:?}", user_operation);
-        println!("{:?}", entry_point);
+        info!("{:?}", user_operation);
+        info!("{:?}", entry_point);
         Ok(true)
     }
 }