From 101071722ee839668ed70eafccfd2f22d636940d Mon Sep 17 00:00:00 2001
From: rkrux <rkrux.connect@gmail.com>
Date: Wed, 13 May 2026 17:06:51 +0530
Subject: [PATCH 01/26] psbt, test: remove address type restrictions in test

Because the corresponding Taproot fields were added in PSBT in PR 22558, so
these restrictions are no longer necessary.

Github-Pull: #35279
Rebased-From: 81348576cc411a63da295a10a3846302419a18e0
---
 test/functional/rpc_psbt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py
index cc443f6a7cf..35c694d7454 100755
--- a/test/functional/rpc_psbt.py
+++ b/test/functional/rpc_psbt.py
@@ -65,7 +65,7 @@ class PSBTTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 3
         self.extra_args = [
-            ["-walletrbf=1", "-addresstype=bech32", "-changetype=bech32"], #TODO: Remove address type restrictions once taproot has psbt extensions
+            ["-walletrbf=1"],
             ["-walletrbf=0", "-changetype=legacy"],
             []
         ]

From 671e6c2c33bc8b1eb04dc9b682ab81e9fb3b5de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rinc?= <pap.lorinc@gmail.com>
Date: Wed, 6 May 2026 14:27:13 +0200
Subject: [PATCH 02/26] wallet: use outpoint when estimating input size

`CalculateMaximumSignedInputSize()` is passed the outpoint being sized, but that context was not used when estimating the signed input size.
Pass the outpoint through so externally selected inputs are not underestimated.

Co-authored-by: Antoine Poinsot <darosior@protonmail.com>

Github-Pull: #35228
Rebased-From: cd8d3bd937b5515ea000408eb07d2ae3cd1aa417
---
 src/wallet/spend.cpp            |  2 +-
 src/wallet/test/spend_tests.cpp | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 3d150426404..613375385d3 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -94,7 +94,7 @@ int CalculateMaximumSignedInputSize(const CTxOut& txout, const COutPoint outpoin
     if (!provider) return -1;
 
     if (const auto desc = InferDescriptor(txout.scriptPubKey, *provider)) {
-        if (const auto weight = MaxInputWeight(*desc, {}, coin_control, true, can_grind_r)) {
+        if (const auto weight = MaxInputWeight(*desc, CTxIn{outpoint}, coin_control, true, can_grind_r)) {
             return static_cast<int>(GetVirtualTransactionSize(*weight, 0, 0));
         }
     }
diff --git a/src/wallet/test/spend_tests.cpp b/src/wallet/test/spend_tests.cpp
index 866ffa48c20..218792ff033 100644
--- a/src/wallet/test/spend_tests.cpp
+++ b/src/wallet/test/spend_tests.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/amount.h>
+#include <key.h>
 #include <policy/fees/block_policy_estimator.h>
 #include <script/solver.h>
 #include <validation.h>
@@ -16,6 +17,22 @@
 namespace wallet {
 BOOST_FIXTURE_TEST_SUITE(spend_tests, WalletTestingSetup)
 
+BOOST_AUTO_TEST_CASE(max_signed_input_size_uses_external_outpoint)
+{
+    const CKey key{GenerateRandomKey()};
+    FillableSigningProvider provider;
+    BOOST_REQUIRE(provider.AddKey(key));
+
+    const CTxOut txout{COIN, GetScriptForDestination(PKHash{key.GetPubKey()})};
+    const COutPoint outpoint{Txid{}, 0};
+    CCoinControl coin_control;
+    coin_control.Select(outpoint).SetTxOut(txout);
+
+    const int low_r{CalculateMaximumSignedInputSize(txout, COutPoint{}, &provider, /*can_grind_r=*/true, &coin_control)};
+    const int high_r{CalculateMaximumSignedInputSize(txout, outpoint, &provider, /*can_grind_r=*/true, &coin_control)};
+    BOOST_CHECK_EQUAL(high_r, low_r + 1);
+}
+
 BOOST_FIXTURE_TEST_CASE(SubtractFee, TestChain100Setup)
 {
     CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey()));

From d61687a2acc19be7ed6d478d8d9299c4c0facd19 Mon Sep 17 00:00:00 2001
From: nervana21 <205626986+nervana21@users.noreply.github.com>
Date: Sat, 16 May 2026 20:45:12 +0100
Subject: [PATCH 03/26] musig: Reject empty pubkey list in GetMuSig2KeyAggCache

Github-Pull: #35316
Rebased-From: 8ce84321ceaf16c0ee3418d30011c357fdc46deb
---
 src/musig.cpp             | 4 ++++
 src/test/bip328_tests.cpp | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/musig.cpp b/src/musig.cpp
index 706874be2cf..f6b579577db 100644
--- a/src/musig.cpp
+++ b/src/musig.cpp
@@ -16,6 +16,10 @@ constexpr uint256 MUSIG_CHAINCODE{
 
 static bool GetMuSig2KeyAggCache(const std::vector<CPubKey>& pubkeys, secp256k1_musig_keyagg_cache& keyagg_cache)
 {
+    if (pubkeys.empty()) {
+        return false;
+    }
+
     // Parse the pubkeys
     std::vector<secp256k1_pubkey> secp_pubkeys;
     std::vector<const secp256k1_pubkey*> pubkey_ptrs;
diff --git a/src/test/bip328_tests.cpp b/src/test/bip328_tests.cpp
index 9fffa00b6b0..630771d5b6a 100644
--- a/src/test/bip328_tests.cpp
+++ b/src/test/bip328_tests.cpp
@@ -89,6 +89,12 @@ BOOST_AUTO_TEST_CASE(valid_keys)
     }
 }
 
+BOOST_AUTO_TEST_CASE(empty_pubkey_list)
+{
+    const std::optional<CPubKey> aggregate_pubkey{MuSig2AggregatePubkeys({})};
+    BOOST_CHECK(!aggregate_pubkey.has_value());
+}
+
 BOOST_AUTO_TEST_CASE(invalid_key)
 {
     std::vector<std::string> test_vectors = {

From 3440027b7dd4a6408935b4041cb8b62ff8ca69e3 Mon Sep 17 00:00:00 2001
From: willcl-ark <will@256k1.dev>
Date: Thu, 21 May 2026 14:13:50 +0100
Subject: [PATCH 04/26] ci: switch to GitHub cache for all runners

Cirrus is winding down and github now offers more than 10GB cache.

Switch to GH cache for all runner-types. Simplify docker build arg
construction, and reduce the number of needed action permissions.

Github-Pull: #35348
Rebased-From: c03107acf50aeada1bacdfdbf632ffce2957bff0
---
 .github/actions/configure-docker/action.yml | 39 ++++-----------------
 .github/actions/restore-caches/action.yml   |  8 ++---
 .github/actions/save-caches/action.yml      |  8 ++---
 .github/workflows/ci.yml                    | 11 ++----
 ci/README.md                                |  6 ++--
 5 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/.github/actions/configure-docker/action.yml b/.github/actions/configure-docker/action.yml
index b4abf7c274a..6f89dc8bd04 100644
--- a/.github/actions/configure-docker/action.yml
+++ b/.github/actions/configure-docker/action.yml
@@ -1,27 +1,14 @@
 name: 'Configure Docker'
 description: 'Set up Docker build driver and configure build cache args'
-inputs:
-  cache-provider:
-    description: 'gha or cirrus cache provider'
-    required: true
 runs:
   using: 'composite'
   steps:
-    - name: Check inputs
-      shell: python
-      run: |
-        # We expect only gha or cirrus as inputs to cache-provider
-        if "${{ inputs.cache-provider }}" not in ("gha", "cirrus"):
-          print("::warning title=Unknown input to configure docker action::Provided value was ${{ inputs.cache-provider }}")
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
-      with:
-        # Use host network to allow access to cirrus gha cache running on the host
-        driver-opts: |
-          network=host
 
-    # This is required to allow buildkit to access the actions cache
+    # This is required when using the gha cache backend with a manual docker buildx invocation.
+    # Docker will check for variables $ACTIONS_CACHE_URL, $ACTIONS_RESULTS_URL and $ACTIONS_RUNTIME_TOKEN
+    # which are set automatically when running on GitHub infra: https://docs.docker.com/build/cache/backends/gha/#synopsis
     - name: Expose actions cache variables
       uses: actions/github-script@v8
       with:
@@ -37,24 +24,12 @@ runs:
       shell: bash
       run: |
         # Configure docker build cache backend
-        #
-        # On forks the gha cache will work but will use Github's cache backend.
-        # Docker will check for variables $ACTIONS_CACHE_URL, $ACTIONS_RESULTS_URL and $ACTIONS_RUNTIME_TOKEN
-        # which are set automatically when running on GitHub infra: https://docs.docker.com/build/cache/backends/gha/#synopsis
-
-        # Use cirrus cache host
-        if [[ ${{ inputs.cache-provider }} == 'cirrus' ]]; then
-          url_args="url=${CIRRUS_CACHE_HOST},url_v2=${CIRRUS_CACHE_HOST}"
-        else
-          url_args=""
-        fi
-
         # Always optimistically --cache‑from in case a cache blob exists
-        args=(--cache-from "type=gha${url_args:+,${url_args}},scope=${CONTAINER_NAME}")
+        args=(--cache-from "type=gha,scope=${CONTAINER_NAME}")
 
-        # Only add --cache-to when using the Cirrus cache provider and pushing to the default branch.
-        if [[ ${{ inputs.cache-provider }} == 'cirrus' && ${{ github.event_name }} == "push" && ${{ github.ref_name }} == ${{ github.event.repository.default_branch }} ]]; then
-          args+=(--cache-to "type=gha${url_args:+,${url_args}},mode=max,ignore-error=true,scope=${CONTAINER_NAME}")
+        # Only add --cache-to when pushing to the default branch.
+        if [[ ${{ github.event_name }} == "push" && ${{ github.ref_name }} == ${{ github.event.repository.default_branch }} ]]; then
+          args+=(--cache-to "type=gha,mode=max,ignore-error=true,scope=${CONTAINER_NAME}")
         fi
 
         # Always `--load` into docker images (needed when using the `docker-container` build driver).
diff --git a/.github/actions/restore-caches/action.yml b/.github/actions/restore-caches/action.yml
index 21f2807f4c7..ee07d68b907 100644
--- a/.github/actions/restore-caches/action.yml
+++ b/.github/actions/restore-caches/action.yml
@@ -5,7 +5,7 @@ runs:
   steps:
     - name: Restore Ccache cache
       id: ccache-cache
-      uses: cirruslabs/cache/restore@v5
+      uses: actions/cache/restore@v5
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
@@ -14,7 +14,7 @@ runs:
 
     - name: Restore depends sources cache
       id: depends-sources
-      uses: cirruslabs/cache/restore@v5
+      uses: actions/cache/restore@v5
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
@@ -23,7 +23,7 @@ runs:
 
     - name: Restore built depends cache
       id: depends-built
-      uses: cirruslabs/cache/restore@v5
+      uses: actions/cache/restore@v5
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
@@ -32,7 +32,7 @@ runs:
 
     - name: Restore previous releases cache
       id: previous-releases
-      uses: cirruslabs/cache/restore@v5
+      uses: actions/cache/restore@v5
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
         key: previous-releases-${{ env.CONTAINER_NAME }}-${{ env.PREVIOUS_RELEASES_HASH }}
diff --git a/.github/actions/save-caches/action.yml b/.github/actions/save-caches/action.yml
index 3072ab3f224..8667c91473d 100644
--- a/.github/actions/save-caches/action.yml
+++ b/.github/actions/save-caches/action.yml
@@ -11,28 +11,28 @@ runs:
         echo "previous releases direct cache hit to primary key: ${{ env.previous-releases-cache-hit }}"
 
     - name: Save Ccache cache
-      uses: cirruslabs/cache/save@v5
+      uses: actions/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) }}
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
 
     - name: Save depends sources cache
-      uses: cirruslabs/cache/save@v5
+      uses: actions/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-sources-cache-hit != 'true') }}
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
 
     - name: Save built depends cache
-      uses: cirruslabs/cache/save@v5
+      uses: actions/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-built-cache-hit != 'true' )}}
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
 
     - name: Save previous releases cache
-      uses: cirruslabs/cache/save@v5
+      uses: actions/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.previous-releases-cache-hit != 'true' )}}
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 914b29cad3d..3ff165acbbe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,8 +19,7 @@ concurrency:
 
 env:
   CI_FAILFAST_TEST_LEAVE_DANGLING: 1  # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error
-  CIRRUS_CACHE_HOST: http://127.0.0.1:12321/ # When using Cirrus Runners this host can be used by the docker `gha` build cache type.
-  REPO_USE_CIRRUS_RUNNERS: 'bitcoin/bitcoin' # Use cirrus runners and cache for this repo, instead of falling back to the slow GHA runners
+  REPO_USE_CIRRUS_RUNNERS: 'bitcoin/bitcoin' # Use cirrus runners for this repo, instead of falling back to the slow GHA runners
 
 defaults:
   run:
@@ -60,7 +59,7 @@ jobs:
     needs: runners
     runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' || 'ubuntu-24.04' }}
     env:
-      TEST_RUNNER_PORT_MIN: "14000"  # Use a larger port, to avoid colliding with CIRRUS_CACHE_HOST port 12321.
+      TEST_RUNNER_PORT_MIN: "14000"  # Use a larger port range to avoid colliding with other CI services.
     if: github.event_name == 'pull_request' && github.event.pull_request.commits != 1
     timeout-minutes: 360  # Use maximum time, see https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes.
     steps:
@@ -368,8 +367,6 @@ jobs:
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
-        with:
-          cache-provider: ${{ needs.runners.outputs.provider }}
 
       - name: CI script
         run: ./ci/test_run_all.sh
@@ -554,8 +551,6 @@ jobs:
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
-        with:
-          cache-provider: ${{ matrix.provider || needs.runners.outputs.provider }}
 
       - name: Clear unnecessary files
         if: ${{ needs.runners.outputs.provider == 'gha' && true || false }} # Only needed on GHA runners
@@ -597,8 +592,6 @@ jobs:
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
-        with:
-          cache-provider: ${{ needs.runners.outputs.provider }}
 
       - name: CI script
         run: |
diff --git a/ci/README.md b/ci/README.md
index 293294a559c..0f43b4f1f63 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -85,15 +85,15 @@ To configure the primary repository, follow these steps:
 3. Enable organisation-level runners to be used in public repositories:
    1. `Org settings -> Actions -> Runner Groups -> Default -> Allow public repos`
 4. Permit the following actions to run:
-   1. cirruslabs/cache/restore@\*
-   1. cirruslabs/cache/save@\*
+   1. actions/cache/restore@\*
+   1. actions/cache/save@\*
    1. docker/setup-buildx-action@\*
    1. actions/github-script@\*
 
 ### Forked repositories
 
 When used in a fork the CI will run on GitHub's free hosted runners by default.
-In this case, due to GitHub's 10GB-per-repo cache size limitations caches will be frequently evicted and missed, but the workflows will run (slowly).
+In this case, GitHub's cache size limitations may cause caches to be frequently evicted and missed, but the workflows will run (slowly).
 
 It is also possible to use your own Cirrus Runners in your own fork with an appropriate patch to the `REPO_USE_CIRRUS_RUNNERS` variable in ../.github/workflows/ci.yml
 NB that Cirrus Runners only work at an organisation level, therefore in order to use your own Cirrus Runners, *the fork must be within your own organisation*.

From 78714f6d4fdc3b7831bba426bfff55bbe1021e6c Mon Sep 17 00:00:00 2001
From: Andrew Toth <andrewstoth@gmail.com>
Date: Tue, 19 May 2026 11:38:51 -0400
Subject: [PATCH 05/26] Disable seek compaction

Seek compaction is causing a cascade effect in the chainstate DB, causing large parts of the database to be rewritten every ~hour.

Every periodic flush writes around 2 MiB. Since this is roughly the `write_buffer_size`, these writes regularly cause the memtable to rotate into a small L0 file. This file has a small seek budget, and with the random UTXO reads done during validation, it can get scheduled for seek compaction quickly.

That seek compaction pushes the small file down to L1. Since most UTXOs are already lower down in L4/L5, many reads that consult this file do not find the key there and continue downward. The bloom filter makes those misses cheap, but LevelDB still decrements the file's seek budget. The file then gets scheduled for another seek compaction, and the same pattern pushes it down through L2 and L3.

The expensive part happens around L3/L4. L4 has many ~32 MiB files holding the bulk of the UTXO set. When LevelDB compacts into L3, it may split the output into many smaller L3 files to limit how much L4 "grandparent" data any one output overlaps. Each of these small L3 files then gets its own small seek budget. Because chainstate keys are hash-random, each small L3 file can still have a broad key range, so many random reads consult it and quickly drain its budget. Once seek-compacted into L4, each tiny L3 file can overlap many L4 files, so compacting a few hundred KiB from L3 can require rewriting hundreds of MiB from L4. Repeating that across many small L3 files can rewrite most of the chainstate.

This is a poor fit for chainstate because UTXO keys are hash-random, the DB is large enough to have many levels, writes are relatively small and periodic, and reads are frequent. The result is that read misses trigger compactions much earlier than size pressure would, and those compactions have very high write amplification.

Disabling seek compaction may leave more files in upper levels for longer, so reads could theoretically consult more files. But Bitcoin Core enables bloom filters for all its LevelDB instances, so these misses are usually cheap in-memory filter checks rather than disk reads.

For the other DBs, the risk is much smaller. They also use bloom filters, and most are smaller and less read-heavy. With fewer levels and less random read pressure, disabling seek compaction should have little effect there.

Co-authored-by: l0rinc <pap.lorinc@gmail.com>

Github-Pull: #35313
Rebased-From: 6bfdb6093bba4710d0f8313ed0113967a8b5176f
---
 src/leveldb/db/autocompact_test.cc | 18 ++++++++----------
 src/leveldb/db/db_test.cc          | 16 +++++++++-------
 src/leveldb/db/version_set.cc      | 17 +++++++----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/leveldb/db/autocompact_test.cc b/src/leveldb/db/autocompact_test.cc
index e6c97a05a6b..f6e714c6524 100644
--- a/src/leveldb/db/autocompact_test.cc
+++ b/src/leveldb/db/autocompact_test.cc
@@ -54,8 +54,8 @@ static const int kValueSize = 200 * 1024;
 static const int kTotalSize = 100 * 1024 * 1024;
 static const int kCount = kTotalSize / kValueSize;
 
-// Read through the first n keys repeatedly and check that they get
-// compacted (verified by checking the size of the key space).
+// Read through the first n keys repeatedly and check that reads do NOT
+// trigger compaction (seek compaction is disabled in this fork).
 void AutoCompactTest::DoReads(int n) {
   std::string value(kValueSize, 'x');
   DBImpl* dbi = reinterpret_cast<DBImpl*>(db_);
@@ -76,25 +76,23 @@ void AutoCompactTest::DoReads(int n) {
   const int64_t initial_size = Size(Key(0), Key(n));
   const int64_t initial_other_size = Size(Key(n), Key(kCount));
 
-  // Read until size drops significantly.
+  // Read repeatedly. The size of the read range must NOT shrink: with
+  // seek compaction disabled, reads never schedule a compaction.
   std::string limit_key = Key(n);
-  for (int read = 0; true; read++) {
-    ASSERT_LT(read, 100) << "Taking too long to compact";
+  for (int read = 0; read < 100; read++) {
     Iterator* iter = db_->NewIterator(ReadOptions());
     for (iter->SeekToFirst();
          iter->Valid() && iter->key().ToString() < limit_key; iter->Next()) {
       // Drop data
     }
     delete iter;
-    // Wait a little bit to allow any triggered compactions to complete.
-    Env::Default()->SleepForMicroseconds(1000000);
     uint64_t size = Size(Key(0), Key(n));
     fprintf(stderr, "iter %3d => %7.3f MB [other %7.3f MB]\n", read + 1,
             size / 1048576.0, Size(Key(n), Key(kCount)) / 1048576.0);
-    if (size <= initial_size / 10) {
-      break;
-    }
   }
+  // Give any background work a chance to run, even though none should.
+  Env::Default()->SleepForMicroseconds(1000000);
+  ASSERT_EQ(Size(Key(0), Key(n)), static_cast<uint64_t>(initial_size));
 
   // Verify that the size of the key space not touched by the reads
   // is pretty much unchanged.
diff --git a/src/leveldb/db/db_test.cc b/src/leveldb/db/db_test.cc
index 3c9f89428ff..16e8ecb9a33 100644
--- a/src/leveldb/db/db_test.cc
+++ b/src/leveldb/db/db_test.cc
@@ -735,15 +735,14 @@ TEST(DBTest, GetPicksCorrectFile) {
   } while (ChangeOptions());
 }
 
-TEST(DBTest, GetEncountersEmptyLevel) {
+TEST(DBTest, GetDoesNotTriggerSeekCompaction) {
   do {
     // Arrange for the following to happen:
     //   * sstable A in level 0
     //   * nothing in level 1
     //   * sstable B in level 2
-    // Then do enough Get() calls to arrange for an automatic compaction
-    // of sstable A.  A bug would cause the compaction to be marked as
-    // occurring at level 1 (instead of the correct level 0).
+    // Seek compaction is disabled in this fork, so repeated reads must
+    // not change the level layout. A manual compaction must still work.
 
     // Step 1: First place sstables in levels 0 and 2
     int compaction_count = 0;
@@ -761,14 +760,17 @@ TEST(DBTest, GetEncountersEmptyLevel) {
     ASSERT_EQ(NumTableFilesAtLevel(1), 0);
     ASSERT_EQ(NumTableFilesAtLevel(2), 1);
 
-    // Step 3: read a bunch of times
+    // Step 3: many read misses must not schedule any compaction.
     for (int i = 0; i < 1000; i++) {
       ASSERT_EQ("NOT_FOUND", Get("missing"));
     }
-
-    // Step 4: Wait for compaction to finish
     DelayMilliseconds(1000);
+    ASSERT_EQ(NumTableFilesAtLevel(0), 1);
+    ASSERT_EQ(NumTableFilesAtLevel(1), 0);
+    ASSERT_EQ(NumTableFilesAtLevel(2), 1);
 
+    // Step 4: a manual compaction still moves the L0 file down.
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr);
     ASSERT_EQ(NumTableFilesAtLevel(0), 0);
   } while (ChangeOptions());
 }
diff --git a/src/leveldb/db/version_set.cc b/src/leveldb/db/version_set.cc
index cd07346ea8a..8dc73295b84 100644
--- a/src/leveldb/db/version_set.cc
+++ b/src/leveldb/db/version_set.cc
@@ -400,16 +400,11 @@ Status Version::Get(const ReadOptions& options, const LookupKey& k,
   return state.found ? state.s : Status::NotFound(Slice());
 }
 
-bool Version::UpdateStats(const GetStats& stats) {
-  FileMetaData* f = stats.seek_file;
-  if (f != nullptr) {
-    f->allowed_seeks--;
-    if (f->allowed_seeks <= 0 && file_to_compact_ == nullptr) {
-      file_to_compact_ = f;
-      file_to_compact_level_ = stats.seek_file_level;
-      return true;
-    }
-  }
+bool Version::UpdateStats(const GetStats& /*stats*/) {
+  // Disable automatic compactions triggered by read seek counters.
+  // The heuristic was tuned for expensive random seeks and can create
+  // severe write amplification on large random-key databases.
+  // Size and manual compactions still run.
   return false;
 }
 
@@ -661,6 +656,8 @@ class VersionSet::Builder {
       // same as the compaction of 40KB of data.  We are a little
       // conservative and allow approximately one seek for every 16KB
       // of data before triggering a compaction.
+      //
+      // Note: seek compactions are disabled. See Version::UpdateStats.
       f->allowed_seeks = static_cast<int>((f->file_size / 16384U));
       if (f->allowed_seeks < 100) f->allowed_seeks = 100;
 

From 6caf6de0a1fd0e8d9c9f7516f04414b431d34e1b Mon Sep 17 00:00:00 2001
From: will <will@256k1.dev>
Date: Mon, 11 May 2026 10:06:55 +0100
Subject: [PATCH 06/26] ci: switch runners from cirrus to warpbuild

Github-Pull: #35378
Rebased-From: 4bdd46ace37f02da062a53a2943caeddca4ed8f9
---
 .github/workflows/ci.yml | 44 ++++++++++++++++++++--------------------
 ci/README.md             |  8 ++++----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ff165acbbe..563e228cd60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ concurrency:
 
 env:
   CI_FAILFAST_TEST_LEAVE_DANGLING: 1  # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error
-  REPO_USE_CIRRUS_RUNNERS: 'bitcoin/bitcoin' # Use cirrus runners for this repo, instead of falling back to the slow GHA runners
+  REPO_USE_WARP_RUNNERS: 'bitcoin/bitcoin' # Use warp runners for this repo, instead of falling back to the slow GHA runners
 
 defaults:
   run:
@@ -46,9 +46,9 @@ jobs:
           fi
       - id: runners
         run: |
-          if [[ "${REPO_USE_CIRRUS_RUNNERS}" == "${{ github.repository }}" ]]; then
-            echo "provider=cirrus" >> "$GITHUB_OUTPUT"
-            echo "::notice title=Runner Selection::Using Cirrus Runners"
+          if [[ "${REPO_USE_WARP_RUNNERS}" == "${{ github.repository }}" ]]; then
+            echo "provider=warp" >> "$GITHUB_OUTPUT"
+            echo "::notice title=Runner Selection::Using Warp Runners"
           else
             echo "provider=gha" >> "$GITHUB_OUTPUT"
             echo "::notice title=Runner Selection::Using GitHub-hosted runners"
@@ -57,7 +57,7 @@ jobs:
   test-each-commit:
     name: 'test ancestor commits'
     needs: runners
-    runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' || 'ubuntu-24.04' }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-24.04' }}
     env:
       TEST_RUNNER_PORT_MIN: "14000"  # Use a larger port range to avoid colliding with other CI services.
     if: github.event_name == 'pull_request' && github.event.pull_request.commits != 1
@@ -331,7 +331,7 @@ jobs:
   windows-cross:
     name: 'Windows-cross to x86_64, ${{ matrix.crt }}'
     needs: [runners, record-frozen-commit]
-    runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm' || 'ubuntu-24.04' }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-4x' || 'ubuntu-24.04' }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
 
     strategy:
@@ -440,7 +440,7 @@ jobs:
   ci-matrix:
     name: ${{ matrix.name }}
     needs: runners
-    runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && matrix.cirrus-runner || matrix.fallback-runner }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && matrix.warp-runner || matrix.fallback-runner }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
     timeout-minutes: ${{ matrix.timeout-minutes }}
 
@@ -453,86 +453,86 @@ jobs:
       matrix:
         include:
           - name: 'iwyu'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_iwyu.sh'
 
           - name: '32 bit ARM'
-            cirrus-runner: 'ubuntu-24.04-arm' # Cirrus' Arm runners are Apple (with virtual Linux aarch64), which doesn't support 32-bit mode
+            warp-runner: 'ubuntu-24.04-arm' # Warp's Arm runners don't support 32-bit mode currently
             fallback-runner: 'ubuntu-24.04-arm'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_arm.sh'
             provider: 'gha'
 
           - name: 'ASan + LSan + UBSan + integer'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' # has to match container in ci/test/00_setup_env_native_asan.sh for tracing tools
+            warp-runner: 'warp-ubuntu-2404-x64-8x' # has to match container in ci/test/00_setup_env_native_asan.sh for tracing tools
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_asan.sh'
 
           - name: 'macOS-cross to arm64'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
+            warp-runner: 'warp-ubuntu-latest-x64-4x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross.sh'
 
           - name: 'macOS-cross to x86_64'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
+            warp-runner: 'warp-ubuntu-latest-x64-4x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
 
           - name: 'No wallet'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
+            warp-runner: 'warp-ubuntu-latest-x64-4x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_nowallet.sh'
 
           - name: 'i686, no IPC'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_i686_no_ipc.sh'
 
           - name: 'fuzzer,address,undefined,integer'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg'
+            warp-runner: 'warp-ubuntu-latest-x64-16x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 240
             file-env: './ci/test/00_setup_env_native_fuzz.sh'
 
           - name: 'previous releases'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_previous_releases.sh'
 
           - name: 'Alpine (musl)'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_alpine_musl.sh'
 
           - name: 'tidy'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_tidy.sh'
 
           - name: 'TSan'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_tsan.sh'
 
           - name: 'MSan, fuzz'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 150
             file-env: './ci/test/00_setup_env_native_fuzz_with_msan.sh'
 
           - name: 'MSan'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg'
+            warp-runner: 'warp-ubuntu-latest-x64-16x'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_msan.sh'
@@ -576,7 +576,7 @@ jobs:
   lint:
     name: 'lint'
     needs: runners
-    runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xs' || 'ubuntu-24.04' }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-2x' || 'ubuntu-24.04' }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
     timeout-minutes: 20
     env:
diff --git a/ci/README.md b/ci/README.md
index 0f43b4f1f63..314d336b76c 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -80,8 +80,8 @@ trigger cache-invalidation and rebuilds as necessary.
 
 To configure the primary repository, follow these steps:
 
-1. Register with [Cirrus Runners](https://cirrus-runners.app/) and purchase runners.
-2. Install the Cirrus Runners GitHub app against the GitHub organization.
+1. Register with [WarpBuild](https://www.warpbuild.com/) and purchase runners.
+2. Install the WarpBuild GitHub app against the GitHub organization.
 3. Enable organisation-level runners to be used in public repositories:
    1. `Org settings -> Actions -> Runner Groups -> Default -> Allow public repos`
 4. Permit the following actions to run:
@@ -95,5 +95,5 @@ To configure the primary repository, follow these steps:
 When used in a fork the CI will run on GitHub's free hosted runners by default.
 In this case, GitHub's cache size limitations may cause caches to be frequently evicted and missed, but the workflows will run (slowly).
 
-It is also possible to use your own Cirrus Runners in your own fork with an appropriate patch to the `REPO_USE_CIRRUS_RUNNERS` variable in ../.github/workflows/ci.yml
-NB that Cirrus Runners only work at an organisation level, therefore in order to use your own Cirrus Runners, *the fork must be within your own organisation*.
+It is also possible to use your own WarpBuild Runners in your own fork with an appropriate patch to the `REPO_USE_WARP_RUNNERS` variable in ../.github/workflows/ci.yml
+NB that WarpBuild Runners only work at an organisation level, therefore in order to use your own WarpBuild Runners, *the fork must be within your own organisation*.

From 8f13bb1ea0b4cd51d7784af642b8912d123e3a26 Mon Sep 17 00:00:00 2001
From: deadmanoz <hones02_tunica@icloud.com>
Date: Fri, 13 Mar 2026 14:50:41 +0800
Subject: [PATCH 07/26] crypto: disable ASan instrumentation of SSE4 SHA256 for
 GCC

The existing Clang-only no_sanitize("address") guard is extended to
also cover GCC.  When GCC compiles this file with -fsanitize=address
in debug builds, the instrumented inline assembly causes a SEGV during
SHA256AutoDetect()'s self-test on CPUs that use the SSE4 code path
(i.e. those without SHA-NI support), regardless of optimization level.

The original Clang code placed the attribute between the function
declarator and the opening brace.  GCC's Attribute Syntax
documentation notes that this position in a function definition
"may, in future, be permitted," so it is not currently supported.
The attribute is moved to the start of the function definition,
which is valid form for both GCC and Clang.

The preprocessor guards are restructured so each compiler branch is
explicit: __clang__ with __has_feature, and __GNUC__ with
__SANITIZE_ADDRESS__.

Github-Pull: #34953
Rebased-From: fedeff7f201df0206eefb744ad125e44a63a3ea0
---
 src/crypto/sha256_sse4.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp
index 2d37d124d1e..4464ec92439 100644
--- a/src/crypto/sha256_sse4.cpp
+++ b/src/crypto/sha256_sse4.cpp
@@ -12,18 +12,23 @@
 
 namespace sha256_sse4
 {
-void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks)
-#if defined(__clang__)
-  /*
-  clang is unable to compile this with -O0 and -fsanitize=address.
-  See upstream bug: https://github.com/llvm/llvm-project/issues/92182.
-  This also fails to compile with -O2, -fcf-protection & -fsanitize=address.
-  See https://github.com/bitcoin/bitcoin/issues/31913.
-  */
-#if __has_feature(address_sanitizer)
+/*
+Both Clang and GCC fail with ASan on this inline assembly:
+- Clang: compile failure with -O0 or -O2 + -fcf-protection under ASan.
+  See https://github.com/llvm/llvm-project/issues/92182
+  and https://github.com/bitcoin/bitcoin/issues/31913.
+- GCC: runtime SEGV during SHA256AutoDetect()'s self-test under ASan,
+  regardless of optimization level.
+  See https://github.com/bitcoin/bitcoin/issues/34881.
+*/
+#if defined(__SANITIZE_ADDRESS__)
+  __attribute__((no_sanitize("address")))
+#elif defined(__clang__)
+#if __has_feature(address_sanitizer) // fallback can be removed once support for Clang 21 is dropped
   __attribute__((no_sanitize("address")))
 #endif
 #endif
+void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks)
 {
     static const uint32_t K256 alignas(16) [] = {
         0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,

From 1f55b3e463fdf4cc0fdd007c1b277c6e8a423db2 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 29 May 2026 08:59:43 +0100
Subject: [PATCH 08/26] doc: remove reference to cirrus

Github-Pull: #35408
Rebased-From: 265563bf75c0b8b615e28d47398098020ff0b109
---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index c5f3028c503..d7fe7ad5e24 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 [*.{h,cpp,rs,py,sh}]
 indent_size = 4
 
-# .cirrus.yml, etc.
+# ci.yml, etc.
 [*.yml]
 indent_size = 2
 

From 39f8e077c8dc99cbc0760b5e05abc4c8134795e5 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 29 May 2026 09:03:07 +0100
Subject: [PATCH 09/26] ci: use ubuntu-latest instead of ubuntu-24.04

To match the usage of -latest for the warp runners.

Github-Pull: #35408
Rebased-From: 5700a61b73342b506b0114b342499da7642c1c10
---
 .github/workflows/ci.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 563e228cd60..accc363836e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
   test-each-commit:
     name: 'test ancestor commits'
     needs: runners
-    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-24.04' }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-latest' }}
     env:
       TEST_RUNNER_PORT_MIN: "14000"  # Use a larger port range to avoid colliding with other CI services.
     if: github.event_name == 'pull_request' && github.event.pull_request.commits != 1
@@ -331,7 +331,7 @@ jobs:
   windows-cross:
     name: 'Windows-cross to x86_64, ${{ matrix.crt }}'
     needs: [runners, record-frozen-commit]
-    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-4x' || 'ubuntu-24.04' }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-4x' || 'ubuntu-latest' }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
 
     strategy:
@@ -454,7 +454,7 @@ jobs:
         include:
           - name: 'iwyu'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_iwyu.sh'
 
@@ -473,67 +473,67 @@ jobs:
 
           - name: 'macOS-cross to arm64'
             warp-runner: 'warp-ubuntu-latest-x64-4x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross.sh'
 
           - name: 'macOS-cross to x86_64'
             warp-runner: 'warp-ubuntu-latest-x64-4x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
 
           - name: 'No wallet'
             warp-runner: 'warp-ubuntu-latest-x64-4x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_nowallet.sh'
 
           - name: 'i686, no IPC'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_i686_no_ipc.sh'
 
           - name: 'fuzzer,address,undefined,integer'
             warp-runner: 'warp-ubuntu-latest-x64-16x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 240
             file-env: './ci/test/00_setup_env_native_fuzz.sh'
 
           - name: 'previous releases'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_previous_releases.sh'
 
           - name: 'Alpine (musl)'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_alpine_musl.sh'
 
           - name: 'tidy'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_tidy.sh'
 
           - name: 'TSan'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_tsan.sh'
 
           - name: 'MSan, fuzz'
             warp-runner: 'warp-ubuntu-latest-x64-8x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 150
             file-env: './ci/test/00_setup_env_native_fuzz_with_msan.sh'
 
           - name: 'MSan'
             warp-runner: 'warp-ubuntu-latest-x64-16x'
-            fallback-runner: 'ubuntu-24.04'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_msan.sh'
 
@@ -576,7 +576,7 @@ jobs:
   lint:
     name: 'lint'
     needs: runners
-    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-2x' || 'ubuntu-24.04' }}
+    runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-2x' || 'ubuntu-latest' }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
     timeout-minutes: 20
     env:

From 25506ed6d958a6332f4e7513e51a59dba2cf9673 Mon Sep 17 00:00:00 2001
From: will <will@256k1.dev>
Date: Mon, 1 Jun 2026 10:26:19 +0100
Subject: [PATCH 10/26] ci: Add dynamic cache switching to warp cache

The GHA cache is very slow, taking on the order of minutes to save and
restore from.

Use WarpBuild's cache instead as this is in the same region and much
faster.

WarpBuild cache action does not auto-fallback to GHA if not being run on
Warp. To allow fork runs to fallback to GHA caching, whilst minimising
duplication in the action files, create new "interal" actions which
perform the switching logic, and use these in the (renamed) cache|save
actions.

Without this we would need the `if` logic in our prvious actions, 4
times in each of save and restore.

Plumb the provider through into the action, as a composite action can't
read `env` (`GITHUB_OUTPUT`) from previous steps.

Github-Pull: #35430
Rebased-From: 2ce4ae7d8f006959cb83be93a17b8125e953c30a
---
 .../restore}/action.yml                       | 16 +++++--
 .../actions/cache/restore/internal/action.yml | 43 +++++++++++++++++++
 .../{save-caches => cache/save}/action.yml    | 16 +++++--
 .../actions/cache/save/internal/action.yml    | 28 ++++++++++++
 .github/workflows/ci.yml                      | 16 +++++--
 ci/README.md                                  |  4 +-
 6 files changed, 110 insertions(+), 13 deletions(-)
 rename .github/actions/{restore-caches => cache/restore}/action.yml (77%)
 create mode 100644 .github/actions/cache/restore/internal/action.yml
 rename .github/actions/{save-caches => cache/save}/action.yml (79%)
 create mode 100644 .github/actions/cache/save/internal/action.yml

diff --git a/.github/actions/restore-caches/action.yml b/.github/actions/cache/restore/action.yml
similarity index 77%
rename from .github/actions/restore-caches/action.yml
rename to .github/actions/cache/restore/action.yml
index ee07d68b907..2cc5b53a1e1 100644
--- a/.github/actions/restore-caches/action.yml
+++ b/.github/actions/cache/restore/action.yml
@@ -1,43 +1,51 @@
 name: 'Restore Caches'
 description: 'Restore ccache, depends sources, and built depends caches'
+inputs:
+  provider:
+    description: 'The cache provider to use'
+    required: true
 runs:
   using: 'composite'
   steps:
     - name: Restore Ccache cache
       id: ccache-cache
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
         restore-keys: |
           ccache-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: Restore depends sources cache
       id: depends-sources
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
         restore-keys: |
           depends-sources-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: Restore built depends cache
       id: depends-built
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
         restore-keys: |
           depends-built-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: Restore previous releases cache
       id: previous-releases
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
         key: previous-releases-${{ env.CONTAINER_NAME }}-${{ env.PREVIOUS_RELEASES_HASH }}
         restore-keys: |
           previous-releases-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: export cache hits
       shell: bash
diff --git a/.github/actions/cache/restore/internal/action.yml b/.github/actions/cache/restore/internal/action.yml
new file mode 100644
index 00000000000..43dd206345d
--- /dev/null
+++ b/.github/actions/cache/restore/internal/action.yml
@@ -0,0 +1,43 @@
+name: 'Cache Restore'
+description: 'Restore a cache with WarpBuild on Warp runners and GitHub Actions cache otherwise'
+inputs:
+  path:
+    description: 'A list of files, directories, and wildcard patterns to restore'
+    required: true
+  key:
+    description: 'An explicit key for restoring the cache'
+    required: true
+  restore-keys:
+    description: 'An ordered multiline string listing prefix-matched restore keys'
+    required: false
+    default: ''
+  provider:
+    description: 'The cache provider to use'
+    required: true
+outputs:
+  cache-hit:
+    description: 'A boolean value to indicate an exact match was found for the primary key'
+    value: ${{ steps.warp.outputs.cache-hit || steps.gha.outputs.cache-hit }}
+  cache-primary-key:
+    description: 'The primary key used to restore the cache'
+    value: ${{ steps.warp.outputs.cache-primary-key || steps.gha.outputs.cache-primary-key }}
+runs:
+  using: 'composite'
+  steps:
+    - name: Restore cache with WarpBuild
+      id: warp
+      if: ${{ inputs.provider == 'warp' }}
+      uses: WarpBuilds/cache/restore@v1
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+        restore-keys: ${{ inputs.restore-keys }}
+
+    - name: Restore cache with GitHub Actions
+      id: gha
+      if: ${{ inputs.provider == 'gha' }}
+      uses: actions/cache/restore@v5
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+        restore-keys: ${{ inputs.restore-keys }}
diff --git a/.github/actions/save-caches/action.yml b/.github/actions/cache/save/action.yml
similarity index 79%
rename from .github/actions/save-caches/action.yml
rename to .github/actions/cache/save/action.yml
index 8667c91473d..5c543b3f9e7 100644
--- a/.github/actions/save-caches/action.yml
+++ b/.github/actions/cache/save/action.yml
@@ -1,5 +1,9 @@
 name: 'Save Caches'
 description: 'Save ccache, depends sources, and built depends caches'
+inputs:
+  provider:
+    description: 'The cache provider to use'
+    required: true
 runs:
   using: 'composite'
   steps:
@@ -11,29 +15,33 @@ runs:
         echo "previous releases direct cache hit to primary key: ${{ env.previous-releases-cache-hit }}"
 
     - name: Save Ccache cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) }}
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
+        provider: ${{ inputs.provider }}
 
     - name: Save depends sources cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-sources-cache-hit != 'true') }}
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
+        provider: ${{ inputs.provider }}
 
     - name: Save built depends cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-built-cache-hit != 'true' )}}
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
+        provider: ${{ inputs.provider }}
 
     - name: Save previous releases cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.previous-releases-cache-hit != 'true' )}}
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
         key: previous-releases-${{ env.CONTAINER_NAME }}-${{ env.PREVIOUS_RELEASES_HASH }}
+        provider: ${{ inputs.provider }}
diff --git a/.github/actions/cache/save/internal/action.yml b/.github/actions/cache/save/internal/action.yml
new file mode 100644
index 00000000000..12f4156a072
--- /dev/null
+++ b/.github/actions/cache/save/internal/action.yml
@@ -0,0 +1,28 @@
+name: 'Cache Save'
+description: 'Save a cache with WarpBuild on Warp runners and GitHub Actions cache otherwise'
+inputs:
+  path:
+    description: 'A list of files, directories, and wildcard patterns to cache'
+    required: true
+  key:
+    description: 'An explicit key for saving the cache'
+    required: true
+  provider:
+    description: 'The cache provider to use'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - name: Save cache with WarpBuild
+      if: ${{ inputs.provider == 'warp' }}
+      uses: WarpBuilds/cache/save@v1
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+
+    - name: Save cache with GitHub Actions
+      if: ${{ inputs.provider == 'gha' }}
+      uses: actions/cache/save@v5
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index accc363836e..7c314ec33a6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -363,7 +363,9 @@ jobs:
 
       - name: Restore caches
         id: restore-cache
-        uses: ./.github/actions/restore-caches
+        uses: ./.github/actions/cache/restore
+        with:
+          provider: ${{ needs.runners.outputs.provider }}
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
@@ -372,7 +374,9 @@ jobs:
         run: ./ci/test_run_all.sh
 
       - name: Save caches
-        uses: ./.github/actions/save-caches
+        uses: ./.github/actions/cache/save
+        with:
+          provider: ${{ needs.runners.outputs.provider }}
 
       - name: Upload built executables
         uses: actions/upload-artifact@v7
@@ -547,7 +551,9 @@ jobs:
 
       - name: Restore caches
         id: restore-cache
-        uses: ./.github/actions/restore-caches
+        uses: ./.github/actions/cache/restore
+        with:
+          provider: ${{ matrix.provider || needs.runners.outputs.provider }}
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
@@ -571,7 +577,9 @@ jobs:
         run: ./ci/test_run_all.sh
 
       - name: Save caches
-        uses: ./.github/actions/save-caches
+        uses: ./.github/actions/cache/save
+        with:
+          provider: ${{ matrix.provider || needs.runners.outputs.provider }}
 
   lint:
     name: 'lint'
diff --git a/ci/README.md b/ci/README.md
index 314d336b76c..0b6a34460ca 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -87,8 +87,10 @@ To configure the primary repository, follow these steps:
 4. Permit the following actions to run:
    1. actions/cache/restore@\*
    1. actions/cache/save@\*
-   1. docker/setup-buildx-action@\*
    1. actions/github-script@\*
+   1. docker/setup-buildx-action@\*
+   1. warpbuilds/cache/restore@\*
+   1. warpbuilds/cache/save@\*
 
 ### Forked repositories
 

From 70000a560b26c4e02f194d082851a1d4813df90b Mon Sep 17 00:00:00 2001
From: will <will@256k1.dev>
Date: Wed, 3 Jun 2026 11:25:11 +0100
Subject: [PATCH 11/26] ci: use Warp cache for Docker layers

Speeds of 1MB/s and 15 minute cached docker image pulls during builds
are not uncommon.

Warp runners provide a local GitHub Actions cache protocol proxy for
Docker layer cache traffic. Point BuildKit's gha cache backend at that
proxy on Warp runners so cached image layers do not have to be fetched
from GitHub's slower cache service.

Add a default for provider so other users (e.g. qa-assets) don't have to
update this unless they use custome runners.

Github-Pull: #35447
Rebased-From: 82901981bfbaeb3f41956597e6d90daa59a0c078
---
 .github/actions/configure-docker/action.yml | 22 +++++++++++++++++++--
 .github/workflows/ci.yml                    |  6 ++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.github/actions/configure-docker/action.yml b/.github/actions/configure-docker/action.yml
index 6f89dc8bd04..074b47ce348 100644
--- a/.github/actions/configure-docker/action.yml
+++ b/.github/actions/configure-docker/action.yml
@@ -1,9 +1,22 @@
 name: 'Configure Docker'
 description: 'Set up Docker build driver and configure build cache args'
+inputs:
+  provider:
+    description: 'The cache provider to use'
+    required: false
+    default: 'gha'
 runs:
   using: 'composite'
   steps:
+    - name: Set up Docker Buildx for Warp cache
+      if: ${{ inputs.provider == 'warp' }}
+      uses: docker/setup-buildx-action@v4
+      with:
+        driver-opts: |
+          network=host
+
     - name: Set up Docker Buildx
+      if: ${{ inputs.provider != 'warp' }}
       uses: docker/setup-buildx-action@v4
 
     # This is required when using the gha cache backend with a manual docker buildx invocation.
@@ -23,13 +36,18 @@ runs:
     - name: Construct docker build cache args
       shell: bash
       run: |
+        cache_options="scope=${CONTAINER_NAME}"
+        if [[ "${{ inputs.provider }}" == "warp" ]]; then
+          cache_options="url=http://127.0.0.1:49160/,version=1,${cache_options}"
+        fi
+
         # Configure docker build cache backend
         # Always optimistically --cache‑from in case a cache blob exists
-        args=(--cache-from "type=gha,scope=${CONTAINER_NAME}")
+        args=(--cache-from "type=gha,${cache_options}")
 
         # Only add --cache-to when pushing to the default branch.
         if [[ ${{ github.event_name }} == "push" && ${{ github.ref_name }} == ${{ github.event.repository.default_branch }} ]]; then
-          args+=(--cache-to "type=gha,mode=max,ignore-error=true,scope=${CONTAINER_NAME}")
+          args+=(--cache-to "type=gha,mode=max,ignore-error=true,${cache_options}")
         fi
 
         # Always `--load` into docker images (needed when using the `docker-container` build driver).
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c314ec33a6..4d3a1b02bf3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -369,6 +369,8 @@ jobs:
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
+        with:
+          provider: ${{ needs.runners.outputs.provider }}
 
       - name: CI script
         run: ./ci/test_run_all.sh
@@ -557,6 +559,8 @@ jobs:
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
+        with:
+          provider: ${{ matrix.provider || needs.runners.outputs.provider }}
 
       - name: Clear unnecessary files
         if: ${{ needs.runners.outputs.provider == 'gha' && true || false }} # Only needed on GHA runners
@@ -600,6 +604,8 @@ jobs:
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
+        with:
+          provider: ${{ needs.runners.outputs.provider }}
 
       - name: CI script
         run: |

From 2c7986b3ee791591bbcfafe149f411dc43d29e49 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Tue, 19 May 2026 07:03:37 +0200
Subject: [PATCH 12/26] net: use the proxy if overriden when doing v2->v1
 reconnections

`OpenNetworkConnection()` supports overriding the proxy to use for
connecting. However when v2 connection is attempted and it fails a v1
connection is tried without that proxy.

Store the override proxy in `CNode` and pass it to
`CConnman::m_reconnections` to be used for v1 retries.

Github-Pull: #35410
Rebased-From: fd230f942d8377cafcc346f1605d5aa00db2cc40
---
 src/net.cpp | 6 +++++-
 src/net.h   | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 4f88aa8aab9..5db4d1ca846 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -536,6 +536,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                                 network_id,
                                 CNodeOptions{
                                     .permission_flags = permission_flags,
+                                    .proxy_override = proxy_override,
                                     .i2p_sam_session = std::move(i2p_transient_session),
                                     .recv_flood_size = nReceiveFloodSize,
                                     .use_v2transport = use_v2transport,
@@ -1943,6 +1944,7 @@ void CConnman::DisconnectNodes()
                 // and we don't want to hold up the socket handler thread for that long.
                 if (network_active && pnode->m_transport->ShouldReconnectV1()) {
                     reconnections_to_add.push_back({
+                        .proxy_override = pnode->m_proxy_override,
                         .addr_connect = pnode->addr,
                         .grant = std::move(pnode->grantOutbound),
                         .destination = pnode->m_dest,
@@ -3980,6 +3982,7 @@ CNode::CNode(NodeId idIn,
       m_permission_flags{node_opts.permission_flags},
       m_sock{sock},
       m_connected{GetTime<std::chrono::seconds>()},
+      m_proxy_override{std::move(node_opts.proxy_override)},
       addr{addrIn},
       addrBind{addrBindIn},
       m_addr_name{addrNameIn.empty() ? addr.ToStringAddrPort() : addrNameIn},
@@ -4163,7 +4166,8 @@ void CConnman::PerformReconnections()
                               std::move(item.grant),
                               item.destination.empty() ? nullptr : item.destination.c_str(),
                               item.conn_type,
-                              item.use_v2transport);
+                              item.use_v2transport,
+                              item.proxy_override);
     }
 }
 
diff --git a/src/net.h b/src/net.h
index b209df61436..b8d675b803b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -669,6 +669,7 @@ public:
 struct CNodeOptions
 {
     NetPermissionFlags permission_flags = NetPermissionFlags::None;
+    std::optional<Proxy> proxy_override = {};
     std::unique_ptr<i2p::sam::Session> i2p_sam_session = nullptr;
     bool prefer_evict = false;
     size_t recv_flood_size{DEFAULT_MAXRECEIVEBUFFER * 1000};
@@ -711,6 +712,10 @@ public:
     std::atomic<std::chrono::seconds> m_last_recv{0s};
     //! Unix epoch time at peer connection
     const std::chrono::seconds m_connected;
+
+    //! Proxy to use regardless of global proxy settings if reconnecting to this node.
+    const std::optional<Proxy> m_proxy_override;
+
     // Address of this peer
     const CAddress addr;
     // Bind address of our side of the connection
@@ -1778,6 +1783,7 @@ private:
     /** Struct for entries in m_reconnections. */
     struct ReconnectionInfo
     {
+        std::optional<Proxy> proxy_override;
         CAddress addr_connect;
         CountingSemaphoreGrant<> grant;
         std::string destination;

From 66377c3c8444801e3059689c4e57ce158511056b Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Mon, 25 May 2026 18:36:39 +0200
Subject: [PATCH 13/26] net: ensure no direct private broadcast connections

Private broadcast connections use either Tor or I2P, which require a
proxy intrinsically or IPv4 or IPv6 which must use a proxy in the
context of private broadcast to avoid leaking the originator's IP
address.

Add a safety check to guard against future mistakes.

Co-authored-by: Andrew Toth <andrewstoth@gmail.com>

Github-Pull: #35410
Rebased-From: d01b461f71e255dcb5d7d0ee84a560f26cfe0b6f
---
 src/net.cpp               | 7 +++++--
 src/test/fuzz/connman.cpp | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 5db4d1ca846..c6de2fbdc90 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -487,8 +487,11 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                 LogDebug(BCLog::PROXY, "Using proxy: %s to connect to %s\n", proxy.ToString(), target_addr.ToStringAddrPort());
                 sock = ConnectThroughProxy(proxy, target_addr.ToStringAddr(), target_addr.GetPort(), proxyConnectionFailed);
             } else {
-                // no proxy needed (none set for target network)
-                sock = ConnectDirectly(target_addr, conn_type == ConnectionType::MANUAL);
+                // No proxy needed (none set for target network). Private broadcast connections
+                // must always use a proxy, otherwise they would leak the originator's IP address.
+                if (Assume(conn_type != ConnectionType::PRIVATE_BROADCAST)) {
+                    sock = ConnectDirectly(target_addr, conn_type == ConnectionType::MANUAL);
+                }
             }
             if (!proxyConnectionFailed) {
                 // If a connection to the node was attempted, and failure (if any) is not caused by a problem connecting to
diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp
index 4a8b7b2155f..fdf25106525 100644
--- a/src/test/fuzz/connman.cpp
+++ b/src/test/fuzz/connman.cpp
@@ -173,13 +173,19 @@ FUZZ_TARGET(connman, .init = initialize_connman)
                     conn_type = ConnectionType::OUTBOUND_FULL_RELAY;
                 }
 
+                std::optional<Proxy> proxy_override;
+                if (conn_type == ConnectionType::PRIVATE_BROADCAST || fuzzed_data_provider.ConsumeBool()) {
+                    proxy_override.emplace(ConsumeService(fuzzed_data_provider));
+                }
+
                 connman.OpenNetworkConnection(
                     /*addrConnect=*/random_address,
                     /*fCountFailure=*/fuzzed_data_provider.ConsumeBool(),
                     /*grant_outbound=*/{},
                     /*pszDest=*/fuzzed_data_provider.ConsumeBool() ? nullptr : random_string.c_str(),
                     /*conn_type=*/conn_type,
-                    /*use_v2transport=*/fuzzed_data_provider.ConsumeBool());
+                    /*use_v2transport=*/fuzzed_data_provider.ConsumeBool(),
+                    /*proxy_override=*/proxy_override);
             },
             [&] {
                 connman.SetNetworkActive(fuzzed_data_provider.ConsumeBool());

From ef20249568d3437f11b7faa8536b1a1ea2cec29e Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Fri, 29 May 2026 09:04:48 +0200
Subject: [PATCH 14/26] test: make reusable SOCKS5 server starting

Extract the part of `p2p_private_broadcast.py` that configures and
starts the SOCKS5 server into a reusable function and put it into
`test_framework/socks5.py`.

Use bind port 0 to let the OS pick an available port instead of
hackishly assuming that `p2p_port(N)` is available where N is more
than the number of the nodes the test uses.

Github-Pull: #35410
Rebased-From: 2ffa81fac40fd4d03bdcfd37479a6f3305afb483
---
 test/functional/p2p_private_broadcast.py | 20 +++-----------------
 test/functional/test_framework/socks5.py | 12 ++++++++++++
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/test/functional/p2p_private_broadcast.py b/test/functional/p2p_private_broadcast.py
index 77bf0e952e9..bf568ee50d7 100755
--- a/test/functional/p2p_private_broadcast.py
+++ b/test/functional/p2p_private_broadcast.py
@@ -29,8 +29,7 @@ from test_framework.netutil import (
 )
 from test_framework.script_util import build_malleated_tx_package
 from test_framework.socks5 import (
-    Socks5Configuration,
-    Socks5Server,
+    start_socks5_server,
 )
 from test_framework.test_framework import (
     BitcoinTestFramework,
@@ -40,7 +39,6 @@ from test_framework.util import (
     assert_greater_than_or_equal,
     assert_not_equal,
     assert_raises_rpc_error,
-    p2p_port,
     tor_port,
 )
 from test_framework.wallet import (
@@ -166,18 +164,6 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
         self.num_nodes = 2
 
     def setup_nodes(self):
-        # Start a SOCKS5 proxy server.
-        socks5_server_config = Socks5Configuration()
-        # self.nodes[0] listens on p2p_port(0),
-        # self.nodes[1] listens on p2p_port(1),
-        # thus we tell the SOCKS5 server to listen on p2p_port(self.num_nodes) (self.num_nodes is 2)
-        socks5_server_config.addr = ("127.0.0.1", p2p_port(self.num_nodes))
-        socks5_server_config.unauth = True
-        socks5_server_config.auth = True
-
-        self.socks5_server = Socks5Server(socks5_server_config)
-        self.socks5_server.start()
-
         self.destinations = []
 
         self.destinations_lock = threading.Lock()
@@ -268,7 +254,7 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
                     "actual_to_port": actual_to_port,
                 }
 
-        self.socks5_server.conf.destinations_factory = destinations_factory
+        self.socks5_server = start_socks5_server(destinations_factory)
 
         self.extra_args = [
             [
@@ -279,7 +265,7 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
                 "-v2transport=0",
                 "-test=addrman",
                 "-privatebroadcast",
-                f"-proxy={socks5_server_config.addr[0]}:{socks5_server_config.addr[1]}",
+                f"-proxy={self.socks5_server.conf.addr[0]}:{self.socks5_server.conf.addr[1]}",
                 # To increase coverage, make it think that the I2P network is reachable so that it
                 # selects such addresses as well. Pick a proxy address where nobody is listening
                 # and connection attempts fail quickly.
diff --git a/test/functional/test_framework/socks5.py b/test/functional/test_framework/socks5.py
index 28aa2e8e383..930e0e677f1 100644
--- a/test/functional/test_framework/socks5.py
+++ b/test/functional/test_framework/socks5.py
@@ -327,3 +327,15 @@ class Socks5Server():
                     logger.debug(f"Stop(): Handler {i} thread joined")
                 else:
                     logger.warning(f"Stop(): Handler thread {i} didn't finish after force close")
+
+def start_socks5_server(destinations_factory):
+    config = Socks5Configuration()
+    config.addr = ("127.0.0.1", 0) # Use port=0 to let the OS pick one. The actual port is later in server.conf.addr[1].
+    config.unauth = True
+    config.auth = True
+    config.destinations_factory = destinations_factory
+
+    server = Socks5Server(config)
+    server.start()
+
+    return server

From 70a8687d9dcf69d03bc75e60fc2e7dd05df9ccb0 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Fri, 29 May 2026 09:45:12 +0200
Subject: [PATCH 15/26] test: make reusable starting a standalone P2P listener

Extract the part of `p2p_private_broadcast.py` that starts
listening on a `P2PConnection` object (or its children classes)
and put it into `test_framework/p2p.py`.

Github-Pull: #35410
Rebased-From: 2333be9cbc58dd2a533c9bd604b9db593b1d96a7
---
 test/functional/p2p_private_broadcast.py | 18 ++----------------
 test/functional/test_framework/p2p.py    | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/test/functional/p2p_private_broadcast.py b/test/functional/p2p_private_broadcast.py
index bf568ee50d7..f546fcef633 100755
--- a/test/functional/p2p_private_broadcast.py
+++ b/test/functional/p2p_private_broadcast.py
@@ -15,6 +15,7 @@ from test_framework.p2p import (
     P2PInterface,
     P2P_SERVICES,
     P2P_VERSION,
+    start_p2p_listener,
 )
 from test_framework.messages import (
     CAddress,
@@ -221,22 +222,7 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
                     listener.peer_connect_helper(dstaddr="0.0.0.0", dstport=0, net=self.chain, timeout_factor=self.options.timeout_factor)
                     listener.peer_connect_send_version(services=P2P_SERVICES)
 
-                    def on_listen_done(addr, port):
-                        nonlocal actual_to_addr
-                        nonlocal actual_to_port
-                        actual_to_addr = addr
-                        actual_to_port = port
-
-                    # Use port=0 to let the OS assign an available port. This
-                    # avoids "address already in use" errors when tests run
-                    # concurrently or ports are still in TIME_WAIT state.
-                    self.network_thread.listen(
-                        addr="127.0.0.1",
-                        port=0,
-                        p2p=listener,
-                        callback=on_listen_done)
-                    # Wait until the callback has been called.
-                    self.wait_until(lambda: actual_to_port != 0)
+                    actual_to_addr, actual_to_port = start_p2p_listener(self.network_thread, listener)
 
                 self.log.debug(f"Instructing the SOCKS5 proxy to redirect connection i={i} ({conn_type}) for "
                                f"{format_addr_port(requested_to_addr, requested_to_port)} to "
diff --git a/test/functional/test_framework/p2p.py b/test/functional/test_framework/p2p.py
index fae4eb94c21..4d812ce3b19 100755
--- a/test/functional/test_framework/p2p.py
+++ b/test/functional/test_framework/p2p.py
@@ -973,3 +973,27 @@ class P2PTxInvStore(P2PInterface):
         self.wait_until(lambda: set(self.tx_invs_received.keys()) == set([int(tx, 16) for tx in txns]), timeout=timeout)
         # Flush messages and wait for the getdatas to be processed
         self.sync_with_ping()
+
+def start_p2p_listener(network_thread, listener):
+    listen_addr = ""
+    listen_port = 0
+
+    def on_listen_done(addr, port):
+        nonlocal listen_addr
+        nonlocal listen_port
+        listen_addr = addr
+        listen_port = port
+
+    # Use port=0 to let the OS assign an available port. This
+    # avoids "address already in use" errors when tests run
+    # concurrently or ports are still in TIME_WAIT state.
+    network_thread.listen(
+        addr="127.0.0.1",
+        port=0,
+        p2p=listener,
+        callback=on_listen_done)
+
+    # Wait until the callback has been called.
+    wait_until_helper_internal(lambda: listen_port != 0)
+
+    return listen_addr, listen_port

From 6c08cb732322fdaf0bd3bbbaca0acc375fb321e2 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Fri, 29 May 2026 10:02:45 +0200
Subject: [PATCH 16/26] test: make reusable filling of a node's addrman

Extract the part of `p2p_private_broadcast.py` that fills a given node's
addrman and put it into `test_framework/test_framework.py`.

Github-Pull: #35410
Rebased-From: ab35a028eded00008841a3ec8662823090bfc68b
---
 test/functional/p2p_private_broadcast.py      | 118 +----------------
 .../test_framework/test_framework.py          | 120 ++++++++++++++++++
 2 files changed, 122 insertions(+), 116 deletions(-)

diff --git a/test/functional/p2p_private_broadcast.py b/test/functional/p2p_private_broadcast.py
index f546fcef633..8cf609e22e7 100755
--- a/test/functional/p2p_private_broadcast.py
+++ b/test/functional/p2p_private_broadcast.py
@@ -48,116 +48,6 @@ from test_framework.wallet import (
 
 NUM_PRIVATE_BROADCAST_PER_TX = 3
 
-# Fill addrman with these addresses. Must have enough Tor addresses, so that even
-# if all 10 default connections are opened to a Tor address (!?) there must be more
-# for private broadcast.
-ADDRMAN_ADDRESSES = [
-    "20.0.0.1",
-    "30.0.0.1",
-    "40.0.0.1",
-    "50.0.0.1",
-    "60.0.0.1",
-    "70.0.0.1",
-    "80.0.0.1",
-    "90.0.0.1",
-    "100.0.0.1",
-    "110.0.0.1",
-    "120.0.0.1",
-    "130.0.0.1",
-    "140.0.0.1",
-    "150.0.0.1",
-    "160.0.0.1",
-    "170.0.0.1",
-    "180.0.0.1",
-    "190.0.0.1",
-    "200.0.0.1",
-    "210.0.0.1",
-
-    "[20::1]",
-    "[30::1]",
-    "[40::1]",
-    "[50::1]",
-    "[60::1]",
-    "[70::1]",
-    "[80::1]",
-    "[90::1]",
-    "[100::1]",
-    "[110::1]",
-    "[120::1]",
-    "[130::1]",
-    "[140::1]",
-    "[150::1]",
-    "[160::1]",
-    "[170::1]",
-    "[180::1]",
-    "[190::1]",
-    "[200::1]",
-    "[210::1]",
-
-    "testonlyad777777777777777777777777777777777777777775b6qd.onion",
-    "testonlyah77777777777777777777777777777777777777777z7ayd.onion",
-    "testonlyal77777777777777777777777777777777777777777vp6qd.onion",
-    "testonlyap77777777777777777777777777777777777777777r5qad.onion",
-    "testonlyat77777777777777777777777777777777777777777udsid.onion",
-    "testonlyax77777777777777777777777777777777777777777yciid.onion",
-    "testonlya777777777777777777777777777777777777777777rhgyd.onion",
-    "testonlybd77777777777777777777777777777777777777777rs4ad.onion",
-    "testonlybp77777777777777777777777777777777777777777zs2ad.onion",
-    "testonlybt777777777777777777777777777777777777777777x6id.onion",
-    "testonlybx777777777777777777777777777777777777777775styd.onion",
-    "testonlyb3777777777777777777777777777777777777777774ckid.onion",
-    "testonlycd77777777777777777777777777777777777777777733id.onion",
-    "testonlych77777777777777777777777777777777777777777t6kid.onion",
-    "testonlycl77777777777777777777777777777777777777777tt3ad.onion",
-    "testonlyct77777777777777777777777777777777777777777wvhyd.onion",
-    "testonlycx7777777777777777777777777777777777777777774bad.onion",
-    "testonlyc377777777777777777777777777777777777777777u6aid.onion",
-    "testonlydd777777777777777777777777777777777777777777u5ad.onion",
-    "testonlydh77777777777777777777777777777777777777777wgnyd.onion",
-
-    "testonlyad77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyah77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyap77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyat77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyax77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlya377777777777777777777777777777777777777777q.b32.i2p",
-    "testonlya777777777777777777777777777777777777777777q.b32.i2p",
-    "testonlybd77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlybh77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlybl77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlybp77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlybt77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlybx77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyb777777777777777777777777777777777777777777q.b32.i2p",
-    "testonlych77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlycp77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyct77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlycx77777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyc377777777777777777777777777777777777777777q.b32.i2p",
-    "testonlyc777777777777777777777777777777777777777777q.b32.i2p",
-
-    "[fc00::1]",
-    "[fc00::2]",
-    "[fc00::3]",
-    "[fc00::5]",
-    "[fc00::6]",
-    "[fc00::7]",
-    "[fc00::8]",
-    "[fc00::9]",
-    "[fc00::10]",
-    "[fc00::11]",
-    "[fc00::12]",
-    "[fc00::13]",
-    "[fc00::15]",
-    "[fc00::16]",
-    "[fc00::17]",
-    "[fc00::18]",
-    "[fc00::19]",
-    "[fc00::20]",
-    "[fc00::22]",
-    "[fc00::23]",
-]
-
 
 class P2PPrivateBroadcast(BitcoinTestFramework):
     def set_test_params(self):
@@ -333,13 +223,9 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
         tx_receiver = self.nodes[1]
         far_observer = tx_receiver.add_p2p_connection(P2PInterface())
 
-        wallet = MiniWallet(tx_originator)
+        self.fill_node_addrman(node_index=0, address_types_to_add=[CAddress.NET_IPV4, CAddress.NET_IPV6, CAddress.NET_TORV3, CAddress.NET_I2P, CAddress.NET_CJDNS])
 
-        # Fill tx_originator's addrman.
-        for addr in ADDRMAN_ADDRESSES:
-            res = tx_originator.addpeeraddress(address=addr, port=0 if addr.endswith(".i2p") else 8333, tried=False)
-            if not res["success"]:
-                self.log.debug(f"Could not add {addr} to tx_originator's addrman (collision?)")
+        wallet = MiniWallet(tx_originator)
 
         txs = wallet.create_self_transfer_chain(chain_length=3)
         self.log.info(f"Created txid={txs[0]['txid']}: for basic test")
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index acc52c56c19..b95b240e4a2 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -23,6 +23,7 @@ import time
 from .address import create_deterministic_address_bcrt1_p2tr_op_true
 from .authproxy import JSONRPCException
 from . import coverage
+from .messages import CAddress
 from .p2p import NetworkThread
 from .test_node import TestNode
 from .util import (
@@ -728,6 +729,125 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
     def wait_until(self, test_function, timeout=60, check_interval=0.05):
         return wait_until_helper_internal(test_function, timeout=timeout, timeout_factor=self.options.timeout_factor, check_interval=check_interval)
 
+    def fill_node_addrman(self, *, node_index, address_types_to_add):
+        ADDRESSES = {
+            CAddress.NET_IPV4: [
+                "20.0.0.1",
+                "30.0.0.1",
+                "40.0.0.1",
+                "50.0.0.1",
+                "60.0.0.1",
+                "70.0.0.1",
+                "80.0.0.1",
+                "90.0.0.1",
+                "100.0.0.1",
+                "110.0.0.1",
+                "120.0.0.1",
+                "130.0.0.1",
+                "140.0.0.1",
+                "150.0.0.1",
+                "160.0.0.1",
+                "170.0.0.1",
+                "180.0.0.1",
+                "190.0.0.1",
+                "200.0.0.1",
+                "210.0.0.1",
+            ],
+            CAddress.NET_IPV6: [
+                "[20::1]",
+                "[30::1]",
+                "[40::1]",
+                "[50::1]",
+                "[60::1]",
+                "[70::1]",
+                "[80::1]",
+                "[90::1]",
+                "[100::1]",
+                "[110::1]",
+                "[120::1]",
+                "[130::1]",
+                "[140::1]",
+                "[150::1]",
+                "[160::1]",
+                "[170::1]",
+                "[180::1]",
+                "[190::1]",
+                "[200::1]",
+                "[210::1]",
+            ],
+            CAddress.NET_TORV3: [
+                "testonlyad777777777777777777777777777777777777777775b6qd.onion",
+                "testonlyah77777777777777777777777777777777777777777z7ayd.onion",
+                "testonlyal77777777777777777777777777777777777777777vp6qd.onion",
+                "testonlyap77777777777777777777777777777777777777777r5qad.onion",
+                "testonlyat77777777777777777777777777777777777777777udsid.onion",
+                "testonlyax77777777777777777777777777777777777777777yciid.onion",
+                "testonlya777777777777777777777777777777777777777777rhgyd.onion",
+                "testonlybd77777777777777777777777777777777777777777rs4ad.onion",
+                "testonlybp77777777777777777777777777777777777777777zs2ad.onion",
+                "testonlybt777777777777777777777777777777777777777777x6id.onion",
+                "testonlybx777777777777777777777777777777777777777775styd.onion",
+                "testonlyb3777777777777777777777777777777777777777774ckid.onion",
+                "testonlycd77777777777777777777777777777777777777777733id.onion",
+                "testonlych77777777777777777777777777777777777777777t6kid.onion",
+                "testonlycl77777777777777777777777777777777777777777tt3ad.onion",
+                "testonlyct77777777777777777777777777777777777777777wvhyd.onion",
+                "testonlycx7777777777777777777777777777777777777777774bad.onion",
+                "testonlyc377777777777777777777777777777777777777777u6aid.onion",
+                "testonlydd777777777777777777777777777777777777777777u5ad.onion",
+                "testonlydh77777777777777777777777777777777777777777wgnyd.onion",
+            ],
+            CAddress.NET_I2P: [
+                "testonlyad77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyah77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyap77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyat77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyax77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlya377777777777777777777777777777777777777777q.b32.i2p",
+                "testonlya777777777777777777777777777777777777777777q.b32.i2p",
+                "testonlybd77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlybh77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlybl77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlybp77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlybt77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlybx77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyb777777777777777777777777777777777777777777q.b32.i2p",
+                "testonlych77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlycp77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyct77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlycx77777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyc377777777777777777777777777777777777777777q.b32.i2p",
+                "testonlyc777777777777777777777777777777777777777777q.b32.i2p",
+            ],
+            CAddress.NET_CJDNS: [
+                "[fc00::1]",
+                "[fc00::2]",
+                "[fc00::3]",
+                "[fc00::5]",
+                "[fc00::6]",
+                "[fc00::7]",
+                "[fc00::8]",
+                "[fc00::9]",
+                "[fc00::10]",
+                "[fc00::11]",
+                "[fc00::12]",
+                "[fc00::13]",
+                "[fc00::15]",
+                "[fc00::16]",
+                "[fc00::17]",
+                "[fc00::18]",
+                "[fc00::19]",
+                "[fc00::20]",
+                "[fc00::22]",
+                "[fc00::23]",
+            ],
+        }
+        for addr_type in address_types_to_add:
+            for addr in ADDRESSES[addr_type]:
+                res = self.nodes[node_index].addpeeraddress(address=addr, port=0 if addr.endswith(".i2p") else 8333, tried=False)
+                if not res["success"]:
+                    self.log.debug(f"Could not add {addr} to nodes[{node_index}]'s addrman (collision?)")
+
     # Private helper methods. These should not be accessed by the subclass test scripts.
 
     def _start_logging(self):

From 13df77d13bc86e23f64d7f76a3f038d6128c2d3c Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Fri, 29 May 2026 06:47:58 +0200
Subject: [PATCH 17/26] test: add a regression test for private broadcast v1
 retries

Github-Pull: #35410
Rebased-From: 5a3756d150fc095d0038592c6338225db48fd4b5
---
 .../p2p_private_broadcast_retry_v1.py         | 199 ++++++++++++++++++
 test/functional/test_runner.py                |   1 +
 2 files changed, 200 insertions(+)
 create mode 100755 test/functional/p2p_private_broadcast_retry_v1.py

diff --git a/test/functional/p2p_private_broadcast_retry_v1.py b/test/functional/p2p_private_broadcast_retry_v1.py
new file mode 100755
index 00000000000..87fa440a883
--- /dev/null
+++ b/test/functional/p2p_private_broadcast_retry_v1.py
@@ -0,0 +1,199 @@
+#!/usr/bin/env python3
+# Copyright (c) 2026-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""
+Ensure that when v2 private broadcast connection to IPv4 fails the v1 retry
+will also be made through the Tor proxy.
+
+The test does:
+* Add a bunch of IPv4 addresses to the node's addrman (they will be added without P2P_V2 flag).
+* Get them to report P2P_V2 in their service flags and connect to each one, so that the flags
+  in addrman are updated to contain P2P_V2.
+* Get one successful connection to a Tor peer (.onion) so that bitcoind assumes the configured
+  Tor proxy works and is indeed a proxy to the Tor network. This will make it open private
+  broadcast connections also to IPv4 addresses via that proxy.
+* Start some private broadcast connections.
+* Remember the destination IPv4 address of the first connection and get it to fail the v2
+  transport.
+* Wait for a subsequent connection also through the Tor proxy to the same IPv4 and expect
+  it to be v1, i.e. the v2->v1 downgrade retry.
+"""
+
+from test_framework.netutil import (
+    format_addr_port
+)
+from test_framework.p2p import (
+    P2PConnection,
+    P2PInterface,
+    P2P_SERVICES,
+    start_p2p_listener,
+)
+from test_framework.messages import (
+    CAddress,
+    NODE_P2P_V2,
+)
+from test_framework.socks5 import (
+    start_socks5_server,
+)
+from test_framework.test_framework import (
+    BitcoinTestFramework,
+)
+from test_framework.v2_p2p import (
+    EncryptedP2PState,
+)
+from test_framework.wallet import (
+    MiniWallet,
+)
+
+class P2PDetermineV2or1AndClose(P2PConnection):
+    def __init__(self, on_v2or1_determined):
+        super().__init__()
+        self.on_v2or1_determined = on_v2or1_determined
+
+    # https://docs.python.org/3/library/asyncio-protocol.html#asyncio.Protocol.data_received
+    def data_received(self, data):
+        self.recvbuf += data
+        if len(self.recvbuf) >= 4:
+            self.on_v2or1_determined(1 if self.recvbuf[0:4] == self.magic_bytes else 2)
+            self.peer_disconnect()
+
+    def on_open(self):
+        pass
+
+    def on_close(self):
+        pass
+
+class P2PPrivateBroadcastRetryV1(BitcoinTestFramework):
+    def set_test_params(self):
+        self.disable_autoconnect = False
+        self.num_nodes = 1
+
+    def ipv4_via_tor_proxy_conn_versions_append(self, v2or1):
+        """
+        Add to the transport versions (v2 or v1) tried towards the first IPv4 which
+        nodes[0] tries to connect to via the Tor proxy.
+        """
+        self.ipv4_via_tor_proxy_conn_versions.append(v2or1)
+
+    def setup_nodes(self):
+        def destinations_factory_all_proxy(requested_to_addr, requested_to_port):
+            """
+            Instruct the SOCKS5 proxy to redirect all connections to newly created P2PInterface
+            objects that claim support for P2P_V2.
+            """
+            listener = P2PInterface()
+            listener.peer_connect_helper(dstaddr="0.0.0.0", dstport=0, net=self.chain, timeout_factor=self.options.timeout_factor)
+            listener.peer_connect_send_version(services=P2P_SERVICES | NODE_P2P_V2)
+
+            actual_to_addr, actual_to_port = start_p2p_listener(self.network_thread, listener)
+
+            self.log.debug("Instructing the common proxy to redirect connection for "
+                           f"{format_addr_port(requested_to_addr, requested_to_port)} to "
+                           f"{format_addr_port(actual_to_addr, actual_to_port)} (Python {type(listener).__name__})")
+
+            return {
+                "actual_to_addr": actual_to_addr,
+                "actual_to_port": actual_to_port,
+            }
+
+        self.all_proxy = start_socks5_server(destinations_factory_all_proxy)
+
+        self.ipv4_via_tor_proxy_addr_port = None # Remember the first IPv4 address connected to via the Tor proxy.
+        self.ipv4_via_tor_proxy_conn_versions = [] # Transport versions tried on that address.
+
+        def destinations_factory_tor_proxy(requested_to_addr, requested_to_port):
+            """
+            Instruct the SOCKS5 proxy to redirect all connections to newly created P2PInterface,
+            except the first connection to an IPv4 address and all subsequent connections to that
+            address which are redirected to P2PDetermineV2or1AndClose.
+            """
+            requested_to = format_addr_port(requested_to_addr, requested_to_port)
+
+            if not requested_to_addr.endswith(".onion") and self.ipv4_via_tor_proxy_addr_port is None: # First IPv4
+                self.ipv4_via_tor_proxy_addr_port = requested_to
+
+            if self.ipv4_via_tor_proxy_addr_port == requested_to:
+                # This is either the first (v2) or the second (the expected v1 retry) connection to requested_to.
+                listener = P2PDetermineV2or1AndClose(self.ipv4_via_tor_proxy_conn_versions_append)
+                listener.peer_connect_helper(dstaddr="0.0.0.0", dstport=0, net=self.chain, timeout_factor=self.options.timeout_factor)
+            else:
+                listener = P2PInterface()
+                listener.peer_connect_helper(dstaddr="0.0.0.0", dstport=0, net=self.chain, timeout_factor=self.options.timeout_factor)
+                listener.peer_connect_send_version(services=P2P_SERVICES | NODE_P2P_V2)
+                if not requested_to_addr.endswith(".onion"):
+                    listener.v2_state = EncryptedP2PState(initiating=False, net=self.chain)
+
+            actual_to_addr, actual_to_port = start_p2p_listener(self.network_thread, listener)
+
+            self.log.debug(f"Instructing the Tor proxy to redirect connection for {requested_to} to "
+                           f"{format_addr_port(actual_to_addr, actual_to_port)} (Python {type(listener).__name__})")
+
+            return {
+                "actual_to_addr": actual_to_addr,
+                "actual_to_port": actual_to_port,
+            }
+
+        self.tor_proxy = start_socks5_server(destinations_factory_tor_proxy)
+
+        self.extra_args = [
+            [
+                "-privatebroadcast=1",
+                f"-proxy={self.all_proxy.conf.addr[0]}:{self.all_proxy.conf.addr[1]}",
+                f"-onion={self.tor_proxy.conf.addr[0]}:{self.tor_proxy.conf.addr[1]}",
+                "-test=addrman",
+                "-v2transport=0",
+            ],
+        ]
+
+        super().setup_nodes()
+
+    def setup_network(self):
+        self.setup_nodes()
+
+    def run_test(self):
+        node0 = self.nodes[0]
+
+        self.log.info("Filling node0's addrman with addresses")
+        self.fill_node_addrman(node_index=0, address_types_to_add=[CAddress.NET_IPV4])
+
+        self.log.info("Opening manual connections to all IPv4 addresses to add P2P_V2 flag to addrman entries")
+        for a in node0.getnodeaddresses(count=0, network="ipv4"):
+            node0.addnode(node=format_addr_port(a["address"], a["port"]), command="onetry", v2transport=False)
+
+        self.log.info("Waiting for all IPv4 addresses to get P2P_V2 as a result of peers advertising support")
+        self.wait_until(lambda: all(a["services"] & NODE_P2P_V2 != 0 for a in node0.getnodeaddresses(count=0, network="ipv4")))
+
+        # The destinations behind the -proxy= don't actually support v2. When bitcoind runs with -v2transport=1
+        # and tries v2 on them they would print benign "magic byte mismatch" warnings.
+        # Disable those since none of them are needed anymore.
+        self.all_proxy.conf.destinations_factory = None
+
+        self.restart_node(0, extra_args=self.extra_args[0] + ["-v2transport=1"])
+
+        self.log.info("Opening a connection to a Tor addresses, so bitcoind considers -onion= is a real Tor proxy")
+        node0.addnode(node="testonlyad777777777777777777777777777777777777777775b6qd.onion:1234", command="onetry", v2transport=False)
+
+        self.log.info("Waiting for at least one Tor connection")
+        self.wait_until(lambda: any(p["network"] == "onion" for p in node0.getpeerinfo()))
+
+        self.log.info("Starting private broadcast connections")
+        wallet = MiniWallet(node0)
+        tx = wallet.create_self_transfer()
+        node0.sendrawtransaction(hexstring=tx["hex"])
+
+        self.log.info("Tor proxy: waiting for connection to an IPv4 address")
+        self.wait_until(lambda: self.ipv4_via_tor_proxy_addr_port is not None)
+        self.log.info(f"Tor proxy: got {self.ipv4_via_tor_proxy_addr_port}, waiting for v2")
+        self.wait_until(lambda: 2 in self.ipv4_via_tor_proxy_conn_versions)
+        self.log.info(f"Tor proxy: got {self.ipv4_via_tor_proxy_addr_port} v2, waiting for v1")
+        self.wait_until(lambda: 1 in self.ipv4_via_tor_proxy_conn_versions)
+        self.log.info(f"Tor proxy: got {self.ipv4_via_tor_proxy_addr_port} v2, v1")
+
+        self.stop_node(0)
+        self.all_proxy.stop()
+        self.tor_proxy.stop()
+
+
+if __name__ == "__main__":
+    P2PPrivateBroadcastRetryV1(__file__).main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index cef49a3845e..298edf88024 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -367,6 +367,7 @@ BASE_SCRIPTS = [
     'p2p_permissions.py',
     'feature_blocksdir.py',
     'wallet_startup.py',
+    'p2p_private_broadcast_retry_v1.py',
     'feature_remove_pruned_files_on_startup.py',
     'p2p_i2p_ports.py',
     'p2p_i2p_sessions.py',

From ccb99122f9ee74de59bbd86e2f46995c7d5edb57 Mon Sep 17 00:00:00 2001
From: Eugene Siegel <elzeigel@gmail.com>
Date: Fri, 29 May 2026 12:04:00 +0200
Subject: [PATCH 18/26] net: un-default the OpenNetworkConnection()'s
 proxy_override argument

This way callers will not forget to set it.

Github-Pull: #35410
Rebased-From: bf0d257c11bebc42b88b7e96368ed2be48bc0ad1
---
 src/net.cpp     | 42 +++++++++++++++++++++++++++++++++++-------
 src/net.h       |  2 +-
 src/rpc/net.cpp |  8 +++++++-
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index c6de2fbdc90..5c28efade89 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1906,7 +1906,13 @@ bool CConnman::AddConnection(const std::string& address, ConnectionType conn_typ
     CountingSemaphoreGrant<> grant(*semOutbound, true);
     if (!grant) return false;
 
-    OpenNetworkConnection(CAddress(), false, std::move(grant), address.c_str(), conn_type, /*use_v2transport=*/use_v2transport);
+    OpenNetworkConnection(/*addrConnect=*/CAddress{},
+                          /*fCountFailure=*/false,
+                          /*grant_outbound=*/std::move(grant),
+                          /*pszDest=*/address.c_str(),
+                          /*conn_type=*/conn_type,
+                          /*use_v2transport=*/use_v2transport,
+                          /*proxy_override=*/std::nullopt);
     return true;
 }
 
@@ -2424,7 +2430,13 @@ void CConnman::ProcessAddrFetch()
     CAddress addr;
     CountingSemaphoreGrant<> grant(*semOutbound, /*fTry=*/true);
     if (grant) {
-        OpenNetworkConnection(addr, false, std::move(grant), strDest.c_str(), ConnectionType::ADDR_FETCH, use_v2transport);
+        OpenNetworkConnection(/*addrConnect=*/addr,
+                              /*fCountFailure=*/false,
+                              /*grant_outbound=*/std::move(grant),
+                              /*pszDest=*/strDest.c_str(),
+                              /*conn_type=*/ConnectionType::ADDR_FETCH,
+                              /*use_v2transport=*/use_v2transport,
+                              /*proxy_override=*/std::nullopt);
     }
 }
 
@@ -2542,8 +2554,13 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, std
         {
             for (const std::string& strAddr : connect)
             {
-                CAddress addr(CService(), NODE_NONE);
-                OpenNetworkConnection(addr, false, {}, strAddr.c_str(), ConnectionType::MANUAL, /*use_v2transport=*/use_v2transport);
+                OpenNetworkConnection(/*addrConnect=*/CAddress{CService{}, NODE_NONE},
+                                      /*fCountFailure=*/false,
+                                      /*grant_outbound=*/{},
+                                      /*pszDest=*/strAddr.c_str(),
+                                      /*conn_type=*/ConnectionType::MANUAL,
+                                      /*use_v2transport=*/use_v2transport,
+                                      /*proxy_override=*/std::nullopt);
                 for (int i = 0; i < 10 && i < nLoop; i++)
                 {
                     if (!m_interrupt_net->sleep_for(500ms)) {
@@ -2893,7 +2910,13 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, std
             const bool count_failures{((int)outbound_ipv46_peer_netgroups.size() + outbound_privacy_network_peers) >= std::min(m_max_automatic_connections - 1, 2)};
             // Use BIP324 transport when both us and them have NODE_V2_P2P set.
             const bool use_v2transport(addrConnect.nServices & GetLocalServices() & NODE_P2P_V2);
-            OpenNetworkConnection(addrConnect, count_failures, std::move(grant), /*pszDest=*/nullptr, conn_type, use_v2transport);
+            OpenNetworkConnection(/*addrConnect=*/addrConnect,
+                                  /*fCountFailure=*/count_failures,
+                                  /*grant_outbound=*/std::move(grant),
+                                  /*pszDest=*/nullptr,
+                                  /*conn_type=*/conn_type,
+                                  /*use_v2transport=*/use_v2transport,
+                                  /*proxy_override=*/std::nullopt);
         }
     }
 }
@@ -2987,8 +3010,13 @@ void CConnman::ThreadOpenAddedConnections()
                 break;
             }
             tried = true;
-            CAddress addr(CService(), NODE_NONE);
-            OpenNetworkConnection(addr, false, std::move(grant), info.m_params.m_added_node.c_str(), ConnectionType::MANUAL, info.m_params.m_use_v2transport);
+            OpenNetworkConnection(/*addrConnect=*/CAddress{CService{}, NODE_NONE},
+                                  /*fCountFailure=*/false,
+                                  /*grant_outbound=*/std::move(grant),
+                                  /*pszDest=*/info.m_params.m_added_node.c_str(),
+                                  /*conn_type=*/ConnectionType::MANUAL,
+                                  /*use_v2transport=*/info.m_params.m_use_v2transport,
+                                  /*proxy_override=*/std::nullopt);
             if (!m_interrupt_net->sleep_for(500ms)) return;
             grant = CountingSemaphoreGrant<>(*semAddnode, /*fTry=*/true);
         }
diff --git a/src/net.h b/src/net.h
index b8d675b803b..96a171736ed 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1191,7 +1191,7 @@ public:
                                const char* pszDest,
                                ConnectionType conn_type,
                                bool use_v2transport,
-                               const std::optional<Proxy>& proxy_override = std::nullopt)
+                               const std::optional<Proxy>& proxy_override)
         EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
 
     /// Group of private broadcast related members.
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 5c54e207973..e9fbd31cc3c 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -356,7 +356,13 @@ static RPCHelpMan addnode()
     if (command == "onetry")
     {
         CAddress addr;
-        connman.OpenNetworkConnection(addr, /*fCountFailure=*/false, /*grant_outbound=*/{}, std::string{node_arg}.c_str(), ConnectionType::MANUAL, use_v2transport);
+        connman.OpenNetworkConnection(/*addrConnect=*/addr,
+                                      /*fCountFailure=*/false,
+                                      /*grant_outbound=*/{},
+                                      /*pszDest=*/std::string{node_arg}.c_str(),
+                                      /*conn_type=*/ConnectionType::MANUAL,
+                                      /*use_v2transport=*/use_v2transport,
+                                      /*proxy_override=*/std::nullopt);
         return UniValue::VNULL;
     }
 

From 1ee11d8ba64481be40a7696f1ec75dc6d481bb2b Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 17 Jun 2026 08:00:42 +0200
Subject: [PATCH 19/26] lint: disable leveldb subtree check

This is no-longer a proper subtree, because of direct cherry-picks.
---
 test/lint/test_runner/src/util.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lint/test_runner/src/util.rs b/test/lint/test_runner/src/util.rs
index 11e332e4c5e..1014a0ccabf 100644
--- a/test/lint/test_runner/src/util.rs
+++ b/test/lint/test_runner/src/util.rs
@@ -66,7 +66,7 @@ pub fn get_subtrees() -> Vec<&'static str> {
         "src/crc32c",
         "src/crypto/ctaes",
         "src/ipc/libmultiprocess",
-        "src/leveldb",
+        //"src/leveldb", No longer a subtree in this release branch, due to direct cherry-picks
         "src/minisketch",
         "src/secp256k1",
     ]

From ca00827fab5ed261104502a06a5dfd4c55145c28 Mon Sep 17 00:00:00 2001
From: Shrey <shrey.1.max@gmail.com>
Date: Thu, 28 May 2026 21:05:09 +0530
Subject: [PATCH 20/26] util: Check write failures before renaming
 settings.json

In WriteSettings(), verify that writing to the stream and closing it
succeeded before returning true. This prevents RenameOver() from replacing
a valid settings.json with a corrupted or zero-byte file when write limits
or a full disk are encountered.

Additionally, update the ReadSettings() parse failure message to mention
power loss, full disk, or storage error as possible causes.

Fixes #35373

Github-Pull: #35384
Rebased-From: 0654511e1b935d22fe6c88e3f5d5c7b336516222
---
 src/common/settings.cpp             | 10 +++++++++-
 src/test/settings_tests.cpp         |  2 +-
 test/functional/feature_settings.py |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e9b929794ff..7d511b574de 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -86,7 +86,7 @@ bool ReadSettings(const fs::path& path, std::map<std::string, SettingsValue>& va
 
     SettingsValue in;
     if (!in.read(std::string{std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>()})) {
-        errors.emplace_back(strprintf("Settings file %s does not contain valid JSON. This is probably caused by disk corruption or a crash, "
+        errors.emplace_back(strprintf("Settings file %s does not contain valid JSON. This may be caused by a crash, power loss, full disk, or storage error, "
                                       "and can be fixed by removing the file, which will reset settings to default values.",
                                       fs::PathToString(path)));
         return false;
@@ -139,7 +139,15 @@ bool WriteSettings(const fs::path& path,
         return false;
     }
     file << out.write(/* prettyIndent= */ 4, /* indentLevel= */ 1) << std::endl;
+    if (file.fail()) {
+        errors.emplace_back(strprintf("Error: Unable to write settings file %s", fs::PathToString(path)));
+        return false;
+    }
     file.close();
+    if (file.fail()) {
+        errors.emplace_back(strprintf("Error: Unable to close settings file %s", fs::PathToString(path)));
+        return false;
+    }
     return true;
 }
 
diff --git a/src/test/settings_tests.cpp b/src/test/settings_tests.cpp
index 54d3b058118..0d8e3b1b7ae 100644
--- a/src/test/settings_tests.cpp
+++ b/src/test/settings_tests.cpp
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(ReadWrite)
     // Check invalid json not allowed
     WriteText(path, R"(invalid json)");
     BOOST_CHECK(!common::ReadSettings(path, values, errors));
-    std::vector<std::string> fail_parse = {strprintf("Settings file %s does not contain valid JSON. This is probably caused by disk corruption or a crash, "
+    std::vector<std::string> fail_parse = {strprintf("Settings file %s does not contain valid JSON. This may be caused by a crash, power loss, full disk, or storage error, "
                                                      "and can be fixed by removing the file, which will reset settings to default values.",
                                                      fs::PathToString(path))};
     BOOST_CHECK_EQUAL_COLLECTIONS(errors.begin(), errors.end(), fail_parse.begin(), fail_parse.end());
diff --git a/test/functional/feature_settings.py b/test/functional/feature_settings.py
index 9a4138b9360..0585e056ff4 100755
--- a/test/functional/feature_settings.py
+++ b/test/functional/feature_settings.py
@@ -73,7 +73,7 @@ class SettingsTest(BitcoinTestFramework):
         # Test invalid json
         with settings.open("w") as fp:
             fp.write("invalid json")
-        node.assert_start_raises_init_error(expected_msg='does not contain valid JSON. This is probably caused by disk corruption or a crash', match=ErrorMatch.PARTIAL_REGEX)
+        node.assert_start_raises_init_error(expected_msg='does not contain valid JSON. This may be caused by a crash, power loss, full disk, or storage error', match=ErrorMatch.PARTIAL_REGEX)
 
         # Test invalid json object
         with settings.open("w") as fp:

From fef6c8a4f2bd5698586bcd7bcb6128cdf50ec6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rinc?= <pap.lorinc@gmail.com>
Date: Thu, 4 Jun 2026 19:42:00 +0200
Subject: [PATCH 21/26] coins: test chainstate flush baseline

Add `CDBWrapper::GetProperty()` and expose it through `CCoinsViewDB::GetDBProperty()` so coins tests can inspect LevelDB runtime properties through the coins view.
Use it in a coins DB flush baseline that records the LevelDB layout after flushing while keeping readback coverage for the flushed coin and best block.

Co-authored-by: Andrew Toth <andrewstoth@gmail.com>

Github-Pull: #35465
Rebased-From: b10889d10752c5d5e4954af2959f7bdff47bd67c
---
 src/dbwrapper.cpp        |  9 +++++++--
 src/dbwrapper.h          |  3 +++
 src/test/coins_tests.cpp | 23 +++++++++++++++++++++++
 src/txdb.cpp             |  5 +++++
 src/txdb.h               |  4 ++++
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index eb222078b5e..7aa5ba3b4ba 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -291,11 +291,16 @@ void CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
     }
 }
 
+std::optional<std::string> CDBWrapper::GetProperty(const std::string& property) const
+{
+    if (std::string value; DBContext().pdb->GetProperty(property, &value)) return value;
+    return std::nullopt;
+}
+
 size_t CDBWrapper::DynamicMemoryUsage() const
 {
-    std::string memory;
     std::optional<size_t> parsed;
-    if (!DBContext().pdb->GetProperty("leveldb.approximate-memory-usage", &memory) || !(parsed = ToIntegral<size_t>(memory))) {
+    if (auto memory{GetProperty("leveldb.approximate-memory-usage")}; !memory || !(parsed = ToIntegral<size_t>(*memory))) {
         LogDebug(BCLog::LEVELDB, "Failed to get approximate-memory-usage property\n");
         return 0;
     }
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 2eee6c1c023..18e152f112c 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -250,6 +250,9 @@ public:
 
     void WriteBatch(CDBBatch& batch, bool fSync = false);
 
+    //! Return a LevelDB property value, if available.
+    std::optional<std::string> GetProperty(const std::string& property) const;
+
     // Get an estimate of LevelDB memory usage (in bytes).
     size_t DynamicMemoryUsage() const;
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 8321bf6a18c..79b61c97aaa 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -13,6 +13,7 @@
 #include <txdb.h>
 #include <uint256.h>
 #include <undo.h>
+#include <util/check.h>
 #include <util/strencodings.h>
 
 #include <map>
@@ -1060,6 +1061,28 @@ BOOST_FIXTURE_TEST_CASE(ccoins_flush_behavior, FlushTest)
     }
 }
 
+BOOST_FIXTURE_TEST_CASE(coins_db_leveldb_layout, FlushTest)
+{
+    auto level2_files{[](CCoinsViewDB& base) {
+        return *Assert(ToIntegral<int>(*Assert(base.GetDBProperty("leveldb.num-files-at-level2"))));
+    }};
+    const COutPoint outpoint{Txid::FromUint256(m_rng.rand256()), 0};
+    const Coin coin{MakeCoin()};
+    const uint256 block_hash{m_rng.rand256()};
+
+    CCoinsViewDB base{{.path = m_args.GetDataDirBase() / "coins_db_leveldb_layout", .cache_bytes = 1_MiB, .wipe_data = true}, {}};
+    CCoinsViewCache cache{&base};
+
+    cache.EmplaceCoinInternalDANGER(COutPoint{outpoint}, Coin{coin});
+    cache.SetBestBlock(block_hash);
+    cache.Sync();
+
+    BOOST_CHECK_EQUAL(level2_files(base), 0);
+
+    BOOST_CHECK(*Assert(base.GetCoin(outpoint)) == coin);
+    BOOST_CHECK_EQUAL(base.GetBestBlock(), block_hash);
+}
+
 BOOST_AUTO_TEST_CASE(coins_resource_is_used)
 {
     CCoinsMapMemoryResource resource;
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 2c39cf2767b..3c8eb575ad9 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -168,6 +168,11 @@ size_t CCoinsViewDB::EstimateSize() const
     return m_db->EstimateSize(DB_COIN, uint8_t(DB_COIN + 1));
 }
 
+std::optional<std::string> CCoinsViewDB::GetDBProperty(const std::string& property)
+{
+    return m_db->GetProperty(property);
+}
+
 /** Specialization of CCoinsViewCursor to iterate over a CCoinsViewDB */
 class CCoinsViewDBCursor: public CCoinsViewCursor
 {
diff --git a/src/txdb.h b/src/txdb.h
index 248fe43e559..4f8cb873cb9 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -17,6 +17,7 @@
 #include <cstdint>
 #include <memory>
 #include <optional>
+#include <string>
 #include <vector>
 
 class COutPoint;
@@ -53,6 +54,9 @@ public:
 
     //! Dynamically alter the underlying leveldb cache size.
     void ResizeCache(size_t new_cache_size) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+
+    //! Return an underlying LevelDB property value, if available.
+    std::optional<std::string> GetDBProperty(const std::string& property);
 };
 
 #endif // BITCOIN_TXDB_H

From 711065a3b9a388cda0f0b9ed4a3650d9dc0ed85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rinc?= <pap.lorinc@gmail.com>
Date: Mon, 8 Jun 2026 15:46:45 +0200
Subject: [PATCH 22/26] validation: randomly compact chainstate

Full chainstate flushes are convenient maintenance points for long-term LevelDB cleanup because the chainstate was just written.
Randomize the trigger so nodes that flush near the same height do not compact together.

Add blocking chainstate compaction through `CCoinsViewDB::CompactFull()` and give each post-IBD full flush on the normal chainstate a 1/320 chance to start compaction.
With hourly flushes this averages roughly every two weeks and makes a six-month miss about one in a million.
This keeps the schedule stateless and leaves last-compaction height or timestamp bookkeeping out of chainstate metadata.

Co-authored-by: Andrew Toth <andrewstoth@gmail.com>

Github-Pull: #35465
Rebased-From: aa021b26f39fd231b2a3aac5780d5113a4aea639
---
 src/dbwrapper.cpp        |  4 +++-
 src/dbwrapper.h          |  3 +++
 src/test/coins_tests.cpp |  2 ++
 src/txdb.cpp             |  8 ++++++++
 src/txdb.h               |  3 +++
 src/validation.cpp       | 21 ++++++++++++++++++---
 6 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 7aa5ba3b4ba..6a3f6b00f13 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -246,7 +246,7 @@ CDBWrapper::CDBWrapper(const DBParams& params)
 
     if (params.options.force_compact) {
         LogInfo("Starting database compaction of %s", fs::PathToString(params.path));
-        DBContext().pdb->CompactRange(nullptr, nullptr);
+        CompactFull();
         LogInfo("Finished database compaction of %s", fs::PathToString(params.path));
     }
 
@@ -297,6 +297,8 @@ std::optional<std::string> CDBWrapper::GetProperty(const std::string& property)
     return std::nullopt;
 }
 
+void CDBWrapper::CompactFull() { DBContext().pdb->CompactRange(nullptr, nullptr); }
+
 size_t CDBWrapper::DynamicMemoryUsage() const
 {
     std::optional<size_t> parsed;
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 18e152f112c..3a3be0001cd 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -250,6 +250,9 @@ public:
 
     void WriteBatch(CDBBatch& batch, bool fSync = false);
 
+    //! Perform a blocking full compaction of the underlying LevelDB.
+    void CompactFull();
+
     //! Return a LevelDB property value, if available.
     std::optional<std::string> GetProperty(const std::string& property) const;
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 79b61c97aaa..0d2dfa78220 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -1078,6 +1078,8 @@ BOOST_FIXTURE_TEST_CASE(coins_db_leveldb_layout, FlushTest)
     cache.Sync();
 
     BOOST_CHECK_EQUAL(level2_files(base), 0);
+    WITH_LOCK(::cs_main, base.CompactFull());
+    BOOST_CHECK_EQUAL(level2_files(base), 1);
 
     BOOST_CHECK(*Assert(base.GetCoin(outpoint)) == coin);
     BOOST_CHECK_EQUAL(base.GetBestBlock(), block_hash);
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 3c8eb575ad9..fdcc690c424 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -173,6 +173,14 @@ std::optional<std::string> CCoinsViewDB::GetDBProperty(const std::string& proper
     return m_db->GetProperty(property);
 }
 
+void CCoinsViewDB::CompactFull()
+{
+    AssertLockHeld(::cs_main);
+    LogDebug(BCLog::COINDB, "Starting chainstate compaction of %s", fs::PathToString(m_db_params.path));
+    m_db->CompactFull();
+    LogDebug(BCLog::COINDB, "Finished chainstate compaction of %s", fs::PathToString(m_db_params.path));
+}
+
 /** Specialization of CCoinsViewCursor to iterate over a CCoinsViewDB */
 class CCoinsViewDBCursor: public CCoinsViewCursor
 {
diff --git a/src/txdb.h b/src/txdb.h
index 4f8cb873cb9..69f5f3d6e04 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -55,6 +55,9 @@ public:
     //! Dynamically alter the underlying leveldb cache size.
     void ResizeCache(size_t new_cache_size) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
+    //! Perform a blocking full compaction of the underlying LevelDB.
+    void CompactFull() EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+
     //! Return an underlying LevelDB property value, if available.
     std::optional<std::string> GetDBProperty(const std::string& property);
 };
diff --git a/src/validation.cpp b/src/validation.cpp
index 23181d4b314..61f8a7cba19 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -112,6 +112,13 @@ const std::vector<std::string> CHECKLEVEL_DOC {
  * */
 static constexpr int PRUNE_LOCK_BUFFER{10};
 
+// Return whether the completed full flush should compact chainstate
+static bool ShouldCompactChainstate(bool in_ibd)
+{
+    static constexpr uint32_t flush_ratio{320}; // Roughly every 2 weeks with hourly flushes
+    return !in_ibd && FastRandomContext().randrange(flush_ratio) == 0;
+}
+
 TRACEPOINT_SEMAPHORE(validation, block_connected);
 TRACEPOINT_SEMAPHORE(utxocache, flush);
 TRACEPOINT_SEMAPHORE(mempool, replaced);
@@ -2824,9 +2831,17 @@ bool Chainstate::FlushStateToDisk(
             m_next_write = FastRandomContext().rand_uniform_delay(NodeClock::now() + DATABASE_WRITE_INTERVAL_MIN, range);
         }
     }
-    if (full_flush_completed && m_chainman.m_options.signals) {
-        // Update best block in wallet (so we can detect restored wallets).
-        m_chainman.m_options.signals->ChainStateFlushed(this->GetRole(), GetLocator(m_chain.Tip()));
+    if (full_flush_completed) {
+        if (m_chainman.m_options.signals) {
+            // Update best block in wallet (so we can detect restored wallets).
+            m_chainman.m_options.signals->ChainStateFlushed(this->GetRole(), GetLocator(m_chain.Tip()));
+        }
+
+        if (!m_chainman.m_interrupt && m_chainman.m_chainstates.size() == 1) { // Skip AssumeUTXO
+            if (ShouldCompactChainstate(m_chainman.IsInitialBlockDownload())) {
+                CoinsDB().CompactFull();
+            }
+        }
     }
     } catch (const std::runtime_error& e) {
         return FatalError(m_chainman.GetNotifications(), state, strprintf(_("System error while flushing: %s"), e.what()));

From ea3b318d8dec2d2a212b383c2859e43a75ca808d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rinc?= <pap.lorinc@gmail.com>
Date: Mon, 8 Jun 2026 16:15:21 +0200
Subject: [PATCH 23/26] coins: compact chainstate in background

Full chainstate compaction can take minutes on large databases.
Move `CCoinsViewDB::CompactFull()` to a named `utxocompact` one-shot background thread so validation only schedules the work.

When validation selects compaction after a full flush, the chainstate was just written and another write is less likely to be needed immediately.
The coins view destructor waits for completion, and a mutex prevents compaction from using `m_db` while `ResizeCache()` replaces it.

Co-authored-by: Andrew Toth <andrewstoth@gmail.com>

Github-Pull: #35465
Rebased-From: 394e473d42ba1383dfec45a3eafa8a73a09dbe8b
---
 src/test/coins_tests.cpp |  2 +-
 src/txdb.cpp             | 34 ++++++++++++++++++++++++++++++----
 src/txdb.h               | 11 ++++++++---
 src/validation.cpp       |  6 ++++--
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 0d2dfa78220..cb746a82cdd 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -1078,7 +1078,7 @@ BOOST_FIXTURE_TEST_CASE(coins_db_leveldb_layout, FlushTest)
     cache.Sync();
 
     BOOST_CHECK_EQUAL(level2_files(base), 0);
-    WITH_LOCK(::cs_main, base.CompactFull());
+    WITH_LOCK(::cs_main, return base.CompactFull()).wait();
     BOOST_CHECK_EQUAL(level2_files(base), 1);
 
     BOOST_CHECK(*Assert(base.GetCoin(outpoint)) == coin);
diff --git a/src/txdb.cpp b/src/txdb.cpp
index fdcc690c424..9f522fb8358 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -13,10 +13,14 @@
 #include <serialize.h>
 #include <uint256.h>
 #include <util/log.h>
+#include <util/threadnames.h>
 #include <util/vector.h>
 
 #include <cassert>
+#include <chrono>
 #include <cstdlib>
+#include <exception>
+#include <future>
 #include <iterator>
 #include <utility>
 
@@ -55,11 +59,22 @@ CCoinsViewDB::CCoinsViewDB(DBParams db_params, CoinsViewOptions options) :
     m_options{std::move(options)},
     m_db{std::make_unique<CDBWrapper>(m_db_params)} { }
 
+CCoinsViewDB::~CCoinsViewDB()
+{
+    if (m_compaction.valid()) {
+        if (m_compaction.wait_for(std::chrono::seconds{0}) != std::future_status::ready) {
+            LogInfo("Waiting for background chainstate compaction of %s", fs::PathToString(m_db_params.path));
+        }
+        m_compaction.wait();
+    }
+}
+
 void CCoinsViewDB::ResizeCache(size_t new_cache_size)
 {
     // We can't do this operation with an in-memory DB since we'll lose all the coins upon
     // reset.
     if (!m_db_params.memory_only) {
+        LOCK(m_db_mutex);
         // Have to do a reset first to get the original `m_db` state to release its
         // filesystem lock.
         m_db.reset();
@@ -173,12 +188,23 @@ std::optional<std::string> CCoinsViewDB::GetDBProperty(const std::string& proper
     return m_db->GetProperty(property);
 }
 
-void CCoinsViewDB::CompactFull()
+std::shared_future<void> CCoinsViewDB::CompactFull()
 {
     AssertLockHeld(::cs_main);
-    LogDebug(BCLog::COINDB, "Starting chainstate compaction of %s", fs::PathToString(m_db_params.path));
-    m_db->CompactFull();
-    LogDebug(BCLog::COINDB, "Finished chainstate compaction of %s", fs::PathToString(m_db_params.path));
+    if (m_compaction.valid() && m_compaction.wait_for(std::chrono::seconds{0}) != std::future_status::ready) return m_compaction;
+    m_compaction = std::async(std::launch::async, [this] {
+        try {
+            util::ThreadRename("utxocompact");
+            LOCK(m_db_mutex);
+
+            LogDebug(BCLog::COINDB, "Starting chainstate compaction of %s", fs::PathToString(m_db_params.path));
+            m_db->CompactFull();
+            LogDebug(BCLog::COINDB, "Finished chainstate compaction of %s", fs::PathToString(m_db_params.path));
+        } catch (const std::exception& e) {
+            LogWarning("Failed chainstate compaction (%s)", e.what());
+        }
+    }).share();
+    return m_compaction;
 }
 
 /** Specialization of CCoinsViewCursor to iterate over a CCoinsViewDB */
diff --git a/src/txdb.h b/src/txdb.h
index 69f5f3d6e04..4164590c5a1 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -15,6 +15,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <future>
 #include <memory>
 #include <optional>
 #include <string>
@@ -37,9 +38,13 @@ class CCoinsViewDB final : public CCoinsView
 protected:
     DBParams m_db_params;
     CoinsViewOptions m_options;
+    //! Prevents CompactFull() from using m_db while ResizeCache() replaces it.
+    Mutex m_db_mutex;
     std::unique_ptr<CDBWrapper> m_db;
+    std::shared_future<void> m_compaction;
 public:
     explicit CCoinsViewDB(DBParams db_params, CoinsViewOptions options);
+    ~CCoinsViewDB() override;
 
     std::optional<Coin> GetCoin(const COutPoint& outpoint) const override;
     bool HaveCoin(const COutPoint &outpoint) const override;
@@ -53,10 +58,10 @@ public:
     size_t EstimateSize() const override;
 
     //! Dynamically alter the underlying leveldb cache size.
-    void ResizeCache(size_t new_cache_size) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+    void ResizeCache(size_t new_cache_size) EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_db_mutex);
 
-    //! Perform a blocking full compaction of the underlying LevelDB.
-    void CompactFull() EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+    //! Perform a full compaction of the underlying LevelDB on a one-shot background thread.
+    std::shared_future<void> CompactFull() EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_db_mutex);
 
     //! Return an underlying LevelDB property value, if available.
     std::optional<std::string> GetDBProperty(const std::string& property);
diff --git a/src/validation.cpp b/src/validation.cpp
index 61f8a7cba19..d3cabe44647 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2837,9 +2837,11 @@ bool Chainstate::FlushStateToDisk(
             m_chainman.m_options.signals->ChainStateFlushed(this->GetRole(), GetLocator(m_chain.Tip()));
         }
 
-        if (!m_chainman.m_interrupt && m_chainman.m_chainstates.size() == 1) { // Skip AssumeUTXO
-            if (ShouldCompactChainstate(m_chainman.IsInitialBlockDownload())) {
+        if (!m_chainman.m_interrupt && ShouldCompactChainstate(m_chainman.IsInitialBlockDownload())) {
+            try {
                 CoinsDB().CompactFull();
+            } catch (const std::exception& e) {
+                LogWarning("Failed to start chainstate compaction (%s)", e.what());
             }
         }
     }

From d813722ef2a94ab3e778607351a228fa2f0a5090 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 20 May 2026 14:01:39 +0100
Subject: [PATCH 24/26] doc: update release notes for v31.1rc1

---
 doc/release-notes.md | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index a1b45a0bd66..d70bb5167b8 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,9 +1,9 @@
-v31.x Release Notes
+v31.1rc1 Release Notes
 ===================
 
-Bitcoin Core version 31.x is now available from:
+Bitcoin Core version 31.1rc1 is now available from:
 
-  <https://bitcoincore.org/bin/bitcoin-core-31.x/>
+  <https://bitcoincore.org/bin/bitcoin-core-31.1/test.rc1/>
 
 This release includes new features, various bug fixes and performance
 improvements, as well as updated translations.
@@ -39,17 +39,35 @@ on them. It is not recommended to use Bitcoin Core on unsupported systems.
 Notable changes
 ===============
 
+### PrivateBroadcast
+
+This release fixes an ip address leak when using the -privatebroadcast feature.
+Under certain circumstances connections were being made over clearnet rather than
+the enabled privacy network.
+
+
 ### Validation
 
 - #35209 validation: correct lifetime of precomputed tx data
+- #35465 coins: compact chainstate regularly
+
+### Leveldb
+
+- #61(bitcoin-core/leveldb): Disable seek compaction
 
 ### P2P
 
 - #35032 net_processing: don't modify addrman for private broadcast connections
+- #35410 net: use the proxy if overriden when doing v2->v1 reconnections
 
 ### Wallet
 
 - #35227 wallet: check the final BDB page LSN during migration
+- #35228 wallet: use outpoint when estimating input size
+
+### Musig
+
+- #35316 musig: Reject empty pubkey list in GetMuSig2KeyAggCache
 
 ### Build
 
@@ -62,11 +80,16 @@ Notable changes
 - #34991 test: fix feature_index_prune.py bug when using --usecli
 - #35080 test: Add missing self.options.timeout_factor scale in tool_bitcoin_chainstate.py
 - #35218 test: fix P2SH script in coins cache fuzz target
+- #35279 psbt, test: remove address type restrictions in test
 
 ### Fuzz
 
 - #35289 fuzz: Fix timeout in txorphan
 
+### Util
+
+- #35384 util: Check write failures before renaming settings.json
+
 ### Docs
 
 - #35283 doc: mention -DWITH_ZMQ=ON in BSD build guides
@@ -75,29 +98,43 @@ Notable changes
 
 - #35202 ci: restore sockets in i686, no IPC job
 - #35230 ci: Move --usecli --extended from i386 task to alpine task
+- #35348 ci: switch to GitHub cache for all runners
+- #35378 ci: switch runners from cirrus to warpbuild
+- #35408 ci: 35378 followups
+- #35430 ci: use warp caching on warp runners
+- #35447 ci: use warpbuild cache for docker buildkit cache
 
 ### Misc
 
 - #35044 contrib: Fix NameError in signet miner gbt()
 - #35175 multi_index: fix compilation failure with boost >= 1.91
+- #34953 crypto: disable ASan instrumentation of SSE4 SHA256 for GCC
 
 Credits
 =======
 
 Thanks to everyone who directly contributed to this release:
 
+- andrewtoth
 - Cory Fields
+- Crypt-iQ
 - darosior
+- deadmanoz
+- fanquake
 - Greg Sanders
 - Hennadii Stepanov
 - junbyjun1238
 - Lőrinc
 - MarcoFalke
 - marcofleon
+- nervana21
 - optout21
 - Pol Espinasa
+- rkrux
+- Shrey
 - Torkel Rogstad
 - Vasil Dimov
+- willcl-ark
 
 As well as to everyone that helped with translations on
 [Transifex](https://explore.transifex.com/bitcoin/bitcoin/).

From 1c9d24fdddf115a9e2db932804df7eab9c5e6b62 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 22 Jun 2026 12:03:22 +0100
Subject: [PATCH 25/26] build: bump version to v31.1rc1

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 892f30d94bf..ed30fdbb7d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,9 @@ get_directory_property(precious_variables CACHE_VARIABLES)
 #=============================
 set(CLIENT_NAME "Bitcoin Core")
 set(CLIENT_VERSION_MAJOR 31)
-set(CLIENT_VERSION_MINOR 0)
+set(CLIENT_VERSION_MINOR 1)
 set(CLIENT_VERSION_BUILD 0)
-set(CLIENT_VERSION_RC 0)
+set(CLIENT_VERSION_RC 1)
 set(CLIENT_VERSION_IS_RELEASE "true")
 set(COPYRIGHT_YEAR "2026")
 

From c058c29831a930f966180c38dfeab4635b8b86fc Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 22 Jun 2026 12:06:03 +0100
Subject: [PATCH 26/26] doc: update manual pages for v31.1rc1

---
 doc/man/bitcoin-cli.1    | 6 +++---
 doc/man/bitcoin-qt.1     | 6 +++---
 doc/man/bitcoin-tx.1     | 6 +++---
 doc/man/bitcoin-util.1   | 6 +++---
 doc/man/bitcoin-wallet.1 | 6 +++---
 doc/man/bitcoin.1        | 4 ++--
 doc/man/bitcoind.1       | 6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index 721a470c713..f8fc3d543f3 100644
--- a/doc/man/bitcoin-cli.1
+++ b/doc/man/bitcoin-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-CLI "1" "April 2026" "bitcoin-cli v31.0.0" "User Commands"
+.TH BITCOIN-CLI "1" "June 2026" "bitcoin-cli v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v31.0.0
+bitcoin-cli \- manual page for bitcoin-cli v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v31.0.0
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v31.0.0
+Bitcoin Core RPC client version v31.1.0rc1
 .PP
 The bitcoin\-cli utility provides a command line interface to interact with a Bitcoin Core RPC server.
 .PP
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index aa90489c1fd..87d55bd8769 100644
--- a/doc/man/bitcoin-qt.1
+++ b/doc/man/bitcoin-qt.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-QT "1" "April 2026" "bitcoin-qt v31.0.0" "User Commands"
+.TH BITCOIN-QT "1" "June 2026" "bitcoin-qt v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v31.0.0
+bitcoin-qt \- manual page for bitcoin-qt v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,options\/\fR] [\fI\,URI\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v31.0.0
+Bitcoin Core version v31.1.0rc1
 .PP
 The bitcoin\-qt application provides a graphical interface for interacting with Bitcoin Core.
 .PP
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index 8ecea692f77..7d14074eeda 100644
--- a/doc/man/bitcoin-tx.1
+++ b/doc/man/bitcoin-tx.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-TX "1" "April 2026" "bitcoin-tx v31.0.0" "User Commands"
+.TH BITCOIN-TX "1" "June 2026" "bitcoin-tx v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v31.0.0
+bitcoin-tx \- manual page for bitcoin-tx v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v31.0.0
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v31.0.0
+Bitcoin Core bitcoin\-tx utility version v31.1.0rc1
 .PP
 The bitcoin\-tx tool is used for creating and modifying bitcoin transactions.
 .PP
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 6e7b1be2c06..7dfe41473d2 100644
--- a/doc/man/bitcoin-util.1
+++ b/doc/man/bitcoin-util.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-UTIL "1" "April 2026" "bitcoin-util v31.0.0" "User Commands"
+.TH BITCOIN-UTIL "1" "June 2026" "bitcoin-util v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoin-util \- manual page for bitcoin-util v31.0.0
+bitcoin-util \- manual page for bitcoin-util v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,command\/\fR]
@@ -9,7 +9,7 @@ bitcoin-util \- manual page for bitcoin-util v31.0.0
 .B bitcoin-util
 [\fI\,options\/\fR] \fI\,grind <hex-block-header>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v31.0.0
+Bitcoin Core bitcoin\-util utility version v31.1.0rc1
 .PP
 The bitcoin\-util tool provides bitcoin related functionality that does not rely on the ability to access a running node. Available [commands] are listed below.
 .SH OPTIONS
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index 33ea607c672..4486d99de15 100644
--- a/doc/man/bitcoin-wallet.1
+++ b/doc/man/bitcoin-wallet.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-WALLET "1" "April 2026" "bitcoin-wallet v31.0.0" "User Commands"
+.TH BITCOIN-WALLET "1" "June 2026" "bitcoin-wallet v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v31.0.0
+bitcoin-wallet \- manual page for bitcoin-wallet v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoin-wallet
 [\fI\,options\/\fR] \fI\,<command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet utility version v31.0.0
+Bitcoin Core bitcoin\-wallet utility version v31.1.0rc1
 .PP
 bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
 .PP
diff --git a/doc/man/bitcoin.1 b/doc/man/bitcoin.1
index 78c93deeea3..d6d1aee9795 100644
--- a/doc/man/bitcoin.1
+++ b/doc/man/bitcoin.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN "1" "April 2026" "bitcoin v31.0.0" "User Commands"
+.TH BITCOIN "1" "June 2026" "bitcoin v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoin \- manual page for bitcoin v31.0.0
+bitcoin \- manual page for bitcoin v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoin
 [\fI\,OPTIONS\/\fR] \fI\,COMMAND\/\fR...
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index e42dcd7f7c0..68975b126e5 100644
--- a/doc/man/bitcoind.1
+++ b/doc/man/bitcoind.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIND "1" "April 2026" "bitcoind v31.0.0" "User Commands"
+.TH BITCOIND "1" "June 2026" "bitcoind v31.1.0rc1" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v31.0.0
+bitcoind \- manual page for bitcoind v31.1.0rc1
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core daemon version v31.0.0 bitcoind
+Bitcoin Core daemon version v31.1.0rc1 bitcoind
 .PP
 The Bitcoin Core daemon (bitcoind) is a headless program that connects to the Bitcoin network to validate and relay transactions and blocks, as well as relaying addresses.
 .PP