feat(key-wallet-manager): single-map WalletManager with Arc<RwLock<T>> per wallet

dash-spv/src/client/lifecycle.rs

@@ -128,7 +128,7 @@ impl<W: WalletInterface, N: NetworkManager, S: StorageManager, H: EventHandler>
         // Create mempool state and build mempool manager if tracking is enabled
         let mempool_state = Arc::new(RwLock::new(MempoolState::default()));
         if config.enable_mempool_tracking {
-            let initial_revision = wallet.read().await.monitor_revision();
+            let initial_revision = wallet.read().await.monitor_revision().await;
             managers.mempool = Some(MempoolManager::new(
                 wallet.clone(),
                 mempool_state.clone(),

dash-spv/src/sync/filters/manager.rs

@@ -500,7 +500,7 @@ impl<H: BlockHeaderStorage, FH: FilterHeaderStorage, F: FilterStorage, W: Wallet
             let end = batch.end_height();
             if end > self.progress.committed_height() {
                 self.progress.update_committed_height(end);
-                self.wallet.write().await.update_filter_committed_height(end);
+                self.wallet.write().await.update_filter_committed_height(end).await;
             }
             self.processing_height = end + 1;
 
@@ -675,7 +675,7 @@ impl<H: BlockHeaderStorage, FH: FilterHeaderStorage, F: FilterStorage, W: Wallet
 
         // Match against wallet's current addresses
         let wallet = self.wallet.read().await;
-        let addresses = wallet.monitored_addresses();
+        let addresses = wallet.monitored_addresses().await;
         let matches = check_compact_filters_for_addresses(batch.filters(), addresses);
         drop(wallet);
 
@@ -821,7 +821,7 @@ mod tests {
 
         // Set wallet committed height via synced_height (MockWallet default delegates)
         let mut wallet = MockWallet::new();
-        wallet.update_synced_height(50);
+        wallet.update_synced_height(50).await;
         let wallet = Arc::new(RwLock::new(wallet));
 
         // Pre-populate filter storage with filters at heights 1..=100
@@ -1049,7 +1049,7 @@ mod tests {
         assert_eq!(manager.state(), SyncState::WaitForEvents);
 
         // Wallet committed to height 100, so scan_start will be 101
-        manager.wallet.write().await.update_synced_height(100);
+        manager.wallet.write().await.update_synced_height(100).await;
         // Filter headers only reached 50, so its below scan_start
         manager.progress.update_filter_header_tip_height(50);
         // Chain tip higher so the Synced early-return is not taken
@@ -1126,7 +1126,7 @@ mod tests {
         // Simulate restart where everything is already synced but state is WaitForEvents.
         // committed == stored == filter_header_tip — start_download detects synced state.
         manager.set_state(SyncState::WaitForEvents);
-        manager.wallet.write().await.update_synced_height(100);
+        manager.wallet.write().await.update_synced_height(100).await;
         manager.progress.update_committed_height(100);
         manager.progress.update_stored_height(100);
         manager.progress.update_filter_header_tip_height(100);

dash-spv/src/sync/mempool/manager.rs

@@ -135,8 +135,8 @@ impl<W: WalletInterface> MempoolManager<W> {
         requests: &RequestSender,
     ) -> SyncResult<()> {
         let wallet = self.wallet.read().await;
-        let addresses = wallet.monitored_addresses();
-        let outpoints = wallet.watched_outpoints();
+        let addresses = wallet.monitored_addresses().await;
+        let outpoints = wallet.watched_outpoints().await;
         drop(wallet);
 
         if addresses.is_empty() && outpoints.is_empty() {
@@ -379,7 +379,7 @@ impl<W: WalletInterface> MempoolManager<W> {
         drop(state);
         if marked {
             let mut wallet = self.wallet.write().await;
-            wallet.process_instant_send_lock(*txid);
+            wallet.process_instant_send_lock(*txid).await;
         }
     }
 

dash-spv/src/sync/mempool/sync_manager.rs

@@ -127,7 +127,7 @@ impl<W: WalletInterface + 'static> SyncManager for MempoolManager<W> {
         // shared `SyncManager::run` loop or a `WalletEvent` bridge — complexity
         // that isn't justified given the 100ms tick latency is negligible for bloom
         // filter rebuilds and the read lock is non-contending.
-        let current_revision = self.wallet.read().await.monitor_revision();
+        let current_revision = self.wallet.read().await.monitor_revision().await;
         if current_revision != self.last_monitor_revision {
             tracing::info!("Wallet monitor revision changed, rebuilding bloom filter");
             self.rebuild_filter(requests).await?;
@@ -621,7 +621,7 @@ mod tests {
 
         let mut mock = MockWallet::new();
         mock.set_addresses(vec![addr.clone()]);
-        let initial_revision = mock.monitor_revision();
+        let initial_revision = mock.monitor_revision().await;
         let wallet = Arc::new(RwLock::new(mock));
         let mempool_state = Arc::new(RwLock::new(MempoolState::default()));
         let (tx, mut rx) = mpsc::unbounded_channel::<NetworkRequest>();
@@ -734,7 +734,7 @@ mod tests {
 
         let mut mock = MockWallet::new();
         mock.set_addresses(vec![addr]);
-        let initial_revision = mock.monitor_revision();
+        let initial_revision = mock.monitor_revision().await;
         let wallet = Arc::new(RwLock::new(mock));
         let mempool_state = Arc::new(RwLock::new(MempoolState::default()));
         let (tx, mut rx) = mpsc::unbounded_channel::<NetworkRequest>();
@@ -785,7 +785,7 @@ mod tests {
         ]);
         let addr = dashcore::Address::from_script(&script, dashcore::Network::Testnet).unwrap();
         mock.set_addresses(vec![addr]);
-        let initial_revision = mock.monitor_revision();
+        let initial_revision = mock.monitor_revision().await;
         let wallet = Arc::new(RwLock::new(mock));
         let mempool_state = Arc::new(RwLock::new(MempoolState::default()));
         let (tx_chan, mut rx) = mpsc::unbounded_channel::<NetworkRequest>();

key-wallet-ffi/src/address_pool.rs

@@ -696,109 +696,109 @@ pub unsafe extern "C" fn managed_wallet_mark_address_used(
         let mut found = false;
         // Check all accounts for the address
         for account in collection.standard_bip44_accounts.values_mut() {
-            if account.mark_address_used(&address) {
+            if account.mark_address_used(&address).0 {
                 found = true;
                 break;
             }
         }
         if !found {
             for account in collection.standard_bip32_accounts.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }
             }
         }
         if !found {
             for account in collection.coinjoin_accounts.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.identity_registration {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             for account in collection.identity_topup.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.identity_topup_not_bound {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.identity_invitation {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.asset_lock_address_topup {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.asset_lock_shielded_address_topup {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.provider_voting_keys {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.provider_owner_keys {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.provider_operator_keys {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             if let Some(account) = &mut collection.provider_platform_keys {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                 }
             }
         }
         if !found {
             for account in collection.dashpay_receival_accounts.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }
             }
         }
         if !found {
             for account in collection.dashpay_external_accounts.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }

key-wallet-ffi/src/wallet_manager_tests.rs

@@ -459,7 +459,7 @@ mod tests {
             let manager_ref = &*manager;
             manager_ref.runtime.block_on(async {
                 let mut manager_guard = manager_ref.manager.write().await;
-                manager_guard.update_synced_height(new_height);
+                manager_guard.update_synced_height(new_height).await;
             });
         }
 

key-wallet-manager/Cargo.toml

@@ -12,12 +12,15 @@ default = []
 parallel-filters = ["dep:rayon"]
 bincode = ["key-wallet/bincode", "dep:bincode"]
 test-utils = ["key-wallet/test-utils"]
+bls = ["key-wallet/bls"]
+eddsa = ["key-wallet/eddsa"]
 
 [dependencies]
 key-wallet = { path = "../key-wallet", default-features = false }
 dashcore = { path = "../dash" }
 async-trait = "0.1"
 tokio = { version = "1", features = ["macros", "rt", "sync"] }
+tracing = "0.1"
 zeroize = { version = "1.8", features = ["derive"] }
 rayon = { version = "1.11", optional = true }
 bincode = { version = "2.0.1", optional = true }