before tests

Author: darioAnongba

src/bitcoin/wallet.rs

@@ -120,8 +120,8 @@ impl Wallet {
         Ok(psbt.into())
     }
 
-    pub fn sign(&self, psbt: Psbt) -> JsResult<bool> {
-        self.0.sign(&mut psbt.into(), SignOptions::default())?;
+    pub fn sign(&self, psbt: &mut Psbt) -> JsResult<bool> {
+        self.0.sign(psbt, SignOptions::default())?;
         Ok(true)
     }
 }

src/types/address.rs

@@ -1,9 +1,12 @@
-use std::ops::Deref;
+use std::{ops::Deref, str::FromStr};
 
 use bdk_wallet::{bitcoin::AddressType as BdkAddressType, AddressInfo as BdkAddressInfo};
+use bitcoin::Address as BdkAddress;
 use wasm_bindgen::prelude::wasm_bindgen;
 
-use super::KeychainKind;
+use crate::result::JsResult;
+
+use super::{KeychainKind, Network};
 
 /// A derived address and the index it was found at.
 #[wasm_bindgen]
@@ -55,6 +58,39 @@ impl From<BdkAddressInfo> for AddressInfo {
     }
 }
 
+/// An owned, growable script.
+#[wasm_bindgen]
+#[derive(Debug, Clone)]
+pub struct Address(BdkAddress);
+
+impl Deref for Address {
+    type Target = BdkAddress;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[wasm_bindgen]
+impl Address {
+    pub fn new(address_str: &str, network: Network) -> JsResult<Self> {
+        let address = BdkAddress::from_str(address_str)?.require_network(network.into())?;
+        Ok(Address(address))
+    }
+}
+
+impl From<BdkAddress> for Address {
+    fn from(inner: BdkAddress) -> Self {
+        Address(inner)
+    }
+}
+
+impl From<Address> for BdkAddress {
+    fn from(address: Address) -> Self {
+        address.0
+    }
+}
+
 /// The different types of addresses.
 #[wasm_bindgen]
 #[derive(Debug)]

src/types/amount.rs

@@ -3,6 +3,8 @@ use std::ops::Deref;
 use bitcoin::{Amount as BdkAmount, Denomination as BdkDenomination};
 use wasm_bindgen::prelude::wasm_bindgen;
 
+use crate::result::JsResult;
+
 /// Amount
 ///
 /// The [Amount] type can be used to express Bitcoin amounts that support
@@ -13,6 +15,15 @@ pub struct Amount(BdkAmount);
 
 #[wasm_bindgen]
 impl Amount {
+    pub fn from_btc(btc: f64) -> JsResult<Self> {
+        let amount = BdkAmount::from_btc(btc)?;
+        Ok(Amount(amount))
+    }
+
+    pub fn from_sat(satoshi: u64) -> Self {
+        Amount(BdkAmount::from_sat(satoshi))
+    }
+
     /// Gets the number of satoshis in this [`Amount`].
     pub fn to_sat(&self) -> u64 {
         self.0.to_sat()

src/types/psbt.rs

@@ -1,11 +1,11 @@
-use std::ops::Deref;
+use std::ops::{Deref, DerefMut};
 
-use bitcoin::{Amount as BdkAmount, FeeRate as BdkFeeRate, Psbt as BdkPsbt, ScriptBuf};
+use bitcoin::{Amount as BdkAmount, FeeRate as BdkFeeRate, Psbt as BdkPsbt, ScriptBuf as BdkScriptBuf};
 use wasm_bindgen::prelude::wasm_bindgen;
 
 use crate::result::JsResult;
 
-use super::{AddressInfo, Amount, Transaction};
+use super::{Address, Amount, Transaction};
 
 /// A Partially Signed Transaction.
 #[wasm_bindgen]
@@ -20,6 +20,12 @@ impl Deref for Psbt {
     }
 }
 
+impl DerefMut for Psbt {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
 #[wasm_bindgen]
 impl Psbt {
     pub fn extract_tx(self) -> JsResult<Transaction> {
@@ -44,19 +50,19 @@ impl From<Psbt> for BdkPsbt {
 #[wasm_bindgen]
 #[derive(Debug)]
 pub struct Recipient {
-    address: AddressInfo,
+    address: Address,
     amount: Amount,
 }
 
 #[wasm_bindgen]
 impl Recipient {
     #[wasm_bindgen(constructor)]
-    pub fn new(address: AddressInfo, amount: Amount) -> Self {
+    pub fn new(address: Address, amount: Amount) -> Self {
         Recipient { address, amount }
     }
 
     #[wasm_bindgen(getter)]
-    pub fn address(&self) -> AddressInfo {
+    pub fn address(&self) -> Address {
         self.address.clone()
     }
 
@@ -66,7 +72,7 @@ impl Recipient {
     }
 }
 
-impl From<Recipient> for (ScriptBuf, BdkAmount) {
+impl From<Recipient> for (BdkScriptBuf, BdkAmount) {
     fn from(r: Recipient) -> Self {
         (r.address().script_pubkey(), r.amount().into())
     }
@@ -88,6 +94,14 @@ impl Deref for FeeRate {
     }
 }
 
+#[wasm_bindgen]
+impl FeeRate {
+    #[wasm_bindgen(constructor)]
+    pub fn new(sat_vb: u64) -> Self {
+        FeeRate(BdkFeeRate::from_sat_per_vb_unchecked(sat_vb))
+    }
+}
+
 impl From<BdkFeeRate> for FeeRate {
     fn from(inner: BdkFeeRate) -> Self {
         FeeRate(inner)

tests/esplora.rs

@@ -7,7 +7,7 @@ extern crate wasm_bindgen_test;
 use bitcoindevkit::{
     bitcoin::{EsploraClient, Wallet},
     set_panic_hook,
-    types::{DescriptorPair, KeychainKind, Network},
+    types::{Address, Amount, DescriptorPair, FeeRate, KeychainKind, Network, Recipient},
 };
 use wasm_bindgen_test::*;
 
@@ -18,6 +18,7 @@ const PARALLEL_REQUESTS: usize = 1;
 const NETWORK: Network = Network::Signet;
 const EXTERNAL_DESC: &str = "wpkh([aafa6322/84'/1'/0']tpubDCfvzhCuifJtWDVdrBcPvZU7U5uyixL7QULk8hXA7KjqiNnry9Te1nwm7yStqenPCQhy5MwzxKkLBD2GmKNgvMYqXgo53iYqQ7Vu4vQbN2N/0/*)#mlua264t";
 const INTERNAL_DESC: &str = "wpkh([aafa6322/84'/1'/0']tpubDCfvzhCuifJtWDVdrBcPvZU7U5uyixL7QULk8hXA7KjqiNnry9Te1nwm7yStqenPCQhy5MwzxKkLBD2GmKNgvMYqXgo53iYqQ7Vu4vQbN2N/1/*)#2teuh09n";
+const RECIPIENT_ADDRESS: &str = "";
 
 #[wasm_bindgen_test]
 async fn test_esplora_client() {
@@ -63,4 +64,17 @@ async fn test_esplora_client() {
 
     let loaded_wallet = Wallet::load(wallet.take_staged().unwrap()).expect("load");
     assert_eq!(loaded_wallet.balance(), wallet.balance());
+
+    let recipient = Address::new(RECIPIENT_ADDRESS, NETWORK).expect("recipient_address");
+    let amount = Amount::from_sat(10000);
+    let mut psbt = wallet
+        .build_tx(FeeRate::new(5), vec![Recipient::new(recipient, amount)])
+        .expect("build_tx");
+
+    assert!(wallet.sign(&mut psbt).expect("sign"));
+
+    let tx = psbt.extract_tx().expect("extract_tx");
+    blockchain_client.broadcast(&tx).await.expect("broadcast");
+
+    web_sys::console::log_1(&tx.compute_txid().into());
 }