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

gui: call import_backup_at_launch

Browse Source
This commit is contained in:
pythcoiner 2025-03-13 06:29:27 +01:00
parent 33e39316c7
commit 03476de35a
No known key found for this signature in database
GPG Key ID: C1048AEEDF303B88
6 changed files with 82 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
liana-gui/src/backup.rs
View File

@ -43,7 +43,7 @@ fn now() -> u64 {
.as_secs()
}
#[derive(Serialize, Deserialize)]
#[derive(Serialize, Deserialize, Clone)]
pub struct Backup {
#[serde(default, skip_serializing_if = "Option::is_none")]
pub name: Option<String>,
@ -371,7 +371,7 @@ async fn get_transactions(
Ok(vec)
}
#[derive(Debug, Serialize, Deserialize)]
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct Account {
#[serde(default, skip_serializing_if = "Option::is_none")]
pub name: Option<String>,
@ -450,7 +450,7 @@ impl Account {
}
}
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
pub struct Key {
pub key: Fingerprint,
#[serde(default, skip_serializing_if = "Option::is_none")]
@ -463,7 +463,7 @@ pub struct Key {
pub metadata: Value,
}
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
pub enum KeyRole {
/// Key to be used in normal spending condition
Main,
@ -475,7 +475,7 @@ pub enum KeyRole {
Cosigning,
}
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
pub enum KeyType {
/// Main user
Internal,

4
liana-gui/src/export.rs
View File

@ -947,8 +947,8 @@ pub async fn import_backup(
if let Some(ks) = KeySetting::from_backup(
v.alias.clone().unwrap_or("".into()),
*k,
v.role.clone(),
v.key_type.clone(),
v.role,
v.key_type,
v.metadata.clone(),
) {
settings_aliases.insert(*k, ks);

3
liana-gui/src/installer/context.rs
View File

@ -5,6 +5,7 @@ use std::time::Duration;
use crate::{
app::settings::KeySetting,
backup::Backup,
lianalite::client::backend::{BackendClient, BackendWalletClient},
node::bitcoind::{Bitcoind, InternalBitcoindConfig},
signer::Signer,
@ -69,6 +70,7 @@ pub struct Context {
pub internal_bitcoind_config: Option<InternalBitcoindConfig>,
pub internal_bitcoind: Option<Bitcoind>,
pub remote_backend: RemoteBackend,
pub backup: Option<Backup>,
}
impl Context {
@ -95,6 +97,7 @@ impl Context {
internal_bitcoind_config: None,
internal_bitcoind: None,
remote_backend,
backup: None,
}
}
}

2
liana-gui/src/installer/mod.rs
View File

@ -66,7 +66,7 @@ pub struct Installer {
signer: Arc<Mutex<Signer>>,
/// Context is data passed through each step.
context: Context,
pub context: Context,
}
impl Installer {

30
liana-gui/src/loader.rs
View File

@ -23,6 +23,9 @@ use lianad::{
StartupError,
};
use crate::app;
use crate::backup::Backup;
use crate::export::RestoreBackupError;
use crate::{
app::{
cache::Cache,
@ -56,7 +59,7 @@ pub struct Loader {
pub daemon_started: bool,
pub internal_bitcoind: Option<Bitcoind>,
pub waiting_daemon_bitcoind: bool,
pub backup: Option<Backup>,
step: Step,
}
@ -83,6 +86,20 @@ pub enum Message {
Cache,
Arc<dyn Daemon + Sync + Send>,
Option<Bitcoind>,
Option<Backup>,
),
Error,
>,
),
App(
Result<
(
Cache,
Arc<Wallet>,
app::Config,
Arc<dyn Daemon + Sync + Send>,
PathBuf,
Option<Bitcoind>,
),
Error,
>,
@ -100,6 +117,7 @@ impl Loader {
gui_config: GUIConfig,
network: bitcoin::Network,
internal_bitcoind: Option<Bitcoind>,
backup: Option<Backup>,
) -> (Self, Task<Message>) {
let path = gui_config
.daemon_rpc_path
@ -114,6 +132,7 @@ impl Loader {
daemon_started: false,
internal_bitcoind,
waiting_daemon_bitcoind: false,
backup,
},
Task::perform(connect(path), Message::Loaded),
)
@ -134,6 +153,7 @@ impl Loader {
self.datadir_path.clone(),
self.network,
self.internal_bitcoind.clone(),
self.backup.clone(),
),
Message::Synced,
);
@ -232,6 +252,7 @@ impl Loader {
self.datadir_path.clone(),
self.network,
self.internal_bitcoind.clone(),
self.backup.clone(),
),
Message::Synced,
);
@ -290,6 +311,7 @@ impl Loader {
self.gui_config.clone(),
self.network,
self.internal_bitcoind.clone(),
self.backup.clone(),
);
*self = loader;
cmd
@ -391,12 +413,14 @@ pub async fn load_application(
datadir_path: PathBuf,
network: bitcoin::Network,
internal_bitcoind: Option<Bitcoind>,
backup: Option<Backup>,
) -> Result<
(
Arc<Wallet>,
Cache,
Arc<dyn Daemon + Sync + Send>,
Option<Bitcoind>,
Option<Backup>,
),
Error,
> {
@ -421,7 +445,7 @@ pub async fn load_application(
..Default::default()
};
Ok((Arc::new(wallet), cache, daemon, internal_bitcoind))
Ok((Arc::new(wallet), cache, daemon, internal_bitcoind, backup))
}
#[derive(Clone, Debug)]
@ -582,6 +606,7 @@ pub enum Error {
Daemon(DaemonError),
Bitcoind(StartInternalBitcoindError),
BitcoindLogs(std::io::Error),
RestoreBackup(RestoreBackupError),
}
impl std::fmt::Display for Error {
@ -592,6 +617,7 @@ impl std::fmt::Display for Error {
Self::Daemon(e) => write!(f, "Liana daemon error: {}", e),
Self::Bitcoind(e) => write!(f, "Bitcoind error: {}", e),
Self::BitcoindLogs(e) => write!(f, "Bitcoind logs error: {}", e),
Self::RestoreBackup(e) => write!(f, "Restore backup: {e}"),
}
}
}

56
liana-gui/src/main.rs
View File

@ -24,11 +24,12 @@ use lianad::config::Config as DaemonConfig;
use liana_gui::{
app::{self, cache::Cache, config::default_datadir, wallet::Wallet, App},
datadir,
export::import_backup_at_launch,
hw::HardwareWalletConfig,
installer::{self, Installer},
launcher::{self, Launcher},
lianalite::{
client::{backend::api, backend::BackendWalletClient},
client::backend::{api, BackendWalletClient},
login,
},
loader::{self, Loader},
@ -162,7 +163,7 @@ impl GUI {
network,
log_level.unwrap_or_else(|| cfg.log_level().unwrap_or(LevelFilter::INFO)),
);
let (loader, command) = Loader::new(datadir_path, cfg, network, None);
let (loader, command) = Loader::new(datadir_path, cfg, network, None, None);
cmds.push(command.map(|msg| Message::Load(Box::new(msg))));
State::Loader(Box::new(loader))
}
@ -242,12 +243,13 @@ impl GUI {
self.state = State::Login(Box::new(login));
command.map(|msg| Message::Login(Box::new(msg)))
} else {
let (loader, command) = Loader::new(datadir_path, cfg, network, None);
let (loader, command) =
Loader::new(datadir_path, cfg, network, None, None);
self.state = State::Loader(Box::new(loader));
command.map(|msg| Message::Load(Box::new(msg)))
}
} else {
let (loader, command) = Loader::new(datadir_path, cfg, network, None);
let (loader, command) = Loader::new(datadir_path, cfg, network, None, None);
self.state = State::Loader(Box::new(loader));
command.map(|msg| Message::Load(Box::new(msg)))
}
@ -334,6 +336,7 @@ impl GUI {
cfg,
daemon_cfg.bitcoin_config.network,
internal_bitcoind,
i.context.backup.take(),
);
self.state = State::Loader(Box::new(loader));
command.map(|msg| Message::Load(Box::new(msg)))
@ -353,18 +356,45 @@ impl GUI {
self.state = State::Launcher(Box::new(launcher));
command.map(|msg| Message::Launch(Box::new(msg)))
}
loader::Message::Synced(Ok((wallet, cache, daemon, bitcoind))) => {
let (app, command) = App::new(
cache,
wallet,
loader.gui_config.clone(),
daemon,
loader.datadir_path.clone(),
bitcoind,
);
loader::Message::Synced(Ok((wallet, cache, daemon, bitcoind, backup))) => {
if let Some(backup) = backup {
let config = loader.gui_config.clone();
let datadir = loader.datadir_path.clone();
Task::perform(
async move {
import_backup_at_launch(
cache, wallet, config, daemon, datadir, bitcoind, backup,
)
.await
},
|r| {
let r = r.map_err(loader::Error::RestoreBackup);
Message::Load(Box::new(loader::Message::App(r)))
},
)
} else {
let (app, command) = App::new(
cache,
wallet,
loader.gui_config.clone(),
daemon,
loader.datadir_path.clone(),
bitcoind,
);
self.state = State::App(app);
command.map(|msg| Message::Run(Box::new(msg)))
}
}
loader::Message::App(Ok((cache, wallet, config, daemon, datadir, bitcoind))) => {
let (app, command) = App::new(cache, wallet, config, daemon, datadir, bitcoind);
self.state = State::App(app);
command.map(|msg| Message::Run(Box::new(msg)))
}
loader::Message::App(Err(e)) => {
tracing::error!("Fail to import backup: {e}");
Task::none()
}
_ => loader.update(*msg).map(|msg| Message::Load(Box::new(msg))),
},
(State::App(i), Message::Run(msg)) => {