Squashed commit of the following:

commit c42375df3aa60eb0bae882e7e979c87d3bc1abfc
Author: xdustinface <xdustinfacex@gmail.com>
Date:   Fri Feb 13 20:57:07 2026 +0100

    fix: reset `FilterManager` when all peers disconnect

commit 0a79b95d5df7f5f84db3e8e27926b1ff427b016e
Author: xdustinface <xdustinfacex@gmail.com>
Date:   Fri Feb 13 20:34:03 2026 +0100

    fix: resolve filter pipeline boundary issues between init and extend_target

    Store planned batch end heights at queue time so send_pending uses
    the original boundaries instead of dynamically recomputing them from
    the current target_height. This prevents both overlaps (when send_pending
    expands a truncated batch) and gaps (when the batch was already sent
    with a smaller range).

    Also fix start_download returning in Syncing state when filter headers
    haven't reached wallet birth height yet — now returns to WaitForEvents
    so subsequent filter header events re-trigger start_download correctly.

    Setup dashd in CI for both spv and ffi test groups.

commit e9254d2cda8d7e6635f4657b06418d606ad8aace
Author: xdustinface <xdustinfacex@gmail.com>
Date:   Fri Feb 13 05:31:04 2026 +0100

    fix: separate filter scan committed height from per-block synced height

    Three related fixes for dashd integration test failures:

    1. FiltersManager now emits FiltersSyncComplete for incremental updates
       when already in Synced state, not just during initial Syncing. This
       allows BlocksManager to properly transition to Synced after processing
       blocks discovered in post-sync filter updates.

    2. wait_for_sync test helper checks filters.current_height (not just
       filter_headers) to prevent premature returns before filter scanning
       and block processing complete.

    3. Introduces filter_committed_height on WalletInterface, separate from
       synced_height. process_block updates synced_height per-block (needed
       for balance/maturity calculations), but FiltersManager uses
       filter_committed_height for restart recovery. This prevents a bug
       where per-block synced_height advances past uncommitted filter batches,
       causing the rescan on restart to skip heights that need rescanning
       for newly discovered addresses.

commit 2ecf9f882ad6580a51dffbf2cdecaa14bc9e8bf7
Author: xdustinface <xdustinfacex@gmail.com>
Date:   Tue Feb 10 15:26:44 2026 +0100

    feat: implement `dashd` sync integration tests for SPV

Author: xdustinface

.github/workflows/build-and-test.yml

@@ -13,6 +13,11 @@ on:
 permissions:
   contents: read
 
+env:
+  DASHVERSION: "23.0.2"
+  TEST_DATA_REPO: "dashpay/regtest-blockchain"
+  TEST_DATA_VERSION: "v0.0.2"
+
 jobs:
   test:
     name: ${{ matrix.group }}
@@ -28,5 +33,32 @@ jobs:
         with:
           shared-key: "test-${{ inputs.os }}-${{ matrix.group }}"
       - run: pip install pyyaml
+
+      # Set up dashd and test data for groups that need it
+      - name: Cache dashd and test data
+        if: matrix.group == 'spv' || matrix.group == 'ffi'
+        uses: actions/cache@v4
+        with:
+          path: .rust-dashcore-test
+          key: rust-dashcore-test-${{ inputs.os }}-${{ env.DASHVERSION }}-${{ env.TEST_DATA_VERSION }}
+
+      - name: Setup dashd for integration tests
+        if: matrix.group == 'spv' || matrix.group == 'ffi'
+        env:
+          CACHE_DIR: ${{ github.workspace }}/.rust-dashcore-test
+        shell: bash
+        run: python contrib/setup-dashd.py >> "$GITHUB_ENV"
+
       - name: Run tests
+        env:
+          DASHD_TEST_RETAIN_DIR: ${{ matrix.group == 'spv' && '/tmp/dashd-test-logs' || '' }}
         run: python .github/scripts/ci_config.py run-group ${{ matrix.group }} --os ${{ inputs.os }}
+
+      - name: Upload failed SPV test logs
+        if: failure() && matrix.group == 'spv'
+        uses: actions/upload-artifact@v4
+        with:
+          name: spv-test-logs-${{ inputs.os }}
+          path: /tmp/dashd-test-logs/
+          retention-days: 7
+          if-no-files-found: ignore

contrib/setup-dashd.py

@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+"""Cross-platform setup script for dashd and test blockchain data.
+
+Downloads the Dash Core binary and regtest test data for integration tests.
+Outputs DASHD_PATH and DASHD_DATADIR lines suitable for appending to GITHUB_ENV
+or evaluating in a shell.
+
+Environment variables:
+    DASHVERSION        - Dash Core version (default: 23.0.2)
+    TEST_DATA_VERSION  - Test data release version (default: v0.0.2)
+    TEST_DATA_REPO     - GitHub repo for test data (default: dashpay/regtest-blockchain)
+    CACHE_DIR          - Cache directory (default: ~/.rust-dashcore-test)
+"""
+
+import os
+import platform
+import sys
+import tarfile
+import urllib.request
+import zipfile
+
+DASHVERSION = os.environ.get("DASHVERSION", "23.0.2")
+TEST_DATA_VERSION = os.environ.get("TEST_DATA_VERSION", "v0.0.2")
+TEST_DATA_REPO = os.environ.get("TEST_DATA_REPO", "dashpay/regtest-blockchain")
+
+
+def get_cache_dir():
+    if "CACHE_DIR" in os.environ:
+        return os.environ["CACHE_DIR"]
+    home = os.environ.get("HOME") or os.environ.get("USERPROFILE")
+    if not home:
+        sys.exit("Cannot determine home directory: neither HOME nor USERPROFILE is set")
+    return os.path.join(home, ".rust-dashcore-test")
+
+
+def get_asset_info():
+    """Return (asset_filename, binary_relative_path) for the current platform."""
+    system = platform.system()
+    machine = platform.machine()
+
+    if system == "Linux":
+        arch = "aarch64" if machine in ("aarch64", "arm64") else "x86_64"
+        asset = f"dashcore-{DASHVERSION}-{arch}-linux-gnu.tar.gz"
+    elif system == "Darwin":
+        arch = "arm64" if machine == "arm64" else "x86_64"
+        asset = f"dashcore-{DASHVERSION}-{arch}-apple-darwin.tar.gz"
+    elif system == "Windows":
+        asset = f"dashcore-{DASHVERSION}-win64.zip"
+    else:
+        sys.exit(f"Unsupported platform: {system}")
+
+    return asset
+
+
+def log(msg):
+    print(msg, file=sys.stderr)
+
+
+def download(url, dest):
+    log(f"Downloading {url} ...")
+    urllib.request.urlretrieve(url, dest)
+
+
+def extract(archive_path, dest_dir):
+    if archive_path.endswith(".zip"):
+        with zipfile.ZipFile(archive_path, "r") as zf:
+            zf.extractall(dest_dir)
+    else:
+        with tarfile.open(archive_path, "r:gz") as tf:
+            tf.extractall(dest_dir)
+
+
+def setup_dashd(cache_dir):
+    """Download and extract dashd binary. Returns the path to the dashd binary."""
+    asset = get_asset_info()
+    dashd_dir = os.path.join(cache_dir, f"dashcore-{DASHVERSION}")
+
+    ext = ".exe" if platform.system() == "Windows" else ""
+    dashd_bin = os.path.join(dashd_dir, "bin", f"dashd{ext}")
+
+    if os.path.isfile(dashd_bin):
+        log(f"dashd {DASHVERSION} already available")
+        return dashd_bin
+
+    log(f"Downloading dashd {DASHVERSION}...")
+    archive_path = os.path.join(cache_dir, asset)
+    url = f"https://github.com/dashpay/dash/releases/download/v{DASHVERSION}/{asset}"
+    download(url, archive_path)
+    extract(archive_path, cache_dir)
+    os.remove(archive_path)
+    log(f"Downloaded dashd to {dashd_dir}")
+
+    if not os.path.isfile(dashd_bin):
+        sys.exit(f"Expected binary not found after extraction: {dashd_bin}")
+
+    return dashd_bin
+
+
+def setup_test_data(cache_dir):
+    """Download and extract test blockchain data. Returns the datadir path."""
+    test_data_dir = os.path.join(
+        cache_dir, f"regtest-blockchain-{TEST_DATA_VERSION}", "regtest-40000"
+    )
+    blocks_dir = os.path.join(test_data_dir, "regtest", "blocks")
+
+    if os.path.isdir(blocks_dir):
+        log(f"Test blockchain data {TEST_DATA_VERSION} already available")
+        return test_data_dir
+
+    log(f"Downloading test blockchain data {TEST_DATA_VERSION}...")
+    parent_dir = os.path.join(cache_dir, f"regtest-blockchain-{TEST_DATA_VERSION}")
+    os.makedirs(parent_dir, exist_ok=True)
+
+    archive_path = os.path.join(cache_dir, "regtest-40000.tar.gz")
+    url = f"https://github.com/{TEST_DATA_REPO}/releases/download/{TEST_DATA_VERSION}/regtest-40000.tar.gz"
+    download(url, archive_path)
+    extract(archive_path, parent_dir)
+    os.remove(archive_path)
+    log(f"Downloaded test data to {test_data_dir}")
+
+    return test_data_dir
+
+
+def main():
+    cache_dir = get_cache_dir()
+    os.makedirs(cache_dir, exist_ok=True)
+
+    dashd_path = setup_dashd(cache_dir)
+    datadir = setup_test_data(cache_dir)
+
+    # Output lines for GITHUB_ENV or shell eval
+    print(f"DASHD_PATH={dashd_path}")
+    print(f"DASHD_DATADIR={datadir}")
+
+
+if __name__ == "__main__":
+    main()

dash-spv-ffi/Cargo.toml

@@ -32,11 +32,17 @@ key-wallet = { path = "../key-wallet" }
 key-wallet-manager = { path = "../key-wallet-manager" }
 rand = "0.8"
 clap = { version = "4.5", features = ["derive"] }
+tempfile = { version = "3.8", optional = true }
+
+[features]
+test-utils = ["dep:tempfile"]
 
 [dev-dependencies]
-tempfile = "3.8"
+dash-spv = { path = "../dash-spv", features = ["test-utils"] }
+dash-spv-ffi = { path = ".", features = ["test-utils"] }
 serial_test = "3.0"
 env_logger = "0.10"
+hex = "0.4"
 
 [build-dependencies]
 cbindgen = "0.29"

dash-spv-ffi/src/lib.rs

@@ -16,6 +16,9 @@ pub use platform_integration::*;
 pub use types::*;
 pub use utils::*;
 
+#[cfg(any(test, feature = "test-utils"))]
+pub mod test_utils;
+
 // FFINetwork is now defined in types.rs for cbindgen compatibility
 // It must match the definition in key_wallet_ffi