feat: expose correct errors

bdk-ffi/src/bdk.udl

@@ -172,6 +172,13 @@ interface FromScriptError {
   OtherFromScriptErr();
 };
 
+[Error]
+interface LoadWithPersistError {
+    Persist(string error_message);
+    InvalidChangeSet(string error_message);
+    CouldNotLoad();
+};
+
 [Error]
 interface ParseAmountError {
   OutOfRange();
@@ -383,7 +390,7 @@ interface Wallet {
   [Throws=CreateWithPersistError]
   constructor(Descriptor descriptor, Descriptor change_descriptor, Network network, Connection connection);
 
-  [Name=load, Throws=FfiGenericError]
+  [Name=load, Throws=LoadWithPersistError]
   constructor(Descriptor descriptor, Descriptor change_descriptor, Connection connection);
 
   AddressInfo reveal_next_address(KeychainKind keychain);

bdk-ffi/src/error.rs

@@ -22,6 +22,7 @@ use bdk_wallet::miniscript::descriptor::DescriptorKeyParseError as BdkDescriptor
 use bdk_wallet::signer::SignerError as BdkSignerError;
 use bdk_wallet::tx_builder::AddUtxoError;
 use bdk_wallet::CreateWithPersistError as BdkCreateWithPersistError;
+use bdk_wallet::LoadWithPersistError as BdkLoadWithPersistError;
 use bitcoin_internals::hex::display::DisplayHex;
 
 use bdk_electrum::bdk_chain;
@@ -423,6 +424,9 @@ pub enum LoadWithPersistError {
 
     #[error("the loaded changeset cannot construct wallet: {error_message}")]
     InvalidChangeSet { error_message: String },
+
+    #[error("could not load")]
+    CouldNotLoad,
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -1091,6 +1095,19 @@ impl From<BdkFromScriptError> for FromScriptError {
     }
 }
 
+impl From<BdkLoadWithPersistError<bdk_chain::rusqlite::Error>> for LoadWithPersistError {
+    fn from(error: BdkLoadWithPersistError<bdk_chain::rusqlite::Error>) -> Self {
+        match error {
+            BdkLoadWithPersistError::Persist(e) => LoadWithPersistError::Persist {
+                error_message: e.to_string(),
+            },
+            BdkLoadWithPersistError::InvalidChangeSet(e) => LoadWithPersistError::InvalidChangeSet {
+                error_message: e.to_string(),
+            },
+        }
+    }
+}
+
 impl From<BdkParseAmountError> for ParseAmountError {
     fn from(error: BdkParseAmountError) -> Self {
         match error {

bdk-ffi/src/lib.rs

@@ -5,7 +5,6 @@ mod error;
 mod esplora;
 mod keys;
 mod store;
-mod tx_builder;
 mod types;
 mod wallet;
 
@@ -33,6 +32,7 @@ use crate::error::ElectrumError;
 use crate::error::EsploraError;
 use crate::error::ExtractTxError;
 use crate::error::FeeRateError;
+use crate::types::Update;
 use crate::error::FfiGenericError;
 use crate::error::FromScriptError;
 use crate::error::InspectError;
@@ -50,8 +50,8 @@ use crate::keys::DescriptorPublicKey;
 use crate::keys::DescriptorSecretKey;
 use crate::keys::Mnemonic;
 use crate::store::Connection;
-use crate::tx_builder::BumpFeeTxBuilder;
-use crate::tx_builder::TxBuilder;
+use crate::wallet::BumpFeeTxBuilder;
+use crate::wallet::TxBuilder;
 use crate::types::AddressInfo;
 use crate::types::Balance;
 use crate::types::BlockId;
@@ -62,12 +62,12 @@ use crate::types::FullScanRequest;
 use crate::types::FullScanScriptInspector;
 use crate::types::LocalOutput;
 use crate::types::ScriptAmount;
-use crate::types::SentAndReceivedValues;
+use crate::wallet::SentAndReceivedValues;
 use crate::types::SyncRequest;
 use crate::types::SyncScriptInspector;
-use crate::types::Update;
 use crate::wallet::Wallet;
 use crate::wallet::WalletNoPersist;
+use crate::error::LoadWithPersistError;
 
 use bdk_wallet::bitcoin::Network;
 use bdk_wallet::keys::bip39::WordCount;

bdk-ffi/src/types.rs

@@ -14,6 +14,7 @@ use bdk_wallet::AddressInfo as BdkAddressInfo;
 use bdk_wallet::Balance as BdkBalance;
 use bdk_wallet::KeychainKind;
 use bdk_wallet::LocalOutput as BdkLocalOutput;
+use bdk_wallet::Update as BdkUpdate;
 
 use std::sync::{Arc, Mutex};
 
@@ -188,3 +189,5 @@ impl FullScanRequest {
         }
     }
 }
+
+pub struct Update(pub(crate) BdkUpdate);

bdk-ffi/src/wallet.rs

@@ -1,26 +1,32 @@
-use crate::bitcoin::Amount;
-use crate::bitcoin::{FeeRate, Psbt, Script, Transaction};
+use crate::bitcoin::{Amount, FeeRate, OutPoint, Psbt, Script, Transaction};
 use crate::descriptor::Descriptor;
 use crate::error::{
-    CalculateFeeError, CannotConnectError, CreateWithPersistError, DescriptorError,
-    FfiGenericError, LoadWithPersistError, SignerError, TxidParseError,
+    CalculateFeeError, CannotConnectError, CreateTxError, SignerError,
+    TxidParseError, CreateWithPersistError, DescriptorError, LoadWithPersistError,
 };
 use crate::store::Connection;
-use crate::types::SentAndReceivedValues;
+use crate::types::{
+    AddressInfo, Balance, CanonicalTx, FullScanRequest, LocalOutput, ScriptAmount, SyncRequest,
+};
 use crate::types::Update;
-use crate::types::{AddressInfo, Balance, CanonicalTx, FullScanRequest, LocalOutput, SyncRequest};
 
+use bdk_wallet::bitcoin::amount::Amount as BdkAmount;
 use bdk_wallet::bitcoin::Network;
-use bdk_wallet::bitcoin::Txid;
+use bdk_wallet::bitcoin::Psbt as BdkPsbt;
+use bdk_wallet::bitcoin::ScriptBuf as BdkScriptBuf;
+use bdk_wallet::bitcoin::{OutPoint as BdkOutPoint, Sequence, Txid};
 use bdk_wallet::chain::Persisted;
 use bdk_wallet::rusqlite::Connection as BdkConnection;
+use bdk_wallet::tx_builder::ChangeSpendPolicy;
 use bdk_wallet::Wallet as BdkWallet;
 use bdk_wallet::{KeychainKind, SignOptions};
 
 use std::borrow::BorrowMut;
+use std::collections::HashSet;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex, MutexGuard};
 
+
 pub struct Wallet {
     inner_mutex: Mutex<Persisted<BdkWallet>>,
 }
@@ -54,21 +60,20 @@ impl Wallet {
         descriptor: Arc<Descriptor>,
         change_descriptor: Arc<Descriptor>,
         connection: Arc<Connection>,
-    ) -> Result<Option<Wallet>, LoadWithPersistError> {
+    ) -> Result<Wallet, LoadWithPersistError> {
         let descriptor = descriptor.to_string_with_secret();
         let change_descriptor = change_descriptor.to_string_with_secret();
         let mut binding = connection.get_store();
         let db: &mut BdkConnection = binding.borrow_mut();
 
-        let wallet: Option<Persisted<BdkWallet>> = BdkWallet::load()
+        let wallet: Persisted<BdkWallet> = BdkWallet::load()
             .descriptors(descriptor, change_descriptor)
-            .load_wallet(db)?;
+            .load_wallet(db)?
+            .ok_or(LoadWithPersistError::CouldNotLoad)?;
 
-        wallet
-            .map(|w| Wallet {
-                inner_mutex: Mutex::new(Some(w)),
-            })
-            .ok_or(Ok(None))
+        Ok(Wallet {
+            inner_mutex: Mutex::new(wallet),
+        })
     }
 
     pub(crate) fn get_wallet(&self) -> MutexGuard<Persisted<BdkWallet>> {
@@ -214,8 +219,6 @@ pub struct SentAndReceivedValues {
     pub received: Arc<Amount>,
 }
 
-pub struct Update(pub(crate) BdkUpdate);
-
 #[derive(Clone, Debug)]
 pub struct TxBuilder {
     pub(crate) recipients: Vec<(BdkScriptBuf, BdkAmount)>,