From c27713ec2fce91df08f24a0b148f4ffec2c4963a Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Oct 2022 16:23:30 -0500
Subject: [PATCH 1/8] Implement BDK Database types for gloo::LocalStorage

---
 node-manager/Cargo.toml          |   5 +-
 node-manager/src/error.rs        |  86 +++
 node-manager/src/lib.rs          |  12 +
 node-manager/src/localstorage.rs | 959 +++++++++++++++++++++++++++++++
 node-manager/src/nodemanager.rs  |   6 +-
 5 files changed, 1063 insertions(+), 5 deletions(-)
 create mode 100644 node-manager/src/error.rs
 create mode 100644 node-manager/src/localstorage.rs

diff --git a/node-manager/Cargo.toml b/node-manager/Cargo.toml
index 4857f03b4..8fb40078e 100644
--- a/node-manager/Cargo.toml
+++ b/node-manager/Cargo.toml
@@ -10,8 +10,11 @@ crate-type = ["cdylib"]
 cfg-if = "1.0.0"
 wasm-bindgen = "0.2.83"
 bip39 = { version = "1.0.1" }
-bitcoin = "0.29.1"
+bitcoin = "0.28.1"
+bdk = { git = "https://www.nakamoto.codes/BitcoinDevShop/bdk", branch="feat/use-external-esplora-client", default-features = false}
 getrandom = { version = "0.2", features = ["js"] }
+serde = { version = "^1.0", features = ["derive"] }
+serde_json = { version = "^1.0" }
 gloo-storage = "0.2.2"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
diff --git a/node-manager/src/error.rs b/node-manager/src/error.rs
new file mode 100644
index 000000000..9f485bd94
--- /dev/null
+++ b/node-manager/src/error.rs
@@ -0,0 +1,86 @@
+use gloo_storage::errors::StorageError;
+use std::fmt;
+
+#[derive(Debug)]
+// copied from LDK lite
+/// An error that possibly needs to be handled by the user.
+pub enum Error {
+    /// Returned when trying to start Mutiny while it is already running.
+    AlreadyRunning,
+    /// Returned when trying to stop Mutiny while it is not running.
+    NotRunning,
+    /// The funding transaction could not be created.
+    FundingTxCreationFailed,
+    /// A network connection has been closed.
+    ConnectionFailed,
+    /// Payment of the given invoice has already been initiated.
+    NonUniquePaymentHash,
+    /// The given invoice is invalid.
+    InvoiceInvalid,
+    /// Invoice creation failed.
+    InvoiceCreationFailed,
+    /// No route for the given target could be found.
+    RoutingFailed,
+    /// A given peer info could not be parsed.
+    PeerInfoParseFailed,
+    /// A channel could not be opened.
+    ChannelCreationFailed,
+    /// A channel could not be closed.
+    ChannelClosingFailed,
+    /// Persistence failed.
+    PersistenceFailed,
+    /// A wallet operation failed.
+    WalletOperationFailed,
+    /// A signing operation failed.
+    WalletSigningFailed,
+    /// A chain access operation failed.
+    ChainAccessFailed,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Self::AlreadyRunning => write!(f, "Mutiny is already running."),
+            Self::NotRunning => write!(f, "Mutiny is not running."),
+            Self::FundingTxCreationFailed => {
+                write!(f, "Funding transaction could not be created.")
+            }
+            Self::ConnectionFailed => write!(f, "Network connection closed."),
+            Self::NonUniquePaymentHash => write!(f, "An invoice must not get payed twice."),
+            Self::InvoiceInvalid => write!(f, "The given invoice is invalid."),
+            Self::InvoiceCreationFailed => write!(f, "Failed to create invoice."),
+            Self::RoutingFailed => write!(f, "Failed to find route."),
+            Self::PeerInfoParseFailed => write!(f, "Failed to parse the given peer information."),
+            Self::ChannelCreationFailed => write!(f, "Failed to create channel."),
+            Self::ChannelClosingFailed => write!(f, "Failed to close channel."),
+            Self::PersistenceFailed => write!(f, "Failed to persist data."),
+            Self::WalletOperationFailed => write!(f, "Failed to conduct wallet operation."),
+            Self::WalletSigningFailed => write!(f, "Failed to sign given transaction."),
+            Self::ChainAccessFailed => write!(f, "Failed to conduct chain access operation."),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl From<bdk::Error> for Error {
+    fn from(e: bdk::Error) -> Self {
+        match e {
+            bdk::Error::Signer(_) => Self::WalletSigningFailed,
+            _ => Self::WalletOperationFailed,
+        }
+    }
+}
+
+// todo uncomment when we add esplora stuff
+// impl From<esplora::EsploraError> for Error {
+//     fn from(_e: esplora::EsploraError) -> Self {
+//         Self::ChainAccessFailed
+//     }
+// }
+
+impl From<StorageError> for Error {
+    fn from(_e: StorageError) -> Self {
+        Self::PersistenceFailed
+    }
+}
diff --git a/node-manager/src/lib.rs b/node-manager/src/lib.rs
index ff736018a..2cc065b6e 100644
--- a/node-manager/src/lib.rs
+++ b/node-manager/src/lib.rs
@@ -2,6 +2,8 @@
 // wasm_bindgen uses improper casing and it needs to be turned off:
 // https://github.com/rustwasm/wasm-bindgen/issues/2882
 
+mod error;
+mod localstorage;
 mod nodemanager;
 mod seedgen;
 mod storage;
@@ -26,3 +28,13 @@ pub async fn main_js() -> Result<(), JsValue> {
     debug!("Main function ends");
     Ok(())
 }
+
+#[cfg(test)]
+mod test {
+    use crate::storage::delete_mnemonic;
+    use gloo_storage::{LocalStorage, Storage};
+
+    pub(crate) fn cleanup_test() -> () {
+        LocalStorage::clear();
+    }
+}
diff --git a/node-manager/src/localstorage.rs b/node-manager/src/localstorage.rs
new file mode 100644
index 000000000..95a149e9f
--- /dev/null
+++ b/node-manager/src/localstorage.rs
@@ -0,0 +1,959 @@
+use bdk::database::{BatchDatabase, BatchOperations, Database, SyncTime};
+use bdk::{KeychainKind, LocalUtxo, TransactionDetails};
+use bitcoin::consensus::deserialize;
+use bitcoin::consensus::encode::serialize;
+use bitcoin::hash_types::Txid;
+use bitcoin::{OutPoint, Script, Transaction};
+use gloo_storage::{LocalStorage, Storage};
+
+use bitcoin::hashes::hex::{FromHex, ToHex};
+use log::{error, info};
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
+
+pub struct MutinyBrowserStorage {}
+
+macro_rules! log {
+        ( $( $t:tt )* ) => {
+            web_sys::console::log_1(&format!( $( $t )* ).into());
+        }
+    }
+
+impl MutinyBrowserStorage {
+    pub fn new() -> Self {
+        MutinyBrowserStorage {}
+    }
+
+    // A wrapper for LocalStorage::set that converts the error to bdk::Error
+    fn set<T>(&self, key: impl AsRef<str>, value: T) -> Result<(), bdk::Error>
+    where
+        T: Serialize,
+    {
+        LocalStorage::set(key, value)
+            .map_err(|_| bdk::Error::Generic(String::from(format!("Storage error"))))
+    }
+
+    // mostly a copy of LocalStorage::get_all()
+    fn scan_prefix(&self, prefix: String) -> Map<String, Value> {
+        let local_storage = LocalStorage::raw();
+        let length = LocalStorage::length();
+        let mut map = Map::with_capacity(length as usize);
+        for index in 0..length {
+            let key_opt: Option<String> = local_storage.key(index).unwrap();
+
+            if let Some(key) = key_opt {
+                if key.starts_with(String::as_str(&prefix)) {
+                    let value: Value = LocalStorage::get(&key).unwrap();
+                    map.insert(key, value);
+                }
+            }
+        }
+
+        map
+    }
+}
+
+// path -> script       p{i,e}<path> -> script
+// script -> path       s<script> -> {i,e}<path>
+// outpoint             u<outpoint> -> txout
+// rawtx                r<txid> -> tx
+// transactions         t<txid> -> tx details
+// deriv indexes        c{i,e} -> u32
+// descriptor checksum  d{i,e} -> vec<u8>
+// last sync time       l -> { height, timestamp }
+
+enum MapKey<'a> {
+    Path((Option<KeychainKind>, Option<u32>)),
+    Script(Option<&'a Script>),
+    Utxo(Option<&'a OutPoint>),
+    RawTx(Option<&'a Txid>),
+    Transaction(Option<&'a Txid>),
+    LastIndex(KeychainKind),
+    SyncTime,
+    DescriptorChecksum(KeychainKind),
+}
+
+// copied from bdk
+impl MapKey<'_> {
+    fn as_prefix(&self) -> Vec<u8> {
+        match self {
+            MapKey::Path((st, _)) => {
+                let mut v = b"p".to_vec();
+                if let Some(st) = st {
+                    v.push(st.as_byte());
+                }
+                v
+            }
+            MapKey::Script(_) => b"s".to_vec(),
+            MapKey::Utxo(_) => b"u".to_vec(),
+            MapKey::RawTx(_) => b"r".to_vec(),
+            MapKey::Transaction(_) => b"t".to_vec(),
+            MapKey::LastIndex(st) => [b"c", st.as_ref()].concat(),
+            MapKey::SyncTime => b"l".to_vec(),
+            MapKey::DescriptorChecksum(st) => [b"d", st.as_ref()].concat(),
+        }
+    }
+
+    fn serialize_content(&self) -> Vec<u8> {
+        match self {
+            MapKey::Path((_, Some(child))) => child.to_be_bytes().to_vec(),
+            MapKey::Script(Some(s)) => serialize(*s),
+            MapKey::Utxo(Some(s)) => serialize(*s),
+            MapKey::RawTx(Some(s)) => serialize(*s),
+            MapKey::Transaction(Some(s)) => serialize(*s),
+            _ => vec![],
+        }
+    }
+
+    pub fn as_map_key(&self) -> String {
+        let mut v = self.as_prefix();
+        v.extend_from_slice(&self.serialize_content());
+
+        v.to_hex()
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+struct ScriptPubKeyInfo {
+    pub keychain: KeychainKind,
+    pub path: u32,
+}
+
+impl BatchOperations for MutinyBrowserStorage {
+    fn set_script_pubkey(
+        &mut self,
+        script: &Script,
+        keychain: KeychainKind,
+        path: u32,
+    ) -> Result<(), bdk::Error> {
+        let key = MapKey::Path((Some(keychain), Some(path))).as_map_key();
+        self.set(key, script.clone())?;
+
+        let key = MapKey::Script(Some(script)).as_map_key();
+        let spk_info = ScriptPubKeyInfo { keychain, path };
+        self.set(key, spk_info)?;
+
+        Ok(())
+    }
+
+    fn set_utxo(&mut self, utxo: &LocalUtxo) -> Result<(), bdk::Error> {
+        let key = MapKey::Utxo(Some(&utxo.outpoint)).as_map_key();
+        self.set(key, utxo)?;
+
+        Ok(())
+    }
+    fn set_raw_tx(&mut self, transaction: &Transaction) -> Result<(), bdk::Error> {
+        let key = MapKey::RawTx(Some(&transaction.txid())).as_map_key();
+        self.set(key, transaction.clone())?;
+
+        Ok(())
+    }
+    fn set_tx(&mut self, transaction: &TransactionDetails) -> Result<(), bdk::Error> {
+        let key = MapKey::Transaction(Some(&transaction.txid)).as_map_key();
+
+        // insert the raw_tx if present
+        if let Some(ref tx) = transaction.transaction {
+            self.set_raw_tx(tx)?;
+        }
+
+        // remove the raw tx from the serialized version
+        let mut transaction = transaction.clone();
+        transaction.transaction = None;
+
+        self.set(key, transaction)?;
+
+        Ok(())
+    }
+    fn set_last_index(&mut self, keychain: KeychainKind, value: u32) -> Result<(), bdk::Error> {
+        let key = MapKey::LastIndex(keychain).as_map_key();
+        self.set(key, value)?;
+
+        Ok(())
+    }
+    fn set_sync_time(&mut self, data: SyncTime) -> Result<(), bdk::Error> {
+        let key = MapKey::SyncTime.as_map_key();
+        self.set(key, data)?;
+
+        Ok(())
+    }
+
+    fn del_script_pubkey_from_path(
+        &mut self,
+        keychain: KeychainKind,
+        path: u32,
+    ) -> Result<Option<Script>, bdk::Error> {
+        let key = MapKey::Path((Some(keychain), Some(path))).as_map_key();
+        let res: Option<Script> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        Ok(res)
+    }
+    fn del_path_from_script_pubkey(
+        &mut self,
+        script: &Script,
+    ) -> Result<Option<(KeychainKind, u32)>, bdk::Error> {
+        let key = MapKey::Script(Some(script)).as_map_key();
+        let res: Option<ScriptPubKeyInfo> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        match res {
+            None => Ok(None),
+            Some(spk_info) => Ok(Some((spk_info.keychain, spk_info.path))),
+        }
+    }
+    fn del_utxo(&mut self, outpoint: &OutPoint) -> Result<Option<LocalUtxo>, bdk::Error> {
+        let key = MapKey::Utxo(Some(outpoint)).as_map_key();
+        let res: Option<LocalUtxo> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        Ok(res)
+    }
+    fn del_raw_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, bdk::Error> {
+        let key = MapKey::RawTx(Some(txid)).as_map_key();
+        let res: Option<Transaction> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        Ok(res)
+    }
+    fn del_tx(
+        &mut self,
+        txid: &Txid,
+        include_raw: bool,
+    ) -> Result<Option<TransactionDetails>, bdk::Error> {
+        let raw_tx = if include_raw {
+            self.del_raw_tx(txid)?
+        } else {
+            None
+        };
+
+        let key = MapKey::Transaction(Some(txid)).as_map_key();
+        let res: Option<TransactionDetails> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        match res {
+            None => Ok(None),
+            Some(mut val) => {
+                val.transaction = raw_tx;
+
+                Ok(Some(val))
+            }
+        }
+    }
+    fn del_last_index(&mut self, keychain: KeychainKind) -> Result<Option<u32>, bdk::Error> {
+        let key = MapKey::LastIndex(keychain).as_map_key();
+        let res: Option<u32> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        Ok(res)
+    }
+    fn del_sync_time(&mut self) -> Result<Option<SyncTime>, bdk::Error> {
+        let key = MapKey::SyncTime.as_map_key();
+        let res: Option<SyncTime> = LocalStorage::get(&key).ok();
+        LocalStorage::delete(&key);
+
+        Ok(res)
+    }
+}
+
+impl Database for MutinyBrowserStorage {
+    fn check_descriptor_checksum<B: AsRef<[u8]>>(
+        &mut self,
+        keychain: KeychainKind,
+        bytes: B,
+    ) -> Result<(), bdk::Error> {
+        let key = MapKey::DescriptorChecksum(keychain).as_map_key();
+
+        let prev = LocalStorage::get::<Vec<u8>>(&key).ok();
+        if let Some(val) = prev {
+            if val == bytes.as_ref().to_vec() {
+                Ok(())
+            } else {
+                Err(bdk::Error::ChecksumMismatch)
+            }
+        } else {
+            self.set(key, bytes.as_ref().to_vec())?;
+            Ok(())
+        }
+    }
+
+    fn iter_script_pubkeys(
+        &self,
+        keychain: Option<KeychainKind>,
+    ) -> Result<Vec<Script>, bdk::Error> {
+        let key = MapKey::Path((keychain, None)).as_map_key();
+        self.scan_prefix(key)
+            .into_iter()
+            .map(|tuple| -> Result<_, bdk::Error> {
+                // todo make this safer
+                let (_, value) = tuple;
+                let str = value.as_str().unwrap();
+                Script::from_hex(str)
+                    .map_err(|_| bdk::Error::Generic(String::from("Error decoding")))
+            })
+            .collect()
+    }
+
+    fn iter_utxos(&self) -> Result<Vec<LocalUtxo>, bdk::Error> {
+        let key = MapKey::Utxo(None).as_map_key();
+        self.scan_prefix(key)
+            .into_iter()
+            .map(|x| -> Result<_, bdk::Error> {
+                let (_, v) = x;
+
+                let utxo: LocalUtxo = Deserialize::deserialize(v)?;
+                Ok(utxo)
+            })
+            .collect()
+    }
+
+    fn iter_raw_txs(&self) -> Result<Vec<Transaction>, bdk::Error> {
+        let key = MapKey::RawTx(None).as_map_key();
+        self.scan_prefix(key)
+            .into_iter()
+            .map(|tuple| -> Result<_, bdk::Error> {
+                let (_, value) = tuple;
+                let tx: Transaction = Deserialize::deserialize(value)?;
+                Ok(tx)
+            })
+            .collect()
+    }
+
+    fn iter_txs(&self, include_raw: bool) -> Result<Vec<TransactionDetails>, bdk::Error> {
+        let key = MapKey::Transaction(None).as_map_key();
+        self.scan_prefix(key)
+            .into_iter()
+            .map(|tuple| -> Result<_, bdk::Error> {
+                let (key, value) = tuple;
+                let mut tx_details: TransactionDetails = Deserialize::deserialize(value)?;
+                if include_raw {
+                    // first byte is prefix for the map, need to drop it
+                    let rm_prefix: &str = &key[2..key.len()];
+                    let k_bytes = Vec::from_hex(rm_prefix)?;
+                    let txid = deserialize(k_bytes.as_slice())?;
+                    tx_details.transaction = self.get_raw_tx(&txid)?;
+                }
+
+                Ok(tx_details)
+            })
+            .collect()
+    }
+
+    fn get_script_pubkey_from_path(
+        &self,
+        keychain: KeychainKind,
+        path: u32,
+    ) -> Result<Option<Script>, bdk::Error> {
+        let key = MapKey::Path((Some(keychain), Some(path))).as_map_key();
+        Ok(LocalStorage::get::<Script>(&key).ok())
+    }
+
+    fn get_path_from_script_pubkey(
+        &self,
+        script: &Script,
+    ) -> Result<Option<(KeychainKind, u32)>, bdk::Error> {
+        let key = MapKey::Script(Some(script)).as_map_key();
+        Ok(LocalStorage::get::<ScriptPubKeyInfo>(&key)
+            .ok()
+            .map(|info| (info.keychain, info.path)))
+    }
+
+    fn get_utxo(&self, outpoint: &OutPoint) -> Result<Option<LocalUtxo>, bdk::Error> {
+        let key = MapKey::Utxo(Some(outpoint)).as_map_key();
+        let res: Option<LocalUtxo> = LocalStorage::get(key).ok();
+
+        Ok(res)
+    }
+
+    fn get_raw_tx(&self, txid: &Txid) -> Result<Option<Transaction>, bdk::Error> {
+        let key = MapKey::RawTx(Some(txid)).as_map_key();
+        Ok(LocalStorage::get::<Transaction>(&key).ok())
+    }
+
+    fn get_tx(
+        &self,
+        txid: &Txid,
+        include_raw: bool,
+    ) -> Result<Option<TransactionDetails>, bdk::Error> {
+        let key = MapKey::Transaction(Some(txid)).as_map_key();
+        Ok(LocalStorage::get::<TransactionDetails>(&key)
+            .ok()
+            .map(|mut txdetails| {
+                if include_raw {
+                    txdetails.transaction = self.get_raw_tx(txid).unwrap();
+                }
+
+                txdetails
+            }))
+    }
+
+    fn get_last_index(&self, keychain: KeychainKind) -> Result<Option<u32>, bdk::Error> {
+        let key = MapKey::LastIndex(keychain).as_map_key();
+        Ok(LocalStorage::get::<u32>(key).ok())
+    }
+
+    fn get_sync_time(&self) -> Result<Option<SyncTime>, bdk::Error> {
+        let key = MapKey::SyncTime.as_map_key();
+        Ok(LocalStorage::get::<SyncTime>(key).ok())
+    }
+
+    // inserts 0 if not present
+    fn increment_last_index(&mut self, keychain: KeychainKind) -> Result<u32, bdk::Error> {
+        let key = MapKey::LastIndex(keychain).as_map_key();
+        let current_opt = LocalStorage::get::<u32>(&key).ok();
+        let value = current_opt.map(|s| s + 1).unwrap_or_else(|| 0);
+        self.set(key, value)?;
+
+        Ok(value)
+    }
+}
+
+impl BatchDatabase for MutinyBrowserStorage {
+    type Batch = Self;
+
+    fn begin_batch(&self) -> Self::Batch {
+        MutinyBrowserStorage::new()
+    }
+
+    fn commit_batch(&mut self, mut _batch: Self::Batch) -> Result<(), bdk::Error> {
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::localstorage::MutinyBrowserStorage;
+    use bdk::database::{BatchDatabase, Database, SyncTime};
+    use bdk::{BlockTime, KeychainKind, LocalUtxo, TransactionDetails};
+    use std::str::FromStr;
+
+    use crate::test::*;
+    use bitcoin::consensus::encode::deserialize;
+    use bitcoin::consensus::serialize;
+    use bitcoin::hashes::hex::*;
+    use bitcoin::*;
+
+    use super::*;
+
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    // todo this is copied from bdk::database::test, can we pull it from dependency?
+
+    pub fn test_script_pubkey<D: Database>(mut db: D) {
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let path = 42;
+        let keychain = KeychainKind::External;
+
+        db.set_script_pubkey(&script, keychain, path).unwrap();
+
+        assert_eq!(
+            db.get_script_pubkey_from_path(keychain, path).unwrap(),
+            Some(script.clone())
+        );
+        assert_eq!(
+            db.get_path_from_script_pubkey(&script).unwrap(),
+            Some((keychain, path))
+        );
+    }
+
+    pub fn test_batch_script_pubkey<D: BatchDatabase>(mut db: D) {
+        let mut batch = db.begin_batch();
+
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let path = 42;
+        let keychain = KeychainKind::External;
+
+        batch.set_script_pubkey(&script, keychain, path).unwrap();
+
+        assert_eq!(
+            db.get_script_pubkey_from_path(keychain, path).unwrap(),
+            None
+        );
+        assert_eq!(db.get_path_from_script_pubkey(&script).unwrap(), None);
+
+        db.commit_batch(batch).unwrap();
+
+        assert_eq!(
+            db.get_script_pubkey_from_path(keychain, path).unwrap(),
+            Some(script.clone())
+        );
+        assert_eq!(
+            db.get_path_from_script_pubkey(&script).unwrap(),
+            Some((keychain, path))
+        );
+    }
+
+    pub fn test_iter_script_pubkey<D: Database>(mut db: D) {
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let path = 42;
+        let keychain = KeychainKind::External;
+
+        db.set_script_pubkey(&script, keychain, path).unwrap();
+
+        assert_eq!(db.iter_script_pubkeys(None).unwrap().len(), 1);
+    }
+
+    pub fn test_del_script_pubkey<D: Database>(mut db: D) {
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let path = 42;
+        let keychain = KeychainKind::External;
+
+        db.set_script_pubkey(&script, keychain, path).unwrap();
+        assert_eq!(db.iter_script_pubkeys(None).unwrap().len(), 1);
+
+        db.del_script_pubkey_from_path(keychain, path).unwrap();
+        assert_eq!(db.iter_script_pubkeys(None).unwrap().len(), 0);
+    }
+
+    pub fn test_utxo<D: Database>(mut db: D) {
+        let outpoint = OutPoint::from_str(
+            "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456:0",
+        )
+        .unwrap();
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let txout = TxOut {
+            value: 133742,
+            script_pubkey: script,
+        };
+        let utxo = LocalUtxo {
+            txout,
+            outpoint,
+            keychain: KeychainKind::External,
+            is_spent: true,
+        };
+
+        db.set_utxo(&utxo).unwrap();
+        db.set_utxo(&utxo).unwrap();
+        assert_eq!(db.iter_utxos().unwrap().len(), 1);
+        assert_eq!(db.get_utxo(&outpoint).unwrap(), Some(utxo));
+    }
+
+    pub fn test_raw_tx<D: Database>(mut db: D) {
+        let hex_tx = Vec::<u8>::from_hex("02000000000101f58c18a90d7a76b30c7e47d4e817adfdd79a6a589a615ef36e360f913adce2cd0000000000feffffff0210270000000000001600145c9a1816d38db5cbdd4b067b689dc19eb7d930e2cf70aa2b080000001600140f48b63160043047f4f60f7f8f551f80458f693f024730440220413f42b7bc979945489a38f5221e5527d4b8e3aa63eae2099e01945896ad6c10022024ceec492d685c31d8adb64e935a06933877c5ae0e21f32efe029850914c5bad012102361caae96f0e9f3a453d354bb37a5c3244422fb22819bf0166c0647a38de39f21fca2300").unwrap();
+        let mut tx: Transaction = deserialize(&hex_tx).unwrap();
+
+        db.set_raw_tx(&tx).unwrap();
+
+        let txid = tx.txid();
+
+        assert_eq!(db.get_raw_tx(&txid).unwrap(), Some(tx.clone()));
+
+        // mutate transaction's witnesses
+        for tx_in in tx.input.iter_mut() {
+            tx_in.witness = Witness::new();
+        }
+
+        let updated_hex_tx = serialize(&tx);
+
+        // verify that mutation was successful
+        assert_ne!(hex_tx, updated_hex_tx);
+
+        db.set_raw_tx(&tx).unwrap();
+
+        let txid = tx.txid();
+
+        assert_eq!(db.get_raw_tx(&txid).unwrap(), Some(tx));
+    }
+
+    pub fn test_tx<D: Database>(mut db: D) {
+        let hex_tx = Vec::<u8>::from_hex("0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000").unwrap();
+        let tx: Transaction = deserialize(&hex_tx).unwrap();
+        let txid = tx.txid();
+        let mut tx_details = TransactionDetails {
+            transaction: Some(tx),
+            txid,
+            received: 1337,
+            sent: 420420,
+            fee: Some(140),
+            confirmation_time: Some(BlockTime {
+                timestamp: 123456,
+                height: 1000,
+            }),
+        };
+
+        db.set_tx(&tx_details).unwrap();
+
+        // get with raw tx too
+        assert_eq!(
+            db.get_tx(&tx_details.txid, true).unwrap(),
+            Some(tx_details.clone())
+        );
+        // get only raw_tx
+        assert_eq!(
+            db.get_raw_tx(&tx_details.txid).unwrap(),
+            tx_details.transaction
+        );
+
+        // now get without raw_tx
+        tx_details.transaction = None;
+        assert_eq!(
+            db.get_tx(&tx_details.txid, false).unwrap(),
+            Some(tx_details)
+        );
+    }
+
+    pub fn test_list_transaction<D: Database>(mut db: D) {
+        let hex_tx = Vec::<u8>::from_hex("0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000").unwrap();
+        let tx: Transaction = deserialize(&hex_tx).unwrap();
+        let txid = tx.txid();
+        let mut tx_details = TransactionDetails {
+            transaction: Some(tx),
+            txid,
+            received: 1337,
+            sent: 420420,
+            fee: Some(140),
+            confirmation_time: Some(BlockTime {
+                timestamp: 123456,
+                height: 1000,
+            }),
+        };
+
+        db.set_tx(&tx_details).unwrap();
+
+        // get raw tx
+        assert_eq!(db.iter_txs(true).unwrap(), vec![tx_details.clone()]);
+
+        // now get without raw tx
+        tx_details.transaction = None;
+
+        // get not raw tx
+        assert_eq!(db.iter_txs(false).unwrap(), vec![tx_details.clone()]);
+    }
+
+    pub fn test_last_index<D: Database>(mut db: D) {
+        db.set_last_index(KeychainKind::External, 1337).unwrap();
+
+        assert_eq!(
+            db.get_last_index(KeychainKind::External).unwrap(),
+            Some(1337)
+        );
+        assert_eq!(db.get_last_index(KeychainKind::Internal).unwrap(), None);
+
+        let res = db.increment_last_index(KeychainKind::External).unwrap();
+        assert_eq!(res, 1338);
+        let res = db.increment_last_index(KeychainKind::Internal).unwrap();
+        assert_eq!(res, 0);
+
+        assert_eq!(
+            db.get_last_index(KeychainKind::External).unwrap(),
+            Some(1338)
+        );
+        assert_eq!(db.get_last_index(KeychainKind::Internal).unwrap(), Some(0));
+    }
+
+    pub fn test_sync_time<D: Database>(mut db: D) {
+        assert!(db.get_sync_time().unwrap().is_none());
+
+        db.set_sync_time(SyncTime {
+            block_time: BlockTime {
+                height: 100,
+                timestamp: 1000,
+            },
+        })
+        .unwrap();
+
+        let extracted = db.get_sync_time().unwrap();
+        assert!(extracted.is_some());
+        assert_eq!(extracted.as_ref().unwrap().block_time.height, 100);
+        assert_eq!(extracted.as_ref().unwrap().block_time.timestamp, 1000);
+
+        db.del_sync_time().unwrap();
+        assert!(db.get_sync_time().unwrap().is_none());
+    }
+
+    pub fn test_iter_raw_txs<D: Database>(mut db: D) {
+        let txs = db.iter_raw_txs().unwrap();
+        assert!(txs.is_empty());
+
+        let hex_tx = Vec::<u8>::from_hex("0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000").unwrap();
+        let first_tx: Transaction = deserialize(&hex_tx).unwrap();
+
+        let hex_tx = Vec::<u8>::from_hex("02000000000101f58c18a90d7a76b30c7e47d4e817adfdd79a6a589a615ef36e360f913adce2cd0000000000feffffff0210270000000000001600145c9a1816d38db5cbdd4b067b689dc19eb7d930e2cf70aa2b080000001600140f48b63160043047f4f60f7f8f551f80458f693f024730440220413f42b7bc979945489a38f5221e5527d4b8e3aa63eae2099e01945896ad6c10022024ceec492d685c31d8adb64e935a06933877c5ae0e21f32efe029850914c5bad012102361caae96f0e9f3a453d354bb37a5c3244422fb22819bf0166c0647a38de39f21fca2300").unwrap();
+        let second_tx: Transaction = deserialize(&hex_tx).unwrap();
+
+        db.set_raw_tx(&first_tx).unwrap();
+        db.set_raw_tx(&second_tx).unwrap();
+
+        let txs = db.iter_raw_txs().unwrap();
+
+        assert!(txs.contains(&first_tx));
+        assert!(txs.contains(&second_tx));
+        assert_eq!(txs.len(), 2);
+    }
+
+    pub fn test_del_path_from_script_pubkey<D: Database>(mut db: D) {
+        let keychain = KeychainKind::External;
+
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let path = 42;
+
+        let res = db.del_path_from_script_pubkey(&script).unwrap();
+
+        assert!(res.is_none());
+
+        let _res = db.set_script_pubkey(&script, keychain, path);
+        let (chain, child) = db.del_path_from_script_pubkey(&script).unwrap().unwrap();
+
+        assert_eq!(chain, keychain);
+        assert_eq!(child, path);
+
+        let res = db.get_path_from_script_pubkey(&script).unwrap();
+        assert!(res.is_none());
+    }
+
+    pub fn test_iter_script_pubkeys<D: Database>(mut db: D) {
+        let keychain = KeychainKind::External;
+        let scripts = db.iter_script_pubkeys(Some(keychain)).unwrap();
+        assert!(scripts.is_empty());
+
+        let first_script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let path = 42;
+
+        db.set_script_pubkey(&first_script, keychain, path).unwrap();
+
+        let second_script =
+            Script::from_hex("00145c9a1816d38db5cbdd4b067b689dc19eb7d930e2").unwrap();
+        let path = 57;
+
+        db.set_script_pubkey(&second_script, keychain, path)
+            .unwrap();
+        let scripts = db.iter_script_pubkeys(Some(keychain)).unwrap();
+
+        assert!(scripts.contains(&first_script));
+        assert!(scripts.contains(&second_script));
+        assert_eq!(scripts.len(), 2);
+    }
+
+    pub fn test_del_utxo<D: Database>(mut db: D) {
+        let outpoint = OutPoint::from_str(
+            "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456:0",
+        )
+        .unwrap();
+        let script =
+            Script::from_hex("76a91402306a7c23f3e8010de41e9e591348bb83f11daa88ac").unwrap();
+        let txout = TxOut {
+            value: 133742,
+            script_pubkey: script,
+        };
+        let utxo = LocalUtxo {
+            txout,
+            outpoint,
+            keychain: KeychainKind::External,
+            is_spent: true,
+        };
+
+        let res = db.del_utxo(&outpoint).unwrap();
+        assert!(res.is_none());
+
+        db.set_utxo(&utxo).unwrap();
+
+        let res = db.del_utxo(&outpoint).unwrap();
+
+        assert_eq!(res.unwrap(), utxo);
+
+        let res = db.get_utxo(&outpoint).unwrap();
+        assert!(res.is_none());
+    }
+
+    pub fn test_del_raw_tx<D: Database>(mut db: D) {
+        let hex_tx = Vec::<u8>::from_hex("02000000000101f58c18a90d7a76b30c7e47d4e817adfdd79a6a589a615ef36e360f913adce2cd0000000000feffffff0210270000000000001600145c9a1816d38db5cbdd4b067b689dc19eb7d930e2cf70aa2b080000001600140f48b63160043047f4f60f7f8f551f80458f693f024730440220413f42b7bc979945489a38f5221e5527d4b8e3aa63eae2099e01945896ad6c10022024ceec492d685c31d8adb64e935a06933877c5ae0e21f32efe029850914c5bad012102361caae96f0e9f3a453d354bb37a5c3244422fb22819bf0166c0647a38de39f21fca2300").unwrap();
+        let tx: Transaction = deserialize(&hex_tx).unwrap();
+
+        let res = db.del_raw_tx(&tx.txid()).unwrap();
+
+        assert!(res.is_none());
+
+        db.set_raw_tx(&tx).unwrap();
+
+        let res = db.del_raw_tx(&tx.txid()).unwrap();
+
+        assert_eq!(res.unwrap(), tx);
+
+        let res = db.get_raw_tx(&tx.txid()).unwrap();
+        assert!(res.is_none());
+    }
+
+    pub fn test_del_tx<D: Database>(mut db: D) {
+        let hex_tx = Vec::<u8>::from_hex("0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000").unwrap();
+        let tx: Transaction = deserialize(&hex_tx).unwrap();
+        let txid = tx.txid();
+        let mut tx_details = TransactionDetails {
+            transaction: Some(tx.clone()),
+            txid,
+            received: 1337,
+            sent: 420420,
+            fee: Some(140),
+            confirmation_time: Some(BlockTime {
+                timestamp: 123456,
+                height: 1000,
+            }),
+        };
+
+        let res = db.del_tx(&tx.txid(), true).unwrap();
+
+        assert!(res.is_none());
+
+        db.set_tx(&tx_details).unwrap();
+
+        let res = db.del_tx(&tx.txid(), false).unwrap();
+        tx_details.transaction = None;
+        assert_eq!(res.unwrap(), tx_details);
+
+        let res = db.get_tx(&tx.txid(), true).unwrap();
+        assert!(res.is_none());
+
+        let res = db.get_raw_tx(&tx.txid()).unwrap();
+        assert_eq!(res.unwrap(), tx);
+
+        db.set_tx(&tx_details).unwrap();
+        let res = db.del_tx(&tx.txid(), true).unwrap();
+        tx_details.transaction = Some(tx.clone());
+        assert_eq!(res.unwrap(), tx_details);
+
+        let res = db.get_tx(&tx.txid(), true).unwrap();
+        assert!(res.is_none());
+
+        let res = db.get_raw_tx(&tx.txid()).unwrap();
+        assert!(res.is_none());
+    }
+
+    pub fn test_del_last_index<D: Database>(mut db: D) {
+        let keychain = KeychainKind::External;
+
+        let _res = db.increment_last_index(keychain);
+
+        let res = db.get_last_index(keychain).unwrap().unwrap();
+
+        assert_eq!(res, 0);
+
+        let _res = db.increment_last_index(keychain);
+
+        let res = db.del_last_index(keychain).unwrap().unwrap();
+
+        assert_eq!(res, 1);
+
+        let res = db.get_last_index(keychain).unwrap();
+        assert!(res.is_none());
+    }
+
+    pub fn test_check_descriptor_checksum<D: Database>(mut db: D) {
+        // insert checksum associated to keychain
+        let checksum = "1cead456".as_bytes();
+        let keychain = KeychainKind::External;
+        let _res = db.check_descriptor_checksum(keychain, checksum);
+
+        // check if `check_descriptor_checksum` throws
+        // `Error::ChecksumMismatch` error if the
+        // function is passed a checksum that does
+        // not match the one initially inserted
+        let checksum = "1cead454".as_bytes();
+        let keychain = KeychainKind::External;
+        let res = db.check_descriptor_checksum(keychain, checksum);
+
+        assert!(res.is_err());
+    }
+
+    fn get_tree() -> MutinyBrowserStorage {
+        cleanup_test();
+        MutinyBrowserStorage::new()
+    }
+
+    #[test]
+    fn script_pubkey_test() {
+        test_script_pubkey(get_tree());
+    }
+
+    // fixme, we don't actually batch, is that okay?
+    // #[test]
+    // fn script_pubkey_test_batch() {
+    //     test_batch_script_pubkey(get_tree());
+    // }
+
+    #[test]
+    fn script_pubkey_test_iter() {
+        test_iter_script_pubkey(get_tree());
+    }
+
+    #[test]
+    fn script_pubkey_test_del() {
+        test_del_script_pubkey(get_tree());
+    }
+
+    #[test]
+    fn utxo_test() {
+        test_utxo(get_tree());
+    }
+
+    #[test]
+    fn raw_tx_test() {
+        test_raw_tx(get_tree());
+    }
+
+    #[test]
+    fn tx_test() {
+        test_tx(get_tree());
+    }
+
+    #[test]
+    fn last_index_test() {
+        test_last_index(get_tree());
+    }
+
+    #[test]
+    fn sync_time_test() {
+        test_sync_time(get_tree());
+    }
+
+    #[test]
+    fn iter_raw_txs_test() {
+        test_iter_raw_txs(get_tree());
+    }
+
+    #[test]
+    fn list_txs_test() {
+        test_list_transaction(get_tree());
+    }
+
+    #[test]
+    fn del_path_from_script_pubkey_test() {
+        test_del_path_from_script_pubkey(get_tree());
+    }
+
+    #[test]
+    fn iter_script_pubkeys_test() {
+        test_iter_script_pubkeys(get_tree());
+    }
+
+    #[test]
+    fn del_utxo_test() {
+        test_del_utxo(get_tree());
+    }
+
+    #[test]
+    fn del_raw_tx_test() {
+        test_del_raw_tx(get_tree());
+    }
+
+    #[test]
+    fn del_tx_test() {
+        test_del_tx(get_tree());
+    }
+
+    #[test]
+    fn del_last_index_test() {
+        test_del_last_index(get_tree());
+    }
+
+    #[test]
+    fn check_descriptor_checksum_test() {
+        test_check_descriptor_checksum(get_tree());
+    }
+}
diff --git a/node-manager/src/nodemanager.rs b/node-manager/src/nodemanager.rs
index 498a5a568..0d093bc4f 100644
--- a/node-manager/src/nodemanager.rs
+++ b/node-manager/src/nodemanager.rs
@@ -87,14 +87,12 @@ mod tests {
     use crate::seedgen::generate_seed;
     use crate::{nodemanager::NodeManager, storage::delete_mnemonic};
 
+    use crate::test::*;
+
     use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
 
     wasm_bindgen_test_configure!(run_in_browser);
 
-    fn cleanup_test() -> () {
-        delete_mnemonic()
-    }
-
     macro_rules! log {
         ( $( $t:tt )* ) => {
             web_sys::console::log_1(&format!( $( $t )* ).into());

From 8c72f091fe33eaf488d967508b23171290acc187 Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Oct 2022 17:49:18 -0500
Subject: [PATCH 2/8] Fixes for cargo clippy

---
 node-manager/src/error.rs        |  1 +
 node-manager/src/lib.rs          |  3 +--
 node-manager/src/localstorage.rs | 27 +++++++--------------------
 node-manager/src/nodemanager.rs  |  2 +-
 node-manager/src/storage.rs      |  3 ++-
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/node-manager/src/error.rs b/node-manager/src/error.rs
index 9f485bd94..95347d806 100644
--- a/node-manager/src/error.rs
+++ b/node-manager/src/error.rs
@@ -2,6 +2,7 @@ use gloo_storage::errors::StorageError;
 use std::fmt;
 
 #[derive(Debug)]
+#[allow(dead_code)]
 // copied from LDK lite
 /// An error that possibly needs to be handled by the user.
 pub enum Error {
diff --git a/node-manager/src/lib.rs b/node-manager/src/lib.rs
index 2cc065b6e..432d219af 100644
--- a/node-manager/src/lib.rs
+++ b/node-manager/src/lib.rs
@@ -31,10 +31,9 @@ pub async fn main_js() -> Result<(), JsValue> {
 
 #[cfg(test)]
 mod test {
-    use crate::storage::delete_mnemonic;
     use gloo_storage::{LocalStorage, Storage};
 
-    pub(crate) fn cleanup_test() -> () {
+    pub(crate) fn cleanup_test() {
         LocalStorage::clear();
     }
 }
diff --git a/node-manager/src/localstorage.rs b/node-manager/src/localstorage.rs
index 95a149e9f..7a6360861 100644
--- a/node-manager/src/localstorage.rs
+++ b/node-manager/src/localstorage.rs
@@ -7,18 +7,11 @@ use bitcoin::{OutPoint, Script, Transaction};
 use gloo_storage::{LocalStorage, Storage};
 
 use bitcoin::hashes::hex::{FromHex, ToHex};
-use log::{error, info};
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 
 pub struct MutinyBrowserStorage {}
 
-macro_rules! log {
-        ( $( $t:tt )* ) => {
-            web_sys::console::log_1(&format!( $( $t )* ).into());
-        }
-    }
-
 impl MutinyBrowserStorage {
     pub fn new() -> Self {
         MutinyBrowserStorage {}
@@ -30,7 +23,7 @@ impl MutinyBrowserStorage {
         T: Serialize,
     {
         LocalStorage::set(key, value)
-            .map_err(|_| bdk::Error::Generic(String::from(format!("Storage error"))))
+            .map_err(|_| bdk::Error::Generic("Storage error".to_string()))
     }
 
     // mostly a copy of LocalStorage::get_all()
@@ -283,10 +276,8 @@ impl Database for MutinyBrowserStorage {
         let key = MapKey::Path((keychain, None)).as_map_key();
         self.scan_prefix(key)
             .into_iter()
-            .map(|tuple| -> Result<_, bdk::Error> {
-                // todo make this safer
-                let (_, value) = tuple;
-                let str = value.as_str().unwrap();
+            .map(|(_, value)| -> Result<_, bdk::Error> {
+                let str = value.as_str().expect("Unexpected json value");
                 Script::from_hex(str)
                     .map_err(|_| bdk::Error::Generic(String::from("Error decoding")))
             })
@@ -297,10 +288,8 @@ impl Database for MutinyBrowserStorage {
         let key = MapKey::Utxo(None).as_map_key();
         self.scan_prefix(key)
             .into_iter()
-            .map(|x| -> Result<_, bdk::Error> {
-                let (_, v) = x;
-
-                let utxo: LocalUtxo = Deserialize::deserialize(v)?;
+            .map(|(_, value)| -> Result<_, bdk::Error> {
+                let utxo: LocalUtxo = Deserialize::deserialize(value)?;
                 Ok(utxo)
             })
             .collect()
@@ -310,8 +299,7 @@ impl Database for MutinyBrowserStorage {
         let key = MapKey::RawTx(None).as_map_key();
         self.scan_prefix(key)
             .into_iter()
-            .map(|tuple| -> Result<_, bdk::Error> {
-                let (_, value) = tuple;
+            .map(|(_, value)| -> Result<_, bdk::Error> {
                 let tx: Transaction = Deserialize::deserialize(value)?;
                 Ok(tx)
             })
@@ -322,8 +310,7 @@ impl Database for MutinyBrowserStorage {
         let key = MapKey::Transaction(None).as_map_key();
         self.scan_prefix(key)
             .into_iter()
-            .map(|tuple| -> Result<_, bdk::Error> {
-                let (key, value) = tuple;
+            .map(|(key, value)| -> Result<_, bdk::Error> {
                 let mut tx_details: TransactionDetails = Deserialize::deserialize(value)?;
                 if include_raw {
                     // first byte is prefix for the map, need to drop it
diff --git a/node-manager/src/nodemanager.rs b/node-manager/src/nodemanager.rs
index 0d093bc4f..7d3b4aaa3 100644
--- a/node-manager/src/nodemanager.rs
+++ b/node-manager/src/nodemanager.rs
@@ -62,7 +62,7 @@ impl NodeManager {
 
     #[wasm_bindgen]
     pub fn show_seed(&self) -> String {
-        return self.mnemonic.to_string();
+        self.mnemonic.to_string()
     }
 
     #[wasm_bindgen]
diff --git a/node-manager/src/storage.rs b/node-manager/src/storage.rs
index cb09bc5eb..c0afe2211 100644
--- a/node-manager/src/storage.rs
+++ b/node-manager/src/storage.rs
@@ -3,7 +3,7 @@ use gloo_storage::*;
 use std::str::FromStr;
 
 pub fn insert_mnemonic(mnemonic: Mnemonic) -> Mnemonic {
-    LocalStorage::set("mnemonic", mnemonic.clone().to_string())
+    LocalStorage::set("mnemonic", mnemonic.to_string())
         .expect("Failed to write to storage");
     mnemonic
 }
@@ -16,6 +16,7 @@ pub fn get_mnemonic() -> Result<Mnemonic> {
     }
 }
 
+#[allow(dead_code)]
 pub fn delete_mnemonic() {
     LocalStorage::delete("mnemonic");
 }

From 872750d8449e699278fa7a67b813eff1fbc95b88 Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Oct 2022 18:10:43 -0500
Subject: [PATCH 3/8] Clippy CI checks

---
 .github/workflows/test.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6092dcaf3..7c7681af9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,14 +8,21 @@ jobs:
     name: Browser Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
+          components: clippy
           target: wasm32-unknown-unknown
           override: true
           profile: minimal
 
+      - uses: actions-rs/clippy-check@v1
+        working-directory: ./node-manager
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features
+
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 

From 26ec3bf334cc04e0db83b48b2da35b76e65ea27c Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Oct 2022 18:44:47 -0500
Subject: [PATCH 4/8] Final updates

---
 node-manager/src/localstorage.rs | 34 +++++++++++++++++++++-----------
 node-manager/src/nodemanager.rs  |  2 +-
 node-manager/src/storage.rs      |  3 +--
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/node-manager/src/localstorage.rs b/node-manager/src/localstorage.rs
index 7a6360861..444a4d64e 100644
--- a/node-manager/src/localstorage.rs
+++ b/node-manager/src/localstorage.rs
@@ -22,8 +22,7 @@ impl MutinyBrowserStorage {
     where
         T: Serialize,
     {
-        LocalStorage::set(key, value)
-            .map_err(|_| bdk::Error::Generic("Storage error".to_string()))
+        LocalStorage::set(key, value).map_err(|_| bdk::Error::Generic("Storage error".to_string()))
     }
 
     // mostly a copy of LocalStorage::get_all()
@@ -277,9 +276,13 @@ impl Database for MutinyBrowserStorage {
         self.scan_prefix(key)
             .into_iter()
             .map(|(_, value)| -> Result<_, bdk::Error> {
-                let str = value.as_str().expect("Unexpected json value");
-                Script::from_hex(str)
-                    .map_err(|_| bdk::Error::Generic(String::from("Error decoding")))
+                let str_opt = value.as_str();
+
+                match str_opt {
+                    Some(str) => Script::from_hex(str)
+                        .map_err(|_| bdk::Error::Generic(String::from("Error decoding json"))),
+                    None => Err(bdk::Error::Generic(String::from("Error decoding json"))),
+                }
             })
             .collect()
     }
@@ -314,13 +317,21 @@ impl Database for MutinyBrowserStorage {
                 let mut tx_details: TransactionDetails = Deserialize::deserialize(value)?;
                 if include_raw {
                     // first byte is prefix for the map, need to drop it
-                    let rm_prefix: &str = &key[2..key.len()];
-                    let k_bytes = Vec::from_hex(rm_prefix)?;
-                    let txid = deserialize(k_bytes.as_slice())?;
-                    tx_details.transaction = self.get_raw_tx(&txid)?;
+                    let rm_prefix_opt = key.get(2..key.len());
+                    match rm_prefix_opt {
+                        Some(rm_prefix) => {
+                            let k_bytes = Vec::from_hex(rm_prefix)?;
+                            let txid = deserialize(k_bytes.as_slice())?;
+                            tx_details.transaction = self.get_raw_tx(&txid)?;
+                            Ok(tx_details)
+                        }
+                        None => Err(bdk::Error::Generic(String::from(
+                            "Error parsing txid from json",
+                        ))),
+                    }
+                } else {
+                    Ok(tx_details)
                 }
-
-                Ok(tx_details)
             })
             .collect()
     }
@@ -445,6 +456,7 @@ mod tests {
         );
     }
 
+    #[allow(dead_code)]
     pub fn test_batch_script_pubkey<D: BatchDatabase>(mut db: D) {
         let mut batch = db.begin_batch();
 
diff --git a/node-manager/src/nodemanager.rs b/node-manager/src/nodemanager.rs
index 7d3b4aaa3..cfd2ad83b 100644
--- a/node-manager/src/nodemanager.rs
+++ b/node-manager/src/nodemanager.rs
@@ -84,8 +84,8 @@ impl NodeManager {
 
 #[cfg(test)]
 mod tests {
+    use crate::nodemanager::NodeManager;
     use crate::seedgen::generate_seed;
-    use crate::{nodemanager::NodeManager, storage::delete_mnemonic};
 
     use crate::test::*;
 
diff --git a/node-manager/src/storage.rs b/node-manager/src/storage.rs
index c0afe2211..f93f1bf65 100644
--- a/node-manager/src/storage.rs
+++ b/node-manager/src/storage.rs
@@ -3,8 +3,7 @@ use gloo_storage::*;
 use std::str::FromStr;
 
 pub fn insert_mnemonic(mnemonic: Mnemonic) -> Mnemonic {
-    LocalStorage::set("mnemonic", mnemonic.to_string())
-        .expect("Failed to write to storage");
+    LocalStorage::set("mnemonic", mnemonic.to_string()).expect("Failed to write to storage");
     mnemonic
 }
 

From f4b9c8d537ac15b8538a4de5afcefa7fa11c413f Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Oct 2022 19:07:41 -0500
Subject: [PATCH 5/8] Remove clippy check

---
 .github/workflows/test.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7c7681af9..1aa4a5998 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,12 +17,6 @@ jobs:
           override: true
           profile: minimal
 
-      - uses: actions-rs/clippy-check@v1
-        working-directory: ./node-manager
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
-
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 

From ef8aaf9b2d5ccaedd1c88c289f4c3ddd9aed5555 Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Oct 2022 22:32:23 -0500
Subject: [PATCH 6/8] Move storage mod into MutinyBrowserStorage

---
 node-manager/src/lib.rs          |  1 -
 node-manager/src/localstorage.rs | 20 ++++++++++++++++++++
 node-manager/src/nodemanager.rs  | 10 +++++-----
 node-manager/src/storage.rs      | 21 ---------------------
 4 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 node-manager/src/storage.rs

diff --git a/node-manager/src/lib.rs b/node-manager/src/lib.rs
index 432d219af..779a83418 100644
--- a/node-manager/src/lib.rs
+++ b/node-manager/src/lib.rs
@@ -6,7 +6,6 @@ mod error;
 mod localstorage;
 mod nodemanager;
 mod seedgen;
-mod storage;
 mod utils;
 
 use cfg_if::cfg_if;
diff --git a/node-manager/src/localstorage.rs b/node-manager/src/localstorage.rs
index 444a4d64e..2ea420368 100644
--- a/node-manager/src/localstorage.rs
+++ b/node-manager/src/localstorage.rs
@@ -1,5 +1,7 @@
 use bdk::database::{BatchDatabase, BatchOperations, Database, SyncTime};
 use bdk::{KeychainKind, LocalUtxo, TransactionDetails};
+use bip39::Mnemonic;
+use std::str::FromStr;
 use bitcoin::consensus::deserialize;
 use bitcoin::consensus::encode::serialize;
 use bitcoin::hash_types::Txid;
@@ -43,6 +45,24 @@ impl MutinyBrowserStorage {
 
         map
     }
+
+    pub fn insert_mnemonic(mnemonic: Mnemonic) -> Mnemonic {
+        LocalStorage::set("mnemonic", mnemonic.to_string()).expect("Failed to write to storage");
+        mnemonic
+    }
+
+    pub fn get_mnemonic() -> gloo_storage::Result<Mnemonic> {
+        let res: gloo_storage::Result<String> = LocalStorage::get("mnemonic");
+        match res {
+            Ok(str) => Ok(Mnemonic::from_str(&str).expect("could not parse specified mnemonic")),
+            Err(e) => Err(e),
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn delete_mnemonic() {
+        LocalStorage::delete("mnemonic");
+    }
 }
 
 // path -> script       p{i,e}<path> -> script
diff --git a/node-manager/src/nodemanager.rs b/node-manager/src/nodemanager.rs
index cfd2ad83b..ea2247f6a 100644
--- a/node-manager/src/nodemanager.rs
+++ b/node-manager/src/nodemanager.rs
@@ -8,7 +8,7 @@ use wasm_bindgen_futures::spawn_local;
 
 use crate::{
     seedgen,
-    storage::{get_mnemonic, insert_mnemonic},
+    localstorage::MutinyBrowserStorage,
     utils::set_panic_hook,
 };
 
@@ -23,7 +23,7 @@ pub struct NodeManager {
 impl NodeManager {
     #[wasm_bindgen]
     pub fn has_node_manager() -> bool {
-        let res = get_mnemonic();
+        let res = MutinyBrowserStorage::get_mnemonic();
         res.is_ok()
     }
 
@@ -35,11 +35,11 @@ impl NodeManager {
             Some(m) => {
                 let seed = Mnemonic::from_str(String::as_str(&m))
                     .expect("could not parse specified mnemonic");
-                insert_mnemonic(seed)
+                MutinyBrowserStorage::insert_mnemonic(seed)
             }
-            None => get_mnemonic().unwrap_or_else(|_| {
+            None => MutinyBrowserStorage::get_mnemonic().unwrap_or_else(|_| {
                 let seed = seedgen::generate_seed();
-                insert_mnemonic(seed)
+                MutinyBrowserStorage::insert_mnemonic(seed)
             }),
         };
 
diff --git a/node-manager/src/storage.rs b/node-manager/src/storage.rs
deleted file mode 100644
index f93f1bf65..000000000
--- a/node-manager/src/storage.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use bip39::Mnemonic;
-use gloo_storage::*;
-use std::str::FromStr;
-
-pub fn insert_mnemonic(mnemonic: Mnemonic) -> Mnemonic {
-    LocalStorage::set("mnemonic", mnemonic.to_string()).expect("Failed to write to storage");
-    mnemonic
-}
-
-pub fn get_mnemonic() -> Result<Mnemonic> {
-    let res: Result<String> = LocalStorage::get("mnemonic");
-    match res {
-        Ok(str) => Ok(Mnemonic::from_str(&str).expect("could not parse specified mnemonic")),
-        Err(e) => Err(e),
-    }
-}
-
-#[allow(dead_code)]
-pub fn delete_mnemonic() {
-    LocalStorage::delete("mnemonic");
-}

From e7de0535770ecd5c6e207311f62123c127f0be4e Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Tue, 25 Oct 2022 01:47:23 -0500
Subject: [PATCH 7/8] Update bdk to rust-bitcoin 29 version

---
 node-manager/Cargo.toml          |  4 ++--
 node-manager/src/localstorage.rs | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/node-manager/Cargo.toml b/node-manager/Cargo.toml
index 8fb40078e..a47559d25 100644
--- a/node-manager/Cargo.toml
+++ b/node-manager/Cargo.toml
@@ -10,8 +10,8 @@ crate-type = ["cdylib"]
 cfg-if = "1.0.0"
 wasm-bindgen = "0.2.83"
 bip39 = { version = "1.0.1" }
-bitcoin = "0.28.1"
-bdk = { git = "https://www.nakamoto.codes/BitcoinDevShop/bdk", branch="feat/use-external-esplora-client", default-features = false}
+bitcoin = "0.29.1"
+bdk = { git = "https://github.com/afilini/bdk", branch = "upgrade/rust-bitcoin-29", default-features = false, features = ["keys-bip39"] }
 getrandom = { version = "0.2", features = ["js"] }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = { version = "^1.0" }
diff --git a/node-manager/src/localstorage.rs b/node-manager/src/localstorage.rs
index 2ea420368..24acad672 100644
--- a/node-manager/src/localstorage.rs
+++ b/node-manager/src/localstorage.rs
@@ -1,14 +1,14 @@
+use std::str::FromStr;
+
 use bdk::database::{BatchDatabase, BatchOperations, Database, SyncTime};
 use bdk::{KeychainKind, LocalUtxo, TransactionDetails};
 use bip39::Mnemonic;
-use std::str::FromStr;
 use bitcoin::consensus::deserialize;
 use bitcoin::consensus::encode::serialize;
 use bitcoin::hash_types::Txid;
+use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::{OutPoint, Script, Transaction};
 use gloo_storage::{LocalStorage, Storage};
-
-use bitcoin::hashes::hex::{FromHex, ToHex};
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 
@@ -439,20 +439,20 @@ impl BatchDatabase for MutinyBrowserStorage {
 
 #[cfg(test)]
 mod tests {
-    use crate::localstorage::MutinyBrowserStorage;
-    use bdk::database::{BatchDatabase, Database, SyncTime};
-    use bdk::{BlockTime, KeychainKind, LocalUtxo, TransactionDetails};
     use std::str::FromStr;
 
-    use crate::test::*;
+    use bdk::database::{BatchDatabase, Database, SyncTime};
+    use bdk::{BlockTime, KeychainKind, LocalUtxo, TransactionDetails};
     use bitcoin::consensus::encode::deserialize;
     use bitcoin::consensus::serialize;
     use bitcoin::hashes::hex::*;
     use bitcoin::*;
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
 
-    use super::*;
+    use crate::localstorage::MutinyBrowserStorage;
+    use crate::test::*;
 
-    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+    use super::*;
 
     wasm_bindgen_test_configure!(run_in_browser);
 

From de5cdaf264dd94bffdaacf6c3998f116027a19c0 Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Tue, 25 Oct 2022 12:05:15 -0500
Subject: [PATCH 8/8] Add rust-toolchain.toml file

---
 node-manager/rust-toolchain.toml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 node-manager/rust-toolchain.toml

diff --git a/node-manager/rust-toolchain.toml b/node-manager/rust-toolchain.toml
new file mode 100644
index 000000000..271800cb2
--- /dev/null
+++ b/node-manager/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"
\ No newline at end of file