From 8dd16fb586b4edc87d602b0a1d6ad396fe5340b3 Mon Sep 17 00:00:00 2001 From: pythcoiner Date: Mon, 7 Apr 2025 12:40:25 +0200 Subject: [PATCH] export: trim string read from files --- liana-gui/src/export.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/liana-gui/src/export.rs b/liana-gui/src/export.rs index 54008e4c..d86cc1d4 100644 --- a/liana-gui/src/export.rs +++ b/liana-gui/src/export.rs @@ -585,6 +585,7 @@ pub async fn import_psbt(sender: &UnboundedSender, path: PathBuf) -> R let mut psbt_str = String::new(); file.read_to_string(&mut psbt_str)?; + psbt_str = psbt_str.trim().to_string(); let psbt = Psbt::from_str(&psbt_str).map_err(|_| Error::ParsePsbt)?; @@ -601,7 +602,9 @@ pub async fn import_descriptor( let mut descr_str = String::new(); file.read_to_string(&mut descr_str)?; - let descriptor = LianaDescriptor::from_str(&descr_str).map_err(|_| Error::ParseDescriptor)?; + let descr_str = descr_str.trim(); + + let descriptor = LianaDescriptor::from_str(descr_str).map_err(|_| Error::ParseDescriptor)?; send_progress!(sender, Progress(100.0)); send_progress!(sender, Descriptor(descriptor)); @@ -617,6 +620,7 @@ pub async fn import_xpub( let mut xpub_str = String::new(); file.read_to_string(&mut xpub_str)?; + let xpub_str = xpub_str.trim().to_string(); if let Ok(DescriptorPublicKey::XPub(key)) = DescriptorPublicKey::from_str(&xpub_str) { let valid = if network == Network::Bitcoin { @@ -667,6 +671,7 @@ pub async fn import_backup( let mut backup_str = String::new(); file.read_to_string(&mut backup_str)?; + backup_str = backup_str.trim().to_string(); let backup: Result = serde_json::from_str(&backup_str); let backup = match backup { @@ -971,6 +976,7 @@ pub async fn wallet_from_backup( let mut backup_str = String::new(); file.read_to_string(&mut backup_str)?; + backup_str = backup_str.trim().to_string(); let backup: Result = serde_json::from_str(&backup_str); let backup = match backup {