diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index d32c55cd5..7e397f635 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -1,26 +1,26 @@
-name: Security Audit
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  audit:
-    permissions:
-      issues: write
-      checks: write
-    strategy:
-      matrix:
-        platform: [
-          ubuntu-latest,
-          macos-latest,
-          windows-latest,
-          ]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-      - name: Run security audit
-        uses: rustsec/audit-check@v1.4.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+#name: Security Audit
+#on:
+#  workflow_dispatch:
+#  schedule:
+#    - cron: '0 0 * * *'
+#
+#jobs:
+#  audit:
+#    permissions:
+#      issues: write
+#      checks: write
+#    strategy:
+#      matrix:
+#        platform: [
+#          ubuntu-latest,
+#          macos-latest,
+#          windows-latest,
+#          ]
+#    runs-on: ${{ matrix.platform }}
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v3
+#      - name: Run security audit
+#        uses: rustsec/audit-check@v1.4.1
+#        with:
+#          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/cln-integration.yml b/.github/workflows/cln-integration.yml
index 2c427cbde..e947f2ebd 100644
--- a/.github/workflows/cln-integration.yml
+++ b/.github/workflows/cln-integration.yml
@@ -1,26 +1,26 @@
-name: CI Checks - CLN Integration Tests
-
-on: [push, pull_request]
-
-jobs:
-  check-cln:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y socat
-
-      - name: Start bitcoind, electrs, and lightningd
-        run: docker compose -f docker-compose-cln.yml up -d
-
-      - name: Forward lightningd RPC socket
-        run: |
-          docker exec ldk-node-cln-1 sh -c "socat -d -d TCP-LISTEN:9937,fork,reuseaddr UNIX-CONNECT:/root/.lightning/regtest/lightning-rpc&"
-          socat -d -d UNIX-LISTEN:/tmp/lightning-rpc,reuseaddr,fork TCP:127.0.0.1:9937&
-
-      - name: Run CLN integration tests
-        run: RUSTFLAGS="--cfg cln_test" cargo test --test integration_tests_cln
+#name: CI Checks - CLN Integration Tests
+#
+#on: [push, pull_request]
+#
+#jobs:
+#  check-cln:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@v4
+#
+#      - name: Install dependencies
+#        run: |
+#          sudo apt-get update -y
+#          sudo apt-get install -y socat
+#
+#      - name: Start bitcoind, electrs, and lightningd
+#        run: docker compose -f docker-compose-cln.yml up -d
+#
+#      - name: Forward lightningd RPC socket
+#        run: |
+#          docker exec ldk-node-cln-1 sh -c "socat -d -d TCP-LISTEN:9937,fork,reuseaddr UNIX-CONNECT:/root/.lightning/regtest/lightning-rpc&"
+#          socat -d -d UNIX-LISTEN:/tmp/lightning-rpc,reuseaddr,fork TCP:127.0.0.1:9937&
+#
+#      - name: Run CLN integration tests
+#        run: RUSTFLAGS="--cfg cln_test" cargo test --test integration_tests_cln
diff --git a/.github/workflows/kotlin.yml b/.github/workflows/kotlin.yml
index a1711ba49..80bbb12c6 100644
--- a/.github/workflows/kotlin.yml
+++ b/.github/workflows/kotlin.yml
@@ -1,56 +1,62 @@
-name: CI Checks - Kotlin Tests
-
-on: [push, pull_request]
-
-jobs:
-  check-kotlin:
-    runs-on: ubuntu-latest
-
-    env:
-      LDK_NODE_JVM_DIR: bindings/kotlin/ldk-node-jvm
-      LDK_NODE_ANDROID_DIR: bindings/kotlin/ldk-node-android
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 11
-
-      - name: Set default Rust version to stable
-        run: rustup default stable
-
-      - name: Show default version of NDK
-        run: echo $ANDROID_NDK_ROOT
-
-      - name: Run ktlintCheck on ldk-node-jvm
-        run: |
-          cd $LDK_NODE_JVM_DIR
-          ./gradlew ktlintCheck
-
-      - name: Run ktlintCheck on ldk-node-android
-        run: |
-          cd $LDK_NODE_ANDROID_DIR
-          ./gradlew ktlintCheck
-
-      - name: Generate Kotlin JVM
-        run: ./scripts/uniffi_bindgen_generate_kotlin.sh
-
-      - name: Generate Kotlin Android
-        run: ./scripts/uniffi_bindgen_generate_kotlin_android.sh
-
-      - name: Start bitcoind and electrs
-        run: docker compose up -d
-
-      - name: Run ldk-node-jvm tests
-        run: |
-          cd $LDK_NODE_JVM_DIR
-          ./gradlew test -Penv=ci
-
-      - name: Run ldk-node-android tests
-        run: |
-          cd $LDK_NODE_ANDROID_DIR
-          ./gradlew test
+#name: CI Checks - Kotlin Tests
+#
+#on: [push, pull_request]
+#
+#jobs:
+#  check-kotlin:
+#    runs-on: ubuntu-latest
+#
+#    env:
+#      LDK_NODE_JVM_DIR: bindings/kotlin/ldk-node-jvm
+#      LDK_NODE_ANDROID_DIR: bindings/kotlin/ldk-node-android
+#
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@v4
+#
+#      - name: Set up JDK
+#        uses: actions/setup-java@v3
+#        with:
+#          distribution: temurin
+#          java-version: 11
+#
+#      - name: Set default Rust version to stable
+#        run: rustup default stable
+#
+#      - name: Show default version of NDK
+#        run: echo $ANDROID_NDK_ROOT
+#
+#      - name: Run ktlintCheck on ldk-node-jvm
+#        run: |
+#          cd $LDK_NODE_JVM_DIR
+#          ./gradlew ktlintCheck
+#
+#      - name: Run ktlintCheck on ldk-node-android
+#        run: |
+#          cd $LDK_NODE_ANDROID_DIR
+#          ./gradlew ktlintCheck
+#
+#      - name: Generate Kotlin JVM
+#        run: ./scripts/uniffi_bindgen_generate_kotlin.sh
+#
+#      - name: Generate Kotlin Android
+#        run: ./scripts/uniffi_bindgen_generate_kotlin_android.sh
+#
+#      - name: Start bitcoind and electrs
+#        run: docker compose up -d
+#
+#      - name: Wait for services to be fully initialized
+#        run: |
+#          echo "Waiting for services to be ready..."
+#          timeout 90 bash -c 'until docker compose ps | grep -q "bitcoin.*healthy" && docker compose ps | grep -q "electrs.*healthy"; do sleep 5; done'
+#          echo "All services are healthy"
+#
+#      - name: Run ldk-node-jvm tests
+#        run: |
+#          cd $LDK_NODE_JVM_DIR
+#          ./gradlew test -Penv=ci
+#
+#      - name: Run ldk-node-android tests
+#        run: |
+#          cd $LDK_NODE_ANDROID_DIR
+#          ./gradlew test
diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
index b6b24ac90..53a6e0878 100644
--- a/.github/workflows/publish-android.yml
+++ b/.github/workflows/publish-android.yml
@@ -1,43 +1,43 @@
-name: Publish ldk-node-android to Maven Central
-on: [workflow_dispatch]
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: "Check out PR branch"
-        uses: actions/checkout@v2
-
-      - name: "Cache"
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
-
-      - name: "Set up JDK"
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-
-      - name: "Install Rust Android targets"
-        run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
-
-      - name: "Build ldk-node-android library"
-        run: |
-          export PATH=$PATH:$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin
-          ./scripts/uniffi_bindgen_generate_kotlin_android.sh
-
-      - name: "Publish to Maven Local and Maven Central"
-        env:
-          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_PASSWORD }}
-        run: |
-          cd bindings/kotlin/ldk-node-android
-          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+#name: Publish ldk-node-android to Maven Central
+#on: [workflow_dispatch]
+#
+#jobs:
+#  build:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - name: "Check out PR branch"
+#        uses: actions/checkout@v2
+#
+#      - name: "Cache"
+#        uses: actions/cache@v2
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#            ./target
+#          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
+#
+#      - name: "Set up JDK"
+#        uses: actions/setup-java@v2
+#        with:
+#          distribution: temurin
+#          java-version: 11
+#
+#      - name: "Install Rust Android targets"
+#        run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
+#
+#      - name: "Build ldk-node-android library"
+#        run: |
+#          export PATH=$PATH:$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin
+#          ./scripts/uniffi_bindgen_generate_kotlin_android.sh
+#
+#      - name: "Publish to Maven Local and Maven Central"
+#        env:
+#          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
+#          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}
+#          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
+#          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_USERNAME }}
+#          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_PASSWORD }}
+#        run: |
+#          cd bindings/kotlin/ldk-node-android
+#          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
diff --git a/.github/workflows/publish-jvm.yml b/.github/workflows/publish-jvm.yml
index 0ae40e0a1..3180f473b 100644
--- a/.github/workflows/publish-jvm.yml
+++ b/.github/workflows/publish-jvm.yml
@@ -1,86 +1,86 @@
-name: Publish ldk-node-jvm to Maven Central
-on: [workflow_dispatch]
-
-jobs:
-  build-jvm-macOS-M1-native-lib:
-    name: "Create M1 and x86_64 JVM native binaries"
-    runs-on: macos-12
-    steps:
-      - name: "Checkout publishing branch"
-        uses: actions/checkout@v2
-
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-
-      - name: Install aarch64 Rust target
-        run: rustup target add aarch64-apple-darwin
-
-      - name: Build ldk-node-jvm library
-        run: |
-          ./scripts/uniffi_bindgen_generate_kotlin.sh
-
-      # build aarch64 + x86_64 native libraries and upload
-      - name: Upload macOS native libraries for reuse in publishing job
-        uses: actions/upload-artifact@v3
-        with:
-          # name: no name is required because we upload the entire directory
-          # the default name "artifact" will be used
-          path: /Users/runner/work/ldk-node/ldk-node/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/
-
-  build-jvm-full-library:
-    name: "Create full ldk-node-jvm library"
-    needs: [build-jvm-macOS-M1-native-lib]
-    runs-on: ubuntu-20.04
-    steps:
-      - name: "Check out PR branch"
-        uses: actions/checkout@v2
-
-      - name: "Cache"
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
-
-      - name: "Set up JDK"
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-
-      - name: "Build ldk-node-jvm library"
-        run: |
-          ./scripts/uniffi_bindgen_generate_kotlin.sh
-
-      - name: Download macOS native libraries from previous job
-        uses: actions/download-artifact@v4.1.7
-        id: download
-        with:
-          # download the artifact created in the prior job (named "artifact")
-          name: artifact
-          path: ./bindings/kotlin/ldk-node-jvm/lib/src/main/resources/
-
-      - name: "Publish to Maven Local and Maven Central"
-        env:
-          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_PASSWORD }}
-        run: |
-          cd bindings/kotlin/ldk-node-jvm
-          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+#name: Publish ldk-node-jvm to Maven Central
+#on: [workflow_dispatch]
+#
+#jobs:
+#  build-jvm-macOS-M1-native-lib:
+#    name: "Create M1 and x86_64 JVM native binaries"
+#    runs-on: macos-12
+#    steps:
+#      - name: "Checkout publishing branch"
+#        uses: actions/checkout@v2
+#
+#      - name: Cache
+#        uses: actions/cache@v3
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#            ./target
+#          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
+#
+#      - name: Set up JDK
+#        uses: actions/setup-java@v2
+#        with:
+#          distribution: temurin
+#          java-version: 11
+#
+#      - name: Install aarch64 Rust target
+#        run: rustup target add aarch64-apple-darwin
+#
+#      - name: Build ldk-node-jvm library
+#        run: |
+#          ./scripts/uniffi_bindgen_generate_kotlin.sh
+#
+#      # build aarch64 + x86_64 native libraries and upload
+#      - name: Upload macOS native libraries for reuse in publishing job
+#        uses: actions/upload-artifact@v3
+#        with:
+#          # name: no name is required because we upload the entire directory
+#          # the default name "artifact" will be used
+#          path: /Users/runner/work/ldk-node/ldk-node/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/
+#
+#  build-jvm-full-library:
+#    name: "Create full ldk-node-jvm library"
+#    needs: [build-jvm-macOS-M1-native-lib]
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - name: "Check out PR branch"
+#        uses: actions/checkout@v2
+#
+#      - name: "Cache"
+#        uses: actions/cache@v2
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#            ./target
+#          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
+#
+#      - name: "Set up JDK"
+#        uses: actions/setup-java@v2
+#        with:
+#          distribution: temurin
+#          java-version: 11
+#
+#      - name: "Build ldk-node-jvm library"
+#        run: |
+#          ./scripts/uniffi_bindgen_generate_kotlin.sh
+#
+#      - name: Download macOS native libraries from previous job
+#        uses: actions/download-artifact@v4.1.7
+#        id: download
+#        with:
+#          # download the artifact created in the prior job (named "artifact")
+#          name: artifact
+#          path: ./bindings/kotlin/ldk-node-jvm/lib/src/main/resources/
+#
+#      - name: "Publish to Maven Local and Maven Central"
+#        env:
+#          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
+#          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}
+#          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
+#          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_USERNAME }}
+#          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_PASSWORD }}
+#        run: |
+#          cd bindings/kotlin/ldk-node-jvm
+#          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 21c0139a2..7efa29969 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -24,6 +24,21 @@ jobs:
       - name: Start bitcoind and electrs
         run: docker compose up -d
 
+      - name: Wait for services to be fully initialized
+        run: |
+          echo "Waiting for Bitcoin to be ready..."
+          timeout 60 bash -c 'until docker exec ldk-node-bitcoin-1 bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass getblockchaininfo > /dev/null 2>&1; do echo "Waiting for Bitcoin..."; sleep 3; done'
+          echo "Bitcoin is ready"
+
+          echo "Waiting for Esplora to be ready..."
+          # Try to get Esplora's status with retries and a timeout
+          timeout 90 bash -c 'until curl -s http://127.0.0.1:3002/blocks/tip/hash > /dev/null 2>&1; do echo "Waiting for Esplora..."; sleep 3; done'
+          echo "Esplora is ready"
+
+          # This is critical - give Esplora extra time to fully index after it starts accepting connections
+          echo "Giving Esplora extra time to finish indexing..."
+          sleep 10
+
       - name: Install testing prerequisites
         run: |
           pip3 install requests
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 1c4e6ed15..440e123f2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,98 +1,98 @@
-name: CI Checks - Rust Tests
-
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        platform: [
-          ubuntu-latest,
-          macos-latest,
-          windows-latest,
-          ]
-        toolchain: [
-          stable,
-          beta,
-          1.75.0, # Our MSRV
-          ]
-        include:
-          - toolchain: stable
-            check-fmt: true
-            build-uniffi: true
-            platform: ubuntu-latest
-          - toolchain: stable
-            platform: macos-latest
-          - toolchain: stable
-            platform: windows-latest
-          - toolchain: 1.75.0
-            msrv: true
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-      - name: Install Rust ${{ matrix.toolchain }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ matrix.toolchain }}
-          rustup override set ${{ matrix.toolchain }}
-      - name: Check formatting on Rust ${{ matrix.toolchain }}
-        if: matrix.check-fmt
-        run: rustup component add rustfmt && cargo fmt --all -- --check
-      - name: Pin packages to allow for MSRV
-        if: matrix.msrv
-        run: |
-          cargo update -p home --precise "0.5.9" --verbose # home v0.5.11 requires rustc 1.81 or newer
-          cargo update -p idna_adapter --precise "1.1.0" --verbose # idna_adapter 1.2 switched to ICU4X, requiring 1.81 and newer
-      - name: Set RUSTFLAGS to deny warnings
-        if: "matrix.toolchain == 'stable'"
-        run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"
-      - name: Enable caching for bitcoind
-        id: cache-bitcoind
-        uses: actions/cache@v4
-        with:
-          path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
-          key: bitcoind-${{ runner.os }}-${{ runner.arch }}
-      - name: Enable caching for electrs
-        id: cache-electrs
-        uses: actions/cache@v4
-        with:
-          path: bin/electrs-${{ runner.os }}-${{ runner.arch }}
-          key: electrs-${{ runner.os }}-${{ runner.arch }}
-      - name: Download bitcoind/electrs
-        if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
-        run: |
-          source ./scripts/download_bitcoind_electrs.sh
-          mkdir bin
-          mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
-          mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
-      - name: Set bitcoind/electrs environment variables
-        run: |
-          echo "BITCOIND_EXE=$( pwd )/bin/bitcoind-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
-          echo "ELECTRS_EXE=$( pwd )/bin/electrs-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
-      - name: Build on Rust ${{ matrix.toolchain }}
-        run: cargo build --verbose --color always
-      - name: Build with UniFFI support on Rust ${{ matrix.toolchain }}
-        if: matrix.build-uniffi
-        run: cargo build --features uniffi --verbose --color always
-      - name: Build documentation on Rust ${{ matrix.toolchain }}
-        if: "matrix.platform != 'windows-latest' || matrix.toolchain != '1.75.0'"
-        run: |
-          cargo doc --release --verbose --color always
-          cargo doc --document-private-items --verbose --color always
-      - name: Check release build on Rust ${{ matrix.toolchain }}
-        run: cargo check --release --verbose --color always
-      - name: Check release build with UniFFI support on Rust ${{ matrix.toolchain }}
-        if: matrix.build-uniffi
-        run: cargo check --release --features uniffi --verbose --color always
-      - name: Test on Rust ${{ matrix.toolchain }}
-        if: "matrix.platform != 'windows-latest'"
-        run: |
-          RUSTFLAGS="--cfg no_download" cargo test
-      - name: Test with UniFFI support on Rust ${{ matrix.toolchain }}
-        if: "matrix.platform != 'windows-latest' && matrix.build-uniffi"
-        run: |
-          RUSTFLAGS="--cfg no_download" cargo test --features uniffi
+#name: CI Checks - Rust Tests
+#
+#on: [push, pull_request]
+#
+#concurrency:
+#  group: ${{ github.workflow }}-${{ github.ref }}
+#  cancel-in-progress: true
+#
+#jobs:
+#  build:
+#    strategy:
+#      matrix:
+#        platform: [
+#          ubuntu-latest,
+#          macos-latest,
+#          windows-latest,
+#          ]
+#        toolchain: [
+#          stable,
+#          beta,
+#          1.75.0, # Our MSRV
+#          ]
+#        include:
+#          - toolchain: stable
+#            check-fmt: true
+#            build-uniffi: true
+#            platform: ubuntu-latest
+#          - toolchain: stable
+#            platform: macos-latest
+#          - toolchain: stable
+#            platform: windows-latest
+#          - toolchain: 1.75.0
+#            msrv: true
+#    runs-on: ${{ matrix.platform }}
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v3
+#      - name: Install Rust ${{ matrix.toolchain }} toolchain
+#        run: |
+#          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ matrix.toolchain }}
+#          rustup override set ${{ matrix.toolchain }}
+#      - name: Check formatting on Rust ${{ matrix.toolchain }}
+#        if: matrix.check-fmt
+#        run: rustup component add rustfmt && cargo fmt --all -- --check
+#      - name: Pin packages to allow for MSRV
+#        if: matrix.msrv
+#        run: |
+#          cargo update -p home --precise "0.5.9" --verbose # home v0.5.11 requires rustc 1.81 or newer
+#          cargo update -p idna_adapter --precise "1.1.0" --verbose # idna_adapter 1.2 switched to ICU4X, requiring 1.81 and newer
+#      - name: Set RUSTFLAGS to deny warnings
+#        if: "matrix.toolchain == 'stable'"
+#        run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"
+#      - name: Enable caching for bitcoind
+#        id: cache-bitcoind
+#        uses: actions/cache@v4
+#        with:
+#          path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
+#          key: bitcoind-${{ runner.os }}-${{ runner.arch }}
+#      - name: Enable caching for electrs
+#        id: cache-electrs
+#        uses: actions/cache@v4
+#        with:
+#          path: bin/electrs-${{ runner.os }}-${{ runner.arch }}
+#          key: electrs-${{ runner.os }}-${{ runner.arch }}
+#      - name: Download bitcoind/electrs
+#        if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
+#        run: |
+#          source ./scripts/download_bitcoind_electrs.sh
+#          mkdir bin
+#          mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
+#          mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
+#      - name: Set bitcoind/electrs environment variables
+#        run: |
+#          echo "BITCOIND_EXE=$( pwd )/bin/bitcoind-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
+#          echo "ELECTRS_EXE=$( pwd )/bin/electrs-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
+#      - name: Build on Rust ${{ matrix.toolchain }}
+#        run: cargo build --verbose --color always
+#      - name: Build with UniFFI support on Rust ${{ matrix.toolchain }}
+#        if: matrix.build-uniffi
+#        run: cargo build --features uniffi --verbose --color always
+#      - name: Build documentation on Rust ${{ matrix.toolchain }}
+#        if: "matrix.platform != 'windows-latest' || matrix.toolchain != '1.75.0'"
+#        run: |
+#          cargo doc --release --verbose --color always
+#          cargo doc --document-private-items --verbose --color always
+#      - name: Check release build on Rust ${{ matrix.toolchain }}
+#        run: cargo check --release --verbose --color always
+#      - name: Check release build with UniFFI support on Rust ${{ matrix.toolchain }}
+#        if: matrix.build-uniffi
+#        run: cargo check --release --features uniffi --verbose --color always
+#      - name: Test on Rust ${{ matrix.toolchain }}
+#        if: "matrix.platform != 'windows-latest'"
+#        run: |
+#          RUSTFLAGS="--cfg no_download" cargo test
+#      - name: Test with UniFFI support on Rust ${{ matrix.toolchain }}
+#        if: "matrix.platform != 'windows-latest' && matrix.build-uniffi"
+#        run: |
+#          RUSTFLAGS="--cfg no_download" cargo test --features uniffi
diff --git a/.github/workflows/semver.yml b/.github/workflows/semver.yml
index 8472cbd2a..ec7c4675b 100644
--- a/.github/workflows/semver.yml
+++ b/.github/workflows/semver.yml
@@ -1,15 +1,15 @@
-name: SemVer checks
-on: [push, pull_request]
-
-jobs:
-  semver-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-      - name: Install Rust stable toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain stable
-          rustup override set stable
-      - name: Check SemVer
-        uses: obi1kenobi/cargo-semver-checks-action@v2
+#name: SemVer checks
+#on: [push, pull_request]
+#
+#jobs:
+#  semver-checks:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v4
+#      - name: Install Rust stable toolchain
+#        run: |
+#          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain stable
+#          rustup override set stable
+#      - name: Check SemVer
+#        uses: obi1kenobi/cargo-semver-checks-action@v2
diff --git a/.github/workflows/vss-integration.yml b/.github/workflows/vss-integration.yml
index 2a6c63704..3b23e18f1 100644
--- a/.github/workflows/vss-integration.yml
+++ b/.github/workflows/vss-integration.yml
@@ -1,82 +1,82 @@
-name: CI Checks - VSS Integration Tests
-
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres:latest
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_DB: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: YOU_MUST_CHANGE_THIS_PASSWORD
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          path: ldk-node
-      - name: Checkout VSS
-        uses: actions/checkout@v3
-        with:
-          repository: lightningdevkit/vss-server
-          path: vss-server
-
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-
-      - name: Start Tomcat
-        run: |
-          docker run -d --network=host --name tomcat tomcat:latest
-
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: release-candidate
-
-      - name: Create database table
-        run: |
-          psql -h localhost -U postgres -d postgres -f ./vss-server/java/app/src/main/java/org/vss/impl/postgres/sql/v0_create_vss_db.sql
-        env:
-          PGPASSWORD: YOU_MUST_CHANGE_THIS_PASSWORD
-
-      - name: Build and Deploy VSS
-        run: |
-          # Print Info
-          java -version
-          gradle --version
-
-          cd vss-server/java
-          gradle wrapper --gradle-version 8.1.1
-          ./gradlew --version
-          ./gradlew build
-
-          docker cp app/build/libs/vss-1.0.war tomcat:/usr/local/tomcat/webapps/vss.war
-          cd ../
-      - name: Run VSS Integration tests against vss-instance.
-        run: |
-          cd ldk-node
-          export TEST_VSS_BASE_URL="http://localhost:8080/vss"
-          RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
-          RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss
-
-      - name: Cleanup
-        run: |
-          docker stop tomcat && docker rm tomcat
+#name: CI Checks - VSS Integration Tests
+#
+#on: [push, pull_request]
+#
+#concurrency:
+#  group: ${{ github.workflow }}-${{ github.ref }}
+#  cancel-in-progress: true
+#
+#jobs:
+#  build-and-test:
+#    runs-on: ubuntu-latest
+#
+#    services:
+#      postgres:
+#        image: postgres:latest
+#        ports:
+#          - 5432:5432
+#        env:
+#          POSTGRES_DB: postgres
+#          POSTGRES_USER: postgres
+#          POSTGRES_PASSWORD: YOU_MUST_CHANGE_THIS_PASSWORD
+#        options: >-
+#          --health-cmd pg_isready
+#          --health-interval 10s
+#          --health-timeout 5s
+#          --health-retries 5
+#
+#    steps:
+#      - name: Checkout code
+#        uses: actions/checkout@v3
+#        with:
+#          path: ldk-node
+#      - name: Checkout VSS
+#        uses: actions/checkout@v3
+#        with:
+#          repository: lightningdevkit/vss-server
+#          path: vss-server
+#
+#      - name: Set up Java
+#        uses: actions/setup-java@v3
+#        with:
+#          distribution: 'corretto'
+#          java-version: '17'
+#
+#      - name: Start Tomcat
+#        run: |
+#          docker run -d --network=host --name tomcat tomcat:latest
+#
+#      - name: Setup Gradle
+#        uses: gradle/gradle-build-action@v2
+#        with:
+#          gradle-version: release-candidate
+#
+#      - name: Create database table
+#        run: |
+#          psql -h localhost -U postgres -d postgres -f ./vss-server/java/app/src/main/java/org/vss/impl/postgres/sql/v0_create_vss_db.sql
+#        env:
+#          PGPASSWORD: YOU_MUST_CHANGE_THIS_PASSWORD
+#
+#      - name: Build and Deploy VSS
+#        run: |
+#          # Print Info
+#          java -version
+#          gradle --version
+#
+#          cd vss-server/java
+#          gradle wrapper --gradle-version 8.1.1
+#          ./gradlew --version
+#          ./gradlew build
+#
+#          docker cp app/build/libs/vss-1.0.war tomcat:/usr/local/tomcat/webapps/vss.war
+#          cd ../
+#      - name: Run VSS Integration tests against vss-instance.
+#        run: |
+#          cd ldk-node
+#          export TEST_VSS_BASE_URL="http://localhost:8080/vss"
+#          RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
+#          RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss
+#
+#      - name: Cleanup
+#        run: |
+#          docker stop tomcat && docker rm tomcat
diff --git a/bindings/python/src/ldk_node/test_ldk_node.py b/bindings/python/src/ldk_node/test_ldk_node.py
index 4c5cdd828..a540be9ea 100644
--- a/bindings/python/src/ldk_node/test_ldk_node.py
+++ b/bindings/python/src/ldk_node/test_ldk_node.py
@@ -51,14 +51,25 @@ def mine_and_wait(esplora_endpoint, blocks):
 def wait_for_block(esplora_endpoint, block_hash):
     url = esplora_endpoint + "/block/" + block_hash + "/status"
     esplora_picked_up_block = False
-    while not esplora_picked_up_block:
-        res = requests.get(url)
+    max_retries = 30
+    retry_count = 0
+
+    while not esplora_picked_up_block and retry_count < max_retries:
         try:
-            json = res.json()
-            esplora_picked_up_block = json['in_best_chain']
-        except:
-            pass
-        time.sleep(1)
+            res = requests.get(url, timeout=10)
+            try:
+                json = res.json()
+                esplora_picked_up_block = json['in_best_chain']
+            except:
+                pass
+        except Exception as e:
+            print(f"Request error: {e}, retrying ({retry_count+1}/{max_retries})...")
+
+        retry_count += 1
+        time.sleep(0.5)
+
+    if not esplora_picked_up_block:
+        raise TimeoutError(f"Block {block_hash} not found after {max_retries} attempts")
 
 def wait_for_tx(esplora_endpoint, txid):
     url = esplora_endpoint + "/tx/" + txid
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c3233bff..f1a2bd4c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,6 +47,11 @@ services:
       - "3002:3002"
     networks:
       - bitcoin-electrs
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:3002/blocks/tip/hash" ]
+      interval: 5s
+      timeout: 10s
+      retries: 5
 
 networks:
   bitcoin-electrs: