fix

Author: QuantumExplorer

dash-spv-ffi/include/dash_spv_ffi.h

@@ -161,6 +161,17 @@ typedef struct FFIEventCallbacks {
   void *user_data;
 } FFIEventCallbacks;
 
+/**
+ * Opaque handle to the wallet manager owned by the SPV client.
+ *
+ * This is intentionally zero-sized so it can be used purely as an FFI handle
+ * while still allowing Rust to cast to the underlying key-wallet manager
+ * implementation when necessary.
+ */
+typedef struct FFIWalletManager {
+  uint8_t _private[0];
+} FFIWalletManager;
+
 /**
  * Handle for Core SDK that can be passed to Platform SDK
  */
@@ -546,7 +557,7 @@ int32_t dash_spv_ffi_client_enable_mempool_tracking(struct FFIDashSpvClient *cli
  *
  * 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) ;
+ struct FFIWalletManager *dash_spv_ffi_client_get_wallet_manager(struct FFIDashSpvClient *client) ;
 
 /**
  * Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager`.
@@ -559,7 +570,7 @@ int32_t dash_spv_ffi_client_enable_mempool_tracking(struct FFIDashSpvClient *cli
  * - `manager` must either be null or a pointer previously returned by
  *   `dash_spv_ffi_client_get_wallet_manager`.
  */
- void dash_spv_ffi_wallet_manager_free(FFIWalletManager *manager) ;
+ void dash_spv_ffi_wallet_manager_free(struct FFIWalletManager *manager) ;
 
  struct FFIClientConfig *dash_spv_ffi_config_new(FFINetwork network) ;
 

dash-spv-ffi/src/client.rs

@@ -1,9 +1,9 @@
 use crate::{
     null_check, set_last_error, FFIClientConfig, FFIDetailedSyncProgress, FFIErrorCode,
-    FFIEventCallbacks, FFIMempoolStrategy, FFISpvStats, FFISyncProgress,
+    FFIEventCallbacks, FFIMempoolStrategy, FFISpvStats, FFISyncProgress, FFIWalletManager,
 };
 // Import wallet types from key-wallet-ffi
-use key_wallet_ffi::FFIWalletManager;
+use key_wallet_ffi::FFIWalletManager as KeyWalletFFIWalletManager;
 
 use dash_spv::storage::DiskStorageManager;
 use dash_spv::types::SyncStage;
@@ -1514,9 +1514,9 @@ pub unsafe extern "C" fn dash_spv_ffi_client_get_wallet_manager(
         let runtime = client.runtime.clone();
 
         // Create the FFIWalletManager with the cloned Arc
-        let manager = FFIWalletManager::from_arc(wallet_arc, runtime);
+        let manager = KeyWalletFFIWalletManager::from_arc(wallet_arc, runtime);
 
-        Box::into_raw(Box::new(manager))
+        Box::into_raw(Box::new(manager)) as *mut FFIWalletManager
     } else {
         set_last_error("Client not initialized");
         std::ptr::null_mut()
@@ -1538,5 +1538,5 @@ pub unsafe extern "C" fn dash_spv_ffi_wallet_manager_free(manager: *mut FFIWalle
         return;
     }
 
-    key_wallet_ffi::wallet_manager::wallet_manager_free(manager);
+    key_wallet_ffi::wallet_manager::wallet_manager_free(manager as *mut KeyWalletFFIWalletManager);
 }

dash-spv-ffi/src/types.rs

@@ -4,6 +4,16 @@ use dash_spv::{ChainState, PeerInfo, SpvStats, SyncProgress};
 use std::ffi::{CStr, CString};
 use std::os::raw::{c_char, c_void};
 
+/// Opaque handle to the wallet manager owned by the SPV client.
+///
+/// This is intentionally zero-sized so it can be used purely as an FFI handle
+/// while still allowing Rust to cast to the underlying key-wallet manager
+/// implementation when necessary.
+#[repr(C)]
+pub struct FFIWalletManager {
+    _private: [u8; 0],
+}
+
 #[repr(C)]
 pub struct FFIString {
     pub ptr: *mut c_char,

dash-spv-ffi/tests/test_wallet_manager.rs

@@ -55,6 +55,7 @@ mod tests {
 
             let wallet_manager = dash_spv_ffi_client_get_wallet_manager(client);
             assert!(!wallet_manager.is_null());
+            let wallet_manager_ptr = wallet_manager as *mut key_wallet_ffi::FFIWalletManager;
 
             // Prepare a serialized wallet using the native manager so we can import it
             let mut native_manager = WalletManager::<ManagedWalletInfo>::new();
@@ -74,7 +75,7 @@ mod tests {
             let mut error = FFIError::success();
             let mut imported_wallet_id = [0u8; 32];
             let import_ok = wallet_manager_import_wallet_from_bytes(
-                wallet_manager,
+                wallet_manager_ptr,
                 serialized_wallet.as_ptr(),
                 serialized_wallet.len(),
                 imported_wallet_id.as_mut_ptr(),
@@ -87,7 +88,7 @@ mod tests {
             let mut ids_ptr: *mut u8 = std::ptr::null_mut();
             let mut id_count: usize = 0;
             let ids_ok = wallet_manager_get_wallet_ids(
-                wallet_manager as *const FFIWalletManager,
+                wallet_manager_ptr as *const FFIWalletManager,
                 &mut ids_ptr,
                 &mut id_count,
                 &mut error as *mut FFIError,
@@ -103,7 +104,7 @@ mod tests {
             // Call the describe helper through FFI to ensure the shared instance reports correctly
             let mut description_error = FFIError::success();
             let description_ptr = key_wallet_ffi::wallet_manager_describe(
-                wallet_manager as *const FFIWalletManager,
+                wallet_manager_ptr as *const FFIWalletManager,
                 FFINetwork::Dash,
                 &mut description_error as *mut FFIError,
             );

dash-spv/src/client/mod.rs

@@ -2566,11 +2566,13 @@ mod tests {
 
     #[tokio::test]
     async fn client_exposes_shared_wallet_manager() {
-        let mut config = ClientConfig::default();
-        config.network = Network::Dash;
-        config.enable_filters = false;
-        config.enable_masternodes = false;
-        config.enable_mempool_tracking = false;
+        let config = ClientConfig {
+            network: Network::Dash,
+            enable_filters: false,
+            enable_masternodes: false,
+            enable_mempool_tracking: false,
+            ..Default::default()
+        };
 
         let network_manager = MockNetworkManager::new();
         let storage = MemoryStorageManager::new().await.expect("memory storage should initialize");

swift-dash-core-sdk/Sources/DashSPVFFI/include/dash_spv_ffi.h

@@ -161,6 +161,17 @@ typedef struct FFIEventCallbacks {
   void *user_data;
 } FFIEventCallbacks;
 
+/**
+ * Opaque handle to the wallet manager owned by the SPV client.
+ *
+ * This is intentionally zero-sized so it can be used purely as an FFI handle
+ * while still allowing Rust to cast to the underlying key-wallet manager
+ * implementation when necessary.
+ */
+typedef struct FFIWalletManager {
+  uint8_t _private[0];
+} FFIWalletManager;
+
 /**
  * Handle for Core SDK that can be passed to Platform SDK
  */
@@ -546,7 +557,7 @@ int32_t dash_spv_ffi_client_enable_mempool_tracking(struct FFIDashSpvClient *cli
  *
  * 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) ;
+ struct FFIWalletManager *dash_spv_ffi_client_get_wallet_manager(struct FFIDashSpvClient *client) ;
 
 /**
  * Release a wallet manager obtained from `dash_spv_ffi_client_get_wallet_manager`.
@@ -559,7 +570,7 @@ int32_t dash_spv_ffi_client_enable_mempool_tracking(struct FFIDashSpvClient *cli
  * - `manager` must either be null or a pointer previously returned by
  *   `dash_spv_ffi_client_get_wallet_manager`.
  */
- void dash_spv_ffi_wallet_manager_free(FFIWalletManager *manager) ;
+ void dash_spv_ffi_wallet_manager_free(struct FFIWalletManager *manager) ;
 
  struct FFIClientConfig *dash_spv_ffi_config_new(FFINetwork network) ;
 

swift-dash-core-sdk/Sources/KeyWalletFFI/include/key_wallet_ffi.h

@@ -3743,6 +3743,12 @@ char *wallet_manager_describe(const FFIWalletManager *manager,
 
 /*
  Free a string previously returned by wallet manager APIs.
+
+ # Safety
+ - `value` must be either null or a pointer obtained from
+   `wallet_manager_describe` (or other wallet manager FFI helpers that
+   specify this free function).
+ - The pointer must not be used after this call returns.
  */
  void wallet_manager_free_string(char *value) ;