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

Merge #766: fix wallet name in settings during install

Browse Source 
9a4b665fa1a471a7a6c7e0dea09065f9f01ec35d fix wallet name in settings during install (edouardparis)

Pull request description:

  DEFAULT_WALLET_NAME aka simple Liana was still used during creation of wallet settings during install
  this should have been noticed if I did test the wallet creation process in detail and if I removed the public exposition of the const variable. SHAME

ACKs for top commit:
  edouardparis:
    Self-ACK 9a4b665fa1a471a7a6c7e0dea09065f9f01ec35d

Tree-SHA512: 3afd98918a7ddcd10e702d0aed66a0645bea734fde61febe021f07c67f5b42a28018e1556e052f03e413db9c75686f121091a7ab871c7c3533d62b7202761625
This commit is contained in:
edouardparis 2023-10-31 10:18:03 +01:00
commit 7e039d7e38
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src/app/wallet.rs
View File

@ -12,7 +12,7 @@ use liana::{miniscript::bitcoin, signer::HotSigner};
use liana::descriptors::LianaDescriptor; use liana::descriptors::LianaDescriptor;
use liana::miniscript::bitcoin::bip32::Fingerprint; use liana::miniscript::bitcoin::bip32::Fingerprint;
pub const DEFAULT_WALLET_NAME: &str = "Liana"; const DEFAULT_WALLET_NAME: &str = "Liana";
pub fn wallet_name(main_descriptor: &LianaDescriptor) -> String { pub fn wallet_name(main_descriptor: &LianaDescriptor) -> String {
let desc = main_descriptor.to_string(); let desc = main_descriptor.to_string();

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

@ -5,7 +5,7 @@ use std::time::Duration;
use crate::{ use crate::{
app::{ app::{
settings::{KeySetting, Settings, WalletSetting}, settings::{KeySetting, Settings, WalletSetting},
wallet::DEFAULT_WALLET_NAME, wallet::wallet_name,
}, },
bitcoind::Bitcoind, bitcoind::Bitcoind,
hw::HardwareWalletConfig, hw::HardwareWalletConfig,
@ -68,13 +68,14 @@ impl Context {
.map(|token| HardwareWalletConfig::new(kind, *fingerprint, token)) .map(|token| HardwareWalletConfig::new(kind, *fingerprint, token))
}) })
.collect(); .collect();
let descriptor = self
.descriptor
.as_ref()
.expect("Must be a descriptor at this point");
Settings { Settings {
wallets: vec![WalletSetting { wallets: vec![WalletSetting {
name: DEFAULT_WALLET_NAME.to_string(), name: wallet_name(descriptor),
descriptor_checksum: self descriptor_checksum: descriptor
.descriptor
.as_ref()
.unwrap()
.to_string() .to_string()
.split_once('#') .split_once('#')
.map(|(_, checksum)| checksum) .map(|(_, checksum)| checksum)