installer: add wallet export feature at descriptor backup step

pythcoiner · pythcoiner · commit db659435b7f8 · 2025-03-12T17:41:43.000+01:00
diff --git a/liana-gui/src/app/state/export.rs b/liana-gui/src/app/state/export.rs
@@ -95,8 +95,12 @@ impl ExportModal {
                         self.state = ImportExportState::Progress(p);
                     }
                 }
-                Progress::Finished | Progress::Ended => self.state = ImportExportState::Ended,
-                Progress::Error(e) => self.error = Some(e),
+                Progress::Finished | Progress::Ended => {
+                    self.state = ImportExportState::Ended;
+                }
+                Progress::Error(e) => {
+                    self.error = Some(e);
+                }
                 Progress::None => {}
                 Progress::Psbt(_) => {
                     if self.import_export_type == ImportExportType::ImportPsbt {
diff --git a/liana-gui/src/app/state/settings/mod.rs b/liana-gui/src/app/state/settings/mod.rs
@@ -271,13 +271,15 @@ impl State for ImportExportSettingsState {
                         },
                         |s| {
                             Message::View(view::Message::Settings(
-                                view::SettingsMessage::ExportBackup(s),
+                                view::SettingsMessage::ExportBackup(Ok(s)),
                             ))
                         },
                     );
                 }
             }
-            Message::View(view::Message::Settings(view::SettingsMessage::ExportBackup(backup))) => {
+            Message::View(view::Message::Settings(view::SettingsMessage::ExportBackup(Ok(
+                backup,
+            )))) => {
                 let modal = ExportModal::new(Some(daemon), ImportExportType::ExportBackup(backup));
                 launch!(self, modal);
             }
diff --git a/liana-gui/src/app/state/settings/wallet.rs b/liana-gui/src/app/state/settings/wallet.rs
@@ -239,15 +239,17 @@ impl State for WalletSettingsState {
                         },
                         |s| {
                             Message::View(view::Message::Settings(
-                                view::SettingsMessage::ExportBackup(s),
+                                view::SettingsMessage::ExportBackup(Ok(s)),
                             ))
                         },
                     )
                 } else {
                     Task::none()
                 }
             }
-            Message::View(view::Message::Settings(view::SettingsMessage::ExportBackup(backup))) => {
+            Message::View(view::Message::Settings(view::SettingsMessage::ExportBackup(Ok(
+                backup,
+            )))) => {
                 if self.modal.is_none() {
                     let modal =
                         // ExportModal::new(Some(daemon), ImportExportType::ExportBackup(backup));
diff --git a/liana-gui/src/app/view/message.rs b/liana-gui/src/app/view/message.rs
@@ -1,4 +1,4 @@
-use crate::{app::menu::Menu, export::ImportExportMessage, node::bitcoind::RpcAuthType};
+use crate::{app::menu::Menu, backup, export::ImportExportMessage, node::bitcoind::RpcAuthType};
 use liana::miniscript::bitcoin::{bip32::Fingerprint, OutPoint};
 
 pub trait Close {
@@ -89,7 +89,7 @@ pub enum SettingsMessage {
     ExportTransactions,
     ExportLabels,
     ExportWallet,
-    ExportBackup(String),
+    ExportBackup(Result<String, backup::Error>),
     ImportWallet,
     AboutSection,
     RegisterWallet,
diff --git a/liana-gui/src/backup.rs b/liana-gui/src/backup.rs
@@ -45,19 +45,19 @@ pub struct Backup {
     pub proprietary: serde_json::Map<String, serde_json::Value>,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Error {
     DescriptorMissing,
     NotSingleWallet,
     Json,
     SettingsFromFile,
-    Daemon(DaemonError),
+    Daemon(String),
     TxTimeMissing,
 }
 
 impl From<DaemonError> for Error {
     fn from(value: DaemonError) -> Self {
-        Error::Daemon(value)
+        Error::Daemon(value.to_string())
     }
 }
 
diff --git a/liana-gui/src/installer/message.rs b/liana-gui/src/installer/message.rs
@@ -7,6 +7,7 @@ use std::path::PathBuf;
 use super::{context, Error};
 use crate::{
     app::view::Close,
+    backup,
     download::{DownloadError, Progress},
     export::ImportExportMessage,
     hw::HardwareWalletMessage,
@@ -46,6 +47,8 @@ pub enum Message {
     WalletRegistered(Result<(Fingerprint, Option<[u8; 32]>), Error>),
     MnemonicWord(usize, String),
     ImportMnemonic(bool),
+    BackupWallet,
+    ExportWallet(Result<String, backup::Error>),
     ImportExport(ImportExportMessage),
 }
 
@@ -57,7 +60,7 @@ impl Close for Message {
 
 impl From<ImportExportMessage> for Message {
     fn from(value: ImportExportMessage) -> Self {
-        Self::ImportExport(value)
+        Message::ImportExport(value)
     }
 }
 
diff --git a/liana-gui/src/installer/mod.rs b/liana-gui/src/installer/mod.rs
@@ -20,10 +20,11 @@ use std::sync::{Arc, Mutex};
 
 use crate::{
     app::{
-        config as gui_config, settings as gui_settings,
-        settings::{AuthConfig, Settings, SettingsError, WalletSetting},
+        config as gui_config,
+        settings::{self as gui_settings, AuthConfig, Settings, SettingsError, WalletSetting},
         wallet::wallet_name,
     },
+    backup,
     daemon::DaemonError,
     datadir::create_directory,
     hw::{HardwareWalletConfig, HardwareWallets},
@@ -708,6 +709,7 @@ pub enum Error {
     CannotGetAvailablePort(String),
     Unexpected(String),
     HardwareWallet(async_hwi::Error),
+    Backup(backup::Error),
 }
 
 impl From<jsonrpc::simple_http::Error> for Error {
@@ -760,6 +762,7 @@ impl std::fmt::Display for Error {
             Self::CannotCreateFile(e) => write!(f, "Failed to create file: {}", e),
             Self::Unexpected(e) => write!(f, "Unexpected: {}", e),
             Self::HardwareWallet(e) => write!(f, "Hardware Wallet: {}", e),
+            Self::Backup(e) => write!(f, "Backup: {:?}", e),
         }
     }
 }
diff --git a/liana-gui/src/installer/step/descriptor/mod.rs b/liana-gui/src/installer/step/descriptor/mod.rs
@@ -16,7 +16,9 @@ use liana_ui::{component::form, widget::Element};
 use async_hwi::DeviceKind;
 
 use crate::{
-    app::wallet::wallet_name,
+    app::{state::export::ExportModal, wallet::wallet_name},
+    backup::{self, Backup},
+    export::{ImportExportMessage, ImportExportType},
     hw::{HardwareWallet, HardwareWallets},
     installer::{
         message::{self, Message},
@@ -302,17 +304,70 @@ pub struct BackupDescriptor {
     done: bool,
     descriptor: Option<LianaDescriptor>,
     key_aliases: HashMap<Fingerprint, String>,
+    modal: Option<ExportModal>,
+    error: Option<Error>,
 }
 
 impl Step for BackupDescriptor {
+    fn subscription(&self, _hws: &HardwareWallets) -> Subscription<Message> {
+        if let Some(modal) = &self.modal {
+            if let Some(sub) = modal.subscription() {
+                sub.map(|m| Message::ImportExport(ImportExportMessage::Progress(m)))
+            } else {
+                Subscription::none()
+            }
+        } else {
+            Subscription::none()
+        }
+    }
     fn update(
         &mut self,
         _hws: &mut HardwareWallets,
         message: Message,
-        _ctx: &Context,
+        ctx: &Context,
     ) -> Task<Message> {
-        if let Message::UserActionDone(done) = message {
-            self.done = done;
+        match message {
+            Message::ImportExport(ImportExportMessage::Close) => {
+                self.modal = None;
+            }
+            Message::ImportExport(m) => {
+                if let Some(modal) = self.modal.as_mut() {
+                    let task: Task<Message> = modal.update(m);
+                    return task;
+                };
+            }
+            Message::BackupWallet => {
+                if self.modal.is_none() {
+                    let ctx = ctx.clone();
+                    return Task::perform(
+                        async move {
+                            let backup = Backup::from_installer(ctx, true).await?;
+                            serde_json::to_string_pretty(&backup).map_err(|_| backup::Error::Json)
+                        },
+                        Message::ExportWallet,
+                    );
+                }
+            }
+            Message::ExportWallet(str) => {
+                if self.modal.is_none() {
+                    let str = match str {
+                        Ok(s) => s,
+                        Err(e) => {
+                            tracing::error!("{e:?}");
+                            self.error = Some(Error::Backup(e));
+                            return Task::none();
+                        }
+                    };
+                    let modal = ExportModal::new(None, ImportExportType::ExportBackup(str));
+                    let launch = modal.launch();
+                    self.modal = Some(modal);
+                    return launch;
+                }
+            }
+            Message::UserActionDone(done) => {
+                self.done = done;
+            }
+            _ => {}
         }
         Task::none()
     }
@@ -334,13 +389,19 @@ impl Step for BackupDescriptor {
         progress: (usize, usize),
         email: Option<&'a str>,
     ) -> Element<Message> {
-        view::backup_descriptor(
+        let content = view::backup_descriptor(
             progress,
             email,
             self.descriptor.as_ref().expect("Must be a descriptor"),
             &self.key_aliases,
+            self.error.as_ref(),
             self.done,
-        )
+        );
+        if let Some(modal) = &self.modal {
+            modal.view(content)
+        } else {
+            content
+        }
     }
 }
 
diff --git a/liana-gui/src/installer/view/mod.rs b/liana-gui/src/installer/view/mod.rs
@@ -687,6 +687,7 @@ pub fn backup_descriptor<'a>(
     email: Option<&'a str>,
     descriptor: &'a LianaDescriptor,
     keys_aliases: &'a HashMap<Fingerprint, String>,
+    error: Option<&Error>,
     done: bool,
 ) -> Element<'a, Message> {
     layout(
@@ -722,6 +723,7 @@ pub fn backup_descriptor<'a>(
                     ))
                     .max_width(1000),
             )
+            .push_maybe(error.map(|e| card::error("Failed to export backup", e.to_string())))
             .push(
                 card::simple(
                     Column::new()
@@ -739,10 +741,17 @@ pub fn backup_descriptor<'a>(
                             ),
                         )
                         .push(
-                            Row::new().push(Column::new().width(Length::Fill)).push(
-                                button::secondary(Some(icon::clipboard_icon()), "Copy")
-                                    .on_press(Message::Clibpboard(descriptor.to_string())),
-                            ),
+                            Row::new()
+                                .push(Space::with_width(Length::Fill))
+                                .push(
+                                    button::secondary(Some(icon::wallet_icon()), "Backup")
+                                        .on_press(Message::BackupWallet),
+                                )
+                                .push(Space::with_width(10))
+                                .push(
+                                    button::secondary(Some(icon::clipboard_icon()), "Copy")
+                                        .on_press(Message::Clibpboard(descriptor.to_string())),
+                                ),
                         )
                         .spacing(10),
                 )

Original file line number	Diff line number	Diff line change
`@@ -271,13 +271,15 @@ impl State for ImportExportSettingsState {`
`271`	`271`	`},`
`272`	`272`	`\|s\| {`
`273`	`273`	`Message::View(view::Message::Settings(`
`274`		`- view::SettingsMessage::ExportBackup(s),`
	`274`	`+ view::SettingsMessage::ExportBackup(Ok(s)),`
`275`	`275`	`))`
`276`	`276`	`},`
`277`	`277`	`);`
`278`	`278`	`}`
`279`	`279`	`}`
`280`		`- Message::View(view::Message::Settings(view::SettingsMessage::ExportBackup(backup))) => {`
	`280`	`+ Message::View(view::Message::Settings(view::SettingsMessage::ExportBackup(Ok(`
	`281`	`+ backup,`
	`282`	`+ )))) => {`
`281`	`283`	`let modal = ExportModal::new(Some(daemon), ImportExportType::ExportBackup(backup));`
`282`	`284`	`launch!(self, modal);`
`283`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,19 +45,19 @@ pub struct Backup {`
`45`	`45`	`pub proprietary: serde_json::Map<String, serde_json::Value>,`
`46`	`46`	`}`
`47`	`47`
`48`		`-#[derive(Debug)]`
	`48`	`+#[derive(Debug, Clone)]`
`49`	`49`	`pub enum Error {`
`50`	`50`	`DescriptorMissing,`
`51`	`51`	`NotSingleWallet,`
`52`	`52`	`Json,`
`53`	`53`	`SettingsFromFile,`
`54`		`- Daemon(DaemonError),`
	`54`	`+ Daemon(String),`
`55`	`55`	`TxTimeMissing,`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`impl From<DaemonError> for Error {`
`59`	`59`	`fn from(value: DaemonError) -> Self {`
`60`		`- Error::Daemon(value)`
	`60`	`+ Error::Daemon(value.to_string())`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`