From 58878d9cd18f87a1b473f521bacdeb23b4fb6bac Mon Sep 17 00:00:00 2001 From: DenioD Date: Fri, 1 Nov 2019 12:14:32 +0100 Subject: [PATCH 1/4] fix win and linux path for.dat and.log, change default server to hush-lightwallet.de --- lib/src/lightclient.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs index fb6db3f..265600a 100644 --- a/lib/src/lightclient.rs +++ b/lib/src/lightclient.rs @@ -27,7 +27,7 @@ use crate::ANCHOR_OFFSET; mod checkpoints; -pub const DEFAULT_SERVER: &str = "https://"; +pub const DEFAULT_SERVER: &str = "https://hush-lightwallet.de:443"; pub const WALLET_NAME: &str = "silentdragonlite-wallet.dat"; pub const LOGFILE_NAME: &str = "silentdragonlite-wallet.debug.log"; @@ -110,7 +110,7 @@ impl LightClientConfig { zcash_data_location.push("silentdragonlite"); } else { zcash_data_location = dirs::home_dir().expect("Couldn't determine home directory!"); - zcash_data_location.push("silentdragonlite/"); + zcash_data_location.push(".silentdragonlite"); }; match &self.chain_name[..] { From 77aa23f5cc3d6cc58a68b142ef5757d27680bb8a Mon Sep 17 00:00:00 2001 From: DenioD Date: Fri, 1 Nov 2019 12:22:33 +0100 Subject: [PATCH 2/4] remove not needed startup_helpers.rs --- lib/src/lightwallet/startup_helpers.rs | 20 -------------------- lib/src/startup_helpers.rs | 20 -------------------- 2 files changed, 40 deletions(-) delete mode 100644 lib/src/lightwallet/startup_helpers.rs delete mode 100644 lib/src/startup_helpers.rs diff --git a/lib/src/lightwallet/startup_helpers.rs b/lib/src/lightwallet/startup_helpers.rs deleted file mode 100644 index d8b7cf2..0000000 --- a/lib/src/lightwallet/startup_helpers.rs +++ /dev/null @@ -1,20 +0,0 @@ -pub fn report_permission_error() { - let user = std::env::var("USER").expect( - "Unexpected error reading value of $USER!"); - let home = std::env::var("HOME").expect( - "Unexpected error reading value of $HOME!"); - let current_executable = std::env::current_exe() - .expect("Unexpected error reporting executable path!"); - eprintln!("USER: {}", user); - eprintln!("HOME: {}", home); - eprintln!("Executable: {}", current_executable.display()); - if home == "/" { - eprintln!("User {} must have permission to write to '{}silentdragonlite/' .", - user, - home); - } else { - eprintln!("User {} must have permission to write to '{}/silentdragonlite/ .", - user, - home); - } -} \ No newline at end of file diff --git a/lib/src/startup_helpers.rs b/lib/src/startup_helpers.rs deleted file mode 100644 index a3cbaf7..0000000 --- a/lib/src/startup_helpers.rs +++ /dev/null @@ -1,20 +0,0 @@ -pub fn report_permission_error() { - let user = std::env::var("USER").expect( - "Unexpected error reading value of $USER!"); - let home = std::env::var("HOME").expect( - "Unexpected error reading value of $HOME!"); - let current_executable = std::env::current_exe() - .expect("Unexpected error reporting executable path!"); - eprintln!("USER: {}", user); - eprintln!("HOME: {}", home); - eprintln!("Executable: {}", current_executable.display()); - if home == "/" { - eprintln!("User {} must have permission to write to '{}silentdragonlite/' .", - user, - home); - } else { - eprintln!("User {} must have permission to write to '{}/silentdragonlite/ .", - user, - home); - } -} From 22b4d562072d01ae35a2a9a9398c365fa640de84 Mon Sep 17 00:00:00 2001 From: DenioD Date: Fri, 1 Nov 2019 13:25:17 +0100 Subject: [PATCH 3/4] fix permission check for log path in lib.rs --- cli/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/src/lib.rs b/cli/src/lib.rs index d4b9943..5d28aae 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -75,11 +75,11 @@ pub fn report_permission_error() { eprintln!("HOME: {}", home); eprintln!("Executable: {}", current_executable.display()); if home == "/" { - eprintln!("User {} must have permission to write to '{}silentdragonlite/' .", + eprintln!("User {} must have permission to write to '{}.silentdragonlite/' .", user, home); } else { - eprintln!("User {} must have permission to write to '{}/silentdragonlite/' .", + eprintln!("User {} must have permission to write to '{}/.silentdragonlite/' .", user, home); } @@ -89,7 +89,7 @@ pub fn report_permission_error() { pub fn get_log_config(config: &LightClientConfig) -> io::Result { let window_size = 3; // log0, log1, log2 let fixed_window_roller = - FixedWindowRoller::builder().build("Silentdragonlite-light-wallet-log{}",window_size).unwrap(); + FixedWindowRoller::builder().build("Silentdragonlite-wallet-log{}",window_size).unwrap(); let size_limit = 5 * 1024 * 1024; // 5MB as max log file size to roll let size_trigger = SizeTrigger::new(size_limit); let compound_policy = CompoundPolicy::new(Box::new(size_trigger),Box::new(fixed_window_roller)); From aeece24f620c83318050a1195fa16f21a4dd0bfb Mon Sep 17 00:00:00 2001 From: DenioD Date: Fri, 1 Nov 2019 15:38:06 +0100 Subject: [PATCH 4/4] fix create folder when not existent --- lib/src/lightclient.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs index 265600a..bd443de 100644 --- a/lib/src/lightclient.rs +++ b/lib/src/lightclient.rs @@ -120,8 +120,15 @@ impl LightClientConfig { c => panic!("Unknown chain {}", c), }; } - - zcash_data_location.into_boxed_path() + + // Create directory if it doesn't exist + match std::fs::create_dir_all(zcash_data_location.clone()) { + Ok(_) => zcash_data_location.into_boxed_path(), + Err(e) => { + eprintln!("Couldn't create zcash directory!\n{}", e); + panic!("Couldn't create zcash directory!"); + } + } } pub fn get_wallet_path(&self) -> Box {