actually setup xpubs from file

Author: Davidson-Souza

.gitignore

@@ -2,4 +2,5 @@
 Cargo.lock
 # ignores perf data and generated performance graphs
 perf.*
-*.svg
+*.svg
+config.toml

src/cli.rs

@@ -1,6 +1,5 @@
-use std::path::PathBuf;
-
 use clap::{arg, command, Parser, Subcommand, ValueEnum};
+
 #[derive(Clone, Debug, ValueEnum)]
 pub enum Network {
     Bitcoin,
@@ -28,7 +27,7 @@ impl std::fmt::Display for Network {
 pub struct Cli {
     /// Sets a custom config file
     #[arg(short, long, value_name = "FILE")]
-    pub config_file: Option<PathBuf>,
+    pub config_file: Option<String>,
     /// Which network should we use
     #[arg(short, long, default_value_t=Network::Bitcoin)]
     pub network: Network,

src/config_file.rs

@@ -24,3 +24,9 @@ pub struct ConfigFile {
     pub wallet: Wallet,
     pub misc: Misc,
 }
+impl ConfigFile {
+    pub fn from_file(filename: &str) -> Result<Self, crate::error::Error> {
+        let file = std::fs::read_to_string(filename)?;
+        Ok(toml::from_str(file.as_str())?)
+    }
+}

src/error.rs

@@ -14,6 +14,7 @@ pub enum Error {
     ValidationError(bitcoin::blockdata::script::Error),
     ChainError(BlockchainError),
     SerdeJsonError(serde_json::Error),
+    TomlParsingError(toml::de::Error),
     WalletInputError(crate::wallet_input::ParsingError),
 }
 
@@ -32,6 +33,7 @@ impl std::fmt::Display for Error {
             Error::ChainError(err) => write!(f, "Error with our blockchain backend: {:?}", err),
             Error::SerdeJsonError(err) => write!(f, "Error serializing object {err}"),
             Error::WalletInputError(err) => write!(f, "Error while parsing user input {:?}", err),
+            Error::TomlParsingError(err) => write!(f, "Error deserializing toml file {err}"),
         }
     }
 }
@@ -47,6 +49,7 @@ impl_from_error!(ValidationError, bitcoin::blockdata::script::Error);
 impl_from_error!(ChainError, BlockchainError);
 impl_from_error!(SerdeJsonError, serde_json::Error);
 impl_from_error!(WalletInputError, crate::wallet_input::ParsingError);
+impl_from_error!(TomlParsingError, toml::de::Error);
 
 impl std::error::Error for Error {}
 #[macro_export]

src/main.rs

@@ -68,7 +68,7 @@ fn main() {
         .init();
 
     let params = Cli::parse();
-    let data = ConfigFile::default();
+    let data = ConfigFile::from_file(&params.config_file.unwrap()).expect("Invalid config file");
     match params.command {
         Commands::Run {
             data_dir,
@@ -82,16 +82,17 @@ fn main() {
         } => {
             let data_dir = get_one_or_another(
                 data_dir,
-                dirs::home_dir().map(|x: PathBuf| x.to_str().unwrap_or_default().to_owned()),
+                dirs::home_dir().map(|x: PathBuf| {
+                    x.to_str().unwrap_or_default().to_owned() + "/.utreexo_wallet/"
+                }),
                 "wallet".into(),
             );
             debug!("Loading wallet");
             let mut wallet = load_wallet(&data_dir);
             wallet.setup().expect("Could not initialize wallet");
             debug!("Done loading wallet");
-
             let result = setup_wallet(
-                get_one_or_another(wallet_xpub, data.wallet.xpubs, vec![]),
+                get_both_vec(wallet_xpub, data.wallet.xpubs),
                 &mut wallet,
                 params.network.clone(),
             );
@@ -198,6 +199,7 @@ fn setup_wallet<D: AddressCacheDatabase>(
     wallet: &mut AddressCache<D>,
     network: cli::Network,
 ) -> Result<(), crate::error::Error> {
+    println!("{:?}", xpubs);
     if xpubs.is_empty() {
         return Ok(());
     }
@@ -265,3 +267,14 @@ where
 
     default
 }
+
+fn get_both_vec<T>(a: Option<Vec<T>>, b: Option<Vec<T>>) -> Vec<T> {
+    let mut result: Vec<T> = vec![];
+    if let Some(a) = a {
+        result.extend(a.into_iter());
+    }
+    if let Some(b) = b {
+        result.extend(b.into_iter());
+    }
+    result
+}