feat: async check transaction (#178)

Author: QuantumExplorer

dash-spv-ffi/include/dash_spv_ffi.h

@@ -3,7 +3,7 @@
 #ifndef DASH_SPV_FFI_H
 #define DASH_SPV_FFI_H
 
-/* Generated with cbindgen:0.29.2 */
+/* Generated with cbindgen:0.29.0 */
 
 /* Warning: This file is auto-generated by cbindgen. Do not modify manually. */
 
@@ -16,6 +16,11 @@
 namespace dash_spv_ffi {
 #endif  // __cplusplus
 
+typedef enum FFIMempoolStrategy {
+  FetchAll = 0,
+  BloomFilter = 1,
+} FFIMempoolStrategy;
+
 typedef enum FFISyncStage {
   Connecting = 0,
   QueryingHeight = 1,
@@ -29,11 +34,6 @@ typedef enum FFISyncStage {
   Failed = 9,
 } FFISyncStage;
 
-typedef enum FFIMempoolStrategy {
-  FetchAll = 0,
-  BloomFilter = 1,
-} FFIMempoolStrategy;
-
 typedef enum DashSpvValidationMode {
   None = 0,
   Basic = 1,

key-wallet-ffi/src/transaction.rs

@@ -564,8 +564,11 @@ pub unsafe extern "C" fn wallet_check_transaction(
                 return false;
             }
         };
-        let check_result =
-            managed_info.check_transaction(&tx, network_rust, context, wallet_mut, update_state);
+
+        // Block on the async check_transaction call
+        let check_result = tokio::runtime::Handle::current().block_on(
+            managed_info.check_transaction(&tx, network_rust, context, wallet_mut, update_state),
+        );
 
         // If we updated state, we need to update the wallet's managed info
         // Note: This would require storing ManagedWalletInfo in FFIWallet

key-wallet-ffi/src/transaction_checking.rs

@@ -208,8 +208,11 @@ pub unsafe extern "C" fn managed_wallet_check_transaction(
             return false;
         }
     };
-    let check_result =
-        managed_wallet.check_transaction(&tx, network_rust, context, wallet_mut, update_state);
+
+    // Block on the async check_transaction call
+    let check_result = tokio::runtime::Handle::current().block_on(
+        managed_wallet.check_transaction(&tx, network_rust, context, wallet_mut, update_state),
+    );
 
     // Convert the result to FFI format
     let affected_accounts = if check_result.affected_accounts.is_empty() {

key-wallet-ffi/src/wallet_manager.rs

@@ -791,7 +791,9 @@ pub unsafe extern "C" fn wallet_manager_process_transaction(
     // Process the transaction using async runtime
     let relevant_wallets = manager_ref.runtime.block_on(async {
         let mut manager_guard = manager_ref.manager.write().await;
-        manager_guard.check_transaction_in_all_wallets(&tx, network, context, update_state_if_found)
+        manager_guard
+            .check_transaction_in_all_wallets(&tx, network, context, update_state_if_found)
+            .await
     });
 
     FFIError::set_success(error);

key-wallet-manager/src/wallet_manager/mod.rs

@@ -502,7 +502,7 @@ impl<T: WalletInfoInterface> WalletManager<T> {
     }
 
     /// Check a transaction against all wallets and update their states if relevant
-    pub fn check_transaction_in_all_wallets(
+    pub async fn check_transaction_in_all_wallets(
         &mut self,
         tx: &Transaction,
         network: Network,
@@ -521,13 +521,9 @@ impl<T: WalletInfoInterface> WalletManager<T> {
             let wallet_info_opt = self.wallet_infos.get_mut(&wallet_id);
 
             if let (Some(wallet), Some(wallet_info)) = (wallet_opt, wallet_info_opt) {
-                let result = wallet_info.check_transaction(
-                    tx,
-                    network,
-                    context,
-                    wallet,
-                    update_state_if_found,
-                );
+                let result = wallet_info
+                    .check_transaction(tx, network, context, wallet, update_state_if_found)
+                    .await;
 
                 // If the transaction is relevant
                 if result.is_relevant {

key-wallet-manager/src/wallet_manager/process_block.rs

@@ -31,9 +31,11 @@ impl<T: WalletInfoInterface + Send + Sync + 'static> WalletInterface for WalletM
                 timestamp: Some(timestamp),
             };
 
-            let affected_wallets = self.check_transaction_in_all_wallets(
-                tx, network, context, true, // update state
-            );
+            let affected_wallets = self
+                .check_transaction_in_all_wallets(
+                    tx, network, context, true, // update state
+                )
+                .await;
 
             if !affected_wallets.is_empty() {
                 relevant_txids.push(tx.txid());
@@ -54,7 +56,8 @@ impl<T: WalletInfoInterface + Send + Sync + 'static> WalletInterface for WalletM
         // Check transaction against all wallets
         self.check_transaction_in_all_wallets(
             tx, network, context, true, // update state
-        );
+        )
+        .await;
     }
 
     async fn handle_reorg(

key-wallet/Cargo.toml

@@ -43,7 +43,9 @@ hex = { version = "0.4"}
 hkdf = { version = "0.12", default-features = false }
 zeroize = { version = "1.8", features = ["derive"] }
 tracing = "0.1"
+async-trait = "0.1"
 
 [dev-dependencies]
 hex = "0.4"
 key-wallet = { path = ".", features = ["bip38", "serde", "bincode", "eddsa", "bls"] }
+tokio = { version = "1", features = ["macros", "rt"] }

key-wallet/src/transaction_checking/transaction_router/tests/asset_unlock.rs

@@ -67,8 +67,8 @@ fn test_asset_unlock_classification() {
     assert!(accounts.contains(&AccountTypeToCheck::StandardBIP32));
 }
 
-#[test]
-fn test_asset_unlock_transaction_routing() {
+#[tokio::test]
+async fn test_asset_unlock_transaction_routing() {
     let network = Network::Testnet;
     let mut wallet = Wallet::new_random(&[network], WalletAccountCreationOptions::Default)
         .expect("Failed to create wallet with default options");
@@ -134,7 +134,8 @@ fn test_asset_unlock_transaction_routing() {
         timestamp: Some(1234567890),
     };
 
-    let result = managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, true);
+    let result =
+        managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, true).await;
 
     // The transaction should be recognized as relevant
     assert!(result.is_relevant, "Asset unlock transaction should be recognized as relevant");
@@ -155,8 +156,8 @@ fn test_asset_unlock_transaction_routing() {
     );
 }
 
-#[test]
-fn test_asset_unlock_routing_to_bip32_account() {
+#[tokio::test]
+async fn test_asset_unlock_routing_to_bip32_account() {
     // Test AssetUnlock routing to BIP32 accounts
     let network = Network::Testnet;
 
@@ -214,7 +215,8 @@ fn test_asset_unlock_routing_to_bip32_account() {
         timestamp: Some(1234567890),
     };
 
-    let result = managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, true);
+    let result =
+        managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, true).await;
 
     // Should be recognized as relevant
     assert!(result.is_relevant, "Asset unlock transaction to BIP32 account should be relevant");

key-wallet/src/transaction_checking/transaction_router/tests/coinbase.rs

@@ -60,8 +60,8 @@ fn create_basic_transaction() -> Transaction {
     }
 }
 
-#[test]
-fn test_coinbase_transaction_routing_to_bip44_receive_address() {
+#[tokio::test]
+async fn test_coinbase_transaction_routing_to_bip44_receive_address() {
     let network = Network::Testnet;
 
     // Create a wallet with a BIP44 account
@@ -109,13 +109,15 @@ fn test_coinbase_transaction_routing_to_bip44_receive_address() {
     };
 
     // Check the coinbase transaction
-    let result = managed_wallet_info.check_transaction(
-        &coinbase_tx,
-        network,
-        context,
-        &mut wallet,
-        true, // update state
-    );
+    let result = managed_wallet_info
+        .check_transaction(
+            &coinbase_tx,
+            network,
+            context,
+            &mut wallet,
+            true, // update state
+        )
+        .await;
 
     // The coinbase transaction should be recognized as relevant
     assert!(result.is_relevant, "Coinbase transaction to BIP44 receive address should be relevant");
@@ -136,8 +138,8 @@ fn test_coinbase_transaction_routing_to_bip44_receive_address() {
     );
 }
 
-#[test]
-fn test_coinbase_transaction_routing_to_bip44_change_address() {
+#[tokio::test]
+async fn test_coinbase_transaction_routing_to_bip44_change_address() {
     let network = Network::Testnet;
 
     // Create a wallet with a BIP44 account
@@ -185,13 +187,15 @@ fn test_coinbase_transaction_routing_to_bip44_change_address() {
     };
 
     // Check the coinbase transaction
-    let result = managed_wallet_info.check_transaction(
-        &coinbase_tx,
-        network,
-        context,
-        &mut wallet,
-        true, // update state
-    );
+    let result = managed_wallet_info
+        .check_transaction(
+            &coinbase_tx,
+            network,
+            context,
+            &mut wallet,
+            true, // update state
+        )
+        .await;
 
     // The coinbase transaction should be recognized as relevant even to change address
     assert!(result.is_relevant, "Coinbase transaction to BIP44 change address should be relevant");
@@ -212,8 +216,8 @@ fn test_coinbase_transaction_routing_to_bip44_change_address() {
     );
 }
 
-#[test]
-fn test_update_state_flag_behavior() {
+#[tokio::test]
+async fn test_update_state_flag_behavior() {
     let network = Network::Testnet;
 
     let mut wallet = Wallet::new_random(&[network], WalletAccountCreationOptions::Default)
@@ -257,7 +261,8 @@ fn test_update_state_flag_behavior() {
     };
 
     // First check with update_state = false
-    let result1 = managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, false);
+    let result1 =
+        managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, false).await;
 
     assert!(result1.is_relevant);
 
@@ -278,13 +283,15 @@ fn test_update_state_flag_behavior() {
     }
 
     // Now check with update_state = true
-    let result2 = managed_wallet_info.check_transaction(
-        &tx,
-        network,
-        context,
-        &mut wallet,
-        true, // update state
-    );
+    let result2 = managed_wallet_info
+        .check_transaction(
+            &tx,
+            network,
+            context,
+            &mut wallet,
+            true, // update state
+        )
+        .await;
 
     assert!(result2.is_relevant);
     assert_eq!(
@@ -346,8 +353,8 @@ fn test_coinbase_routing() {
     assert!(!accounts.contains(&AccountTypeToCheck::ProviderOwnerKeys));
 }
 
-#[test]
-fn test_coinbase_transaction_with_payload_routing() {
+#[tokio::test]
+async fn test_coinbase_transaction_with_payload_routing() {
     // Test coinbase with special payload routing to BIP44 account
     let network = Network::Testnet;
     let mut wallet = Wallet::new_random(&[network], WalletAccountCreationOptions::Default)
@@ -402,8 +409,9 @@ fn test_coinbase_transaction_with_payload_routing() {
         timestamp: Some(1234567890),
     };
 
-    let result =
-        managed_wallet_info.check_transaction(&coinbase_tx, network, context, &mut wallet, true);
+    let result = managed_wallet_info
+        .check_transaction(&coinbase_tx, network, context, &mut wallet, true)
+        .await;
 
     assert!(result.is_relevant, "Coinbase with payload should be relevant");
     assert_eq!(result.total_received, 5000000000, "Should have received block reward");

key-wallet/src/transaction_checking/transaction_router/tests/identity_transactions.rs

@@ -53,8 +53,8 @@ fn test_identity_registration() {
     assert!(accounts.contains(&AccountTypeToCheck::IdentityTopUp));
 }
 
-#[test]
-fn test_identity_registration_account_routing() {
+#[tokio::test]
+async fn test_identity_registration_account_routing() {
     let network = Network::Testnet;
 
     let mut wallet = Wallet::new_random(&[network], WalletAccountCreationOptions::None)
@@ -144,7 +144,8 @@ fn test_identity_registration_account_routing() {
     };
 
     // First check without updating state
-    let result = managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, true);
+    let result =
+        managed_wallet_info.check_transaction(&tx, network, context, &mut wallet, true).await;
 
     println!(
         "Identity registration transaction result: is_relevant={}, received={}, credit_conversion={}",
@@ -174,8 +175,8 @@ fn test_identity_registration_account_routing() {
     );
 }
 
-#[test]
-fn test_normal_payment_to_identity_address_not_detected() {
+#[tokio::test]
+async fn test_normal_payment_to_identity_address_not_detected() {
     let network = Network::Testnet;
 
     let mut wallet = Wallet::new_random(&[network], WalletAccountCreationOptions::Default)
@@ -219,13 +220,15 @@ fn test_normal_payment_to_identity_address_not_detected() {
         timestamp: Some(1234567890),
     };
 
-    let result = managed_wallet_info.check_transaction(
-        &normal_tx,
-        network,
-        context,
-        &mut wallet,
-        true, // update state
-    );
+    let result = managed_wallet_info
+        .check_transaction(
+            &normal_tx,
+            network,
+            context,
+            &mut wallet,
+            true, // update state
+        )
+        .await;
 
     // A normal transaction to an identity registration address should NOT be detected
     // Identity addresses are only for special transactions (AssetLock)