Defer ChainMonitor updates and persistence to flush()

.github/workflows/build.yml

@@ -13,326 +13,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  ext-test:
-    runs-on: self-hosted
-    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
-      - name: Run externalized tests
-        run: |
-          cd ext-functional-test-demo
-          cargo test --verbose --color always
-          cargo test --verbose --color always --features test-broken
   build:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ self-hosted, windows-latest, macos-latest ]
-        toolchain: [ stable, beta, 1.75.0 ] # 1.75.0 is the MSRV for all crates
-        exclude:
-          - platform: windows-latest
-            toolchain: 1.75.0
-          - platform: windows-latest
-            toolchain: beta
-          - platform: macos-latest
-            toolchain: beta
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-      - 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 }}
-      - name: Use rust-lld linker on Windows
-        if: matrix.platform == 'windows-latest'
-        shell: bash
-        run: echo "RUSTFLAGS=-C linker=rust-lld" >> "$GITHUB_ENV"
-      - name: Install no-std-check dependencies for ARM Embedded
-        if: "matrix.platform == 'self-hosted'"
-        run: |
-          rustup target add thumbv7m-none-eabi
-      - name: shellcheck the CI and `contrib` scripts
-        if: "matrix.platform == 'self-hosted'"
-        run: |
-          shellcheck ci/*.sh -aP ci
-          shellcheck contrib/*.sh -aP contrib
-      - name: Set RUSTFLAGS to deny warnings
-        if: "matrix.toolchain == '1.75.0'"
-        run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"
-      - name: Enable caching for bitcoind
-        if: matrix.platform != 'windows-latest'
-        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
-        if: matrix.platform != 'windows-latest'
-        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 ./contrib/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
-        if: matrix.platform != 'windows-latest'
-        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: Run CI script
-        shell: bash # Default on Winblows is powershell
-        run: CI_ENV=1 CI_MINIMIZE_DISK_USAGE=1 ./ci/ci-tests.sh
-
-  coverage:
-    needs: fuzz
-    strategy:
-      fail-fast: false
-    runs-on: self-hosted
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install Rust stable toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
-      - name: Run tests with coverage generation
-        run: |
-          cargo install cargo-llvm-cov
-          export RUSTFLAGS="-Coverflow-checks=off"
-          cargo llvm-cov --features rest-client,rpc-client,tokio,serde --codecov --hide-instantiations --output-path=target/codecov.json
-          curl --verbose -O https://cli.codecov.io/latest/linux/codecov
-          chmod +x codecov
-          # Could you use this to fake the coverage report for your PR? Sure.
-          # Will anyone be impressed by your amazing coverage? No
-          # Maybe if codecov wasn't broken we wouldn't need to do this...
-          ./codecov --verbose upload-process --disable-search --fail-on-error -f target/codecov.json -t "f421b687-4dc2-4387-ac3d-dc3b2528af57" -F 'tests'
-          cargo clean
-      - name: Download honggfuzz corpus
-        uses: actions/download-artifact@v4
-        with:
-          name: hfuzz-corpus
-          path: fuzz/hfuzz_workspace
-      - name: Run fuzz coverage generation
-        run: |
-          ./contrib/generate_fuzz_coverage.sh --output-dir `pwd` --output-codecov-json
-          # Could you use this to fake the coverage report for your PR? Sure.
-          # Will anyone be impressed by your amazing coverage? No
-          # Maybe if codecov wasn't broken we wouldn't need to do this...
-          ./codecov --verbose upload-process --disable-search --fail-on-error -f fuzz-codecov.json -t "f421b687-4dc2-4387-ac3d-dc3b2528af57" -F 'fuzzing'
-
-  benchmark:
-    runs-on: ubuntu-latest
-    env:
-      TOOLCHAIN: stable
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      - name: Cache routing graph snapshot
-        id: cache-graph
-        uses: actions/cache@v4
-        with:
-          path: lightning/net_graph-2023-12-10.bin
-          key: ldk-net_graph-v0.0.118-2023-12-10.bin
-      - name: Fetch routing graph snapshot
-        if: steps.cache-graph.outputs.cache-hit != 'true'
-        run: |
-          curl --verbose -L -o lightning/net_graph-2023-12-10.bin https://bitcoin.ninja/ldk-net_graph-v0.0.118-2023-12-10.bin
-          echo "Sha sum: $(sha256sum lightning/net_graph-2023-12-10.bin | awk '{ print $1 }')"
-          if [ "$(sha256sum lightning/net_graph-2023-12-10.bin | awk '{ print $1 }')" != "${EXPECTED_ROUTING_GRAPH_SNAPSHOT_SHASUM}" ]; then
-            echo "Bad hash"
-            exit 1
-          fi
-        env:
-          EXPECTED_ROUTING_GRAPH_SNAPSHOT_SHASUM: e94b38ef4b3ce683893bf6a3ee28d60cb37c73b059403ff77b7e7458157968c2
-      - name: Cache scorer snapshot
-        id: cache-scorer
-        uses: actions/cache@v4
-        with:
-          path: lightning/scorer-2023-12-10.bin
-          key: ldk-scorer-v0.0.118-2023-12-10.bin
-      - name: Fetch scorer snapshot
-        if: steps.cache-scorer.outputs.cache-hit != 'true'
-        run: |
-          curl --verbose -L -o lightning/scorer-2023-12-10.bin https://bitcoin.ninja/ldk-scorer-v0.0.118-2023-12-10.bin
-          echo "Sha sum: $(sha256sum lightning/scorer-2023-12-10.bin | awk '{ print $1 }')"
-          if [ "$(sha256sum lightning/scorer-2023-12-10.bin | awk '{ print $1 }')" != "${EXPECTED_SCORER_SNAPSHOT_SHASUM}" ]; then
-            echo "Bad hash"
-            exit 1
-          fi
-        env:
-          EXPECTED_SCORER_SNAPSHOT_SHASUM: 570a26bb28870fe1da7e392cdec9fb794718826b04c43ca053d71a8a9bb9be69
-      - name: Fetch rapid graph sync reference input
-        run: |
-          curl --verbose -L -o lightning-rapid-gossip-sync/res/full_graph.lngossip https://bitcoin.ninja/ldk-compressed_graph-285cb27df79-2022-07-21.bin
-          echo "Sha sum: $(sha256sum lightning-rapid-gossip-sync/res/full_graph.lngossip | awk '{ print $1 }')"
-          if [ "$(sha256sum lightning-rapid-gossip-sync/res/full_graph.lngossip | awk '{ print $1 }')" != "${EXPECTED_RAPID_GOSSIP_SHASUM}" ]; then
-            echo "Bad hash"
-            exit 1
-          fi
-        env:
-          EXPECTED_RAPID_GOSSIP_SHASUM: e0f5d11641c11896d7af3a2246d3d6c3f1720b7d2d17aab321ecce82e6b7deb8
-      - name: Test with Network Graph on Rust ${{ matrix.toolchain }}
-        run: |
-          cd lightning
-          RUSTFLAGS="--cfg=require_route_graph_test" cargo test
-          cd ..
-      - name: Run benchmarks on Rust ${{ matrix.toolchain }}
-        run: |
-          cd bench
-          RUSTFLAGS="--cfg=ldk_bench --cfg=require_route_graph_test" cargo bench
-
-  check_release:
-    runs-on: ubuntu-latest
-    env:
-      TOOLCHAIN: stable
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      - name: Run cargo check for release build.
-        run: |
-          cargo check --release
-          cargo check --no-default-features --features=std --release
-          cargo doc --release
-      - name: Run cargo check for Taproot build.
-        run: |
-          cargo check --release
-          cargo check --no-default-features --release
-          cargo check --no-default-features --features=std --release
-          cargo doc --release
-          cargo doc --no-default-features --release
-        env:
-          RUSTFLAGS: '--cfg=taproot'
-          RUSTDOCFLAGS: '--cfg=taproot'
-
-  check_docs:
+        stream: [1, 2, 3, 4]
     runs-on: self-hosted
-    env:
-      # While docs.rs builds using a nightly compiler (and we use some nightly features),
-      # nightly ends up randomly breaking builds occasionally, so we instead use beta
-      # and set RUSTC_BOOTSTRAP in check-docsrs.sh
-      TOOLCHAIN: beta
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      - name: Simulate docs.rs build
-        run: ci/check-docsrs.sh
-
-  fuzz:
-    runs-on: self-hosted
-    env:
-      TOOLCHAIN: 1.75
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      # This is read-only for PRs. It seeds the fuzzer for a more effective run.
-      # NOTE: The `key` is unique and will always miss, forcing a fallback to
-      # the `restore-keys` to find the latest global cache from the `main` branch.
-      - name: Restore persistent fuzz corpus (PR)
-        if: ${{ github.ref != 'refs/heads/main' }}
-        uses: actions/cache/restore@v4
-        with:
-          path: fuzz/hfuzz_workspace
-          key: fuzz-corpus-${{ github.ref }}-${{ github.sha }}
-          restore-keys: |
-            fuzz-corpus-refs/heads/main-
-      # The `restore-keys` performs a prefix search to find the most recent
-      # cache from a previous `main` run. We then save with a new, unique
-      # `key` (using the SHA) to ensure the cache is always updated,
-      # as caches are immutable.
-      - name: Restore/Save persistent honggfuzz corpus (Main)
-        if: ${{ github.ref == 'refs/heads/main' }}
-        uses: actions/cache@v4
-        with:
-          path: fuzz/hfuzz_workspace
-          key: fuzz-corpus-refs/heads/main-${{ github.sha }}
-          restore-keys: |
-            fuzz-corpus-refs/heads/main-
-      - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
-        run: |
-          cd fuzz
-          RUSTFLAGS="--cfg=fuzzing --cfg=secp256k1_fuzz --cfg=hashes_fuzz" cargo test --verbose --color always --lib --bins -j8
-          cargo clean
-      - name: Run fuzzers
-        run: cd fuzz && ./ci-fuzz.sh && cd ..
-      - name: Upload honggfuzz corpus
-        uses: actions/upload-artifact@v4
-        with:
-          name: hfuzz-corpus
-          path: fuzz/hfuzz_workspace
-
-  linting:
-    runs-on: ubuntu-latest
-    env:
-      TOOLCHAIN: stable
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      - name: Install clippy
-        run: |
-          rustup component add clippy
-      - name: Run default clippy linting
-        run: |
-          ./ci/check-lint.sh
-
-  rustfmt:
-    runs-on: ubuntu-latest
-    env:
-      TOOLCHAIN: 1.75.0
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      - name: Install rustfmt
-        run: |
-          rustup component add rustfmt
-      - name: Run rustfmt checks
-        run: cargo fmt --check
-      - name: Run rustfmt checks on lightning-tests
-        run: cd lightning-tests && cargo fmt --check
-  tor-connect:
-    runs-on: ubuntu-latest
-    env:
-      TOOLCHAIN: 1.75.0
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      - name: Install tor
+      - name: Install Rust 1.75.0 toolchain
         run: |
-          sudo apt install -y tor
-      - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain 1.75.0
+      - name: Run test_deferred_monitor_payment in loop with full suite
         run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
-      - name: Test tor connections using lightning-net-tokio
+          for i in $(seq 1 20); do
+            echo "=== Stream ${{ matrix.stream }} iteration $i ==="
+            cargo test -p lightning --lib -- chain::chainmonitor::tests::test_deferred_monitor_payment 2>&1
+            echo "=== Passed ==="
+          done
+      - name: Run full workspace tests once (parallel pressure)
         run: |
-          TOR_PROXY="127.0.0.1:9050" RUSTFLAGS="--cfg=tor" cargo test --verbose --color always -p lightning-net-tokio
+          cargo test --quiet --color always 2>&1 | tail -50

fuzz/src/chanmon_consistency.rs

@@ -285,6 +285,7 @@ impl TestChainMonitor {
 				Arc::clone(&persister),
 				Arc::clone(&keys),
 				keys.get_peer_storage_key(),
+				false,
 			)),
 			logger,
 			keys,

fuzz/src/full_stack.rs

@@ -597,6 +597,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 		Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) }),
 		Arc::clone(&keys_manager),
 		keys_manager.get_peer_storage_key(),
+		false,
 	));
 
 	let network = Network::Bitcoin;

fuzz/src/lsps_message.rs

@@ -59,6 +59,7 @@ pub fn do_test(data: &[u8]) {
 		Arc::clone(&kv_store),
 		Arc::clone(&keys_manager),
 		keys_manager.get_peer_storage_key(),
+		false,
 	));
 	let best_block = BestBlock::from_network(network);
 	let params = ChainParameters { network, best_block };