nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #89: installer: check xpub network

Browse Source 
25056d0d5e173c2c9378cdc2a98c5880d7451c83 installer: check xpub network (edouard)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 3ff1b9e25c84ca086f7c9a5bd11293bc40506a002d9a2d23dc4dd58bfe287e85aa71140724218b41373817fd56ed2e82be78de84f7caa5c29a45492e784875f9
This commit is contained in:
edouard 2022-11-15 17:56:59 +01:00
commit edb4359087
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gui/src/installer/step/descriptor.rs
View File

@ -4,7 +4,10 @@ use iced::{pure::Element, Command};
use minisafe::{
descriptors::MultipathDescriptor,
miniscript::{
bitcoin::util::bip32::{DerivationPath, Fingerprint},
bitcoin::{
util::bip32::{DerivationPath, Fingerprint},
Network,
},
descriptor::{Descriptor, DescriptorMultiXKey, DescriptorPublicKey, Wildcard},
},
};
@ -20,6 +23,7 @@ use crate::{
};
pub struct DefineDescriptor {
network: Network,
imported_descriptor: form::Value<String>,
user_xpub: form::Value<String>,
heir_xpub: form::Value<String>,
@ -32,6 +36,7 @@ pub struct DefineDescriptor {
impl DefineDescriptor {
pub fn new() -> Self {
Self {
network: Network::Bitcoin,
imported_descriptor: form::Value::default(),
user_xpub: form::Value::default(),
heir_xpub: form::Value::default(),
@ -100,6 +105,10 @@ impl Step for DefineDescriptor {
Command::none()
}
fn load_context(&mut self, ctx: &Context) {
self.network = ctx.bitcoin_config.network;
}
fn apply(&mut self, ctx: &mut Context) -> bool {
// descriptor forms for import or creation cannot be both empty or filled.
if self.imported_descriptor.value.is_empty()
@ -108,14 +117,29 @@ impl Step for DefineDescriptor {
|| self.sequence.value.is_empty())
{
if !self.user_xpub.value.is_empty() {
self.user_xpub.valid = DescriptorPublicKey::from_str(&self.user_xpub.value).is_ok();
let key = DescriptorPublicKey::from_str(&self.user_xpub.value);
self.user_xpub.valid = key.is_ok();
// Check the Network
if let Ok(key) = &key {
self.user_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network);
}
}
if !self.heir_xpub.value.is_empty() {
self.heir_xpub.valid = DescriptorPublicKey::from_str(&self.heir_xpub.value).is_ok();
let key = DescriptorPublicKey::from_str(&self.heir_xpub.value);
self.heir_xpub.valid = key.is_ok();
// Check the Network
if let Ok(key) = &key {
self.heir_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network);
}
}
if !self.sequence.value.is_empty() {
self.sequence.valid = self.sequence.value.parse::<u32>().is_ok();
} else {
self.sequence.valid = false;
}
if !self.imported_descriptor.value.is_empty() {
self.imported_descriptor.valid =
Descriptor::<DescriptorPublicKey>::from_str(&self.imported_descriptor.value)
@ -133,9 +157,15 @@ impl Step for DefineDescriptor {
} else {
let user_key = DescriptorPublicKey::from_str(&self.user_xpub.value);
self.user_xpub.valid = user_key.is_ok();
if let Ok(key) = &user_key {
self.user_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network);
}
let heir_key = DescriptorPublicKey::from_str(&self.heir_xpub.value);
self.user_xpub.valid = user_key.is_ok();
self.heir_xpub.valid = heir_key.is_ok();
if let Ok(key) = &heir_key {
self.heir_xpub.valid = check_key_network(&key, ctx.bitcoin_config.network);
}
let sequence = self.sequence.value.parse::<u16>();
self.sequence.valid = sequence.is_ok();
@ -166,6 +196,7 @@ impl Step for DefineDescriptor {
modal.view()
} else {
view::define_descriptor(
self.network,
&self.imported_descriptor,
&self.user_xpub,
&self.heir_xpub,
@ -176,6 +207,26 @@ impl Step for DefineDescriptor {
}
}
fn check_key_network(key: &DescriptorPublicKey, network: Network) -> bool {
match key {
DescriptorPublicKey::XPub(key) => {
if network == Network::Bitcoin {
key.xkey.network == Network::Bitcoin
} else {
key.xkey.network == Network::Testnet
}
}
DescriptorPublicKey::MultiXPub(key) => {
if network == Network::Bitcoin {
key.xkey.network == Network::Bitcoin
} else {
key.xkey.network == Network::Testnet
}
}
_ => true,
}
}
impl Default for DefineDescriptor {
fn default() -> Self {
Self::new()

13
gui/src/installer/view.rs
View File

@ -56,6 +56,7 @@ pub fn welcome(network: &bitcoin::Network, valid: bool) -> Element<Message> {
}
pub fn define_descriptor<'a>(
network: bitcoin::Network,
imported_descriptor: &form::Value<String>,
user_xpub: &form::Value<String>,
heir_xpub: &form::Value<String>,
@ -82,7 +83,11 @@ pub fn define_descriptor<'a>(
form::Form::new("Xpub", user_xpub, |msg| {
Message::DefineDescriptor(message::DefineDescriptor::UserXpubEdited(msg))
})
.warning("Please enter correct xpub")
.warning(if network == bitcoin::Network::Bitcoin {
"Please enter correct xpub"
} else {
"Please enter correct tpub"
})
.size(20)
.padding(10),
)
@ -102,7 +107,11 @@ pub fn define_descriptor<'a>(
form::Form::new("Xpub", heir_xpub, |msg| {
Message::DefineDescriptor(message::DefineDescriptor::HeirXpubEdited(msg))
})
.warning("Please enter correct xpub")
.warning(if network == bitcoin::Network::Bitcoin {
"Please enter correct xpub"
} else {
"Please enter correct tpub"
})
.size(20)
.padding(10),
)