feat: small fixes

Cargo.toml

@@ -8,7 +8,7 @@ version = "0.40.0"
 [patch.crates-io]
 dashcore_hashes = { path = "hashes" }
 # Use fixed version of elliptic-curve-tools with DefaultIsZeroes trait bound
-elliptic-curve-tools = { git = "https://github.com/mikelodder7/elliptic-curve-tools", branch = "main" }
+elliptic-curve-tools = { git = "https://github.com/mikelodder7/elliptic-curve-tools", rev = "8eaba09c9dc93ab367b3ad6fa85ed8e7ae8f0da5" }
 
 [profile.release]
 # Default to unwinding for most crates

dash-spv-ffi/FFI_API.md

@@ -4,7 +4,7 @@ This document provides a comprehensive reference for all FFI (Foreign Function I
 
 **Auto-generated**: This documentation is automatically generated from the source code. Do not edit manually.
 
-**Total Functions**: 70
+**Total Functions**: 71
 
 ## Table of Contents
 
@@ -138,7 +138,7 @@ Functions: 2
 
 ### Utility Functions
 
-Functions: 18
+Functions: 19
 
 | Function | Description | Module |
 |----------|-------------|--------|
@@ -151,7 +151,7 @@ Functions: 18
 | `dash_spv_ffi_client_get_stats` | Get current runtime statistics for the SPV client | client |
 | `dash_spv_ffi_client_get_tip_hash` | Get the current chain tip hash (32 bytes) if available | client |
 | `dash_spv_ffi_client_get_tip_height` | Get the current chain tip height (absolute) | client |
-| `dash_spv_ffi_client_get_wallet_manager` | Get the wallet manager from the SPV client  Returns an opaque pointer to FFIW... | client |
+| `dash_spv_ffi_client_get_wallet_manager` | Get the wallet manager from the SPV client  Returns a pointer to an `FFIWalle... | client |
 | `dash_spv_ffi_client_record_send` | Record that we attempted to send a transaction by its txid | client |
 | `dash_spv_ffi_client_rescan_blockchain` | Request a rescan of the blockchain from a given height (not yet implemented) | client |
 | `dash_spv_ffi_enable_test_mode` | No description | utils |
@@ -160,6 +160,7 @@ Functions: 18
 | `dash_spv_ffi_string_array_destroy` | Destroy an array of FFIString pointers (Vec<*mut FFIString>) and their contents | types |
 | `dash_spv_ffi_string_destroy` | No description | types |
 | `dash_spv_ffi_version` | No description | utils |
+| `dash_spv_ffi_wallet_manager_free` | Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager` | client |
 
 ## Detailed Function Documentation
 
@@ -1117,14 +1118,14 @@ Get the current chain tip height (absolute).  # Safety - `client` must be a vali
 #### `dash_spv_ffi_client_get_wallet_manager`
 
 ```c
-dash_spv_ffi_client_get_wallet_manager(client: *mut FFIDashSpvClient,) -> *mut c_void
+dash_spv_ffi_client_get_wallet_manager(client: *mut FFIDashSpvClient,) -> *mut FFIWalletManager
 ```
 
 **Description:**
-Get the wallet manager from the SPV client  Returns an opaque pointer to FFIWalletManager that contains a cloned Arc reference to the wallet manager. This allows direct interaction with the wallet manager without going through the client.  # Safety  The caller must ensure that: - The client pointer is valid - The returned pointer is freed using `wallet_manager_free` from key-wallet-ffi  # Returns  An opaque pointer (void*) to the wallet manager, or NULL if the client is not initialized. Swift should treat this as an OpaquePointer. Get a handle to the wallet manager owned by this client.  # Safety - `client` must be a valid, non-null pointer.
+Get the wallet manager from the SPV client  Returns a pointer to an `FFIWalletManager` wrapper that clones the underlying `Arc<RwLock<WalletManager>>`. This allows direct interaction with the wallet manager without going back through the client for each call.  # Safety  The caller must ensure that: - The client pointer is valid - The returned pointer is released exactly once using `dash_spv_ffi_wallet_manager_free`  # Returns  A pointer to the wallet manager wrapper, or NULL if the client is not initialized.
 
 **Safety:**
-The caller must ensure that: - The client pointer is valid - The returned pointer is freed using `wallet_manager_free` from key-wallet-ffi
+The caller must ensure that: - The client pointer is valid - The returned pointer is released exactly once using `dash_spv_ffi_wallet_manager_free`
 
 **Module:** `client`
 
@@ -1237,6 +1238,22 @@ dash_spv_ffi_version() -> *const c_char
 
 ---
 
+#### `dash_spv_ffi_wallet_manager_free`
+
+```c
+dash_spv_ffi_wallet_manager_free(manager: *mut FFIWalletManager) -> ()
+```
+
+**Description:**
+Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager`.  This simply forwards to `wallet_manager_free` in key-wallet-ffi so that lifetime management is consistent between direct key-wallet usage and the SPV client pathway.  # Safety - `manager` must either be null or a pointer previously returned by `dash_spv_ffi_client_get_wallet_manager`.
+
+**Safety:**
+- `manager` must either be null or a pointer previously returned by `dash_spv_ffi_client_get_wallet_manager`.
+
+**Module:** `client`
+
+---
+
 ## Type Definitions
 
 ### Core Types
@@ -1266,7 +1283,7 @@ dash_spv_ffi_version() -> *const c_char
 2. **Cleanup Required**: All returned pointers must be freed using the appropriate `_destroy` function
 3. **Thread Safety**: The SPV client is thread-safe
 4. **Error Handling**: Check return codes and use `dash_spv_ffi_get_last_error()` for details
-5. **Opaque Pointers**: `dash_spv_ffi_client_get_wallet_manager()` returns `void*` for Swift compatibility
+5. **Shared Ownership**: `dash_spv_ffi_client_get_wallet_manager()` returns `FFIWalletManager*` that must be released with `dash_spv_ffi_wallet_manager_free()`
 
 ## Usage Examples
 
@@ -1289,8 +1306,8 @@ if (result != 0) {
 // Sync to chain tip
 dash_spv_ffi_client_sync_to_tip(client, NULL, NULL);
 
-// Get wallet manager (returns void* for Swift)
-void* wallet_manager = dash_spv_ffi_client_get_wallet_manager(client);
+// Get wallet manager (shares ownership with the client)
+FFIWalletManager* wallet_manager = dash_spv_ffi_client_get_wallet_manager(client);
 
 // Clean up
 dash_spv_ffi_client_destroy(client);

dash-spv-ffi/dash_spv_ffi.h

@@ -531,27 +531,35 @@ int32_t dash_spv_ffi_client_enable_mempool_tracking(struct FFIDashSpvClient *cli
 /**
  * Get the wallet manager from the SPV client
  *
- * Returns an opaque pointer to FFIWalletManager that contains a cloned Arc reference to the wallet manager.
- * This allows direct interaction with the wallet manager without going through the client.
+ * Returns a pointer to an `FFIWalletManager` wrapper that clones the underlying
+ * `Arc<RwLock<WalletManager>>`. This allows direct interaction with the wallet
+ * manager without going back through the client for each call.
  *
  * # Safety
  *
  * The caller must ensure that:
  * - The client pointer is valid
- * - The returned pointer is freed using `wallet_manager_free` from key-wallet-ffi
+ * - The returned pointer is released exactly once using
+ *   `dash_spv_ffi_wallet_manager_free`
  *
  * # Returns
  *
- * An opaque pointer (void*) to the wallet manager, or NULL if the client is not initialized.
- * Swift should treat this as an OpaquePointer.
- * Get a handle to the wallet manager owned by this client.
+ * A pointer to the wallet manager wrapper, or NULL if the client is not initialized.
+ */
+ FFIWalletManager *dash_spv_ffi_client_get_wallet_manager(struct FFIDashSpvClient *client) ;
+
+/**
+ * Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager`.
+ *
+ * This simply forwards to `wallet_manager_free` in key-wallet-ffi so that
+ * lifetime management is consistent between direct key-wallet usage and the
+ * SPV client pathway.
  *
  * # Safety
- * - `client` must be a valid, non-null pointer.
+ * - `manager` must either be null or a pointer previously returned by
+ *   `dash_spv_ffi_client_get_wallet_manager`.
  */
-
-void *dash_spv_ffi_client_get_wallet_manager(struct FFIDashSpvClient *client)
-;
+ void dash_spv_ffi_wallet_manager_free(FFIWalletManager *manager) ;
 
  struct FFIClientConfig *dash_spv_ffi_config_new(FFINetwork network) ;
 

dash-spv-ffi/examples/wallet_manager_usage.rs

@@ -5,7 +5,7 @@
 /// 2. No longer requires going through the client for each operation
 /// 3. Cleaner and more efficient access to wallet functionality
 use dash_spv_ffi::*;
-use key_wallet_ffi::{wallet_manager_free, wallet_manager_wallet_count, FFIError};
+use key_wallet_ffi::{wallet_manager_wallet_count, FFIError};
 
 fn main() {
     unsafe {
@@ -21,22 +21,22 @@ fn main() {
             panic!("Failed to create client");
         }
 
-        // Get the wallet manager - now returns void* for Swift compatibility
-        // This contains a cloned Arc to the wallet manager, allowing
-        // direct interaction without going through the client
-        let wallet_manager_ptr = dash_spv_ffi_client_get_wallet_manager(client);
-        if wallet_manager_ptr.is_null() {
+        // Get the wallet manager - this returns a strongly typed pointer that
+        // shares the Arc with the SPV client, allowing direct interaction
+        let wallet_manager = dash_spv_ffi_client_get_wallet_manager(client);
+        if wallet_manager.is_null() {
             panic!("Failed to get wallet manager");
         }
-        // Cast back to FFIWalletManager for use
-        let wallet_manager = wallet_manager_ptr as *mut key_wallet_ffi::FFIWalletManager;
 
         // Now we can use the wallet manager directly
         // No need to go through client -> inner -> spv_client -> wallet()
 
         // Get the number of wallets (should be 0 initially)
         let mut error = std::mem::zeroed::<FFIError>();
-        let wallet_count = wallet_manager_wallet_count(wallet_manager, &mut error);
+        let wallet_count = wallet_manager_wallet_count(
+            wallet_manager as *const key_wallet_ffi::FFIWalletManager,
+            &mut error,
+        );
         println!("Number of wallets: {}", wallet_count);
 
         // Note: To get total balance, you would need to iterate through wallets
@@ -66,7 +66,7 @@ fn main() {
         // Clean up
         // The wallet manager can now be independently destroyed
         // It maintains its own Arc reference to the underlying wallet
-        wallet_manager_free(wallet_manager);
+        dash_spv_ffi_wallet_manager_free(wallet_manager);
         dash_spv_ffi_client_destroy(client);
         dash_spv_ffi_config_destroy(config);
 

dash-spv-ffi/include/dash_spv_ffi.h

@@ -531,27 +531,35 @@ int32_t dash_spv_ffi_client_enable_mempool_tracking(struct FFIDashSpvClient *cli
 /**
  * Get the wallet manager from the SPV client
  *
- * Returns an opaque pointer to FFIWalletManager that contains a cloned Arc reference to the wallet manager.
- * This allows direct interaction with the wallet manager without going through the client.
+ * Returns a pointer to an `FFIWalletManager` wrapper that clones the underlying
+ * `Arc<RwLock<WalletManager>>`. This allows direct interaction with the wallet
+ * manager without going back through the client for each call.
  *
  * # Safety
  *
  * The caller must ensure that:
  * - The client pointer is valid
- * - The returned pointer is freed using `wallet_manager_free` from key-wallet-ffi
+ * - The returned pointer is released exactly once using
+ *   `dash_spv_ffi_wallet_manager_free`
  *
  * # Returns
  *
- * An opaque pointer (void*) to the wallet manager, or NULL if the client is not initialized.
- * Swift should treat this as an OpaquePointer.
- * Get a handle to the wallet manager owned by this client.
+ * A pointer to the wallet manager wrapper, or NULL if the client is not initialized.
+ */
+ FFIWalletManager *dash_spv_ffi_client_get_wallet_manager(struct FFIDashSpvClient *client) ;
+
+/**
+ * Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager`.
+ *
+ * This simply forwards to `wallet_manager_free` in key-wallet-ffi so that
+ * lifetime management is consistent between direct key-wallet usage and the
+ * SPV client pathway.
  *
  * # Safety
- * - `client` must be a valid, non-null pointer.
+ * - `manager` must either be null or a pointer previously returned by
+ *   `dash_spv_ffi_client_get_wallet_manager`.
  */
-
-void *dash_spv_ffi_client_get_wallet_manager(struct FFIDashSpvClient *client)
-;
+ void dash_spv_ffi_wallet_manager_free(FFIWalletManager *manager) ;
 
  struct FFIClientConfig *dash_spv_ffi_config_new(FFINetwork network) ;
 

dash-spv-ffi/scripts/generate_ffi_docs.py

@@ -287,7 +287,10 @@ def generate_markdown(functions: List[FFIFunction]) -> str:
     md.append("2. **Cleanup Required**: All returned pointers must be freed using the appropriate `_destroy` function")
     md.append("3. **Thread Safety**: The SPV client is thread-safe")
     md.append("4. **Error Handling**: Check return codes and use `dash_spv_ffi_get_last_error()` for details")
-    md.append("5. **Opaque Pointers**: `dash_spv_ffi_client_get_wallet_manager()` returns `void*` for Swift compatibility")
+    md.append(
+        "5. **Shared Ownership**: `dash_spv_ffi_client_get_wallet_manager()` returns `FFIWalletManager*` "
+        "that must be released with `dash_spv_ffi_wallet_manager_free()`"
+    )
     md.append("")
 
     # Usage Examples
@@ -312,8 +315,8 @@ def generate_markdown(functions: List[FFIFunction]) -> str:
     md.append("// Sync to chain tip")
     md.append("dash_spv_ffi_client_sync_to_tip(client, NULL, NULL);")
     md.append("")
-    md.append("// Get wallet manager (returns void* for Swift)")
-    md.append("void* wallet_manager = dash_spv_ffi_client_get_wallet_manager(client);")
+    md.append("// Get wallet manager (shares ownership with the client)")
+    md.append("FFIWalletManager* wallet_manager = dash_spv_ffi_client_get_wallet_manager(client);")
     md.append("")
     md.append("// Clean up")
     md.append("dash_spv_ffi_client_destroy(client);")

dash-spv-ffi/src/client.rs

@@ -1485,27 +1485,24 @@ pub unsafe extern "C" fn dash_spv_ffi_client_record_send(
 
 /// Get the wallet manager from the SPV client
 ///
-/// Returns an opaque pointer to FFIWalletManager that contains a cloned Arc reference to the wallet manager.
-/// This allows direct interaction with the wallet manager without going through the client.
+/// Returns a pointer to an `FFIWalletManager` wrapper that clones the underlying
+/// `Arc<RwLock<WalletManager>>`. This allows direct interaction with the wallet
+/// manager without going back through the client for each call.
 ///
 /// # Safety
 ///
 /// The caller must ensure that:
 /// - The client pointer is valid
-/// - The returned pointer is freed using `wallet_manager_free` from key-wallet-ffi
+/// - The returned pointer is released exactly once using
+///   `dash_spv_ffi_wallet_manager_free`
 ///
 /// # Returns
 ///
-/// An opaque pointer (void*) to the wallet manager, or NULL if the client is not initialized.
-/// Swift should treat this as an OpaquePointer.
-/// Get a handle to the wallet manager owned by this client.
-///
-/// # Safety
-/// - `client` must be a valid, non-null pointer.
+/// A pointer to the wallet manager wrapper, or NULL if the client is not initialized.
 #[no_mangle]
 pub unsafe extern "C" fn dash_spv_ffi_client_get_wallet_manager(
     client: *mut FFIDashSpvClient,
-) -> *mut c_void {
+) -> *mut FFIWalletManager {
     null_check!(client, std::ptr::null_mut());
 
     let client = &*client;
@@ -1519,9 +1516,27 @@ pub unsafe extern "C" fn dash_spv_ffi_client_get_wallet_manager(
         // Create the FFIWalletManager with the cloned Arc
         let manager = FFIWalletManager::from_arc(wallet_arc, runtime);
 
-        Box::into_raw(Box::new(manager)) as *mut c_void
+        Box::into_raw(Box::new(manager))
     } else {
         set_last_error("Client not initialized");
         std::ptr::null_mut()
     }
 }
+
+/// Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager`.
+///
+/// This simply forwards to `wallet_manager_free` in key-wallet-ffi so that
+/// lifetime management is consistent between direct key-wallet usage and the
+/// SPV client pathway.
+///
+/// # Safety
+/// - `manager` must either be null or a pointer previously returned by
+///   `dash_spv_ffi_client_get_wallet_manager`.
+#[no_mangle]
+pub unsafe extern "C" fn dash_spv_ffi_wallet_manager_free(manager: *mut FFIWalletManager) {
+    if manager.is_null() {
+        return;
+    }
+
+    key_wallet_ffi::wallet_manager::wallet_manager_free(manager);
+}