Skip to content

bugfix import unified full viewing key ufvk #1895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 28, 2025
Merged

bugfix import unified full viewing key ufvk #1895

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
675bfa1
bugfix import unified full viewing key ufvk
Tomas-M Aug 21, 2025
a9b5885
fmt
Tomas-M Aug 21, 2025
b105caf
elseif
Tomas-M Aug 21, 2025
f6980a9
Merge branch 'dev' into dev
Oscar-Pepper Aug 22, 2025
6a3e91a
Resolve conflicts with upstream dev branch
Tomas-M Aug 27, 2025
c3bcbde
Merge branch 'dev' into dev
Tomas-M Aug 27, 2025
5dd7604
Merge branch 'dev' into dev
Tomas-M Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 73 additions & 55 deletions zingocli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,13 @@ fn parse_seed(s: &str) -> Result<String, String> {
match s.parse::<String>() {
Ok(s) => {
let count = s.split_whitespace().count();
if count == 24 {
if [12, 15, 18, 21, 24].contains(&count) {
Ok(s)
} else {
Err(format!("Expected 24 words, but received: {}.", count))
Err(format!(
"Expected 12/15/18/21/24 words, but received: {}.",
count
))
}
}
Err(_) => Err("Unexpected failure to parse String!!".to_string()),
Expand Down Expand Up @@ -290,7 +293,8 @@ pub fn command_loop(
pub struct ConfigTemplate {
params: Vec<String>,
server: http::Uri,
from: Option<String>,
seed: Option<String>,
ufvk: Option<String>,
birthday: u64,
data_dir: PathBuf,
sync: bool,
Expand All @@ -317,21 +321,16 @@ impl ConfigTemplate {
} else {
None
};
let seed = matches.get_one::<String>("seed");
let viewkey = matches.get_one::<String>("viewkey");
let from = if seed.is_some() && viewkey.is_some() {
let seed = matches.get_one::<String>("seed").cloned();
let ufvk = matches.get_one::<String>("viewkey").cloned();
if seed.is_some() && ufvk.is_some() {
return Err("Cannot load a wallet from both seed phrase and viewkey!".to_string());
} else if seed.is_some() {
seed
} else if viewkey.is_some() {
viewkey
} else {
None
};
}
let maybe_birthday = matches
.get_one::<u32>("birthday")
.map(|bday| bday.to_string());
if from.is_some() && maybe_birthday.is_none() {
let from_provided = seed.is_some() || ufvk.is_some();
if from_provided && maybe_birthday.is_none() {
eprintln!("ERROR!");
eprintln!(
"Please specify the wallet birthday (eg. '--birthday 600000') to restore a wallet. (If you want to load the entire blockchain instead, you can use birthday 0. /this would require extensive time and computational resources)"
Expand All @@ -342,7 +341,6 @@ If you don't remember the block height, you can pass '--birthday 0' to scan from
.to_string(),
);
}
let from = from.map(|seed| seed.to_string());
if matches.contains_id("chain") && is_regtest {
return Err("regtest mode incompatible with custom chain selection".to_string());
}
Expand Down Expand Up @@ -403,7 +401,8 @@ If you don't remember the block height, you can pass '--birthday 0' to scan from
Ok(Self {
params,
server,
from,
seed,
ufvk,
birthday,
data_dir,
sync,
Expand Down Expand Up @@ -442,12 +441,12 @@ pub fn startup(
)
.unwrap();

let mut lightclient = match filled_template.from.clone() {
Some(phrase) => LightClient::create_from_wallet(
let mut lightclient = if let Some(seed_phrase) = filled_template.seed.clone() {
LightClient::create_from_wallet(
LightWallet::new(
config.chain,
WalletBase::Mnemonic {
mnemonic: Mnemonic::from_phrase(phrase).map_err(|e| {
mnemonic: Mnemonic::from_phrase(seed_phrase).map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::InvalidInput,
format!("Invalid seed phrase. {}", e),
Expand All @@ -472,42 +471,61 @@ pub fn startup(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?,

None => {
if config.wallet_path_exists() {
LightClient::create_from_wallet_path(config.clone()).map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?
} else {
println!("Creating a new wallet");
// Call the lightwalletd server to get the current block-height
// Do a getinfo first, before opening the wallet
let server_uri = config.get_lightwalletd_uri();
let chain_height = RT
.block_on(async move {
zingolib::grpc_connector::get_latest_block(server_uri)
.await
.map(|block_id| BlockHeight::from_u32(block_id.height as u32))
})
.map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?;
// Create a wallet with height - 100, to protect against reorgs
LightClient::new(config.clone(), chain_height - 100, false).map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?
}
}
})?
} else if let Some(ufvk) = filled_template.ufvk.clone() {
LightClient::create_from_wallet(
LightWallet::new(
config.chain,
WalletBase::Ufvk(ufvk),
(filled_template.birthday as u32).into(),
config.wallet_settings.clone(),
)
.map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create wallet. {}", e),
)
})?,
config.clone(),
false,
)
.map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?
} else if config.wallet_path_exists() {
LightClient::create_from_wallet_path(config.clone()).map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?
} else {
println!("Creating a new wallet");
// Call the lightwalletd server to get the current block-height
// Do a getinfo first, before opening the wallet
let server_uri = config.get_lightwalletd_uri();
let chain_height = RT
.block_on(async move {
zingolib::grpc_connector::get_latest_block(server_uri)
.await
.map(|block_id| BlockHeight::from_u32(block_id.height as u32))
})
.map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?;
// Create a wallet with height - 100, to protect against reorgs
LightClient::new(config.clone(), chain_height - 100, false).map_err(|e| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("Failed to create lightclient. {}", e),
)
})?
};

if filled_template.command.is_none() {
Expand Down