Fix issue where new wallets weren't being created
This commit is contained in:
@@ -244,8 +244,32 @@ impl LightClient {
|
|||||||
Ok(l)
|
Ok(l)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Create a brand new wallet with a new seed phrase. Will fail if a wallet file
|
||||||
|
/// already exists on disk
|
||||||
|
pub fn new(config: &LightClientConfig, latest_block: u64) -> io::Result<Self> {
|
||||||
|
if config.wallet_exists() {
|
||||||
|
return Err(Error::new(ErrorKind::AlreadyExists,
|
||||||
|
"Cannot create a new wallet from seed, because a wallet already exists"));
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut l = LightClient {
|
||||||
|
wallet : Arc::new(RwLock::new(LightWallet::new(None, config, latest_block)?)),
|
||||||
|
config : config.clone(),
|
||||||
|
sapling_output : vec![],
|
||||||
|
sapling_spend : vec![]
|
||||||
|
};
|
||||||
|
|
||||||
|
l.set_wallet_initial_state();
|
||||||
|
l.read_sapling_params();
|
||||||
|
|
||||||
|
info!("Created new wallet with a new seed!");
|
||||||
|
info!("Created LightClient to {}", &config.server);
|
||||||
|
|
||||||
|
Ok(l)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn new_from_phrase(seed_phrase: String, config: &LightClientConfig, latest_block: u64) -> io::Result<Self> {
|
pub fn new_from_phrase(seed_phrase: String, config: &LightClientConfig, latest_block: u64) -> io::Result<Self> {
|
||||||
if config.get_wallet_path().exists() {
|
if config.wallet_exists() {
|
||||||
return Err(Error::new(ErrorKind::AlreadyExists,
|
return Err(Error::new(ErrorKind::AlreadyExists,
|
||||||
"Cannot create a new wallet from seed, because a wallet already exists"));
|
"Cannot create a new wallet from seed, because a wallet already exists"));
|
||||||
}
|
}
|
||||||
@@ -267,7 +291,7 @@ impl LightClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_from_disk(config: &LightClientConfig) -> io::Result<Self> {
|
pub fn read_from_disk(config: &LightClientConfig) -> io::Result<Self> {
|
||||||
if !config.get_wallet_path().exists() {
|
if !config.wallet_exists() {
|
||||||
return Err(Error::new(ErrorKind::AlreadyExists,
|
return Err(Error::new(ErrorKind::AlreadyExists,
|
||||||
format!("Cannot read wallet. No file at {}", config.get_wallet_path().display())));
|
format!("Cannot read wallet. No file at {}", config.get_wallet_path().display())));
|
||||||
}
|
}
|
||||||
|
|||||||
11
src/main.rs
11
src/main.rs
@@ -120,7 +120,7 @@ pub fn main() {
|
|||||||
Some(13) => {
|
Some(13) => {
|
||||||
startup_helpers::report_permission_error();
|
startup_helpers::report_permission_error();
|
||||||
},
|
},
|
||||||
_ => eprintln!("Something else!")
|
_ => {}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -162,7 +162,14 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option<String>, first_sync:
|
|||||||
|
|
||||||
let lightclient = match seed {
|
let lightclient = match seed {
|
||||||
Some(phrase) => Arc::new(LightClient::new_from_phrase(phrase, &config, latest_block_height)?),
|
Some(phrase) => Arc::new(LightClient::new_from_phrase(phrase, &config, latest_block_height)?),
|
||||||
None => Arc::new(LightClient::read_from_disk(&config)?)
|
None => {
|
||||||
|
if config.wallet_exists() {
|
||||||
|
Arc::new(LightClient::read_from_disk(&config)?)
|
||||||
|
} else {
|
||||||
|
println!("Creating a new wallet");
|
||||||
|
Arc::new(LightClient::new(&config, latest_block_height)?)
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Print startup Messages
|
// Print startup Messages
|
||||||
|
|||||||
Reference in New Issue
Block a user