more fixes

Author: QuantumExplorer

dash-spv-ffi/dash_spv_ffi.h

@@ -30,8 +30,9 @@ typedef enum FFISyncStage {
   Storing = 4,
   DownloadingFilterHeaders = 5,
   DownloadingFilters = 6,
-  Complete = 7,
-  Failed = 8,
+  DownloadingBlocks = 7,
+  Complete = 8,
+  Failed = 9,
 } FFISyncStage;
 
 typedef enum DashSpvValidationMode {

dash-spv-ffi/include/dash_spv_ffi.h

@@ -30,8 +30,9 @@ typedef enum FFISyncStage {
   Storing = 4,
   DownloadingFilterHeaders = 5,
   DownloadingFilters = 6,
-  Complete = 7,
-  Failed = 8,
+  DownloadingBlocks = 7,
+  Complete = 8,
+  Failed = 9,
 } FFISyncStage;
 
 typedef enum DashSpvValidationMode {

dash-spv-ffi/src/bin/ffi_cli.rs

@@ -1,6 +1,7 @@
 use std::ffi::{CStr, CString};
 use std::os::raw::{c_char, c_void};
 use std::ptr;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::thread;
 use std::time::Duration;
 
@@ -16,6 +17,8 @@ enum NetworkOpt {
     Regtest,
 }
 
+static SYNC_COMPLETED: AtomicBool = AtomicBool::new(false);
+
 fn ffi_string_to_rust(s: *const c_char) -> String {
     if s.is_null() {
         return String::new();
@@ -44,6 +47,7 @@ extern "C" fn on_completion(success: bool, msg: *const c_char, _ud: *mut c_void)
     let m = ffi_string_to_rust(msg);
     if success {
         println!("Completed: {}", m);
+        SYNC_COMPLETED.store(true, Ordering::SeqCst);
     } else {
         eprintln!("Failed: {}", m);
     }
@@ -188,6 +192,9 @@ fn main() {
             std::process::exit(1);
         }
 
+        // Ensure completion flag is reset before starting sync
+        SYNC_COMPLETED.store(false, Ordering::SeqCst);
+
         // Run sync on this thread; detailed progress will print via callback
         let rc = dash_spv_ffi_client_sync_to_tip_with_progress(
             client,
@@ -206,11 +213,14 @@ fn main() {
             let prog_ptr = dash_spv_ffi_client_get_sync_progress(client);
             if !prog_ptr.is_null() {
                 let prog = &*prog_ptr;
-                let headers_done = prog.header_height >= prog.filter_header_height;
-                let filters_complete = prog.filter_header_height >= prog.header_height
-                    || !prog.filter_sync_available
-                    || disable_filter_sync;
-                if headers_done && filters_complete {
+                let headers_done = SYNC_COMPLETED.load(Ordering::SeqCst);
+                let filters_complete = if disable_filter_sync || !prog.filter_sync_available {
+                    false
+                } else {
+                    prog.filter_header_height >= prog.header_height
+                        && prog.last_synced_filter_height >= prog.filter_header_height
+                };
+                if headers_done && (filters_complete || disable_filter_sync) {
                     dash_spv_ffi_sync_progress_destroy(prog_ptr);
                     break;
                 }

dash-spv-ffi/src/types.rs

@@ -67,8 +67,9 @@ pub enum FFISyncStage {
     Storing = 4,
     DownloadingFilterHeaders = 5,
     DownloadingFilters = 6,
-    Complete = 7,
-    Failed = 8,
+    DownloadingBlocks = 7,
+    Complete = 8,
+    Failed = 9,
 }
 
 impl From<SyncStage> for FFISyncStage {
@@ -91,6 +92,9 @@ impl From<SyncStage> for FFISyncStage {
             SyncStage::DownloadingFilters {
                 ..
             } => FFISyncStage::DownloadingFilters,
+            SyncStage::DownloadingBlocks {
+                ..
+            } => FFISyncStage::DownloadingBlocks,
             SyncStage::Complete => FFISyncStage::Complete,
             SyncStage::Failed(_) => FFISyncStage::Failed,
         }
@@ -135,6 +139,9 @@ impl From<DetailedSyncProgress> for FFIDetailedSyncProgress {
                 completed,
                 total,
             } => format!("Downloading filters {} / {}", completed, total),
+            SyncStage::DownloadingBlocks {
+                pending,
+            } => format!("Downloading blocks ({} pending)", pending),
             SyncStage::Complete => "Synchronization complete".to_string(),
             SyncStage::Failed(err) => err.clone(),
         };

dash-spv/src/client/mod.rs

@@ -195,8 +195,8 @@ impl<
             SyncPhase::DownloadingBlocks {
                 pending_blocks,
                 ..
-            } => SyncStage::StoringHeaders {
-                batch_size: pending_blocks.len(),
+            } => SyncStage::DownloadingBlocks {
+                pending: pending_blocks.len(),
             },
             SyncPhase::FullySynced {
                 ..

dash-spv/src/types.rs

@@ -116,6 +116,9 @@ pub enum SyncStage {
         completed: u32,
         total: u32,
     },
+    DownloadingBlocks {
+        pending: usize,
+    },
     Complete,
     Failed(String),
 }

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

@@ -30,8 +30,9 @@ typedef enum FFISyncStage {
   Storing = 4,
   DownloadingFilterHeaders = 5,
   DownloadingFilters = 6,
-  Complete = 7,
-  Failed = 8,
+  DownloadingBlocks = 7,
+  Complete = 8,
+  Failed = 9,
 } FFISyncStage;
 
 typedef enum DashSpvValidationMode {

swift-dash-core-sdk/Sources/SwiftDashCoreSDK/Core/SPVClient.swift

@@ -109,6 +109,7 @@ public enum SyncStage: Equatable, Sendable {
     case downloading
     case downloadingFilterHeaders
     case downloadingFilters
+    case downloadingBlocks
     case validating
     case storing
     case complete
@@ -131,9 +132,11 @@ public enum SyncStage: Equatable, Sendable {
             self = .downloadingFilterHeaders
         case 6:  // Downloading filters
             self = .downloadingFilters
-        case 7:  // Complete
+        case 7:  // Downloading blocks
+            self = .downloadingBlocks
+        case 8:  // Complete
             self = .complete
-        case 8:  // Failed
+        case 9:  // Failed
             self = .failed
         default:
             self = .failed
@@ -152,6 +155,8 @@ public enum SyncStage: Equatable, Sendable {
             return "Downloading filter headers"
         case .downloadingFilters:
             return "Downloading filters"
+        case .downloadingBlocks:
+            return "Downloading blocks"
         case .validating:
             return "Validating headers"
         case .storing:
@@ -184,6 +189,8 @@ public enum SyncStage: Equatable, Sendable {
             return "🧾"
         case .downloadingFilters:
             return "🪄"
+        case .downloadingBlocks:
+            return "📦"
         case .validating:
             return "✅"
         case .storing:

swift-dash-core-sdk/Sources/SwiftDashCoreSDK/Models/SyncProgress.swift

@@ -28,9 +28,6 @@ public struct SyncProgress: Sendable, Equatable {
         filterHeaderHeight: UInt32 = 0,
         masternodeHeight: UInt32 = 0,
         peerCount: UInt32 = 0,
-        headersSynced: Bool = false,
-        filterHeadersSynced: Bool = false,
-        masternodesSynced: Bool = false,
         filtersDownloaded: UInt32 = 0,
         lastSyncedFilterHeight: UInt32 = 0
     ) {