Add Balance struct and conversion from BdkBalance

Author: thunderbiscuit

src/bdk.udl

@@ -7,6 +7,7 @@ namespace bdk {
 enum BdkError {
   "InvalidU32Bytes",
   "Generic",
+  "MissingCachedScripts",
   "ScriptDoesntHaveAddressForm",
   "NoRecipients",
   "NoUtxosSelected",
@@ -73,6 +74,15 @@ dictionary SqliteDbConfiguration {
   string path;
 };
 
+dictionary Balance {
+  u64 immature;
+  u64 trusted_pending;
+  u64 untrusted_pending;
+  u64 confirmed;
+  u64 spendable;
+  u64 total;
+};
+
 [Enum]
 interface DatabaseConfig {
   Memory();
@@ -181,7 +191,7 @@ interface Wallet {
   AddressInfo get_address(AddressIndex address_index);
 
   [Throws=BdkError]
-  u64 get_balance();
+  Balance get_balance();
 
   [Throws=BdkError]
   boolean sign([ByRef] PartiallySignedBitcoinTransaction psbt);
@@ -239,9 +249,9 @@ interface TxBuilder {
   TxBuilder enable_rbf_with_sequence(u32 nsequence);
 
   TxBuilder add_data(sequence<u8> data);
-  
+
   TxBuilder set_recipients(sequence<AddressAmount> recipients);
-  
+
   [Throws=BdkError]
   PartiallySignedBitcoinTransaction finish([ByRef] Wallet wallet);
 };
@@ -285,4 +295,4 @@ interface DescriptorPublicKey {
   DescriptorPublicKey extend(DerivationPath path);
 
   string as_string();
-};
+};

src/lib.rs

@@ -23,8 +23,8 @@ use bdk::wallet::tx_builder::ChangeSpendPolicy;
 use bdk::wallet::AddressIndex as BdkAddressIndex;
 use bdk::wallet::AddressInfo as BdkAddressInfo;
 use bdk::{
-    BlockTime, Error, FeeRate, KeychainKind, SignOptions, SyncOptions as BdkSyncOptions,
-    Wallet as BdkWallet,
+    Balance as BdkBalance, BlockTime, Error, FeeRate, KeychainKind, SignOptions,
+    SyncOptions as BdkSyncOptions, Wallet as BdkWallet,
 };
 use std::collections::HashSet;
 use std::convert::{From, TryFrom};
@@ -150,7 +150,7 @@ pub struct TransactionDetails {
     /// Sent value (sats)
     /// Sum of owned inputs of this transaction.
     pub sent: u64,
-    /// Fee value (sats) if available.
+    /// Fee value (sats) if confirmed.
     /// The availability of the fee depends on the backend. It's never None with an Electrum
     /// Server backend, but it could be None with a Bitcoin RPC node without txindex that receive
     /// funds while offline.
@@ -273,6 +273,34 @@ impl From<&OutPoint> for BdkOutPoint {
     }
 }
 
+pub struct Balance {
+    // All coinbase outputs not yet matured
+    pub immature: u64,
+    /// Unconfirmed UTXOs generated by a wallet tx
+    pub trusted_pending: u64,
+    /// Unconfirmed UTXOs received from an external wallet
+    pub untrusted_pending: u64,
+    /// Confirmed and immediately spendable balance
+    pub confirmed: u64,
+    /// Get sum of trusted_pending and confirmed coins
+    pub spendable: u64,
+    /// Get the whole balance visible to the wallet
+    pub total: u64,
+}
+
+impl From<BdkBalance> for Balance {
+    fn from(bdk_balance: BdkBalance) -> Self {
+        Balance {
+            immature: bdk_balance.immature,
+            trusted_pending: bdk_balance.trusted_pending,
+            untrusted_pending: bdk_balance.untrusted_pending,
+            confirmed: bdk_balance.confirmed,
+            spendable: bdk_balance.get_spendable(),
+            total: bdk_balance.get_total(),
+        }
+    }
+}
+
 /// A transaction output, which defines new coins to be created from old ones.
 pub struct TxOut {
     /// The value of the output, in satoshis.
@@ -429,8 +457,8 @@ impl Wallet {
 
     /// Return the balance, meaning the sum of this wallet’s unspent outputs’ values. Note that this method only operates
     /// on the internal database, which first needs to be Wallet.sync manually.
-    fn get_balance(&self) -> Result<u64, Error> {
-        self.get_wallet().get_balance()
+    fn get_balance(&self) -> Result<Balance, Error> {
+        self.get_wallet().get_balance().map(|b| b.into())
     }
 
     /// Sign a transaction with all the wallet’s signers.