temp 2

Author: thunderbiscuit

bdk-ffi/Cargo.lock

@@ -18,12 +18,15 @@ path = "uniffi-bindgen.rs"
 default = ["uniffi/cli"]
 
 [dependencies]
-bdk_wallet = { version = "1.0.0-beta.1", features = ["all-keys", "keys-bip39", "rusqlite"] }
-bdk_esplora = { version = "0.16.0", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
+# bdk_wallet = { version = "1.0.0-beta.1", features = ["all-keys", "keys-bip39", "rusqlite"] }
+# bdk_esplora = { git = "https://github.com/bitcoindevkit/bdk/", package = "bdk_esplora", version = "0.16.0", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
+# bdk_electrum = { version = "0.15.0" }
+
+bdk_wallet = { git = "https://github.com/thunderbiscuit/bdk/", branch = "feature/electrum-client-ring", features = ["all-keys", "keys-bip39", "rusqlite"] }
+bdk_esplora = { git = "https://github.com/thunderbiscuit/bdk/", package = "bdk_esplora", branch = "feature/electrum-client-ring", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
 # NOTE: This is a temporary workaround to use the electrum-client with the use-rustls-ring feature. It points to a fork
 #       of bdk in which the bdk_electrum library uses the electrum-client with the use-rustls-ring feature.
 bdk_electrum = { git = "https://github.com/thunderbiscuit/bdk/", package = "bdk_electrum", branch = "feature/electrum-client-ring", default-features = false, features = ["use-rustls-ring"] }
-# bdk_electrum = { version = "0.15.0" }
 bdk_bitcoind_rpc = { version = "0.13.0" }
 bitcoin-internals = { version = "0.2.0", features = ["alloc"] }
 

bdk-ffi/Cargo.toml

@@ -4,6 +4,11 @@ namespace bdk {};
 // bdk crate - error module
 // ------------------------------------------------------------------------
 
+[Error]
+interface FfiGenericError {
+  GenericError();
+};
+
 [Error]
 interface AddressParseError {
   Base58();
@@ -242,11 +247,11 @@ interface SignerError {
     TxInputsIndexError(string error_message);
     MiniscriptPsbt(string error_message);
     External(string error_message);
+    Psbt(string error_message);
 };
 
 [Error]
 interface SqliteError {
-  InvalidNetwork(Network expected, Network given);
   Sqlite(string rusqlite_error);
 };
 
@@ -266,13 +271,13 @@ interface TxidParseError {
   InvalidTxid(string txid);
 };
 
-[Error]
-interface WalletCreationError {
-  Descriptor(string error_message);
-  LoadedGenesisDoesNotMatch(string expected, string got);
-  LoadedNetworkDoesNotMatch(Network expected, Network? got);
-  LoadedDescriptorDoesNotMatch(string got, KeychainKind keychain);
-};
+// [Error]
+// interface WalletCreationError {
+//   Descriptor(string error_message);
+//   LoadedGenesisDoesNotMatch(string expected, string got);
+//   LoadedNetworkDoesNotMatch(Network expected, Network? got);
+//   LoadedDescriptorDoesNotMatch(string got, KeychainKind keychain);
+// };
 
 // ------------------------------------------------------------------------
 // bdk_wallet crate - types module
@@ -317,10 +322,20 @@ dictionary TxOut {
 
 [Enum]
 interface ChainPosition {
-  Confirmed(u32 height, u64 timestamp);
+  Confirmed(ConfirmationBlockTime confirmation_block_time);
   Unconfirmed(u64 timestamp);
 };
 
+dictionary ConfirmationBlockTime {
+  BlockId block_id;
+  u64 confirmation_time;
+};
+
+dictionary BlockId {
+  u32 height;
+  string hash;
+};
+
 dictionary CanonicalTx {
   Transaction transaction;
   ChainPosition chain_position;
@@ -359,11 +374,11 @@ enum ChangeSpendPolicy {
 };
 
 interface Wallet {
-  [Throws=WalletCreationError]
+  [Name=create, Throws=FfiGenericError]
   constructor(Descriptor descriptor, Descriptor change_descriptor, Network network, Connection connection);
 
-  [Name=load, Throws=WalletCreationError]
-  constructor(Descriptor descriptor, Descriptor change_descriptor, Network network, Connection connection);
+  // [Name=load, Throws=FfiGenericError]
+  // constructor(Descriptor descriptor, Descriptor change_descriptor, Network network, Connection connection);
 
   AddressInfo reveal_next_address(KeychainKind keychain);
 
@@ -374,7 +389,7 @@ interface Wallet {
   [Throws=CannotConnectError]
   void apply_update(Update update);
 
-  boolean is_mine([ByRef] Script script);
+  boolean is_mine(Script script);
 
   [Throws=SignerError]
   boolean sign(Psbt psbt);
@@ -400,8 +415,7 @@ interface Wallet {
 
   SyncRequest start_sync_with_revealed_spks();
 
-  [Throws=PersistenceError]
-  void persist(Connection connection);
+  boolean persist(Connection connection);
 };
 
 interface Update {};
@@ -459,7 +473,7 @@ interface BumpFeeTxBuilder {
 // ------------------------------------------------------------------------
 
 interface Connection {
-  [Throws=SqliteError]
+  [Throws=FfiGenericError]
   constructor(string path);
 };
 

bdk-ffi/src/bdk.udl

@@ -3,15 +3,14 @@ use crate::error::ElectrumError;
 use crate::types::{FullScanRequest, SyncRequest};
 use crate::wallet::Update;
 
-use bdk_electrum::bdk_chain::spk_client::{FullScanResult, SyncResult};
+use bdk_electrum::bdk_chain::spk_client::SyncResult;
 use bdk_electrum::BdkElectrumClient as BdkBdkElectrumClient;
 use bdk_wallet::bitcoin::Transaction as BdkTransaction;
 use bdk_wallet::chain::spk_client::FullScanRequest as BdkFullScanRequest;
 use bdk_wallet::chain::spk_client::FullScanResult as BdkFullScanResult;
 use bdk_wallet::chain::spk_client::SyncRequest as BdkSyncRequest;
-use bdk_wallet::chain::spk_client::SyncResult as BdkSyncResult;
-use bdk_wallet::Update as BdkUpdate;
 use bdk_wallet::KeychainKind;
+use bdk_wallet::Update as BdkUpdate;
 
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -44,14 +43,12 @@ impl ElectrumClient {
             .take()
             .ok_or(ElectrumError::RequestAlreadyConsumed)?;
 
-        let electrum_result: FullScanResult<KeychainKind> = self.0.full_scan(
+        let full_scan_result: BdkFullScanResult<KeychainKind> = self.0.full_scan(
             request,
             stop_gap as usize,
             batch_size as usize,
             fetch_prev_txouts,
         )?;
-        let full_scan_result: BdkFullScanResult<KeychainKind> =
-            electrum_result.with_confirmation_time_height_anchor(&self.0)?;
 
         let update = BdkUpdate {
             last_active_indices: full_scan_result.last_active_indices,
@@ -76,11 +73,9 @@ impl ElectrumClient {
             .take()
             .ok_or(ElectrumError::RequestAlreadyConsumed)?;
 
-        let electrum_result: SyncResult =
+        let sync_result: SyncResult =
             self.0
                 .sync(request, batch_size as usize, fetch_prev_txouts)?;
-        let sync_result: BdkSyncResult =
-            electrum_result.with_confirmation_time_height_anchor(&self.0)?;
 
         let update = BdkUpdate {
             last_active_indices: BTreeMap::default(),

bdk-ffi/src/electrum.rs

@@ -1,5 +1,4 @@
 use crate::bitcoin::OutPoint;
-use crate::Network;
 
 use bdk_bitcoind_rpc::bitcoincore_rpc::bitcoin::address::ParseError;
 use bdk_electrum::electrum_client::Error as BdkElectrumError;
@@ -19,11 +18,8 @@ use bdk_wallet::error::BuildFeeBumpError;
 use bdk_wallet::error::CreateTxError as BdkCreateTxError;
 use bdk_wallet::keys::bip39::Error as BdkBip39Error;
 use bdk_wallet::miniscript::descriptor::DescriptorKeyParseError as BdkDescriptorKeyParseError;
-use bdk_wallet::rusqlite::Error as BdkSqliteError;
 use bdk_wallet::signer::SignerError as BdkSignerError;
 use bdk_wallet::tx_builder::AddUtxoError;
-use bdk_wallet::KeychainKind;
-use bdk_wallet::LoadError;
 use bitcoin_internals::hex::display::DisplayHex;
 
 use std::convert::TryInto;
@@ -32,6 +28,18 @@ use std::convert::TryInto;
 // error definitions
 // ------------------------------------------------------------------------
 
+#[derive(Debug, thiserror::Error)]
+pub enum FfiGenericError {
+    GenericError,
+}
+
+// implementing the Display trait for the FfiGenericError
+impl std::fmt::Display for FfiGenericError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Generic error")
+    }
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum AddressParseError {
     #[error("base58 address encoding error")]
@@ -595,7 +603,6 @@ pub enum SignerError {
 pub enum SqliteError {
     // NOTE: This error is renamed from Network to InvalidNetwork to avoid conflict with the Network
     //       enum in uniffi.
-
     #[error("SQLite error: {rusqlite_error}")]
     Sqlite { rusqlite_error: String },
 }
@@ -637,14 +644,14 @@ pub enum WalletCreationError {
     // From NewError and NewOrLoadError
     #[error("error with descriptor: {error_message}")]
     Descriptor { error_message: String },
-    #[error("data loaded from persistence is missing network type.")]
-    MissingNetwork,
-    #[error("data loaded from persistence is missing genesis hash.")]
-    MissingGenesis,
-    #[error("data loaded from persistence is missing descriptor: {error_message}")]
-    MissingDescriptor { error_message: String },
-    #[error("data loaded is unexpected: {error_message}")]
-    Mismatch { error_message: String },
+    // #[error("data loaded from persistence is missing network type.")]
+    // MissingNetwork,
+    // #[error("data loaded from persistence is missing genesis hash.")]
+    // MissingGenesis,
+    // #[error("data loaded from persistence is missing descriptor: {error_message}")]
+    // MissingDescriptor { error_message: String },
+    // #[error("data loaded is unexpected: {error_message}")]
+    // Mismatch { error_message: String },
 }
 
 // ------------------------------------------------------------------------
@@ -1180,7 +1187,9 @@ impl From<BdkSignerError> for SignerError {
                 error_message: e.to_string(),
             },
             BdkSignerError::External(e) => SignerError::External { error_message: e },
-            BdkSignerError::Psbt(e) => SignerError::Psbt { error_message: e.to_string() },
+            BdkSignerError::Psbt(e) => SignerError::Psbt {
+                error_message: e.to_string(),
+            },
         }
     }
 }
@@ -1208,13 +1217,13 @@ impl From<BdkEncodeError> for TransactionError {
     }
 }
 
-impl From<BdkSqliteError> for SqliteError {
-    fn from(error: BdkSqliteError) -> Self {
-        SqliteError::Sqlite {
-            rusqlite_error: error.to_string(),
-        }
-    }
-}
+// impl From<BdkSqliteError> for SqliteError {
+//     fn from(error: BdkSqliteError) -> Self {
+//         SqliteError::Sqlite {
+//             rusqlite_error: error.to_string(),
+//         }
+//     }
+// }
 
 impl From<DescriptorError> for WalletCreationError {
     fn from(error: DescriptorError) -> Self {
@@ -1224,27 +1233,27 @@ impl From<DescriptorError> for WalletCreationError {
     }
 }
 
-impl From<LoadError> for WalletCreationError {
-    fn from(error: LoadError) -> Self {
-        match error {
-            LoadError::Descriptor(e) => WalletCreationError::Descriptor {
-                error_message: e.to_string(),
-            },
-            LoadError::MissingGenesis => {
-                WalletCreationError::MissingGenesis 
-            }
-            LoadError::LoadedNetworkDoesNotMatch { expected, got } => {
-                WalletCreationError::LoadedNetworkDoesNotMatch { expected, got }
-            }
-            LoadError::LoadedDescriptorDoesNotMatch { got, keychain } => {
-                WalletCreationError::LoadedDescriptorDoesNotMatch {
-                    got: format!("{:?}", got),
-                    keychain,
-                }
-            }
-        }
-    }
-}
+// impl From<LoadError> for WalletCreationError {
+//     fn from(error: LoadError) -> Self {
+//         match error {
+//             LoadError::Descriptor(e) => WalletCreationError::Descriptor {
+//                 error_message: e.to_string(),
+//             },
+//             LoadError::MissingGenesis => {
+//                 WalletCreationError::MissingGenesis
+//             }
+//             LoadError::LoadedNetworkDoesNotMatch { expected, got } => {
+//                 WalletCreationError::LoadedNetworkDoesNotMatch { expected, got }
+//             }
+//             LoadError::LoadedDescriptorDoesNotMatch { got, keychain } => {
+//                 WalletCreationError::LoadedDescriptorDoesNotMatch {
+//                     got: format!("{:?}", got),
+//                     keychain,
+//                 }
+//             }
+//         }
+//     }
+// }
 
 // ------------------------------------------------------------------------
 // error tests

bdk-ffi/src/error.rs

@@ -41,7 +41,6 @@ use crate::error::SignerError;
 use crate::error::SqliteError;
 use crate::error::TransactionError;
 use crate::error::TxidParseError;
-use crate::error::WalletCreationError;
 use crate::esplora::EsploraClient;
 use crate::keys::DerivationPath;
 use crate::keys::DescriptorPublicKey;
@@ -50,9 +49,11 @@ use crate::keys::Mnemonic;
 use crate::store::Connection;
 use crate::types::AddressInfo;
 use crate::types::Balance;
+use crate::types::BlockId;
 use crate::types::CanonicalTx;
 use crate::types::ChainPosition;
 use crate::types::ChangeSet;
+use crate::types::ConfirmationBlockTime;
 use crate::types::FullScanRequest;
 use crate::types::FullScanScriptInspector;
 use crate::types::LocalOutput;
@@ -64,6 +65,7 @@ use crate::wallet::SentAndReceivedValues;
 use crate::wallet::TxBuilder;
 use crate::wallet::Update;
 use crate::wallet::Wallet;
+use crate::error::FfiGenericError;
 
 use bdk_wallet::bitcoin::Network;
 use bdk_wallet::keys::bip39::WordCount;