gui: remove base64 dep

wizardsardine · Jan 22, 2024 · 99bc44d · 99bc44d
1 parent c9bb7b0
commit 99bc44d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 26 deletions.
diff --git a/gui/Cargo.lock b/gui/Cargo.lock
diff --git a/gui/Cargo.toml b/gui/Cargo.toml
@@ -18,7 +18,6 @@ async-hwi = { git = "https://github.com/wizardsardine/async-hwi", branch = "mast
 liana = { git = "https://github.com/wizardsardine/liana", branch = "master", default-features = false, features = ["nonblocking_shutdown"] }
 liana_ui = { path = "ui" }
 backtrace = "0.3"
-base64 = "0.13"
 hex = "0.4.3"
 
 iced = { version = "0.9", default-features= false, features = ["tokio", "glow", "svg", "qr_code", "image"] }

diff --git a/gui/src/app/state/psbt.rs b/gui/src/app/state/psbt.rs
@@ -1,5 +1,6 @@
 use std::collections::{HashMap, HashSet};
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::Arc;
 
 use iced::Subscription;
@@ -654,8 +655,7 @@ impl Action for UpdateAction {
                     Ok(()) => {
                         self.success = true;
                         self.error = None;
-                        let psbt = Psbt::deserialize(&base64::decode(&self.updated.value).unwrap())
-                            .expect("Already checked");
+                        let psbt = Psbt::from_str(&self.updated.value).expect("Already checked");
                         for (i, input) in tx.psbt.inputs.iter_mut().enumerate() {
                             if tx
                                 .psbt
@@ -688,21 +688,15 @@ impl Action for UpdateAction {
             }
             Message::View(view::Message::ImportSpend(view::ImportSpendMessage::PsbtEdited(s))) => {
                 self.updated.value = s;
-                if let Some(psbt) = base64::decode(&self.updated.value)
-                    .ok()
-                    .and_then(|bytes| Psbt::deserialize(&bytes).ok())
-                {
+                if let Ok(psbt) = Psbt::from_str(&self.updated.value) {
                     self.updated.valid = tx.psbt.unsigned_tx.txid() == psbt.unsigned_tx.txid();
                 }
             }
             Message::View(view::Message::ImportSpend(view::ImportSpendMessage::Confirm)) => {
                 if self.updated.valid {
                     self.processing = true;
                     self.error = None;
-                    let updated = Psbt::deserialize(
-                        &base64::decode(&self.updated.value).expect("Already checked"),
-                    )
-                    .unwrap();
+                    let updated = Psbt::from_str(&self.updated.value).expect("Already checked");
                     return Command::perform(
                         async move { daemon.update_spend_tx(&updated).map_err(|e| e.into()) },
                         Message::Updated,

diff --git a/gui/src/app/state/psbts.rs b/gui/src/app/state/psbts.rs
@@ -1,3 +1,4 @@
+use std::str::FromStr;
 use std::sync::Arc;
 
 use iced::{Command, Subscription};
@@ -190,19 +191,13 @@ impl ImportPsbtModal {
             }
             Message::View(view::Message::ImportSpend(view::ImportSpendMessage::PsbtEdited(s))) => {
                 self.imported.value = s;
-                self.imported.valid = base64::decode(&self.imported.value)
-                    .ok()
-                    .and_then(|bytes| Psbt::deserialize(&bytes).ok())
-                    .is_some();
+                self.imported.valid = Psbt::from_str(&self.imported.value).ok().is_some();
             }
             Message::View(view::Message::ImportSpend(view::ImportSpendMessage::Confirm)) => {
                 if self.imported.valid {
                     self.processing = true;
                     self.error = None;
-                    let imported = Psbt::deserialize(
-                        &base64::decode(&self.imported.value).expect("Already checked"),
-                    )
-                    .unwrap();
+                    let imported = Psbt::from_str(&self.imported.value).expect("Already checked");
                     return Command::perform(
                         async move { daemon.update_spend_tx(&imported).map_err(|e| e.into()) },
                         Message::Updated,

diff --git a/gui/src/daemon/client/mod.rs b/gui/src/daemon/client/mod.rs
@@ -110,7 +110,7 @@ impl<C: Client + Debug> Daemon for Lianad<C> {
     }
 
     fn update_spend_tx(&self, psbt: &Psbt) -> Result<(), DaemonError> {
-        let spend_tx = base64::encode(psbt.serialize());
+        let spend_tx = psbt.to_string();
         let _res: serde_json::value::Value = self.call("updatespend", Some(vec![spend_tx]))?;
         Ok(())
     }