diff --git a/depend/bitcoin/.editorconfig b/depend/bitcoin/.editorconfig
index c5f3028c..d7fe7ad5 100644
--- a/depend/bitcoin/.editorconfig
+++ b/depend/bitcoin/.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
 
diff --git a/depend/bitcoin/.gitattributes b/depend/bitcoin/.gitattributes
index c9cf4a7d..25303e74 100644
--- a/depend/bitcoin/.gitattributes
+++ b/depend/bitcoin/.gitattributes
@@ -1 +1,2 @@
 src/clientversion.cpp export-subst
+src/CMakeLists.txt export-subst
diff --git a/depend/bitcoin/.github/ISSUE_TEMPLATE/bug.yml b/depend/bitcoin/.github/ISSUE_TEMPLATE/bug.yml
index 7c894ab7..53d9353b 100644
--- a/depend/bitcoin/.github/ISSUE_TEMPLATE/bug.yml
+++ b/depend/bitcoin/.github/ISSUE_TEMPLATE/bug.yml
@@ -10,6 +10,7 @@ body:
         * General bitcoin questions and/or support requests should use Bitcoin StackExchange at https://bitcoin.stackexchange.com.
         * For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
         * If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running `memtest` and observe CPU temperature with a load-test tool such as `linpack` before creating an issue.
+        * If you use AI tools when opening this issue, please read the [AI policy](https://github.com/bitcoin/bitcoin/blob/master/doc/AI_POLICY.md).
 
         ----
   - type: checkboxes
diff --git a/depend/bitcoin/.github/ISSUE_TEMPLATE/feature_request.yml b/depend/bitcoin/.github/ISSUE_TEMPLATE/feature_request.yml
index 4622fd98..24e33ea1 100644
--- a/depend/bitcoin/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/depend/bitcoin/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -2,6 +2,11 @@ name: Feature Request
 description: Suggest an idea for this project.
 labels: [Feature]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        If you use AI tools when opening this issue, please read the [AI policy](https://github.com/bitcoin/bitcoin/blob/master/doc/AI_POLICY.md).
+
   - type: textarea
     id: feature
     attributes:
diff --git a/depend/bitcoin/.github/ISSUE_TEMPLATE/good_first_issue.yml b/depend/bitcoin/.github/ISSUE_TEMPLATE/good_first_issue.yml
deleted file mode 100644
index 2a486b3f..00000000
--- a/depend/bitcoin/.github/ISSUE_TEMPLATE/good_first_issue.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Good First Issue
-description: (Regular devs only) Suggest a new good first issue
-labels: [good first issue]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please add the label "good first issue" manually before or after opening
-
-        A good first issue is an uncontroversial issue, that has a relatively unique and obvious solution
-
-        Motivate the issue and explain the solution briefly
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation
-      description: Motivate the issue
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: Possible solution
-      description: Describe a possible solution
-    validations:
-      required: false
-  - type: textarea
-    id: useful-skills
-    attributes:
-      label: Useful Skills
-      description: For example, “`std::thread`”, “Qt6 GUI and async GUI design” or “basic understanding of Bitcoin mining and the Bitcoin Core RPC interface”.
-      value: |
-        * Compiling Bitcoin Core from source
-        * Running the C++ unit tests and the Python functional tests
-        * ...
-  - type: textarea
-    attributes:
-      label: Guidance for new contributors
-      description: Please leave this to automatically add the footer for new contributors
-      value: |
-        Want to work on this issue?
-
-        For guidance on contributing, please read [CONTRIBUTING.md](https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md) before opening your pull request.
-
diff --git a/depend/bitcoin/.github/ISSUE_TEMPLATE/gui_issue.yml b/depend/bitcoin/.github/ISSUE_TEMPLATE/gui_issue.yml
index 4fe578e9..4a09e4a3 100644
--- a/depend/bitcoin/.github/ISSUE_TEMPLATE/gui_issue.yml
+++ b/depend/bitcoin/.github/ISSUE_TEMPLATE/gui_issue.yml
@@ -2,6 +2,11 @@ name: Issue or feature request related to the GUI
 description: Any report, issue or feature request related to the GUI
 labels: [GUI]
 body:
+- type: markdown
+  attributes:
+    value: |
+      If you use AI tools when opening this issue, please read the [AI policy](https://github.com/bitcoin/bitcoin/blob/master/doc/AI_POLICY.md).
+
 - type: checkboxes
   id: acknowledgement
   attributes:
diff --git a/depend/bitcoin/.github/PULL_REQUEST_TEMPLATE.md b/depend/bitcoin/.github/PULL_REQUEST_TEMPLATE.md
index ae92fc78..269a9e59 100644
--- a/depend/bitcoin/.github/PULL_REQUEST_TEMPLATE.md
+++ b/depend/bitcoin/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,13 @@
 <!--
 *** Please remove the following help text before submitting: ***
 
-Pull requests without a rationale and clear improvement may be closed
-immediately.
+Pull requests may be closed immediately if they:
+- do not have a rationale and clear improvement
+- do not adhere to doc/AI_POLICY.md
 
 GUI-related pull requests should be opened against
-https://github.com/bitcoin-core/gui
-first. See CONTRIBUTING.md
+https://github.com/bitcoin-core/gui first.
+See CONTRIBUTING.md
 -->
 
 <!--
diff --git a/depend/bitcoin/.github/actions/restore-caches/action.yml b/depend/bitcoin/.github/actions/cache/restore/action.yml
similarity index 77%
rename from depend/bitcoin/.github/actions/restore-caches/action.yml
rename to depend/bitcoin/.github/actions/cache/restore/action.yml
index 21f2807f..2cc5b53a 100644
--- a/depend/bitcoin/.github/actions/restore-caches/action.yml
+++ b/depend/bitcoin/.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: cirruslabs/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: cirruslabs/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: cirruslabs/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: cirruslabs/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/depend/bitcoin/.github/actions/cache/restore/internal/action.yml b/depend/bitcoin/.github/actions/cache/restore/internal/action.yml
new file mode 100644
index 00000000..43dd2063
--- /dev/null
+++ b/depend/bitcoin/.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/depend/bitcoin/.github/actions/save-caches/action.yml b/depend/bitcoin/.github/actions/cache/save/action.yml
similarity index 79%
rename from depend/bitcoin/.github/actions/save-caches/action.yml
rename to depend/bitcoin/.github/actions/cache/save/action.yml
index 3072ab3f..5c543b3f 100644
--- a/depend/bitcoin/.github/actions/save-caches/action.yml
+++ b/depend/bitcoin/.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: cirruslabs/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: cirruslabs/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: cirruslabs/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: cirruslabs/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/depend/bitcoin/.github/actions/cache/save/internal/action.yml b/depend/bitcoin/.github/actions/cache/save/internal/action.yml
new file mode 100644
index 00000000..12f4156a
--- /dev/null
+++ b/depend/bitcoin/.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/depend/bitcoin/.github/actions/configure-docker/action.yml b/depend/bitcoin/.github/actions/configure-docker/action.yml
index b4abf7c2..074b47ce 100644
--- a/depend/bitcoin/.github/actions/configure-docker/action.yml
+++ b/depend/bitcoin/.github/actions/configure-docker/action.yml
@@ -1,27 +1,27 @@
 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
+  provider:
+    description: 'The cache provider to use'
+    required: false
+    default: 'gha'
 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
+    - name: Set up Docker Buildx for Warp cache
+      if: ${{ inputs.provider == 'warp' }}
       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
+    - 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.
+    # 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:
@@ -36,25 +36,18 @@ runs:
     - name: Construct docker build cache args
       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=""
+        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${url_args:+,${url_args}},scope=${CONTAINER_NAME}")
+        args=(--cache-from "type=gha,${cache_options}")
 
-        # 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,${cache_options}")
         fi
 
         # Always `--load` into docker images (needed when using the `docker-container` build driver).
diff --git a/depend/bitcoin/.github/actions/configure-environment/action.yml b/depend/bitcoin/.github/actions/configure-environment/action.yml
index e2a26b71..d3c928cf 100644
--- a/depend/bitcoin/.github/actions/configure-environment/action.yml
+++ b/depend/bitcoin/.github/actions/configure-environment/action.yml
@@ -7,7 +7,9 @@ runs:
       shell: bash
       run: |
         echo "BASE_ROOT_DIR=${{ runner.temp }}" >> "$GITHUB_ENV"
-        echo "BASE_BUILD_DIR=${{ runner.temp }}/build" >> "$GITHUB_ENV"
+        # Space and non-ASCII symbols mimic BASE_SCRATCH_DIR in ci/test/00_setup_env.sh,
+        # to test word-splitting and UTF-8 path handling on CI.
+        echo "BASE_BUILD_DIR=${{ runner.temp }}/build_ ₿🧪_" >> "$GITHUB_ENV"
         echo "CCACHE_DIR=${{ runner.temp }}/ccache_dir" >> $GITHUB_ENV
         echo "DEPENDS_DIR=${{ runner.temp }}/depends" >> "$GITHUB_ENV"
         echo "BASE_CACHE=${{ runner.temp }}/depends/built" >> $GITHUB_ENV
diff --git a/depend/bitcoin/.github/ci-test-each-commit-exec.py b/depend/bitcoin/.github/ci-test-each-commit-exec.py
index aed1526b..402e7352 100755
--- a/depend/bitcoin/.github/ci-test-each-commit-exec.py
+++ b/depend/bitcoin/.github/ci-test-each-commit-exec.py
@@ -40,8 +40,8 @@ def main():
         "-DCMAKE_BUILD_TYPE=Debug",
         "-DCMAKE_COMPILE_WARNING_AS_ERROR=ON",
         "--preset=dev-mode",
-        # Tolerate unused member functions in intermediate commits in a pull request
-        "-DCMAKE_CXX_FLAGS=-Wno-error=unused-member-function",
+        # Tolerate unused (member) functions in intermediate commits in a pull request
+        "-DCMAKE_CXX_FLAGS=-Wno-error=unused-member-function -Wno-error=unused-function",
     ])
 
     if run(["cmake", "--build", build_dir, "-j", str(num_procs)], check=False).returncode != 0:
diff --git a/depend/bitcoin/.github/ci-windows-cross.py b/depend/bitcoin/.github/ci-windows-cross.py
index 6453cb9e..355d8fb7 100755
--- a/depend/bitcoin/.github/ci-windows-cross.py
+++ b/depend/bitcoin/.github/ci-windows-cross.py
@@ -5,6 +5,7 @@
 
 import argparse
 import os
+import re
 import shlex
 import subprocess
 import sys
@@ -28,6 +29,31 @@ def print_version():
     run([str(bitcoind), "-version"])
 
 
+def check_imports():
+    bitcoind = Path.cwd() / "bin" / "bitcoind.exe"
+    output = run(
+        ["dumpbin.exe", "/imports", str(bitcoind)],
+        capture_output=True,
+        text=True,
+    ).stdout
+    dlls = re.findall(r"^\s*(\S+\.dll)\s*$", output, re.IGNORECASE | re.MULTILINE)
+    print("\n".join(dlls))
+
+    # Ensure the executable is linked against the expected C runtime.
+    dlls = {name.lower() for name in dlls}
+    uses_msvcrt = "msvcrt.dll" in dlls
+    uses_ucrt = any(name.startswith("api-ms-win-crt-") for name in dlls)
+    crt = os.environ["CRT"]
+    if crt == "msvcrt":
+        crt_ok = uses_msvcrt and not uses_ucrt
+    elif crt == "ucrt":
+        crt_ok = uses_ucrt and not uses_msvcrt
+    else:
+        sys.exit(f"Unexpected CRT value: {crt!r}")
+    if not crt_ok:
+        sys.exit(f"Imported DLLs do not match the expected {crt!r} C runtime.")
+
+
 def check_manifests():
     release_dir = Path.cwd() / "bin"
     manifest_path = release_dir / "bitcoind.manifest"
@@ -96,26 +122,29 @@ def run_functional_tests():
         "--jobs",
         num_procs,
         "--quiet",
-        f"--tmpdirprefix={workspace}",
+        f"--tmpdirprefix={workspace / '_ _'}",
         "--combinedlogslen=99999999",
         *shlex.split(os.environ.get("TEST_RUNNER_EXTRA", "").strip()),
-        # feature_unsupported_utxo_db.py fails on Windows because of emojis in the test data directory.
+        # Tests using ancient releases fail on Windows because of emojis in the test data directory.
         "--exclude",
         "feature_unsupported_utxo_db.py",
+        "--exclude",
+        "wallet_ancient_migration.py",
     ]
     run(test_runner_cmd)
 
-    # Run feature_unsupported_utxo_db sequentially in ASCII-only tmp dir,
-    # because it is excluded above due to lack of UTF-8 support in the
+    # Run ancient release tests sequentially in ASCII-only tmp dir,
+    # because they are excluded above due to lack of UTF-8 support in the
     # ancient release.
-    cmd_feature_unsupported_db = [
-        sys.executable,
-        str(workspace / "test" / "functional" / "feature_unsupported_utxo_db.py"),
-        "--previous-releases",
-        "--tmpdir",
-        str(Path(workspace) / "test_feature_unsupported_utxo_db"),
-    ]
-    run(cmd_feature_unsupported_db)
+    for test_name in ["feature_unsupported_utxo_db", "wallet_ancient_migration"]:
+        cmd = [
+            sys.executable,
+            str(workspace / "test" / "functional" / f"{test_name}.py"),
+            "--previous-releases",
+            "--tmpdir",
+            str(workspace / f"test_{test_name}"),
+        ]
+        run(cmd)
 
 
 def run_unit_tests():
@@ -140,6 +169,7 @@ def main():
     parser = argparse.ArgumentParser(description="Utility to run Windows CI steps.")
     steps = list(map(lambda f: f.__name__, [
         print_version,
+        check_imports,
         check_manifests,
         prepare_tests,
         run_unit_tests,
diff --git a/depend/bitcoin/.github/ci-windows.py b/depend/bitcoin/.github/ci-windows.py
index 964558a2..26356822 100755
--- a/depend/bitcoin/.github/ci-windows.py
+++ b/depend/bitcoin/.github/ci-windows.py
@@ -34,8 +34,6 @@ def run(cmd, **kwargs):
     "fuzz": [
         "-DVCPKG_MANIFEST_NO_DEFAULT_FEATURES=ON",
         "-DVCPKG_MANIFEST_FEATURES=wallet",
-        "-DBUILD_GUI=OFF",
-        "-DWITH_ZMQ=OFF",
         "-DBUILD_FOR_FUZZING=ON",
         "-DCMAKE_COMPILE_WARNING_AS_ERROR=ON",
     ],
@@ -198,7 +196,7 @@ def run_tests(ci_type):
             "--jobs",
             num_procs,
             "--quiet",
-            f"--tmpdirprefix={workspace}",
+            f"--tmpdirprefix={workspace / '_ _'}",
             "--combinedlogslen=99999999",
             *shlex.split(os.environ.get("TEST_RUNNER_EXTRA", "").strip()),
         ]
diff --git a/depend/bitcoin/.github/workflows/ci.yml b/depend/bitcoin/.github/workflows/ci.yml
index ea62ef28..d8d48eec 100644
--- a/depend/bitcoin/.github/workflows/ci.yml
+++ b/depend/bitcoin/.github/workflows/ci.yml
@@ -19,8 +19,6 @@ 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
 
 defaults:
   run:
@@ -29,12 +27,16 @@ defaults:
     shell: bash
 
 jobs:
-  runners:
-    name: '[meta] determine runners'
-    runs-on: ubuntu-slim
-    outputs:
-      provider: ${{ steps.runners.outputs.provider }}
+  test-each-commit:
+    name: 'test ancestor commits'
+    runs-on: ${{ github.repository == 'bitcoin/bitcoin' && '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
+    timeout-minutes: 360  # Use maximum time, see https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes.
     steps:
+      - name: Determine fetch depth
+        run: echo "FETCH_DEPTH=$((${{ github.event.pull_request.commits }} + 2))" >> "$GITHUB_ENV"
       - &ANNOTATION_PR_NUMBER
         name: Annotate with pull request number
         # This annotation is machine-readable and can be used to assign a check
@@ -45,28 +47,6 @@ jobs:
           if [ "${{ github.event_name }}" = "pull_request" ]; then
             echo "::notice title=debug_pull_request_number_str::${{ github.event.number }}"
           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"
-          else
-            echo "provider=gha" >> "$GITHUB_OUTPUT"
-            echo "::notice title=Runner Selection::Using GitHub-hosted runners"
-          fi
-
-  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' }}
-    env:
-      TEST_RUNNER_PORT_MIN: "14000"  # Use a larger port, to avoid colliding with CIRRUS_CACHE_HOST port 12321.
-    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:
-      - name: Determine fetch depth
-        run: echo "FETCH_DEPTH=$((${{ github.event.pull_request.commits }} + 2))" >> "$GITHUB_ENV"
-      - *ANNOTATION_PR_NUMBER
       - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -116,7 +96,7 @@ jobs:
           git config user.name "CI"
       - run: |
           sudo apt-get update
-          sudo apt-get install clang mold ccache build-essential cmake ninja-build pkgconf python3-zmq libevent-dev libboost-dev libsqlite3-dev systemtap-sdt-dev libzmq3-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev capnproto libcapnp-dev -y
+          sudo apt-get install clang mold ccache build-essential cmake ninja-build pkgconf python3-zmq libboost-dev libsqlite3-dev systemtap-sdt-dev libzmq3-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev capnproto libcapnp-dev -y
           sudo pip3 install --break-system-packages pycapnp
       - name: Compile and run tests
         run: |
@@ -179,7 +159,7 @@ jobs:
         run: |
           # A workaround for "The `brew link` step did not complete successfully" error.
           brew install --quiet python@3 || brew link --overwrite python@3
-          brew install --quiet coreutils ninja pkgconf ccache boost libevent zeromq qt@6 qrencode capnp
+          brew install --quiet coreutils ninja pkgconf ccache boost zeromq qt@6 qrencode capnp
 
       - name: Set Ccache directory
         run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
@@ -285,9 +265,10 @@ jobs:
         # Only save cache from the 'standard' job, as it includes the necessary downloads for other jobs in the matrix. If the matrix is modified, this may need amending.
         if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && steps.vcpkg-downloads-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
         with:
+          # Cache the tools once as archives, but not redundantly in extracted form.
           path: |
             ~/AppData/Local/vcpkg/downloads/*
-            !~/AppData/Local/vcpkg/downloads/tools  # Cache the tools once as archives, but not redundantly in extracted form.
+            !~/AppData/Local/vcpkg/downloads/tools
           key: ${{ steps.vcpkg-downloads-cache.outputs.cache-primary-key }}
 
       - name: Build
@@ -324,8 +305,8 @@ 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' }}
+    needs: record-frozen-commit
+    runs-on: ${{ github.repository == 'bitcoin/bitcoin' && 'warp-ubuntu-latest-x64-4x' || 'ubuntu-latest' }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
 
     strategy:
@@ -357,18 +338,22 @@ jobs:
 
       - name: Restore caches
         id: restore-cache
-        uses: ./.github/actions/restore-caches
+        uses: ./.github/actions/cache/restore
+        with:
+          provider: ${{ github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha' }}
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
         with:
-          cache-provider: ${{ needs.runners.outputs.provider }}
+          provider: ${{ github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha' }}
 
       - name: CI script
         run: ./ci/test_run_all.sh
 
       - name: Save caches
-        uses: ./.github/actions/save-caches
+        uses: ./.github/actions/cache/save
+        with:
+          provider: ${{ github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha' }}
 
       - name: Upload built executables
         uses: actions/upload-artifact@v7
@@ -418,6 +403,11 @@ jobs:
 
       - *IMPORT_VS_ENV
 
+      - name: Check imported DLLs
+        env:
+          CRT: ${{ matrix.crt }}
+        run: py -3 .github/ci-windows-cross.py check_imports
+
       - name: Check executable manifests
         run: py -3 .github/ci-windows-cross.py check_manifests
 
@@ -435,8 +425,7 @@ jobs:
 
   ci-matrix:
     name: ${{ matrix.name }}
-    needs: runners
-    runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && matrix.cirrus-runner || matrix.fallback-runner }}
+    runs-on: ${{ github.repository == 'bitcoin/bitcoin' && matrix.warp-runner || matrix.fallback-runner }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
     timeout-minutes: ${{ matrix.timeout-minutes }}
 
@@ -449,96 +438,114 @@ jobs:
       matrix:
         include:
           - name: 'iwyu'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-4x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-4x'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
 
+          - name: 'NetBSD Cross'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
+            timeout-minutes: 120
+            file-env: './ci/test/00_setup_env_netbsd_cross.sh'
+
           - name: 'FreeBSD Cross'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_freebsd_cross.sh'
 
+          - name: 'OpenBSD Cross'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
+            timeout-minutes: 120
+            file-env: './ci/test/00_setup_env_openbsd_cross.sh'
+
           - name: 'No wallet'
-            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-4x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-16x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
             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'
-            fallback-runner: 'ubuntu-24.04'
-            timeout-minutes: 150
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
+            timeout-minutes: 180
             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'
-            fallback-runner: 'ubuntu-24.04'
+            warp-runner: 'warp-ubuntu-latest-x64-16x'
+            fallback-runner: 'ubuntu-latest'
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_native_msan.sh'
 
+          - name: 'riscv32 bare metal, static libbitcoin_consensus'
+            warp-runner: 'warp-ubuntu-latest-x64-8x'
+            fallback-runner: 'ubuntu-latest'
+            timeout-minutes: 120
+            file-env: './ci/test/00_setup_env_riscv_bare_cross.sh'
+
     steps:
       - *ANNOTATION_PR_NUMBER
 
@@ -549,15 +556,17 @@ jobs:
 
       - name: Restore caches
         id: restore-cache
-        uses: ./.github/actions/restore-caches
+        uses: ./.github/actions/cache/restore
+        with:
+          provider: ${{ matrix.provider || (github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha') }}
 
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
         with:
-          cache-provider: ${{ matrix.provider || needs.runners.outputs.provider }}
+          provider: ${{ matrix.provider || (github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha') }}
 
       - name: Clear unnecessary files
-        if: ${{ needs.runners.outputs.provider == 'gha' && true || false }} # Only needed on GHA runners
+        if: ${{ github.repository != 'bitcoin/bitcoin' || matrix.provider == 'gha' }} # Only needed on GHA runners
         uses: ./.github/actions/clear-files
 
       - name: Enable bpfcc script
@@ -575,12 +584,13 @@ jobs:
         run: ./ci/test_run_all.sh
 
       - name: Save caches
-        uses: ./.github/actions/save-caches
+        uses: ./.github/actions/cache/save
+        with:
+          provider: ${{ matrix.provider || (github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha') }}
 
   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: ${{ github.repository == 'bitcoin/bitcoin' && 'warp-ubuntu-latest-x64-2x' || 'ubuntu-latest' }}
     if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
     timeout-minutes: 20
     env:
@@ -597,7 +607,7 @@ jobs:
       - name: Configure Docker
         uses: ./.github/actions/configure-docker
         with:
-          cache-provider: ${{ needs.runners.outputs.provider }}
+          provider: ${{ github.repository == 'bitcoin/bitcoin' && 'warp' || 'gha' }}
 
       - name: CI script
         run: |
diff --git a/depend/bitcoin/.python-version b/depend/bitcoin/.python-version
index 1445aee8..c8cfe395 100644
--- a/depend/bitcoin/.python-version
+++ b/depend/bitcoin/.python-version
@@ -1 +1 @@
-3.10.14
+3.10
diff --git a/depend/bitcoin/.tx/config b/depend/bitcoin/.tx/config
index 41051254..a43890a3 100644
--- a/depend/bitcoin/.tx/config
+++ b/depend/bitcoin/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:bitcoin:p:bitcoin:r:qt-translation-031x]
-file_filter = src/qt/locale/bitcoin_<lang>.xlf
-source_file = src/qt/locale/bitcoin_en.xlf
+[o:bitcoin:p:bitcoin:r:qt-translation-032x]
+file_filter = src/qt/locale/bitcoin_<lang>.ts
+source_file = src/qt/locale/bitcoin_en.ts
 source_lang = en
diff --git a/depend/bitcoin/CMakeLists.txt b/depend/bitcoin/CMakeLists.txt
index eda934cc..f36c4cd4 100644
--- a/depend/bitcoin/CMakeLists.txt
+++ b/depend/bitcoin/CMakeLists.txt
@@ -80,6 +80,7 @@ if(CMAKE_VERSION VERSION_LESS 4.2 AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NO
   set(CMAKE_INSTALL_NAME_TOOL "${CMAKE_COMMAND} -E true")
 endif()
 enable_language(CXX)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -107,84 +108,33 @@ option(BUILD_CLI "Build bitcoin-cli executable." ON)
 option(BUILD_TESTS "Build test_bitcoin and other unit test executables." ON)
 option(BUILD_TX "Build bitcoin-tx executable." ${BUILD_TESTS})
 option(BUILD_UTIL "Build bitcoin-util executable." ${BUILD_TESTS})
+cmake_dependent_option(BUILD_GUI_TESTS "Build test_bitcoin-qt executable." ON "BUILD_GUI;BUILD_TESTS" OFF)
 
 option(BUILD_UTIL_CHAINSTATE "Build experimental bitcoin-chainstate executable." OFF)
 option(BUILD_KERNEL_LIB "Build experimental bitcoinkernel library." ${BUILD_UTIL_CHAINSTATE})
 cmake_dependent_option(BUILD_KERNEL_TEST "Build tests for the experimental bitcoinkernel library." ON "BUILD_KERNEL_LIB" OFF)
 
 option(ENABLE_WALLET "Enable wallet." ON)
-if(ENABLE_WALLET)
-  if(VCPKG_TARGET_TRIPLET)
-    # Use of the `unofficial::` namespace is a vcpkg package manager convention.
-    find_package(unofficial-sqlite3 CONFIG REQUIRED)
-    add_library(SQLite3::SQLite3 ALIAS unofficial::sqlite3::sqlite3)
-  else()
-    find_package(SQLite3 3.7.17 REQUIRED)
-    if(NOT TARGET SQLite3::SQLite3) # CMake < 4.3
-      add_library(SQLite3::SQLite3 ALIAS SQLite::SQLite3)
-    endif()
-  endif()
-endif()
 cmake_dependent_option(BUILD_WALLET_TOOL "Build bitcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF)
 
-option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting executables." OFF)
-option(CMAKE_COMPILE_WARNING_AS_ERROR "Treat compiler warnings as errors." OFF)
-option(WITH_CCACHE "Attempt to use ccache for compiling." ON)
-
+option(ENABLE_EXTERNAL_SIGNER "Enable external signer support." ON)
 option(WITH_ZMQ "Enable ZMQ notifications." OFF)
-if(WITH_ZMQ)
-  find_package(ZeroMQ 4.0.0 MODULE REQUIRED)
-endif()
-
+cmake_dependent_option(ENABLE_IPC "Build multiprocess bitcoin-node and bitcoin-gui executables in addition to monolithic bitcoind and bitcoin-qt executables." ON "NOT WIN32" OFF)
+cmake_dependent_option(WITH_EXTERNAL_LIBMULTIPROCESS "Build with external libmultiprocess library instead of with local git subtree when ENABLE_IPC is enabled. This is not normally recommended, but can be useful for developing libmultiprocess itself." OFF "ENABLE_IPC" OFF)
 option(WITH_EMBEDDED_ASMAP "Embed default ASMap data." ON)
-
 option(WITH_USDT "Enable tracepoints for Userspace, Statically Defined Tracing." OFF)
-if(WITH_USDT)
-  find_package(USDT MODULE REQUIRED)
-endif()
-
-option(ENABLE_EXTERNAL_SIGNER "Enable external signer support." ON)
 
 cmake_dependent_option(WITH_QRENCODE "Enable QR code support." ON "BUILD_GUI" OFF)
-if(WITH_QRENCODE)
-  find_package(QRencode MODULE REQUIRED)
-  set(USE_QRCODE TRUE)
-endif()
-
 cmake_dependent_option(WITH_DBUS "Enable DBus support." ON "NOT CMAKE_SYSTEM_NAME MATCHES \"(Windows|Darwin)\" AND BUILD_GUI" OFF)
 
-cmake_dependent_option(ENABLE_IPC "Build multiprocess bitcoin-node and bitcoin-gui executables in addition to monolithic bitcoind and bitcoin-qt executables." ON "NOT WIN32" OFF)
-cmake_dependent_option(WITH_EXTERNAL_LIBMULTIPROCESS "Build with external libmultiprocess library instead of with local git subtree when ENABLE_IPC is enabled. This is not normally recommended, but can be useful for developing libmultiprocess itself." OFF "ENABLE_IPC" OFF)
-if(ENABLE_IPC AND WITH_EXTERNAL_LIBMULTIPROCESS)
-  find_package(Libmultiprocess REQUIRED COMPONENTS Lib)
-  find_package(LibmultiprocessNative REQUIRED COMPONENTS Bin
-    NAMES Libmultiprocess
-  )
-endif()
-
-cmake_dependent_option(BUILD_GUI_TESTS "Build test_bitcoin-qt executable." ON "BUILD_GUI;BUILD_TESTS" OFF)
-if(BUILD_GUI)
-  set(qt_components Core Gui Widgets LinguistTools)
-  if(ENABLE_WALLET)
-    list(APPEND qt_components Network)
-  endif()
-  if(WITH_DBUS)
-    list(APPEND qt_components DBus)
-    set(USE_DBUS TRUE)
-  endif()
-  if(BUILD_GUI_TESTS)
-    list(APPEND qt_components Test)
-  endif()
-  find_package(Qt 6.2 MODULE REQUIRED
-    COMPONENTS ${qt_components}
-  )
-  unset(qt_components)
-endif()
-
 option(BUILD_BENCH "Build bench_bitcoin executable." OFF)
 option(BUILD_FUZZ_BINARY "Build fuzz binary." OFF)
 option(BUILD_FOR_FUZZING "Build for fuzzing. Enabling this will disable all other targets and override BUILD_FUZZ_BINARY." OFF)
 
+option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting executables." OFF)
+option(CMAKE_COMPILE_WARNING_AS_ERROR "Treat compiler warnings as errors." OFF)
+option(WITH_CCACHE "Attempt to use ccache for compiling." ON)
+
 option(INSTALL_MAN "Install man pages." ON)
 
 set(APPEND_CPPFLAGS "" CACHE STRING "Preprocessor flags that are appended to the command line after all other flags added by the build system. This variable is intended for debugging and special builds.")
@@ -197,11 +147,13 @@ string(APPEND CMAKE_CXX_COMPILE_OBJECT " ${APPEND_CPPFLAGS} ${APPEND_CXXFLAGS}")
 string(APPEND CMAKE_CXX_CREATE_SHARED_LIBRARY " ${APPEND_LDFLAGS}")
 string(APPEND CMAKE_CXX_LINK_EXECUTABLE " ${APPEND_LDFLAGS}")
 
-set(configure_warnings)
-
-include(CheckLinkerSupportsPIE)
-check_linker_supports_pie(configure_warnings)
+# Check required C++ toolchain features early.
+include(CheckCXXFeatures)
+check_cxx_features()
 
+#=============================
+# Core interface library
+#=============================
 # The core_interface library aims to encapsulate common build flags.
 # It is a usage requirement for all targets except for secp256k1, which
 # gets its flags by other means.
@@ -213,6 +165,15 @@ target_link_libraries(core_interface INTERFACE
   $<$<CONFIG:Debug>:core_interface_debug>
 )
 
+#=============================
+# Option interaction
+#=============================
+# Compute the final state of build options.
+# This must be done after all options have been initially set,
+# as some options (e.g., BUILD_FOR_FUZZING) may override or adjust others.
+# It must also come before any dependency checks to ensure that the set
+# of dependencies checked is consistent with the final option values,
+# that is, that all required, and only the required, dependencies are tested.
 if(BUILD_FOR_FUZZING)
   message(WARNING "BUILD_FOR_FUZZING=ON will disable all other targets and force BUILD_FUZZ_BINARY=ON.")
   set(BUILD_BITCOIN_BIN OFF)
@@ -231,7 +192,6 @@ if(BUILD_FOR_FUZZING)
   set(BUILD_TESTS OFF)
   set(BUILD_GUI_TESTS OFF)
   set(BUILD_BENCH OFF)
-  set(ENABLE_IPC OFF)
   set(BUILD_FUZZ_BINARY ON)
 
   target_compile_definitions(core_interface INTERFACE
@@ -239,6 +199,83 @@ if(BUILD_FOR_FUZZING)
   )
 endif()
 
+#=============================
+# Check and set PIC/PIE
+#=============================
+set(configure_warnings)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic")
+include(CheckLinkerSupportsPIE)
+# Set CMAKE_POSITION_INDEPENDENT_CODE early so it applies to all
+# subsequent checks, including dependency packages and tool flags.
+check_linker_supports_pie(configure_warnings)
+endif()
+
+#=============================
+# Find dependencies
+#=============================
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic")
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+target_link_libraries(core_interface INTERFACE
+  Threads::Threads
+)
+endif()
+
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic")
+include(AddBoostIfNeeded)
+add_boost_if_needed()
+endif()
+
+if(ENABLE_WALLET)
+  if(VCPKG_TARGET_TRIPLET)
+    # Use of the `unofficial::` namespace is a vcpkg package manager convention.
+    find_package(unofficial-sqlite3 CONFIG REQUIRED)
+    add_library(SQLite3::SQLite3 ALIAS unofficial::sqlite3::sqlite3)
+  else()
+    find_package(SQLite3 3.7.17 REQUIRED)
+    if(NOT TARGET SQLite3::SQLite3) # CMake < 4.3
+      add_library(SQLite3::SQLite3 ALIAS SQLite::SQLite3)
+    endif()
+  endif()
+endif()
+
+if(WITH_ZMQ)
+  find_package(ZeroMQ 4.0.0 MODULE REQUIRED)
+endif()
+
+if(ENABLE_IPC AND WITH_EXTERNAL_LIBMULTIPROCESS)
+  find_package(Libmultiprocess REQUIRED COMPONENTS Lib)
+  find_package(LibmultiprocessNative REQUIRED COMPONENTS Bin
+    NAMES Libmultiprocess
+  )
+endif()
+
+if(WITH_USDT)
+  find_package(USDT MODULE REQUIRED)
+endif()
+
+if(BUILD_GUI)
+  set(qt_components Core Gui Widgets LinguistTools)
+  if(ENABLE_WALLET)
+    list(APPEND qt_components Network)
+  endif()
+  if(WITH_DBUS)
+    list(APPEND qt_components DBus)
+    set(USE_DBUS TRUE)
+  endif()
+  if(BUILD_GUI_TESTS)
+    list(APPEND qt_components Test)
+  endif()
+  find_package(Qt 6.2 MODULE REQUIRED
+    COMPONENTS ${qt_components}
+  )
+  unset(qt_components)
+  if(WITH_QRENCODE)
+    find_package(QRencode MODULE REQUIRED)
+    set(USE_QRCODE TRUE)
+  endif()
+endif()
+
 include(TryAppendCXXFlags)
 include(TryAppendLinkerFlag)
 
@@ -293,10 +330,6 @@ if(WIN32)
       /Zc:__cplusplus
       /sdl
     )
-    target_link_options(core_interface INTERFACE
-      # We embed our own manifests.
-      /MANIFEST:NO
-    )
     # Improve parallelism in MSBuild.
     # See: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/.
     list(APPEND CMAKE_VS_GLOBALS "UseMultiToolTask=true")
@@ -349,12 +382,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   endif()
 endif()
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(core_interface INTERFACE
-  Threads::Threads
-)
-
 # Define sanitize_interface with -fsanitize flags intended to apply to all
 # libraries and executables.
 add_library(sanitize_interface INTERFACE)
@@ -424,13 +451,6 @@ if(BUILD_FUZZ_BINARY)
   target_link_libraries(fuzzer_interface INTERFACE ${FUZZ_LIBS})
 endif()
 
-include(AddBoostIfNeeded)
-add_boost_if_needed()
-
-if(BUILD_DAEMON OR BUILD_GUI OR BUILD_CLI OR BUILD_TESTS OR BUILD_BENCH OR BUILD_FUZZ_BINARY)
-  find_package(Libevent 2.1.8 MODULE REQUIRED)
-endif()
-
 include(cmake/introspection.cmake)
 
 include(cmake/ccache.cmake)
@@ -447,7 +467,6 @@ if(MSVC)
   try_append_cxx_flags("/wd4805" TARGET warn_interface SKIP_LINK)
   target_compile_definitions(warn_interface INTERFACE
     _CRT_SECURE_NO_WARNINGS
-    _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
   )
 else()
   try_append_cxx_flags("-Wall" TARGET warn_interface SKIP_LINK)
@@ -577,6 +596,7 @@ endif()
 
 if(REDUCE_EXPORTS)
   set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+  set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
   try_append_linker_flag("-Wl,--exclude-libs,ALL" TARGET core_interface)
   try_append_linker_flag("-Wl,-no_exported_symbols" VAR CMAKE_EXE_LINKER_FLAGS)
 endif()
diff --git a/depend/bitcoin/CONTRIBUTING.md b/depend/bitcoin/CONTRIBUTING.md
index f0e88514..93be1099 100644
--- a/depend/bitcoin/CONTRIBUTING.md
+++ b/depend/bitcoin/CONTRIBUTING.md
@@ -19,38 +19,22 @@ Getting Started
 
 New contributors are very welcome and needed.
 
-Reviewing and testing is highly valued and the most effective way you can contribute
-as a new contributor. It also will teach you much more about the code and
-process than opening pull requests. Please refer to the [peer review](#peer-review)
-section below.
+If you use AI tools while contributing, please read and follow the [AI
+policy](/doc/AI_POLICY.md). Contributors are responsible for understanding and
+explaining their own work in their own words.
+
+In-depth reviewing and testing are the bottleneck of the project, and are the
+most effective way anyone can start to contribute. It will teach you much more
+about the code and process than opening pull requests, and may help you uncover
+related issues and follow-ups to contribute code for. Please refer to the [peer
+review](#peer-review) section below.
 
 Before you start contributing, familiarize yourself with the Bitcoin Core build
 system and tests. Refer to the documentation in the repository on how to build
 Bitcoin Core and how to run the unit tests, functional tests, and fuzz tests.
 
-There are many open issues of varying difficulty waiting to be fixed.
-If you're looking for somewhere to start contributing, check out the
-[good first issue](https://github.com/bitcoin/bitcoin/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
-list or changes that are
-[up for grabs](https://github.com/bitcoin/bitcoin/issues?utf8=%E2%9C%93&q=label%3A%22Up+for+grabs%22).
-Some of them might no longer be applicable. So if you are interested, but
-unsure, you might want to leave a comment on the issue first.
-
 You may also participate in the [Bitcoin Core PR Review Club](https://bitcoincore.reviews/).
 
-### Good First Issue Label
-
-The purpose of the `good first issue` label is to highlight which issues are
-suitable for a new contributor without a deep understanding of the codebase.
-
-However, good first issues can be solved by anyone. If they remain unsolved
-for a longer time, a frequent contributor might address them.
-
-You do not need to request permission to start working on an issue. However,
-you are encouraged to leave a comment if you are planning to work on it. This
-will help other contributors monitor which issues are actively being addressed
-and is also an effective way to request assistance if and when you need it.
-
 Communication Channels
 ----------------------
 
@@ -122,7 +106,8 @@ fixes or code moves with actual code changes.
 
 Make sure each individual commit is hygienic: that it builds successfully on its
 own without warnings, errors, regressions, or test failures.
-This means tests must be updated in the same commit that changes the behavior.
+See the [developer notes](doc/developer-notes.md#commit-structure-for-tests)
+for guidance on where test coverage belongs in a commit stack.
 
 Commit messages should be verbose by default consisting of a short subject line
 (50 chars max), a blank line and detailed explanatory text as separate
diff --git a/depend/bitcoin/CTestConfig.cmake b/depend/bitcoin/CTestConfig.cmake
new file mode 100644
index 00000000..539a37d2
--- /dev/null
+++ b/depend/bitcoin/CTestConfig.cmake
@@ -0,0 +1,2 @@
+set(CTEST_SUBMIT_URL "https://my.cdash.org/submit.php?project=bitcoin-core")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")
diff --git a/depend/bitcoin/SECURITY.md b/depend/bitcoin/SECURITY.md
index fd4c61d1..17dedcd7 100644
--- a/depend/bitcoin/SECURITY.md
+++ b/depend/bitcoin/SECURITY.md
@@ -13,8 +13,8 @@ The following keys may be used to communicate sensitive information to developer
 
 | Name | Fingerprint |
 |------|-------------|
-| Pieter Wuille | 133E AC17 9436 F14A 5CF1  B794 860F EB80 4E66 9320 |
 | Michael Ford | E777 299F C265 DD04 7930  70EB 944D 35F9 AC3D B76A |
 | Ava Chow | 1528 1230 0785 C964 44D3  334D 1756 5732 E08E 5E41 |
+| Niklas Gögge | 2CBB F208 E594 BF43 9B5F 276C 7465 CFFF 6793 242E |
 
 You can import a key by running the following command with that individual’s fingerprint: `gpg --keyserver hkps://keys.openpgp.org --recv-keys "<fingerprint>"` Ensure that you put quotes around fingerprints containing spaces.
diff --git a/depend/bitcoin/ci/README.md b/depend/bitcoin/ci/README.md
index 293294a5..33c623dc 100644
--- a/depend/bitcoin/ci/README.md
+++ b/depend/bitcoin/ci/README.md
@@ -80,20 +80,22 @@ 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:
-   1. cirruslabs/cache/restore@\*
-   1. cirruslabs/cache/save@\*
-   1. docker/setup-buildx-action@\*
+   1. actions/cache/restore@\*
+   1. actions/cache/save@\*
    1. actions/github-script@\*
+   1. docker/setup-buildx-action@\*
+   1. warpbuilds/cache/restore@\*
+   1. warpbuilds/cache/save@\*
 
 ### 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*.
+It is also possible to use your own WarpBuild Runners in your own fork by replacing the references to `bitcoin/bitcoin` in `../.github/workflows/ci.yml` with the name of your fork (e.g. `your-org/bitcoin`).
+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*.
diff --git a/depend/bitcoin/ci/lint/01_install.sh b/depend/bitcoin/ci/lint/01_install.sh
index 573dbca5..9c2020a9 100755
--- a/depend/bitcoin/ci/lint/01_install.sh
+++ b/depend/bitcoin/ci/lint/01_install.sh
@@ -22,29 +22,14 @@ ${CI_RETRY_EXE} apt-get update
 # - moreutils (used by scripted-diff)
 ${CI_RETRY_EXE} apt-get install -y cargo curl xz-utils git gpg moreutils
 
-PYTHON_PATH="/python_build"
-if [ ! -d "${PYTHON_PATH}/bin" ]; then
-  (
-    ${CI_RETRY_EXE} git clone --depth=1 https://github.com/pyenv/pyenv.git
-    cd pyenv/plugins/python-build || exit 1
-    ./install.sh
-  )
-  # For dependencies see https://github.com/pyenv/pyenv/wiki#suggested-build-environment
-  ${CI_RETRY_EXE} apt-get install -y build-essential libssl-dev zlib1g-dev \
-    libbz2-dev libreadline-dev libsqlite3-dev curl llvm \
-    libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
-    clang
-  env CC=clang python-build "$(cat "/.python-version")" "${PYTHON_PATH}"
-fi
-export PATH="${PYTHON_PATH}/bin:${PATH}"
+# Install Python and create venv using uv (reads version from .python-version)
+uv venv /python_env
+
+export PATH="/python_env/bin:${PATH}"
 command -v python3
 python3 --version
 
-${CI_RETRY_EXE} pip3 install \
-  lief==0.17.5 \
-  mypy==1.19.1 \
-  pyzmq==27.1.0 \
-  ruff==0.15.5
+uv pip install --python /python_env --requirements /ci/lint/requirements.txt
 
 SHELLCHECK_VERSION=v0.11.0
 curl --fail -L "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.$(uname --machine).tar.xz" | \
diff --git a/depend/bitcoin/ci/lint/06_script.sh b/depend/bitcoin/ci/lint/06_script.sh
index 1b36fada..a0f2dc88 100755
--- a/depend/bitcoin/ci/lint/06_script.sh
+++ b/depend/bitcoin/ci/lint/06_script.sh
@@ -12,7 +12,7 @@ set -o errexit -o pipefail -o xtrace
 # of the mounted bitcoin src dir.
 git config --global --add safe.directory /bitcoin
 
-export PATH="/python_build/bin:${PATH}"
+export PATH="/python_env/bin:${PATH}"
 
 if [ -n "${LINT_CI_IS_PR}" ]; then
   export COMMIT_RANGE="HEAD~..HEAD"
diff --git a/depend/bitcoin/ci/lint/requirements.txt b/depend/bitcoin/ci/lint/requirements.txt
new file mode 100644
index 00000000..15784538
--- /dev/null
+++ b/depend/bitcoin/ci/lint/requirements.txt
@@ -0,0 +1,4 @@
+# lief version should match the version used in Guix
+lief==0.17.5
+mypy==2.3.0
+pyzmq==27.1.0
diff --git a/depend/bitcoin/ci/lint_imagefile b/depend/bitcoin/ci/lint_imagefile
index 77e9688c..cc4986a7 100644
--- a/depend/bitcoin/ci/lint_imagefile
+++ b/depend/bitcoin/ci/lint_imagefile
@@ -4,10 +4,17 @@
 
 # See test/lint/README.md for usage.
 
-FROM mirror.gcr.io/ubuntu:24.04
+FROM mirror.gcr.io/ubuntu:26.04
+
+# Pin uv and ruff to minor version to avoid breaking changes
+# https://docs.astral.sh/uv/reference/policies/versioning/
+# https://docs.astral.sh/ruff/versioning/
+COPY --from=ghcr.io/astral-sh/uv:0.11 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/ruff:0.15 /ruff /bin/
 
 COPY ./ci/retry/retry /ci_retry
 COPY ./.python-version /.python-version
+COPY ./ci/lint/requirements.txt /ci/lint/requirements.txt
 COPY ./ci/lint/01_install.sh /install.sh
 
 RUN /install.sh && \
diff --git a/depend/bitcoin/ci/test/00_setup_env.sh b/depend/bitcoin/ci/test/00_setup_env.sh
index 8d9a16ab..fc8f2d98 100755
--- a/depend/bitcoin/ci/test/00_setup_env.sh
+++ b/depend/bitcoin/ci/test/00_setup_env.sh
@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-set -o errexit -o pipefail -o xtrace
+set -o errexit -o nounset -o pipefail -o xtrace
 
 # The source root dir, usually from git, usually read-only.
 # The ci system copies this folder.
@@ -14,21 +14,22 @@ BASE_READ_ONLY_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>
 export BASE_READ_ONLY_DIR
 # The destination root dir inside the container.
 # This folder will also hold any SDKs.
-# This folder only exists on the ci guest and will be a copy of BASE_READ_ONLY_DIR
+# This folder only exists on the ci guest and will be a copy of BASE_READ_ONLY_DIR.
+# This value is embedded in the CI image at build time; changing it requires
+# rebuilding the image.
 export BASE_ROOT_DIR="${BASE_ROOT_DIR:-/ci_container_base}"
 # The depends dir.
 # This folder exists only on the ci guest, and on the ci host as a volume.
 export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
 # A folder for the ci system to put temporary files (build result, datadirs for tests, ...)
+# The name contains a space and a non-ASCII symbol to confirm the build and
+# tests handle word-splitting and UTF8 correctly.
 # This folder only exists on the ci guest.
-export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch}
+export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch_ ₿🧪_}
 
 echo "Setting specific values in env"
-if [ -n "${FILE_ENV}" ]; then
-  set -o errexit;
-  # shellcheck disable=SC1090
-  source "${FILE_ENV}"
-fi
+# shellcheck disable=SC1090
+source "${FILE_ENV}"
 
 echo "Fallback to default values in env (if not yet set)"
 # The number of parallel jobs to pass down to make and test_runner.py
diff --git a/depend/bitcoin/ci/test/00_setup_env_arm.sh b/depend/bitcoin/ci/test/00_setup_env_arm.sh
index f4ad97d2..71b519da 100755
--- a/depend/bitcoin/ci/test/00_setup_env_arm.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_arm.sh
@@ -8,7 +8,8 @@ export LC_ALL=C.UTF-8
 
 export HOST=arm-linux-gnueabihf
 export DPKG_ADD_ARCH="armhf"
-export PACKAGES="python3-zmq g++-arm-linux-gnueabihf libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
+export PACKAGES="python3-pip python3-zmq g++-arm-linux-gnueabihf libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
+export PIP_PACKAGES="--break-system-packages pycapnp"
 export CONTAINER_NAME=ci_arm_linux
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"  # Check that https://packages.debian.org/trixie/g++-arm-linux-gnueabihf (version 14.x, similar to guix) can cross-compile
 export CI_IMAGE_PLATFORM="linux/arm64"
diff --git a/depend/bitcoin/ci/test/00_setup_env_freebsd_cross.sh b/depend/bitcoin/ci/test/00_setup_env_freebsd_cross.sh
index da7304d1..9a22cb6f 100755
--- a/depend/bitcoin/ci/test/00_setup_env_freebsd_cross.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_freebsd_cross.sh
@@ -7,15 +7,28 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_freebsd_cross
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export APT_LLVM_V="22"
-export FREEBSD_VERSION=15.0
-export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} lld"
 export HOST=x86_64-unknown-freebsd
-export DEP_OPTS="build_CC=clang build_CXX=clang++ AR=llvm-ar-${APT_LLVM_V} STRIP=llvm-strip-${APT_LLVM_V} NM=llvm-nm-${APT_LLVM_V} RANLIB=llvm-ranlib-${APT_LLVM_V}"
+export FREEBSD_VERSION=15.1
+export FREEBSD_SDK_BASENAME="freebsd-${HOST}-${FREEBSD_VERSION}"
+export FREEBSD_SDK_SHA256=3768988b151c20f965679062b065c63a977d6bbb9f47fd83695ec2c40790c18f
+export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} lld-${APT_LLVM_V}"
+export SYSROOT="--sysroot=${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}"
+export DEP_OPTS="build_CC=clang build_CXX=clang++ \
+ CC='clang --target=${HOST} ${SYSROOT}' \
+ CXX='clang++ --target=${HOST} ${SYSROOT} -stdlib=libc++' \
+ LDFLAGS='-Wc,-fuse-ld=lld -fuse-ld=lld' \
+ AR=llvm-ar-${APT_LLVM_V} \
+ NM=llvm-nm-${APT_LLVM_V} \
+ OBJCOPY=llvm-objcopy-${APT_LLVM_V} \
+ OBJDUMP=llvm-objdump-${APT_LLVM_V} \
+ RANLIB=llvm-ranlib-${APT_LLVM_V} \
+ STRIP=llvm-strip-${APT_LLVM_V}"
 export GOAL="install"
 export BITCOIN_CONFIG="\
  --preset=dev-mode \
+ -DCMAKE_LINKER_TYPE=LLD \
  -DREDUCE_EXPORTS=ON \
  -DWITH_USDT=OFF \
 "
diff --git a/depend/bitcoin/ci/test/00_setup_env_i686_no_ipc.sh b/depend/bitcoin/ci/test/00_setup_env_i686_no_ipc.sh
index dca0486f..d8df8100 100755
--- a/depend/bitcoin/ci/test/00_setup_env_i686_no_ipc.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_i686_no_ipc.sh
@@ -8,18 +8,16 @@ export LC_ALL=C.UTF-8
 
 export HOST=i686-pc-linux-gnu
 export CONTAINER_NAME=ci_i686_no_multiprocess
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CI_IMAGE_PLATFORM="linux/amd64"
-export PACKAGES="llvm clang g++-multilib"
+export CI_CONTAINER_CAP="--security-opt seccomp=unconfined"
+export PACKAGES="g++-multilib"
 export DEP_OPTS="DEBUG=1 NO_IPC=1"
 export GOAL="install"
 export CI_LIMIT_STACK_SIZE=1
-export TEST_RUNNER_EXTRA="--v2transport --usecli"
 export BITCOIN_CONFIG="\
  --preset=dev-mode \
  -DENABLE_IPC=OFF \
  -DCMAKE_BUILD_TYPE=Debug \
- -DCMAKE_C_COMPILER='clang;-m32' \
- -DCMAKE_CXX_COMPILER='clang++;-m32' \
  -DAPPEND_CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' \
 "
diff --git a/depend/bitcoin/ci/test/00_setup_env_mac_cross.sh b/depend/bitcoin/ci/test/00_setup_env_mac_cross.sh
index 63d89fb9..80c6f878 100755
--- a/depend/bitcoin/ci/test/00_setup_env_mac_cross.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_mac_cross.sh
@@ -14,6 +14,7 @@ export HOST=arm64-apple-darwin
 export PACKAGES="clang lld llvm zip"
 export XCODE_VERSION=26.1.1
 export XCODE_BUILD_ID=17B100
+export OSX_SDK_SHA256=9600fa93644df674ee916b5e2c8a6ba8dacf631996a65dc922d003b98b5ea3b1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export GOAL="deploy"
diff --git a/depend/bitcoin/ci/test/00_setup_env_mac_cross_intel.sh b/depend/bitcoin/ci/test/00_setup_env_mac_cross_intel.sh
index 4b07e14b..e679c957 100755
--- a/depend/bitcoin/ci/test/00_setup_env_mac_cross_intel.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_mac_cross_intel.sh
@@ -14,6 +14,7 @@ export HOST=x86_64-apple-darwin
 export PACKAGES="clang lld llvm zip"
 export XCODE_VERSION=26.1.1
 export XCODE_BUILD_ID=17B100
+export OSX_SDK_SHA256=9600fa93644df674ee916b5e2c8a6ba8dacf631996a65dc922d003b98b5ea3b1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export GOAL="deploy"
diff --git a/depend/bitcoin/ci/test/00_setup_env_mac_native.sh b/depend/bitcoin/ci/test/00_setup_env_mac_native.sh
index a9b4d5c8..d59c5ae6 100755
--- a/depend/bitcoin/ci/test/00_setup_env_mac_native.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_mac_native.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME="ci_mac_native"  # macos does not use a container, but the env var is needed for logging
-export PIP_PACKAGES="--break-system-packages pycapnp zmq"
+export PIP_PACKAGES="--break-system-packages pycapnp pyzmq"
 export GOAL="install deploy"
 export CMAKE_GENERATOR="Ninja"
 export CI_OS_NAME="macos"
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_alpine_musl.sh b/depend/bitcoin/ci/test/00_setup_env_native_alpine_musl.sh
index e42cb4a3..3801dfec 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_alpine_musl.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_alpine_musl.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_alpine_musl
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/alpine:3.23"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/alpine:3.24"
 export CI_BASE_PACKAGES="build-base musl-dev pkgconf curl ccache make ninja git python3-dev py3-pip which patch xz procps rsync util-linux bison e2fsprogs cmake dash linux-headers"
 export PIP_PACKAGES="--break-system-packages pyzmq pycapnp"
 export DEP_OPTS="DEBUG=1"
@@ -17,4 +17,5 @@ export BITCOIN_CONFIG="\
  -DREDUCE_EXPORTS=ON \
  -DCMAKE_BUILD_TYPE=Debug \
 "
+export TEST_RUNNER_EXTRA="--v2transport --usecli --extended --exclude feature_dbcrash"  # Run extended tests under --usecli and --v2transport, but exclude the very slow dbcrash
 export BITCOIN_CMD="bitcoin -m" # Used in functional tests
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_asan.sh b/depend/bitcoin/ci/test/00_setup_env_native_asan.sh
index 2465c70b..7e28b05e 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_asan.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_asan.sh
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
 
 # Only install BCC tracing packages in CI. Container has to match the host for BCC to work.
-if [[ "${INSTALL_BCC_TRACING_TOOLS}" == "true" ]]; then
+if [[ "${INSTALL_BCC_TRACING_TOOLS:-}" == "true" ]]; then
   # Required for USDT functional tests to run
   BPFCC_PACKAGE="bpfcc-tools linux-headers-$(uname --kernel-release)"
   export CI_CONTAINER_CAP="--privileged -v /sys/kernel:/sys/kernel:rw"
@@ -20,7 +20,7 @@ fi
 
 export CONTAINER_NAME=ci_native_asan
 export APT_LLVM_V="22"
-export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev mold python3-zmq qt6-base-dev qt6-tools-dev qt6-l10n-tools libevent-dev libboost-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE} libcapnp-dev capnproto python3-pip"
+export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev mold python3-zmq qt6-base-dev qt6-tools-dev qt6-l10n-tools libboost-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE} libcapnp-dev capnproto python3-pip"
 export PIP_PACKAGES="--break-system-packages pycapnp"
 export NO_DEPENDS=1
 export GOAL="install"
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_chimera_lto.sh b/depend/bitcoin/ci/test/00_setup_env_native_chimera_lto.sh
index fb5a343d..1cb983bf 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_chimera_lto.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_chimera_lto.sh
@@ -11,8 +11,9 @@ export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_chimera_musl
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/chimeralinux/chimera"
-export CI_BASE_PACKAGES="ccache chimerautils chimerautils-extra clang cmake curl e2fsprogs git gmake gtar linux-headers ninja pkgconf procps python-devel python-pip rsync util-linux util-linux-lscpu xz"
+export CI_BASE_PACKAGES="ccache chimerautils chimerautils-extra clang cmake curl e2fsprogs git gmake gtar linux-headers procps python-devel python-pip rsync util-linux util-linux-lscpu"
 export PIP_PACKAGES="--break-system-packages pyzmq pycapnp"
+# NO_QT=1 because Qt needs various patches: https://github.com/chimera-linux/cports/tree/master/main/qt6-qtbase/patches
 export DEP_OPTS="build_CC=clang build_CXX=clang++ build_TAR=gtar AR=llvm-ar CC=clang CXX=clang++ NM=llvm-nm RANLIB=llvm-ranlib STRIP=llvm-strip NO_QT=1"
 export GOAL="install"
 export BITCOIN_CONFIG="\
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_fuzz.sh b/depend/bitcoin/ci/test/00_setup_env_native_fuzz.sh
index cdfe2a0d..bb203a72 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_fuzz.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_fuzz.sh
@@ -6,10 +6,10 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CONTAINER_NAME=ci_native_fuzz
 export APT_LLVM_V="22"
-export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libevent-dev libboost-dev libsqlite3-dev libcapnp-dev capnproto"
+export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libboost-dev libsqlite3-dev libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_msan.sh b/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_msan.sh
index 82d9044a..7f6ad828 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_msan.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_msan.sh
@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export APT_LLVM_V="22"
 LIBCXX_DIR="/cxx_build/"
 export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
@@ -28,6 +28,6 @@ export BITCOIN_CONFIG="\
  -DAPPEND_CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -U_FORTIFY_SOURCE' \
 "
 export USE_INSTRUMENTED_LIBCPP="MemoryWithOrigins"
-export RUN_UNIT_TESTS="false"
-export RUN_FUNCTIONAL_TESTS="false"
+export RUN_UNIT_TESTS=false
+export RUN_FUNCTIONAL_TESTS=false
 export RUN_FUZZ_TESTS=true
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
index ed84ae84..b6442c78 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
@@ -6,9 +6,9 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CONTAINER_NAME=ci_native_fuzz_valgrind
-export PACKAGES="clang llvm libclang-rt-dev libevent-dev libboost-dev libsqlite3-dev valgrind libcapnp-dev capnproto"
+export PACKAGES="clang llvm libclang-rt-dev libboost-dev libsqlite3-dev valgrind libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_iwyu.sh b/depend/bitcoin/ci/test/00_setup_env_native_iwyu.sh
index 27b1e02b..14c367bb 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_iwyu.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_iwyu.sh
@@ -6,11 +6,11 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"  # To build codegen, CMake must be 3.31 or newer.
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"  # To build codegen, CMake must be 3.31 or newer.
 export CONTAINER_NAME=ci_native_iwyu
 export IWYU_LLVM_V="22"
 export APT_LLVM_V="${IWYU_LLVM_V}"
-export PACKAGES="clang-${IWYU_LLVM_V} clang-format-${IWYU_LLVM_V} libclang-${IWYU_LLVM_V}-dev llvm-${IWYU_LLVM_V}-dev jq libevent-dev libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
+export PACKAGES="clang-${IWYU_LLVM_V} clang-format-${IWYU_LLVM_V} libclang-${IWYU_LLVM_V}-dev llvm-${IWYU_LLVM_V}-dev jq libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_msan.sh b/depend/bitcoin/ci/test/00_setup_env_native_msan.sh
index 4a17fb49..1d005abb 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_msan.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_msan.sh
@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export APT_LLVM_V="22"
 LIBCXX_DIR="/cxx_build/"
 export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
@@ -15,7 +15,7 @@ export MSAN_AND_LIBCXX_FLAGS="${MSAN_FLAGS} ${LIBCXX_FLAGS}"
 
 export CONTAINER_NAME="ci_native_msan"
 export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} llvm-${APT_LLVM_V}-dev libclang-${APT_LLVM_V}-dev libclang-rt-${APT_LLVM_V}-dev python3-pip"
-export PIP_PACKAGES="--break-system-packages pycapnp"
+export PIP_PACKAGES="--break-system-packages pycapnp pyzmq"
 export DEP_OPTS="DEBUG=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
 export GOAL="install"
 export CI_LIMIT_STACK_SIZE=1
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_previous_releases.sh b/depend/bitcoin/ci/test/00_setup_env_native_previous_releases.sh
index d6af52c4..5e189f8c 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_previous_releases.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_previous_releases.sh
@@ -14,7 +14,7 @@ export DEP_OPTS="CC=gcc-12 CXX=g++-12"
 export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash"  # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
 export GOAL="install"
 export CI_LIMIT_STACK_SIZE=1
-export DOWNLOAD_PREVIOUS_RELEASES="true"
+export DOWNLOAD_PREVIOUS_RELEASES=true
 # Use -Werror as the CMake version does not support CMAKE_COMPILE_WARNING_AS_ERROR
 export BITCOIN_CONFIG="\
  --preset=dev-mode \
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_tidy.sh b/depend/bitcoin/ci/test/00_setup_env_native_tidy.sh
index b3cda17e..845a4370 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_tidy.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_tidy.sh
@@ -6,11 +6,11 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CONTAINER_NAME=ci_native_tidy
 export TIDY_LLVM_V="22"
 export APT_LLVM_V="${TIDY_LLVM_V}"
-export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq libevent-dev libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
+export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_tsan.sh b/depend/bitcoin/ci/test/00_setup_env_native_tsan.sh
index 29dd06bf..4f900699 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_tsan.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_tsan.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_tsan
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export APT_LLVM_V="22"
 LIBCXX_DIR="/cxx_build/"
 LIBCXX_FLAGS="-fsanitize=thread -nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"
@@ -16,10 +16,11 @@ export PIP_PACKAGES="--break-system-packages pycapnp"
 export DEP_OPTS="CC=clang CXX=clang++ CXXFLAGS='${LIBCXX_FLAGS}' NO_QT=1"
 export GOAL="install"
 export CI_LIMIT_STACK_SIZE=1
+# Disable fortification with -U_FORTIFY_SOURCE to work around https://github.com/bitcoin/bitcoin/issues/30586
 export BITCOIN_CONFIG="\
   --preset=dev-mode \
   -DBUILD_GUI=OFF \
   -DSANITIZERS=thread \
-  -DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES' \
+  -DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES -U_FORTIFY_SOURCE' \
 "
 export USE_INSTRUMENTED_LIBCPP="Thread"
diff --git a/depend/bitcoin/ci/test/00_setup_env_native_valgrind.sh b/depend/bitcoin/ci/test/00_setup_env_native_valgrind.sh
index 0ca02f77..52b5a37b 100755
--- a/depend/bitcoin/ci/test/00_setup_env_native_valgrind.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_native_valgrind.sh
@@ -6,9 +6,9 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CONTAINER_NAME=ci_native_valgrind
-export PACKAGES="clang llvm libclang-rt-dev valgrind python3-zmq libevent-dev libboost-dev libzmq3-dev libsqlite3-dev libcapnp-dev capnproto python3-pip"
+export PACKAGES="clang llvm libclang-rt-dev valgrind python3-zmq libboost-dev libzmq3-dev libsqlite3-dev libcapnp-dev capnproto python3-pip"
 export PIP_PACKAGES="--break-system-packages pycapnp"
 export USE_VALGRIND=1
 export NO_DEPENDS=1
diff --git a/depend/bitcoin/ci/test/00_setup_env_netbsd_cross.sh b/depend/bitcoin/ci/test/00_setup_env_netbsd_cross.sh
new file mode 100755
index 00000000..e817473f
--- /dev/null
+++ b/depend/bitcoin/ci/test/00_setup_env_netbsd_cross.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+
+export LC_ALL=C.UTF-8
+
+export CONTAINER_NAME=ci_netbsd_cross
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
+export APT_LLVM_V="22"
+export HOST=x86_64-unknown-netbsd
+export NETBSD_VERSION=11.0
+export NETBSD_SDK_BASENAME="netbsd-${HOST}-${NETBSD_VERSION}"
+export NETBSD_SDK_SHA512SUMS="\
+e8871bbedb8c3e0f696cc2596ced0c1e6497939f725fb3495b8d2c168430325907550f5f840f4dd0e3c73e6090394747c5e54762f2737de81177b984403522a8  base.tar.xz\n\
+d8df6c07e9142dd8189292b769ac312f86185a6a278a752c18c840f7cd3a8dd3c535f9b0c8e06b62d556b2c75b97a01d786184e8a18f5e080ccd213591c8628f  comp.tar.xz"
+export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} lld-${APT_LLVM_V}"
+export SYSROOT="--sysroot=${DEPENDS_DIR}/SDKs/${NETBSD_SDK_BASENAME}"
+export DEP_OPTS="build_CC=clang build_CXX=clang++ \
+ CC='clang --target=${HOST} ${SYSROOT}' \
+ CXX='clang++ --target=${HOST} ${SYSROOT} -stdlib=libstdc++' \
+ LDFLAGS='-fuse-ld=lld -lgcc_s' \
+ AR=llvm-ar-${APT_LLVM_V} \
+ NM=llvm-nm-${APT_LLVM_V} \
+ OBJCOPY=llvm-objcopy-${APT_LLVM_V} \
+ OBJDUMP=llvm-objdump-${APT_LLVM_V} \
+ RANLIB=llvm-ranlib-${APT_LLVM_V} \
+ STRIP=llvm-strip-${APT_LLVM_V}"
+export GOAL="install"
+export BITCOIN_CONFIG="\
+ --preset=dev-mode \
+ -DBUILD_GUI=OFF \
+ -DREDUCE_EXPORTS=ON \
+ -DWITH_USDT=OFF \
+"
+export RUN_UNIT_TESTS=false
+export RUN_FUNCTIONAL_TESTS=false
diff --git a/depend/bitcoin/ci/test/00_setup_env_openbsd_cross.sh b/depend/bitcoin/ci/test/00_setup_env_openbsd_cross.sh
new file mode 100755
index 00000000..f9d75e47
--- /dev/null
+++ b/depend/bitcoin/ci/test/00_setup_env_openbsd_cross.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+
+export LC_ALL=C.UTF-8
+
+export CONTAINER_NAME=ci_openbsd_cross
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
+export APT_LLVM_V="22"
+export HOST=x86_64-unknown-openbsd
+export OPENBSD_VERSION=7.9
+export OPENBSD_SDK_BASENAME="openbsd-${HOST}-${OPENBSD_VERSION}"
+export OPENBSD_SDK_SHA256SUMS="\
+923d2e03f06408d50d4848334398c6d04b5514dcac7917badfc178a0eef248de  base79.tgz\n\
+21a67af20aebcabf85b09f4206fc95b4cae0a35d42b154b976f0159f457724f9  comp79.tgz"
+export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} lld-${APT_LLVM_V}"
+export SYSROOT="--sysroot=${DEPENDS_DIR}/SDKs/${OPENBSD_SDK_BASENAME}"
+export DEP_OPTS="NO_QT=1 build_CC=clang build_CXX=clang++ \
+ CC='clang --target=${HOST} ${SYSROOT}' \
+ CXX='clang++ --target=${HOST} ${SYSROOT} -stdlib=libc++' \
+ LDFLAGS='-fuse-ld=lld' \
+ AR=llvm-ar-${APT_LLVM_V} \
+ NM=llvm-nm-${APT_LLVM_V} \
+ OBJCOPY=llvm-objcopy-${APT_LLVM_V} \
+ OBJDUMP=llvm-objdump-${APT_LLVM_V} \
+ RANLIB=llvm-ranlib-${APT_LLVM_V} \
+ STRIP=llvm-strip-${APT_LLVM_V}"
+export GOAL="install"
+export BITCOIN_CONFIG="\
+ --preset=dev-mode \
+ -DBUILD_GUI=OFF \
+ -DREDUCE_EXPORTS=ON \
+ -DWITH_USDT=OFF \
+"
+export RUN_UNIT_TESTS=false
+export RUN_FUNCTIONAL_TESTS=false
diff --git a/depend/bitcoin/ci/test/00_setup_env_riscv_bare_cross.sh b/depend/bitcoin/ci/test/00_setup_env_riscv_bare_cross.sh
new file mode 100755
index 00000000..c5459e78
--- /dev/null
+++ b/depend/bitcoin/ci/test/00_setup_env_riscv_bare_cross.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+export CONTAINER_NAME=ci_native_riscv_bare
+
+export GOAL="bitcoin_consensus bitcoin_crypto secp256k1"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
+export HOST="riscv32-unknown-elf-gcc"
+export PACKAGES="autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev ninja-build git cmake libglib2.0-dev libslirp-dev"
+export BITCOIN_CONFIG="-DCMAKE_C_COMPILER=/opt/riscv-ilp32/bin/riscv32-unknown-elf-gcc \
+ -DCMAKE_CXX_COMPILER=/opt/riscv-ilp32/bin/riscv32-unknown-elf-g++ \
+ -DBUILD_KERNEL_LIB=OFF \
+ -DBUILD_UTIL_CHAINSTATE=OFF \
+ -DBUILD_TESTS=OFF \
+ -DBUILD_BENCH=OFF \
+ -DBUILD_FUZZ_BINARY=OFF \
+ -DBUILD_DAEMON=OFF \
+ -DBUILD_TX=OFF \
+ -DBUILD_UTIL=OFF \
+ -DBUILD_CLI=OFF \
+ -DBUILD_BITCOIN_BIN=OFF \
+ -DENABLE_WALLET=OFF \
+ -DENABLE_EXTERNAL_SIGNER=OFF \
+ -DENABLE_IPC=OFF \
+ -DCMAKE_SYSTEM_NAME=Generic \
+ -DIFADDR_LINKS_WITHOUT_LIBSOCKET=ON \
+ "
+
+export BARE_METAL_RISCV=true
+export RUN_UNIT_TESTS=false
+export RUN_FUNCTIONAL_TESTS=false
+export NO_DEPENDS=true
diff --git a/depend/bitcoin/ci/test/00_setup_env_s390x.sh b/depend/bitcoin/ci/test/00_setup_env_s390x.sh
index d1e34070..a7c59d76 100755
--- a/depend/bitcoin/ci/test/00_setup_env_s390x.sh
+++ b/depend/bitcoin/ci/test/00_setup_env_s390x.sh
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
 export HOST=s390x-linux-gnu
 export PACKAGES="python3-zmq"
 export CONTAINER_NAME=ci_s390x
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CI_IMAGE_PLATFORM="linux/s390x"
 # bind tests excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
 export TEST_RUNNER_EXTRA="--exclude rpc_bind --exclude feature_bind_extra"
diff --git a/depend/bitcoin/ci/test/01_base_install.sh b/depend/bitcoin/ci/test/01_base_install.sh
index 512d1a32..29121476 100755
--- a/depend/bitcoin/ci/test/01_base_install.sh
+++ b/depend/bitcoin/ci/test/01_base_install.sh
@@ -62,10 +62,13 @@ if [ -n "$PIP_PACKAGES" ]; then
 fi
 
 if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
-  ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-22.1.3" /llvm-project
+  ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-22.1.7" /llvm-project
 
+# LLVM is configured with LIBCXXABI_USE_LLVM_UNWINDER=OFF,
+# because libunwind doesn't handle exceptions under MSAN.
+# https://github.com/llvm/llvm-project/issues/84348
   cmake -G Ninja -B /cxx_build/ \
-    -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
+    -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
     -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_USE_SANITIZER="${USE_INSTRUMENTED_LIBCPP}" \
     -DCMAKE_C_COMPILER=clang \
@@ -84,9 +87,28 @@ if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
   rm -rf /llvm-project
 fi
 
+if [[ ${BARE_METAL_RISCV} == "true" ]]; then
+    # Use a mirror for these submodules as sourceware blocks too many requests combating AI.
+    ${CI_RETRY_EXE} git clone --depth=1 https://github.com/riscv-collab/riscv-gnu-toolchain -b 2026.06.06 /riscv/gcc
+    ( cd /riscv/gcc;
+      export GIT_CONFIG_COUNT=3
+      export GIT_CONFIG_KEY_0=url.https://git.fish.foo/mirrors/binutils-gdb.git.insteadOf
+      export GIT_CONFIG_VALUE_0=https://sourceware.org/git/binutils-gdb.git
+      export GIT_CONFIG_KEY_1=url.https://git.fish.foo/mirrors/glibc.git.insteadOf
+      export GIT_CONFIG_VALUE_1=https://sourceware.org/git/glibc.git
+      export GIT_CONFIG_KEY_2=url.https://git.fish.foo/mirrors/newlib-cygwin.git.insteadOf
+      export GIT_CONFIG_VALUE_2=https://sourceware.org/git/newlib-cygwin.git
+      ./configure --prefix=/opt/riscv-ilp32 --with-arch=rv32gc --with-abi=ilp32 --disable-gdb;
+      make "$MAKEJOBS"; )
+    rm -rf /riscv/gcc
+fi
+
 if [[ "${RUN_IWYU}" == true ]]; then
   ${CI_RETRY_EXE} git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_"${IWYU_LLVM_V}" /include-what-you-use
-  (cd /include-what-you-use && patch -p1 < /ci_container_base/ci/test/01_iwyu.patch)
+  pushd /include-what-you-use
+  patch -p1 < "${BASE_ROOT_DIR}/ci/test/01_iwyu.patch"
+  patch -p1 < "${BASE_ROOT_DIR}/ci/test/02_iwyu_hash.patch"
+  popd
   cmake -B /iwyu-build/ -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-"${IWYU_LLVM_V}" -S /include-what-you-use
   make -C /iwyu-build/ install "$MAKEJOBS"
 fi
@@ -101,10 +123,21 @@ if [ -n "$XCODE_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OSX_SDK_BASENAME}" ]
   if [ ! -f "$OSX_SDK_PATH" ]; then
     ${CI_RETRY_EXE} curl --location --fail "${SDK_URL}/${OSX_SDK_FILENAME}" -o "$OSX_SDK_PATH"
   fi
+  sha256sum -c <<<"${OSX_SDK_SHA256} ${OSX_SDK_PATH}"
   tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
 fi
 
-FREEBSD_SDK_BASENAME="freebsd-${HOST}-${FREEBSD_VERSION}"
+if [ -n "$NETBSD_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${NETBSD_SDK_BASENAME}" ]; then
+  mkdir -p "${DEPENDS_DIR}/SDKs/${NETBSD_SDK_BASENAME}"
+  while read -r NETBSD_SDK_SHA512 NETBSD_SDK_FILENAME; do
+    NETBSD_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${NETBSD_SDK_FILENAME}"
+    if [ ! -f "$NETBSD_SDK_PATH" ]; then
+      ${CI_RETRY_EXE} curl --location --fail "https://cdn.netbsd.org/pub/NetBSD/NetBSD-${NETBSD_VERSION}/amd64/binary/sets/${NETBSD_SDK_FILENAME}" -o "$NETBSD_SDK_PATH"
+    fi
+    sha512sum -c <<<"${NETBSD_SDK_SHA512}  ${NETBSD_SDK_PATH}"
+    tar -C "${DEPENDS_DIR}/SDKs/${NETBSD_SDK_BASENAME}" -xf "$NETBSD_SDK_PATH"
+  done < <(printf '%b\n' "${NETBSD_SDK_SHA512SUMS}")
+fi
 
 if [ -n "$FREEBSD_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}" ]; then
   FREEBSD_SDK_FILENAME="base-${FREEBSD_VERSION}.txz"
@@ -112,8 +145,29 @@ if [ -n "$FREEBSD_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENA
   if [ ! -f "$FREEBSD_SDK_PATH" ]; then
     ${CI_RETRY_EXE} curl --location --fail "https://download.freebsd.org/releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz" -o "$FREEBSD_SDK_PATH"
   fi
+  sha256sum -c <<<"${FREEBSD_SDK_SHA256} ${FREEBSD_SDK_PATH}"
   mkdir -p "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}"
   tar -C "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}" -xf "$FREEBSD_SDK_PATH"
 fi
 
+if [ -n "$OPENBSD_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OPENBSD_SDK_BASENAME}" ]; then
+  mkdir -p "${DEPENDS_DIR}/SDKs/${OPENBSD_SDK_BASENAME}"
+  while read -r OPENBSD_SDK_SHA256 OPENBSD_SDK_FILENAME; do
+    OPENBSD_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${OPENBSD_SDK_FILENAME}"
+    if [ ! -f "$OPENBSD_SDK_PATH" ]; then
+      ${CI_RETRY_EXE} curl --location --fail "https://cdn.openbsd.org/pub/OpenBSD/${OPENBSD_VERSION}/amd64/${OPENBSD_SDK_FILENAME}" -o "$OPENBSD_SDK_PATH"
+    fi
+    sha256sum -c <<<"${OPENBSD_SDK_SHA256}  ${OPENBSD_SDK_PATH}"
+    tar -C "${DEPENDS_DIR}/SDKs/${OPENBSD_SDK_BASENAME}" -xf "$OPENBSD_SDK_PATH"
+  done < <(printf '%b\n' "${OPENBSD_SDK_SHA256SUMS}")
+  (
+    # The SDK has versioned shared libs, but no unversioned libfoo.so symlink,
+    # which breaks linking the kernel with lld. Create the symlinks.
+    cd "${DEPENDS_DIR}/SDKs/${OPENBSD_SDK_BASENAME}/usr/lib"
+    ln -sf libc++abi.so.*.*  libc++abi.so
+    ln -sf libc++.so.*.*     libc++.so
+    ln -sf libpthread.so.*.* libpthread.so
+  )
+fi
+
 echo -n "done" > "${CFG_DONE}"
diff --git a/depend/bitcoin/ci/test/01_iwyu.patch b/depend/bitcoin/ci/test/01_iwyu.patch
index d86a02dc..794bb74f 100644
--- a/depend/bitcoin/ci/test/01_iwyu.patch
+++ b/depend/bitcoin/ci/test/01_iwyu.patch
@@ -15,7 +15,7 @@ See: https://en.cppreference.com/w/cpp/preprocessor/include.html.
 
 
 Prefer C++ headers over C counterparts.
-See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/iwyu_include_picker.cc#L587-L629.
+See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_22/iwyu_include_picker.cc#L645-L687.
 
 --- a/iwyu_include_picker.cc
 +++ b/iwyu_include_picker.cc
diff --git a/depend/bitcoin/ci/test/02_iwyu_hash.patch b/depend/bitcoin/ci/test/02_iwyu_hash.patch
new file mode 100644
index 00000000..12df7a04
--- /dev/null
+++ b/depend/bitcoin/ci/test/02_iwyu_hash.patch
@@ -0,0 +1,44 @@
+Map std::hash to its providing standard headers.
+Backport of https://github.com/include-what-you-use/include-what-you-use/pull/2013
+(commit 52f85e1f4d990f55fc6556d543eb051d79364a16) to the clang_22 release
+branch. Drop once the upstream fix lands in the IWYU branch tracked by
+ci/test/00_setup_env_native_iwyu.sh.
+
+--- a/std_symbol_map.inc
++++ b/std_symbol_map.inc
+@@ -1054,12 +1054,27 @@
+ { "std::has_unique_object_representations_v", kPrivate, "<type_traits>", kPublic },
+ { "std::has_virtual_destructor", kPrivate, "<type_traits>", kPublic },
+ { "std::has_virtual_destructor_v", kPrivate, "<type_traits>", kPublic },
++{ "std::hash", kPrivate, "<functional>", kPublic },
++{ "std::hash", kPrivate, "<bitset>", kPublic },
++{ "std::hash", kPrivate, "<coroutine>", kPublic },
++{ "std::hash", kPrivate, "<filesystem>", kPublic },
++{ "std::hash", kPrivate, "<memory>", kPublic },
++{ "std::hash", kPrivate, "<optional>", kPublic },
++{ "std::hash", kPrivate, "<stacktrace>", kPublic },
++{ "std::hash", kPrivate, "<string>", kPublic },
++{ "std::hash", kPrivate, "<string_view>", kPublic },
++{ "std::hash", kPrivate, "<system_error>", kPublic },
++{ "std::hash", kPrivate, "<thread>", kPublic },
++{ "std::hash", kPrivate, "<typeindex>", kPublic },
++{ "std::hash", kPrivate, "<variant>", kPublic },
++{ "std::hash", kPrivate, "<vector>", kPublic },
+ { "std::hash<std::basic_stacktrace<:0>>", kPrivate, "<stacktrace>", kPublic },
+ { "std::hash<std::basic_string<char, std::char_traits<char>, :0>>", kPrivate, "<string>", kPublic },
+ { "std::hash<std::basic_string<char16_t, std::char_traits<char16_t>, :0>>", kPrivate, "<string>", kPublic },
+ { "std::hash<std::basic_string<char32_t, std::char_traits<char32_t>, :0>>", kPrivate, "<string>", kPublic },
+ { "std::hash<std::basic_string<char8_t, std::char_traits<char8_t>, :0>>", kPrivate, "<string>", kPublic },
+ { "std::hash<std::basic_string<wchar_t, std::char_traits<wchar_t>, :0>>", kPrivate, "<string>", kPublic },
++{ "std::hash<std::bitset<:0>>", kPrivate, "<bitset>", kPublic },
+ { "std::hash<std::coroutine_handle<:0>>", kPrivate, "<coroutine>", kPublic },
+ { "std::hash<std::error_code>", kPrivate, "<system_error>", kPublic },
+ { "std::hash<std::error_condition>", kPrivate, "<system_error>", kPublic },
+@@ -1069,6 +1084,7 @@
+ { "std::hash<std::shared_ptr<:0>>", kPrivate, "<memory>", kPublic },
+ { "std::hash<std::stacktrace_entry>", kPrivate, "<stacktrace>", kPublic },
+ { "std::hash<std::string_view>", kPrivate, "<string_view>", kPublic },
++{ "std::hash<std::thread::id>", kPrivate, "<thread>", kPublic },
+ { "std::hash<std::type_index>", kPrivate, "<typeindex>", kPublic },
+ { "std::hash<std::u16string_view>", kPrivate, "<string_view>", kPublic },
+ { "std::hash<std::u32string_view>", kPrivate, "<string_view>", kPublic },
diff --git a/depend/bitcoin/ci/test/02_run_container.py b/depend/bitcoin/ci/test/02_run_container.py
index abaa5355..05887000 100755
--- a/depend/bitcoin/ci/test/02_run_container.py
+++ b/depend/bitcoin/ci/test/02_run_container.py
@@ -115,6 +115,7 @@ def main():
             CI_CCACHE_MOUNT = f"type=bind,src={os.environ['CCACHE_DIR']},dst={os.environ['CCACHE_DIR']}"
 
         run(["docker", "network", "create", "--ipv6", "--subnet", "1111:1111::/112", "ci-ip6net"], check=False)
+        run(["docker", "network", "create", "--subnet", "1.1.1.0/24", "ci-ip4net"], check=False)
 
         if os.getenv("RESTART_CI_DOCKER_BEFORE_RUN"):
             print("Restart docker before run to stop and clear all containers started with --rm")
@@ -144,6 +145,7 @@ def main():
             f"--env-file={env_file}",
             f"--name={os.environ['CONTAINER_NAME']}",
             "--network=ci-ip6net",
+            "--ip6=1111:1111::5", # Used by some of the tests, don't change it just here (keep them in sync).
             f"--platform={os.environ['CI_IMAGE_PLATFORM']}",
             os.environ["CONTAINER_NAME"],
         ]
@@ -154,6 +156,8 @@ def main():
             text=True,
         ).stdout.strip()
 
+        run(["docker", "network", "connect", "--ip=1.1.1.5", "ci-ip4net", container_id]) # The IP address is used by some of the tests, don't change it just here (keep them in sync).
+
     def ci_exec(cmd_inner, **kwargs):
         if os.getenv("DANGER_RUN_CI_ON_HOST"):
             prefix = []
diff --git a/depend/bitcoin/ci/test/03_test_script.sh b/depend/bitcoin/ci/test/03_test_script.sh
index 4e4d9757..f89ba657 100755
--- a/depend/bitcoin/ci/test/03_test_script.sh
+++ b/depend/bitcoin/ci/test/03_test_script.sh
@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-set -o errexit -o xtrace
+set -o errexit -o xtrace -o pipefail
 
 if [ "${DANGER_RUN_CI_ON_HOST}" != "1" ]; then
   echo "This script will make unsafe local and global modifications, so it can only be run inside a container and requires DANGER_RUN_CI_ON_HOST=1"
@@ -17,7 +17,7 @@ cd "${BASE_ROOT_DIR}"
 
 export PATH="/path_with space:${PATH}"
 export ASAN_OPTIONS="detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
-export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
+export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan:print_suppressions=0"
 export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:second_deadlock_stack=1"
 export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
 
@@ -109,7 +109,7 @@ ccache --zero-stats
 # Folder where the build is done.
 BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
 
-BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR -Werror=dev"
+BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL '-DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR' -Werror=dev"
 
 if [[ "${RUN_IWYU}" == true || "${RUN_TIDY}" == true ]]; then
   BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
@@ -136,10 +136,30 @@ cmake --build "${BASE_BUILD_DIR}" "$MAKEJOBS" --target $GOAL || (
 )
 
 ccache --version | head -n 1 && ccache --show-stats --verbose
-hit_rate=$(ccache --show-stats | grep "Hits:" | head -1 | sed 's/.*(\(.*\)%).*/\1/')
-if [ "${hit_rate%.*}" -lt 75 ]; then
-  echo "::notice title=low ccache hitrate::Ccache hit-rate in $CONTAINER_NAME was $hit_rate%"
-fi
+ccache --print-stats | python3 -c '
+import os
+import sys
+
+for line in sys.stdin:
+    key, value = line.split("\t", 1)
+    # "primary storage" fallback only needed for ccache version 4.5.1
+    if key in ("local_storage_hit", "primary_storage_hit"):
+        hits = int(value)
+    elif key in ("local_storage_miss", "primary_storage_miss"):
+        miss = int(value)
+
+calls = hits + miss
+# codegen has no calls, so skip that here
+if calls:
+    rate = (hits / calls * 100)
+    print(f"{rate:.2f}")
+    if rate < 75:
+        container = os.environ["CONTAINER_NAME"]
+        print(
+            "::notice title=low ccache hitrate::"
+            f"Ccache hit-rate in {container} was {rate:.2f}%"
+        )
+'
 du -sh "${DEPENDS_DIR}"/*/
 du -sh "${PREVIOUS_RELEASES_DIR}"
 
@@ -147,8 +167,13 @@ if [ -n "${CI_LIMIT_STACK_SIZE}" ]; then
   ulimit -s 512
 fi
 
+if [[ ${BARE_METAL_RISCV} == "true" ]]; then
+    export BASE_BUILD_DIR
+    "${BASE_ROOT_DIR}/ci/test/link-riscv.sh"
+fi
+
 if [ -n "$USE_VALGRIND" ]; then
-  "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
+  "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.py"
 fi
 
 if [ "$RUN_CHECK_DEPS" = "true" ]; then
@@ -209,7 +234,7 @@ fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
   # TODO: Consider enforcing IWYU across the entire codebase.
-  FILES_WITH_ENFORCED_IWYU="/src/(((crypto|index|kernel|primitives|univalue/(lib|test)|util|zmq)/.*|common/license_info|node/blockstorage|node/utxo_snapshot|clientversion|core_io|signet)\\.cpp)"
+  FILES_WITH_ENFORCED_IWYU='/src/((bench|common|consensus|crypto|index|kernel|primitives|script|univalue/(lib|test)|util|zmq)/.*|node/(blockstorage|interfaces|miner|mining_args|utxo_snapshot)|rpc/mining|clientversion|core_io|signet|init)\.cpp'
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns)))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_errors.json"
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns) | not))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_warnings.json"
 
@@ -217,12 +242,16 @@ if [[ "${RUN_IWYU}" == true ]]; then
 
   run_iwyu() {
     mv "${BASE_BUILD_DIR}/$1" "${BASE_BUILD_DIR}/compile_commands.json"
-    python3 "/include-what-you-use/iwyu_tool.py" \
+    {
+      python3 "/include-what-you-use/iwyu_tool.py" \
              -p "${BASE_BUILD_DIR}" "${MAKEJOBS}" \
              -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
              -Xiwyu --max_line_length=160 \
-             -Xiwyu --check_also="*/primitives/*.h" \
-             2>&1 | tee /tmp/iwyu_ci.out
+             -Xiwyu --check_also='*/common/types\.h' \
+             -Xiwyu --check_also='*/consensus/*\.h' \
+             -Xiwyu --check_also='*/primitives/transaction_identifier\.h' \
+             2>&1 || true
+    } | tee /tmp/iwyu_ci.out
     python3 "/include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out
     git diff -U1 | ./contrib/devtools/clang-format-diff.py -binary="clang-format-${IWYU_LLVM_V}" -p1 -i -v
   }
diff --git a/depend/bitcoin/ci/test/link-riscv.sh b/depend/bitcoin/ci/test/link-riscv.sh
new file mode 100755
index 00000000..93bebfa8
--- /dev/null
+++ b/depend/bitcoin/ci/test/link-riscv.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+set -o errexit -o xtrace -o pipefail
+
+GCC=/opt/riscv-ilp32/bin/riscv32-unknown-elf-gcc
+GXX=/opt/riscv-ilp32/bin/riscv32-unknown-elf-g++
+CRTBEGIN=$("${GCC}" -print-file-name=crtbegin.o)
+LIBGCC=$("${GCC}" -print-libgcc-file-name)
+LIBSTDCXX=$("${GXX}" -print-file-name=libstdc++.a)
+LIBC=$("${GCC}" -print-file-name=libc.a)
+LIBM=$("${GCC}" -print-file-name=libm.a)
+
+echo -e "#include <script/script_error.h>\n int main() { return ScriptErrorString(ScriptError_t::SCRIPT_ERR_UNKNOWN_ERROR).size() > 0; }" > test.cpp
+
+"${GXX}" -I "${BASE_ROOT_DIR}"/src -g -std=c++20 -c test.cpp -o test.o
+
+# Make the binary executable on linux for testing purposes
+echo -e ".section .text
+      .global _start
+      .type _start, @function
+
+      _start:
+          .option push
+          .option norelax
+          la gp, __global_pointer$
+          .option pop
+
+          call main
+
+          # Put Exit2 system call number into the a7 register
+          li a7, 93
+          ecall" > start.s
+
+"${GCC}" -c start.s -o start.o
+
+echo -e "#include <sys/stat.h>
+      void _exit(int code) { while(1); }
+      int _sbrk(int incr) { return 0; }
+      int _write(int file, char *ptr, int len) { return 0; }
+      int _close(int file) { return -1; }
+      int _fstat(int file, struct stat *st) { st->st_mode = S_IFCHR; return 0; }
+      int _isatty(int file) { return 1; }
+      int _lseek(int file, int ptr, int dir) { return 0; }
+      int _read(int file, char *ptr, int len) { return 0; }
+      int _kill(int pid, int sig) { return -1; }
+      int _getpid(void) { return -1; }" > syscalls.c
+
+"${GCC}" -g -c syscalls.c -o syscalls.o
+
+"${GXX}" -g -std=c++20 \
+    -nostdlib \
+    "${CRTBEGIN}" \
+    test.o \
+    start.o \
+    syscalls.o \
+    -Wl,--whole-archive \
+    "${BASE_BUILD_DIR}"/lib/libbitcoin_consensus.a \
+    "${BASE_BUILD_DIR}"/lib/libbitcoin_crypto.a \
+    "${BASE_BUILD_DIR}"/src/secp256k1/lib/libsecp256k1.a \
+    -Wl,--no-whole-archive \
+    "${LIBSTDCXX}" \
+    "${LIBC}" \
+    "${LIBM}" \
+    "${LIBGCC}" \
+    -o test.elf
+
+file test.elf
+
diff --git a/depend/bitcoin/ci/test/wrap-valgrind.py b/depend/bitcoin/ci/test/wrap-valgrind.py
new file mode 100755
index 00000000..6a79f2aa
--- /dev/null
+++ b/depend/bitcoin/ci/test/wrap-valgrind.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit/.
+
+import os
+import shlex
+from pathlib import Path
+
+
+def main():
+    base_root = Path(os.environ["BASE_ROOT_DIR"])
+    base_out = Path(os.environ["BASE_OUTDIR"])
+    suppressions_file = base_root / "test" / "sanitizer_suppressions" / "valgrind.supp"
+    target_names = {b.name for b in (base_out / "bin").iterdir()}
+
+    for exe in base_root.rglob("*"):
+        if exe.name in target_names and exe.is_file() and os.access(exe, os.X_OK):
+            print(f"Wrap {exe} ...")
+            original_path = exe.with_name(f"{exe.name}_orig")
+            exe.rename(original_path)
+            exe.write_text(
+                "#!/usr/bin/env bash\n"
+                "exec valgrind --gen-suppressions=all --quiet --error-exitcode=1 "
+                f"--suppressions={shlex.quote(str(suppressions_file))} "
+                f'{shlex.quote(str(original_path))} "$@"\n'
+            )
+            exe.chmod(exe.stat().st_mode | 0o111)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/depend/bitcoin/ci/test/wrap-valgrind.sh b/depend/bitcoin/ci/test/wrap-valgrind.sh
deleted file mode 100755
index 4ed3f2d6..00000000
--- a/depend/bitcoin/ci/test/wrap-valgrind.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2018-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.
-
-export LC_ALL=C.UTF-8
-
-for b_name in "${BASE_OUTDIR}/bin"/*; do
-    # shellcheck disable=SC2044
-    for b in $(find "${BASE_ROOT_DIR}" -executable -type f -name "$(basename "$b_name")"); do
-      echo "Wrap $b ..."
-      mv "$b" "${b}_orig"
-      echo '#!/usr/bin/env bash' > "$b"
-      echo "exec valgrind --gen-suppressions=all --quiet --error-exitcode=1 --suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/valgrind.supp \"${b}_orig\" \"\$@\"" >> "$b"
-      chmod +x "$b"
-    done
-done
diff --git a/depend/bitcoin/ci/test_imagefile b/depend/bitcoin/ci/test_imagefile
index 908e9a0f..c696f075 100644
--- a/depend/bitcoin/ci/test_imagefile
+++ b/depend/bitcoin/ci/test_imagefile
@@ -16,9 +16,10 @@ ENV BASE_ROOT_DIR=${BASE_ROOT_DIR}
 
 # Make retry available in PATH, needed for CI_RETRY_EXE
 COPY ./ci/retry/retry /usr/bin/retry
-COPY ./ci/test/00_setup_env.sh ./${FILE_ENV} ./ci/test/01_base_install.sh ./ci/test/01_iwyu.patch /ci_container_base/ci/test/
+COPY ./ci/test/00_setup_env.sh ./${FILE_ENV} ./ci/test/01_base_install.sh ${BASE_ROOT_DIR}/ci/test/
+COPY ./ci/test/*.patch ${BASE_ROOT_DIR}/ci/test/
 
 # Bash is required, so install it when missing
 RUN sh -c "bash -c 'true' || ( apk update && apk add --no-cache bash )"
 
-RUN ["bash", "-c", "cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && DANGER_RUN_CI_ON_HOST=1 ./ci/test/01_base_install.sh"]
+RUN ["bash", "-c", "cd ${BASE_ROOT_DIR}/ && set -o errexit && source ./ci/test/00_setup_env.sh && DANGER_RUN_CI_ON_HOST=1 ./ci/test/01_base_install.sh"]
diff --git a/depend/bitcoin/cmake/bitcoin-build-config.h.in b/depend/bitcoin/cmake/bitcoin-build-config.h.in
index bf3ddcd7..1743d79f 100644
--- a/depend/bitcoin/cmake/bitcoin-build-config.h.in
+++ b/depend/bitcoin/cmake/bitcoin-build-config.h.in
@@ -88,7 +88,7 @@
 /* Define this symbol if the BSD sysctl(KERN_ARND) is available */
 #cmakedefine HAVE_SYSCTL_ARND 1
 
-/* Define to 1 if std::system or ::wsystem is available. */
+/* Define to 1 if std::system is available. */
 #cmakedefine HAVE_SYSTEM 1
 
 /* Define to the address where bug reports for this package should be sent. */
diff --git a/depend/bitcoin/cmake/introspection.cmake b/depend/bitcoin/cmake/introspection.cmake
index d2257633..61236279 100644
--- a/depend/bitcoin/cmake/introspection.cmake
+++ b/depend/bitcoin/cmake/introspection.cmake
@@ -17,13 +17,14 @@ if(NOT WIN32)
 endif()
 
 include(TestAppendRequiredLibraries)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic")
 test_append_atomic_library(core_interface)
+endif()
 
 # Even though ::system is part of the standard library, we still check
 # for it, to support building targets that don't have it, such as iOS.
 check_cxx_symbol_exists(std::system "cstdlib" HAVE_STD_SYSTEM)
-check_cxx_symbol_exists(::_wsystem "stdlib.h" HAVE__WSYSTEM)
-if(HAVE_STD_SYSTEM OR HAVE__WSYSTEM)
+if(HAVE_STD_SYSTEM)
   set(HAVE_SYSTEM 1)
 endif()
 
diff --git a/depend/bitcoin/cmake/leveldb.cmake b/depend/bitcoin/cmake/leveldb.cmake
index cff8c61f..b9246cf8 100644
--- a/depend/bitcoin/cmake/leveldb.cmake
+++ b/depend/bitcoin/cmake/leveldb.cmake
@@ -56,7 +56,6 @@ target_compile_definitions(leveldb
     HAVE_FDATASYNC=$<BOOL:${HAVE_FDATASYNC}>
     HAVE_FULLFSYNC=$<BOOL:${HAVE_FULLFSYNC}>
     HAVE_O_CLOEXEC=$<BOOL:${HAVE_O_CLOEXEC}>
-    FALLTHROUGH_INTENDED=[[fallthrough]]
     $<$<NOT:$<BOOL:${WIN32}>>:LEVELDB_PLATFORM_POSIX>
     $<$<BOOL:${WIN32}>:LEVELDB_PLATFORM_WINDOWS>
     $<$<BOOL:${WIN32}>:_UNICODE;UNICODE>
@@ -84,9 +83,6 @@ if(MSVC)
     _CRT_NONSTDC_NO_WARNINGS
   )
 else()
-  try_append_cxx_flags("-Wconditional-uninitialized" TARGET nowarn_leveldb_interface SKIP_LINK
-    IF_CHECK_PASSED "-Wno-conditional-uninitialized"
-  )
   try_append_cxx_flags("-Wcovered-switch-default" TARGET nowarn_leveldb_interface SKIP_LINK
     IF_CHECK_PASSED "-Wno-covered-switch-default"
   )
diff --git a/depend/bitcoin/cmake/module/AddBoostIfNeeded.cmake b/depend/bitcoin/cmake/module/AddBoostIfNeeded.cmake
index 80a6d2e8..658e6d07 100644
--- a/depend/bitcoin/cmake/module/AddBoostIfNeeded.cmake
+++ b/depend/bitcoin/cmake/module/AddBoostIfNeeded.cmake
@@ -31,17 +31,6 @@ function(add_boost_if_needed)
 
   find_package(Boost 1.74.0 REQUIRED CONFIG)
   mark_as_advanced(Boost_INCLUDE_DIR boost_headers_DIR)
-  # Workaround for a bug in NetBSD pkgsrc.
-  # See https://gnats.netbsd.org/59856.
-  if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-    get_filename_component(_boost_include_dir "${boost_headers_DIR}/../../../include/" ABSOLUTE)
-    if(_boost_include_dir MATCHES "^/usr/pkg/")
-      set_target_properties(Boost::headers PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES ${_boost_include_dir}
-      )
-    endif()
-    unset(_boost_include_dir)
-  endif()
   set_target_properties(Boost::headers PROPERTIES IMPORTED_GLOBAL TRUE)
   target_compile_definitions(Boost::headers INTERFACE
     # We don't use multi_index serialization.
diff --git a/depend/bitcoin/cmake/module/AddWindowsResources.cmake b/depend/bitcoin/cmake/module/AddWindowsResources.cmake
index 84c1ba85..8fad425a 100644
--- a/depend/bitcoin/cmake/module/AddWindowsResources.cmake
+++ b/depend/bitcoin/cmake/module/AddWindowsResources.cmake
@@ -4,21 +4,19 @@
 
 include_guard(GLOBAL)
 
-function(add_windows_resources target rc_file)
-  if(WIN32)
-    target_sources(${target} PRIVATE ${rc_file})
-  endif()
-endfunction()
-
 # Add a fusion manifest to Windows executables.
 # See: https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests
 function(add_windows_application_manifest target)
-  if(WIN32)
-    configure_file(${PROJECT_SOURCE_DIR}/cmake/windows-app.manifest.in ${target}.manifest USE_SOURCE_PERMISSIONS)
+  configure_file(${PROJECT_SOURCE_DIR}/cmake/windows-app.manifest.in ${target}.manifest USE_SOURCE_PERMISSIONS)
+  if(MSVC)
+    target_sources(${target} PRIVATE ${target}.manifest)
+  else()
+    # TODO: Remove when upstream issue is fixed:
+    # https://gitlab.kitware.com/cmake/cmake/-/issues/23244
     file(CONFIGURE
       OUTPUT ${target}-manifest.rc
       CONTENT "1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ \"${target}.manifest\""
     )
-    add_windows_resources(${target} ${CMAKE_CURRENT_BINARY_DIR}/${target}-manifest.rc)
+    target_sources(${target} PRIVATE ${target}-manifest.rc)
   endif()
 endfunction()
diff --git a/depend/bitcoin/cmake/module/CheckCXXFeatures.cmake b/depend/bitcoin/cmake/module/CheckCXXFeatures.cmake
new file mode 100644
index 00000000..fde630e3
--- /dev/null
+++ b/depend/bitcoin/cmake/module/CheckCXXFeatures.cmake
@@ -0,0 +1,43 @@
+# Copyright (c) 2026-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit/.
+
+include_guard(GLOBAL)
+
+# Checks for C++ features required to compile Bitcoin Core.
+
+include(CheckCXXSourceCompiles)
+
+function(check_cxx_features)
+  set(CMAKE_REQUIRED_QUIET TRUE)
+
+  message(STATUS "Checking for required C++ features")
+
+  # Checks for Class Template Argument Deduction for aggregate types - used in src/util/overloaded.h
+  check_cxx_source_compiles("
+    #include <variant>
+
+    template<class... Ts> struct Overloaded : Ts... { using Ts::operator()...; };
+
+    int main() {
+      std::variant<int, double> v = 42;
+      return std::visit(Overloaded{
+        [](int) { return 0; },
+        [](double) { return 1; }
+      }, v);
+    }
+  " HAVE_CTAD_FOR_AGGREGATES)
+
+  if(NOT HAVE_CTAD_FOR_AGGREGATES)
+    message(FATAL_ERROR
+      "Compiler lacks Class Template Argument Deduction (CTAD) for aggregates.\n"
+      "This C++ feature is required for src/util/overloaded.h.\n"
+      "You are probably using an old compiler version\n"
+      "The recommended compiler versions can be checked in\n"
+      "doc/dependencies.md#compiler.\n"
+    )
+  endif()
+
+  message(STATUS "Checking for required C++ features - done")
+
+endfunction()
diff --git a/depend/bitcoin/cmake/module/FindLibevent.cmake b/depend/bitcoin/cmake/module/FindLibevent.cmake
deleted file mode 100644
index c006b43d..00000000
--- a/depend/bitcoin/cmake/module/FindLibevent.cmake
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) 2024-present The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://opensource.org/license/mit/.
-
-#[=======================================================================[
-FindLibevent
-------------
-
-Finds the Libevent headers and libraries.
-
-This is a wrapper around find_package()/pkg_check_modules() commands that:
- - facilitates searching in various build environments
- - prints a standard log message
-
-#]=======================================================================]
-
-# Check whether evhttp_connection_get_peer expects const char**.
-# See https://github.com/libevent/libevent/commit/a18301a2bb160ff7c3ffaf5b7653c39ffe27b385
-function(check_evhttp_connection_get_peer target)
-  include(CMakePushCheckState)
-  cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_LIBRARIES ${target})
-  include(CheckCXXSourceCompiles)
-  check_cxx_source_compiles("
-    #include <cstdint>
-    #include <event2/http.h>
-
-    int main()
-    {
-        evhttp_connection* conn = (evhttp_connection*)1;
-        const char* host;
-        uint16_t port;
-        evhttp_connection_get_peer(conn, &host, &port);
-    }
-    " HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR
-  )
-  cmake_pop_check_state()
-  target_compile_definitions(${target} INTERFACE
-    $<$<BOOL:${HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR}>:HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR>
-  )
-endfunction()
-
-set(_libevent_components core extra)
-if(NOT WIN32)
-  list(APPEND _libevent_components pthreads)
-endif()
-
-find_package(Libevent ${Libevent_FIND_VERSION} QUIET
-  NO_MODULE
-)
-
-include(FindPackageHandleStandardArgs)
-if(Libevent_FOUND)
-  find_package(Libevent ${Libevent_FIND_VERSION} QUIET
-    REQUIRED COMPONENTS ${_libevent_components}
-    NO_MODULE
-  )
-  find_package_handle_standard_args(Libevent
-    REQUIRED_VARS Libevent_DIR
-    VERSION_VAR Libevent_VERSION
-  )
-  check_evhttp_connection_get_peer(libevent::extra)
-else()
-  find_package(PkgConfig REQUIRED)
-  foreach(component IN LISTS _libevent_components)
-    pkg_check_modules(libevent_${component}
-      REQUIRED QUIET
-      IMPORTED_TARGET GLOBAL
-      libevent_${component}>=${Libevent_FIND_VERSION}
-    )
-    if(TARGET PkgConfig::libevent_${component} AND NOT TARGET libevent::${component})
-      add_library(libevent::${component} ALIAS PkgConfig::libevent_${component})
-    endif()
-  endforeach()
-  find_package_handle_standard_args(Libevent
-    REQUIRED_VARS libevent_core_LIBRARY_DIRS
-    VERSION_VAR libevent_core_VERSION
-  )
-  check_evhttp_connection_get_peer(PkgConfig::libevent_extra)
-endif()
-
-unset(_libevent_components)
-
-mark_as_advanced(Libevent_DIR)
-mark_as_advanced(_event_h)
-mark_as_advanced(_event_lib)
diff --git a/depend/bitcoin/cmake/module/FindQRencode.cmake b/depend/bitcoin/cmake/module/FindQRencode.cmake
index 575bfecc..7c213989 100644
--- a/depend/bitcoin/cmake/module/FindQRencode.cmake
+++ b/depend/bitcoin/cmake/module/FindQRencode.cmake
@@ -14,45 +14,28 @@ This is a wrapper around find_package()/pkg_check_modules() commands that:
 
 #]=======================================================================]
 
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_QRencode QUIET libqrencode)
-endif()
-
 find_path(QRencode_INCLUDE_DIR
   NAMES qrencode.h
-  HINTS ${PC_QRencode_INCLUDE_DIRS}
 )
-
 find_library(QRencode_LIBRARY_RELEASE
   NAMES qrencode
-  HINTS ${PC_QRencode_LIBRARY_DIRS}
 )
 find_library(QRencode_LIBRARY_DEBUG
   NAMES qrencoded qrencode
-  HINTS ${PC_QRencode_LIBRARY_DIRS}
 )
-include(SelectLibraryConfigurations)
-select_library_configurations(QRencode)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(QRencode
-  REQUIRED_VARS QRencode_LIBRARY QRencode_INCLUDE_DIR
-  VERSION_VAR PC_QRencode_VERSION
+  REQUIRED_VARS QRencode_LIBRARY_RELEASE QRencode_INCLUDE_DIR
 )
 
-if(QRencode_FOUND)
-  if(NOT TARGET QRencode::QRencode)
-    add_library(QRencode::QRencode UNKNOWN IMPORTED)
-  endif()
-  if(QRencode_LIBRARY_RELEASE)
-    set_property(TARGET QRencode::QRencode APPEND PROPERTY
-      IMPORTED_CONFIGURATIONS RELEASE
-    )
-    set_target_properties(QRencode::QRencode PROPERTIES
-      IMPORTED_LOCATION_RELEASE "${QRencode_LIBRARY_RELEASE}"
-    )
-  endif()
+if(QRencode_FOUND AND NOT TARGET QRencode::QRencode)
+  add_library(QRencode::QRencode UNKNOWN IMPORTED)
+  set_target_properties(QRencode::QRencode PROPERTIES
+    IMPORTED_CONFIGURATIONS RELEASE
+    IMPORTED_LOCATION_RELEASE "${QRencode_LIBRARY_RELEASE}"
+    INTERFACE_INCLUDE_DIRECTORIES "${QRencode_INCLUDE_DIR}"
+  )
   if(QRencode_LIBRARY_DEBUG)
     set_property(TARGET QRencode::QRencode APPEND PROPERTY
       IMPORTED_CONFIGURATIONS DEBUG
@@ -61,11 +44,10 @@ if(QRencode_FOUND)
       IMPORTED_LOCATION_DEBUG "${QRencode_LIBRARY_DEBUG}"
     )
   endif()
-  set_target_properties(QRencode::QRencode PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${QRencode_INCLUDE_DIR}"
-  )
 endif()
 
 mark_as_advanced(
   QRencode_INCLUDE_DIR
+  QRencode_LIBRARY_RELEASE
+  QRencode_LIBRARY_DEBUG
 )
diff --git a/depend/bitcoin/cmake/module/GenerateSetupNsi.cmake b/depend/bitcoin/cmake/module/GenerateSetupNsi.cmake
deleted file mode 100644
index c8d5bd67..00000000
--- a/depend/bitcoin/cmake/module/GenerateSetupNsi.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2023-present The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://opensource.org/license/mit/.
-
-function(generate_setup_nsi)
-  set(abs_top_srcdir ${PROJECT_SOURCE_DIR})
-  set(abs_top_builddir ${PROJECT_BINARY_DIR})
-  set(CLIENT_URL ${PROJECT_HOMEPAGE_URL})
-  set(CLIENT_TARNAME "bitcoin")
-  set(BITCOIN_WRAPPER_NAME "bitcoin")
-  set(BITCOIN_GUI_NAME "bitcoin-qt")
-  set(BITCOIN_DAEMON_NAME "bitcoind")
-  set(BITCOIN_CLI_NAME "bitcoin-cli")
-  set(BITCOIN_TX_NAME "bitcoin-tx")
-  set(BITCOIN_WALLET_TOOL_NAME "bitcoin-wallet")
-  set(BITCOIN_TEST_NAME "test_bitcoin")
-  set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX})
-  configure_file(${PROJECT_SOURCE_DIR}/share/setup.nsi.in ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi USE_SOURCE_PERMISSIONS @ONLY)
-endfunction()
diff --git a/depend/bitcoin/cmake/module/Maintenance.cmake b/depend/bitcoin/cmake/module/Maintenance.cmake
index 15fbf2be..43e145d6 100644
--- a/depend/bitcoin/cmake/module/Maintenance.cmake
+++ b/depend/bitcoin/cmake/module/Maintenance.cmake
@@ -19,32 +19,21 @@ function(setup_split_debug_script)
 endfunction()
 
 function(add_windows_deploy_target)
+  configure_file(${PROJECT_SOURCE_DIR}/cmake/script/GenerateWindowsInstaller.cmake.in ${PROJECT_BINARY_DIR}/GenerateWindowsInstaller.cmake USE_SOURCE_PERMISSIONS @ONLY)
   if(MINGW AND TARGET bitcoin AND TARGET bitcoin-qt AND TARGET bitcoind AND TARGET bitcoin-cli AND TARGET bitcoin-tx AND TARGET bitcoin-wallet AND TARGET bitcoin-util AND TARGET test_bitcoin)
-    find_program(MAKENSIS_EXECUTABLE makensis)
-    if(NOT MAKENSIS_EXECUTABLE)
-      add_custom_target(deploy
-        COMMAND ${CMAKE_COMMAND} -E echo "Error: NSIS not found"
-      )
-      return()
-    endif()
-
-    # TODO: Consider replacing this code with the CPack NSIS Generator.
-    #       See https://cmake.org/cmake/help/latest/cpack_gen/nsis.html
-    include(GenerateSetupNsi)
-    generate_setup_nsi()
     add_custom_command(
       OUTPUT ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/release
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-qt> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-qt>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoind> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoind>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-cli> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-cli>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-tx> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-tx>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-wallet> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-wallet>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-util> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-util>
-      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:test_bitcoin> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:test_bitcoin>
-      COMMAND ${MAKENSIS_EXECUTABLE} -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
-      VERBATIM
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      COMMAND ${CMAKE_COMMAND} -E make_directory release
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin> -o release/$<TARGET_FILE_NAME:bitcoin>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-qt> -o release/$<TARGET_FILE_NAME:bitcoin-qt>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoind> -o release/$<TARGET_FILE_NAME:bitcoind>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-cli> -o release/$<TARGET_FILE_NAME:bitcoin-cli>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-tx> -o release/$<TARGET_FILE_NAME:bitcoin-tx>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-wallet> -o release/$<TARGET_FILE_NAME:bitcoin-wallet>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-util> -o release/$<TARGET_FILE_NAME:bitcoin-util>
+      COMMAND ${CMAKE_STRIP} $<TARGET_FILE:test_bitcoin> -o release/$<TARGET_FILE_NAME:test_bitcoin>
+      COMMAND ${CMAKE_COMMAND} -D BIN_DIR=release -D LIBEXEC_DIR=release -P GenerateWindowsInstaller.cmake
     )
     add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe)
   endif()
diff --git a/depend/bitcoin/cmake/module/TestAppendRequiredLibraries.cmake b/depend/bitcoin/cmake/module/TestAppendRequiredLibraries.cmake
index 1fc339a9..2ca5e4b4 100644
--- a/depend/bitcoin/cmake/module/TestAppendRequiredLibraries.cmake
+++ b/depend/bitcoin/cmake/module/TestAppendRequiredLibraries.cmake
@@ -15,7 +15,6 @@ function(test_append_socket_library target)
   endif()
 
   set(check_socket_source "
-    #include <sys/types.h>
     #include <ifaddrs.h>
 
     int main() {
diff --git a/depend/bitcoin/cmake/script/GenerateBuildInfo.cmake b/depend/bitcoin/cmake/script/GenerateBuildInfo.cmake
index d3ee2eb0..62773a3a 100644
--- a/depend/bitcoin/cmake/script/GenerateBuildInfo.cmake
+++ b/depend/bitcoin/cmake/script/GenerateBuildInfo.cmake
@@ -5,7 +5,7 @@
 macro(fatal_error)
   message(FATAL_ERROR "\n"
     "Usage:\n"
-    "  cmake -D BUILD_INFO_HEADER_PATH=<path> [-D SOURCE_DIR=<path>] -P ${CMAKE_CURRENT_LIST_FILE}\n"
+    "  cmake -D BUILD_INFO_HEADER_PATH=<path> -D GIT_EXECUTABLE=<path> [-D SOURCE_DIR=<path>] -P ${CMAKE_CURRENT_LIST_FILE}\n"
     "All specified paths must be absolute ones.\n"
   )
 endmacro()
@@ -28,72 +28,69 @@ else()
   set(WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
-set(GIT_TAG)
-set(GIT_COMMIT)
-if(NOT "$ENV{BITCOIN_GENBUILD_NO_GIT}" STREQUAL "1")
-  find_package(Git QUIET)
-  if(Git_FOUND)
+set(GIT_TAG "")
+set(GIT_COMMIT "")
+if(GIT_EXECUTABLE)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-work-tree
+    WORKING_DIRECTORY ${WORKING_DIR}
+    OUTPUT_VARIABLE IS_INSIDE_WORK_TREE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+  )
+  if(IS_INSIDE_WORK_TREE)
+    # Clean 'dirty' status of touched files that haven't been modified.
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} diff
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_QUIET
+      ERROR_QUIET
+    )
+
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-work-tree
+      COMMAND ${GIT_EXECUTABLE} describe --abbrev=0
       WORKING_DIRECTORY ${WORKING_DIR}
-      OUTPUT_VARIABLE IS_INSIDE_WORK_TREE
+      OUTPUT_VARIABLE MOST_RECENT_TAG
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
     )
-    if(IS_INSIDE_WORK_TREE)
-      # Clean 'dirty' status of touched files that haven't been modified.
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} diff
-        WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_QUIET
-        ERROR_QUIET
-      )
 
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} describe --abbrev=0
-        WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_VARIABLE MOST_RECENT_TAG
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET
-      )
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-list -1 ${MOST_RECENT_TAG}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE MOST_RECENT_TAG_COMMIT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
 
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-list -1 ${MOST_RECENT_TAG}
-        WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_VARIABLE MOST_RECENT_TAG_COMMIT
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET
-      )
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE HEAD_COMMIT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
 
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} diff-index --quiet HEAD --
+      WORKING_DIRECTORY ${WORKING_DIR}
+      RESULT_VARIABLE IS_DIRTY
+    )
+
+    if(HEAD_COMMIT STREQUAL MOST_RECENT_TAG_COMMIT AND NOT IS_DIRTY)
+      # If latest commit is tagged and not dirty, then use the tag name.
+      set(GIT_TAG ${MOST_RECENT_TAG})
+    else()
+      # Otherwise, generate suffix from git, i.e. string like "0e0a5173fae3-dirty".
       execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+        COMMAND ${GIT_EXECUTABLE} rev-parse --short=12 HEAD
         WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_VARIABLE HEAD_COMMIT
+        OUTPUT_VARIABLE GIT_COMMIT
         OUTPUT_STRIP_TRAILING_WHITESPACE
         ERROR_QUIET
       )
-
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} diff-index --quiet HEAD --
-        WORKING_DIRECTORY ${WORKING_DIR}
-        RESULT_VARIABLE IS_DIRTY
-      )
-
-      if(HEAD_COMMIT STREQUAL MOST_RECENT_TAG_COMMIT AND NOT IS_DIRTY)
-        # If latest commit is tagged and not dirty, then use the tag name.
-        set(GIT_TAG ${MOST_RECENT_TAG})
-      else()
-        # Otherwise, generate suffix from git, i.e. string like "0e0a5173fae3-dirty".
-        execute_process(
-          COMMAND ${GIT_EXECUTABLE} rev-parse --short=12 HEAD
-          WORKING_DIRECTORY ${WORKING_DIR}
-          OUTPUT_VARIABLE GIT_COMMIT
-          OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_QUIET
-        )
-        if(IS_DIRTY)
-          string(APPEND GIT_COMMIT "-dirty")
-        endif()
+      if(IS_DIRTY)
+        string(APPEND GIT_COMMIT "-dirty")
       endif()
     endif()
   endif()
diff --git a/depend/bitcoin/cmake/script/GenerateWindowsInstaller.cmake.in b/depend/bitcoin/cmake/script/GenerateWindowsInstaller.cmake.in
new file mode 100644
index 00000000..16ebdd49
--- /dev/null
+++ b/depend/bitcoin/cmake/script/GenerateWindowsInstaller.cmake.in
@@ -0,0 +1,40 @@
+# Copyright (c) 2026-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit/.
+
+find_program(MAKENSIS_EXECUTABLE makensis REQUIRED)
+
+# Project variables.
+set(CLIENT_NAME "@CLIENT_NAME@")
+set(CLIENT_VERSION_MAJOR @CLIENT_VERSION_MAJOR@)
+set(CLIENT_VERSION_MINOR @CLIENT_VERSION_MINOR@)
+set(CLIENT_VERSION_BUILD @CLIENT_VERSION_BUILD@)
+set(CLIENT_VERSION_STRING "@CLIENT_VERSION_STRING@")
+set(CLIENT_URL "@PROJECT_HOMEPAGE_URL@")
+set(COPYRIGHT_YEAR "@COPYRIGHT_YEAR@")
+set(COPYRIGHT_HOLDERS_FINAL "@COPYRIGHT_HOLDERS_FINAL@")
+set(abs_top_srcdir @PROJECT_SOURCE_DIR@)
+set(EXEEXT @CMAKE_EXECUTABLE_SUFFIX@)
+
+# Script variables.
+cmake_path(ABSOLUTE_PATH BIN_DIR NORMALIZE)
+cmake_path(ABSOLUTE_PATH LIBEXEC_DIR NORMALIZE)
+
+# Other variables required by the `setup.nsi.in` template.
+set(CLIENT_TARNAME "bitcoin")
+set(BITCOIN_WRAPPER_NAME "bitcoin")
+set(BITCOIN_GUI_NAME "bitcoin-qt")
+set(BITCOIN_DAEMON_NAME "bitcoind")
+set(BITCOIN_CLI_NAME "bitcoin-cli")
+set(BITCOIN_TX_NAME "bitcoin-tx")
+set(BITCOIN_WALLET_TOOL_NAME "bitcoin-wallet")
+set(BITCOIN_TEST_NAME "test_bitcoin")
+configure_file(@PROJECT_SOURCE_DIR@/share/setup.nsi.in ${CMAKE_CURRENT_LIST_DIR}/bitcoin-win64-setup.nsi
+  USE_SOURCE_PERMISSIONS @ONLY
+)
+
+execute_process(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+  COMMAND ${MAKENSIS_EXECUTABLE} -V2 bitcoin-win64-setup.nsi
+  COMMAND_ERROR_IS_FATAL ANY
+)
diff --git a/depend/bitcoin/contrib/devtools/gen-manpages.py b/depend/bitcoin/contrib/devtools/gen-manpages.py
index 94187944..c5ec7309 100755
--- a/depend/bitcoin/contrib/devtools/gen-manpages.py
+++ b/depend/bitcoin/contrib/devtools/gen-manpages.py
@@ -50,8 +50,13 @@
 versions = []
 for relpath in BINARIES:
     abspath = os.path.join(builddir, relpath)
+    # Prevent QT from emitting a localized version string for --version and --help
+    is_qt = relpath == "bin/bitcoin-qt"
     try:
-        r = subprocess.run([abspath, "--version"], stdout=subprocess.PIPE, check=True, text=True)
+        cmd_args = ["--version"]
+        if is_qt:
+            cmd_args.append("--lang=en")
+        r = subprocess.run([abspath, *cmd_args], stdout=subprocess.PIPE, check=True, text=True)
     except IOError:
         if(args.skip_missing_binaries):
             print(f'{abspath} not found or not an executable. Skipping...', file=sys.stderr)
@@ -69,13 +74,13 @@
     copyright = r.stdout.split('\n')[1:]
     assert copyright[0].startswith('Copyright (C)')
 
-    versions.append((abspath, verstr, copyright))
+    versions.append((abspath, verstr, copyright, is_qt))
 
 if not versions:
     print(f'No binaries found in {builddir}. Please ensure the binaries are present in {builddir}, or set another build path using the BUILDDIR env variable.')
     sys.exit(1)
 
-if any(verstr.endswith('-dirty') for (_, verstr, _) in versions):
+if any(verstr.endswith('-dirty') for (_, verstr, _, _) in versions):
     print("WARNING: Binaries were built from a dirty tree.")
     print('man pages generated from dirty binaries should NOT be committed.')
     print('To properly generate man pages, please commit your changes (or discard them), rebuild, then run this script again.')
@@ -93,7 +98,16 @@
     footer.flush()
 
     # Call the binaries through help2man to produce a manual page for each of them.
-    for (abspath, verstr, _) in versions:
+    for (abspath, verstr, _, is_qt) in versions:
         outname = os.path.join(mandir, os.path.basename(abspath) + '.1')
+        help_option = '--help-option=--help' + (' --lang=en' if is_qt else '')
         print(f'Generating {outname}…')
-        subprocess.run([help2man, '-N', '--version-string=' + verstr, '--include=' + footer.name, '-o', outname, abspath], check=True)
+        subprocess.run([
+            help2man,
+            '-N',
+            '--version-string=' + verstr,
+            '--include=' + footer.name,
+            '-o', outname,
+            help_option,
+            abspath,
+        ], check=True)
diff --git a/depend/bitcoin/contrib/guix/guix-attest b/depend/bitcoin/contrib/guix/guix-attest
index b0ef28dc..06925ffb 100755
--- a/depend/bitcoin/contrib/guix/guix-attest
+++ b/depend/bitcoin/contrib/guix/guix-attest
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
-export LC_ALL=C
-set -e -o pipefail
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
@@ -139,14 +142,6 @@ fi
 ##  Attest  ##
 ##############
 
-# Usage: out_name $outdir
-#
-#   HOST: The output directory being attested
-#
-out_name() {
-    basename "$(dirname "$1")"
-}
-
 shasum_already_exists() {
 cat <<EOF
 --
diff --git a/depend/bitcoin/contrib/guix/guix-build b/depend/bitcoin/contrib/guix/guix-build
index bef1c841..9afe00a0 100755
--- a/depend/bitcoin/contrib/guix/guix-build
+++ b/depend/bitcoin/contrib/guix/guix-build
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
-export LC_ALL=C
-set -e -o pipefail
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
@@ -85,14 +88,6 @@ export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu ri
                        x86_64-w64-mingw32
                        x86_64-apple-darwin arm64-apple-darwin}"
 
-# Usage: distsrc_for_host HOST
-#
-#   HOST: The current platform triple we're building for
-#
-distsrc_for_host() {
-    echo "${DISTSRC_BASE}/distsrc-${VERSION}-${1}"
-}
-
 # Accumulate a list of build directories that already exist...
 hosts_distsrc_exists=""
 for host in $HOSTS; do
@@ -244,18 +239,9 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
 
 # Precious directories are those which should not be cleaned between successive
 # guix builds
-depends_precious_dir_names='SOURCES_PATH BASE_CACHE SDK_PATH'
-precious_dir_names="${depends_precious_dir_names} OUTDIR_BASE PROFILES_BASE"
-
-# Usage: contains IFS-SEPARATED-LIST ITEM
-contains() {
-    for i in ${1}; do
-        if [ "$i" = "${2}" ]; then
-            return 0  # Found!
-        fi
-    done
-    return 1
-}
+depends_precious_dir_names="SOURCES_PATH BASE_CACHE SDK_PATH"
+base_dir_names="OUTDIR_BASE PROFILES_BASE"
+precious_dir_names="${depends_precious_dir_names} ${base_dir_names}"
 
 # If the user explicitly specified a precious directory, create it so we
 # can map it into the container
@@ -287,11 +273,9 @@ mkdir -p "$VAR_BASE"
          -- $(printf "print-%s\n" $depends_precious_dir_names)
 
     # Get remaining precious dir definitions from the environment
-    for precious_dir_name in $precious_dir_names; do
+    for precious_dir_name in $base_dir_names; do
         precious_dir_path="${!precious_dir_name}"
-        if ! contains "$depends_precious_dir_names" "$precious_dir_name"; then
-            echo "${precious_dir_name}=${precious_dir_path}"
-        fi
+        echo "${precious_dir_name}=${precious_dir_path}"
     done
 } > "${VAR_BASE}/precious_dirs"
 
@@ -305,22 +289,6 @@ for host in $HOSTS; do
     make -C "${PWD}/depends" -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"}
 done
 
-# Usage: outdir_for_host HOST SUFFIX
-#
-#   HOST: The current platform triple we're building for
-#
-outdir_for_host() {
-    echo "${OUTDIR_BASE}/${1}${2:+-${2}}"
-}
-
-# Usage: profiledir_for_host HOST SUFFIX
-#
-#   HOST: The current platform triple we're building for
-#
-profiledir_for_host() {
-    echo "${PROFILES_BASE}/${1}${2:+-${2}}"
-}
-
 
 #########
 # BUILD #
@@ -356,7 +324,6 @@ for host in $HOSTS; do
         # for the particular $HOST we're building for
         export HOST="$host"
 
-        # shellcheck disable=SC2030
 cat << EOF
 INFO: Building ${VERSION:?not set} for platform triple ${HOST:?not set}:
       ...using reference timestamp: ${SOURCE_DATE_EPOCH:?not set}
@@ -364,17 +331,17 @@ INFO: Building ${VERSION:?not set} for platform triple ${HOST:?not set}:
       ...from worktree directory: '${PWD}'
           ...bind-mounted in container to: '/bitcoin'
       ...in build directory: '$(distsrc_for_host "$HOST")'
-          ...bind-mounted in container to: '$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")'
+          ...bind-mounted in container to: '$(distsrc_for_host "$HOST" "" /distsrc-base)'
       ...outputting in: '$(outdir_for_host "$HOST")'
-          ...bind-mounted in container to: '$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST")'
+          ...bind-mounted in container to: '$(outdir_for_host "$HOST" "" /outdir-base)'
       ADDITIONAL FLAGS (if set)
           ADDITIONAL_GUIX_COMMON_FLAGS: ${ADDITIONAL_GUIX_COMMON_FLAGS}
           ADDITIONAL_GUIX_ENVIRONMENT_FLAGS: ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS}
           ADDITIONAL_GUIX_TIMEMACHINE_FLAGS: ${ADDITIONAL_GUIX_TIMEMACHINE_FLAGS}
 EOF
 
-        # Run the build script 'contrib/guix/libexec/build.sh' in the build
-        # container specified by 'contrib/guix/manifest.scm'.
+        # Run the build scripts 'contrib/guix/libexec/*.sh' in the build
+        # containers specified by 'contrib/guix/manifest*.scm'.
         #
         # Explanation of `guix shell` flags:
         #
@@ -439,39 +406,73 @@ EOF
         #    substitutes (pre-built packages) from servers that the user trusts.
         #    Please read the README.md in the same directory as this file for
         #    more information.
-        #
-        # shellcheck disable=SC2086,SC2031
-        time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
-                                 --container \
-                                 --writable-root \
-                                 --pure \
-                                 --no-cwd \
-                                 --share="$PWD"=/bitcoin \
-                                 --share="$DISTSRC_BASE"=/distsrc-base \
-                                 --share="$OUTDIR_BASE"=/outdir-base \
-                                 --expose="$(git rev-parse --git-common-dir)" \
-                                 ${SOURCES_PATH:+--share="$SOURCES_PATH"} \
-                                 ${BASE_CACHE:+--share="$BASE_CACHE"} \
-                                 ${SDK_PATH:+--share="$SDK_PATH"} \
-                                 --cores="$JOBS" \
-                                 --keep-failed \
-                                 --fallback \
-                                 --link-profile \
-                                 --root="$(profiledir_for_host "${HOST}")" \
-                                 ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \
-                                 ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
-                                 -- env HOST="$host" \
-                                        DISTNAME="$DISTNAME" \
-                                        JOBS="$JOBS" \
-                                        SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
-                                        ${V:+V=1} \
-                                        ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \
-                                        ${BASE_CACHE:+BASE_CACHE="$BASE_CACHE"} \
-                                        ${SDK_PATH:+SDK_PATH="$SDK_PATH"} \
-                                        DISTSRC="$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")" \
-                                        OUTDIR="$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST")" \
-                                        DIST_ARCHIVE_BASE=/outdir-base/dist-archive \
-                                      bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh"
+        read -ra _guix_common_flags <<< "$ADDITIONAL_GUIX_COMMON_FLAGS"
+        read -ra _guix_env_flags <<< "$ADDITIONAL_GUIX_ENVIRONMENT_FLAGS"
+
+        shell_opts=(
+            --manifest="${PWD}/contrib/guix/manifest_build.scm"
+            --container
+            --writable-root
+            --pure
+            --no-cwd
+            --share="$PWD=/bitcoin"
+            --share="$DISTSRC_BASE=/distsrc-base"
+            --share="$OUTDIR_BASE=/outdir-base"
+            --expose="$(git rev-parse --git-common-dir)"
+            ${SOURCES_PATH:+--share="$SOURCES_PATH"}
+            ${BASE_CACHE:+--share="$BASE_CACHE"}
+            ${SDK_PATH:+--share="$SDK_PATH"}
+            --cores="$JOBS"
+            --keep-failed
+            --fallback
+            --link-profile
+            ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"}
+            "${_guix_common_flags[@]}" "${_guix_env_flags[@]}"
+            -- env HOST="$host" \
+                DISTNAME="$DISTNAME"
+                JOBS="$JOBS"
+                SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}"
+                ${V:+V=1}
+                ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"}
+                ${BASE_CACHE:+BASE_CACHE="$BASE_CACHE"}
+                ${SDK_PATH:+SDK_PATH="$SDK_PATH"}
+                DISTSRC="$(distsrc_for_host "$HOST" "" /distsrc-base)"
+                OUTDIR="$(outdir_for_host "$HOST" "" /outdir-base)"
+                DIST_ARCHIVE_BASE=/outdir-base/dist-archive
+        )
+
+        case "$HOST" in
+            *linux*)
+            time-machine shell --root="$(profiledir_for_host "${HOST}")" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_linux.sh"
+
+            time-machine shell --manifest="${PWD}/contrib/guix/manifest_gui.scm" \
+                                    --root="$(profiledir_for_host "${HOST}"_gui)" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_linux_gui.sh"
+            ;;
+            *darwin*)
+            time-machine shell --root="$(profiledir_for_host "${HOST}")" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_macos.sh"
+
+            time-machine shell --manifest="${PWD}/contrib/guix/manifest_gui.scm" \
+                                    --root="$(profiledir_for_host "${HOST}"_gui)" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_macos_gui.sh"
+            ;;
+            *mingw*)
+            time-machine shell --root="$(profiledir_for_host "${HOST}")" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_win.sh"
+
+            time-machine shell --manifest="${PWD}/contrib/guix/manifest_gui.scm" \
+                                    --root="$(profiledir_for_host "${HOST}"_gui)" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_win_gui.sh"
+            ;;
+        esac
     )
 
 done
diff --git a/depend/bitcoin/contrib/guix/guix-clean b/depend/bitcoin/contrib/guix/guix-clean
index 32258cd7..a72a2644 100755
--- a/depend/bitcoin/contrib/guix/guix-clean
+++ b/depend/bitcoin/contrib/guix/guix-clean
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
-export LC_ALL=C
-set -e -o pipefail
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
diff --git a/depend/bitcoin/contrib/guix/guix-codesign b/depend/bitcoin/contrib/guix/guix-codesign
index 39291dfe..179041c1 100755
--- a/depend/bitcoin/contrib/guix/guix-codesign
+++ b/depend/bitcoin/contrib/guix/guix-codesign
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
-export LC_ALL=C
-set -e -o pipefail
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
@@ -99,18 +102,10 @@ fi
 # Default to building for all supported HOSTs (overridable by environment)
 export HOSTS="${HOSTS:-x86_64-w64-mingw32 x86_64-apple-darwin arm64-apple-darwin}"
 
-# Usage: distsrc_for_host HOST
-#
-#   HOST: The current platform triple we're building for
-#
-distsrc_for_host() {
-    echo "${DISTSRC_BASE}/distsrc-${VERSION}-${1}-codesigned"
-}
-
 # Accumulate a list of build directories that already exist...
 hosts_distsrc_exists=""
 for host in $HOSTS; do
-    if [ -e "$(distsrc_for_host "$host")" ]; then
+    if [ -e "$(distsrc_for_host "$host" codesigned)" ]; then
         hosts_distsrc_exists+=" ${host}"
     fi
 done
@@ -134,7 +129,7 @@ packages cache, the garbage collector roots for Guix environments, and the
 output directory.
 EOF
 for host in $hosts_distsrc_exists; do
-    echo "     ${host} '$(distsrc_for_host "$host")'"
+    echo "     ${host} '$(distsrc_for_host "$host" codesigned)'"
 done
 exit 1
 else
@@ -146,22 +141,18 @@ fi
 # Codesigning tarballs SHOULD exist
 ################
 
-# Usage: outdir_for_host HOST SUFFIX
+# Usage: codesigning_tarball_for_host HOST [BASE]
 #
 #   HOST: The current platform triple we're building for
+#   BASE: Optional. If provided, replaces ${OUTDIR_BASE}
 #
-outdir_for_host() {
-    echo "${OUTDIR_BASE}/${1}${2:+-${2}}"
-}
-
-
 codesigning_tarball_for_host() {
     case "$1" in
         *mingw*)
-            echo "$(outdir_for_host "$1")/${DISTNAME}-win64-codesigning.tar.gz"
+            echo "$(outdir_for_host "$1" "" "$2")/${DISTNAME}-win64-codesigning.tar.gz"
             ;;
         *darwin*)
-            echo "$(outdir_for_host "$1")/${DISTNAME}-${1}-codesigning.tar.gz"
+            echo "$(outdir_for_host "$1" "" "$2")/${DISTNAME}-${1}-codesigning.tar.gz"
             ;;
         *)
             exit 1
@@ -232,14 +223,6 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
 OUTDIR_BASE="${OUTDIR_BASE:-${VERSION_BASE}/output}"
 mkdir -p "$OUTDIR_BASE"
 
-# Usage: profiledir_for_host HOST SUFFIX
-#
-#   HOST: The current platform triple we're building for
-#
-profiledir_for_host() {
-    echo "${PROFILES_BASE}/${1}${2:+-${2}}"
-}
-
 #########
 # BUILD #
 #########
@@ -274,16 +257,15 @@ for host in $HOSTS; do
         # for the particular $HOST we're building for
         export HOST="$host"
 
-        # shellcheck disable=SC2030
 cat << EOF
 INFO: Codesigning ${VERSION:?not set} for platform triple ${HOST:?not set}:
       ...using reference timestamp: ${SOURCE_DATE_EPOCH:?not set}
       ...from worktree directory: '${PWD}'
           ...bind-mounted in container to: '/bitcoin'
-      ...in build directory: '$(distsrc_for_host "$HOST")'
-          ...bind-mounted in container to: '$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")'
+      ...in build directory: '$(distsrc_for_host "$HOST" codesigned)'
+          ...bind-mounted in container to: '$(distsrc_for_host "$HOST" codesigned /distsrc-base)'
       ...outputting in: '$(outdir_for_host "$HOST" codesigned)'
-          ...bind-mounted in container to: '$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST" codesigned)'
+          ...bind-mounted in container to: '$(outdir_for_host "$HOST" codesigned /outdir-base)'
       ...using detached signatures in: '${DETACHED_SIGS_REPO:?not set}'
           ...bind-mounted in container to: '/detached-sigs'
 EOF
@@ -340,8 +322,8 @@ EOF
         #    Please read the README.md in the same directory as this file for
         #    more information.
         #
-        # shellcheck disable=SC2086,SC2031
-        time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
+        # shellcheck disable=SC2086
+        time-machine shell --manifest="${PWD}/contrib/guix/manifest_codesign.scm" \
                                  --container \
                                  --writable-root \
                                  --pure \
@@ -364,11 +346,11 @@ EOF
                                         JOBS="$JOBS" \
                                         SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
                                         ${V:+V=1} \
-                                        DISTSRC="$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")" \
-                                        OUTDIR="$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST" codesigned)" \
+                                        DISTSRC="$(distsrc_for_host "$HOST" codesigned /distsrc-base)" \
+                                        OUTDIR="$(outdir_for_host "$HOST" codesigned /outdir-base)" \
                                         DIST_ARCHIVE_BASE=/outdir-base/dist-archive \
                                         DETACHED_SIGS_REPO=/detached-sigs \
-                                        CODESIGNING_TARBALL="$(OUTDIR_BASE=/outdir-base && codesigning_tarball_for_host "$HOST")" \
+                                        CODESIGNING_TARBALL="$(codesigning_tarball_for_host "$HOST" /outdir-base)" \
                                       bash -c "cd /bitcoin && bash contrib/guix/libexec/codesign.sh"
     )
 
diff --git a/depend/bitcoin/contrib/guix/guix-verify b/depend/bitcoin/contrib/guix/guix-verify
index 02ae0227..82e74003 100755
--- a/depend/bitcoin/contrib/guix/guix-verify
+++ b/depend/bitcoin/contrib/guix/guix-verify
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
-export LC_ALL=C
-set -e -o pipefail
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
diff --git a/depend/bitcoin/contrib/guix/libexec/build.sh b/depend/bitcoin/contrib/guix/libexec/build.sh
deleted file mode 100755
index 51354273..00000000
--- a/depend/bitcoin/contrib/guix/libexec/build.sh
+++ /dev/null
@@ -1,410 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2019-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.
-export LC_ALL=C
-set -e -o pipefail
-
-# Environment variables for determinism
-export TAR_OPTIONS="--no-same-owner --owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
-export TZ=UTC
-
-# Although Guix _does_ set umask when building its own packages (in our case,
-# this is all packages in manifest.scm), it does not set it for `guix
-# shell`. It does make sense for at least `guix shell --container`
-# to set umask, so if that change gets merged upstream and we bump the
-# time-machine to a commit which includes the aforementioned change, we can
-# remove this line.
-#
-# This line should be placed before any commands which creates files.
-umask 0022
-
-if [ -n "$V" ]; then
-    # Print both unexpanded (-v) and expanded (-x) forms of commands as they are
-    # read from this file.
-    set -vx
-    # Set VERBOSE for CMake-based builds
-    export VERBOSE="$V"
-fi
-
-# Check that required environment variables are set
-cat << EOF
-Required environment variables as seen inside the container:
-    DIST_ARCHIVE_BASE: ${DIST_ARCHIVE_BASE:?not set}
-    DISTNAME: ${DISTNAME:?not set}
-    HOST: ${HOST:?not set}
-    SOURCE_DATE_EPOCH: ${SOURCE_DATE_EPOCH:?not set}
-    JOBS: ${JOBS:?not set}
-    DISTSRC: ${DISTSRC:?not set}
-    OUTDIR: ${OUTDIR:?not set}
-EOF
-
-ACTUAL_OUTDIR="${OUTDIR}"
-OUTDIR="${DISTSRC}/output"
-
-#####################
-# Environment Setup #
-#####################
-
-# The depends folder also serves as a base-prefix for depends packages for
-# $HOSTs after successfully building.
-BASEPREFIX="${PWD}/depends"
-
-# Given a package name and an output name, return the path of that output in our
-# current guix environment
-store_path() {
-    grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \
-        | head --lines=1 \
-        | sed --expression='s|\x29*$||' \
-              --expression='s|^[[:space:]]*"||' \
-              --expression='s|"[[:space:]]*$||'
-}
-
-
-# Set environment variables to point the NATIVE toolchain to the right
-# includes/libs
-NATIVE_GCC="$(store_path gcc-toolchain)"
-
-unset LIBRARY_PATH
-unset CPATH
-unset C_INCLUDE_PATH
-unset CPLUS_INCLUDE_PATH
-unset OBJC_INCLUDE_PATH
-unset OBJCPLUS_INCLUDE_PATH
-
-# Set native toolchain
-build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
-build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
-
-case "$HOST" in
-    *darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;; # Required for native packages
-    *mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
-    *)
-        NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
-        export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"
-        ;;
-esac
-
-# Set environment variables to point the CROSS toolchain to the right
-# includes/libs for $HOST
-case "$HOST" in
-    *mingw*)
-        # Determine output paths to use in CROSS_* environment variables
-        CROSS_GLIBC="$(store_path "mingw-w64-x86_64-winpthreads")"
-        CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
-        CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
-        CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
-        CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
-
-        # The search path ordering is generally:
-        #    1. gcc-related search paths
-        #    2. libc-related search paths
-        #    2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
-        export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
-        export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
-        export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
-        ;;
-    *darwin*)
-        # The CROSS toolchain for darwin uses the SDK and ignores environment variables.
-        # See depends/hosts/darwin.mk for more details.
-        ;;
-    *linux*)
-        CROSS_GLIBC="$(store_path "glibc-cross-${HOST}")"
-        CROSS_GLIBC_STATIC="$(store_path "glibc-cross-${HOST}" static)"
-        CROSS_KERNEL="$(store_path "linux-libre-headers-cross-${HOST}")"
-        CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
-        CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
-        CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
-        CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
-
-        export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include:${CROSS_KERNEL}/include"
-        export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
-        export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib:${CROSS_GLIBC_STATIC}/lib"
-        ;;
-    *)
-        exit 1 ;;
-esac
-
-# Sanity check CROSS_*_PATH directories
-IFS=':' read -ra PATHS <<< "${CROSS_C_INCLUDE_PATH}:${CROSS_CPLUS_INCLUDE_PATH}:${CROSS_LIBRARY_PATH}"
-for p in "${PATHS[@]}"; do
-    if [ -n "$p" ] && [ ! -d "$p" ]; then
-        echo "'$p' doesn't exist or isn't a directory... Aborting..."
-        exit 1
-    fi
-done
-
-# Disable Guix ld auto-rpath behavior
-export GUIX_LD_WRAPPER_DISABLE_RPATH=yes
-
-# Make /usr/bin if it doesn't exist
-[ -e /usr/bin ] || mkdir -p /usr/bin
-
-# Symlink env to a conventional path
-[ -e /usr/bin/env ]  || ln -s --no-dereference "$(command -v env)"  /usr/bin/env
-
-# Determine the correct value for -Wl,--dynamic-linker for the current $HOST
-case "$HOST" in
-    *linux*)
-        glibc_dynamic_linker=$(
-            case "$HOST" in
-                x86_64-linux-gnu)      echo /lib64/ld-linux-x86-64.so.2 ;;
-                arm-linux-gnueabihf)   echo /lib/ld-linux-armhf.so.3 ;;
-                aarch64-linux-gnu)     echo /lib/ld-linux-aarch64.so.1 ;;
-                riscv64-linux-gnu)     echo /lib/ld-linux-riscv64-lp64d.so.1 ;;
-                powerpc64-linux-gnu)   echo /lib64/ld64.so.1;;
-                powerpc64le-linux-gnu) echo /lib64/ld64.so.2;;
-                *)                     exit 1 ;;
-            esac
-        )
-        ;;
-esac
-
-####################
-# Depends Building #
-####################
-
-# Build the depends tree, overriding variables that assume multilib gcc
-make -C depends --jobs="$JOBS" HOST="$HOST" \
-                                   ${V:+V=1} \
-                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
-                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
-                                   ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
-                                   ${build_CC+build_CC="$build_CC"} \
-                                   ${build_CXX+build_CXX="$build_CXX"} \
-                                   x86_64_linux_CC=x86_64-linux-gnu-gcc \
-                                   x86_64_linux_CXX=x86_64-linux-gnu-g++ \
-                                   x86_64_linux_AR=x86_64-linux-gnu-gcc-ar \
-                                   x86_64_linux_RANLIB=x86_64-linux-gnu-gcc-ranlib \
-                                   x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
-                                   x86_64_linux_STRIP=x86_64-linux-gnu-strip
-
-case "$HOST" in
-    *darwin*)
-        # Unset now that Qt is built
-        unset LIBRARY_PATH
-        ;;
-esac
-
-###########################
-# Source Tarball Building #
-###########################
-
-GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz"
-
-# Create the source tarball if not already there
-if [ ! -e "$GIT_ARCHIVE" ]; then
-    mkdir -p "$(dirname "$GIT_ARCHIVE")"
-    git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD
-fi
-
-mkdir -p "$OUTDIR"
-
-###########################
-# Binary Tarball Building #
-###########################
-
-# CONFIGFLAGS
-CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF -DCMAKE_SKIP_RPATH=TRUE"
-
-# CFLAGS
-HOST_CFLAGS="-O2 -g"
-HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
-HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
-case "$HOST" in
-    *mingw*)  HOST_CFLAGS+=" -fno-ident" ;;
-    *darwin*) unset HOST_CFLAGS ;;
-esac
-
-# CXXFLAGS
-HOST_CXXFLAGS="$HOST_CFLAGS"
-
-case "$HOST" in
-    arm-linux-gnueabihf) HOST_CXXFLAGS="${HOST_CXXFLAGS} -Wno-psabi" ;;
-esac
-
-# LDFLAGS
-case "$HOST" in
-    *linux*)  HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$glibc_dynamic_linker -Wl,-O2" ;;
-    *mingw*)  HOST_LDFLAGS="-Wl,--no-insert-timestamp" ;;
-esac
-
-# EXE FLAGS
-case "$HOST" in
-    *linux*)  CMAKE_EXE_LINKER_FLAGS="-DCMAKE_EXE_LINKER_FLAGS=${HOST_LDFLAGS} -static-libstdc++ -static-libgcc" ;;
-esac
-
-mkdir -p "$DISTSRC"
-(
-    cd "$DISTSRC"
-
-    # Extract the source tarball
-    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
-
-    # Configure this DISTSRC for $HOST
-    # shellcheck disable=SC2086
-    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
-    cmake -S . -B build \
-          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
-          -DWITH_CCACHE=OFF \
-          -Werror=dev \
-          ${CONFIGFLAGS} \
-          "${CMAKE_EXE_LINKER_FLAGS}"
-
-    # Build Bitcoin Core
-    cmake --build build -j "$JOBS" ${V:+--verbose}
-
-    mkdir -p "$OUTDIR"
-
-    # Make the os-specific installers
-    case "$HOST" in
-        *mingw*)
-            cmake --build build -j "$JOBS" -t deploy ${V:+--verbose}
-            mv build/bitcoin-win64-setup.exe "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
-            ;;
-    esac
-
-    # Setup the directory where our Bitcoin Core build for HOST will be
-    # installed. This directory will also later serve as the input for our
-    # binary tarballs.
-    INSTALLPATH="${PWD}/installed/${DISTNAME}"
-    mkdir -p "${INSTALLPATH}"
-    # Install built Bitcoin Core to $INSTALLPATH
-    case "$HOST" in
-        *darwin*)
-            cmake --install build --strip --prefix "${INSTALLPATH}" ${V:+--verbose}
-            ;;
-        *)
-            cmake --install build --prefix "${INSTALLPATH}" ${V:+--verbose}
-            ;;
-    esac
-
-    # Perform basic security checks on installed executables.
-    echo "Checking binary security on installed executables..."
-    python3 "${DISTSRC}/contrib/guix/security-check.py" "${INSTALLPATH}/bin/"* "${INSTALLPATH}/libexec/"*
-    # Check that executables only contain allowed version symbols.
-    echo "Running symbol and dynamic library checks on installed executables..."
-    python3 "${DISTSRC}/contrib/guix/symbol-check.py" "${INSTALLPATH}/bin/"* "${INSTALLPATH}/libexec/"*
-
-    (
-        cd installed
-
-        case "$HOST" in
-            *darwin*) ;;
-            *)
-                # Split binaries from their debug symbols
-                {
-                    find "${DISTNAME}/bin" "${DISTNAME}/libexec" -type f -executable -print0
-                } | xargs -0 -P"$JOBS" -I{} "${DISTSRC}/build/split-debug.sh" {} {} {}.dbg
-                ;;
-        esac
-
-        case "$HOST" in
-            *mingw*)
-                cp "${DISTSRC}/doc/README_windows.txt" "${DISTNAME}/readme.txt"
-                ;;
-            *linux*)
-                cp "${DISTSRC}/README.md" "${DISTNAME}/"
-                cp "${DISTSRC}/doc/INSTALL_linux.md" "${DISTNAME}/INSTALL.md"
-                ;;
-        esac
-
-        # copy over the example bitcoin.conf file. if contrib/devtools/gen-bitcoin-conf.sh
-        # has not been run before buildling, this file will be a stub
-        cp "${DISTSRC}/share/examples/bitcoin.conf" "${DISTNAME}/"
-
-        cp -r "${DISTSRC}/share/rpcauth" "${DISTNAME}/share/"
-
-        # Deterministically produce {non-,}debug binary tarballs ready
-        # for release
-        case "$HOST" in
-            *mingw*)
-                find "${DISTNAME}" -not -name "*.dbg" -print0 \
-                    | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
-                find "${DISTNAME}" -not -name "*.dbg" \
-                    | sort \
-                    | zip -X@ "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-unsigned.zip" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-unsigned.zip" && exit 1 )
-                find "${DISTNAME}" -name "*.dbg" -print0 \
-                    | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
-                find "${DISTNAME}" -name "*.dbg" \
-                    | sort \
-                    | zip -X@ "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-debug.zip" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-debug.zip" && exit 1 )
-                ;;
-            *linux*)
-                find "${DISTNAME}" -not -name "*.dbg" -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" && exit 1 )
-                find "${DISTNAME}" -name "*.dbg" -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" && exit 1 )
-                ;;
-            *darwin*)
-                find "${DISTNAME}" -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 )
-                ;;
-        esac
-    )  # $DISTSRC/installed
-
-    # Finally make tarballs for codesigning
-    case "$HOST" in
-        *mingw*)
-            cp -rf --target-directory=. contrib/windeploy
-            (
-                cd ./windeploy
-                mkdir -p unsigned
-                cp --target-directory=unsigned/ "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
-                cp -r --target-directory=unsigned/ "${INSTALLPATH}"
-                find unsigned/ -name "*.dbg" -print0 \
-                    | xargs -0r rm
-                find . -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-win64-codesigning.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-win64-codesigning.tar.gz" && exit 1 )
-            )
-            ;;
-        *darwin*)
-            cmake --build build --target deploy ${V:+--verbose}
-            mv build/dist/bitcoin-macos-app.zip "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip"
-            mkdir -p "unsigned-app-${HOST}"
-            cp  --target-directory="unsigned-app-${HOST}" \
-                contrib/macdeploy/detached-sig-create.sh
-            mv --target-directory="unsigned-app-${HOST}" build/dist
-            cp -r --target-directory="unsigned-app-${HOST}" "${INSTALLPATH}"
-            (
-                cd "unsigned-app-${HOST}"
-                find . -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-codesigning.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-codesigning.tar.gz" && exit 1 )
-            )
-            ;;
-    esac
-)  # $DISTSRC
-
-rm -rf "$ACTUAL_OUTDIR"
-mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
-    || ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
-
-(
-    tmp="$(mktemp)"
-    cd /outdir-base
-    {
-        echo "$GIT_ARCHIVE"
-        find "$ACTUAL_OUTDIR" -type f
-    } | xargs realpath --relative-base="$PWD" \
-        | xargs sha256sum \
-        | sort -k2 \
-        > "$tmp";
-    mv "$tmp" "$ACTUAL_OUTDIR"/SHA256SUMS.part
-)
diff --git a/depend/bitcoin/contrib/guix/libexec/build_linux.sh b/depend/bitcoin/contrib/guix/libexec/build_linux.sh
new file mode 100755
index 00000000..b84fcdde
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/build_linux.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# setup gcc toolchain
+gcc_toolchain
+
+# Build the depends tree, overriding variables that assume multilib gcc
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   x86_64_linux_CC=x86_64-linux-gnu-gcc \
+                                   x86_64_linux_CXX=x86_64-linux-gnu-g++ \
+                                   x86_64_linux_AR=x86_64-linux-gnu-gcc-ar \
+                                   x86_64_linux_RANLIB=x86_64-linux-gnu-gcc-ranlib \
+                                   x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
+                                   x86_64_linux_STRIP=x86_64-linux-gnu-strip \
+                                   NO_QT=1
+
+# CFLAGS
+HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
+
+# CXXFLAGS
+HOST_CXXFLAGS="$HOST_CFLAGS"
+
+case "$HOST" in
+    arm-linux-gnueabihf) HOST_CXXFLAGS="${HOST_CXXFLAGS} -Wno-psabi" ;;
+esac
+
+# LDFLAGS
+HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$(glibc_dynamic_linker "$HOST") -Wl,-O2"
+
+# Use LINK_WARNING_AS_ERROR when using CMake 4.x
+case "$HOST" in
+    riscv64-linux-gnu) ;; # https://github.com/boostorg/test/issues/345
+    *) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,--fatal-warnings" ;;
+esac
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+    cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DCMAKE_EXE_LINKER_FLAGS="${HOST_LDFLAGS} -static-libstdc++ -static-libgcc" \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DCMAKE_SKIP_RPATH=TRUE \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS"
+
+    # Install built Bitcoin Core
+    cmake --install build
+)
+
+rm -rf "$DISTSRC"/build
+
+exit 0
diff --git a/depend/bitcoin/contrib/guix/libexec/build_linux_gui.sh b/depend/bitcoin/contrib/guix/libexec/build_linux_gui.sh
new file mode 100755
index 00000000..f069d4b4
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/build_linux_gui.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# setup gcc toolchain
+gcc_toolchain
+
+# Build the depends tree, overriding variables that assume multilib gcc
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   x86_64_linux_CC=x86_64-linux-gnu-gcc \
+                                   x86_64_linux_CXX=x86_64-linux-gnu-g++ \
+                                   x86_64_linux_AR=x86_64-linux-gnu-gcc-ar \
+                                   x86_64_linux_RANLIB=x86_64-linux-gnu-gcc-ranlib \
+                                   x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
+                                   x86_64_linux_STRIP=x86_64-linux-gnu-strip
+
+# CFLAGS
+HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
+
+# CXXFLAGS
+HOST_CXXFLAGS="$HOST_CFLAGS"
+
+case "$HOST" in
+    arm-linux-gnueabihf) HOST_CXXFLAGS="${HOST_CXXFLAGS} -Wno-psabi" ;;
+esac
+
+# LDFLAGS
+HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$(glibc_dynamic_linker "$HOST") -Wl,-O2"
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+    cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_BITCOIN_BIN=OFF \
+          -DBUILD_CLI=OFF \
+          -DBUILD_DAEMON=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_TX=OFF \
+          -DBUILD_UTIL=OFF \
+          -DBUILD_WALLET_TOOL=OFF \
+          -DCMAKE_EXE_LINKER_FLAGS="${HOST_LDFLAGS} -static-libstdc++ -static-libgcc" \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DCMAKE_SKIP_RPATH=TRUE \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF \
+          -Werror=dev
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS" --target bitcoin-gui bitcoin-qt
+
+    # Install built Bitcoin Core
+    cmake --install build --component bitcoin-gui
+    cmake --install build --component bitcoin-qt
+)  # $DISTSRC
+
+# shellcheck source=package.sh
+source "$(dirname "${BASH_SOURCE[0]}")/package.sh"
diff --git a/depend/bitcoin/contrib/guix/libexec/build_macos.sh b/depend/bitcoin/contrib/guix/libexec/build_macos.sh
new file mode 100755
index 00000000..a782d80e
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/build_macos.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# Setup toolchain
+llvm_toolchain
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   ${build_LDFLAGS+build_LDFLAGS="$build_LDFLAGS"} \
+                                   ${build_AR+build_AR="$build_AR"} \
+                                   ${build_RANLIB+build_RANLIB="$build_RANLIB"} \
+                                   ${build_OBJDUMP+build_OBJDUMP="$build_OBJDUMP"} \
+                                   ${build_NM+build_NM="$build_NM"} \
+                                   ${build_STRIP+build_STRIP="$build_STRIP"} \
+                                   NO_QT=1
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DCMAKE_SKIP_RPATH=TRUE \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS"
+
+    # Install built Bitcoin Core
+    cmake --install build --strip
+)
+
+rm -rf "$DISTSRC"/build
+
+exit 0
diff --git a/depend/bitcoin/contrib/guix/libexec/build_macos_gui.sh b/depend/bitcoin/contrib/guix/libexec/build_macos_gui.sh
new file mode 100755
index 00000000..1f2dbc64
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/build_macos_gui.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# Setup toolchain
+llvm_toolchain
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   ${build_LDFLAGS+build_LDFLAGS="$build_LDFLAGS"} \
+                                   ${build_AR+build_AR="$build_AR"} \
+                                   ${build_RANLIB+build_RANLIB="$build_RANLIB"} \
+                                   ${build_OBJDUMP+build_OBJDUMP="$build_OBJDUMP"} \
+                                   ${build_NM+build_NM="$build_NM"} \
+                                   ${build_STRIP+build_STRIP="$build_STRIP"}
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_BITCOIN_BIN=OFF \
+          -DBUILD_CLI=OFF \
+          -DBUILD_DAEMON=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_TX=OFF \
+          -DBUILD_UTIL=OFF \
+          -DBUILD_WALLET_TOOL=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DCMAKE_SKIP_RPATH=TRUE \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF \
+          -Werror=dev
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS" --target bitcoin-gui bitcoin-qt
+
+    # Install built Bitcoin Core
+    cmake --install build --strip --component bitcoin-gui
+    cmake --install build --strip --component bitcoin-qt
+)
+
+# shellcheck source=package.sh
+source "$(dirname "${BASH_SOURCE[0]}")/package.sh"
diff --git a/depend/bitcoin/contrib/guix/libexec/build_win.sh b/depend/bitcoin/contrib/guix/libexec/build_win.sh
new file mode 100755
index 00000000..7dd6e9fc
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/build_win.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# setup mingw-w64 toolchain
+mingw_w64_toolchain
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   NO_QT=1
+
+# CFLAGS
+HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
+HOST_CFLAGS+=" -fno-ident"
+
+# CXXFLAGS
+HOST_CXXFLAGS="$HOST_CFLAGS"
+
+# LDFLAGS
+HOST_LDFLAGS="-Wl,--no-insert-timestamp -Wl,--fatal-warnings"
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+    cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS"
+
+    # Install built Bitcoin Core
+    cmake --install build
+)
+
+rm -rf "$DISTSRC"/build
+
+exit 0
diff --git a/depend/bitcoin/contrib/guix/libexec/build_win_gui.sh b/depend/bitcoin/contrib/guix/libexec/build_win_gui.sh
new file mode 100755
index 00000000..65696a2f
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/build_win_gui.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# setup mingw-w64 toolchain
+mingw_w64_toolchain
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"}
+
+# CFLAGS
+HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
+HOST_CFLAGS+=" -fno-ident"
+
+# CXXFLAGS
+HOST_CXXFLAGS="$HOST_CFLAGS"
+
+# LDFLAGS
+HOST_LDFLAGS="-Wl,--no-insert-timestamp -Wl,--fatal-warnings"
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+    cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_BITCOIN_BIN=OFF \
+          -DBUILD_CLI=OFF \
+          -DBUILD_DAEMON=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_TX=OFF \
+          -DBUILD_UTIL=OFF \
+          -DBUILD_WALLET_TOOL=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF \
+          -Werror=dev
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS" --target bitcoin-qt
+
+    # Install built Bitcoin Core
+    cmake --install build --component bitcoin-qt
+)
+
+# shellcheck source=package.sh
+source "$(dirname "${BASH_SOURCE[0]}")/package.sh"
diff --git a/depend/bitcoin/contrib/guix/libexec/codesign.sh b/depend/bitcoin/contrib/guix/libexec/codesign.sh
index 9b7f085d..21f4c110 100755
--- a/depend/bitcoin/contrib/guix/libexec/codesign.sh
+++ b/depend/bitcoin/contrib/guix/libexec/codesign.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
-# Copyright (c) 2021-present The Bitcoin Core developers
+# Copyright (c) The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-export LC_ALL=C
-set -e -o pipefail
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
 # Environment variables for determinism
 export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
diff --git a/depend/bitcoin/contrib/guix/libexec/package.sh b/depend/bitcoin/contrib/guix/libexec/package.sh
new file mode 100755
index 00000000..05f5e61f
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/package.sh
@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+(
+    cd "$DISTSRC"
+
+    # Perform basic security checks on installed executables.
+    echo "Checking binary security on installed executables..."
+    python3 "${DISTSRC}/contrib/guix/security-check.py" "${INSTALLPATH}/bin/"* "${INSTALLPATH}/libexec/"*
+    # Check that executables only contain allowed version symbols.
+    echo "Running symbol and dynamic library checks on installed executables..."
+    python3 "${DISTSRC}/contrib/guix/symbol-check.py" "${INSTALLPATH}/bin/"* "${INSTALLPATH}/libexec/"*
+
+    (
+        cd installed
+
+        case "$HOST" in
+            *darwin*) ;;
+            *)
+                # Split binaries from their debug symbols
+                {
+                    find "${DISTNAME}/bin" "${DISTNAME}/libexec" -type f -executable -print0
+                } | xargs -0 -P"$JOBS" -I{} "${DISTSRC}/build/split-debug.sh" {} {} {}.dbg
+                ;;
+        esac
+
+        case "$HOST" in
+            *mingw*)
+                cp "${DISTSRC}/doc/README_windows.txt" "${DISTNAME}/readme.txt"
+                ;;
+            *linux*)
+                cp "${DISTSRC}/README.md" "${DISTNAME}/"
+                cp "${DISTSRC}/doc/INSTALL_linux.md" "${DISTNAME}/INSTALL.md"
+                ;;
+        esac
+
+        # copy over the example bitcoin.conf file. if contrib/devtools/gen-bitcoin-conf.sh
+        # has not been run before building, this file will be a stub
+        cp "${DISTSRC}/share/examples/bitcoin.conf" "${DISTNAME}/"
+
+        cp -r "${DISTSRC}/share/rpcauth" "${DISTNAME}/share/"
+
+        # Deterministically produce {non-,}debug binary tarballs ready
+        # for release
+        case "$HOST" in
+            *mingw*)
+                find "${DISTNAME}" -not -name "*.dbg" -print0 \
+                    | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
+                find "${DISTNAME}" -not -name "*.dbg" \
+                    | sort \
+                    | zip -X@ "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-unsigned.zip" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-unsigned.zip" && exit 1 )
+                find "${DISTNAME}" -name "*.dbg" -print0 \
+                    | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
+                find "${DISTNAME}" -name "*.dbg" \
+                    | sort \
+                    | zip -X@ "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-debug.zip" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-debug.zip" && exit 1 )
+                ;;
+            *linux*)
+                find "${DISTNAME}" -not -name "*.dbg" -print0 \
+                    | sort --zero-terminated \
+                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
+                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" && exit 1 )
+                find "${DISTNAME}" -name "*.dbg" -print0 \
+                    | sort --zero-terminated \
+                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
+                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" && exit 1 )
+                ;;
+            *darwin*)
+                find "${DISTNAME}" -print0 \
+                    | sort --zero-terminated \
+                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
+                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 )
+                ;;
+        esac
+    )  # $DISTSRC/installed
+
+    # Finally make tarballs for codesigning
+    case "$HOST" in
+        *mingw*)
+            # Make the installer
+            cmake -D BIN_DIR="${INSTALLPATH}/bin" -D LIBEXEC_DIR="${INSTALLPATH}/libexec" -P build/GenerateWindowsInstaller.cmake
+            mv build/bitcoin-win64-setup.exe "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
+
+            cp -rf --target-directory=. contrib/windeploy
+            (
+                cd ./windeploy
+                mkdir -p unsigned
+                cp --target-directory=unsigned/ "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
+                cp -r --target-directory=unsigned/ "${INSTALLPATH}"
+                find unsigned/ -name "*.dbg" -print0 \
+                    | xargs -0r rm
+                find . -print0 \
+                    | sort --zero-terminated \
+                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
+                    | gzip -9n > "${OUTDIR}/${DISTNAME}-win64-codesigning.tar.gz" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-win64-codesigning.tar.gz" && exit 1 )
+            )
+            ;;
+        *darwin*)
+            cmake --build build --target deploy
+            mv build/dist/bitcoin-macos-app.zip "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip"
+            mkdir -p "unsigned-app-${HOST}"
+            cp  --target-directory="unsigned-app-${HOST}" \
+                contrib/macdeploy/detached-sig-create.sh
+            mv --target-directory="unsigned-app-${HOST}" build/dist
+            cp -r --target-directory="unsigned-app-${HOST}" "${INSTALLPATH}"
+            (
+                cd "unsigned-app-${HOST}"
+                find . -print0 \
+                    | sort --zero-terminated \
+                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
+                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-codesigning.tar.gz" \
+                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-codesigning.tar.gz" && exit 1 )
+            )
+            ;;
+    esac
+
+) # $DISTSRC
+
+rm -rf "$ACTUAL_OUTDIR"
+mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
+    || ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
+
+(
+    tmp="$(mktemp)"
+    cd /outdir-base
+    {
+        echo "$GIT_ARCHIVE"
+        find "$ACTUAL_OUTDIR" -type f
+    } | xargs realpath --relative-base="$PWD" \
+        | xargs sha256sum \
+        | sort -k2 \
+        > "$tmp";
+    mv "$tmp" "$ACTUAL_OUTDIR"/SHA256SUMS.part
+)
diff --git a/depend/bitcoin/contrib/guix/libexec/prelude.bash b/depend/bitcoin/contrib/guix/libexec/prelude.bash
index 166675e8..2fe5c738 100644
--- a/depend/bitcoin/contrib/guix/libexec/prelude.bash
+++ b/depend/bitcoin/contrib/guix/libexec/prelude.bash
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-export LC_ALL=C
-set -e -o pipefail
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
 
-# shellcheck source=contrib/shell/realpath.bash
 source contrib/shell/realpath.bash
-
-# shellcheck source=contrib/shell/git-utils.bash
 source contrib/shell/git-utils.bash
 
 ################
@@ -80,6 +80,34 @@ time-machine() {
                       -- "$@"
 }
 
+# Usage: distsrc_for_host HOST [SUFFIX] [BASE]
+#
+#   HOST: The current platform triple we're building for
+#   SUFFIX: Optional. If provided, appended to the directory name as "-SUFFIX"
+#   BASE: Optional. If provided, replaces ${DISTSRC_BASE}
+#
+distsrc_for_host() {
+    echo "${3:-${DISTSRC_BASE}}/distsrc-${VERSION}-${1}${2:+-${2}}"
+}
+
+# Usage: outdir_for_host HOST [SUFFIX] [BASE]
+#
+#   HOST: The current platform triple we're building for
+#   SUFFIX: Optional. If provided, appended to the directory name as "-SUFFIX"
+#   BASE: Optional. If provided, replaces ${OUTDIR_BASE}
+#
+outdir_for_host() {
+    echo "${3:-${OUTDIR_BASE}}/${1}${2:+-${2}}"
+}
+
+# Usage: profiledir_for_host HOST [SUFFIX]
+#
+#   HOST: The current platform triple we're building for
+#   SUFFIX: Optional. If provided, appended to the directory name as "-SUFFIX"
+#
+profiledir_for_host() {
+    echo "${PROFILES_BASE}/${1}${2:+-${2}}"
+}
 
 ################
 # Set common variables
diff --git a/depend/bitcoin/contrib/guix/libexec/setup.sh b/depend/bitcoin/contrib/guix/libexec/setup.sh
new file mode 100755
index 00000000..2e3eb159
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/libexec/setup.sh
@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail
+
+# Environment variables for determinism
+export TAR_OPTIONS="--no-same-owner --owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
+export TZ=UTC
+
+# Although Guix _does_ set umask when building its own packages (in our case,
+# this is all packages in manifest.scm), it does not set it for `guix
+# shell`. It does make sense for at least `guix shell --container`
+# to set umask, so if that change gets merged upstream and we bump the
+# time-machine to a commit which includes the aforementioned change, we can
+# remove this line.
+#
+# This line should be placed before any commands which creates files.
+umask 0022
+
+if [ -n "$V" ]; then
+    # Print both unexpanded (-v) and expanded (-x) forms of commands as they are
+    # read from this file.
+    set -vx
+    # Set VERBOSE for CMake-based builds
+    export VERBOSE="$V"
+fi
+
+# Check that required environment variables are set
+cat << EOF
+Required environment variables as seen inside the container:
+    DIST_ARCHIVE_BASE: ${DIST_ARCHIVE_BASE:?not set}
+    DISTNAME: ${DISTNAME:?not set}
+    HOST: ${HOST:?not set}
+    SOURCE_DATE_EPOCH: ${SOURCE_DATE_EPOCH:?not set}
+    JOBS: ${JOBS:?not set}
+    DISTSRC: ${DISTSRC:?not set}
+    OUTDIR: ${OUTDIR:?not set}
+EOF
+
+export ACTUAL_OUTDIR="${OUTDIR}"
+export OUTDIR="${DISTSRC}/output"
+export INSTALLPATH="${DISTSRC}/installed/${DISTNAME}"
+
+#####################
+# Environment Setup #
+#####################
+
+# The depends folder also serves as a base-prefix for depends packages for
+# $HOSTs after successfully building.
+export BASEPREFIX="${PWD}/depends"
+
+# Given a package name and an output name, return the path of that output in our
+# current guix environment
+store_path() {
+    grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \
+        | head --lines=1 \
+        | sed --expression='s|\x29*$||' \
+              --expression='s|^[[:space:]]*"||' \
+              --expression='s|"[[:space:]]*$||'
+}
+
+# Sanity check CROSS_*_PATH directories
+check_cross_paths() {
+    local p paths
+    IFS=':' read -ra paths <<< "$1"
+    for p in "${paths[@]}"; do
+        if [ -n "$p" ] && [ ! -d "$p" ]; then
+            echo "'$p' doesn't exist or isn't a directory... Aborting..." >&2
+            return 1
+        fi
+    done
+}
+
+# Given a hostname, determine the correct value for -Wl,--dynamic-linker.
+glibc_dynamic_linker() {
+    case "$1" in
+        x86_64-linux-gnu)      echo /lib64/ld-linux-x86-64.so.2 ;;
+        arm-linux-gnueabihf)   echo /lib/ld-linux-armhf.so.3 ;;
+        aarch64-linux-gnu)     echo /lib/ld-linux-aarch64.so.1 ;;
+        riscv64-linux-gnu)     echo /lib/ld-linux-riscv64-lp64d.so.1 ;;
+        powerpc64-linux-gnu)   echo /lib64/ld64.so.1 ;;
+        powerpc64le-linux-gnu) echo /lib64/ld64.so.2 ;;
+        *)                     exit 1 ;;
+    esac
+}
+
+gcc_toolchain() {
+    # Set environment variables to point the NATIVE toolchain to the right
+    # includes/libs
+    local NATIVE_GCC NATIVE_GCC_STATIC CROSS_GLIBC CROSS_GLIBC_STATIC CROSS_KERNEL CROSS_GCC CROSS_GCC_LIB_STORE CROSS_GCC_LIBS CROSS_GCC_LIB
+
+    NATIVE_GCC="$(store_path gcc-toolchain)"
+
+    # Set native toolchain
+    export build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
+    export build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
+
+    NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
+    export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"
+
+    # Set environment variables to point the CROSS toolchain to the right
+    # includes/libs for $HOST
+    CROSS_GLIBC="$(store_path "glibc-cross-${HOST}")"
+    CROSS_GLIBC_STATIC="$(store_path "glibc-cross-${HOST}" static)"
+    CROSS_KERNEL="$(store_path "linux-libre-headers-cross-${HOST}")"
+    CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
+    CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
+    CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
+    CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
+
+    export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include:${CROSS_KERNEL}/include"
+    export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
+    export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib:${CROSS_GLIBC_STATIC}/lib"
+
+    check_cross_paths "${CROSS_C_INCLUDE_PATH}:${CROSS_CPLUS_INCLUDE_PATH}:${CROSS_LIBRARY_PATH}"
+}
+
+llvm_toolchain() {
+    local CLANG_TOOLCHAIN LIB_CXX
+
+    CLANG_TOOLCHAIN="$(store_path clang-toolchain)"
+    LIB_CXX="$(store_path libcxx)"
+
+    export build_CC="${CLANG_TOOLCHAIN}/bin/clang -isystem ${CLANG_TOOLCHAIN}/include"
+    export build_CXX="${CLANG_TOOLCHAIN}/bin/clang++ -stdlib=libc++ -isystem ${LIB_CXX}/include/c++/v1 -isystem ${CLANG_TOOLCHAIN}/include"
+    export build_LDFLAGS="-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind -L${LIB_CXX}/lib -Wl,-rpath,${LIB_CXX}/lib"
+    export build_AR="${CLANG_TOOLCHAIN}/bin/llvm-ar"
+    export build_RANLIB="${CLANG_TOOLCHAIN}/bin/llvm-ranlib"
+    export build_OBJDUMP="${CLANG_TOOLCHAIN}/bin/llvm-objdump"
+    export build_NM="${CLANG_TOOLCHAIN}/bin/llvm-nm"
+    export build_STRIP="${CLANG_TOOLCHAIN}/bin/llvm-strip"
+}
+
+mingw_w64_toolchain() {
+    # Set environment variables to point the NATIVE toolchain to the right
+    # includes/libs
+    local NATIVE_GCC CROSS_GLIBC CROSS_GCC CROSS_GCC_LIB_STORE CROSS_GCC_LIBS CROSS_GCC_LIB
+
+    NATIVE_GCC="$(store_path gcc-toolchain)"
+
+    # Set native toolchain
+    export build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
+    export build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
+
+    # Set environment variables to point the CROSS toolchain to the right
+    # includes/libs for $HOST
+    # Determine output paths to use in CROSS_* environment variables
+    CROSS_GLIBC="$(store_path "mingw-w64-x86_64-winpthreads")"
+    CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
+    CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
+    CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
+    CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
+
+    # The search path ordering is generally:
+    #    1. gcc-related search paths
+    #    2. libc-related search paths
+    #    2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
+    export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
+    export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
+    export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
+
+    check_cross_paths "${CROSS_C_INCLUDE_PATH}:${CROSS_CPLUS_INCLUDE_PATH}:${CROSS_LIBRARY_PATH}"
+}
+
+# Disable Guix ld auto-rpath behavior
+export GUIX_LD_WRAPPER_DISABLE_RPATH=yes
+
+# Make /usr/bin if it doesn't exist
+[ -e /usr/bin ] || mkdir -p /usr/bin
+
+# Symlink env to a conventional path
+[ -e /usr/bin/env ]  || ln -s --no-dereference "$(command -v env)"  /usr/bin/env
+
+###########################
+# Source Tarball Building #
+###########################
+
+GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz"
+
+# Create the source tarball if not already there
+if [ ! -e "$GIT_ARCHIVE" ]; then
+    mkdir -p "$(dirname "$GIT_ARCHIVE")"
+    git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD
+fi
+
+mkdir -p "$OUTDIR"
+
+unset LIBRARY_PATH
+unset CPATH
+unset C_INCLUDE_PATH
+unset CPLUS_INCLUDE_PATH
+unset OBJC_INCLUDE_PATH
+unset OBJCPLUS_INCLUDE_PATH
diff --git a/depend/bitcoin/contrib/guix/manifest.scm b/depend/bitcoin/contrib/guix/manifest_build.scm
similarity index 56%
rename from depend/bitcoin/contrib/guix/manifest.scm
rename to depend/bitcoin/contrib/guix/manifest_build.scm
index 4fd901e5..8e8df90a 100644
--- a/depend/bitcoin/contrib/guix/manifest.scm
+++ b/depend/bitcoin/contrib/guix/manifest_build.scm
@@ -1,32 +1,18 @@
 (use-modules (gnu packages)
              ((gnu packages bash) #:select (bash-minimal))
-             (gnu packages bison)
              ((gnu packages cmake) #:select (cmake-minimal))
              (gnu packages commencement)
-             (gnu packages compression)
+             ((gnu packages compression) #:select (gzip))
              (gnu packages cross-base)
-             ((gnu packages crypto) #:select (osslsigncode))
-             (gnu packages gawk)
              (gnu packages gcc)
-             ((gnu packages installers) #:select (nsis-x86_64))
              ((gnu packages linux) #:select (linux-libre-headers-6.1))
              (gnu packages llvm)
              (gnu packages mingw)
-             (gnu packages ninja)
-             (gnu packages pkg-config)
-             ((gnu packages python) #:select (python-minimal))
-             ((gnu packages python-build) #:select (python-poetry-core))
-             ((gnu packages python-crypto) #:select (python-asn1crypto python-oscrypto))
-             ((gnu packages python-xyz) #:select (python-lief))
-             ((gnu packages tls) #:select (openssl))
              ((gnu packages version-control) #:select (git-minimal))
-             (guix build-system python)
-             (guix build-system pyproject)
              (guix build-system trivial)
              (guix download)
              (guix gexp)
              (guix git-download)
-             ((guix licenses) #:prefix license:)
              (guix packages)
              ((guix utils) #:select (substitute-keyword-arguments)))
 
@@ -171,157 +157,24 @@ chain for " target " development."))
       (home-page (package-home-page pthreads-xgcc))
       (license (package-license pthreads-xgcc)))))
 
-(define-public python-elfesteem
-  (let ((commit "2eb1e5384ff7a220fd1afacd4a0170acff54fe56"))
-    (package
-      (name "python-elfesteem")
-      (version (git-version "0.1" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/LRGH/elfesteem")
-               (commit commit)))
-         (file-name (git-file-name name commit))
-         (sha256
-          (base32
-           "07x6p8clh11z8s1n2kdxrqwqm2almgc5qpkcr9ckb6y5ivjdr5r6"))))
-      (build-system python-build-system)
-      ;; There are no tests, but attempting to run python setup.py test leads to
-      ;; PYTHONPATH problems, just disable the test
-      (arguments '(#:tests? #f))
-      (home-page "https://github.com/LRGH/elfesteem")
-      (synopsis "ELF/PE/Mach-O parsing library")
-      (description "elfesteem parses ELF, PE and Mach-O files.")
-      (license license:lgpl2.1))))
-
-(define-public python-oscryptotests
-  (package (inherit python-oscrypto)
-    (name "python-oscryptotests")
-    (propagated-inputs
-      (list python-oscrypto))
-    (arguments
-     `(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'hard-code-path-to-libscrypt
-           (lambda* (#:key inputs #:allow-other-keys)
-             (chdir "tests")
-             #t)))))))
-
-(define-public python-certvalidator
-  (let ((commit "a145bf25eb75a9f014b3e7678826132efbba6213"))
-    (package
-      (name "python-certvalidator")
-      (version (git-version "0.1" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/achow101/certvalidator")
-               (commit commit)))
-         (file-name (git-file-name name commit))
-         (sha256
-          (base32
-           "1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k"))))
-      (build-system python-build-system)
-      (propagated-inputs
-        (list openssl
-              python-asn1crypto
-              python-oscrypto
-              python-oscryptotests)) ;; certvalidator tests import oscryptotests
-      (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'disable-broken-tests
-             (lambda _
-               (substitute* "tests/test_certificate_validator.py"
-                 (("^(.*)class CertificateValidatorTests" line indent)
-                  (string-append indent
-                                 "@unittest.skip(\"Disabled by Guix\")\n"
-                                 line)))
-               (substitute* "tests/test_crl_client.py"
-                 (("^(.*)def test_fetch_crl" line indent)
-                  (string-append indent
-                                 "@unittest.skip(\"Disabled by Guix\")\n"
-                                 line)))
-               (substitute* "tests/test_ocsp_client.py"
-                 (("^(.*)def test_fetch_ocsp" line indent)
-                  (string-append indent
-                                 "@unittest.skip(\"Disabled by Guix\")\n"
-                                 line)))
-               (substitute* "tests/test_registry.py"
-                 (("^(.*)def test_build_paths" line indent)
-                  (string-append indent
-                                 "@unittest.skip(\"Disabled by Guix\")\n"
-                                 line)))
-               (substitute* "tests/test_validate.py"
-                 (("^(.*)def test_revocation_mode_hard" line indent)
-                  (string-append indent
-                                 "@unittest.skip(\"Disabled by Guix\")\n"
-                                 line)))
-               (substitute* "tests/test_validate.py"
-                 (("^(.*)def test_revocation_mode_soft" line indent)
-                  (string-append indent
-                                 "@unittest.skip(\"Disabled by Guix\")\n"
-                                 line)))
-               #t))
-           (replace 'check
-             (lambda _
-               (invoke "python" "run.py" "tests")
-               #t)))))
-      (home-page "https://github.com/wbond/certvalidator")
-      (synopsis "Python library for validating X.509 certificates and paths")
-      (description "certvalidator is a Python library for validating X.509
-certificates or paths. Supports various options, including: validation at a
-specific moment in time, whitelisting and revocation checks.")
-      (license license:expat))))
-
-(define-public python-signapple
-  (let ((commit "85bfcecc33d2773bc09bc318cec0614af2c8e287"))
-    (package
-      (name "python-signapple")
-      (version (git-version "0.2.0" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/achow101/signapple")
-               (commit commit)))
-         (file-name (git-file-name name commit))
-         (sha256
-          (base32
-           "17yqjll8nw83q6dhgqhkl7w502z5vy9sln8m6mlx0f1c10isg8yg"))))
-      (build-system pyproject-build-system)
-      (propagated-inputs
-        (list python-asn1crypto
-              python-oscrypto
-              python-certvalidator
-              python-elfesteem))
-      (native-inputs (list python-poetry-core))
-      ;; There are no tests, but attempting to run python setup.py test leads to
-      ;; problems, just disable the test
-      (arguments '(#:tests? #f))
-      (home-page "https://github.com/achow101/signapple")
-      (synopsis "Mach-O binary signature tool")
-      (description "signapple is a Python tool for creating, verifying, and
-inspecting signatures in Mach-O binaries.")
-      (license license:expat))))
-
 (define-public mingw-w64-base-gcc
   (package
     (inherit base-gcc)
     (arguments
       (substitute-keyword-arguments (package-arguments base-gcc)
         ((#:configure-flags flags)
-          `(append ,flags
+          #~(append #$flags
             ;; https://gcc.gnu.org/install/configure.html
-            (list "--enable-threads=posix",
-                  "--enable-default-ssp=yes",
-                  "--enable-host-bind-now=yes",
-                  "--disable-gcov",
-                  "--disable-libgomp",
-                  building-on)))))))
+            (list "--enable-default-ssp=yes"
+                  "--enable-gprofng=no"
+                  "--enable-host-bind-now=yes"
+                  "--enable-threads=posix"
+                  "--disable-gcov"
+                  "--disable-libgomp"
+                  "--disable-libsanitizer"
+                  "--disable-lto"
+                  "--disable-nls"
+                  #$building-on)))))))
 
 (define-public linux-base-gcc
   (package
@@ -329,22 +182,25 @@ inspecting signatures in Mach-O binaries.")
     (arguments
       (substitute-keyword-arguments (package-arguments base-gcc)
         ((#:configure-flags flags)
-          `(append ,flags
+           #~(append #$flags
             ;; https://gcc.gnu.org/install/configure.html
-            (list "--enable-initfini-array=yes",
-                  "--enable-default-ssp=yes",
-                  "--enable-default-pie=yes",
-                  "--enable-host-bind-now=yes",
-                  "--enable-standard-branch-protection=yes",
-                  "--enable-cet=yes",
-                  "--enable-gprofng=no",
-                  "--disable-gcov",
-                  "--disable-libgomp",
-                  "--disable-libquadmath",
-                  "--disable-libsanitizer",
-                  building-on)))
+            (list "--enable-cet=yes"
+                  "--enable-default-ssp=yes"
+                  "--enable-default-pie=yes"
+                  "--enable-gprofng=no"
+                  "--enable-host-bind-now=yes"
+                  "--enable-initfini-array=yes"
+                  "--enable-standard-branch-protection=yes"
+                  "--disable-gcov"
+                  "--disable-libgomp"
+                  "--disable-libquadmath"
+                  "--disable-libsanitizer"
+                  "--disable-lto"
+                  "--disable-nls"
+                  "--disable-tm-clone-registry"
+                  #$building-on)))
         ((#:phases phases)
-          `(modify-phases ,phases
+          #~(modify-phases #$phases
             ;; Given a XGCC package, return a modified package that replace each instance of
             ;; -rpath in the default system spec that's inserted by Guix with -rpath-link
             (add-after 'pre-configure 'replace-rpath-with-rpath-link
@@ -358,7 +214,7 @@ inspecting signatures in Mach-O binaries.")
 (define-public glibc-2.31
   (let ((commit "28eb5caf895ced5d895cb02757e109004a2d33e5"))
   (package
-    (inherit glibc) ;; 2.39
+    (inherit glibc) ;; 2.41
     (version "2.31")
     (source (origin
               (method git-fetch)
@@ -376,12 +232,13 @@ inspecting signatures in Mach-O binaries.")
         ((#:configure-flags flags)
           `(append ,flags
             ;; https://www.gnu.org/software/libc/manual/html_node/Configuring-and-compiling.html
-            (list "--enable-stack-protector=all",
+            (list "--enable-bind-now",
                   "--enable-cet",
-                  "--enable-bind-now",
-                  "--disable-werror",
-                  "--disable-timezone-tools",
+                  "--enable-kernel=3.17.0",
+                  "--enable-stack-protector=all",
                   "--disable-profile",
+                  "--disable-timezone-tools",
+                  "--disable-werror",
                   building-on)))
     ((#:phases phases)
         `(modify-phases ,phases
@@ -405,42 +262,28 @@ inspecting signatures in Mach-O binaries.")
         coreutils-minimal
         ;; File(system) inspection
         grep
-        diffutils
         findutils
         ;; File transformation
         patch
-        gawk
         sed
         ;; Compression and archiving
         tar
         gzip
-        xz
         ;; Build tools
-        gcc-toolchain-14
         cmake-minimal
         gnu-make
-        ninja
-        ;; Scripting
-        python-minimal ;; (3.11)
         ;; Git
-        git-minimal
-        ;; Tests
-        python-lief)
+        git-minimal)
   (let ((target (getenv "HOST")))
     (cond ((string-suffix? "-mingw32" target)
-           (list zip
-                 (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
-                 nsis-x86_64
-                 osslsigncode))
+           (list gcc-toolchain-14
+                 (make-mingw-pthreads-cross-toolchain target)))
           ((string-contains target "-linux-")
-           (list bison
-                 pkg-config
+           (list gcc-toolchain-14
                  (list gcc-toolchain-14 "static")
                  (make-bitcoin-cross-toolchain target)))
           ((string-contains target "darwin")
            (list clang-toolchain-19
-                 lld-19
-                 (make-lld-wrapper lld-19 #:lld-as-ld? #t)
-                 python-signapple
-                 zip))
+                 libcxx ;; 19.1.7
+                 lld-19))
           (else '())))))
diff --git a/depend/bitcoin/contrib/guix/manifest_codesign.scm b/depend/bitcoin/contrib/guix/manifest_codesign.scm
new file mode 100644
index 00000000..652f40ac
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/manifest_codesign.scm
@@ -0,0 +1,179 @@
+(use-modules ((gnu packages bash) #:select (bash-minimal))
+             ((gnu packages compression) #:select (gzip zip))
+             ((gnu packages crypto) #:select (osslsigncode))
+             ((gnu packages python-build) #:select (python-poetry-core))
+             ((gnu packages python-crypto) #:select (python-asn1crypto python-oscrypto))
+             ((gnu packages tls) #:select (openssl))
+             ((gnu packages version-control) #:select (git-minimal))
+             (guix build-system python)
+             (guix build-system pyproject)
+             (guix git-download)
+             ((guix licenses) #:prefix license:)
+             (guix packages))
+
+(define-public python-elfesteem
+  (let ((commit "2eb1e5384ff7a220fd1afacd4a0170acff54fe56"))
+    (package
+      (name "python-elfesteem")
+      (version (git-version "0.1" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/LRGH/elfesteem")
+               (commit commit)))
+         (file-name (git-file-name name commit))
+         (sha256
+          (base32
+           "07x6p8clh11z8s1n2kdxrqwqm2almgc5qpkcr9ckb6y5ivjdr5r6"))))
+      (build-system python-build-system)
+      ;; There are no tests, but attempting to run python setup.py test leads to
+      ;; PYTHONPATH problems, just disable the test
+      (arguments '(#:tests? #f))
+      (home-page "https://github.com/LRGH/elfesteem")
+      (synopsis "ELF/PE/Mach-O parsing library")
+      (description "elfesteem parses ELF, PE and Mach-O files.")
+      (license license:lgpl2.1))))
+
+(define-public python-oscryptotests
+  (package (inherit python-oscrypto)
+    (name "python-oscryptotests")
+    (propagated-inputs
+      (list python-oscrypto))
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'hard-code-path-to-libscrypt
+           (lambda* (#:key inputs #:allow-other-keys)
+             (chdir "tests")
+             #t)))))))
+
+(define-public python-certvalidator
+  (let ((commit "a145bf25eb75a9f014b3e7678826132efbba6213"))
+    (package
+      (name "python-certvalidator")
+      (version (git-version "0.1" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/achow101/certvalidator")
+               (commit commit)))
+         (file-name (git-file-name name commit))
+         (sha256
+          (base32
+           "1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k"))))
+      (build-system python-build-system)
+      (propagated-inputs
+        (list openssl
+              python-asn1crypto
+              python-oscrypto
+              python-oscryptotests)) ;; certvalidator tests import oscryptotests
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'disable-broken-tests
+             (lambda _
+               (substitute* "tests/test_certificate_validator.py"
+                 (("^(.*)class CertificateValidatorTests" line indent)
+                  (string-append indent
+                                 "@unittest.skip(\"Disabled by Guix\")\n"
+                                 line)))
+               (substitute* "tests/test_crl_client.py"
+                 (("^(.*)def test_fetch_crl" line indent)
+                  (string-append indent
+                                 "@unittest.skip(\"Disabled by Guix\")\n"
+                                 line)))
+               (substitute* "tests/test_ocsp_client.py"
+                 (("^(.*)def test_fetch_ocsp" line indent)
+                  (string-append indent
+                                 "@unittest.skip(\"Disabled by Guix\")\n"
+                                 line)))
+               (substitute* "tests/test_registry.py"
+                 (("^(.*)def test_build_paths" line indent)
+                  (string-append indent
+                                 "@unittest.skip(\"Disabled by Guix\")\n"
+                                 line)))
+               (substitute* "tests/test_validate.py"
+                 (("^(.*)def test_revocation_mode_hard" line indent)
+                  (string-append indent
+                                 "@unittest.skip(\"Disabled by Guix\")\n"
+                                 line)))
+               (substitute* "tests/test_validate.py"
+                 (("^(.*)def test_revocation_mode_soft" line indent)
+                  (string-append indent
+                                 "@unittest.skip(\"Disabled by Guix\")\n"
+                                 line)))
+               #t))
+           (replace 'check
+             (lambda _
+               (invoke "python" "run.py" "tests")
+               #t)))))
+      (home-page "https://github.com/wbond/certvalidator")
+      (synopsis "Python library for validating X.509 certificates and paths")
+      (description "certvalidator is a Python library for validating X.509
+certificates or paths. Supports various options, including: validation at a
+specific moment in time, whitelisting and revocation checks.")
+      (license license:expat))))
+
+(define-public python-signapple
+  (let ((commit "3fab3bb57f227f0dd31007b417683035f5204838"))
+    (package
+      (name "python-signapple")
+      (version (git-version "0.2.0" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/achow101/signapple")
+               (commit commit)))
+         (file-name (git-file-name name commit))
+         (sha256
+          (base32
+           "0qpr78bs50rw79dbihr9ifjq19y6819ih5pn9jd2rbjyifimzf7p"))))
+      (build-system pyproject-build-system)
+      (propagated-inputs
+        (list python-asn1crypto
+              python-oscrypto
+              python-certvalidator
+              python-elfesteem))
+      (native-inputs (list python-poetry-core))
+      (arguments
+       ;; There are no tests, but attempting to run python setup.py test leads to
+       ;; problems, just disable the test
+       (list #:tests? #f
+             #:phases
+             #~(modify-phases %standard-phases
+                 ;; Add a phase to inject OpenSSL paths for oscrypto.
+                 (add-after 'wrap 'wrap-openssl-paths
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((openssl (assoc-ref inputs "openssl")))
+                       (wrap-program (string-append #$output "/bin/signapple")
+                         `("SIGNAPPLE_OSCRYPTO_SSL_PATHS" =
+                           (,(string-append openssl "/lib/libcrypto.so" "," openssl "/lib/libssl.so"))))))))))
+      (home-page "https://github.com/achow101/signapple")
+      (synopsis "Mach-O binary signature tool")
+      (description "signapple is a Python tool for creating, verifying, and
+inspecting signatures in Mach-O binaries.")
+      (license license:expat))))
+
+(packages->manifest
+ (append
+  (list ;; The Basics
+        bash-minimal
+        coreutils-minimal
+        ;; File(system) inspection
+        findutils
+        ;; Compression and archiving
+        tar
+        gzip
+        zip
+        ;; Git
+        git-minimal)
+  (let ((target (getenv "HOST")))
+    (cond ((string-suffix? "-mingw32" target)
+           (list osslsigncode))
+          ((string-contains target "darwin")
+           (list python-signapple))
+          (else '())))))
diff --git a/depend/bitcoin/contrib/guix/manifest_gui.scm b/depend/bitcoin/contrib/guix/manifest_gui.scm
new file mode 100644
index 00000000..1754af90
--- /dev/null
+++ b/depend/bitcoin/contrib/guix/manifest_gui.scm
@@ -0,0 +1,30 @@
+(use-modules (gnu packages bison)
+             ((gnu packages compression) #:select (xz zip))
+             (gnu packages gawk)
+             ((gnu packages installers) #:select (nsis-x86_64))
+             (gnu packages ninja)
+             (gnu packages pkg-config)
+             ((gnu packages python) #:select (python-minimal))
+             ((gnu packages python-xyz) #:select (python-lief)))
+
+(packages->manifest
+ (append
+  (list ;; Compression and archiving
+        xz
+        ;; Build tools
+        ninja
+        ;; Packaging scripts
+        python-minimal ;; (3.11)
+        ;; Tests
+        python-lief)
+  (let ((target (getenv "HOST")))
+    (cond ((string-suffix? "-mingw32" target)
+           (list zip
+                 nsis-x86_64))
+          ((string-contains target "-linux-")
+           (list bison
+                 gawk
+                 pkg-config))
+          ((string-contains target "darwin")
+           (list zip))
+          (else '())))))
diff --git a/depend/bitcoin/contrib/guix/security-check.py b/depend/bitcoin/contrib/guix/security-check.py
index 2a6e26b6..87aafcb9 100755
--- a/depend/bitcoin/contrib/guix/security-check.py
+++ b/depend/bitcoin/contrib/guix/security-check.py
@@ -280,8 +280,8 @@ def check_MACHO_BRANCH_PROTECTION(binary) -> bool:
     for filename in sys.argv[1:]:
         binary = lief.parse(filename)
 
-        etype = binary.format
-        arch = binary.abstract.header.architecture
+        etype = binary.format # type: ignore[union-attr]
+        arch = binary.abstract.header.architecture # type: ignore[union-attr]
 
         failed: list[str] = []
         for (name, func) in CHECKS[etype][arch]:
diff --git a/depend/bitcoin/contrib/guix/symbol-check.py b/depend/bitcoin/contrib/guix/symbol-check.py
index 86b79652..b1f326d3 100755
--- a/depend/bitcoin/contrib/guix/symbol-check.py
+++ b/depend/bitcoin/contrib/guix/symbol-check.py
@@ -72,17 +72,17 @@
 
 ELF_ABIS: dict[lief.ELF.ARCH, dict[lief.Header.ENDIANNESS, list[int]]] = {
     lief.ELF.ARCH.X86_64: {
-        lief.Header.ENDIANNESS.LITTLE: [3,2,0],
+        lief.Header.ENDIANNESS.LITTLE: [3,17,0],
     },
     lief.ELF.ARCH.ARM: {
-        lief.Header.ENDIANNESS.LITTLE: [3,2,0],
+        lief.Header.ENDIANNESS.LITTLE: [3,17,0],
     },
     lief.ELF.ARCH.AARCH64: {
-        lief.Header.ENDIANNESS.LITTLE: [3,7,0],
+        lief.Header.ENDIANNESS.LITTLE: [3,17,0],
     },
     lief.ELF.ARCH.PPC64: {
-        lief.Header.ENDIANNESS.LITTLE: [3,10,0],
-        lief.Header.ENDIANNESS.BIG: [3,2,0],
+        lief.Header.ENDIANNESS.LITTLE: [3,17,0],
+        lief.Header.ENDIANNESS.BIG: [3,17,0],
     },
     lief.ELF.ARCH.RISCV: {
         lief.Header.ENDIANNESS.LITTLE: [4,15,0],
@@ -306,7 +306,7 @@ def check_ELF_ABI(binary) -> bool:
     for filename in sys.argv[1:]:
         binary = lief.parse(filename)
 
-        etype = binary.format
+        etype = binary.format # type: ignore[union-attr]
 
         failed: list[str] = []
         for (name, func) in CHECKS[etype]:
diff --git a/depend/bitcoin/contrib/seeds/README.md b/depend/bitcoin/contrib/seeds/README.md
index 2eb68467..388ddd54 100644
--- a/depend/bitcoin/contrib/seeds/README.md
+++ b/depend/bitcoin/contrib/seeds/README.md
@@ -15,8 +15,7 @@ DNS seed, virtu's crawler, and asmap community AS map data. Run the following co
 from the `/contrib/seeds` directory:
 
 ```
-curl https://bitcoin.sipa.be/seeds.txt.gz | gzip -dc > seeds_main.txt
-curl https://21.ninja/seeds.txt.gz | gzip -dc >> seeds_main.txt
+curl https://21.ninja/seeds.txt.gz | gzip -dc > seeds_main.txt
 curl https://mainnet.achownodes.xyz/seeds.txt.gz | gzip -dc >> seeds_main.txt
 curl https://signet.achownodes.xyz/seeds.txt.gz | gzip -dc > seeds_signet.txt
 curl https://testnet.achownodes.xyz/seeds.txt.gz | gzip -dc > seeds_test.txt
diff --git a/depend/bitcoin/contrib/seeds/generate-seeds.py b/depend/bitcoin/contrib/seeds/generate-seeds.py
index 2dfad0c7..ff2b4028 100755
--- a/depend/bitcoin/contrib/seeds/generate-seeds.py
+++ b/depend/bitcoin/contrib/seeds/generate-seeds.py
@@ -22,9 +22,9 @@
 
 The output will be several data structures with the peers in binary format:
 
-   static const uint8_t chainparams_seed_{main,signet,test,testnet4}[]={
-   ...
-   }
+   inline constexpr uint8_t chainparams_seed_{main,signet,test,testnet4}[]{
+       ...
+   };
 
 These should be pasted into `src/chainparamsseeds.h`.
 '''
@@ -137,7 +137,7 @@ def bip155_serialize(spec):
     return r
 
 def process_nodes(g, f, structname):
-    g.write('static const uint8_t %s[] = {\n' % structname)
+    g.write("inline constexpr uint8_t %s[]{\n" % structname)
     for line in f:
         comment = line.find('#')
         if comment != -1:
diff --git a/depend/bitcoin/contrib/signet/miner b/depend/bitcoin/contrib/signet/miner
index f46d88b5..5827e4b3 100755
--- a/depend/bitcoin/contrib/signet/miner
+++ b/depend/bitcoin/contrib/signet/miner
@@ -66,8 +66,8 @@ def signet_txs(block, challenge):
 def decode_challenge_psbt(b64psbt):
     psbt = PSBT.from_base64(b64psbt)
 
-    assert len(psbt.tx.vin) == 1
-    assert len(psbt.tx.vout) == 1
+    assert len(psbt.i) == 1
+    assert len(psbt.o) == 1
     assert PSBT_SIGNET_BLOCK in psbt.g.map
     return psbt
 
@@ -333,7 +333,7 @@ class Generate:
     def gbt(self, bcli, bestblockhash, now):
         tmpl = json.loads(bcli("getblocktemplate", '{"rules":["signet","segwit"]}'))
         if tmpl["previousblockhash"] != bestblockhash:
-            logging.warning("GBT based off unexpected block (%s not %s), retrying", tmpl["previousblockhash"], bci["bestblockhash"])
+            logging.warning("GBT based off unexpected block (%s not %s), retrying", tmpl["previousblockhash"], bestblockhash)
             time.sleep(1)
             return None
 
diff --git a/depend/bitcoin/contrib/verify-commits/pre-push-hook.sh b/depend/bitcoin/contrib/verify-commits/pre-push-hook.sh
deleted file mode 100755
index a532bf74..00000000
--- a/depend/bitcoin/contrib/verify-commits/pre-push-hook.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2014-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.
-
-export LC_ALL=C
-if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)bitcoin/bitcoin(.git)?$ ]]; then
-    exit 0
-fi
-
-while read LINE; do
-    set -- A "$LINE"
-    if [ "$4" != "refs/heads/master" ]; then
-        continue
-    fi
-    if ! ./contrib/verify-commits/verify-commits.py "$3" > /dev/null 2>&1; then
-        echo "ERROR: A commit is not signed, can't push"
-        ./contrib/verify-commits/verify-commits.py
-        exit 1
-    fi
-done < /dev/stdin
diff --git a/depend/bitcoin/depends/Makefile b/depend/bitcoin/depends/Makefile
index c377187b..b55ac440 100644
--- a/depend/bitcoin/depends/Makefile
+++ b/depend/bitcoin/depends/Makefile
@@ -35,7 +35,6 @@ WORK_PATH = $(BASEDIR)/work
 BASE_CACHE ?= $(BASEDIR)/built
 SDK_PATH ?= $(BASEDIR)/SDKs
 NO_BOOST ?=
-NO_LIBEVENT ?=
 NO_QT ?=
 NO_QR ?=
 NO_WALLET ?=
@@ -154,8 +153,6 @@ $(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD
 
 boost_packages_$(NO_BOOST) = $(boost_packages)
 
-libevent_packages_$(NO_LIBEVENT) = $(libevent_packages)
-
 qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
 
 qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
@@ -167,7 +164,7 @@ zmq_packages_$(NO_ZMQ) = $(zmq_packages)
 ipc_packages_$(NO_IPC) = $(ipc_packages)
 usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)
 
-packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(usdt_packages_)
+packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(qt_packages_) $(wallet_packages_) $(usdt_packages_)
 native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) $(qt_native_packages_)
 
 ifneq ($(zmq_packages_),)
diff --git a/depend/bitcoin/depends/README.md b/depend/bitcoin/depends/README.md
index b12df135..83ebf8e2 100644
--- a/depend/bitcoin/depends/README.md
+++ b/depend/bitcoin/depends/README.md
@@ -53,6 +53,10 @@ To build dependencies for the current arch+OS:
 
     pkg_add bash cmake curl gmake gtar
 
+Skip the following packages if you don't intend to use the GUI and will build with [`NO_QT=1`](#dependency-options):
+
+    pkg_add bison ninja
+
 To build dependencies for the current arch+OS:
 
     gmake
@@ -90,7 +94,6 @@ The following can be set when running make: `make FOO=bar`
 - `C_STANDARD`: Set the C standard version used. Defaults to `c11`.
 - `CXX_STANDARD`: Set the C++ standard version used. Defaults to `c++20`.
 - `NO_BOOST`: Don't download/build/cache Boost
-- `NO_LIBEVENT`: Don't download/build/cache Libevent
 - `NO_QT`: Don't download/build/cache Qt and its dependencies
 - `NO_QR`: Don't download/build/cache packages needed for enabling qrencode
 - `NO_ZMQ`: Don't download/build/cache packages needed for enabling ZeroMQ
diff --git a/depend/bitcoin/depends/config.guess b/depend/bitcoin/depends/config.guess
index a9d01fde..c7f4c329 100755
--- a/depend/bitcoin/depends/config.guess
+++ b/depend/bitcoin/depends/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2025 Free Software Foundation, Inc.
+#   Copyright 1992-2026 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2025-07-10'
+timestamp='2026-05-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2025 Free Software Foundation, Inc.
+Copyright 1992-2026 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -150,7 +150,7 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case $UNAME_SYSTEM in
-Linux|GNU|GNU/*)
+Ironclad|Linux|GNU|GNU/*)
 	LIBC=unknown
 
 	set_cc_for_build
@@ -167,6 +167,8 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#elif defined(__LLVM_LIBC__)
 	LIBC=llvm
+	#elif defined(__mlibc__)
+	LIBC=mlibc
 	#else
 	#include <stdarg.h>
 	/* First heuristic to detect musl libc.  */
@@ -1186,6 +1188,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
+    sw_64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     tile*:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
@@ -1598,10 +1603,10 @@ EOF
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
     x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*)
-	GUESS=$UNAME_MACHINE-pc-ironclad-mlibc
+	GUESS=$UNAME_MACHINE-pc-ironclad-$LIBC
 	;;
     *:[Ii]ronclad:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc
+	GUESS=$UNAME_MACHINE-unknown-ironclad-$LIBC
 	;;
 esac
 
diff --git a/depend/bitcoin/depends/config.sub b/depend/bitcoin/depends/config.sub
index 3d35cde1..404aa082 100755
--- a/depend/bitcoin/depends/config.sub
+++ b/depend/bitcoin/depends/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2025 Free Software Foundation, Inc.
+#   Copyright 1992-2026 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
 
-timestamp='2025-07-10'
+timestamp='2026-05-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2025 Free Software Foundation, Inc.
+Copyright 1992-2026 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1432,6 +1432,7 @@ case $cpu-$vendor in
 			| sparcv9v \
 			| spu \
 			| sv1 \
+			| sw_64 \
 			| sx* \
 			| tahoe \
 			| thumbv7* \
@@ -1525,7 +1526,7 @@ EOF
 		;;
 	ironclad*)
 		kernel=ironclad
-		os=`echo "$basic_os" | sed -e 's|ironclad|mlibc|'`
+		os=`echo "$basic_os" | sed -e 's|ironclad|gnu|'`
 		;;
 	linux*)
 		kernel=linux
@@ -2220,7 +2221,7 @@ case $kernel-$os-$obj in
 		;;
 	uclinux-uclibc*- | uclinux-gnu*- )
 		;;
-	ironclad-mlibc*-)
+	ironclad-gnu*- | ironclad-mlibc*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
diff --git a/depend/bitcoin/depends/funcs.mk b/depend/bitcoin/depends/funcs.mk
index 60e7889a..f6221ef1 100644
--- a/depend/bitcoin/depends/funcs.mk
+++ b/depend/bitcoin/depends/funcs.mk
@@ -222,7 +222,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
                -DCMAKE_AR=`which $$($(1)_ar)` \
                -DCMAKE_NM=`which $$($(1)_nm)` \
                -DCMAKE_RANLIB=`which $$($(1)_ranlib)` \
-               -DCMAKE_INSTALL_LIBDIR=lib/ \
+               -DCMAKE_INSTALL_LIBDIR=lib \
                -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
                -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(V) \
                -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE \
diff --git a/depend/bitcoin/depends/gen_id b/depend/bitcoin/depends/gen_id
index 5504deeb..b9104c43 100755
--- a/depend/bitcoin/depends/gen_id
+++ b/depend/bitcoin/depends/gen_id
@@ -28,6 +28,10 @@
     # Redirect stderr to stdout
     exec 2>&1
 
+    # Unset SOURCE_DATE_EPOCH to prevent it from leaking into tool
+    # outputs and to maximize reuse of the built package cache.
+    unset SOURCE_DATE_EPOCH
+
     echo "BEGIN ALL"
 
     # Include any ID salts supplied via command line
diff --git a/depend/bitcoin/depends/hosts/freebsd.mk b/depend/bitcoin/depends/hosts/freebsd.mk
index 240180f2..ada5a449 100644
--- a/depend/bitcoin/depends/hosts/freebsd.mk
+++ b/depend/bitcoin/depends/hosts/freebsd.mk
@@ -1,26 +1,6 @@
-FREEBSD_VERSION ?= 15.0
-FREEBSD_SDK=$(SDK_PATH)/freebsd-$(host)-$(FREEBSD_VERSION)/
-
-clang_prog=$(shell command -v clang)
-clangxx_prog=$(shell command -v clang++)
-
-freebsd_AR=$(shell command -v llvm-ar)
-freebsd_NM=$(shell command -v llvm-nm)
-freebsd_OBJCOPY=$(shell command -v llvm-objcopy)
-freebsd_OBJDUMP=$(shell command -v llvm-objdump)
-freebsd_RANLIB=$(shell command -v llvm-ranlib)
-freebsd_STRIP=$(shell command -v llvm-strip)
-
-
-freebsd_CC=$(clang_prog) --target=$(host) \
-              --sysroot=$(FREEBSD_SDK)
-
-freebsd_CXX=$(clangxx_prog) --target=$(host) \
-              --sysroot=$(FREEBSD_SDK) -stdlib=libc++
-
 freebsd_CFLAGS=
 freebsd_CXXFLAGS=
-freebsd_LDFLAGS=-fuse-ld=lld
+freebsd_LDFLAGS=
 
 freebsd_release_CFLAGS=-O2
 freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
@@ -28,4 +8,25 @@ freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
 freebsd_debug_CFLAGS=-O1 -g
 freebsd_debug_CXXFLAGS=$(freebsd_debug_CFLAGS)
 
+ifeq (86,$(findstring 86,$(build_arch)))
+i686_freebsd_CC=clang -m32
+i686_freebsd_CXX=clang++ -m32
+i686_freebsd_AR=ar
+i686_freebsd_RANLIB=ranlib
+i686_freebsd_NM=nm
+i686_freebsd_STRIP=strip
+
+x86_64_freebsd_CC=clang -m64
+x86_64_freebsd_CXX=clang++ -m64
+x86_64_freebsd_AR=ar
+x86_64_freebsd_RANLIB=ranlib
+x86_64_freebsd_NM=nm
+x86_64_freebsd_STRIP=strip
+else
+i686_freebsd_CC=$(default_host_CC) -m32
+i686_freebsd_CXX=$(default_host_CXX) -m32
+x86_64_freebsd_CC=$(default_host_CC) -m64
+x86_64_freebsd_CXX=$(default_host_CXX) -m64
+endif
+
 freebsd_cmake_system_name=FreeBSD
diff --git a/depend/bitcoin/depends/hosts/netbsd.mk b/depend/bitcoin/depends/hosts/netbsd.mk
index 0e1256c3..df7a5ea9 100644
--- a/depend/bitcoin/depends/hosts/netbsd.mk
+++ b/depend/bitcoin/depends/hosts/netbsd.mk
@@ -1,5 +1,6 @@
 netbsd_CFLAGS=
 netbsd_CXXFLAGS=
+netbsd_LDFLAGS=
 
 ifneq ($(LTO),)
 netbsd_AR = $(host_toolchain)gcc-ar
diff --git a/depend/bitcoin/depends/hosts/openbsd.mk b/depend/bitcoin/depends/hosts/openbsd.mk
index 5ab3f53e..fe56d384 100644
--- a/depend/bitcoin/depends/hosts/openbsd.mk
+++ b/depend/bitcoin/depends/hosts/openbsd.mk
@@ -1,5 +1,6 @@
 openbsd_CFLAGS=
 openbsd_CXXFLAGS=
+openbsd_LDFLAGS=
 
 openbsd_release_CFLAGS=-O2
 openbsd_release_CXXFLAGS=$(openbsd_release_CFLAGS)
diff --git a/depend/bitcoin/depends/packages/boost.mk b/depend/bitcoin/depends/packages/boost.mk
index 5be0e60b..81d5ef5f 100644
--- a/depend/bitcoin/depends/packages/boost.mk
+++ b/depend/bitcoin/depends/packages/boost.mk
@@ -1,8 +1,8 @@
 package=boost
-$(package)_version = 1.90.0
+$(package)_version = 1.91.0-1
 $(package)_download_path = https://github.com/boostorg/boost/releases/download/boost-$($(package)_version)
 $(package)_file_name = boost-$($(package)_version)-cmake.tar.gz
-$(package)_sha256_hash = 913ca43d49e93d1b158c9862009add1518a4c665e7853b349a6492d158b036d4
+$(package)_sha256_hash = 8a82bd11a720c70923806c36ee5c26dbd2d630c1eaa1d8fad9a7bd5529908a26
 $(package)_build_subdir = build
 
 define $(package)_set_vars
diff --git a/depend/bitcoin/depends/packages/freetype.mk b/depend/bitcoin/depends/packages/freetype.mk
index b34edc60..74d5e42a 100644
--- a/depend/bitcoin/depends/packages/freetype.mk
+++ b/depend/bitcoin/depends/packages/freetype.mk
@@ -5,6 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b
 $(package)_build_subdir=build
 $(package)_patches += cmake_minimum.patch
+$(package)_patches += openbsd_versioning.patch
 
 define $(package)_set_vars
   $(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DBUILD_SHARED_LIBS=TRUE
@@ -14,7 +15,8 @@ define $(package)_set_vars
 endef
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch
+  patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch && \
+  patch -p1 < $($(package)_patch_dir)/openbsd_versioning.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depend/bitcoin/depends/packages/libevent.mk b/depend/bitcoin/depends/packages/libevent.mk
deleted file mode 100644
index 33eeed55..00000000
--- a/depend/bitcoin/depends/packages/libevent.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-package=libevent
-$(package)_version=2.1.12-stable
-$(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
-$(package)_patches=cmake_fixups.patch
-$(package)_patches += netbsd_fixup.patch
-$(package)_patches += winver_fixup.patch
-$(package)_build_subdir=build
-
-# When building for Windows, we set _WIN32_WINNT to target the same Windows
-# version as we do in releases. Due to quirks in libevents build system, this
-# is also required to enable support for ipv6. See #19375.
-define $(package)_set_vars
-  $(package)_config_opts=-DCMAKE_BUILD_TYPE=None -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON
-  $(package)_config_opts+=-DEVENT__DISABLE_SAMPLES=ON -DEVENT__DISABLE_REGRESS=ON
-  $(package)_config_opts+=-DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=STATIC
-  $(package)_cflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
-  $(package)_cppflags += -D_GNU_SOURCE -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
-  $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0A00
-endef
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/cmake_fixups.patch && \
-  patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch && \
-  patch -p1 < $($(package)_patch_dir)/winver_fixup.patch
-endef
-
-define $(package)_config_cmds
-  $($(package)_cmake) -S .. -B .
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf bin lib/pkgconfig && \
-  rm include/ev*.h && \
-  rm include/event2/*_compat.h && \
-  rm lib/libevent.a
-endef
diff --git a/depend/bitcoin/depends/packages/native_capnp.mk b/depend/bitcoin/depends/packages/native_capnp.mk
index d65a8b97..f207421d 100644
--- a/depend/bitcoin/depends/packages/native_capnp.mk
+++ b/depend/bitcoin/depends/packages/native_capnp.mk
@@ -1,9 +1,9 @@
 package=native_capnp
-$(package)_version=1.4.0
+$(package)_version=1.5.0
 $(package)_download_path=https://capnproto.org/
 $(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
 $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
-$(package)_sha256_hash=fa02378ad522b318916b9ad928d1372fc9abd43dd1f4f0392e50450f5c87828f
+$(package)_sha256_hash=77dbc13ca82d9c87ddb4581dd49559d45b63096433d3dadea08b7f31b360a5ba
 
 define $(package)_set_vars
   $(package)_config_opts := -DBUILD_TESTING=OFF
diff --git a/depend/bitcoin/depends/packages/native_qt.mk b/depend/bitcoin/depends/packages/native_qt.mk
index 2bf088c1..913d0fc4 100644
--- a/depend/bitcoin/depends/packages/native_qt.mk
+++ b/depend/bitcoin/depends/packages/native_qt.mk
@@ -10,6 +10,7 @@ $(package)_patches += qtbase_skip_tools.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += qttools_skip_dependencies.patch
 $(package)_patches += fix-macos26-qyield.patch
+$(package)_patches += fix_missed_headers.patch
 
 $(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
 $(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
@@ -94,6 +95,7 @@ $(package)_config_env += OBJCXX="$$(build_CXX)"
 endif
 
 $(package)_cmake_opts := -DCMAKE_EXE_LINKER_FLAGS="$$(build_LDFLAGS)"
+$(package)_cmake_opts += -DCMAKE_AR="$$(build_AR)"
 ifneq ($(V),)
 $(package)_cmake_opts += --log-level=STATUS
 endif
@@ -139,7 +141,8 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
   patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch && \
-  patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch
+  patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch && \
+  patch -p1 -i $($(package)_patch_dir)/fix_missed_headers.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depend/bitcoin/depends/packages/packages.mk b/depend/bitcoin/depends/packages/packages.mk
index 22ae4787..f50b45d0 100644
--- a/depend/bitcoin/depends/packages/packages.mk
+++ b/depend/bitcoin/depends/packages/packages.mk
@@ -2,15 +2,15 @@ packages:=
 
 boost_packages = boost
 
-libevent_packages = libevent
-
 qrencode_linux_packages = qrencode
 qrencode_freebsd_packages = qrencode
+qrencode_openbsd_packages = qrencode
 qrencode_darwin_packages = qrencode
 qrencode_mingw32_packages = qrencode
 
 qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_cursor libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 qt_freebsd_packages:=$(qt_linux_packages)
+qt_openbsd_packages:=$(qt_linux_packages)
 qt_darwin_packages=qt
 qt_mingw32_packages=qt
 ifneq ($(host),$(build))
diff --git a/depend/bitcoin/depends/packages/qrencode.mk b/depend/bitcoin/depends/packages/qrencode.mk
index e3f61409..da3aafea 100644
--- a/depend/bitcoin/depends/packages/qrencode.mk
+++ b/depend/bitcoin/depends/packages/qrencode.mk
@@ -30,5 +30,5 @@ define $(package)_stage_cmds
 endef
 
 define $(package)_postprocess_cmds
-  rm -rf share
+  rm -rf share lib/pkgconfig
 endef
diff --git a/depend/bitcoin/depends/packages/qt.mk b/depend/bitcoin/depends/packages/qt.mk
index 9b7cec34..cd4c3cc7 100644
--- a/depend/bitcoin/depends/packages/qt.mk
+++ b/depend/bitcoin/depends/packages/qt.mk
@@ -9,11 +9,11 @@ $(package)_dependencies := native_$(package)
 endif
 $(package)_linux_dependencies := freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_cursor libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 $(package)_freebsd_dependencies := $($(package)_linux_dependencies)
+$(package)_openbsd_dependencies := $($(package)_linux_dependencies)
 $(package)_patches_path := $(qt_details_patches_path)
 $(package)_patches := cocoa_compat.patch
 $(package)_patches += dont_hardcode_pwd.patch
 $(package)_patches += qtbase_avoid_qmain.patch
-$(package)_patches += qtbase_platformsupport.patch
 $(package)_patches += qtbase_plugins_cocoa.patch
 $(package)_patches += qtbase_skip_tools.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
@@ -26,6 +26,9 @@ $(package)_patches += fix-gcc16-sfinae-qbitarray.patch
 $(package)_patches += fix-gcc16-sfinae-qanystringview.patch
 $(package)_patches += fix-macos26-qyield.patch
 $(package)_patches += fix-qbytearray-include.patch
+$(package)_patches += fix_openbsd_network_kernel.patch
+$(package)_patches += fix_openbsd_plugin_qelfparser.patch
+$(package)_patches += fix_missed_headers.patch
 
 $(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
 $(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
@@ -158,6 +161,7 @@ $(package)_config_opts_linux += -ltcg
 endif
 $(package)_config_opts_freebsd := $$($(package)_config_opts_linux)
 $(package)_config_opts_freebsd += -no-feature-inotify
+$(package)_config_opts_openbsd := $$($(package)_config_opts_linux)
 
 $(package)_config_opts_mingw32 := -no-dbus
 $(package)_config_opts_mingw32 += -no-feature-freetype
@@ -177,7 +181,11 @@ $(package)_cmake_opts += --log-level=STATUS
 endif
 
 $(package)_cmake_opts += -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON
-$(package)_cmake_opts += -DCMAKE_C_FLAGS="$$($(package)_cppflags) $$($$($(package)_type)_CFLAGS) -ffile-prefix-map=$$($(package)_extract_dir)=/usr"
+# The bundled libpng 1.6.49 in Qt 6.8.4 introduced support for
+# the RISC-V Vector Extension (RVV). However, the resulting library
+# fails to link when cross-compiling for riscv64-linux-gnu.
+# Disable this feature for now.
+$(package)_cmake_opts += -DCMAKE_C_FLAGS="$$($(package)_cppflags) -DPNG_RISCV_RVV_OPT=0 $$($$($(package)_type)_CFLAGS) -ffile-prefix-map=$$($(package)_extract_dir)=/usr"
 $(package)_cmake_opts += -DCMAKE_C_FLAGS_RELEASE="$$($$($(package)_type)_release_CFLAGS)"
 $(package)_cmake_opts += -DCMAKE_C_FLAGS_DEBUG="$$($$($(package)_type)_debug_CFLAGS)"
 $(package)_cmake_opts += -DCMAKE_CXX_FLAGS="$$($(package)_cppflags) $$($$($(package)_type)_CXXFLAGS) -ffile-prefix-map=$$($(package)_extract_dir)=/usr"
@@ -194,6 +202,7 @@ endif
 $(package)_cmake_opts += -DCMAKE_EXE_LINKER_FLAGS="$$($$($(package)_type)_LDFLAGS)"
 $(package)_cmake_opts += -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$$($$($(package)_type)_release_LDFLAGS)"
 $(package)_cmake_opts += -DCMAKE_EXE_LINKER_FLAGS_DEBUG="$$($$($(package)_type)_debug_LDFLAGS)"
+$(package)_cmake_opts += -DCMAKE_AR="$$($(package)_ar)"
 
 ifneq ($(host),$(build))
 $(package)_cmake_opts += -DCMAKE_SYSTEM_NAME=$($(host_os)_cmake_system_name)
@@ -208,7 +217,7 @@ $(package)_cmake_opts += -DCMAKE_DISABLE_FIND_PACKAGE_WrapSystemDoubleConversion
 $(package)_cmake_opts += -DCMAKE_DISABLE_FIND_PACKAGE_WrapSystemMd4c=TRUE
 $(package)_cmake_opts += -DCMAKE_DISABLE_FIND_PACKAGE_WrapZSTD=TRUE
 endif
-ifeq ($(host_os),linux)
+ifneq (,$(filter linux openbsd,$(host_os)))
 # The `-dbus-runtime` configure option does not work
 # https://qt-project.atlassian.net/browse/QTBUG-144864
 $(package)_cmake_opts += -DINPUT_dbus=runtime
@@ -273,7 +282,6 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/cocoa_compat.patch && \
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_avoid_qmain.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtbase_platformsupport.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_plugins_cocoa.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
@@ -284,7 +292,10 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qbitarray.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qanystringview.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch && \
-  patch -p1 -i $($(package)_patch_dir)/fix-qbytearray-include.patch
+  patch -p1 -i $($(package)_patch_dir)/fix-qbytearray-include.patch && \
+  patch -p1 -i $($(package)_patch_dir)/fix_openbsd_network_kernel.patch && \
+  patch -p1 -i $($(package)_patch_dir)/fix_openbsd_plugin_qelfparser.patch && \
+  patch -p1 -i $($(package)_patch_dir)/fix_missed_headers.patch
 endef
 ifeq ($(host),$(build))
   $(package)_preprocess_cmds += && patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch
diff --git a/depend/bitcoin/depends/packages/qt_details.mk b/depend/bitcoin/depends/packages/qt_details.mk
index e49ac6a2..1808f342 100644
--- a/depend/bitcoin/depends/packages/qt_details.mk
+++ b/depend/bitcoin/depends/packages/qt_details.mk
@@ -1,19 +1,19 @@
-qt_details_version := 6.8.3
+qt_details_version := 6.8.4
 qt_details_download_path := https://download.qt.io/archive/qt/6.8/$(qt_details_version)/submodules
-qt_details_suffix := everywhere-src-$(qt_details_version).tar.xz
+qt_details_suffix := everywhere-opensource-src-$(qt_details_version).tar.xz
 
 qt_details_qtbase_file_name := qtbase-$(qt_details_suffix)
-qt_details_qtbase_sha256_hash := 56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80
+qt_details_qtbase_sha256_hash := 532dfbf3fa3cbc68fa37441ea9e81c5009da044eaecda78ffaeafd8bd125532f
 
 qt_details_qttranslations_file_name := qttranslations-$(qt_details_suffix)
-qt_details_qttranslations_sha256_hash := c3c61d79c3d8fe316a20b3617c64673ce5b5519b2e45535f49bee313152fa531
+qt_details_qttranslations_sha256_hash := 33b1fd1d75598cbf54da12263957f18292c9fb01e42fcc3ab9bd2f8ac79763b7
 
 qt_details_qttools_file_name := qttools-$(qt_details_suffix)
-qt_details_qttools_sha256_hash := 02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a
+qt_details_qttools_sha256_hash := c6030ea66d7be1ca7e3b40578beb35b0f4ff4014277d8e051d3219759f6ab399
 
 qt_details_patches_path := $(PATCHES_PATH)/qt
 
-qt_details_top_download_path := https://raw.githubusercontent.com/qt/qt5/refs/heads/$(qt_details_version)
+qt_details_top_download_path := https://raw.githubusercontent.com/qt/qt5/refs/tags/v$(qt_details_version)-lts-lgpl
 qt_details_top_cmakelists_file_name := CMakeLists.txt
 qt_details_top_cmakelists_download_file := $(qt_details_top_cmakelists_file_name)
 qt_details_top_cmakelists_sha256_hash := 54e9a4e554da37792446dda4f52bc308407b01a34bcc3afbad58e4e0f71fac9b
diff --git a/depend/bitcoin/depends/packages/zeromq.mk b/depend/bitcoin/depends/packages/zeromq.mk
index 8bf84b1f..ab10e6c2 100644
--- a/depend/bitcoin/depends/packages/zeromq.mk
+++ b/depend/bitcoin/depends/packages/zeromq.mk
@@ -11,6 +11,7 @@ $(package)_patches += openbsd_kqueue_headers.patch
 $(package)_patches += cmake_minimum.patch
 $(package)_patches += cacheline_undefined.patch
 $(package)_patches += no_librt.patch
+$(package)_patches += add_new_include.patch
 
 define $(package)_set_vars
   $(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DWITH_DOCS=OFF -DWITH_LIBSODIUM=OFF
@@ -28,7 +29,8 @@ define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \
   patch -p1 < $($(package)_patch_dir)/openbsd_kqueue_headers.patch && \
   patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch && \
-  patch -p1 < $($(package)_patch_dir)/no_librt.patch
+  patch -p1 < $($(package)_patch_dir)/no_librt.patch && \
+  patch -p1 < $($(package)_patch_dir)/add_new_include.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depend/bitcoin/depends/patches/freetype/openbsd_versioning.patch b/depend/bitcoin/depends/patches/freetype/openbsd_versioning.patch
new file mode 100644
index 00000000..ea5cffef
--- /dev/null
+++ b/depend/bitcoin/depends/patches/freetype/openbsd_versioning.patch
@@ -0,0 +1,31 @@
+[cmake] Fix shared library versioning on OpenBSD.
+
+This emulates Libtool to make sure Libtool and CMake agree on the ABI
+version. Specifically, for OpenBSD, `builds/unix/configure` defines
+`version_type=sunos` and skips defining `soname_spec`.
+
+See upstream MR: https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/433.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -458,9 +458,17 @@ if (WIN32)
+ endif ()
+ 
+ if (BUILD_SHARED_LIBS)
+-  set_target_properties(freetype PROPERTIES
+-    VERSION ${LIBRARY_VERSION}
+-    SOVERSION ${LIBRARY_SOVERSION})
++  if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
++    # For OpenBSD, libtool follows `sunos` version type.
++    set_target_properties(freetype PROPERTIES
++      # libtool does not define its internal `soname_spec` variable
++      # for OpenBSD. So skipping the SOVERSION option.
++      VERSION ${LIBTOOL_CURRENT}.${LIBTOOL_REVISION})
++  else ()
++    set_target_properties(freetype PROPERTIES
++      VERSION ${LIBRARY_VERSION}
++      SOVERSION ${LIBRARY_SOVERSION})
++  endif ()
+ endif ()
+ 
+ # Pick up ftconfig.h and ftoption.h generated above, first.
diff --git a/depend/bitcoin/depends/patches/libevent/cmake_fixups.patch b/depend/bitcoin/depends/patches/libevent/cmake_fixups.patch
deleted file mode 100644
index a8812afd..00000000
--- a/depend/bitcoin/depends/patches/libevent/cmake_fixups.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake: set minimum version to 3.5
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,7 +19,7 @@
- #       start libevent.sln
- #
- 
--cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
- 
- if (POLICY CMP0054)
-     cmake_policy(SET CMP0054 NEW)
diff --git a/depend/bitcoin/depends/patches/libevent/netbsd_fixup.patch b/depend/bitcoin/depends/patches/libevent/netbsd_fixup.patch
deleted file mode 100644
index 21d96aaf..00000000
--- a/depend/bitcoin/depends/patches/libevent/netbsd_fixup.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Improve portability on NetBSD
-
-According to GCC documentation, "the various `-std` options disable
-certain keywords".
-This change adheres to GCC's recommendation by replacing the `typeof`
-keyword with its alternative, `__typeof__`.
-
-See https://github.com/libevent/libevent/commit/1759485e9a59147a47a674f5132fcfe764e7748c.
-
-
---- a/kqueue.c
-+++ b/kqueue.c
-@@ -52,8 +52,8 @@
-  * intptr_t, whereas others define it as void*.  There doesn't seem to be an
-  * easy way to tell them apart via autoconf, so we need to use OS macros. */
- #if defined(__NetBSD__)
--#define PTR_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(x))
--#define INT_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(intptr_t)(x))
-+#define PTR_TO_UDATA(x) ((__typeof__(((struct kevent *)0)->udata))(x))
-+#define INT_TO_UDATA(x) ((__typeof__(((struct kevent *)0)->udata))(intptr_t)(x))
- #elif defined(EVENT__HAVE_INTTYPES_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__darwin__) && !defined(__APPLE__) && !defined(__CloudABI__)
- #define PTR_TO_UDATA(x)	((intptr_t)(x))
- #define INT_TO_UDATA(x) ((intptr_t)(x))
diff --git a/depend/bitcoin/depends/patches/libevent/winver_fixup.patch b/depend/bitcoin/depends/patches/libevent/winver_fixup.patch
deleted file mode 100644
index 4995c356..00000000
--- a/depend/bitcoin/depends/patches/libevent/winver_fixup.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Cherry-picked from a14ff91254f40cf36e0fee199e26fb11260fab49.
-
-move _WIN32_WINNT defintions before first #include
-
-_WIN32_WINNT and WIN32_LEAN_AND_MEAN need to be defined
-before the windows.h is included for the first time.
-Avoid the confusion of indirect #include by defining
-before any.
-
-diff --git a/event_iocp.c b/event_iocp.c
-index 6b2a2e15..4955e426 100644
---- a/event_iocp.c
-+++ b/event_iocp.c
-@@ -23,12 +23,14 @@
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
--#include "evconfig-private.h"
- 
- #ifndef _WIN32_WINNT
- /* Minimum required for InitializeCriticalSectionAndSpinCount */
- #define _WIN32_WINNT 0x0403
- #endif
-+
-+#include "evconfig-private.h"
-+
- #include <winsock2.h>
- #include <windows.h>
- #include <process.h>
-diff --git a/evthread_win32.c b/evthread_win32.c
-index 2ec80560..8647f72b 100644
---- a/evthread_win32.c
-+++ b/evthread_win32.c
-@@ -23,18 +23,21 @@
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
--#include "event2/event-config.h"
--#include "evconfig-private.h"
- 
- #ifdef _WIN32
- #ifndef _WIN32_WINNT
- /* Minimum required for InitializeCriticalSectionAndSpinCount */
- #define _WIN32_WINNT 0x0403
- #endif
--#include <winsock2.h>
- #define WIN32_LEAN_AND_MEAN
-+#endif
-+
-+#include "event2/event-config.h"
-+#include "evconfig-private.h"
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
- #include <windows.h>
--#undef WIN32_LEAN_AND_MEAN
- #include <sys/locking.h>
- #endif
- 
-diff --git a/evutil.c b/evutil.c
-index 9817f086..8537ffe8 100644
---- a/evutil.c
-+++ b/evutil.c
-@@ -24,6 +24,14 @@
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#ifdef _WIN32
-+#ifndef _WIN32_WINNT
-+/* For structs needed by GetAdaptersAddresses */
-+#define _WIN32_WINNT 0x0501
-+#endif
-+#define WIN32_LEAN_AND_MEAN
-+#endif
-+
- #include "event2/event-config.h"
- #include "evconfig-private.h"
- 
-@@ -31,15 +39,10 @@
- #include <winsock2.h>
- #include <winerror.h>
- #include <ws2tcpip.h>
--#define WIN32_LEAN_AND_MEAN
- #include <windows.h>
--#undef WIN32_LEAN_AND_MEAN
- #include <io.h>
- #include <tchar.h>
- #include <process.h>
--#undef _WIN32_WINNT
--/* For structs needed by GetAdaptersAddresses */
--#define _WIN32_WINNT 0x0501
- #include <iphlpapi.h>
- #include <netioapi.h>
- #endif
-diff --git a/listener.c b/listener.c
-index f5c00c9c..d1080e76 100644
---- a/listener.c
-+++ b/listener.c
-@@ -24,16 +24,19 @@
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#ifdef _WIN32
-+#ifndef _WIN32_WINNT
-+/* Minimum required for InitializeCriticalSectionAndSpinCount */
-+#define _WIN32_WINNT 0x0403
-+#endif
-+#endif
-+
- #include "event2/event-config.h"
- #include "evconfig-private.h"
- 
- #include <sys/types.h>
- 
- #ifdef _WIN32
--#ifndef _WIN32_WINNT
--/* Minimum required for InitializeCriticalSectionAndSpinCount */
--#define _WIN32_WINNT 0x0403
--#endif
- #include <winsock2.h>
- #include <winerror.h>
- #include <ws2tcpip.h>
diff --git a/depend/bitcoin/depends/patches/qt/fix-gcc16-qcompare.patch b/depend/bitcoin/depends/patches/qt/fix-gcc16-qcompare.patch
index e56f610a..c2c1100a 100644
--- a/depend/bitcoin/depends/patches/qt/fix-gcc16-qcompare.patch
+++ b/depend/bitcoin/depends/patches/qt/fix-gcc16-qcompare.patch
@@ -105,7 +105,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
  namespace Qt {
  
  class weak_ordering;
-@@ -157,12 +183,18 @@ public:
+@@ -156,12 +182,18 @@ public:
      constexpr Q_IMPLICIT operator std::partial_ordering() const noexcept
      {
          static_assert(sizeof(*this) == sizeof(std::partial_ordering));
@@ -127,7 +127,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
          switch (m_order) {
          case qToUnderlying(O::Less):        return R::less;
          case qToUnderlying(O::Greater):     return R::greater;
-@@ -170,7 +202,6 @@ public:
+@@ -169,7 +201,6 @@ public:
          case qToUnderlying(U::Unordered):   return R::unordered;
          }
          Q_UNREACHABLE_RETURN(R::unordered);
@@ -135,7 +135,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
      }
  
      friend constexpr bool operator==(partial_ordering lhs, std::partial_ordering rhs) noexcept
-@@ -349,18 +380,18 @@ public:
+@@ -347,18 +378,18 @@ public:
      constexpr Q_IMPLICIT operator std::weak_ordering() const noexcept
      {
          static_assert(sizeof(*this) == sizeof(std::weak_ordering));
@@ -158,7 +158,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
      }
  
      friend constexpr bool operator==(weak_ordering lhs, std::weak_ordering rhs) noexcept
-@@ -547,18 +578,18 @@ public:
+@@ -542,18 +573,18 @@ public:
      constexpr Q_IMPLICIT operator std::strong_ordering() const noexcept
      {
          static_assert(sizeof(*this) == sizeof(std::strong_ordering));
@@ -181,7 +181,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
      }
  
      friend constexpr bool operator==(strong_ordering lhs, std::strong_ordering rhs) noexcept
-@@ -625,6 +656,8 @@ inline constexpr strong_ordering strong_ordering::greater(QtPrivate::Ordering::G
+@@ -620,6 +651,8 @@ inline constexpr strong_ordering strong_ordering::greater(QtPrivate::Ordering::G
  
  } // namespace Qt
  
diff --git a/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qanystringview.patch b/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qanystringview.patch
index 11c27949..42f13ebb 100644
--- a/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qanystringview.patch
+++ b/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qanystringview.patch
@@ -19,7 +19,7 @@ diff --git a/qtbase/src/corelib/text/qanystringview.cpp b/qtbase/src/corelib/tex
 index 7bf8a3fa1fd..3c993ff1da0 100644
 --- a/qtbase/src/corelib/text/qanystringview.cpp
 +++ b/qtbase/src/corelib/text/qanystringview.cpp
-@@ -243,6 +243,10 @@ QT_BEGIN_NAMESPACE
+@@ -355,6 +355,10 @@ QT_BEGIN_NAMESPACE
      \sa isNull(), isEmpty()
  */
  
diff --git a/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qchar.patch b/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qchar.patch
index 888e128c..e8afea81 100644
--- a/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qchar.patch
+++ b/depend/bitcoin/depends/patches/qt/fix-gcc16-sfinae-qchar.patch
@@ -37,7 +37,7 @@ diff --git a/qtbase/src/corelib/kernel/qmetatype.cpp b/qtbase/src/corelib/kernel
 index e70583404a46..54a0fe671fe0 100644
 --- a/qtbase/src/corelib/kernel/qmetatype.cpp
 +++ b/qtbase/src/corelib/kernel/qmetatype.cpp
-@@ -1212,7 +1212,7 @@ QT_WARNING_DISABLE_CLANG("-Wtautological-compare")
+@@ -1230,7 +1230,7 @@ QT_WARNING_DISABLE_CLANG("-Wtautological-compare")
              return true;
          );
          QMETATYPE_CONVERTER(QString, Char32,
diff --git a/depend/bitcoin/depends/patches/qt/fix_missed_headers.patch b/depend/bitcoin/depends/patches/qt/fix_missed_headers.patch
new file mode 100644
index 00000000..1fda902c
--- /dev/null
+++ b/depend/bitcoin/depends/patches/qt/fix_missed_headers.patch
@@ -0,0 +1,32 @@
+QXcbAtom: add missing <cstdlib> #include
+
+Clang 21 complained about free() being an undefined identifier.
+
+See: https://codereview.qt-project.org/c/qt/qtbase/+/686891
+
+--- a/qtbase/src/plugins/platforms/xcb/qxcbatom.cpp
++++ b/qtbase/src/plugins/platforms/xcb/qxcbatom.cpp
+@@ -7,6 +7,7 @@
+ #include <string.h>
+ 
+ #include <algorithm>
++#include <cstdlib>
+ 
+ static const char *xcb_atomnames = {
+     // window-manager <-> client protocols
+
+
+syncqt.cpp: Include <algorithm> for std::transform
+
+See: https://codereview.qt-project.org/c/qt/qtbase/+/673183
+
+--- a/qtbase/src/tools/syncqt/main.cpp
++++ b/qtbase/src/tools/syncqt/main.cpp
+@@ -15,6 +15,7 @@
+  * pre-defined list of header files.
+  */
+ 
++#include <algorithm>
+ #include <iostream>
+ #include <fstream>
+ #include <string>
diff --git a/depend/bitcoin/depends/patches/qt/fix_openbsd_network_kernel.patch b/depend/bitcoin/depends/patches/qt/fix_openbsd_network_kernel.patch
new file mode 100644
index 00000000..2a5a4ac2
--- /dev/null
+++ b/depend/bitcoin/depends/patches/qt/fix_openbsd_network_kernel.patch
@@ -0,0 +1,31 @@
+Fix compiling on OpenBSD
+
+1. The `net/if_types.h` header does not define the `IFT_STF` symbol.
+2. The `netinet6/in6_var.h` header defines some of the used symbols.
+
+For the reference, see:
+ - https://codeberg.org/OpenBSD/ports/src/commit/f8f1aedbe8aff550c69930b5d92b9c392e298382/x11/qt6/qtbase/patches/patch-src_network_kernel_qnetworkinterface_unix_cpp
+
+
+--- a/qtbase/src/network/kernel/qnetworkinterface_unix.cpp
++++ b/qtbase/src/network/kernel/qnetworkinterface_unix.cpp
+@@ -392,6 +392,9 @@ QT_BEGIN_INCLUDE_NAMESPACE
+ #  include <net/if_media.h>
+ #  include <net/if_types.h>
+ #  include <netinet/in_var.h>
++#  ifdef Q_OS_OPENBSD
++#    include <netinet6/in6_var.h>
++#  endif
+ #endif // QT_PLATFORM_UIKIT
+ QT_END_INCLUDE_NAMESPACE
+ 
+@@ -419,7 +422,9 @@ static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, stru
+         return QNetworkInterface::Ieee1394;
+ 
+     case IFT_GIF:
++#ifndef Q_OS_OPENBSD
+     case IFT_STF:
++#endif
+         return QNetworkInterface::Virtual;
+     }
+ 
diff --git a/depend/bitcoin/depends/patches/qt/fix_openbsd_plugin_qelfparser.patch b/depend/bitcoin/depends/patches/qt/fix_openbsd_plugin_qelfparser.patch
new file mode 100644
index 00000000..1b32e45f
--- /dev/null
+++ b/depend/bitcoin/depends/patches/qt/fix_openbsd_plugin_qelfparser.patch
@@ -0,0 +1,20 @@
+Fix compiling on OpenBSD
+
+Avoid use of undeclared identifier `ELFOSABI_AIX`.
+
+For the reference, see:
+ - https://codeberg.org/OpenBSD/ports/src/commit/c5e4088b89277b96d840492f9961b1593182b99c/x11/qt6/qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp
+
+
+--- a/qtbase/src/corelib/plugin/qelfparser_p.cpp
++++ b/qtbase/src/corelib/plugin/qelfparser_p.cpp
+@@ -341,7 +341,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
+     case ELFOSABI_NETBSD:   d << " (NetBSD"; break;
+     case ELFOSABI_LINUX:    d << " (GNU/Linux"; break;
+     case ELFOSABI_SOLARIS:  d << " (Solaris"; break;
++#ifndef Q_OS_OPENBSD
+     case ELFOSABI_AIX:      d << " (AIX"; break;
++#endif
+     case ELFOSABI_IRIX:     d << " (IRIX"; break;
+     case ELFOSABI_FREEBSD:  d << " (FreeBSD"; break;
+     case ELFOSABI_OPENBSD:  d << " (OpenBSD"; break;
diff --git a/depend/bitcoin/depends/patches/qt/qtbase_platformsupport.patch b/depend/bitcoin/depends/patches/qt/qtbase_platformsupport.patch
deleted file mode 100644
index 45ccaea5..00000000
--- a/depend/bitcoin/depends/patches/qt/qtbase_platformsupport.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-CMake: Prevent creation of empty InputSupportPrivate module
-
-The combination of
-    -no-feature-evdev
-    -no-feature-tslib
-    -no-feature-libinput
-led to the creation of the InputSupportPrivate module without source
-files.
-
-This triggered CMake upstream issue 23464 when using CMake < 3.25.
-
-Fix this by adjusting the inexact condition that decides whether to
-build InputSupportPrivate.
-
-
-See: https://codereview.qt-project.org/c/qt/qtbase/+/633612
-
-
---- a/qtbase/src/platformsupport/CMakeLists.txt
-+++ b/qtbase/src/platformsupport/CMakeLists.txt
-@@ -3,7 +3,12 @@
- 
- add_subdirectory(devicediscovery)
- add_subdirectory(fbconvenience)
--if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
-+if(QT_FEATURE_evdev
-+    OR QT_FEATURE_vxworksevdev
-+    OR QT_FEATURE_integrityhid
-+    OR QT_FEATURE_libinput
-+    OR QT_FEATURE_tslib
-+    OR (QT_FEATURE_libinput AND QT_FEATURE_xkbcommon))
-     add_subdirectory(input)
- endif()
- if(QT_FEATURE_kms)
diff --git a/depend/bitcoin/depends/patches/qt/qtbase_plugins_cocoa.patch b/depend/bitcoin/depends/patches/qt/qtbase_plugins_cocoa.patch
index 2b0cc509..1f055353 100644
--- a/depend/bitcoin/depends/patches/qt/qtbase_plugins_cocoa.patch
+++ b/depend/bitcoin/depends/patches/qt/qtbase_plugins_cocoa.patch
@@ -8,7 +8,7 @@ See: https://codereview.qt-project.org/c/qt/qtbase/+/634002
 
 --- a/qtbase/src/plugins/platforms/cocoa/CMakeLists.txt
 +++ b/qtbase/src/plugins/platforms/cocoa/CMakeLists.txt
-@@ -107,3 +107,10 @@ qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionma
+@@ -108,3 +108,10 @@ qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionma
      SOURCES
          qcocoasessionmanager.cpp qcocoasessionmanager.h
  )
diff --git a/depend/bitcoin/depends/patches/qt/qtbase_skip_tools.patch b/depend/bitcoin/depends/patches/qt/qtbase_skip_tools.patch
index eef65425..77cb3e3f 100644
--- a/depend/bitcoin/depends/patches/qt/qtbase_skip_tools.patch
+++ b/depend/bitcoin/depends/patches/qt/qtbase_skip_tools.patch
@@ -9,7 +9,7 @@ Skip building/installing unneeded tools:
 
 --- a/qtbase/cmake/QtBaseGlobalTargets.cmake
 +++ b/qtbase/cmake/QtBaseGlobalTargets.cmake
-@@ -118,9 +118,6 @@ qt_generate_global_module_pri_file()
+@@ -128,9 +128,6 @@ qt_generate_global_module_pri_file()
  qt_generate_global_device_pri_file()
  qt_generate_qmake_and_qtpaths_wrapper_for_target()
  
@@ -19,7 +19,7 @@ Skip building/installing unneeded tools:
  
  qt_internal_add_platform_internal_target(GlobalConfigPrivate)
  target_link_libraries(GlobalConfigPrivate INTERFACE GlobalConfig)
-@@ -390,12 +387,3 @@ elseif(WASM)
+@@ -400,12 +397,3 @@ elseif(WASM)
      qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-wasmtestrunner.py"
          DESTINATION "${INSTALL_LIBEXECDIR}")
  endif()
diff --git a/depend/bitcoin/depends/patches/zeromq/add_new_include.patch b/depend/bitcoin/depends/patches/zeromq/add_new_include.patch
new file mode 100644
index 00000000..0bf987f6
--- /dev/null
+++ b/depend/bitcoin/depends/patches/zeromq/add_new_include.patch
@@ -0,0 +1,123 @@
+commit 2e8a6ccb414ca79636392604893c79c3b0d00dc4
+Author: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
+Date:   Sat Jul 4 09:11:11 2026 +0200
+
+    Add missing <new> includes for std::nothrow
+    
+    Without the <new> include, compilation may fail:
+    
+    ```
+    src/polling_util.hpp:28:30: error: no member named 'nothrow' in namespace 'std'
+       28 |             _buf = new (std::nothrow) T[nitems_];
+          |                              ^~~~~~~
+    ```
+
+diff --git a/src/norm_engine.cpp b/src/norm_engine.cpp
+index 1e3ae179..02483f0b 100644
+--- a/src/norm_engine.cpp
++++ b/src/norm_engine.cpp
+@@ -1,6 +1,7 @@
+ 
+ #include "precompiled.hpp"
+ 
++#include <new>
+ #include "platform.hpp"
+ 
+ #if defined ZMQ_HAVE_NORM
+diff --git a/src/polling_util.hpp b/src/polling_util.hpp
+index 13a4911f..3536be9a 100644
+--- a/src/polling_util.hpp
++++ b/src/polling_util.hpp
+@@ -4,6 +4,7 @@
+ #define __ZMQ_SOCKET_POLLING_UTIL_HPP_INCLUDED__
+ 
+ #include <stdlib.h>
++#include <new>
+ #include <vector>
+ 
+ #if defined ZMQ_HAVE_WINDOWS
+diff --git a/src/proxy.cpp b/src/proxy.cpp
+index 78d6ba61..85e4db4a 100644
+--- a/src/proxy.cpp
++++ b/src/proxy.cpp
+@@ -3,6 +3,7 @@
+ #include "precompiled.hpp"
+ 
+ #include <stddef.h>
++#include <new>
+ #include "poller.hpp"
+ #include "proxy.hpp"
+ #include "likely.hpp"
+diff --git a/src/reaper.cpp b/src/reaper.cpp
+index 4361a7e9..1484a926 100644
+--- a/src/reaper.cpp
++++ b/src/reaper.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include "precompiled.hpp"
+ #include "macros.hpp"
++#include <new>
+ #include "reaper.hpp"
+ #include "socket_base.hpp"
+ #include "err.hpp"
+diff --git a/src/session_base.cpp b/src/session_base.cpp
+index 5a81b076..618443d5 100644
+--- a/src/session_base.cpp
++++ b/src/session_base.cpp
+@@ -1,6 +1,7 @@
+ /* SPDX-License-Identifier: MPL-2.0 */
+ 
+ #include "precompiled.hpp"
++#include <new>
+ #include "macros.hpp"
+ #include "session_base.hpp"
+ #include "i_engine.hpp"
+diff --git a/src/socket_poller.cpp b/src/socket_poller.cpp
+index b5c330e8..3feb452e 100644
+--- a/src/socket_poller.cpp
++++ b/src/socket_poller.cpp
+@@ -7,6 +7,7 @@
+ #include "macros.hpp"
+ 
+ #include <limits.h>
++#include <new>
+ 
+ static bool is_thread_safe (const zmq::socket_base_t &socket_)
+ {
+diff --git a/src/stream_connecter_base.cpp b/src/stream_connecter_base.cpp
+index 8dd9a6d6..6b733b4d 100644
+--- a/src/stream_connecter_base.cpp
++++ b/src/stream_connecter_base.cpp
+@@ -15,6 +15,7 @@
+ #endif
+ 
+ #include <limits>
++#include <new>
+ 
+ zmq::stream_connecter_base_t::stream_connecter_base_t (
+   zmq::io_thread_t *io_thread_,
+diff --git a/src/stream_listener_base.cpp b/src/stream_listener_base.cpp
+index 350093ad..b4e02027 100644
+--- a/src/stream_listener_base.cpp
++++ b/src/stream_listener_base.cpp
+@@ -13,6 +13,8 @@
+ #include <winsock2.h>
+ #endif
+ 
++#include <new>
++
+ zmq::stream_listener_base_t::stream_listener_base_t (
+   zmq::io_thread_t *io_thread_,
+   zmq::socket_base_t *socket_,
+diff --git a/src/ws_engine.cpp b/src/ws_engine.cpp
+index 9eec0d92..55590cdc 100644
+--- a/src/ws_engine.cpp
++++ b/src/ws_engine.cpp
+@@ -26,6 +26,7 @@
+ #endif
+ 
+ #include <cstring>
++#include <new>
+ 
+ #include "compat.hpp"
+ #include "tcp.hpp"
diff --git a/depend/bitcoin/depends/toolchain.cmake.in b/depend/bitcoin/depends/toolchain.cmake.in
index 87189efa..9d9f9e49 100644
--- a/depend/bitcoin/depends/toolchain.cmake.in
+++ b/depend/bitcoin/depends/toolchain.cmake.in
@@ -117,7 +117,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_HOST_APPLE)
 endif()
 
 
-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD)$")
+if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD|OpenBSD)$")
   # Customize pkg-config behavior for finding dependencies
   # of the xcb QPA platform plugin:
   # 1. Restrict search paths to the depends.
diff --git a/depend/bitcoin/doc/AI_POLICY.md b/depend/bitcoin/doc/AI_POLICY.md
new file mode 100644
index 00000000..fde44c48
--- /dev/null
+++ b/depend/bitcoin/doc/AI_POLICY.md
@@ -0,0 +1,38 @@
+# AI Policy
+
+Using AI (i.e. LLMs) as tools for coding is welcome, provided that such use adheres to the following policy, adds value, and does not waste the community's time.
+
+A high bar is held for all contributions to this project.
+
+**AI should not be used to generate comments when communicating with maintainers and other contributors**.
+Comments are expected to be written by humans.
+Comments that are believed to be written by AI may be moderated.
+
+If you are opening an issue, you should be able to describe the problem in your own words.
+
+You should only open a pull request if you:
+
+- know the language the code is written in
+- could have written the code yourself
+- understand the existing surrounding code and the effect of the suggested changes
+
+You must also be able to explain the pull request changes in your own words.
+This includes the pull request body and responses to questions.
+**Do not copy responses from the AI when replying to questions from reviewers.**
+
+This project requires a human author in the loop who understands the work produced by AI.
+**Pull requests should not be opened or driven by autonomous agents**.
+A human author must choose the work, understand the change, and be responsible for the contribution.
+Do not include agents as authors or co-authors of your commits for these reasons.
+Pull requests that appear in violation of this can be closed without notice.
+
+If you wish to include context from an interaction with AI in your comments, it must be disclosed as such.
+It must be accompanied by human commentary explaining the relevance and implications of the context.
+
+Questions or proposed changes to this policy can be discussed in [bitcoin-core/meta].
+
+This policy was adapted from [ripgrep's AI policy], which was adapted from [uv's AI policy].
+
+[bitcoin-core/meta]: https://github.com/bitcoin-core/meta
+[ripgrep's ai policy]: https://github.com/BurntSushi/ripgrep/blob/f0cec341ab95c25c691ad3d5754d4bd9eedde21f/AI_POLICY.md
+[uv's ai policy]: https://github.com/astral-sh/.github/blob/c5187e200db51bfe11d56e13053d29bd3793fdd8/AI_POLICY.md
diff --git a/depend/bitcoin/doc/JSON-RPC-interface.md b/depend/bitcoin/doc/JSON-RPC-interface.md
index e7f085a3..a9ea089d 100644
--- a/depend/bitcoin/doc/JSON-RPC-interface.md
+++ b/depend/bitcoin/doc/JSON-RPC-interface.md
@@ -124,6 +124,22 @@ RPC interface will be abused.
   security-sensitive operations on a computer whose other programs you
   trust.
 
+- **RPC Credentials Security Boundary:** Any client with valid RPC credentials
+  should be treated as having significant control over both the Bitcoin Core node
+  and the filesystem resources accessible by the `bitcoind` process. RPC commands
+  can load wallet files from paths that the `bitcoind` process has permission to
+  access, specify file paths for operations, and potentially gain broader access
+  than intended. This means that someone with RPC access can potentially compromise
+  not only the Bitcoin Core node, but also the machine it is running on. Bitcoin Core
+  provides the `-rpcwhitelist` option to restrict which RPC commands specific users
+  can access, and `-rpcwhitelistdefault` to control the default behavior for users
+  without explicit whitelists. However, when using multiple wallets or sharing access
+  with different users, these should not be considered robust security boundaries, as
+  users with access to certain commands may still be able to exploit functionality in
+  unexpected ways. For security-sensitive operations, implement proper system-level
+  isolation (containers, virtualization, separate user accounts with restricted
+  permissions) rather than relying solely on RPC access controls.
+
 - **Securing remote network access:** You may optionally allow other
   computers to remotely control Bitcoin Core by setting the `rpcallowip`
   and `rpcbind` configuration parameters.  These settings are only meant
diff --git a/depend/bitcoin/doc/REST-interface.md b/depend/bitcoin/doc/REST-interface.md
index ed46e222..9b8f11d2 100644
--- a/depend/bitcoin/doc/REST-interface.md
+++ b/depend/bitcoin/doc/REST-interface.md
@@ -12,6 +12,25 @@ REST Interface consistency guarantees
 The [same guarantees as for the RPC Interface](/doc/JSON-RPC-interface.md#rpc-consistency-guarantees)
 apply.
 
+Default HTTP caching
+--------------------
+
+REST responses include `Cache-Control` headers by default:
+
+* `public, immutable, max-age=86400` for `/block` and `/block/notxdetails`
+  binary and hex responses, `/blockpart`, `/blockfilter` and `/spenttxouts` in
+  all formats, and `/deploymentinfo/<BLOCKHASH>.json`. The TTL is deliberately
+  short so caches do not hold older response shapes across software upgrades.
+* `no-store` for `/block` and `/block/notxdetails` JSON, `/tx`, `/headers`,
+  `/blockfilterheaders`, `/blockhashbyheight`, `/chaininfo`, `/mempool`,
+  `/getutxos`, `/deploymentinfo.json`, and all error responses. These responses
+  can change with active chain or node state and do not currently provide cache
+  validators such as `ETag` or `Last-Modified`.
+
+If you front `bitcoind` with a reverse proxy or CDN such as Caddy or nginx with
+the headers-more module, you can override these defaults there. Keep overrides
+scoped to responses you know are safe to cache more aggressively.
+
 Limitations
 -----------
 
diff --git a/depend/bitcoin/doc/bips.md b/depend/bitcoin/doc/bips.md
index 07e50248..6f9b322e 100644
--- a/depend/bitcoin/doc/bips.md
+++ b/depend/bitcoin/doc/bips.md
@@ -49,6 +49,7 @@ BIPs that are implemented by Bitcoin Core:
 * [`BIP 173`](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki): Bech32 addresses for native Segregated Witness outputs are supported as of **v0.16.0** ([PR 11167](https://github.com/bitcoin/bitcoin/pull/11167)). Bech32 addresses are generated by default as of **v0.20.0** ([PR 16884](https://github.com/bitcoin/bitcoin/pull/16884)).
 * [`BIP 174`](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki): RPCs to operate on Partially Signed Bitcoin Transactions (PSBT) are present as of **v0.17.0** ([PR 13557](https://github.com/bitcoin/bitcoin/pull/13557)).
 * [`BIP 176`](https://github.com/bitcoin/bips/blob/master/bip-0176.mediawiki): Bits Denomination [QT only] is supported as of **v0.16.0** ([PR 12035](https://github.com/bitcoin/bitcoin/pull/12035)).
+* [`BIP 323`](https://github.com/bitcoin/bips/blob/master/bip-0323.mediawiki): BIP 9 bits 5 to 28 (inclusive) are ignored for soft-fork signalling and unknown soft fork warnings as of **v32.0**.
 * [`BIP 324`](https://github.com/bitcoin/bips/blob/master/bip-0324.mediawiki): The v2 transport protocol specified by BIP324 and the associated `NODE_P2P_V2` service bit are supported as of **v26.0**, but off by default ([PR 28331](https://github.com/bitcoin/bitcoin/pull/28331)). On by default as of **v27.0** ([PR 29347](https://github.com/bitcoin/bitcoin/pull/29347)).
 * [`BIP 325`](https://github.com/bitcoin/bips/blob/master/bip-0325.mediawiki): Signet test network is supported as of **v0.21.0** ([PR 18267](https://github.com/bitcoin/bitcoin/pull/18267)).
 * [`BIP 327`](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki): Key aggregation via `musig()` descriptors is supported as of **v30.0** ([PR 31244](https://github.com/bitcoin/bitcoin/pull/31244)). Signing is supported as of **v31.0** ([PR 29675](https://github.com/bitcoin/bitcoin/pull/29675))
@@ -78,3 +79,4 @@ BIPs that are implemented by Bitcoin Core:
 * [`BIP 390`](https://github.com/bitcoin/bips/blob/master/bip-0390.mediawiki): MuSig2 Descriptor parsing is implemented in **v30.0** ([PR 31244](https://github.com/bitcoin/bitcoin/pull/31244)) and signing in **v31.0** ([PR 29675](https://github.com/bitcoin/bitcoin/pull/29675))
 * [`BIP 431`](https://github.com/bitcoin/bips/blob/master/bip-0431.mediawiki): transactions with nVersion=3 are standard and treated as Topologically Restricted Until Confirmation as of **v28.0** ([PR 29496](https://github.com/bitcoin/bitcoin/pull/29496)).
 * [`BIP 433`](https://github.com/bitcoin/bips/blob/master/bip-0433.mediawiki): Spending of Pay to Anchor (P2A) outputs is standard as of **v28.0** ([PR 30352](https://github.com/bitcoin/bitcoin/pull/30352)).
+* [`BIP 434`](https://github.com/bitcoin/bips/blob/master/bip-0434.md): Peer Feature Negotiation as of **v32.0** ([PR 35221](https://github.com/bitcoin/bitcoin/pull/35221)).
diff --git a/depend/bitcoin/doc/build-freebsd.md b/depend/bitcoin/doc/build-freebsd.md
index de373d1e..8189fe0b 100644
--- a/depend/bitcoin/doc/build-freebsd.md
+++ b/depend/bitcoin/doc/build-freebsd.md
@@ -1,8 +1,8 @@
 # FreeBSD Build Guide
 
-**Updated for FreeBSD [15.0](https://www.freebsd.org/releases/15.0R/announce/)**
+Bitcoin Core is supported on all [supported FreeBSD releases](https://www.freebsd.org/security/#sup).
 
-This guide describes how to build bitcoind, command-line utilities, and GUI on FreeBSD.
+This guide describes how to build bitcoind, command-line utilities, and GUI on the most recent production release.
 
 ## Preparation
 
@@ -10,7 +10,7 @@ This guide describes how to build bitcoind, command-line utilities, and GUI on F
 Run the following as root to install the base dependencies for building.
 
 ```bash
-pkg install boost-libs cmake git libevent pkgconf
+pkg install boost-libs cmake git
 ```
 
 SQLite is required for the wallet:
@@ -64,9 +64,9 @@ Otherwise, if you don't need QR encoding support, use the `-DWITH_QRENCODE=OFF`
 #### Notifications
 ###### ZeroMQ
 
-Bitcoin Core can provide notifications via ZeroMQ. If the package is installed, support will be compiled in.
+Bitcoin Core can provide notifications via ZeroMQ. To compile ZMQ support, install the following dependency and pass `-DWITH_ZMQ=ON` when configuring.
 ```bash
-pkg install libzmq4
+pkg install libzmq4 pkgconf
 ```
 
 #### Test Suite Dependencies
@@ -74,7 +74,7 @@ There is an included test suite that is useful for testing code changes when dev
 To run the test suite (recommended), you will need to have Python 3 installed:
 
 ```bash
-pkg install python3 databases/py-sqlite3 net/py-pyzmq
+pkg install python3 databases/py-sqlite3 net/py-pyzmq lsof
 ```
 ---
 
diff --git a/depend/bitcoin/doc/build-netbsd.md b/depend/bitcoin/doc/build-netbsd.md
index f19eb4c5..fc3096bb 100644
--- a/depend/bitcoin/doc/build-netbsd.md
+++ b/depend/bitcoin/doc/build-netbsd.md
@@ -1,8 +1,8 @@
 # NetBSD Build Guide
 
-**Updated for NetBSD [10.1](https://netbsd.org/releases/formal-10/NetBSD-10.1.html)**
+Bitcoin Core is supported on all [supported NetBSD releases](https://www.netbsd.org/releases/).
 
-This guide describes how to build bitcoind, command-line utilities, and GUI on NetBSD.
+This guide describes how to build bitcoind, command-line utilities, and GUI on the latest release.
 
 ## Preparation
 
@@ -12,23 +12,7 @@ Install the required dependencies the usual way you [install software on NetBSD]
 The example commands below use `pkgin`.
 
 ```bash
-pkgin install git cmake pkg-config boost libevent
-```
-
-NetBSD currently ships with an older version of `gcc` than is needed to build. You should upgrade your `gcc` and then pass this new version to the configure script.
-
-For example, grab `gcc12`:
-```
-pkgin install gcc12
-```
-
-Then, when configuring, pass the following:
-```bash
-cmake -B build
-    ...
-    -DCMAKE_C_COMPILER="/usr/pkg/gcc12/bin/gcc" \
-    -DCMAKE_CXX_COMPILER="/usr/pkg/gcc12/bin/g++" \
-    ...
+pkgin install git cmake boost
 ```
 
 SQLite is required for the wallet:
@@ -42,7 +26,7 @@ To build Bitcoin Core without the wallet, use `-DENABLE_WALLET=OFF`.
 Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)):
 
 ```bash
-pkgin install capnproto
+pkgin install capnproto pkgconf
 ```
 
 Compile with `-DENABLE_IPC=OFF` if you do not need IPC functionality.
@@ -82,9 +66,9 @@ Otherwise, if you don't need QR encoding support, use the `-DWITH_QRENCODE=OFF`
 #### Notifications
 ###### ZeroMQ
 
-Bitcoin Core can provide notifications via ZeroMQ. If the package is installed, support will be compiled in.
+Bitcoin Core can provide notifications via ZeroMQ. To compile ZMQ support, install the following dependency and pass `-DWITH_ZMQ=ON` when configuring.
 ```bash
-pkgin install zeromq
+pkgin install zeromq pkgconf
 ```
 
 #### Test Suite Dependencies
@@ -93,7 +77,14 @@ There is an included test suite that is useful for testing code changes when dev
 To run the test suite (recommended), you will need to have Python 3 installed:
 
 ```bash
-pkgin install python313 py313-zmq
+pkgin install python313 py313-zmq lsof
+```
+
+When the `lsof` binary package was built for a different point release, it might be necessary to force its installation as follows:
+
+```bash
+echo "CHECK_OSABI=no" >> /etc/pkg_install.conf
+pkgin install lsof
 ```
 
 ## Building Bitcoin Core
diff --git a/depend/bitcoin/doc/build-openbsd.md b/depend/bitcoin/doc/build-openbsd.md
index 4ea58795..bcc2eba6 100644
--- a/depend/bitcoin/doc/build-openbsd.md
+++ b/depend/bitcoin/doc/build-openbsd.md
@@ -1,8 +1,8 @@
 # OpenBSD Build Guide
 
-**Updated for OpenBSD [7.8](https://www.openbsd.org/78.html)**
+Bitcoin Core is supported on [the two most recent OpenBSD releases](https://www.openbsd.org/faq/faq5.html#Flavors).
 
-This guide describes how to build bitcoind, command-line utilities, and GUI on OpenBSD.
+This guide describes how to build bitcoind, command-line utilities, and GUI on the latest release.
 
 ## Preparation
 
@@ -10,7 +10,7 @@ This guide describes how to build bitcoind, command-line utilities, and GUI on O
 Run the following as root to install the base dependencies for building.
 
 ```bash
-pkg_add git cmake boost libevent
+pkg_add git cmake boost
 ```
 
 SQLite is required for the wallet:
@@ -64,7 +64,7 @@ Otherwise, if you don't need QR encoding support, use the `-DWITH_QRENCODE=OFF`
 #### Notifications
 ###### ZeroMQ
 
-Bitcoin Core can provide notifications via ZeroMQ. If the package is installed, support will be compiled in.
+Bitcoin Core can provide notifications via ZeroMQ. To compile ZMQ support, install the following dependency and pass `-DWITH_ZMQ=ON` when configuring.
 ```bash
 pkg_add zeromq
 ```
diff --git a/depend/bitcoin/doc/build-osx.md b/depend/bitcoin/doc/build-osx.md
index 3c2b0f3a..4cdb4834 100644
--- a/depend/bitcoin/doc/build-osx.md
+++ b/depend/bitcoin/doc/build-osx.md
@@ -16,7 +16,9 @@ macOS comes with a built-in Terminal located in:
 ### 1. Xcode Command Line Tools
 
 The Xcode Command Line Tools are a collection of build tools for macOS.
-These tools must be installed in order to build Bitcoin Core from source.
+Version 16.2 (or higher) of these tools must be
+[installed](https://developer.apple.com/documentation/xcode/installing-the-command-line-tools)
+in order to build Bitcoin Core from source.
 
 To install, run the following command from your terminal:
 
@@ -48,7 +50,7 @@ See [dependencies.md](dependencies.md) for a complete overview.
 To install, run the following from your terminal:
 
 ``` bash
-brew install cmake boost pkgconf libevent capnp
+brew install cmake boost capnp
 ```
 
 #### Wallet Dependencies
@@ -104,11 +106,11 @@ Otherwise, if you don't need QR encoding support, you can pass `-DWITH_QRENCODE=
 
 #### ZMQ Dependencies
 
-Support for ZMQ notifications requires the following dependency.
+Bitcoin Core can provide notifications via ZeroMQ. To compile ZMQ support, install the following dependency and pass `-DWITH_ZMQ=ON` when configuring.
 Skip if you do not need ZMQ functionality.
 
 ``` bash
-brew install zeromq
+brew install zeromq pkgconf
 ```
 
 Check out the [further configuration](#further-configuration) section for more information.
@@ -139,7 +141,7 @@ It is required that you have `python` and `zip` installed.
 
 There are many ways to configure Bitcoin Core, here are a few common examples:
 
-##### Wallet (only SQlite) and GUI Support:
+##### Wallet and GUI:
 
 This enables the GUI.
 If `sqlite` or `qt` are not installed, this will throw an error.
@@ -175,7 +177,7 @@ ctest --test-dir build  # Append "-j N" for N parallel tests.
 
 ### 3. Deploy (optional)
 
-You can also create a  `.zip` containing the `.app` bundle by running the following command:
+You can also create a `.zip` containing the `.app` bundle by running the following command:
 
 ``` bash
 cmake --build build --target deploy
diff --git a/depend/bitcoin/doc/build-unix.md b/depend/bitcoin/doc/build-unix.md
index e499aa9b..b1dd5422 100644
--- a/depend/bitcoin/doc/build-unix.md
+++ b/depend/bitcoin/doc/build-unix.md
@@ -1,11 +1,10 @@
-UNIX BUILD NOTES
-====================
+# UNIX BUILD NOTES
+
 Some notes on how to build Bitcoin Core in Unix.
 
 (For BSD specific instructions, see `build-*bsd.md` in this directory.)
 
-To Build
----------------------
+## To Build
 
 ```bash
 cmake -B build
@@ -18,8 +17,7 @@ cmake --install build  # Optional
 ```
 
 See below for instructions on how to [install the dependencies on popular Linux
-distributions](#linux-distribution-specific-instructions), or the
-[dependencies](#dependencies) section for a complete overview.
+distributions](#dependencies).
 
 ## Memory Requirements
 
@@ -40,162 +38,48 @@ Finally, clang (often less resource hungry) can be used instead of gcc, which is
 
     cmake -B build -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
 
-## Linux Distribution Specific Instructions
-
-### Ubuntu & Debian
+## Dependencies
 
-#### Dependency Build Instructions
+You can either build from self-compiled [depends](/depends/README.md) or
+install the dependencies from your distribution package manager. Dependencies
+for additional features in later columns are optional.
 
-Build requirements for the latest Debian "stable" release, or the latest Ubuntu LTS release:
+| Package manager         | Required build dependencies | SQLite (wallet) | Cap'n Proto (IPC) | ZMQ <sup><a href="#note1">[1]</a></sup> | USDT | Qt and libqrencode (GUI) |
+| ----------------------- | --------------------------- | --------------- | ----------------- | --- | ---- | ------------------------ |
+| Debian / Ubuntu (`apt`) | `build-essential cmake python3 libboost-dev` | `libsqlite3-dev` | `libcapnp-dev capnproto` | `libzmq3-dev pkgconf` | `systemtap-sdt-dev` | `qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libgl-dev qt6-wayland libqrencode-dev` |
+| Fedora (`dnf`)          | `gcc-c++ cmake make python3 boost-devel` | `sqlite-devel` | `capnproto capnproto-devel` | `zeromq-devel pkgconf` | `systemtap-sdt-devel` | `qt6-qtbase-devel qt6-qttools-devel qt6-qtwayland qrencode-devel` |
+| Alpine (`apk`)          | `build-base cmake linux-headers python3 boost-dev` | `sqlite-dev` | `capnproto capnproto-dev` | `zeromq-dev` | Not supported | `qt6-qtbase-dev qt6-qttools-dev libqrencode-dev` |
+| Arch (`pacman`)         | `gcc make cmake python boost` | `sqlite` | `capnproto` | `zeromq` | `systemtap` | `qt6-base qt6-tools qt6-wayland qrencode` |
 
-    sudo apt-get install build-essential cmake pkgconf python3
+<a id="note1"></a>1. Some ZMQ packages do not vendor the CMake config files, which requires `pkgconf` or `pkg-config` to be installed.
 
 For Debian "oldstable", or earlier Ubuntu LTS releases, you may need to pick a
 later compiler version, according to the [dependencies](/doc/dependencies.md)
 documentation.
 
-Now, you can either build from self-compiled [depends](#dependencies) or install the required dependencies:
-
-    sudo apt-get install libevent-dev libboost-dev
-
-SQLite is required for the wallet:
-
-    sudo apt install libsqlite3-dev
-
-To build Bitcoin Core without the wallet, see [*Disable-wallet mode*](#disable-wallet-mode)
-
-Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)):
-
-    sudo apt-get install libcapnp-dev capnproto
-
-Compile with `-DENABLE_IPC=OFF` if you do not need IPC functionality.
-
-ZMQ-enabled binaries are compiled with `-DWITH_ZMQ=ON` and require the following dependency:
-
-    sudo apt-get install libzmq3-dev
-
-User-Space, Statically Defined Tracing (USDT) dependencies:
-
-    sudo apt install systemtap-sdt-dev
-
-GUI dependencies:
-
-Bitcoin Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, we need to install
-the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if you don't intend to use the GUI.
-
-    sudo apt-get install qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libgl-dev
-
-Additionally, to support Wayland protocol for modern desktop environments:
-
-    sudo apt install qt6-wayland
-
-The GUI will be able to encode addresses in QR codes unless this feature is explicitly disabled. To install libqrencode, run:
-
-    sudo apt-get install libqrencode-dev
-
-Otherwise, if you don't need QR encoding support, use the `-DWITH_QRENCODE=OFF` option to disable this feature in order to compile the GUI.
-
-
-### Fedora
-
-#### Dependency Build Instructions
-
-Build requirements:
-
-    sudo dnf install gcc-c++ cmake make python3
-
-Now, you can either build from self-compiled [depends](#dependencies) or install the required dependencies:
-
-    sudo dnf install libevent-devel boost-devel
-
-SQLite is required for the wallet:
-
-    sudo dnf install sqlite-devel
-
-To build Bitcoin Core without the wallet, see [*Disable-wallet mode*](#disable-wallet-mode)
-
-ZMQ-enabled binaries are compiled with `-DWITH_ZMQ=ON` and require the following dependency:
-
-    sudo dnf install zeromq-devel
-
-User-Space, Statically Defined Tracing (USDT) dependencies:
-
-    sudo dnf install systemtap-sdt-devel
-
-Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)):
-
-    sudo dnf install capnproto capnproto-devel
-
-Compile with `-DENABLE_IPC=OFF` if you do not need IPC functionality.
-
-GUI dependencies:
-
-Bitcoin Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, we need to install
-the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if you don't intend to use the GUI.
-
-    sudo dnf install qt6-qtbase-devel qt6-qttools-devel
-
-Additionally, to support Wayland protocol for modern desktop environments:
-
-    sudo dnf install qt6-qtwayland
-
-The GUI will be able to encode addresses in QR codes unless this feature is explicitly disabled. To install libqrencode, run:
-
-    sudo dnf install qrencode-devel
-
-Otherwise, if you don't need QR encoding support, use the `-DWITH_QRENCODE=OFF` option to disable this feature in order to compile the GUI.
-
-### Alpine
-
-#### Dependency Build Instructions
-
-Build requirements:
-
-    apk add build-base cmake linux-headers pkgconf python3
-
-Now, you can either build from self-compiled [depends](#dependencies) or install the required dependencies:
-
-    apk add libevent-dev boost-dev
-
-SQLite is required for the wallet:
-
-    apk add sqlite-dev
-
 To build Bitcoin Core without the wallet, see [*Disable-wallet mode*](#disable-wallet-mode)
+and use `-DENABLE_WALLET=OFF` to build without the wallet and skip the SQLite dependency.
 
-Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)):
-
-    apk add capnproto capnproto-dev
-
+Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)).
 Compile with `-DENABLE_IPC=OFF` if you do not need IPC functionality.
 
-ZMQ dependencies (provides ZMQ API):
-
-    apk add zeromq-dev
+ZMQ-enabled binaries are compiled with `-DWITH_ZMQ=ON` and require libzmq.
 
-User-Space, Statically Defined Tracing (USDT) is not supported or tested on Alpine Linux at this time.
+User-Space, Statically Defined Tracing (USDT) requires the systemtap-sdt
+development package and must be enabled via `-DWITH_USDT=ON`.
 
 GUI dependencies:
 
 Bitcoin Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, we need to install
 the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if you don't intend to use the GUI.
 
-    apk add qt6-qtbase-dev  qt6-qttools-dev
-
-The GUI will be able to encode addresses in QR codes unless this feature is explicitly disabled. To install libqrencode, run:
-
-    apk add libqrencode-dev
+Additionally, install the Qt Wayland platform plugin for modern desktop environments.
 
+The GUI will be able to encode addresses in QR codes and requires libqrencode.
 Otherwise, if you don't need QR encoding support, use the `-DWITH_QRENCODE=OFF` option to disable this feature in order to compile the GUI.
 
-## Dependencies
+### Disable-wallet mode
 
-See [dependencies.md](dependencies.md) for a complete overview, and
-[depends](/depends/README.md) on how to compile them yourself, if you wish to
-not use the packages of your Linux distribution.
-
-Disable-wallet mode
---------------------
 When the intention is to only run a P2P node, without a wallet, Bitcoin Core can
 be compiled in disable-wallet mode with:
 
@@ -204,17 +88,3 @@ be compiled in disable-wallet mode with:
 In this case there is no dependency on SQLite.
 
 Mining is also possible in disable-wallet mode using the `getblocktemplate` RPC call.
-
-Setup and Build Example: Arch Linux
------------------------------------
-This example lists the steps necessary to setup and build a command line only distribution of the latest changes on Arch Linux:
-
-    pacman --sync --needed capnproto cmake boost gcc git libevent make python sqlite
-    git clone https://github.com/bitcoin/bitcoin.git
-    cd bitcoin/
-    cmake -B build
-    cmake --build build
-    ctest --test-dir build
-    ./build/bin/bitcoind
-    ./build/bin/bitcoin help
-
diff --git a/depend/bitcoin/doc/cjdns.md b/depend/bitcoin/doc/cjdns.md
index 9bdcec73..22849282 100644
--- a/depend/bitcoin/doc/cjdns.md
+++ b/depend/bitcoin/doc/cjdns.md
@@ -73,7 +73,11 @@ connections are not affected by this option. It can be specified multiple times
 to allow multiple networks, e.g. onlynet=cjdns, onlynet=i2p, onlynet=onion.
 
 CJDNS support was added to Bitcoin Core in version 23.0 and there may be fewer
-CJDNS peers than Tor or IP ones. You can use `bitcoin-cli -addrinfo` to see the
+CJDNS peers than Tor or IP ones. Therefore, using CJDNS alone without other
+networks is discouraged: a node may be unable to fill its outbound connection slots
+but will repeatedly try the few addresses it knows and is more susceptible to
+[Sybil attacks](https://en.bitcoin.it/wiki/Weaknesses#Sybil_attack).
+You can use `bitcoin-cli -addrinfo` to see the
 number of CJDNS addresses known to your node.
 
 In general, a node can be run with both an onion service and CJDNS (or any/all
diff --git a/depend/bitcoin/doc/dependencies.md b/depend/bitcoin/doc/dependencies.md
index aac4bb90..23e30784 100644
--- a/depend/bitcoin/doc/dependencies.md
+++ b/depend/bitcoin/doc/dependencies.md
@@ -8,10 +8,12 @@ them using [depends](/depends/README.md).
 
 Bitcoin Core requires one of the following compilers.
 
-| Dependency | Minimum required |
+| Toolchain | Minimum required |
 | --- | --- |
 | [Clang](https://clang.llvm.org) | [17.0](https://github.com/bitcoin/bitcoin/pull/33555) |
 | [GCC](https://gcc.gnu.org) | [12.1](https://github.com/bitcoin/bitcoin/pull/33842) |
+| [Xcode CLT](/doc/build-osx.md) | [16.2](https://github.com/bitcoin/bitcoin/pull/33932) |
+| [MSVC](/doc/build-windows-msvc.md) | [18.3](https://github.com/bitcoin/bitcoin/pull/33861) |
 
 ## Required
 
@@ -21,7 +23,6 @@ Bitcoin Core requires one of the following compilers.
 | --- | --- | --- |
 | [Boost](../depends/packages/boost.mk) | [link](https://www.boost.org/users/download/) | [1.74.0](https://github.com/bitcoin/bitcoin/pull/34107) |
 | CMake | [link](https://cmake.org/) | [3.22](https://github.com/bitcoin/bitcoin/pull/30454) |
-| [libevent](../depends/packages/libevent.mk) | [link](https://github.com/libevent/libevent/releases) | [2.1.8](https://github.com/bitcoin/bitcoin/pull/24681) |
 
 ### Runtime
 
diff --git a/depend/bitcoin/doc/developer-notes.md b/depend/bitcoin/doc/developer-notes.md
index e79c14ad..b31d42a1 100644
--- a/depend/bitcoin/doc/developer-notes.md
+++ b/depend/bitcoin/doc/developer-notes.md
@@ -40,10 +40,10 @@ code.
     - Class member variables have a `m_` prefix.
     - Global variables have a `g_` prefix.
   - Constant names are all uppercase, and use `_` to separate words.
-  - Enumerator constants may be `snake_case`, `PascalCase` or `ALL_CAPS`.
-    This is a more tolerant policy than the [C++ Core
-    Guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Renum-caps),
-    which recommend using `snake_case`.  Please use what seems appropriate.
+  - Enumerator constants may be `snake_case`, or `PascalCase`. They should not
+    be `ALL_CAPS`, according to the [C++ Core
+    Guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#renum-caps),
+    to avoid clashing with macros.
   - Class names, function names, and method names are UpperCamelCase
     (PascalCase). Do not prefix class names with `C`. See [Internal interface
     naming style](#internal-interface-naming-style) for an exception to this
@@ -55,16 +55,13 @@ code.
 
 - **Miscellaneous**
   - `++i` is preferred over `i++`.
-  - `nullptr` is preferred over `NULL` or `(void*)0`.
   - `static_assert` is preferred over `assert` where possible. Generally; compile-time checking is preferred over run-time checking.
   - Use a named cast or functional cast, not a C-Style cast. When casting
     between integer types, use functional casts such as `int(x)` or `int{x}`
     instead of `(int) x`. When casting between more complex types, use `static_cast`.
     Use `reinterpret_cast` and `const_cast` as appropriate.
-  - Prefer [`list initialization ({})`](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Res-list) where possible.
+  - Prefer [`list initialization ({})`](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#res-list) where possible.
     For example `int x{0};` instead of `int x = 0;` or `int x(0);`
-  - Recursion is checked by clang-tidy and thus must be made explicit. Use
-    `NOLINTNEXTLINE(misc-no-recursion)` to suppress the check.
 
 For function calls a namespace should be specified explicitly, unless such functions have been declared within it.
 Otherwise, [argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl), also known as ADL, could be
@@ -140,7 +137,18 @@ public:
   non-optional in-out and output parameters should usually be references, as
   they cannot be null.
 
-### Coding Style (C++ named arguments)
+### Coding Style (clang-tidy rules)
+
+The clang-tidy tool is used to check some rules. Please refer to the [upstream
+documentation](https://clang.llvm.org/extra/clang-tidy/checks/list.html) about
+the details and rationale for each rule.
+
+#### C++ Recursive Functions
+
+Recursion is checked by clang-tidy and thus must be made explicit. Use
+`NOLINTNEXTLINE(misc-no-recursion)` to suppress the check.
+
+#### C++ named arguments
 
 When passing named arguments, use a format that clang-tidy understands. The
 argument names can otherwise not be verified by clang-tidy.
@@ -156,7 +164,7 @@ int main()
 }
 ```
 
-### Running clang-tidy
+#### Running clang-tidy
 
 To run clang-tidy on Ubuntu/Debian, install the dependencies:
 
@@ -191,10 +199,6 @@ To run clang-tidy on the changed source lines:
 git diff | ( cd ./src/ && clang-tidy-diff -p2 -path ../build -j $(nproc) )
 ```
 
-## Coding Style (Python)
-
-Refer to [/test/functional/README.md#style-guidelines](/test/functional/README.md#style-guidelines).
-
 ## Coding Style (Doxygen-compatible comments)
 
 Bitcoin Core uses [Doxygen](https://www.doxygen.nl/) to generate its official documentation.
@@ -298,6 +302,10 @@ Linux: `sudo apt install doxygen graphviz`
 
 MacOS: `brew install doxygen graphviz`
 
+## Coding Style (Python)
+
+Refer to [/test/functional/README.md#style-guidelines](/test/functional/README.md#style-guidelines).
+
 ## Development tips and tricks
 
 ### Compiling for debugging
@@ -386,22 +394,6 @@ other input.
      assumption may or may not result in a slightly degraded user experience,
      but it is safe to continue program execution.
 
-### Valgrind suppressions file
-
-Valgrind is a programming tool for memory debugging, memory leak detection, and
-profiling. The repo contains a Valgrind suppressions file
-([`valgrind.supp`](/test/sanitizer_suppressions/valgrind.supp))
-which includes known Valgrind warnings in our dependencies that cannot be fixed
-in-tree. Example use:
-
-```shell
-$ valgrind --suppressions=test/sanitizer_suppressions/valgrind.supp build/bin/test_bitcoin
-$ valgrind --suppressions=test/sanitizer_suppressions/valgrind.supp --leak-check=full \
-      --show-leak-kinds=all build/bin/test_bitcoin --log_level=test_suite
-$ valgrind -v --leak-check=full build/bin/bitcoind -printtoconsole
-$ ./build/test/functional/test_runner.py --valgrind
-```
-
 ### Compiling for test coverage
 
 #### Using LCOV
@@ -539,30 +531,39 @@ The generated coverage report can be accessed at `build/coverage_report/index.ht
 The [`include-what-you-use`](https://github.com/include-what-you-use/include-what-you-use) tool (IWYU)
 helps to enforce the source code organization [policy](#source-code-organization) in this repository.
 
-To ensure consistency, it is recommended to run the IWYU CI job locally rather than running the tool directly.
+To reproduce the IWYU CI job locally, run:
+```bash
+env -i HOME="$HOME" PATH="$PATH" USER="$USER" MAKEJOBS="-j1" FILE_ENV="./ci/test/00_setup_env_native_iwyu.sh" ./ci/test_run_all.sh || echo "IWYU failed"
+```
 
 In some cases, IWYU might suggest headers that seem unnecessary at first glance, but are actually required.
 For example, a macro may use a symbol that requires its own include. Another example is passing a string literal
 to a function that accepts a `std::string` parameter. An implicit conversion occurs at the callsite using the
 `std::string` constructor, which makes the corresponding header required. We accept these suggestions as is.
 
-Use `IWYU pragma: export` very sparingly, as this enforces transitive inclusion of headers
-and undermines the specific purpose of IWYU.
+If the provided IWYU CI job still produces a false positive, reduce it to a minimal reproducer and report it upstream.
+
+Use IWYU pragmas sparingly.
+
+Use `IWYU pragma: keep` only as a narrow workaround when needed.
+
+Use `IWYU pragma: associated` only when IWYU cannot infer the intended associated header.
+
+Use `IWYU pragma: export` very sparingly, as this enforces transitive inclusion of headers and undermines the specific purpose of IWYU.
 
 The acceptable cases for using `IWYU pragma: export` are:
 1. Facade headers. For example, see [`compat/compat.h`](/src/compat/compat.h).
 2. Drop-in replacement headers. For example, see [`util/time.h`](/src/util/time.h).
 3. Presenting a complete interface across multiple headers.
 
-A comment explaining the rationale is required for every use of `IWYU pragma: export`.
+For IWYU pragmas, prefer adding a nearby source comment that explains why the annotation is needed.
 
 ### Performance profiling with perf
 
 Profiling is a good way to get a precise idea of where time is being spent in
 code. One tool for doing profiling on Linux platforms is called
-[`perf`](https://www.brendangregg.com/perf.html), and has been integrated into
-the functional test framework. Perf can observe a running process and sample
-(at some frequency) where its execution is.
+[`perf`](https://www.brendangregg.com/perf.html). It can observe a running
+process and sample (at some frequency) where its execution is.
 
 Perf installation is contingent on which kernel version you're running; see
 [this thread](https://askubuntu.com/questions/50145/how-to-install-perf-monitoring-tool)
@@ -597,8 +598,21 @@ perf report --stdio | c++filt | less
 
 or using a graphical tool like [Hotspot](https://github.com/KDAB/hotspot).
 
-See the functional test documentation for how to invoke perf within tests.
+### Valgrind
+
+Valgrind is a programming tool for memory debugging, memory leak detection, and
+profiling. The repo contains a Valgrind suppressions file
+([`valgrind.supp`](/test/sanitizer_suppressions/valgrind.supp))
+which includes known Valgrind warnings in our dependencies that cannot be fixed
+in-tree. Example use:
 
+```shell
+$ valgrind --suppressions=test/sanitizer_suppressions/valgrind.supp build/bin/test_bitcoin
+$ valgrind --suppressions=test/sanitizer_suppressions/valgrind.supp --leak-check=full \
+      --show-leak-kinds=all build/bin/test_bitcoin --log_level=test_suite
+$ valgrind -v --leak-check=full build/bin/bitcoind -printtoconsole
+$ ./build/test/functional/test_runner.py --valgrind
+```
 
 ### Sanitizers
 
@@ -654,6 +668,40 @@ Additional resources:
  * [GCC Instrumentation Options](https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html)
  * [Google Sanitizers Wiki](https://github.com/google/sanitizers/wiki)
 
+# Development guidelines
+
+A few non-style-related recommendations for developers, as well as points to
+pay attention to for reviewers of Bitcoin Core code.
+
+## General Testing
+
+As a rule of thumb, an externally observable change (new feature, bug fix, or
+changed default) should be accompanied by an automated test.
+New tests are usually not needed for behavior-preserving work that is easy to
+validate, such as moving code, renaming, or mechanical refactors.
+When an automated test would be brittle or have limited long-term value,
+a manual testing guide in the commit message or PR description is an
+acceptable alternative.
+
+### Commit Structure for Tests
+
+Test placement depends on existing coverage and the type of change:
+
+* When existing tests already cover the behavior being changed, update them in
+  the same commit as the change. The diff records the old and new expectations
+  together and shows the change was intentional.
+* For a simple feature or bug fix without existing coverage, the change and its
+  test can often be in the same commit.
+* For a non-trivial refactor, if the relevant invariant is not already covered
+  by automated tests, first add that coverage in a separate test commit. The
+  refactor commit should not need to update test expectations.
+* For a non-trivial change to existing behavior without coverage, consider
+  adding a preceding commit with a [characterization test](https://en.wikipedia.org/wiki/Characterization_test)
+  to document the current behavior. Mark assertions whose expected values will
+  change with `TODO` comments so they are not mistaken for intended behavior.
+  Remove the comments when updating those assertions in the behavior-changing
+  commit.
+
 ## Locking/mutex usage notes
 
 The code is multi-threaded and uses mutexes and the
@@ -672,62 +720,57 @@ and its `cs_KeyStore` lock for example).
 
 ## Threads
 
-- [Main thread (`bitcoind`)](https://doxygen.bitcoincore.org/bitcoind_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97)
+- [Main thread (`bitcoind`)](https://doxygen.bitcoincore.org/bitcoind_8cpp.html#main)
   : Started from `main()` in `bitcoind.cpp`. Responsible for starting up and
   shutting down the application.
 
-- [Init load (`b-initload`)](https://doxygen.bitcoincore.org/namespacenode.html#ab4305679079866f0f420f7dbf278381d)
+- [Init load (`b-initload`)](https://doxygen.bitcoincore.org/init_8cpp.html#initload)
   : Performs various loading tasks that are part of init but shouldn't block the node from being started: external block import,
    reindex, reindex-chainstate, main chain activation, spawn indexes background sync threads and mempool load.
 
-- [CCheckQueue::Loop (`b-scriptch.x`)](https://doxygen.bitcoincore.org/class_c_check_queue.html#a6e7fa51d3a25e7cb65446d4b50e6a987)
+- [CCheckQueue::Loop (`b-scriptch.xx`)](https://doxygen.bitcoincore.org/class_c_check_queue.html#checkqueue)
   : Parallel script validation threads for transactions in blocks.
 
-- [ThreadHTTP (`b-http`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#abb9f6ea8819672bd9a62d3695070709c)
-  : Libevent thread to listen for RPC and REST connections.
+- [ThreadHTTP (`b-http`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#http)
+  : Thread to listen for RPC and REST connections.
 
-- [HTTP worker threads (`b-http_pool_x`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#a2ad0a49dc9b5e8117c0dee98c24187d8)
+- [HTTP worker threads (`b-http.xx`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#http_pool)
   : Threads to service RPC and REST requests.
 
-- [Indexer threads (`b-txindex`, etc)](https://doxygen.bitcoincore.org/class_base_index.html#a96a7407421fbf877509248bbe64f8d87)
+- [Indexer threads (`b-txidx`, `b-blkfltbscidx`, `b-coinstatsidx`, `b-txospenderidx`)](https://doxygen.bitcoincore.org/class_base_index.html#index_sync)
   : One thread per indexer.
 
-- [SchedulerThread (`b-scheduler`)](https://doxygen.bitcoincore.org/class_c_scheduler.html#a14d2800815da93577858ea078aed1fba)
+- [SchedulerThread (`b-scheduler`)](https://doxygen.bitcoincore.org/class_c_scheduler.html#scheduler)
   : Does asynchronous background tasks like dumping wallet contents, dumping
   addrman and running asynchronous validationinterface callbacks.
 
-- [TorControlThread (`b-torcontrol`)](https://doxygen.bitcoincore.org/torcontrol_8cpp.html#a52a3efff23634500bb42c6474f306091)
-  : Libevent thread for tor connections.
+- [TorControlThread (`b-torcontrol`)](https://doxygen.bitcoincore.org/class_tor_controller.html#torcontrol)
+  : Thread for tor connections.
 
 - Net threads:
 
-  - [ThreadMessageHandler (`b-msghand`)](https://doxygen.bitcoincore.org/class_c_connman.html#aacdbb7148575a31bb33bc345e2bf22a9)
+  - [ThreadMessageHandler (`b-msghand`)](https://doxygen.bitcoincore.org/class_c_connman.html#msghand)
     : Application level message handling (sending and receiving). Almost
     all net_processing and validation logic runs on this thread.
 
-  - [ThreadDNSAddressSeed (`b-dnsseed`)](https://doxygen.bitcoincore.org/class_c_connman.html#aa7c6970ed98a4a7bafbc071d24897d13)
+  - [ThreadDNSAddressSeed (`b-dnsseed`)](https://doxygen.bitcoincore.org/class_c_connman.html#dnsseed)
     : Loads addresses of peers from the DNS.
 
-  - ThreadMapPort (`b-mapport`)
+  - [ThreadMapPort (`b-mapport`)](https://doxygen.bitcoincore.org/mapport_8cpp.html#mapport)
     : Universal plug-and-play startup/shutdown.
 
-  - [ThreadSocketHandler (`b-net`)](https://doxygen.bitcoincore.org/class_c_connman.html#a765597cbfe99c083d8fa3d61bb464e34)
+  - [ThreadSocketHandler (`b-net`)](https://doxygen.bitcoincore.org/class_c_connman.html#net)
     : Sends/Receives data from peers on port 8333.
 
-  - [ThreadOpenAddedConnections (`b-addcon`)](https://doxygen.bitcoincore.org/class_c_connman.html#a0b787caf95e52a346a2b31a580d60a62)
+  - [ThreadOpenAddedConnections (`b-addcon`)](https://doxygen.bitcoincore.org/class_c_connman.html#addcon)
     : Opens network connections to added nodes.
 
-  - [ThreadOpenConnections (`b-opencon`)](https://doxygen.bitcoincore.org/class_c_connman.html#a55e9feafc3bab78e5c9d408c207faa45)
+  - [ThreadOpenConnections (`b-opencon`)](https://doxygen.bitcoincore.org/class_c_connman.html#opencon)
     : Initiates new connections to peers.
 
-  - [ThreadI2PAcceptIncoming (`b-i2paccept`)](https://doxygen.bitcoincore.org/class_c_connman.html#a57787b4f9ac847d24065fbb0dd6e70f8)
+  - [ThreadI2PAcceptIncoming (`b-i2paccept`)](https://doxygen.bitcoincore.org/class_c_connman.html#i2paccept)
     : Listens for and accepts incoming I2P connections through the I2P SAM proxy.
 
-# Development guidelines
-
-A few non-style-related recommendations for developers, as well as points to
-pay attention to for reviewers of Bitcoin Core code.
-
 ## General Bitcoin Core
 
 - New features should be exposed on RPC first, then can be made available in the GUI.
@@ -744,13 +787,12 @@ logging messages. They should be used as follows:
   most of the time, and it should be used for log messages that are
   useful for debugging and can reasonably be enabled on a production
   system (that has sufficient free storage space). They will be logged
-  if the program is started with `-debug=category` or `-debug=1`.
+  if the program is started with `-debug=category` or `-debug=1`, or
+  the category is enabled through the `logging` RPC.
 
 - `LogInfo(fmt, params...)` should only be used rarely, e.g. for startup
   messages or for infrequent and important events such as a new block tip
-  being found or a new outbound connection being made. These log messages
-  are unconditional, so care must be taken that they can't be used by an
-  attacker to fill up storage.
+  being found or a new outbound connection being made.
 
 - `LogError(fmt, params...)` should be used in place of `LogInfo` for
   severe problems that require the node (or a subsystem) to shut down
@@ -772,6 +814,13 @@ Note that the format strings and parameters of `LogDebug` and `LogTrace`
 are only evaluated if the logging category is enabled, so you must be
 careful to avoid side-effects in those expressions.
 
+While `LogInfo`, `LogWarning` and `LogError` messages should be rare,
+in case there are circumstances where they are not, those messages
+are automatically rate-limited to prevent potential disk-filling
+attacks. For the cases where this protection is undesirable,
+rate-limiting can be avoided with the `util::log::NO_RATE_LIMIT` tag, eg
+`LogInfo(util::log::NO_RATE_LIMIT, "UpdateTip: new best=%s ...",...)`.
+
 ## General C++
 
 For general C++ guidelines, you may refer to the [C++ Core
@@ -780,7 +829,7 @@ Guidelines](https://isocpp.github.io/CppCoreGuidelines/).
 Common misconceptions are clarified in those sections:
 
 - Passing (non-)fundamental types in the [C++ Core
-  Guideline](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-conventional).
+  Guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#rf-conventional).
 
 - If you use the `.h`, you must link the `.cpp`.
 
@@ -1364,6 +1413,46 @@ A few guidelines for modifying existing RPC interfaces:
 
   - *Rationale*: Changes in RPC JSON structure can break downstream application compatibility. Implementation of `deprecatedrpc` provides a grace period for downstream applications to migrate. Release notes provide notification to downstream users.
 
+## Feature deprecation and removal process
+
+Bitcoin Core uses a structured process for deprecating and removing features to give
+downstream users and applications time to migrate.
+
+### General principles
+
+- The minimum deprecation **grace period** for a feature that is going to be removed is one
+  major release.
+- Any deprecation or removal must come with a release note.
+
+### RPC methods and fields
+
+- To deprecate an entire RPC method, gate the old behavior behind `-deprecatedrpc=<feature>`.
+  Deprecated features should remain accessible via this flag during the grace period so
+  downstream users are not immediately broken.
+- The RPC help text must mention the deprecation and the `-deprecatedrpc=<feature>` flag
+  that re-enables it. For example:
+  ```
+  "\nDeprecated in v25.0, use the `newfoo` RPC instead. Start bitcoind with"
+  " `-deprecatedrpc=foo` to continue using this RPC.\n"
+  ```
+
+### Startup options
+
+- To deprecate a startup option, emit a warning via `LogWarning` or `InitWarning` when the
+  option is used, so users are notified at startup.
+- Update the option's help text to indicate it is deprecated and, if applicable, will be
+  removed in a future release.
+
+### REST interface
+
+- Deprecated REST endpoints or behaviors should be documented in `doc/REST-interface.md`
+  with the version they were deprecated.
+
+### ZMQ
+
+- Deprecated ZMQ topics or behaviors should be documented in `doc/zmq.md` with the version
+  they were deprecated.
+
 ## Internal interface guidelines
 
 Internal interfaces between parts of the codebase that are meant to be
diff --git a/depend/bitcoin/doc/external-signer.md b/depend/bitcoin/doc/external-signer.md
index c1b6b20c..8b02edd6 100644
--- a/depend/bitcoin/doc/external-signer.md
+++ b/depend/bitcoin/doc/external-signer.md
@@ -2,6 +2,8 @@
 
 Bitcoin Core can be launched with `-signer=<cmd>` where `<cmd>` is an external tool which can sign transactions and perform other functions. For example, it can be used to communicate with a hardware wallet.
 
+Interaction with external signer uses [Partially Signed Bitcoin Transaction (PSBT)](psbt.md).
+
 ## Example usage
 
 The following example is based on the [HWI](https://github.com/bitcoin-core/HWI) tool. Version 2.0 or newer is required. Although this tool is hosted under the Bitcoin Core GitHub organization and maintained by Bitcoin Core developers, it should be used with caution. It is considered experimental and has far less review than Bitcoin Core itself. Be particularly careful when running tools such as these on a computer with private keys on it.
@@ -11,7 +13,7 @@ When using a hardware wallet, consult the manufacturer website for (alternative)
 Start Bitcoin Core:
 
 ```sh
-$ bitcoind -signer=../HWI/hwi.py
+bitcoind -signer=../HWI/hwi.py
 ```
 
 `bitcoin node` can also be substituted for `bitcoind`.
@@ -24,14 +26,19 @@ Follow the hardware manufacturers instructions for the initial device setup, as
 
 Get a list of signing devices / services:
 
+```sh
+bitcoin-cli enumeratesigners
+```
+
 ```
-$ bitcoin-cli enumeratesigners
 {
   "signers": [
     {
-      "fingerprint": "c8df832a"
+      "fingerprint": "c8df832a",
+      "name": "trezor_t"
     }
-]
+  ]
+}
 ```
 
 The master key fingerprint is used to identify a device.
@@ -39,102 +46,141 @@ The master key fingerprint is used to identify a device.
 Create a wallet, this automatically imports the public keys:
 
 ```sh
-$ bitcoin-cli createwallet "hww" true true "" true true true
+bitcoin rpc createwallet wallet_name="hww2" disable_private_keys=true descriptors=true external_signer=true
 ```
 
-`bitcoin rpc` can also be substituted for `bitcoin-cli`.
+Creation of the external wallet can be confirmed with `getwalletinfo`, which will report `"external_signer": true`. These commands can also be executed using `bitcoin-qt` Debug Console instead of using `bitcoin rpc` or `bitcoin-cli`.
 
 ### Verify an address
 
 Display an address on the device:
 
 ```sh
-$ bitcoin-cli -rpcwallet=<wallet> getnewaddress
-$ bitcoin-cli -rpcwallet=<wallet> walletdisplayaddress <address>
+bitcoin-cli -rpcwallet=<walletname> getnewaddress
+bitcoin-cli -rpcwallet=<walletname> walletdisplayaddress <address>
 ```
 
 Replace `<address>` with the result of `getnewaddress`.
 
 ### Spending
 
-Under the hood this uses a [Partially Signed Bitcoin Transaction](psbt.md).
+Under the hood this uses a [PSBT (Partially Signed Bitcoin Transaction)](psbt.md).
 
 ```sh
-$ bitcoin-cli -rpcwallet=<wallet> sendtoaddress <address> <amount>
+bitcoin rpc -rpcwallet=<walletname> send outputs='{"<address>": <amount>}'
 ```
 
-This prompts your hardware wallet to sign, and fail if it's not connected. If successful
-it automatically broadcasts the transaction.
+This constructs a PSBT and prompts your external signer to sign (will fail if it's not connected). If successful, Bitcoin Core finalizes and broadcasts the transaction.
 
-```sh
-{"complete": true, "txid": <txid>}
+```
+{"complete": true, "txid": "<txid>"}
 ```
 
 ## Signer API
 
-In order to be compatible with Bitcoin Core any signer command should conform to the specification below. This specification is subject to change. Ideally a BIP should propose a standard so that other wallets can also make use of it.
+In order to be compatible with Bitcoin Core, any signer command should conform to the specification below. This specification is subject to change. Ideally a BIP should propose a standard so that other wallets can also make use of it.
 
 Prerequisite knowledge:
 * [Output Descriptors](descriptors.md)
 * Partially Signed Bitcoin Transaction ([PSBT](psbt.md))
 
+### Flag `--chain <name>` (required except for `enumerate`)
+
+With `<name>` one of `main`, `test`, `signet`, `regtest`, `testnet4`.
+
+Bitcoin Core passes this flag to commands that operate on a chain-specific signer, for example `getdescriptors`, `displayaddress` and `signtx`.
+
+### Flag `--stdin` (required)
+
+Indicate that (sub)command should be received over stdin and results returned in response to that. `--stdin` is a global flag, it is not specific to any subcommand.
+
+Bitcoin Core currently uses this flag for `signtx`.
+
+All subcommands SHOULD support both
+- being called as commandline arguments; or
+- being written to _external-signer_ process directly through stdin (with `--stdin`).
+
+Usage:
+```sh
+<cmd> --stdin …
+```
+
+```
+[…command and arguments written to stdin…]
+```
+
+Note: remember that shell-expansion is not available on _stdin_. Consequently, commands such as `signtx`, may write their arguments in either quoted or unquoted form.
+
+### Flag `--fingerprint <fingerprint>` (required except for `enumerate`)
+
+With `<fingerprint>` being the hexadecimal 8-symbol identifier for a wallet.
+
+Bitcoin Core passes this flag to commands that operate on a specific external-signer wallet, for example `getdescriptors`, `displayaddress` and `signtx`.
+
 ### `enumerate` (required)
 
 Usage:
+
+```sh
+<cmd> enumerate
+```
+
 ```
-$ <cmd> enumerate
 [
     {
-        "fingerprint": "00000000"
+        "fingerprint": "00000000",
+        "model": "trezor_t"
     }
 ]
 ```
 
-The command MUST return an (empty) array with at least a `fingerprint` field.
+The command MUST return an array, possibly empty, of entries that contain at least a `fingerprint` field.
+
+If present, the optional `model` field is used as the device name in the `enumeratesigners` RPC result.
 
 A future extension could add an optional return field with device capabilities. Perhaps a descriptor with wildcards. For example: `["pkh("44'/0'/$'/{0,1}/*"), sh(wpkh("49'/0'/$'/{0,1}/*")), wpkh("84'/0'/$'/{0,1}/*")]`. This would indicate the device supports legacy, wrapped SegWit and native SegWit. In addition it restricts the derivation paths that can used for those, to maintain compatibility with other wallet software. It also indicates the device, or the driver, doesn't support multisig.
 
 A future extension could add an optional return field `reachable`, in case `<cmd>` knows a signer exists but can't currently reach it.
 
-### `signtransaction` (required)
+### `signtx` (required)
 
-Usage:
-```
-$ <cmd> --fingerprint=<fingerprint> (--testnet) signtransaction <psbt>
-base64_encode_signed_psbt
-```
+`signtx` indicates a PSBT signing-request, followed by Base64-encoded PSBT. Quotes are optional.
 
-The command returns a psbt with any signatures.
+This command reads request `<base64-encoded psbt>` and MUST return a JSON object. On success, it MUST contain `{"psbt": "<base64-encoded psbt>"}` updated to include any new signatures. On failure, it SHOULD contain `{"error": "<message>"}`. Presence of a key `error` with value `null` is not considered an error.
 
-The `psbt` SHOULD include bip32 derivations. The command SHOULD fail if none of the bip32 derivations match a key owned by the device.
+PSBT SHOULD include BIP32 derivations. The command SHOULD fail if none of the BIP32 derivations match a key owned by the device.
 
 The command SHOULD fail if the user cancels.
 
-The command MAY complain if `--testnet` is set, but any of the BIP32 derivation paths contain a coin type other than `1h` (and vice versa).
+The command MAY complain if `--chain` is set to a test-network, but any of the BIP32 derivation paths contain a coin type other than `1h` (and vice versa).
 
 ### `getdescriptors` (optional)
 
 Usage:
 
-```
-$ <cmd> --fingerprint=<fingerprint> (--testnet) getdescriptors <account>
-<xpub>
+```sh
+<cmd> --fingerprint <fingerprint> --chain <name> getdescriptors --account <account>
 ```
 
 Returns descriptors supported by the device. Example:
 
+```sh
+<cmd> --fingerprint 00000000 --chain main getdescriptors --account 0
+```
+
 ```
-$ <cmd> --fingerprint=00000000 --testnet getdescriptors
 {
   "receive": [
     "pkh([00000000/44h/0h/0h]xpub6C.../0/*)#fn95jwmg",
     "sh(wpkh([00000000/49h/0h/0h]xpub6B..../0/*))#j4r9hntt",
-    "wpkh([00000000/84h/0h/0h]xpub6C.../0/*)#qw72dxa9"
+    "wpkh([00000000/84h/0h/0h]xpub6C.../0/*)#qw72dxa9",
+    "tr([00000000/86h/0h/0h]xpub6C.../0/*)#4d8tq2ns"
   ],
   "internal": [
     "pkh([00000000/44h/0h/0h]xpub6C.../1/*)#c8q40mts",
     "sh(wpkh([00000000/49h/0h/0h]xpub6B..../1/*))#85dn0v75",
-    "wpkh([00000000/84h/0h/0h]xpub6C..../1/*)#36mtsnda"
+    "wpkh([00000000/84h/0h/0h]xpub6C..../1/*)#36mtsnda",
+    "tr([00000000/86h/0h/0h]xpub6C.../1/*)#d63h6jpt"
   ]
 }
 ```
@@ -142,14 +188,14 @@ $ <cmd> --fingerprint=00000000 --testnet getdescriptors
 ### `displayaddress` (optional)
 
 Usage:
-```
-<cmd> --fingerprint=<fingerprint> (--testnet) displayaddress --desc descriptor
+```sh
+<cmd> --fingerprint <fingerprint> --chain <name> displayaddress --desc <descriptor>
 ```
 
 Example, display the first native SegWit receive address on Testnet:
 
-```
-<cmd> --fingerprint=00000000 --testnet displayaddress --desc "wpkh([00000000/84h/1h/0h]tpubDDUZ..../0/0)"
+```sh
+<cmd> --fingerprint 00000000 --chain test displayaddress --desc "wpkh([00000000/84h/1h/0h]tpubDDUZ..../0/0)"
 ```
 
 The command MUST be able to figure out the address type from the descriptor.
@@ -157,22 +203,24 @@ The command MUST be able to figure out the address type from the descriptor.
 The command MUST return an object containing `{"address": "[the address]"}`.
 As a sanity check, for devices that support this, it SHOULD ask the device to derive the address.
 
-If <descriptor> contains a master key fingerprint, the command MUST fail if it does not match the fingerprint known by the device.
+If `<descriptor>` contains a master key fingerprint, the command MUST fail if it does not match the fingerprint known by the device.
 
-If <descriptor> contains an xpub, the command MUST fail if it does not match the xpub known by the device.
+If `<descriptor>` contains an xpub, the command MUST fail if it does not match the xpub known by the device.
 
-The command MAY complain if `--testnet` is set, but the BIP32 coin type is not `1h` (and vice versa).
+The command MAY complain if `--chain` is set to a test-network, but the BIP32 coin-type is not `1h` (and vice versa).
 
 ## How Bitcoin Core uses the Signer API
 
-The `enumeratesigners` RPC simply calls `<cmd> enumerate`.
+The `enumeratesigners` RPC calls `<cmd> enumerate`, skips duplicate entries with the same `fingerprint`, and maps the optional `model` field to the RPC `name` field.
+
+Wallet operations that need a signer (`createwallet`, `walletdisplayaddress` and spending) also call `<cmd> enumerate` and fail unless exactly one signer is found, so only one device should be connected at a time.
 
 The `createwallet` RPC calls:
 
-* `<cmd> --fingerprint=00000000 getdescriptors 0`
+* `<cmd> --fingerprint 00000000 --chain <name> getdescriptors --account 0`
 
-It then imports descriptors for all support address types, in a BIP44/49/84 compatible manner.
+It then imports descriptors for all supported address types, in a BIP44/49/84/86 compatible manner.
 
-The `walletdisplayaddress` RPC reuses some code from `getaddressinfo` on the provided address and obtains the inferred descriptor. It then calls `<cmd> --fingerprint=00000000 displayaddress --desc=<descriptor>`.
+The `walletdisplayaddress` RPC obtains the inferred descriptor for the provided address. It then calls `<cmd> --fingerprint 00000000 --chain <name> displayaddress --desc <descriptor>`.
 
-`sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transaction.
+For external-signer wallets, spending uses `send` or `sendall`, and fee-bumping uses `bumpfee`. Bitcoin Core builds a PSBT, adds key origin information, checks whether any input key origin fingerprint matches the signer, calls `<cmd> --stdin --fingerprint 00000000 --chain <name>`, and sends `signtx <psbt>` over stdin. If signatures are sufficient, it finalizes the transaction and, for broadcasting RPCs, broadcasts it. If signing cannot complete, the call fails with an error. For manual fee-bumping, use `psbtbumpfee` to obtain a PSBT for signing.
diff --git a/depend/bitcoin/doc/fuzzing.md b/depend/bitcoin/doc/fuzzing.md
index 4b108862..253f3f12 100644
--- a/depend/bitcoin/doc/fuzzing.md
+++ b/depend/bitcoin/doc/fuzzing.md
@@ -14,6 +14,8 @@ $ FUZZ=process_message build_fuzz/bin/fuzz
 ```
 
 One can use `--preset=libfuzzer-nosan` to do the same without common sanitizers enabled.
+Note that this preset uses a different build directory, so replace `build_fuzz` with
+`build_fuzz_nosan` in the build and run commands above.
 See [further](#run-without-sanitizers-for-increased-throughput) for more information.
 
 There is also a runner script to execute all fuzz targets. Refer to
diff --git a/depend/bitcoin/doc/i2p.md b/depend/bitcoin/doc/i2p.md
index 2877c1e5..6bf427ea 100644
--- a/depend/bitcoin/doc/i2p.md
+++ b/depend/bitcoin/doc/i2p.md
@@ -4,20 +4,20 @@ It is possible to run Bitcoin Core as an
 [I2P (Invisible Internet Project)](https://en.wikipedia.org/wiki/I2P)
 service and connect to such services.
 
-This [glossary](https://geti2p.net/en/about/glossary) may be useful to get
+This [glossary](https://i2p.net/en/docs/overview/glossary) may be useful to get
 started with I2P terminology.
 
 ## Run Bitcoin Core with an I2P router (proxy)
 
-A running I2P router (proxy) is required with the [SAM](https://geti2p.net/en/docs/api/samv3)
+A running I2P router (proxy) is required with the [SAM](https://i2p.net/en/docs/api/samv3)
 application bridge enabled. The following routers are recommended for use with Bitcoin Core:
 
-- [i2prouter (I2P Router)](https://geti2p.net), the official implementation in
+- [i2prouter (I2P Router)](https://i2p.net), the official implementation in
   Java. The SAM bridge is not enabled by default; it must be started manually,
   or configured to start automatically, in the Clients page in the
   router console (`http://127.0.0.1:7657/configclients`) or in the `clients.config` file.
 - [i2pd (I2P Daemon)](https://github.com/PurpleI2P/i2pd)
-  ([documentation](https://i2pd.readthedocs.io/en/latest)), a lighter
+  ([documentation](https://docs.i2pd.website/en/latest)), a lighter
   alternative in C++. It enables the SAM bridge by default.
 
 Note the IP address and port the SAM proxy is listening to; usually, it is
@@ -113,7 +113,7 @@ You can use the `getnodeaddresses` RPC to fetch a number of I2P peers known to y
 
 ## Compatibility
 
-Bitcoin Core uses the [SAM v3.1](https://geti2p.net/en/docs/api/samv3) protocol
+Bitcoin Core uses the [SAM v3.1](https://i2p.net/en/docs/api/samv3) protocol
 to connect to the I2P network. Any I2P router that supports it can be used.
 
 ## Ports in I2P and Bitcoin Core
@@ -158,13 +158,13 @@ Similar bandwidth configuration options for the Java I2P router can be found in
 `http://127.0.0.1:7657/config` under the "Bandwidth" tab.
 
 Before doing this, please see the "Participating Traffic Considerations" section
-in [Embedding I2P in your Application](https://geti2p.net/en/docs/applications/embedding).
+in [Embedding I2P in your Application](https://i2p.net/en/docs/applications/embedding).
 
 In most cases, the default router settings should work fine.
 
 ## Bundling I2P in a Bitcoin application
 
-Please see the "General Guidance for Developers" section in https://geti2p.net/en/docs/api/samv3
+Please see the "General Guidance for Developers" section in https://i2p.net/en/docs/api/samv3
 if you are developing a downstream application that may be bundling I2P with Bitcoin.
 
 ## Privacy recommendations
diff --git a/depend/bitcoin/doc/multisig-tutorial.md b/depend/bitcoin/doc/multisig-tutorial.md
index b6f496a3..fd74e62e 100644
--- a/depend/bitcoin/doc/multisig-tutorial.md
+++ b/depend/bitcoin/doc/multisig-tutorial.md
@@ -9,18 +9,16 @@ This tutorial uses [jq](https://github.com/stedolan/jq) JSON processor to proces
 Before starting this tutorial, start the bitcoin node on the signet network.
 
 ```bash
-./build/bin/bitcoind -signet -daemon
+./build/bin/bitcoin node -signet -daemon
 ```
 
-This tutorial also uses the default WPKH derivation path to get the xpubs and does not conform to [BIP 45](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki) or [BIP 87](https://github.com/bitcoin/bips/blob/master/bip-0087.mediawiki).
-
-At the time of writing, there is no way to extract a specific path from wallets in Bitcoin Core. For this, an external signer/xpub can be used.
+This tutorial also uses the default PKH derivation path to get the xpubs and does not conform to [BIP 45](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki) or [BIP 87](https://github.com/bitcoin/bips/blob/master/bip-0087.mediawiki).
 
 ## 1.1 Basic Multisig Workflow
 
 ### 1.1 Create the Descriptor Wallets
 
-For a 2-of-3 multisig, create 3 descriptor wallets. It is important that they are of the descriptor type in order to retrieve the wallet descriptors. These wallets contain HD seed and private keys, which will be used to sign the PSBTs and derive the xpub.
+For a 2-of-3 multisig, create 3 wallets. These wallets contain HD seed and private keys, which will be used to sign the PSBTs and derive the xpub.
 
 These three wallets should not be used directly for privacy reasons (public key reuse). They should only be used to sign transactions for the (watch-only) multisig wallet.
 
@@ -31,16 +29,7 @@ do
 done
 ```
 
-Extract the xpub of each wallet. To do this, the `listdescriptors` RPC is used. By default, Bitcoin Core single-sig wallets are created using path `m/44'/1'/0'` for PKH, `m/84'/1'/0'` for WPKH, `m/49'/1'/0'` for P2WPKH-nested-in-P2SH and `m/86'/1'/0'` for P2TR based accounts. Each of them uses the chain 0 for external addresses and chain 1 for internal ones, as shown in the example below.
-
-```
-wpkh([1004658e/84'/1'/0']tpubDCBEcmVKbfC9KfdydyLbJ2gfNL88grZu1XcWSW9ytTM6fitvaRmVyr8Ddf7SjZ2ZfMx9RicjYAXhuh3fmLiVLPodPEqnQQURUfrBKiiVZc8/0/*)#g8l47ngv
-
-wpkh([1004658e/84'/1'/0']tpubDCBEcmVKbfC9KfdydyLbJ2gfNL88grZu1XcWSW9ytTM6fitvaRmVyr8Ddf7SjZ2ZfMx9RicjYAXhuh3fmLiVLPodPEqnQQURUfrBKiiVZc8/1/*)#en65rxc5
-```
-
-The suffix (after #) is the checksum. Descriptors can optionally be suffixed with a checksum to protect against typos or copy-paste errors.
-All RPCs in Bitcoin Core will include the checksum in their output.
+Extract the xpub of each wallet. To do this, the `derivehdkey` RPC is used.
 
 Note that previously at least two descriptors were usually used, one for external derivation paths and one for internal ones. Since https://github.com/bitcoin/bitcoin/pull/22838 this redundancy has been eliminated by a multipath descriptor with <code><0;1></code> at the [BIP-44](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change) change level expanding to external and internal descriptors when imported.
 
@@ -49,49 +38,44 @@ declare -A xpubs
 
 for ((n=1;n<=3;n++))
 do
- xpubs["xpub_${n}"]=$(./build/bin/bitcoin rpc -signet -rpcwallet="participant_${n}" listdescriptors | jq '.descriptors | [.[] | select(.desc | startswith("wpkh") and contains("/0/*") )][0] | .desc' | grep -Po '(?<=\().*(?=\))' | sed 's /0/\* /<0;1>/* ')
+ xpubs["xpub_${n}"]=$(./build/bin/bitcoin rpc -signet -rpcwallet="participant_${n}" derivehdkey "m/44h/1h/0h" | jq -r '.origin + .xpub')
 done
 ```
 
-`jq` is used to extract the xpub from the `wpkh` descriptor.
-
-The following command can be used to verify if the xpub was generated correctly.
+The following command can be used to verify if the xpubs were obtained successfully:
 
 ```bash
 for x in "${!xpubs[@]}"; do printf "[%s]=%s\n" "$x" "${xpubs[$x]}" ; done
 ```
 
-As previously mentioned, this step extracts the `m/84'/1'/0'` account instead of the path defined in [BIP 45](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki) or [BIP 87](https://github.com/bitcoin/bips/blob/master/bip-0087.mediawiki), since there is no way to extract a specific path in Bitcoin Core at the time of writing.
+As previously mentioned, this step extracts the `m/44'/1'/0'` account instead of the path defined in [BIP 45](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki) or [BIP 87](https://github.com/bitcoin/bips/blob/master/bip-0087.mediawiki), because the wallet currently can't sign for a derivation path that's not used in one of its descriptors.
 
 ### 1.2 Define the Multisig Descriptor
 
-Define the multisig descriptor, add the checksum and then, wrap it in a JSON array.
+Define the multisig descriptors.
+
+All RPCs in Bitcoin Core will include the checksum in their output.
 
 ```bash
-desc="wsh(sortedmulti(2,${xpubs["xpub_1"]},${xpubs["xpub_2"]},${xpubs["xpub_3"]}))"
+desc="wsh(sortedmulti(2,${xpubs["xpub_1"]}/<0;1>/*,${xpubs["xpub_2"]}/<0;1>/*,${xpubs["xpub_3"]}/<0;1>/*))"
 
-checksum=$(./build/bin/bitcoin rpc -signet getdescriptorinfo $desc | jq -r '.checksum')
+desc_sum=$(./build/bin/bitcoin rpc -signet getdescriptorinfo $desc | jq -r '.checksum')
 
-multisig_desc="[{\"desc\": \"${desc}#${checksum}\", \"active\": true, \"timestamp\": \"now\"}]"
+multisig_desc="[{\"desc\": \"$desc#$desc_sum\", \"active\": true, \"timestamp\": \"now\"}]"
 ```
 
 `desc` specifies the output type (`wsh`, in this case) and the xpubs involved. It also uses BIP 67 (`sortedmulti`), so the wallet can be recreated without worrying about the order of xpubs. Conceptually, descriptors describe a list of scriptPubKey (along with information for spending from it) [[source](https://github.com/bitcoin/bitcoin/issues/21199#issuecomment-780772418)].
 
-After creating the descriptor, it is necessary to add the checksum, which is required by the `importdescriptors` RPC.
+The checksum for a descriptor without one can be computed using the `getdescriptorinfo` RPC. The response has a `checksum` field, which is appended to the descriptor after `#` to protect against typos or copy-paste errors.
 
-The checksum for a descriptor without one can be computed using the `getdescriptorinfo` RPC. The response has the `checksum` field, which is the checksum for the input descriptor, append "#" and this checksum to the input descriptor.
-
-There are other fields that can be added to the descriptor:
+There are other fields that can be added to the descriptors:
 
 * `active`: Sets the descriptor to be the active one for the corresponding output type (`wsh`, in this case).
-* `internal`: Indicates whether matching outputs should be treated as something other than incoming payments (e.g. change).
 * `timestamp`: Sets the time from which to start rescanning the blockchain for the descriptor, in UNIX epoch time.
 
-Note: when a multipath descriptor is imported, it is expanded into two descriptors which are imported separately, with the second implicitly used for internal (change) addresses.
-
 Documentation for these and other parameters can be found by typing `./build/bin/bitcoin rpc -signet help importdescriptors`.
 
-`multisig_desc` wraps the descriptor in a JSON array and will be used to create the multisig wallet.
+`multisig_desc` concatenates the descriptor in a JSON array and then it will be used to create the multisig wallet.
 
 ### 1.3 Create the Multisig Wallet
 
@@ -99,16 +83,18 @@ To create the multisig wallet, first create an empty one (no keys, HD seed and p
 
 Then import the descriptor created in the previous step using the `importdescriptors` RPC.
 
-After that, `getwalletinfo` can be used to check if the wallet was created successfully.
+After that, `listdescriptors` can be used to check if the wallet was created successfully.
 
 ```bash
-./build/bin/bitcoin rpc -signet createwallet "multisig_wallet_01" disable_private_keys=true blank=true
+./build/bin/bitcoin rpc -signet -named createwallet wallet_name="multisig_wallet_01" disable_private_keys=true blank=true
 
 ./build/bin/bitcoin rpc -signet -rpcwallet="multisig_wallet_01" importdescriptors "$multisig_desc"
 
-./build/bin/bitcoin rpc -signet -rpcwallet="multisig_wallet_01" getwalletinfo
+./build/bin/bitcoin rpc -signet -rpcwallet="multisig_wallet_01" listdescriptors
 ```
 
+The `<0;1>` notation in `desc` caused the creation of two descriptors. One uses the chain 0 for external addresses, and the other uses chain 1 for internal ones (change).
+
 Once the wallets have already been created and this tutorial needs to be repeated or resumed, it is not necessary to recreate them, just load them with the command below:
 
 ```bash
@@ -199,7 +185,7 @@ psbt_2=$(./build/bin/bitcoin rpc -signet -rpcwallet="participant_2" walletproces
 The PSBT, if signed separately by the co-signers, must be combined into one transaction before being finalized. This is done by `combinepsbt` RPC.
 
 ```bash
-combined_psbt=$(./build/bin/bitcoin rpc -signet combinepsbt "[$psbt_1, $psbt_2]")
+combined_psbt=$(./build/bin/bitcoin rpc -signet combinepsbt txs="[$psbt_1, $psbt_2]")
 ```
 
 There is an RPC called `joinpsbts`, but it has a different purpose than `combinepsbt`. `joinpsbts` joins the inputs from multiple distinct PSBTs into one PSBT.
diff --git a/depend/bitcoin/doc/offline-signing-tutorial.md b/depend/bitcoin/doc/offline-signing-tutorial.md
index ffe15622..a6454d09 100644
--- a/depend/bitcoin/doc/offline-signing-tutorial.md
+++ b/depend/bitcoin/doc/offline-signing-tutorial.md
@@ -10,12 +10,12 @@ This workflow uses [Partially Signed Bitcoin Transactions](/doc/psbt.md) (PSBTs)
 > While this tutorial demonstrates the process using `signet` network, you should omit the `-signet` flag in the provided commands when working with `mainnet`.
 
 ## Overview
-In this tutorial we have two hosts, both running Bitcoin v25.0
+In this tutorial we have two hosts, both running Bitcoin v32.0
 
 * `offline` host which is disconnected from all networks (internet, Tor, wifi, bluetooth etc.) and does not have, or need, a copy of the blockchain.
 * `online` host which is a regular online node with a synced blockchain.
 
-We are going to first create an `offline_wallet` on the offline host. We will then create a `watch_only_wallet` on the online host using public key descriptors exported from the `offline_wallet`. Next we will receive some coins into the wallet. In order to spend these coins we'll create an unsigned PSBT using the `watch_only_wallet`, sign the PSBT using the private keys in the `offline_wallet`, and finally broadcast the signed PSBT using the online host.
+We are going to first create an `offline_wallet` on the offline host. We will then create a `watch_only_wallet` on the online host using a wallet file exported from the `offline_wallet`. Next we will receive some coins into the wallet. In order to spend these coins we'll create an unsigned PSBT using the `watch_only_wallet`, sign the PSBT using the private keys in the `offline_wallet`, and finally broadcast the signed PSBT using the online host.
 
 ### Requirements
 - [jq](https://jqlang.github.io/jq/) installation - This tutorial uses jq to process certain fields from JSON RPC responses, but this convenience is optional.
@@ -39,72 +39,30 @@ We are going to first create an `offline_wallet` on the offline host. We will th
 > [!NOTE]
 > The use of a passphrase is crucial to encrypt the wallet.dat file. This encryption ensures that even if an unauthorized individual gains access to the offline host, they won't be able to access the wallet's contents. Further details about securing your wallet can be found in  [Managing the Wallet](/doc/managing-wallets.md#12-encrypting-the-wallet)
 
-2. Export the public key-only descriptors from the offline host to a JSON file named `descriptors.json`. We use `jq` here to extract the `.descriptors` field from the full RPC response.
-
+2. Export the wallet in a watch-only format to a .dat file named `watch_only_wallet.dat`.
 ```sh
-[offline]$ ./build/bin/bitcoin-cli -signet -rpcwallet="offline_wallet" listdescriptors \
-             | jq -r '.descriptors' \
-             >> /path/to/descriptors.json
+[offline]$ ./build/bin/bitcoin-cli -signet -rpcwallet="offline_wallet" -named exportwatchonlywallet \
+             destination=/path/to/watch_only_wallet.dat
 ```
 
 > [!NOTE]
-> The `descriptors.json` file will be transferred to the online machine (e.g. using a USB flash drive) where it can be imported to create a related watch-only wallet.
+> The `watch_only_wallet.dat` file will be transferred to the online machine (e.g. using a USB flash drive) where it can be imported to create a related watch-only wallet.
 
 ### Create the online `watch_only_wallet`
 
-1. On the online machine create a blank watch-only wallet which has private keys disabled and is named `watch_only_wallet`. This is achieved by using the `createwallet` options: `disable_private_keys=true, blank=true`.
-
+On the online machine import the watch-only wallet. This wallet will have the private keys disabled and is named `watch_only_wallet`. This is achieved by using the `restorewallet` rpc call.
 The `watch_only_wallet` wallet will be used to track and validate incoming transactions, create unsigned PSBTs when spending coins, and broadcast signed and finalized PSBTs.
 
-> [!NOTE]
-> `disable_private_keys` indicates that the wallet should refuse to import private keys, i.e. will be a dedicated watch-only wallet.
-
 ```sh
-[online]$ ./build/bin/bitcoin-cli -signet -named createwallet \
+[online]$ ./build/bin/bitcoin-cli -signet -named restorewallet \
               wallet_name="watch_only_wallet" \
-              disable_private_keys=true \
-              blank=true
+              backup_file=/path/to/watch_only_wallet.dat
 
 {
   "name": "watch_only_wallet"
 }
 ```
 
-2. Import the `offline_wallet`s public key descriptors to the online `watch_only_wallet` using the `descriptors.json` file created on the offline wallet.
-
-```sh
-[online]$ ./build/bin/bitcoin-cli -signet -rpcwallet="watch_only_wallet" importdescriptors "$(cat /path/to/descriptors.json)"
-
-[
-  {
-    "success": true
-  },
-  {
-    "success": true
-  },
-  {
-    "success": true
-  },
-  {
-    "success": true
-  },
-  {
-    "success": true
-  },
-  {
-    "success": true
-  },
-  {
-    "success": true
-  },
-  {
-    "success": true
-  }
-]
-```
-> [!NOTE]
-> Multiple success values indicate that multiple descriptors, for different address types, have been successfully imported. This allows generating different address types on the `watch_only_wallet`.
-
 ### Fund the `offline_wallet`
 
 At this point, it's important to understand that both the `offline_wallet` and online `watch_only_wallet` share the same public keys. As a result, they generate the same addresses. Transactions can be created using either wallet, but valid signatures can only be added by the `offline_wallet` as only it has the private keys.
@@ -160,8 +118,6 @@ tb1qtu5qgc6ddhmqm5yqjvhg83qgk2t4ewajg0h6yh
 
 cHNidP8BAHECAAAAAWLHKR9/xAjetzL/FCmZU5lbfINRMWPRPHWO68PfUzkPAQAAAAD9////AoA4AQAAAAAAFgAULajnzvO5M38eEwmu9dF+xH5m5RGs0g0AAAAAABYAFMaT0f/Wp2DCZzL6dkJ3GhWj4Y9vAAAAAAABAHECAAAAAY+dRPEBrGopkw4ugSzS9npzJDEIrE/bq1XXI0KbYnYrAQAAAAD+////ArKaXgAAAAAAFgAUwEc4LdoxSjbWo/2Ue+HS+QjwfiBAQg8AAAAAABYAFF8oBGNNbfYN0ICTLoPECLKXXLuyYW8CAAEBH0BCDwAAAAAAFgAUXygEY01t9g3QgJMug8QIspdcu7IiBgJZMszudZAVj34IuzYpDRNdMKCwRRY9qJbhzXZF7EIjqRgwbHNPVAAAgAEAAIAAAACAAAAAAAAAAAAAACICA7BlBnyAR4F2UkKuSX9MFhYCsn6j//z9i7lHDm1O0CU0GDBsc09UAACAAQAAgAAAAIABAAAAAAAAAAA=
 ```
-> [!NOTE]
-> Leaving the `input` array empty in the above `walletcreatefundedpsbt` command is permitted and will cause the wallet to automatically select appropriate inputs for the transaction.
 
 ### Decode and Analyze the Unsigned PSBT
 
@@ -252,7 +208,7 @@ You can also show transactions related to the wallet using `listtransactions`
 ```sh
 [online]$ ./build/bin/bitcoin-cli -signet -rpcwallet="watch_only_wallet" listtransactions
 
-{
+[
     ...
-}
+]
 ```
diff --git a/depend/bitcoin/doc/reduce-memory.md b/depend/bitcoin/doc/reduce-memory.md
index 44d90bcf..6729ab66 100644
--- a/depend/bitcoin/doc/reduce-memory.md
+++ b/depend/bitcoin/doc/reduce-memory.md
@@ -33,7 +33,7 @@ The size of some in-memory caches can be reduced. As caches trade off memory usa
 
 ## Number of peers
 
-- `-maxconnections=<n>` - the maximum number of connections, which defaults to 125. Each active connection takes up some
+- `-maxconnections=<n>` - the maximum number of connections, which defaults to 200. Each active connection takes up some
   memory. This option applies only if inbound connections are enabled; otherwise, the number of connections will not
   be more than 11. Of the 11 outbound peers, there can be 8 full-relay connections, 2 block-relay-only ones,
   and occasionally 1 short-lived feeler or extra outbound block-relay-only connection.
@@ -49,6 +49,7 @@ threads take up 8MiB for the thread stack on a 64-bit system, and 4MiB in a
 
 - `-par=<n>` - the number of script verification threads, defaults to the number of cores in the system minus one.
 - `-rpcthreads=<n>` - the number of threads used for processing RPC requests, defaults to `16`.
+- `-prevoutfetchthreads=<n>` - the number of threads used to fetch block input prevouts, defaults to `8`.
 
 ## Linux specific
 
diff --git a/depend/bitcoin/doc/reduce-traffic.md b/depend/bitcoin/doc/reduce-traffic.md
index 8926a836..315de214 100644
--- a/depend/bitcoin/doc/reduce-traffic.md
+++ b/depend/bitcoin/doc/reduce-traffic.md
@@ -3,8 +3,9 @@ Reduce Traffic
 
 Some node operators need to deal with bandwidth caps imposed by their ISPs.
 
-By default, Bitcoin Core allows up to 125 connections to different peers, 11 of
-which are outbound. You can therefore, have at most 114 inbound connections.
+By default, Bitcoin Core allows up to 200 connections to different peers, 11 of
+which are outbound. You can therefore, have at most 189 inbound connections, half of
+which can only be taken up by low-traffic block-relay-only peers.
 Of the 11 outbound peers, there can be 8 full-relay connections, 2
 block-relay-only ones and occasionally 1 short-lived feeler or an extra block-relay-only connection.
 
diff --git a/depend/bitcoin/doc/release-notes-21283.md b/depend/bitcoin/doc/release-notes-21283.md
new file mode 100644
index 00000000..fb5494a1
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-21283.md
@@ -0,0 +1,6 @@
+Updated RPCs
+------------
+
+- `createpsbt`, `walletcreatepsbt`, `converttopsbt`, and `psbtbumpfee`
+  will now default to creating version 2 PSBTs. An optional `psbt_version`
+  argument is added to these RPCs which allows specifying the version of PSBT to create.
diff --git a/depend/bitcoin/doc/release-notes-26201.md b/depend/bitcoin/doc/release-notes-26201.md
index 66c9da54..108b1bfd 100644
--- a/depend/bitcoin/doc/release-notes-26201.md
+++ b/depend/bitcoin/doc/release-notes-26201.md
@@ -1,4 +1,9 @@
 RPC
 ---
 
-- 'taproot' has been removed from 'getdeploymentinfo' because its historical activation height is no longer used anywhere in the codebase. (#26201)
+- 'taproot' has been removed from 'getdeploymentinfo' because its historical
+  activation height is no longer used anywhere in the codebase.
+  Applications that rely on `deployments.taproot` to detect Taproot support
+  should either assume Taproot to be always active (since Bitcoin Core v24.0),
+  or check for `TAPROOT` in the `script_flags` array returned by
+  `getdeploymentinfo` (since Bitcoin Core v31.0). (#26201)
diff --git a/depend/bitcoin/doc/release-notes-29136.md b/depend/bitcoin/doc/release-notes-29136.md
new file mode 100644
index 00000000..af074a0b
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-29136.md
@@ -0,0 +1,6 @@
+Wallet
+------
+- A new RPC `addhdkey` is added which allows a BIP 32 extended key to be added to the wallet without
+  needing to import it as part of a separate descriptor. This key will not be used to produce any
+  output scripts unless it is explicitly imported as part of a separate descriptor independent of
+  the `addhdkey` RPC.
diff --git a/depend/bitcoin/doc/release-notes-32220.md b/depend/bitcoin/doc/release-notes-32220.md
new file mode 100644
index 00000000..c2527157
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-32220.md
@@ -0,0 +1,9 @@
+### Build System
+
+- The undocumented `BITCOIN_GENBUILD_NO_GIT` environment variable is no longer
+  required and has been removed. The build system now automatically detects
+  when it is being built from a source archive or as a subproject of a git-aware
+  parent project and skips git metadata fetching.
+
+  Users who need to disable git execution explicitly can still do so by
+  configuring with `-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON`.
diff --git a/depend/bitcoin/doc/release-notes-32489.md b/depend/bitcoin/doc/release-notes-32489.md
new file mode 100644
index 00000000..e8a0eabc
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-32489.md
@@ -0,0 +1,15 @@
+New RPCs
+--------
+
+A new `exportwatchonlywallet` RPC creates a watchonly wallet file from an
+existing descriptor wallet. The exported file contains the wallet's public
+descriptors (with derived key caches where needed), transactions, and address
+book data, but no private keys. It can be imported on another node using the
+existing `restorewallet` RPC.
+
+Wallet
+------
+
+The [Offline Signing Tutorial](/doc/offline-signing-tutorial.md) has been
+updated to use `exportwatchonlywallet` for setting up the online watch-only
+wallet, replacing the previous manual descriptor import workflow.
diff --git a/depend/bitcoin/doc/release-notes-32784.md b/depend/bitcoin/doc/release-notes-32784.md
new file mode 100644
index 00000000..6312165f
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-32784.md
@@ -0,0 +1,9 @@
+Wallet
+------
+
+- A new `derivehdkey` RPC is available to obtain an xpub or xprv for a
+  derivation path with at least one hardened step from an HD key known to the
+  wallet. This can be used to coordinate a multisig setup, where each signer
+  shares an xpub using a
+  different derivation path than the default single-signature descriptors. The
+  example in `doc/multisig-tutorial.md` is updated to use this RPC. (#32784)
diff --git a/depend/bitcoin/doc/release-notes-32800.md b/depend/bitcoin/doc/release-notes-32800.md
new file mode 100644
index 00000000..de7a427e
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-32800.md
@@ -0,0 +1,9 @@
+- Mempool RPCs (`getrawmempool`, `getmempoolentry`, `testmempoolaccept`, `submitpackage`)
+now include an additional field `vsize_adjusted` (which is the sigop-adjusted virtual size
+used for policy) and `vsize_bip141` (which represents the raw BIP141 virtual size).
+While `vsize` is marked as DEPRECATED, it was previously erroneously described as the BIP 141
+vsize, but is actually sigops-adjusted vsize. Use `vsize_bip141` to actually get that behavior
+or switch to the explicit `vsize_adjusted` for retained behavior.
+
+- `getrawtransaction` RPC now includes an additional field `vsize_adjusted`, which is the
+sigop-adjusted virtual size if the transaction is in the mempool.
diff --git a/depend/bitcoin/doc/release-notes-33671.md b/depend/bitcoin/doc/release-notes-33671.md
new file mode 100644
index 00000000..2df75f3d
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-33671.md
@@ -0,0 +1,11 @@
+Updated RPCs
+------------
+
+- `getbalances` now includes a `nonmempool` field under `mine`, reporting
+  the net balance of wallet transactions that are not in the mempool (e.g.
+  due to too low a feerate, too many unconfirmed ancestors, or a too-large
+  `OP_RETURN` output). This value is always negative, and is typically an
+  over-estimate since it accounts for coins being spent but not for change
+  outputs returning to the wallet (which are also outside the mempool).
+  Without this field, funds involved in non-mempool transactions could
+  appear to go missing from the wallet balance. (#33671)
diff --git a/depend/bitcoin/doc/release-notes-33966.md b/depend/bitcoin/doc/release-notes-33966.md
new file mode 100644
index 00000000..7251a13d
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-33966.md
@@ -0,0 +1,9 @@
+Mining
+------
+
+- The IPC mining interface now rejects out-of-range block template options
+  instead of silently clamping them, such as oversized reserved block weight or
+  coinbase sigops limits. (#33966)
+
+- The `-blockmaxweight` startup option is now rejected when it is lower than
+  `-blockreservedweight`, instead of being silently clamped. (#33966)
diff --git a/depend/bitcoin/doc/release-notes-34544.md b/depend/bitcoin/doc/release-notes-34544.md
new file mode 100644
index 00000000..bcc3e38f
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-34544.md
@@ -0,0 +1,7 @@
+Wallet
+------
+
+- Wallets names that are relative paths including `..` and `.` elements, and
+  wallets named `/` are no longer allowed. Any users that depended on this
+  behavior can instead use absolute paths to their wallet or move their wallet
+  to a safer path.
diff --git a/depend/bitcoin/doc/release-notes-34628.md b/depend/bitcoin/doc/release-notes-34628.md
new file mode 100644
index 00000000..884ac073
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-34628.md
@@ -0,0 +1,13 @@
+P2P and network changes
+-----------------------
+
+- To reduce memory and CPU usage during periods of high transaction
+  volume, rate-limiting of outgoing transaction relay has been changed
+  to use a global backlog instead of being done on a per-peer basis. The
+  default rate-limit remains as 14 tx/s (boosted by 2.5x for outbound
+  peers), though this can be changed via the `-txsendrate` configuration
+  option. An additional bandwidth rate-limit has also been introduced
+  at 12MB of transactions per 10 minutes, with a high burst rate. The
+  size of the global backlog and the token bucket values for the rate
+  limits can be queried via the `getnetworkinfo` RPC. (#34628)
+
diff --git a/depend/bitcoin/doc/release-notes-34672.md b/depend/bitcoin/doc/release-notes-34672.md
new file mode 100644
index 00000000..060d9142
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-34672.md
@@ -0,0 +1,11 @@
+IPC Interface
+-------------
+
+- `BlockTemplate.submitSolution` now returns `reason` and `debug` rejection
+  details in addition to the boolean result. Clients must regenerate IPC
+  bindings from the updated `mining.capnp` schema to use the new method. The
+  previous `@7` method now returns an error directing clients to update. (#34672)
+
+- `BlockTemplate.submitSolution` now reports duplicate blocks as failures with
+  `reason="duplicate"`, matching `Mining.submitBlock`, instead of returning
+  success for duplicate submissions. (#34672)
diff --git a/depend/bitcoin/doc/release-notes-34779.md b/depend/bitcoin/doc/release-notes-34779.md
new file mode 100644
index 00000000..7f1f5099
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-34779.md
@@ -0,0 +1,5 @@
+Logging
+-------
+
+- BIP 9 bits 5 to 28 inclusive are now ignored for soft fork signaling, as per BIP 323. We won't
+  warn about unknown deployments when receiving blocks that set any of those bits in their version.
diff --git a/depend/bitcoin/doc/release-notes-34794.md b/depend/bitcoin/doc/release-notes-34794.md
new file mode 100644
index 00000000..befafa94
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-34794.md
@@ -0,0 +1,8 @@
+REST API
+--------
+
+- REST responses now include `Cache-Control` headers to guide intermediary
+  caches. Immutable responses such as block binary and hex data, block parts,
+  block filters, spent transaction outputs, and block-specific deployment info
+  are marked cacheable for one day. Responses that can change with active chain
+  or node state, as well as errors, are marked `no-store`. (#34794)
diff --git a/depend/bitcoin/doc/release-notes-34917.md b/depend/bitcoin/doc/release-notes-34917.md
new file mode 100644
index 00000000..cd79418c
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-34917.md
@@ -0,0 +1,9 @@
+RPC and Startup Option
+------------
+The `bip125-replaceable` key in the wallet transaction RPCs such
+as `listtransactions`, `listsinceblock`, and `gettransaction` is
+marked as deprecated. Users still have the option to retrieve this
+key by passing the `-deprecatedrpc=bip125` startup option. Also,
+the `-walletrbf` startup option has been marked as deprecated and
+will be fully removed in the next release. Using this option emits
+a warning in the logs.
diff --git a/depend/bitcoin/doc/release-notes-35182.md b/depend/bitcoin/doc/release-notes-35182.md
new file mode 100644
index 00000000..8d2b6918
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35182.md
@@ -0,0 +1,16 @@
+HTTP: RPC / REST
+----------------
+
+The HTTP server has been rewritten from scratch to replace libevent. (#35182)
+
+The `libevent` logging category has been removed. Configurations like
+`-debug=libevent` or `-debugexclude=libevent` will log a deprecation warning
+and be ignored. These configurations will result in an error in a future release.
+
+Certain HTTP edge cases will observe different behavior to be more RFC-compliant:
+
+- Stricter enforcement of maximum headers size (8192 bytes)
+- Reject requests with whitespace in header field-names
+- "Line Folding" is rejected (whitespace at start of a header line)
+- Tolerate `%` at the end of requested URLs
+- Multiple "Content-Length" headers with different values are rejected
diff --git a/depend/bitcoin/doc/release-notes-35266 b/depend/bitcoin/doc/release-notes-35266
new file mode 100644
index 00000000..2c54c88e
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35266
@@ -0,0 +1,7 @@
+RPC
+---
+
+The `migratewallet` RPC now gives the option to not load the descriptor wallet after migrating it from a legacy wallet.
+This will now allow pruned nodes to migrate a wallet out of sync below the pruning height.
+Note that to use the new wallet it must be loaded to a full node anyway.
+
diff --git a/depend/bitcoin/doc/release-notes-35267.md b/depend/bitcoin/doc/release-notes-35267.md
new file mode 100644
index 00000000..ff9ad455
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35267.md
@@ -0,0 +1,4 @@
+RPC
+---
+
+The `getprivatebroadcastinfo` and `abortprivatebroadcast` RPCs now return an error `-32601`, "Method not found", when `-privatebroadcast` is not enabled at startup.
diff --git a/depend/bitcoin/doc/release-notes-35295.md b/depend/bitcoin/doc/release-notes-35295.md
new file mode 100644
index 00000000..de646531
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35295.md
@@ -0,0 +1,8 @@
+Performance Improvements
+------------------------
+
+- Block validation can now prefetch input prevouts from the chainstate database
+  in parallel while connecting blocks, speeding up validation when prevouts need
+  to be read from disk. A new `-prevoutfetchthreads=<n>` option controls the
+  number of prefetch worker threads. The default is 8 threads, up to a maximum
+  of 16; set it to 0 to disable parallel prefetching. (#35295)
diff --git a/depend/bitcoin/doc/release-notes-35319.md b/depend/bitcoin/doc/release-notes-35319.md
new file mode 100644
index 00000000..6b729969
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35319.md
@@ -0,0 +1,20 @@
+P2P and network changes
+-----------------------
+
+- Fix a possible leak of the originator's IP address for transactions sent with
+`sendrawtransaction` RPC when `-privatebroadcast=1`. When Bitcoin Core connects
+to a peer, if that peer has been advertised to support P2P protocol v2, then
+Bitcoin Core tries to use the v2 protocol and if that fails it retries the
+connection using the v1 protocol. When the private broadcast is about to send a
+transaction to an IPv4 or IPv6 peer it overrides the normal proxy selection and
+forces the connection through the Tor proxy (and thus through the Tor network,
+protecting the sender's IP address). However if v2 protocol is tried and it
+fails, then the v1 retry connection would be made disregarding the "override
+proxy" request, possibly making an IPv4 or IPv6 direct connection. In other
+words, for this to happen the following must be true:
+  1. An IPv4 or IPv6 address has been advertised to the sender, indicating v2
+  support.
+  2. The sender must have Tor configured.
+  3. The sender's configuration must be such that connections to IPv4 or IPv6
+  are made directly (no `-proxy=` is used for IPv4 or IPv6).
+  4. The recipient does not support v2 (the flags from 1. are bogus). (#35319)
diff --git a/depend/bitcoin/doc/release-notes-35406.md b/depend/bitcoin/doc/release-notes-35406.md
new file mode 100644
index 00000000..178a0791
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35406.md
@@ -0,0 +1,8 @@
+P2P and network changes
+-----------------------
+
+- The private-broadcast queue (transactions submitted via `sendrawtransaction`
+when `-privatebroadcast` is enabled and not yet echoed back from the network)
+is now capped at 10,000 entries. When full, new submissions are rejected. It is
+up to the caller to inspect the queue via `getprivatebroadcastinfo` and free
+up space when stuck via `abortprivatebroadcast`. (#35406)
diff --git a/depend/bitcoin/doc/release-notes-35501.md b/depend/bitcoin/doc/release-notes-35501.md
new file mode 100644
index 00000000..2399ca1e
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35501.md
@@ -0,0 +1,4 @@
+RPC
+---
+
+- `gettransaction`, `listtransactions`, and `listsinceblock` now have an `alternate_wtxids` field which lists the wtxids of all transactions that have the same txid. When there is only one known witness variant the field is an empty array, analogous to `walletconflicts` and `mempoolconflicts`.
diff --git a/depend/bitcoin/doc/release-notes-35531.md b/depend/bitcoin/doc/release-notes-35531.md
new file mode 100644
index 00000000..90e6014c
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35531.md
@@ -0,0 +1,12 @@
+## Index
+
+- The transaction index (`-txindex`) now stores less data on disk; a fully
+  rebuilt index takes less than half the space. The index is backwards compatible,
+  so existing users will not see the space saving unless the index is recreated.
+  To do so, stop the node, delete the `<datadir>/indexes/txindex` directory, and
+  restart; rebuilding can take up to a few hours depending on hardware. Progress
+  can be monitored using the `getindexinfo` RPC. Once rebuilt, the index can no
+  longer be read by previous releases, so downgrading will rebuild it again in
+  the old format. When downgrading permanently, delete the
+  `<datadir>/indexes/txindex` directory first, since previous releases do not
+  reclaim the space used by entries in the new format. (#35531)
diff --git a/depend/bitcoin/doc/release-notes-35592.md b/depend/bitcoin/doc/release-notes-35592.md
new file mode 100644
index 00000000..e24eec31
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35592.md
@@ -0,0 +1,6 @@
+HTTP: RPC / REST
+----------------
+
+Clients attempting to connect from addresses not allowed by the `-rpcallowip`
+option (or its default, `localhost`) will now be immediately disconnected
+instead of receiving a `403 Forbidden`.
diff --git a/depend/bitcoin/doc/release-notes-35601.md b/depend/bitcoin/doc/release-notes-35601.md
new file mode 100644
index 00000000..9068f635
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35601.md
@@ -0,0 +1,4 @@
+Wallet
+------
+
+The `send` and `sendall` RPCs are no longer marked as experimental. (#35601)
diff --git a/depend/bitcoin/doc/release-notes-35610.md b/depend/bitcoin/doc/release-notes-35610.md
new file mode 100644
index 00000000..1f80677e
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35610.md
@@ -0,0 +1,6 @@
+Tools and Utilities
+-------------------
+
+- A new `bitcoin-util getchainparams` command returns hardcoded details
+  about the selected chain.
+
diff --git a/depend/bitcoin/doc/release-notes-35634.md b/depend/bitcoin/doc/release-notes-35634.md
new file mode 100644
index 00000000..2398305b
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35634.md
@@ -0,0 +1,8 @@
+Indexes
+-------
+
+- The transaction output spender index (`-txospenderindex`) now uses less disk
+  space. Existing indexes remain compatible and no action is required. To reclaim
+  the space for data indexed before upgrading, stop the node, delete the
+  `<datadir>/indexes/txospenderindex/` directory, and restart with
+  `-txospenderindex` enabled to rebuild it. (#35634, #35568)
diff --git a/depend/bitcoin/doc/release-notes-35680.md b/depend/bitcoin/doc/release-notes-35680.md
new file mode 100644
index 00000000..c5d19b15
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35680.md
@@ -0,0 +1,13 @@
+P2P and network changes
+-----------------------
+
+- Each transaction sent via private broadcast (`-privatebroadcast`) is limited
+  to 1,000 send attempts. After reaching the limit, broadcasting stops; call
+  `sendrawtransaction` again to retry. Transactions that reach the limit remain
+  available through `getprivatebroadcastinfo` and `abortprivatebroadcast`. (#35680)
+
+Updated RPCs
+------------
+
+- `getprivatebroadcastinfo` now reports an `attempts_remaining` field for each
+  transaction. (#35680)
diff --git a/depend/bitcoin/doc/release-notes-35696.md b/depend/bitcoin/doc/release-notes-35696.md
new file mode 100644
index 00000000..393c2b05
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35696.md
@@ -0,0 +1,8 @@
+### P2P and Network Changes
+
+Support for the legacy ElGamal (type 0) encryption type when creating I2P
+sessions is being sunset by the I2P network and will be removed from bitcoind on
+or before v34. Nodes using I2P with versions of Bitcoin Core earlier than v26.1
+(PRs #29200, #29209) will soon only be able to connect to other legacy ElGamal
+I2P peers and will be increasingly isolated from the rest of the network, with a
+reduced anonymity set. See #35696 for details.
diff --git a/depend/bitcoin/doc/release-notes-35836.md b/depend/bitcoin/doc/release-notes-35836.md
new file mode 100644
index 00000000..851e48d4
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-35836.md
@@ -0,0 +1,5 @@
+# RPC (wallet)
+
+* The `fundrawtransaction` RPC no longer accepts a boolean as the second
+  positional argument. This silent no-op fallback was removed and the argument
+  is now fully type checked. Passing a boolean will raise an error. (#35836)
diff --git a/depend/bitcoin/doc/release-notes-953.md b/depend/bitcoin/doc/release-notes-953.md
new file mode 100644
index 00000000..a4d03975
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-953.md
@@ -0,0 +1,5 @@
+GUI Changes
+---
+
+The migrate wallet option now allows to disable wallet loading after migrating.
+It is useful in case the node is pruned and the wallet was created before the pruned height.
diff --git a/depend/bitcoin/doc/release-notes-gui-872.md b/depend/bitcoin/doc/release-notes-gui-872.md
new file mode 100644
index 00000000..5ea70345
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-gui-872.md
@@ -0,0 +1,7 @@
+GUI
+---
+
+* A menu action has been added to allow creating a watchonly wallet file from
+  an existing descriptor wallet. This option mirrors the `exportwatchonlywallet`
+  RPC - the exported file can be imported to another node using the Restore
+  Wallet menu action.
diff --git a/depend/bitcoin/doc/release-notes-removeprunedfunds.md b/depend/bitcoin/doc/release-notes-removeprunedfunds.md
new file mode 100644
index 00000000..0e0d0ceb
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes-removeprunedfunds.md
@@ -0,0 +1,6 @@
+Updated RPCs
+------------
+
+- The `removeprunedfunds` RPC has been deprecated and will be removed in the
+next major release. In order to continue using it, `bitcoind` must be started
+with the `-deprecatedrpc=removeprunedfunds` option.
diff --git a/depend/bitcoin/doc/release-notes/release-notes-29.4.md b/depend/bitcoin/doc/release-notes/release-notes-29.4.md
new file mode 100644
index 00000000..3ff905db
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes/release-notes-29.4.md
@@ -0,0 +1,107 @@
+Bitcoin Core version 29.4 is now available from:
+
+  <https://bitcoincore.org/bin/bitcoin-core-29.4/>
+
+This release includes various bug fixes and performance
+improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at GitHub:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+How to Upgrade
+==============
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes in some cases), then run the
+installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on macOS)
+or `bitcoind`/`bitcoin-qt` (on Linux).
+
+Upgrading directly from a version of Bitcoin Core that has reached its EOL is
+possible, but it might take some time if the data directory needs to be migrated. Old
+wallet versions of Bitcoin Core are generally supported.
+
+Compatibility
+==============
+
+Bitcoin Core is supported and tested on operating systems using the
+Linux Kernel 3.17+, macOS 13+, and Windows 10+. Bitcoin
+Core should also work on most other Unix-like systems but is not as
+frequently tested on them. It is not recommended to use Bitcoin Core on
+unsupported systems.
+
+Notable changes
+===============
+
+This release fixes an issue where the chainstate database would repeatedly
+rewrite large portions of itself, causing excessive disk reads and writes
+during normal operation.
+
+### Validation
+
+- #35209 validation: correct lifetime of precomputed tx data
+- #35465 coins: compact chainstate regularly
+
+### Leveldb
+
+- #61(bitcoin-core/leveldb): Disable seek compaction
+
+### Net
+
+- #34093 netif: fix compilation warning in QueryDefaultGatewayImpl()
+
+### Wallet
+
+- #35228 wallet: use outpoint when estimating input size
+
+### Build
+
+- #34228 depends: Unset SOURCE_DATE_EPOCH in gen_id script
+- #34848 cmake: Migrate away from deprecated SQLite3 target
+
+### Test
+
+- #34918 fuzz: [refactor] Remove unused g_setup pointers
+
+### Doc
+
+- #34510 doc: fix broken bpftrace installation link
+- #34561 wallet: rpc: manpage: fix example missing `fee_rate` argument
+- #34671 doc: Update Guix install for Debian/Ubuntu
+- #35283 doc: mention -DWITH_ZMQ=ON in BSD build guides
+
+### CI
+
+- #35202 ci: restore sockets in i686, no IPC job
+- #35378 ci: switch runners from cirrus to warpbuild
+- #35408 ci: 35378 followups
+
+### Misc
+
+- #35175 multi_index: fix compilation failure with boost >= 1.91
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- andrewtoth
+- Cory Fields
+- Daniel Pfeifer
+- darosior
+- fanquake
+- Hennadii Stepanov
+- jayvaliya
+- junbyjun1238
+- Lőrinc
+- MarcoFalke
+- SomberNight
+- ToRyVand
+- willcl-ark
+
+As well as to everyone that helped with translations on
+[Transifex](https://explore.transifex.com/bitcoin/bitcoin/).
diff --git a/depend/bitcoin/doc/release-notes/release-notes-30.3.md b/depend/bitcoin/doc/release-notes/release-notes-30.3.md
new file mode 100644
index 00000000..f8ccd661
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes/release-notes-30.3.md
@@ -0,0 +1,167 @@
+v30.3 Release Notes
+===================
+
+Bitcoin Core version v30.3 is now available from:
+
+  <https://bitcoincore.org/bin/bitcoin-core-30.3/>
+
+This release includes new features, various bug fixes and performance
+improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at GitHub:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+How to Upgrade
+==============
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes in some cases), then run the
+installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on macOS)
+or `bitcoind`/`bitcoin-qt` (on Linux).
+
+Upgrading directly from a version of Bitcoin Core that has reached its EOL is
+possible, but it might take some time if the data directory needs to be migrated. Old
+wallet versions of Bitcoin Core are generally supported.
+
+Compatibility
+==============
+
+Bitcoin Core is supported and tested on operating systems using the
+Linux Kernel 3.17+, macOS 13+, and Windows 10+. Bitcoin
+Core should also work on most other Unix-like systems but is not as
+frequently tested on them. It is not recommended to use Bitcoin Core on
+unsupported systems.
+
+Notable changes
+===============
+
+This release fixes an issue where the chainstate database would repeatedly
+rewrite large portions of itself, causing excessive disk reads and writes
+during normal operation.
+
+### Validation
+
+- #35209 validation: correct lifetime of precomputed tx data
+- #35465 coins: compact chainstate regularly
+
+### Leveldb
+
+- #61(bitcoin-core/leveldb): Disable seek compaction
+
+### Wallet
+
+- #34358 wallet: fix removeprunedfunds bug with conflicting transactions
+- #34870 wallet: feebumper, fix crash when combined bump fee is unavailable
+- #34888 wallet: fix amount computed as boolean in coin selection
+- #35228 wallet: use outpoint when estimating input size
+
+### Net
+
+- #34093 netif: fix compilation warning in QueryDefaultGatewayImpl()
+- #34549 net: reduce log level for PCP/NAT-PMP NOT_AUTHORIZED failures
+
+### PSBT
+
+- #34272 psbt: Fix PSBTInputSignedAndVerified bounds assert
+- #34219 psbt: validate pubkeys in MuSig2 pubnonce/partial sig deserialization
+
+### Miniscript
+
+- #34434 miniscript: correct and_v() properties
+
+### Build
+
+- #34228 depends: Unset SOURCE_DATE_EPOCH in gen_id script
+- #34281 build: Temporarily remove confusing and brittle -fdebug-prefix-map
+- #34554 build: avoid exporting secp256k1 symbols
+- #34627 guix: use a temporary file over sponge, drop moreutils
+- #34713 depends: Allow building Qt packages after interruption
+- #34754 depends: Qt fixes for GCC 16 compatibility
+- #34787 build: fix native macOS deployment
+- #34848 cmake: Migrate away from deprecated SQLite3 target
+- #34956 depends, qt: Fix build on aarch64 macOS 26.4
+
+### Test
+
+- #34185 test: fix feature_pruning when built without wallet
+- #34282 qa: Fix Windows logging bug
+- #34390 test: allow overriding tar in get_previous_releases.py
+- #34409 test: use ModuleNotFoundError in interface_ipc.py
+- #34445 fuzz: Use AFL_SHM_ID for naming test directories
+- #34608 test: Fix broken --valgrind handling after bitcoin wrapper
+- #34690 test: Add missing timeout_factor to zmq socket
+- #34869 tests: applied PYTHON_GIL to the env for every test
+- #34918 fuzz: [refactor] Remove unused g_setup pointers
+- #35080 test: Add missing self.options.timeout_factor scale in tool_bitcoin_chainstate.py
+
+### Util
+
+- #34597 util: Fix UB in SetStdinEcho when ENOTTY
+
+### Doc
+
+- #34252 doc: add 433 (Pay to Anchor) to bips.md
+- #34413 doc: Remove outdated -fdebug-prefix-map section in dev notes
+- #34510 doc: fix broken bpftrace installation link
+- #34561 wallet: rpc: manpage: fix example missing `fee_rate` argument
+- #34671 doc: Update Guix install for Debian/Ubuntu
+- #34702 doc: Fix fee field in getblock RPC result
+- #34706 doc: Improve dependencies.md IPC documentation
+- #34789 doc: update build guides pre v31
+- #35283 doc: mention -DWITH_ZMQ=ON in BSD build guides
+
+### CI
+
+- #32513 ci: remove 3rd party js from windows dll gha job
+- #34344 ci: update GitHub Actions versions
+- #34453 ci: Always print low ccache hit rate notice
+- #34461 ci: Print verbose build error message in test-each-commit
+- #34802 ci: Bump GHA actions versions
+- #34815 ci: bump cirruslabs actions versions
+- #35202 ci: restore sockets in i686, no IPC job
+- #35378 ci: switch runners from cirrus to warpbuild
+- #35408 ci: 35378 followups
+
+### Misc
+
+- #35175 multi_index: fix compilation failure with boost >= 1.91
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- ANAVHEOBA
+- andrewtoth
+- brunoerg
+- Cory Fields
+- Daniel Pfeifer
+- darosior
+- fanquake
+- furszy
+- Hennadii Stepanov
+- jayvaliya
+- junbyjun1238
+- kevkevinpal
+- Lőrinc
+- m3dwards
+- marcofleon
+- MarcoFalke
+- mzumsande
+- nervana21
+- Padraic Slattery
+- ryanofsky
+- Sebastian Falbesoner
+- SomberNight
+- tboy1337
+- theuni
+- ToRyVand
+- willcl-ark
+
+As well as to everyone that helped with translations on
+[Transifex](https://explore.transifex.com/bitcoin/bitcoin/).
diff --git a/depend/bitcoin/doc/release-notes/release-notes-31.1.md b/depend/bitcoin/doc/release-notes/release-notes-31.1.md
new file mode 100644
index 00000000..e57950ba
--- /dev/null
+++ b/depend/bitcoin/doc/release-notes/release-notes-31.1.md
@@ -0,0 +1,140 @@
+v31.1 Release Notes
+===================
+
+Bitcoin Core version 31.1 is now available from:
+
+  <https://bitcoincore.org/bin/bitcoin-core-31.1/>
+
+This release includes new features, various bug fixes and performance
+improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at GitHub:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+How to Upgrade
+==============
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes in some cases), then run the installer
+(on Windows) or just copy over `/Applications/Bitcoin-Qt` (on macOS) or
+`bitcoind`/`bitcoin-qt` (on Linux).
+
+Upgrading directly from a version of Bitcoin Core that has reached its EOL is
+possible, but it might take some time if the data directory needs to be
+migrated. Old wallet versions of Bitcoin Core are generally supported.
+
+Compatibility
+==============
+
+Bitcoin Core is supported and tested on the following operating systems or
+newer: Linux Kernel 3.17, macOS 14, and Windows 10 (version 1903). Bitcoin Core
+should also work on most other Unix-like systems but is not as frequently tested
+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
+
+- #34228 depends: Unset SOURCE_DATE_EPOCH in gen_id script
+
+### Test
+
+- #34425 test: Fix all races after a socket is closed gracefully
+- #34863 test: Clean shutdown in Socks5Server
+- #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
+
+### CI
+
+- #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/).
diff --git a/depend/bitcoin/doc/release-process.md b/depend/bitcoin/doc/release-process.md
index 28bcfe83..c02ada5a 100644
--- a/depend/bitcoin/doc/release-process.md
+++ b/depend/bitcoin/doc/release-process.md
@@ -59,11 +59,11 @@ Release Process
 - Clear the release notes and move them to the wiki (see "Write the release notes" below).
 - Translations on Transifex:
     - Pull translations from Transifex into the master branch.
-    - Create [a new resource](https://app.transifex.com/bitcoin/bitcoin/content/) named after the major version with the slug `qt-translation-<RRR>x`, where `RRR` is the major branch number padded with zeros. Use `src/qt/locale/bitcoin_en.xlf` to create it.
+    - Create [a new resource](https://app.transifex.com/bitcoin/bitcoin/content/) named after the major version with the slug `qt-translation-<RRR>x`, where `RRR` is the major branch number padded with zeros. Use `src/qt/locale/bitcoin_en.ts` to create it.
     - In the project workflow settings, ensure that [Translation Memory Fill-up](https://help.transifex.com/en/articles/6224817-setting-up-translation-memory-fill-up) is enabled and that [Translation Memory Context Matching](https://help.transifex.com/en/articles/6224753-translation-memory-with-context) is disabled.
     - Update the Transifex slug in [`.tx/config`](/.tx/config) to the slug of the resource created in the first step. This identifies which resource the translations will be synchronized from.
     - Make an announcement that translators can start translating for the new version. You can use one of the [previous announcements](https://app.transifex.com/bitcoin/communication/) as a template.
-    - Change the auto-update URL for the resource to `master`, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/qt/locale/bitcoin_en.xlf`. (Do this only after the previous steps, to prevent an auto-update from interfering.)
+    - Change the auto-update URL for the resource to `master`, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/qt/locale/bitcoin_en.ts`. (Do this only after the previous steps, to prevent an auto-update from interfering.)
 
 #### After branch-off (on the major release branch)
 
@@ -72,7 +72,7 @@ Release Process
 - Clear the release notes: `cp doc/release-notes-empty-template.md doc/release-notes.md`
 - Create a pinned meta-issue for testing the release candidate (see [this issue](https://github.com/bitcoin/bitcoin/issues/27621) for an example) and provide a link to it in the release announcements where useful.
 - Translations on Transifex
-    - Change the auto-update URL for the new major version's resource away from `master` and to the branch, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/<branch>/src/qt/locale/bitcoin_en.xlf`. Do not forget this or it will keep tracking the translations on master instead, drifting away from the specific major release.
+    - Change the auto-update URL for the new major version's resource away from `master` and to the branch, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/<branch>/src/qt/locale/bitcoin_en.ts`. Do not forget this or it will keep tracking the translations on master instead, drifting away from the specific major release.
 - Prune inputs from the qa-assets repo (See [pruning
   inputs](https://github.com/bitcoin-core/qa-assets#pruning-inputs)).
 
diff --git a/depend/bitcoin/ruff.toml b/depend/bitcoin/ruff.toml
new file mode 100644
index 00000000..61cf6d24
--- /dev/null
+++ b/depend/bitcoin/ruff.toml
@@ -0,0 +1,16 @@
+[lint]
+select = [
+    "B006", # mutable-argument-default
+    "B008", # function-call-in-default-argument
+    "E", # pycodestyle errors
+    "F", # pyflakes errors
+    "PLE",  # Pylint errors
+    "RUF001", # ambiguous-unicode-character-string
+    "RUF002", # ambiguous-unicode-character-docstring
+    "RUF003", # ambiguous-unicode-character-comment
+    "W", # pycodestyle warnings
+]
+ignore = [
+    "E501", # line too long
+    "E741", # ambiguous-variable-name
+]
diff --git a/depend/bitcoin/share/qt/translate.cmake b/depend/bitcoin/share/qt/translate.cmake
index 2ac8c7f0..a8f54a91 100644
--- a/depend/bitcoin/share/qt/translate.cmake
+++ b/depend/bitcoin/share/qt/translate.cmake
@@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.22)
 set(input_variables
   PROJECT_SOURCE_DIR
   COPYRIGHT_HOLDERS
-  LCONVERT_EXECUTABLE
   LUPDATE_EXECUTABLE
   XGETTEXT_EXECUTABLE
 )
@@ -103,28 +102,13 @@ extract_strings("${PROJECT_SOURCE_DIR}/src/qt/bitcoinstrings.cpp"
 execute_process(
   COMMAND ${LUPDATE_EXECUTABLE}
     -no-obsolete
+    -sort-messages
     -I ${PROJECT_SOURCE_DIR}/src
-    -locations relative
+    -locations none
+    -target-language en
     ${ui_files}
     ${qt_translatable_sources}
     ${PROJECT_SOURCE_DIR}/src/qt/bitcoinstrings.cpp
     -ts ${PROJECT_SOURCE_DIR}/src/qt/locale/bitcoin_en.ts
   COMMAND_ERROR_IS_FATAL ANY
 )
-
-execute_process(
-  COMMAND ${LCONVERT_EXECUTABLE}
-    -drop-translations
-    -o ${PROJECT_SOURCE_DIR}/src/qt/locale/bitcoin_en.xlf
-    -i ${PROJECT_SOURCE_DIR}/src/qt/locale/bitcoin_en.ts
-  COMMAND_ERROR_IS_FATAL ANY
-)
-
-file(READ "${PROJECT_SOURCE_DIR}/src/qt/locale/bitcoin_en.xlf" bitcoin_en)
-string(REPLACE "source-language=\"en\" target-language=\"en\""
-  "source-language=\"en\"" bitcoin_en "${bitcoin_en}"
-)
-string(REGEX REPLACE " *<target xml:space=\"preserve\"></target>\n"
-  "" bitcoin_en "${bitcoin_en}"
-)
-file(WRITE "${PROJECT_SOURCE_DIR}/src/qt/locale/bitcoin_en.xlf" "${bitcoin_en}")
diff --git a/depend/bitcoin/share/setup.nsi.in b/depend/bitcoin/share/setup.nsi.in
index 387d7811..33baa477 100644
--- a/depend/bitcoin/share/setup.nsi.in
+++ b/depend/bitcoin/share/setup.nsi.in
@@ -72,19 +72,19 @@ ShowUninstDetails show
 Section -Main SEC0000
     SetOutPath $INSTDIR
     SetOverwrite on
-    File @abs_top_builddir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
-    File @abs_top_builddir@/release/@BITCOIN_WRAPPER_NAME@@EXEEXT@
-    File /oname=COPYING.txt @abs_top_srcdir@/COPYING
-    File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
-    File @abs_top_srcdir@/share/examples/bitcoin.conf
+    File "@BIN_DIR@/@BITCOIN_GUI_NAME@@EXEEXT@"
+    File "@BIN_DIR@/@BITCOIN_WRAPPER_NAME@@EXEEXT@"
+    File /oname=COPYING.txt "@abs_top_srcdir@/COPYING"
+    File /oname=readme.txt "@abs_top_srcdir@/doc/README_windows.txt"
+    File "@abs_top_srcdir@/share/examples/bitcoin.conf"
     SetOutPath $INSTDIR\share\rpcauth
-    File @abs_top_srcdir@/share/rpcauth/*.*
+    File "@abs_top_srcdir@/share/rpcauth/*.*"
     SetOutPath $INSTDIR\daemon
-    File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
-    File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
-    File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@
-    File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@
-    File @abs_top_builddir@/release/@BITCOIN_TEST_NAME@@EXEEXT@
+    File "@BIN_DIR@/@BITCOIN_DAEMON_NAME@@EXEEXT@"
+    File "@BIN_DIR@/@BITCOIN_CLI_NAME@@EXEEXT@"
+    File "@BIN_DIR@/@BITCOIN_TX_NAME@@EXEEXT@"
+    File "@BIN_DIR@/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@"
+    File "@LIBEXEC_DIR@/@BITCOIN_TEST_NAME@@EXEEXT@"
     SetOutPath $INSTDIR
     WriteRegStr HKCU "${REGKEY}\Components" Main 1
 SectionEnd
diff --git a/depend/bitcoin/src/.clang-format b/depend/bitcoin/src/.clang-format
index 72a20228..7097595a 100644
--- a/depend/bitcoin/src/.clang-format
+++ b/depend/bitcoin/src/.clang-format
@@ -97,6 +97,7 @@ ForEachMacros:
   - BOOST_FOREACH
 IfMacros:
   - KJ_IF_MAYBE
+  - LIMITED_WHILE
 IncludeBlocks:   Regroup
 IncludeCategories:
   - Regex:           '^<bitcoin-build-config\.h>'
diff --git a/depend/bitcoin/src/.clang-tidy b/depend/bitcoin/src/.clang-tidy
index 9bdcc03f..4e0af3f3 100644
--- a/depend/bitcoin/src/.clang-tidy
+++ b/depend/bitcoin/src/.clang-tidy
@@ -8,8 +8,10 @@ bugprone-use-after-move,
 bugprone-lambda-function-name,
 bugprone-unhandled-self-assignment,
 bugprone-unused-return-value,
-misc-unused-using-decls,
+fuchsia-header-anon-namespaces,
+misc-definitions-in-headers,
 misc-no-recursion,
+misc-unused-using-decls,
 modernize-avoid-bind,
 modernize-deprecated-headers,
 modernize-use-default-member-init,
diff --git a/depend/bitcoin/src/CMakeLists.txt b/depend/bitcoin/src/CMakeLists.txt
index b37f3c8c..15f5dd27 100644
--- a/depend/bitcoin/src/CMakeLists.txt
+++ b/depend/bitcoin/src/CMakeLists.txt
@@ -37,9 +37,15 @@ if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 endif()
 
+set(IS_SOURCE_TARBALL FALSE)
+# git will expand the next line to "set(IS_SOURCE_TARBALL TRUE)" inside archives:
+#$Format:%nset(IS_SOURCE_TARBALL TRUE)$
+if(NOT IS_SOURCE_TARBALL AND PROJECT_IS_TOP_LEVEL)
+  find_package(Git QUIET)
+endif()
 add_custom_target(generate_build_info
   BYPRODUCTS ${PROJECT_BINARY_DIR}/src/bitcoin-build-info.h
-  COMMAND ${CMAKE_COMMAND} -DBUILD_INFO_HEADER_PATH=${PROJECT_BINARY_DIR}/src/bitcoin-build-info.h -DSOURCE_DIR=${PROJECT_SOURCE_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/script/GenerateBuildInfo.cmake
+  COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DBUILD_INFO_HEADER_PATH=${PROJECT_BINARY_DIR}/src/bitcoin-build-info.h -DSOURCE_DIR=${PROJECT_SOURCE_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/script/GenerateBuildInfo.cmake
   COMMENT "Generating bitcoin-build-info.h"
   VERBATIM
 )
@@ -158,10 +164,10 @@ if(ENABLE_WALLET)
   if(BUILD_WALLET_TOOL)
     add_executable(bitcoin-wallet
       bitcoin-wallet.cpp
+      bitcoin-wallet-res.rc
       init/bitcoin-wallet.cpp
       wallet/wallettool.cpp
     )
-    add_windows_resources(bitcoin-wallet bitcoin-wallet-res.rc)
     add_windows_application_manifest(bitcoin-wallet)
     target_link_libraries(bitcoin-wallet
       core_interface
@@ -226,6 +232,7 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   node/mempool_persist.cpp
   node/mempool_persist_args.cpp
   node/miner.cpp
+  node/mining_args.cpp
   node/mini_miner.cpp
   node/minisketchwrapper.cpp
   node/peerman_args.cpp
@@ -282,10 +289,7 @@ target_link_libraries(bitcoin_node
     leveldb
     minisketch
     univalue
-    Boost::headers
-    $<TARGET_NAME_IF_EXISTS:libevent::core>
-    $<TARGET_NAME_IF_EXISTS:libevent::extra>
-    $<TARGET_NAME_IF_EXISTS:libevent::pthreads>
+    $<TARGET_NAME_IF_EXISTS:Boost::headers>
     $<TARGET_NAME_IF_EXISTS:USDT::headers>
 )
 if(WITH_EMBEDDED_ASMAP)
@@ -298,8 +302,10 @@ endif()
 
 # Bitcoin wrapper executable that can call other executables.
 if(BUILD_BITCOIN_BIN)
-  add_executable(bitcoin bitcoin.cpp)
-  add_windows_resources(bitcoin bitcoin-res.rc)
+  add_executable(bitcoin
+    bitcoin.cpp
+    bitcoin-res.rc
+  )
   add_windows_application_manifest(bitcoin)
   target_link_libraries(bitcoin core_interface bitcoin_common bitcoin_util)
   install_binary_component(bitcoin HAS_MANPAGE)
@@ -309,9 +315,9 @@ endif()
 if(BUILD_DAEMON)
   add_executable(bitcoind
     bitcoind.cpp
+    bitcoind-res.rc
     init/bitcoind.cpp
   )
-  add_windows_resources(bitcoind bitcoind-res.rc)
   add_windows_application_manifest(bitcoind)
   target_link_libraries(bitcoind
     core_interface
@@ -348,8 +354,11 @@ target_link_libraries(bitcoin_cli
 
 # Bitcoin Core RPC client
 if(BUILD_CLI)
-  add_executable(bitcoin-cli bitcoin-cli.cpp init/basic.cpp)
-  add_windows_resources(bitcoin-cli bitcoin-cli-res.rc)
+  add_executable(bitcoin-cli
+    bitcoin-cli.cpp
+    bitcoin-cli-res.rc
+    init/basic.cpp
+  )
   add_windows_application_manifest(bitcoin-cli)
   target_link_libraries(bitcoin-cli
     core_interface
@@ -357,16 +366,16 @@ if(BUILD_CLI)
     bitcoin_common
     bitcoin_ipc
     bitcoin_util
-    libevent::core
-    libevent::extra
   )
   install_binary_component(bitcoin-cli HAS_MANPAGE)
 endif()
 
 
 if(BUILD_TX)
-  add_executable(bitcoin-tx bitcoin-tx.cpp)
-  add_windows_resources(bitcoin-tx bitcoin-tx-res.rc)
+  add_executable(bitcoin-tx
+    bitcoin-tx.cpp
+    bitcoin-tx-res.rc
+  )
   add_windows_application_manifest(bitcoin-tx)
   target_link_libraries(bitcoin-tx
     core_interface
@@ -379,13 +388,16 @@ endif()
 
 
 if(BUILD_UTIL)
-  add_executable(bitcoin-util bitcoin-util.cpp)
-  add_windows_resources(bitcoin-util bitcoin-util-res.rc)
+  add_executable(bitcoin-util
+    bitcoin-util.cpp
+    bitcoin-util-res.rc
+  )
   add_windows_application_manifest(bitcoin-util)
   target_link_libraries(bitcoin-util
     core_interface
     bitcoin_common
     bitcoin_util
+    univalue
   )
   install_binary_component(bitcoin-util HAS_MANPAGE)
 endif()
diff --git a/depend/bitcoin/src/addrdb.cpp b/depend/bitcoin/src/addrdb.cpp
index 5db632c7..14baf1a6 100644
--- a/depend/bitcoin/src/addrdb.cpp
+++ b/depend/bitcoin/src/addrdb.cpp
@@ -14,7 +14,6 @@
 #include <common/settings.h>
 #include <cstdint>
 #include <hash.h>
-#include <logging.h>
 #include <logging/timer.h>
 #include <netbase.h>
 #include <netgroup.h>
@@ -24,6 +23,7 @@
 #include <univalue.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/syserror.h>
 #include <util/translation.h>
 
diff --git a/depend/bitcoin/src/addresstype.h b/depend/bitcoin/src/addresstype.h
index 862049de..79fcf3d1 100644
--- a/depend/bitcoin/src/addresstype.h
+++ b/depend/bitcoin/src/addresstype.h
@@ -118,7 +118,7 @@ struct WitnessUnknown
 };
 
 /** Witness program for Pay-to-Anchor output script type */
-static const std::vector<unsigned char> ANCHOR_BYTES{0x4e, 0x73};
+inline const std::vector<unsigned char> ANCHOR_BYTES{0x4e, 0x73};
 
 struct PayToAnchor : public WitnessUnknown
 {
diff --git a/depend/bitcoin/src/addrman.cpp b/depend/bitcoin/src/addrman.cpp
index d3dae59a..554e5ad0 100644
--- a/depend/bitcoin/src/addrman.cpp
+++ b/depend/bitcoin/src/addrman.cpp
@@ -9,9 +9,9 @@
 #include <addrman_impl.h>
 
 #include <hash.h>
-#include <logging.h>
 #include <logging/timer.h>
 #include <netaddress.h>
+#include <netgroup.h>
 #include <protocol.h>
 #include <random.h>
 #include <serialize.h>
@@ -19,6 +19,7 @@
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/time.h>
 
 #include <cmath>
@@ -909,7 +910,10 @@ void AddrManImpl::ResolveCollisions_()
             int tried_bucket_pos = info_new.GetBucketPosition(nKey, false, tried_bucket);
             if (!info_new.IsValid()) { // id_new may no longer map to a valid address
                 erase_collision = true;
-            } else if (vvTried[tried_bucket][tried_bucket_pos] != -1) { // The position in the tried bucket is not empty
+            } else {
+                // A pending tried collision implies that the destination tried slot
+                // remains occupied until we resolve it.
+                Assume(vvTried[tried_bucket][tried_bucket_pos] != -1);
 
                 // Get the to-be-evicted address that is being tested
                 nid_type id_old = vvTried[tried_bucket][tried_bucket_pos];
@@ -938,9 +942,6 @@ void AddrManImpl::ResolveCollisions_()
                     Good_(info_new, false, current_time);
                     erase_collision = true;
                 }
-            } else { // Collision is not actually a collision anymore
-                Good_(info_new, false, Now<NodeSeconds>());
-                erase_collision = true;
             }
         }
 
@@ -976,6 +977,7 @@ std::pair<CAddress, NodeSeconds> AddrManImpl::SelectTriedCollision_()
     int tried_bucket = newInfo.GetTriedBucket(nKey, m_netgroupman);
     int tried_bucket_pos = newInfo.GetBucketPosition(nKey, false, tried_bucket);
 
+    Assume(vvTried[tried_bucket][tried_bucket_pos] != -1);
     const AddrInfo& info_old = mapInfo[vvTried[tried_bucket][tried_bucket_pos]];
     return {info_old, info_old.m_last_try};
 }
diff --git a/depend/bitcoin/src/addrman.h b/depend/bitcoin/src/addrman.h
index 94e7d3e6..70697f76 100644
--- a/depend/bitcoin/src/addrman.h
+++ b/depend/bitcoin/src/addrman.h
@@ -7,38 +7,41 @@
 #define BITCOIN_ADDRMAN_H
 
 #include <netaddress.h>
-#include <netgroup.h>
 #include <protocol.h>
-#include <streams.h>
 #include <util/time.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <ios>
 #include <memory>
 #include <optional>
+#include <string>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
+class NetGroupManager;
+
 /** Over how many buckets entries with tried addresses from a single group (/16 for IPv4) are spread */
-static constexpr uint32_t ADDRMAN_TRIED_BUCKETS_PER_GROUP{8};
+inline constexpr uint32_t ADDRMAN_TRIED_BUCKETS_PER_GROUP{8};
 /** Over how many buckets entries with new addresses originating from a single group are spread */
-static constexpr uint32_t ADDRMAN_NEW_BUCKETS_PER_SOURCE_GROUP{64};
+inline constexpr uint32_t ADDRMAN_NEW_BUCKETS_PER_SOURCE_GROUP{64};
 /** Maximum number of times an address can occur in the new table */
-static constexpr int32_t ADDRMAN_NEW_BUCKETS_PER_ADDRESS{8};
+inline constexpr int32_t ADDRMAN_NEW_BUCKETS_PER_ADDRESS{8};
 /** How old addresses can maximally be */
-static constexpr auto ADDRMAN_HORIZON{30 * 24h};
+inline constexpr auto ADDRMAN_HORIZON{30 * 24h};
 /** After how many failed attempts we give up on a new node */
-static constexpr int32_t ADDRMAN_RETRIES{3};
+inline constexpr int32_t ADDRMAN_RETRIES{3};
 /** How many successive failures are allowed ... */
-static constexpr int32_t ADDRMAN_MAX_FAILURES{10};
+inline constexpr int32_t ADDRMAN_MAX_FAILURES{10};
 /** ... in at least this duration */
-static constexpr auto ADDRMAN_MIN_FAIL{7 * 24h};
+inline constexpr auto ADDRMAN_MIN_FAIL{7 * 24h};
 /** How recent a successful connection should be before we allow an address to be evicted from tried */
-static constexpr auto ADDRMAN_REPLACEMENT{4h};
+inline constexpr auto ADDRMAN_REPLACEMENT{4h};
 /** The maximum number of tried addr collisions to store */
-static constexpr size_t ADDRMAN_SET_TRIED_COLLISION_SIZE{10};
+inline constexpr size_t ADDRMAN_SET_TRIED_COLLISION_SIZE{10};
 /** The maximum time we'll spend trying to resolve a tried table collision */
-static constexpr auto ADDRMAN_TEST_WINDOW{40min};
+inline constexpr auto ADDRMAN_TEST_WINDOW{40min};
 
 class InvalidAddrManVersionError : public std::ios_base::failure
 {
@@ -50,7 +53,7 @@ class AddrManImpl;
 class AddrInfo;
 
 /** Default for -checkaddrman */
-static constexpr int32_t DEFAULT_ADDRMAN_CONSISTENCY_CHECKS{0};
+inline constexpr int32_t DEFAULT_ADDRMAN_CONSISTENCY_CHECKS{0};
 
 /** Location information for an address in AddrMan */
 struct AddressPosition {
@@ -69,10 +72,7 @@ struct AddressPosition {
     const int bucket;
     const int position;
 
-    bool operator==(AddressPosition other) {
-        return std::tie(tried, multiplicity, bucket, position) ==
-               std::tie(other.tried, other.multiplicity, other.bucket, other.position);
-    }
+    bool operator==(const AddressPosition&) const = default;
     explicit AddressPosition(bool tried_in, int multiplicity_in, int bucket_in, int position_in)
         : tried{tried_in}, multiplicity{multiplicity_in}, bucket{bucket_in}, position{position_in} {}
 };
diff --git a/depend/bitcoin/src/addrman_impl.h b/depend/bitcoin/src/addrman_impl.h
index c1716f89..e6e2cab8 100644
--- a/depend/bitcoin/src/addrman_impl.h
+++ b/depend/bitcoin/src/addrman_impl.h
@@ -5,13 +5,13 @@
 #ifndef BITCOIN_ADDRMAN_IMPL_H
 #define BITCOIN_ADDRMAN_IMPL_H
 
-#include <logging.h>
 #include <logging/timer.h>
 #include <netaddress.h>
 #include <protocol.h>
 #include <serialize.h>
 #include <sync.h>
 #include <uint256.h>
+#include <util/log.h>
 #include <util/time.h>
 
 #include <cstdint>
@@ -23,14 +23,14 @@
 #include <vector>
 
 /** Total number of buckets for tried addresses */
-static constexpr int32_t ADDRMAN_TRIED_BUCKET_COUNT_LOG2{8};
-static constexpr int ADDRMAN_TRIED_BUCKET_COUNT{1 << ADDRMAN_TRIED_BUCKET_COUNT_LOG2};
+inline constexpr int32_t ADDRMAN_TRIED_BUCKET_COUNT_LOG2{8};
+inline constexpr int ADDRMAN_TRIED_BUCKET_COUNT{1 << ADDRMAN_TRIED_BUCKET_COUNT_LOG2};
 /** Total number of buckets for new addresses */
-static constexpr int32_t ADDRMAN_NEW_BUCKET_COUNT_LOG2{10};
-static constexpr int ADDRMAN_NEW_BUCKET_COUNT{1 << ADDRMAN_NEW_BUCKET_COUNT_LOG2};
+inline constexpr int32_t ADDRMAN_NEW_BUCKET_COUNT_LOG2{10};
+inline constexpr int ADDRMAN_NEW_BUCKET_COUNT{1 << ADDRMAN_NEW_BUCKET_COUNT_LOG2};
 /** Maximum allowed number of entries in buckets for new and tried addresses */
-static constexpr int32_t ADDRMAN_BUCKET_SIZE_LOG2{6};
-static constexpr int ADDRMAN_BUCKET_SIZE{1 << ADDRMAN_BUCKET_SIZE_LOG2};
+inline constexpr int32_t ADDRMAN_BUCKET_SIZE_LOG2{6};
+inline constexpr int ADDRMAN_BUCKET_SIZE{1 << ADDRMAN_BUCKET_SIZE_LOG2};
 
 /**
  * User-defined type for the internally used nIds
diff --git a/depend/bitcoin/src/banman.cpp b/depend/bitcoin/src/banman.cpp
index 3c1f64e2..54789f8d 100644
--- a/depend/bitcoin/src/banman.cpp
+++ b/depend/bitcoin/src/banman.cpp
@@ -6,10 +6,10 @@
 #include <banman.h>
 
 #include <common/system.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <node/interface_ui.h>
 #include <sync.h>
+#include <util/log.h>
 #include <util/time.h>
 #include <util/translation.h>
 
diff --git a/depend/bitcoin/src/banman.h b/depend/bitcoin/src/banman.h
index 93149e63..815e2438 100644
--- a/depend/bitcoin/src/banman.h
+++ b/depend/bitcoin/src/banman.h
@@ -16,10 +16,10 @@
 #include <memory>
 
 // NOTE: When adjusting this, update rpcnet:setban's help ("24h")
-static constexpr unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24; // Default 24-hour ban
+inline constexpr unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24; // Default 24-hour ban
 
 /// How often to dump banned addresses/subnets to disk.
-static constexpr std::chrono::minutes DUMP_BANS_INTERVAL{15};
+inline constexpr std::chrono::minutes DUMP_BANS_INTERVAL{15};
 
 class CClientUIInterface;
 class CNetAddr;
diff --git a/depend/bitcoin/src/base58.h b/depend/bitcoin/src/base58.h
index f258163b..1656cbe1 100644
--- a/depend/bitcoin/src/base58.h
+++ b/depend/bitcoin/src/base58.h
@@ -14,8 +14,7 @@
 #ifndef BITCOIN_BASE58_H
 #define BITCOIN_BASE58_H
 
-#include <span.h>
-
+#include <span>
 #include <string>
 #include <vector>
 
diff --git a/depend/bitcoin/src/bech32.h b/depend/bitcoin/src/bech32.h
index ba4c79bb..f16aa855 100644
--- a/depend/bitcoin/src/bech32.h
+++ b/depend/bitcoin/src/bech32.h
@@ -14,15 +14,17 @@
 #ifndef BITCOIN_BECH32_H
 #define BITCOIN_BECH32_H
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace bech32
 {
 
-static constexpr size_t CHECKSUM_SIZE = 6;
-static constexpr char SEPARATOR = '1';
+inline constexpr size_t CHECKSUM_SIZE = 6;
+inline constexpr char SEPARATOR = '1';
 
 enum class Encoding {
     INVALID, //!< Failed decoding
diff --git a/depend/bitcoin/src/bench/CMakeLists.txt b/depend/bitcoin/src/bench/CMakeLists.txt
index e1d5e409..45ba7c40 100644
--- a/depend/bitcoin/src/bench/CMakeLists.txt
+++ b/depend/bitcoin/src/bench/CMakeLists.txt
@@ -52,6 +52,7 @@ add_executable(bench_bitcoin
   strencodings.cpp
   txgraph.cpp
   txorphanage.cpp
+  uint256_blob.cpp
   util_time.cpp
   verify_script.cpp
 )
@@ -70,6 +71,10 @@ target_link_libraries(bench_bitcoin
   Boost::headers
 )
 
+if(WITH_EMBEDDED_ASMAP)
+  target_sources(bench_bitcoin PRIVATE asmap.cpp)
+endif()
+
 if(ENABLE_WALLET)
   target_sources(bench_bitcoin
     PRIVATE
diff --git a/depend/bitcoin/src/bench/addrman.cpp b/depend/bitcoin/src/bench/addrman.cpp
index 703b4d24..5ce7893d 100644
--- a/depend/bitcoin/src/bench/addrman.cpp
+++ b/depend/bitcoin/src/bench/addrman.cpp
@@ -10,13 +10,13 @@
 #include <netgroup.h>
 #include <protocol.h>
 #include <random.h>
-#include <span.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/time.h>
 
 #include <cstring>
 #include <optional>
+#include <span>
 #include <vector>
 
 /* A "source" is a source address from which we have received a bunch of other addresses. */
diff --git a/depend/bitcoin/src/bench/asmap.cpp b/depend/bitcoin/src/bench/asmap.cpp
new file mode 100644
index 00000000..92b048f7
--- /dev/null
+++ b/depend/bitcoin/src/bench/asmap.cpp
@@ -0,0 +1,161 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <bench/bench.h>
+#include <netbase.h>
+#include <netgroup.h>
+#include <node/data/ip_asn.dat.h>
+#include <random.h>
+#include <util/asmap.h>
+#include <util/check.h>
+
+#include <algorithm>
+#include <array>
+#include <span>
+#include <string>
+
+static void BenchGetMappedAS(benchmark::Bench& bench, std::span<const CNetAddr> addrs, bool check = true)
+{
+    std::span<const std::byte> asmap{node::data::ip_asn};
+    assert(!asmap.empty() && CheckStandardAsmap(asmap));
+    auto netgroupman{NetGroupManager::WithEmbeddedAsmap(asmap)};
+
+    bench.batch(addrs.size()).run([&] {
+        for (const CNetAddr& addr : addrs) {
+            // The embedded ASMap file might change over time and cause some
+            // addresses to become unmapped. We check the mapping to ensure
+            // the addresses are actually mapped.
+            assert((netgroupman.GetMappedAS(addr) > 0) == check);
+        }
+    });
+}
+
+static CNetAddr LookupAddr(const std::string& address) { return LookupHost(address, /*fAllowLookup=*/false).value(); }
+
+static void ASMapGetMappedASQuad9v4(benchmark::Bench& bench)
+{
+    std::vector<CNetAddr> addrs{LookupAddr("9.9.9.9")};
+    BenchGetMappedAS(bench, addrs);
+}
+
+static void ASMapGetMappedASQuad9v6(benchmark::Bench& bench)
+{
+    std::vector<CNetAddr> addrs{LookupAddr("2620:fe::fe")};
+    BenchGetMappedAS(bench, addrs);
+}
+
+static void ASMapGetMappedASCloudflarev4(benchmark::Bench& bench)
+{
+    std::vector<CNetAddr> addrs{LookupAddr("1.1.1.1")};
+    BenchGetMappedAS(bench, addrs);
+}
+
+static void ASMapGetMappedASCloudflarev6(benchmark::Bench& bench)
+{
+    std::vector<CNetAddr> addrs{LookupAddr("2606:4700:4700::1111")};
+    BenchGetMappedAS(bench, addrs);
+}
+
+static void ASMapGetMappedASGooglev4(benchmark::Bench& bench)
+{
+    std::vector<CNetAddr> addrs{LookupAddr("8.8.8.8")};
+    BenchGetMappedAS(bench, addrs);
+}
+
+static void ASMapGetMappedASGooglev6(benchmark::Bench& bench)
+{
+    std::vector<CNetAddr> addrs{LookupAddr("2001:4860:4860::8888")};
+    BenchGetMappedAS(bench, addrs);
+}
+
+static void ASMapGetMappedASUnmappedv4(benchmark::Bench& bench)
+{
+    // Reserved as per RFC 5737 (unmapped)
+    std::vector<CNetAddr> addrs{LookupAddr("203.0.113.0")};
+    BenchGetMappedAS(bench, addrs, /*check=*/false);
+}
+
+static void ASMapGetMappedASUnmappedv6(benchmark::Bench& bench)
+{
+    // Reserved as per RFC 9637 (unmapped)
+    std::vector<CNetAddr> addrs{LookupAddr("3fff::1")};
+    BenchGetMappedAS(bench, addrs, /*check=*/false);
+}
+
+static void ASMapGetMappedASMulti(benchmark::Bench& bench)
+{
+    // A list of 25 IPv4 and 25 IPv6 addresses randomly sampled across
+    // 50 ASNs to have a mix of different lookup times. These have been
+    // masked to /24 and /64 respectively. Some of these could become
+    // unmapped when updating the embedded ASMap file, which will cause
+    // the benchmarks to assert and the IPs will need to be changed out.
+    std::array addrs{
+        LookupAddr("5.8.10.1"),
+        LookupAddr("14.53.20.1"),
+        LookupAddr("34.86.160.1"),
+        LookupAddr("67.68.205.1"),
+        LookupAddr("68.163.58.1"),
+        LookupAddr("69.138.189.1"),
+        LookupAddr("72.211.58.1"),
+        LookupAddr("73.124.158.1"),
+        LookupAddr("77.179.43.1"),
+        LookupAddr("80.79.125.1"),
+        LookupAddr("81.217.170.1"),
+        LookupAddr("82.216.149.1"),
+        LookupAddr("84.52.201.1"),
+        LookupAddr("87.184.174.1"),
+        LookupAddr("90.221.151.1"),
+        LookupAddr("95.31.136.1"),
+        LookupAddr("99.234.174.1"),
+        LookupAddr("105.98.199.1"),
+        LookupAddr("146.190.174.1"),
+        LookupAddr("154.16.157.1"),
+        LookupAddr("172.81.183.1"),
+        LookupAddr("173.24.74.1"),
+        LookupAddr("195.99.226.1"),
+        LookupAddr("213.197.14.1"),
+        LookupAddr("220.255.248.1"),
+
+        LookupAddr("2001:16a2:c0b0:58b7::1"),
+        LookupAddr("2001:67c:e60:c0c::1"),
+        LookupAddr("2001:99a:213:27f0::1"),
+        LookupAddr("2001:9e8:894b:be00::1"),
+        LookupAddr("2406:2d40:1ebc:3508::1"),
+        LookupAddr("2600:1015:a020:1e00::1"),
+        LookupAddr("2600:1700:4228:a800::1"),
+        LookupAddr("2601:603:5000:3309::1"),
+        LookupAddr("2601:cd:ce01:9610::1"),
+        LookupAddr("2603:800c:25f0:8350::1"),
+        LookupAddr("2604:3d09:f89:d100::1"),
+        LookupAddr("2607:fb90:236f:821f::1"),
+        LookupAddr("2800:2331:5440:ba3::1"),
+        LookupAddr("2a00:16e0:1012:c108::1"),
+        LookupAddr("2a00:23c6:9d44:7801::1"),
+        LookupAddr("2a00:79c0:609:4900::1"),
+        LookupAddr("2a01:4f8:13a:1f8d::1"),
+        LookupAddr("2a01:e0a:8a3:ab90::1"),
+        LookupAddr("2a02:810b:449e:c900::1"),
+        LookupAddr("2a02:8308:20d:e800::1"),
+        LookupAddr("2a0a:ef40:331:4401::1"),
+        LookupAddr("2a0c:5a86:a002:e700::1"),
+        LookupAddr("2a10:3781:1d7:1::1"),
+        LookupAddr("2a12:26c0:3303:a100::1"),
+        LookupAddr("2a12:a800:2:1::1"),
+    };
+
+    FastRandomContext rng{/*fDeterministic=*/true};
+    std::ranges::shuffle(addrs, rng);
+
+    BenchGetMappedAS(bench, addrs, /*check=*/true);
+}
+
+BENCHMARK(ASMapGetMappedASQuad9v4);
+BENCHMARK(ASMapGetMappedASQuad9v6);
+BENCHMARK(ASMapGetMappedASCloudflarev4);
+BENCHMARK(ASMapGetMappedASCloudflarev6);
+BENCHMARK(ASMapGetMappedASGooglev4);
+BENCHMARK(ASMapGetMappedASGooglev6);
+BENCHMARK(ASMapGetMappedASUnmappedv4);
+BENCHMARK(ASMapGetMappedASUnmappedv6);
+BENCHMARK(ASMapGetMappedASMulti);
diff --git a/depend/bitcoin/src/bench/base58.cpp b/depend/bitcoin/src/bench/base58.cpp
index 0be16439..ed36dc32 100644
--- a/depend/bitcoin/src/bench/base58.cpp
+++ b/depend/bitcoin/src/bench/base58.cpp
@@ -4,7 +4,6 @@
 
 #include <base58.h>
 #include <bench/bench.h>
-#include <span.h>
 
 #include <array>
 #include <cstring>
diff --git a/depend/bitcoin/src/bench/bech32.cpp b/depend/bitcoin/src/bench/bech32.cpp
index c5e864ae..1147bd6d 100644
--- a/depend/bitcoin/src/bench/bech32.cpp
+++ b/depend/bitcoin/src/bench/bech32.cpp
@@ -6,6 +6,7 @@
 #include <bench/bench.h>
 #include <util/strencodings.h>
 
+#include <array>
 #include <vector>
 
 using namespace util::hex_literals;
diff --git a/depend/bitcoin/src/bench/bench.cpp b/depend/bitcoin/src/bench/bench.cpp
index 45d1b360..4d1f4da0 100644
--- a/depend/bitcoin/src/bench/bench.cpp
+++ b/depend/bitcoin/src/bench/bench.cpp
@@ -7,19 +7,18 @@
 #include <test/util/setup_common.h> // IWYU pragma: keep
 #include <util/check.h>
 #include <util/fs.h>
+#include <util/time.h>
 
-#include <chrono>
 #include <compare>
 #include <fstream>
 #include <functional>
 #include <iostream>
 #include <regex>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
-using namespace std::chrono_literals;
-
 /**
  * Retrieves the available test setup command line arguments that may be used
  * in the benchmark. They will be used only if the benchmark utilizes a
@@ -68,9 +67,9 @@ BenchRunner::BenchmarkMap& BenchRunner::benchmarks()
     return benchmarks_map;
 }
 
-BenchRunner::BenchRunner(std::string name, BenchFunction func)
+BenchRunner::BenchRunner(std::string_view name, BenchFunction func)
 {
-    Assert(benchmarks().try_emplace(std::move(name), std::move(func)).second);
+    Assert(benchmarks().try_emplace(std::string{name}, std::move(func)).second);
 }
 
 void BenchRunner::RunAll(const Args& args)
diff --git a/depend/bitcoin/src/bench/bench.h b/depend/bitcoin/src/bench/bench.h
index f7df42a3..54c75bc2 100644
--- a/depend/bitcoin/src/bench/bench.h
+++ b/depend/bitcoin/src/bench/bench.h
@@ -8,11 +8,12 @@
 #include <bench/nanobench.h> // IWYU pragma: export
 #include <util/fs.h>
 #include <util/macros.h>
+#include <util/time.h>
 
-#include <chrono>
 #include <functional>
 #include <map>
 #include <string>
+#include <string_view>
 #include <vector>
 
 /*
@@ -58,7 +59,7 @@ class BenchRunner
     static BenchmarkMap& benchmarks();
 
 public:
-    BenchRunner(std::string name, BenchFunction func);
+    BenchRunner(std::string_view name, BenchFunction func);
 
     static void RunAll(const Args& args);
 };
diff --git a/depend/bitcoin/src/bench/bench_bitcoin.cpp b/depend/bitcoin/src/bench/bench_bitcoin.cpp
index 987523a1..fa0c170f 100644
--- a/depend/bitcoin/src/bench/bench_bitcoin.cpp
+++ b/depend/bitcoin/src/bench/bench_bitcoin.cpp
@@ -3,19 +3,19 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <common/args.h>
 #include <crypto/sha256.h>
+#include <test/util/setup_common.h>
 #include <tinyformat.h>
 #include <util/fs.h>
-#include <util/string.h>
-#include <test/util/setup_common.h>
+#include <util/time.h>
 
-#include <chrono>
 #include <cstdint>
 #include <cstdlib>
 #include <exception>
 #include <iostream>
+#include <optional>
 #include <sstream>
+#include <string>
 #include <vector>
 
 static const char* DEFAULT_BENCH_FILTER = ".*";
diff --git a/depend/bitcoin/src/bench/bip324_ecdh.cpp b/depend/bitcoin/src/bench/bip324_ecdh.cpp
index 65deb8b7..c8d3a35e 100644
--- a/depend/bitcoin/src/bench/bip324_ecdh.cpp
+++ b/depend/bitcoin/src/bench/bip324_ecdh.cpp
@@ -11,6 +11,7 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <span>
 
 static void BIP324_ECDH(benchmark::Bench& bench)
 {
diff --git a/depend/bitcoin/src/bench/block_assemble.cpp b/depend/bitcoin/src/bench/block_assemble.cpp
index 702f2c09..45052ecf 100644
--- a/depend/bitcoin/src/bench/block_assemble.cpp
+++ b/depend/bitcoin/src/bench/block_assemble.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <consensus/consensus.h>
-#include <node/miner.h>
+#include <node/mining_types.h>
 #include <primitives/transaction.h>
 #include <random.h>
 #include <script/script.h>
@@ -12,15 +12,15 @@
 #include <test/util/mining.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
+#include <util/check.h>
 #include <validation.h>
 
 #include <array>
-#include <cassert>
 #include <cstddef>
 #include <memory>
 #include <vector>
 
-using node::BlockAssembler;
+using node::BlockCreateOptions;
 
 static void AssembleBlock(benchmark::Bench& bench)
 {
@@ -28,9 +28,9 @@ static void AssembleBlock(benchmark::Bench& bench)
 
     CScriptWitness witness;
     witness.stack.push_back(WITNESS_STACK_ELEM_OP_TRUE);
-    BlockAssembler::Options options;
-    options.coinbase_output_script = P2WSH_OP_TRUE;
-    options.include_dummy_extranonce = true;
+    BlockCreateOptions options{
+        .coinbase_output_script = P2WSH_OP_TRUE,
+    };
 
     // Collect some loose transactions that spend the coinbases of our mined blocks
     constexpr size_t NUM_BLOCKS{200};
@@ -61,12 +61,12 @@ static void BlockAssemblerAddPackageTxns(benchmark::Bench& bench)
     FastRandomContext det_rand{true};
     auto testing_setup{MakeNoLogFileContext<TestChain100Setup>()};
     testing_setup->PopulateMempool(det_rand, /*num_transactions=*/1000, /*submit=*/true);
-    BlockAssembler::Options assembler_options;
-    assembler_options.test_block_validity = false;
-    assembler_options.coinbase_output_script = P2WSH_OP_TRUE;
 
     bench.run([&] {
-        PrepareBlock(testing_setup->m_node, assembler_options);
+        PrepareBlock(testing_setup->m_node, {
+            .coinbase_output_script = P2WSH_OP_TRUE,
+            .test_block_validity = false
+        });
     });
 }
 
diff --git a/depend/bitcoin/src/bench/blockencodings.cpp b/depend/bitcoin/src/bench/blockencodings.cpp
index ce968dbc..274474d4 100644
--- a/depend/bitcoin/src/bench/blockencodings.cpp
+++ b/depend/bitcoin/src/bench/blockencodings.cpp
@@ -7,15 +7,23 @@
 #include <consensus/amount.h>
 #include <kernel/cs_main.h>
 #include <net_processing.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
+#include <random.h>
 #include <script/script.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
+#include <uint256.h>
 #include <util/check.h>
 
+#include <algorithm>
+#include <array>
+#include <cstddef>
 #include <memory>
+#include <span>
+#include <utility>
 #include <vector>
 
 
diff --git a/depend/bitcoin/src/bench/ccoins_caching.cpp b/depend/bitcoin/src/bench/ccoins_caching.cpp
index 12ea0760..ec44e663 100644
--- a/depend/bitcoin/src/bench/ccoins_caching.cpp
+++ b/depend/bitcoin/src/bench/ccoins_caching.cpp
@@ -5,14 +5,16 @@
 #include <bench/bench.h>
 #include <coins.h>
 #include <consensus/amount.h>
+#include <consensus/validation.h>
 #include <key.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
 #include <test/util/transaction_utils.h>
+#include <util/check.h>
 
-#include <cassert>
+#include <span>
 #include <vector>
 
 // Microbenchmark for simple accesses to a CCoinsViewCache database. Note from
diff --git a/depend/bitcoin/src/bench/chacha20.cpp b/depend/bitcoin/src/bench/chacha20.cpp
index b5a333d0..cc2b57eb 100644
--- a/depend/bitcoin/src/bench/chacha20.cpp
+++ b/depend/bitcoin/src/bench/chacha20.cpp
@@ -2,15 +2,16 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <bench/bench.h>
 #include <crypto/chacha20.h>
 #include <crypto/chacha20poly1305.h>
-#include <span.h>
-#include <util/byte_units.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/2014.
+#include <util/byte_units.h> // IWYU pragma: keep
 
 #include <cstddef>
 #include <cstdint>
+#include <span>
 #include <vector>
 
 /* Number of bytes to process per iteration */
diff --git a/depend/bitcoin/src/bench/checkblock.cpp b/depend/bitcoin/src/bench/checkblock.cpp
index b943dc0f..a35f5e9d 100644
--- a/depend/bitcoin/src/bench/checkblock.cpp
+++ b/depend/bitcoin/src/bench/checkblock.cpp
@@ -5,13 +5,17 @@
 #include <bench/bench.h>
 #include <bench/data/block413567.raw.h>
 #include <consensus/validation.h>
+#include <kernel/chainparams.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
+#include <serialize.h>
 #include <streams.h>
+#include <util/check.h>
 #include <validation.h>
 
-#include <cassert>
-#include <cstddef>
+#include <memory>
+#include <span>
+#include <vector>
 
 // These are the two major time-sinks which happen after we have fully received
 // a block off the wire, but before we can relay the block on to peers using
diff --git a/depend/bitcoin/src/bench/checkqueue.cpp b/depend/bitcoin/src/bench/checkqueue.cpp
index 2c9126dd..20f3094b 100644
--- a/depend/bitcoin/src/bench/checkqueue.cpp
+++ b/depend/bitcoin/src/bench/checkqueue.cpp
@@ -12,6 +12,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <optional>
 #include <utility>
 #include <vector>
 
diff --git a/depend/bitcoin/src/bench/cluster_linearize.cpp b/depend/bitcoin/src/bench/cluster_linearize.cpp
index 0799cc2c..6d4c8382 100644
--- a/depend/bitcoin/src/bench/cluster_linearize.cpp
+++ b/depend/bitcoin/src/bench/cluster_linearize.cpp
@@ -4,13 +4,18 @@
 
 #include <bench/bench.h>
 #include <cluster_linearize.h>
+#include <serialize.h>
+#include <streams.h>
 #include <test/util/cluster_linearize.h>
+#include <tinyformat.h>
 #include <util/bitset.h>
+#include <util/check.h>
 #include <util/strencodings.h>
 
-#include <algorithm>
-#include <cassert>
 #include <cstdint>
+#include <span>
+#include <string>
+#include <tuple>
 #include <vector>
 
 using namespace cluster_linearize;
diff --git a/depend/bitcoin/src/bench/coin_selection.cpp b/depend/bitcoin/src/bench/coin_selection.cpp
index 9f0bf2cc..396d21d4 100644
--- a/depend/bitcoin/src/bench/coin_selection.cpp
+++ b/depend/bitcoin/src/bench/coin_selection.cpp
@@ -4,8 +4,6 @@
 
 #include <bench/bench.h>
 #include <consensus/amount.h>
-#include <interfaces/chain.h>
-#include <node/context.h>
 #include <outputtype.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
@@ -13,23 +11,26 @@
 #include <random.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
+#include <util/check.h>
 #include <util/result.h>
 #include <wallet/coinselection.h>
-#include <wallet/context.h>
+#include <wallet/db.h>
 #include <wallet/spend.h>
-#include <wallet/test/util.h>
+#include <wallet/sqlite.h>
 #include <wallet/transaction.h>
 #include <wallet/wallet.h>
 
-#include <cassert>
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <memory>
-#include <set>
+#include <optional>
+#include <string>
 #include <utility>
 #include <vector>
 
 namespace wallet {
-static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<std::unique_ptr<CWalletTx>>& wtxs)
+static void addCoin(const CAmount& nValue, std::vector<std::unique_ptr<CWalletTx>>& wtxs)
 {
     static int nextLockTime = 0;
     CMutableTransaction tx;
@@ -39,66 +40,113 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<st
     wtxs.push_back(std::make_unique<CWalletTx>(MakeTransactionRef(std::move(tx)), TxStateInactive{}));
 }
 
-// Simple benchmark for wallet coin selection. Note that it maybe be necessary
-// to build up more complicated scenarios in order to get meaningful
-// measurements of performance. From laanwj, "Wallet coin selection is probably
-// the hardest, as you need a wider selection of scenarios, just testing the
-// same one over and over isn't too useful. Generating random isn't useful
-// either for measurements."
-// (https://github.com/bitcoin/bitcoin/issues/7883#issuecomment-224807484)
+// This benchmark is based on a large diverse UTXO pool. The UTXOs are
+// pseudorandomly generated and assigned one of the four relevant output types
+// P2PKH, P2SH-P2WPKH, P2WPKH, and P2TR UTXOs.
+// Smaller amounts are more likely to be generated than larger amounts. This
+// UTXO pool is used to run coin selection for pseudorandom selection targets.
+// Altogether, this gives us a deterministic benchmark with a somewhat
+// representative coin selection scenario.
 static void CoinSelection(benchmark::Bench& bench)
 {
     const auto test_setup = MakeNoLogFileContext<TestingSetup>();
-    CWallet wallet(test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase());
+    CWallet wallet(test_setup->m_node.chain.get(), "", MakeInMemoryWalletDatabase());
     std::vector<std::unique_ptr<CWalletTx>> wtxs;
     LOCK(wallet.cs_wallet);
 
-    // Add coins.
-    for (int i = 0; i < 1000; ++i) {
-        addCoin(1000 * COIN, wallet, wtxs);
+    // Keep selection deterministic for benchmark stability
+    FastRandomContext det_rand{/*fDeterministic=*/true};
+
+    // Generate coin amounts biased towards smaller amounts
+    for (int i = 0; i < 400; ++i) {
+        CAmount amount;
+        int p{det_rand.randrange(100)};
+        if (p < 50) {
+            amount = 10'000 + det_rand.randrange(90'000);
+        } else if (p < 75) {
+            amount = 100'000 + det_rand.randrange(900'000);
+        } else if (p < 95) {
+            amount = 1'000'000 + det_rand.randrange(9'000'000);
+        } else {
+            amount = 10'000'000 + det_rand.randrange(90'000'000);
+        }
+        addCoin(amount, wtxs);
     }
-    addCoin(3 * COIN, wallet, wtxs);
 
-    // Create coins
+    // Create coins from the amounts assigning them various output types
     wallet::CoinsResult available_coins;
     for (const auto& wtx : wtxs) {
-        const auto txout = wtx->tx->vout.at(0);
-        available_coins.coins[OutputType::BECH32].emplace_back(COutPoint(wtx->GetHash(), 0), txout, /*depth=*/6 * 24, CalculateMaximumSignedInputSize(txout, &wallet, /*coin_control=*/nullptr), /*solvable=*/true, /*safe=*/true, wtx->GetTxTime(), /*from_me=*/true, /*fees=*/ 0);
+        const auto txout = wtx->GetTx()->vout.at(0);
+        OutputType outtype;
+        int input_bytes;
+        int y{det_rand.randrange(100)};
+        if (y < 35) {
+            outtype = OutputType::LEGACY;
+            input_bytes = 148;
+        } else if (y < 55) {
+            outtype = OutputType::P2SH_SEGWIT;
+            input_bytes = 91;
+        } else if (y < 90) {
+            outtype = OutputType::BECH32;
+            input_bytes = 68;
+        } else {
+            outtype = OutputType::BECH32M;
+            input_bytes = 58;
+        }
+        CAmount fees = 20 * input_bytes;
+        available_coins.coins[outtype].emplace_back(COutPoint(wtx->GetHash(), 0), txout, /*depth=*/6 * 24, /*input_bytes=*/input_bytes, /*solvable=*/true, /*safe=*/true, wtx->GetTxTime(), /*from_me=*/true, /*fees=*/fees);
     }
 
-    const CoinEligibilityFilter filter_standard(1, 6, 0);
-    FastRandomContext rand{};
-    const CoinSelectionParams coin_selection_params{
-        rand,
-        /*change_output_size=*/ 34,
-        /*change_spend_size=*/ 148,
-        /*min_change_target=*/ CHANGE_LOWER,
-        /*effective_feerate=*/ CFeeRate(20'000),
-        /*long_term_feerate=*/ CFeeRate(10'000),
-        /*discard_feerate=*/ CFeeRate(3000),
-        /*tx_noinputs_size=*/ 0,
-        /*avoid_partial=*/ false,
-    };
-    auto group = wallet::GroupOutputs(wallet, available_coins, coin_selection_params, {{filter_standard}})[filter_standard];
-    bench.run([&] {
-        auto result = AttemptSelection(wallet.chain(), 1002.99 * COIN, group, coin_selection_params, /*allow_mixed_output_types=*/true);
-        assert(result);
-        assert(result->GetSelectedValue() == 1003 * COIN);
-        assert(result->GetInputSet().size() == 2);
-    });
+    const CoinEligibilityFilter filter_standard(/*conf_mine=*/1, /*conf_theirs=*/6, /*max_ancestors=*/0);
+
+    constexpr size_t NUM_TARGETS{10};
+    std::vector<CAmount> targets;
+    targets.reserve(NUM_TARGETS);
+    for (size_t i{0}; i < NUM_TARGETS; ++i) {
+        targets.push_back(10'000'000 + det_rand.randrange(90'000'000));
+    }
+
+    std::optional<FastRandomContext> rng;
+    std::optional<CoinSelectionParams> params;
+    std::vector<wallet::OutputGroupTypeMap> groups;
+    bench.batch(NUM_TARGETS).unit("selection").epochIterations(1)
+        .setup([&] {
+            rng.emplace(/*fDeterministic=*/true);
+            params.emplace(*rng);
+
+            params->change_output_size = 31;
+            params->change_spend_size = 68;
+            params->m_min_change_target = CHANGE_LOWER;
+            params->m_effective_feerate = CFeeRate{20'000};
+            params->m_long_term_feerate = CFeeRate{10'000};
+            params->m_discard_feerate = CFeeRate{3000};
+            params->tx_noinputs_size = 72;
+            params->m_avoid_partial_spends = false;
+
+            params->m_change_fee = params->m_effective_feerate.GetFee(params->change_output_size);
+            params->min_viable_change = params->m_discard_feerate.GetFee(params->change_spend_size);
+            params->m_cost_of_change = params->min_viable_change + params->m_change_fee;
+
+            groups.assign(NUM_TARGETS, wallet::GroupOutputs(wallet, available_coins, *params, {{filter_standard}})[filter_standard]);
+        })
+        .run([&] {
+            for (size_t i{0}; i < NUM_TARGETS; ++i) {
+                auto result{AttemptSelection(wallet.chain(), targets[i], groups[i], *params, /*allow_mixed_output_types=*/true)};
+                assert(result && result->GetSelectedValue() >= targets[i]);
+            }
+        });
 }
 
-// Copied from src/wallet/test/coinselector_tests.cpp
-static void add_coin(const CAmount& nValue, int nInput, std::vector<OutputGroup>& set)
+static void add_coin(const CAmount& nValue, uint32_t nInput, std::vector<OutputGroup>& set)
 {
     CMutableTransaction tx;
     tx.vout.resize(nInput + 1);
     tx.vout[nInput].nValue = nValue;
     COutput output(COutPoint(tx.GetHash(), nInput), tx.vout.at(nInput), /*depth=*/0, /*input_bytes=*/-1, /*solvable=*/true, /*safe=*/true, /*time=*/0, /*from_me=*/true, /*fees=*/0);
     set.emplace_back();
-    set.back().Insert(std::make_shared<COutput>(output), /*ancestors=*/ 0, /*cluster_count=*/ 0);
+    set.back().Insert(std::make_shared<COutput>(output), /*ancestors=*/0, /*cluster_count=*/0);
 }
-// Copied from src/wallet/test/coinselector_tests.cpp
+
 static CAmount make_hard_case(int utxos, std::vector<OutputGroup>& utxo_pool)
 {
     utxo_pool.clear();
diff --git a/depend/bitcoin/src/bench/connectblock.cpp b/depend/bitcoin/src/bench/connectblock.cpp
index 434bcdcb..5d530a5a 100644
--- a/depend/bitcoin/src/bench/connectblock.cpp
+++ b/depend/bitcoin/src/bench/connectblock.cpp
@@ -4,14 +4,26 @@
 
 #include <addresstype.h>
 #include <bench/bench.h>
-#include <interfaces/chain.h>
-#include <kernel/cs_main.h>
-#include <script/interpreter.h>
+#include <chain.h>
+#include <coins.h>
+#include <consensus/amount.h>
+#include <consensus/validation.h>
+#include <key.h>
+#include <node/blockstorage.h>
+#include <policy/feerate.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <pubkey.h>
+#include <script/script.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
+#include <util/check.h>
 #include <validation.h>
 
-#include <cassert>
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <utility>
 #include <vector>
 
 /*
@@ -39,7 +51,7 @@ CBlock CreateTestBlock(
         {COutPoint(coinbase_to_spend->GetHash(), 0)},
         chainstate.m_chain.Height() + 1, keys, outputs, {}, {})};
     const CScript coinbase_spk{GetScriptForDestination(coinbase_taproot)};
-    test_setup.CreateAndProcessBlock({first_tx}, coinbase_spk, &chainstate);
+    test_setup.CreateAndProcessBlock({first_tx}, coinbase_spk);
 
     std::vector<CMutableTransaction> txs;
     txs.reserve(num_txs);
@@ -59,7 +71,7 @@ CBlock CreateTestBlock(
     }
 
     // Coinbase output can use any output type as it is not spent and will not change the benchmark
-    return test_setup.CreateBlock(txs, coinbase_spk, chainstate);
+    return test_setup.CreateBlock(txs, coinbase_spk);
 }
 
 /*
diff --git a/depend/bitcoin/src/bench/crypto_hash.cpp b/depend/bitcoin/src/bench/crypto_hash.cpp
index 666ff3c0..82744897 100644
--- a/depend/bitcoin/src/bench/crypto_hash.cpp
+++ b/depend/bitcoin/src/bench/crypto_hash.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <bench/bench.h>
 #include <crypto/muhash.h>
 #include <crypto/ripemd160.h>
@@ -12,11 +11,12 @@
 #include <crypto/sha512.h>
 #include <crypto/siphash.h>
 #include <random.h>
-#include <span.h>
 #include <tinyformat.h>
 #include <uint256.h>
 
 #include <cstdint>
+#include <span>
+#include <string>
 #include <vector>
 
 /* Number of bytes to hash per iteration */
@@ -190,10 +190,10 @@ static void SHA512(benchmark::Bench& bench)
     });
 }
 
-static void SipHash_32b(benchmark::Bench& bench)
+static void SipHash24_32b(benchmark::Bench& bench)
 {
     FastRandomContext rng{/*fDeterministic=*/true};
-    PresaltedSipHasher presalted_sip_hasher(rng.rand64(), rng.rand64());
+    PresaltedSipHasher presalted_sip_hasher{rng.rand64(), rng.rand64()};
     auto val{rng.rand256()};
     auto i{0U};
     bench.run([&] {
@@ -203,6 +203,49 @@ static void SipHash_32b(benchmark::Bench& bench)
     });
 }
 
+static void SipHash24_36b(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    PresaltedSipHasher presalted_sip_hasher{rng.rand64(), rng.rand64()};
+    auto val{rng.rand256()};
+    uint32_t extra{rng.rand32()};
+    auto i{0U};
+    bench.run([&] {
+        ankerl::nanobench::doNotOptimizeAway(presalted_sip_hasher(val, extra));
+        ++i;
+        val.data()[i % uint256::size()] ^= i & 0xFF;
+        extra += i;
+    });
+}
+
+static void SipHash13UJ_32b(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    SipHasher13UJ sip_hasher{rng.rand64(), rng.rand64()};
+    auto val{rng.rand256()};
+    auto i{0U};
+    bench.run([&] {
+        ankerl::nanobench::doNotOptimizeAway(sip_hasher.Hash(val));
+        ++i;
+        val.data()[i % uint256::size()] ^= i & 0xFF;
+    });
+}
+
+static void SipHash13UJ_36b(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    SipHasher13UJ sip_hasher{rng.rand64(), rng.rand64()};
+    auto val{rng.rand256()};
+    uint32_t extra{rng.rand32()};
+    auto i{0U};
+    bench.run([&] {
+        ankerl::nanobench::doNotOptimizeAway(sip_hasher.Hash(val, uint64_t{extra}));
+        ++i;
+        val.data()[i % uint256::size()] ^= i & 0xFF;
+        extra += i;
+    });
+}
+
 static void MuHash(benchmark::Bench& bench)
 {
     MuHash3072 acc;
@@ -273,7 +316,10 @@ BENCHMARK(SHA256_32b_STANDARD);
 BENCHMARK(SHA256_32b_SSE4);
 BENCHMARK(SHA256_32b_AVX2);
 BENCHMARK(SHA256_32b_SHANI);
-BENCHMARK(SipHash_32b);
+BENCHMARK(SipHash24_32b);
+BENCHMARK(SipHash24_36b);
+BENCHMARK(SipHash13UJ_32b);
+BENCHMARK(SipHash13UJ_36b);
 BENCHMARK(SHA256D64_1024_STANDARD);
 BENCHMARK(SHA256D64_1024_SSE4);
 BENCHMARK(SHA256D64_1024_AVX2);
diff --git a/depend/bitcoin/src/bench/descriptors.cpp b/depend/bitcoin/src/bench/descriptors.cpp
index c375d312..af5dc46b 100644
--- a/depend/bitcoin/src/bench/descriptors.cpp
+++ b/depend/bitcoin/src/bench/descriptors.cpp
@@ -7,8 +7,8 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <util/check.h>
 
-#include <cassert>
 #include <cstdint>
 #include <memory>
 #include <string>
diff --git a/depend/bitcoin/src/bench/disconnected_transactions.cpp b/depend/bitcoin/src/bench/disconnected_transactions.cpp
index 4dd5de42..1ab2ec6c 100644
--- a/depend/bitcoin/src/bench/disconnected_transactions.cpp
+++ b/depend/bitcoin/src/bench/disconnected_transactions.cpp
@@ -8,13 +8,12 @@
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <test/util/setup_common.h>
+#include <util/check.h>
 
 #include <algorithm>
-#include <cassert>
 #include <cstddef>
 #include <cstdint>
 #include <iterator>
-#include <memory>
 #include <vector>
 
 constexpr size_t BLOCK_VTX_COUNT{4000};
diff --git a/depend/bitcoin/src/bench/duplicate_inputs.cpp b/depend/bitcoin/src/bench/duplicate_inputs.cpp
index 5b1ca5f5..a5280667 100644
--- a/depend/bitcoin/src/bench/duplicate_inputs.cpp
+++ b/depend/bitcoin/src/bench/duplicate_inputs.cpp
@@ -16,9 +16,9 @@
 #include <sync.h>
 #include <test/util/setup_common.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <validation.h>
 
-#include <cassert>
 #include <cstdint>
 #include <memory>
 #include <string>
diff --git a/depend/bitcoin/src/bench/ellswift.cpp b/depend/bitcoin/src/bench/ellswift.cpp
index 2daf1a9e..2951ca9b 100644
--- a/depend/bitcoin/src/bench/ellswift.cpp
+++ b/depend/bitcoin/src/bench/ellswift.cpp
@@ -8,9 +8,10 @@
 #include <random.h>
 #include <span.h>
 #include <uint256.h>
+#include <util/check.h>
 
 #include <algorithm>
-#include <cassert>
+#include <span>
 
 static void EllSwiftCreate(benchmark::Bench& bench)
 {
diff --git a/depend/bitcoin/src/bench/index_blockfilter.cpp b/depend/bitcoin/src/bench/index_blockfilter.cpp
index 805ad050..a945754f 100644
--- a/depend/bitcoin/src/bench/index_blockfilter.cpp
+++ b/depend/bitcoin/src/bench/index_blockfilter.cpp
@@ -13,16 +13,16 @@
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/script.h>
-#include <span.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/strencodings.h>
-#include <util/time.h>
 #include <validation.h>
 
-#include <cassert>
 #include <memory>
+#include <span>
 #include <vector>
 
 using namespace util::hex_literals;
@@ -39,7 +39,7 @@ static void BlockFilterIndexSync(benchmark::Bench& bench)
     std::vector<CMutableTransaction> noTxns;
     for (int i = 0; i < CHAIN_SIZE - 100; i++) {
         test_setup->CreateAndProcessBlock(noTxns, script);
-        SetMockTime(GetTime() + 1);
+        test_setup->m_clock += 1s;
     }
     assert(WITH_LOCK(::cs_main, return test_setup->m_node.chainman->ActiveHeight() == CHAIN_SIZE));
 
diff --git a/depend/bitcoin/src/bench/load_external.cpp b/depend/bitcoin/src/bench/load_external.cpp
index 8e7201ea..77c229f1 100644
--- a/depend/bitcoin/src/bench/load_external.cpp
+++ b/depend/bitcoin/src/bench/load_external.cpp
@@ -7,7 +7,6 @@
 #include <chainparams.h>
 #include <flatfile.h>
 #include <node/blockstorage.h>
-#include <span.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
 #include <uint256.h>
@@ -18,8 +17,8 @@
 #include <cstdio>
 #include <map>
 #include <memory>
+#include <span>
 #include <stdexcept>
-#include <vector>
 
 /**
  * The LoadExternalBlockFile() function is used during -reindex and -loadblock.
diff --git a/depend/bitcoin/src/bench/lockedpool.cpp b/depend/bitcoin/src/bench/lockedpool.cpp
index 61b35cce..0a924a72 100644
--- a/depend/bitcoin/src/bench/lockedpool.cpp
+++ b/depend/bitcoin/src/bench/lockedpool.cpp
@@ -4,10 +4,12 @@
 
 #include <bench/bench.h>
 #include <support/lockedpool.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/2014.
+#include <util/byte_units.h> // IWYU pragma: keep
 
 #include <cstddef>
 #include <cstdint>
-#include <util/byte_units.h>
 #include <vector>
 
 #define ASIZE 2048
diff --git a/depend/bitcoin/src/bench/mempool_ephemeral_spends.cpp b/depend/bitcoin/src/bench/mempool_ephemeral_spends.cpp
index 1c069287..f88643c5 100644
--- a/depend/bitcoin/src/bench/mempool_ephemeral_spends.cpp
+++ b/depend/bitcoin/src/bench/mempool_ephemeral_spends.cpp
@@ -4,9 +4,10 @@
 
 #include <bench/bench.h>
 #include <consensus/amount.h>
+#include <consensus/validation.h>
 #include <kernel/cs_main.h>
 #include <policy/ephemeral_policy.h>
-#include <policy/policy.h>
+#include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <sync.h>
@@ -15,6 +16,7 @@
 #include <txmempool.h>
 #include <util/check.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <vector>
diff --git a/depend/bitcoin/src/bench/mempool_stress.cpp b/depend/bitcoin/src/bench/mempool_stress.cpp
index 1f582081..ab1146e1 100644
--- a/depend/bitcoin/src/bench/mempool_stress.cpp
+++ b/depend/bitcoin/src/bench/mempool_stress.cpp
@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 #include <consensus/amount.h>
-#include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <random.h>
 #include <script/script.h>
@@ -17,6 +16,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <optional>
 #include <vector>
 
 class CCoinsViewCache;
diff --git a/depend/bitcoin/src/bench/merkle_root.cpp b/depend/bitcoin/src/bench/merkle_root.cpp
index 17f7fa86..d80ddb21 100644
--- a/depend/bitcoin/src/bench/merkle_root.cpp
+++ b/depend/bitcoin/src/bench/merkle_root.cpp
@@ -6,8 +6,10 @@
 #include <consensus/merkle.h>
 #include <random.h>
 #include <uint256.h>
+#include <util/check.h>
 
-#include <cassert>
+#include <initializer_list>
+#include <utility>
 #include <vector>
 
 static void MerkleRoot(benchmark::Bench& bench)
diff --git a/depend/bitcoin/src/bench/nanobench.h b/depend/bitcoin/src/bench/nanobench.h
index 79a384aa..ffcc4802 100644
--- a/depend/bitcoin/src/bench/nanobench.h
+++ b/depend/bitcoin/src/bench/nanobench.h
@@ -41,10 +41,19 @@
 
 #include <chrono>        // high_resolution_clock
 #include <cassert>       // assert
+#include <cstdint>
 #include <cstring>       // memcpy
+// IWYU will only see this header with ANKERL_NANOBENCH_IMPLEMENT defined, which
+// makes it suggest removing forward declarations for the Input/output library.
+// IWYU pragma: begin_keep
 #include <iosfwd>        // for std::ostream* custom output target in Config
+// IWYU pragma: end_keep
+#include <limits>
+#include <ratio>
 #include <string>        // all names
+#include <type_traits>
 #include <unordered_map> // holds context information of results
+#include <utility>
 #include <vector>        // holds all results
 
 #define ANKERL_NANOBENCH(x) ANKERL_NANOBENCH_PRIVATE_##x()
@@ -127,6 +136,11 @@
 
 // declarations ///////////////////////////////////////////////////////////////////////////////////
 
+// As definitions follow these declarations within this
+// header, IWYU considers some of them redundant and
+// suggests removing them. Disable this IWYU behavior.
+// IWYU pragma: begin_keep
+
 namespace ankerl {
 namespace nanobench {
 
@@ -370,6 +384,8 @@ class LinuxPerformanceCounters;
 } // namespace nanobench
 } // namespace ankerl
 
+// IWYU pragma: end_keep
+
 // definitions ////////////////////////////////////////////////////////////////////////////////////
 
 namespace ankerl {
@@ -1353,18 +1369,22 @@ void doNotOptimizeAway(T const& val) {
 } // namespace ankerl
 
 #if defined(ANKERL_NANOBENCH_IMPLEMENT)
+// NOLINTBEGIN(misc-definitions-in-headers)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // implementation part - only visible in .cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #    include <algorithm> // sort, reverse
-#    include <atomic>    // compare_exchange_strong in loop overhead
+#    include <cmath>
+#    include <compare>
 #    include <cstdlib>   // getenv
-#    include <cstring>   // strstr, strncmp
 #    include <fstream>   // ifstream to parse proc files
+#    include <functional>
 #    include <iomanip>   // setw, setprecision
 #    include <iostream>  // cout
+#    include <iterator>
+#    include <locale>
 #    include <numeric>   // accumulate
 #    include <random>    // random_device
 #    include <sstream>   // to_s in Number
@@ -1379,18 +1399,22 @@ void doNotOptimizeAway(T const& val) {
 #        include <linux/perf_event.h>
 #        include <sys/ioctl.h>
 #        include <sys/syscall.h>
+#        include <sys/types.h>
 #    endif
 
 // declarations ///////////////////////////////////////////////////////////////////////////////////
 
+// As definitions follow these declarations within this
+// header, IWYU considers some of them redundant and
+// suggests removing them. Disable this IWYU behavior.
+// IWYU pragma: begin_keep
+
 namespace ankerl {
 namespace nanobench {
 
 // helper stuff that is only intended to be used internally
 namespace detail {
 
-struct TableInfo;
-
 // formatting utilities
 namespace fmt {
 
@@ -1405,6 +1429,8 @@ class MarkDownCode;
 } // namespace nanobench
 } // namespace ankerl
 
+// IWYU pragma: end_keep
+
 // definitions ////////////////////////////////////////////////////////////////////////////////////
 
 namespace ankerl {
@@ -2629,9 +2655,9 @@ class LinuxPerformanceCounters {
     std::map<uint64_t, Target> mIdToTarget{};
 
     // start with minimum size of 3 for read_format
-    std::vector<uint64_t> mCounters{3};
-    std::vector<uint64_t> mCalibratedOverhead{3};
-    std::vector<uint64_t> mLoopOverhead{3};
+    std::vector<uint64_t> mCounters = std::vector<uint64_t>(3);
+    std::vector<uint64_t> mCalibratedOverhead = std::vector<uint64_t>(3);
+    std::vector<uint64_t> mLoopOverhead = std::vector<uint64_t>(3);
 
     uint64_t mTimeEnabledNanos = 0;
     uint64_t mTimeRunningNanos = 0;
@@ -3538,5 +3564,6 @@ std::ostream& operator<<(std::ostream& os, std::vector<ankerl::nanobench::BigO>
 } // namespace nanobench
 } // namespace ankerl
 
+// NOLINTEND(misc-definitions-in-headers)
 #endif // ANKERL_NANOBENCH_IMPLEMENT
 #endif // ANKERL_NANOBENCH_H_INCLUDED
diff --git a/depend/bitcoin/src/bench/obfuscation.cpp b/depend/bitcoin/src/bench/obfuscation.cpp
index c7392e03..1587b734 100644
--- a/depend/bitcoin/src/bench/obfuscation.cpp
+++ b/depend/bitcoin/src/bench/obfuscation.cpp
@@ -7,6 +7,7 @@
 #include <util/obfuscation.h>
 
 #include <cstddef>
+#include <span>
 #include <vector>
 
 static void ObfuscationBench(benchmark::Bench& bench)
diff --git a/depend/bitcoin/src/bench/parse_hex.cpp b/depend/bitcoin/src/bench/parse_hex.cpp
index 928176bd..846009a3 100644
--- a/depend/bitcoin/src/bench/parse_hex.cpp
+++ b/depend/bitcoin/src/bench/parse_hex.cpp
@@ -4,11 +4,12 @@
 
 #include <bench/bench.h>
 #include <random.h>
+#include <util/check.h>
 #include <util/strencodings.h>
 
-#include <cassert>
 #include <cstddef>
 #include <optional>
+#include <string>
 #include <vector>
 
 std::string generateHexString(size_t length) {
diff --git a/depend/bitcoin/src/bench/peer_eviction.cpp b/depend/bitcoin/src/bench/peer_eviction.cpp
index 24b78e31..b9c1c9b3 100644
--- a/depend/bitcoin/src/bench/peer_eviction.cpp
+++ b/depend/bitcoin/src/bench/peer_eviction.cpp
@@ -7,8 +7,8 @@
 #include <node/eviction.h>
 #include <random.h>
 #include <test/util/net.h>
+#include <util/time.h>
 
-#include <chrono>
 #include <functional>
 #include <vector>
 
diff --git a/depend/bitcoin/src/bench/poly1305.cpp b/depend/bitcoin/src/bench/poly1305.cpp
index ef5a573d..a3d0f94b 100644
--- a/depend/bitcoin/src/bench/poly1305.cpp
+++ b/depend/bitcoin/src/bench/poly1305.cpp
@@ -2,14 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <bench/bench.h>
 #include <crypto/poly1305.h>
-#include <span.h>
-#include <util/byte_units.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/2014.
+#include <util/byte_units.h> // IWYU pragma: keep
 
 #include <cstddef>
 #include <cstdint>
+#include <span>
 #include <vector>
 
 /* Number of bytes to process per iteration */
diff --git a/depend/bitcoin/src/bench/prevector.cpp b/depend/bitcoin/src/bench/prevector.cpp
index e842aec4..2b5544fe 100644
--- a/depend/bitcoin/src/bench/prevector.cpp
+++ b/depend/bitcoin/src/bench/prevector.cpp
@@ -9,6 +9,7 @@
 #include <serialize.h>
 #include <streams.h>
 
+#include <span>
 #include <type_traits>
 #include <vector>
 
diff --git a/depend/bitcoin/src/bench/readwriteblock.cpp b/depend/bitcoin/src/bench/readwriteblock.cpp
index b8e226c6..984936db 100644
--- a/depend/bitcoin/src/bench/readwriteblock.cpp
+++ b/depend/bitcoin/src/bench/readwriteblock.cpp
@@ -9,15 +9,16 @@
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <serialize.h>
-#include <span.h>
 #include <streams.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
+#include <uint256.h>
+#include <util/check.h>
 #include <validation.h>
 
-#include <cassert>
-#include <cstdint>
 #include <memory>
-#include <vector>
+#include <optional>
+#include <span>
 
 static CBlock CreateTestBlock()
 {
@@ -32,6 +33,7 @@ static void WriteBlockBench(benchmark::Bench& bench)
     auto& blockman{testing_setup->m_node.chainman->m_blockman};
     const CBlock block{CreateTestBlock()};
     bench.run([&] {
+        LOCK(::cs_main);
         const auto pos{blockman.WriteBlock(block, 413'567)};
         assert(!pos.IsNull());
     });
@@ -43,7 +45,7 @@ static void ReadBlockBench(benchmark::Bench& bench)
     auto& blockman{testing_setup->m_node.chainman->m_blockman};
     const auto& test_block{CreateTestBlock()};
     const auto& expected_hash{test_block.GetHash()};
-    const auto& pos{blockman.WriteBlock(test_block, 413'567)};
+    const auto& pos{WITH_LOCK(::cs_main, return blockman.WriteBlock(test_block, 413'567))};
     bench.run([&] {
         CBlock block;
         const auto success{blockman.ReadBlock(block, pos, expected_hash)};
@@ -55,7 +57,7 @@ static void ReadRawBlockBench(benchmark::Bench& bench)
 {
     const auto testing_setup{MakeNoLogFileContext<const TestingSetup>(ChainType::MAIN)};
     auto& blockman{testing_setup->m_node.chainman->m_blockman};
-    const auto pos{blockman.WriteBlock(CreateTestBlock(), 413'567)};
+    const auto pos{WITH_LOCK(::cs_main, return blockman.WriteBlock(CreateTestBlock(), 413'567))};
     bench.run([&] {
         const auto res{blockman.ReadRawBlock(pos)};
         assert(res);
diff --git a/depend/bitcoin/src/bench/rollingbloom.cpp b/depend/bitcoin/src/bench/rollingbloom.cpp
index 8331eb6a..0f9bc9e8 100644
--- a/depend/bitcoin/src/bench/rollingbloom.cpp
+++ b/depend/bitcoin/src/bench/rollingbloom.cpp
@@ -2,13 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <bench/bench.h>
 #include <common/bloom.h>
 #include <crypto/common.h>
-#include <span.h>
 
 #include <cstdint>
+#include <span>
 #include <vector>
 
 static void RollingBloom(benchmark::Bench& bench)
diff --git a/depend/bitcoin/src/bench/rpc_blockchain.cpp b/depend/bitcoin/src/bench/rpc_blockchain.cpp
index fe83c4a2..b09eae64 100644
--- a/depend/bitcoin/src/bench/rpc_blockchain.cpp
+++ b/depend/bitcoin/src/bench/rpc_blockchain.cpp
@@ -5,21 +5,22 @@
 #include <bench/bench.h>
 #include <bench/data/block413567.raw.h>
 #include <chain.h>
+#include <consensus/params.h>
 #include <core_io.h>
+#include <kernel/chainparams.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <rpc/blockchain.h>
 #include <serialize.h>
-#include <span.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
 #include <uint256.h>
 #include <univalue.h>
 #include <validation.h>
 
-#include <cstddef>
 #include <memory>
-#include <vector>
+#include <span>
+#include <string>
 
 namespace {
 
diff --git a/depend/bitcoin/src/bench/sign_transaction.cpp b/depend/bitcoin/src/bench/sign_transaction.cpp
index 63a5d97f..38955595 100644
--- a/depend/bitcoin/src/bench/sign_transaction.cpp
+++ b/depend/bitcoin/src/bench/sign_transaction.cpp
@@ -8,17 +8,17 @@
 #include <key.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
+#include <random.h>
 #include <script/interpreter.h>
 #include <script/script.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
-#include <span.h>
-#include <test/util/random.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/translation.h>
 
-#include <cassert>
 #include <map>
+#include <span>
 #include <vector>
 
 enum class InputType {
diff --git a/depend/bitcoin/src/bench/streams_findbyte.cpp b/depend/bitcoin/src/bench/streams_findbyte.cpp
index c9ea486c..456f5aef 100644
--- a/depend/bitcoin/src/bench/streams_findbyte.cpp
+++ b/depend/bitcoin/src/bench/streams_findbyte.cpp
@@ -5,11 +5,13 @@
 #include <bench/bench.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
+#include <util/check.h>
 #include <util/fs.h>
 
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
+#include <memory>
 
 static void FindByte(benchmark::Bench& bench)
 {
diff --git a/depend/bitcoin/src/bench/strencodings.cpp b/depend/bitcoin/src/bench/strencodings.cpp
index c00de181..4b52b744 100644
--- a/depend/bitcoin/src/bench/strencodings.cpp
+++ b/depend/bitcoin/src/bench/strencodings.cpp
@@ -6,9 +6,10 @@
 #include <consensus/consensus.h>
 #include <crypto/hex_base.h>
 #include <random.h>
-#include <span.h>
-#include <util/strencodings.h>
 
+#include <cstddef>
+#include <span>
+#include <string>
 #include <vector>
 
 static void HexStrBench(benchmark::Bench& bench)
diff --git a/depend/bitcoin/src/bench/txgraph.cpp b/depend/bitcoin/src/bench/txgraph.cpp
index c56a284a..57081dd9 100644
--- a/depend/bitcoin/src/bench/txgraph.cpp
+++ b/depend/bitcoin/src/bench/txgraph.cpp
@@ -5,10 +5,17 @@
 #include <bench/bench.h>
 #include <random.h>
 #include <txgraph.h>
+#include <util/check.h>
 #include <util/feefrac.h>
 
-#include <cassert>
+#include <algorithm>
+#include <compare>
+#include <cstddef>
 #include <cstdint>
+#include <functional>
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace {
 
diff --git a/depend/bitcoin/src/bench/txorphanage.cpp b/depend/bitcoin/src/bench/txorphanage.cpp
index 1f94553b..8765a7b9 100644
--- a/depend/bitcoin/src/bench/txorphanage.cpp
+++ b/depend/bitcoin/src/bench/txorphanage.cpp
@@ -3,19 +3,24 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <consensus/amount.h>
+#include <consensus/consensus.h>
+#include <consensus/validation.h>
 #include <net.h>
 #include <policy/policy.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
-#include <pubkey.h>
-#include <script/sign.h>
-#include <test/util/setup_common.h>
 #include <node/txorphanage.h>
-#include <util/check.h>
+#include <random.h>
 #include <test/util/transaction_utils.h>
+#include <threadsafety.h>
+#include <util/check.h>
 
+#include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <numeric>
+#include <vector>
 
 static constexpr node::TxOrphanage::Usage TINY_TX_WEIGHT{240};
 static constexpr int64_t APPROX_WEIGHT_PER_INPUT{200};
diff --git a/depend/bitcoin/src/bench/uint256_blob.cpp b/depend/bitcoin/src/bench/uint256_blob.cpp
new file mode 100644
index 00000000..fba0a0e8
--- /dev/null
+++ b/depend/bitcoin/src/bench/uint256_blob.cpp
@@ -0,0 +1,91 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
+#include <bench/bench.h>
+#include <random.h>
+#include <uint256.h>
+
+#include <compare>
+#include <cstddef>
+#include <utility>
+#include <vector>
+
+namespace {
+
+enum class Difference {
+    NONE,
+    FIRST_BYTE,
+    LAST_BYTE,
+};
+
+constexpr size_t NUM_PAIRS{4'096};
+
+std::vector<std::pair<uint256, uint256>> MakePairs(Difference difference)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    std::vector<std::pair<uint256, uint256>> pairs;
+    pairs.reserve(NUM_PAIRS);
+
+    for (size_t i{0}; i < NUM_PAIRS; ++i) {
+        uint256 lhs{rng.rand256()};
+        uint256 rhs{lhs};
+        if (difference != Difference::NONE) {
+            const size_t position{difference == Difference::FIRST_BYTE ? 0 : uint256::size() - 1};
+            lhs.begin()[position] = i % 2 == 0 ? 0 : 255;
+            rhs.begin()[position] = i % 2 == 0 ? 255 : 0;
+        }
+        pairs.emplace_back(lhs, rhs);
+    }
+    return pairs;
+}
+
+template <typename Comparator>
+void Comparison(benchmark::Bench& bench, Difference difference, Comparator comparator)
+{
+    const auto pairs{MakePairs(difference)};
+    bench.batch(pairs.size()).unit("comparison").run([&] {
+        for (const auto& [lhs, rhs] : pairs) {
+            ankerl::nanobench::doNotOptimizeAway(comparator(lhs, rhs));
+        }
+    });
+}
+
+void Uint256EqualIdentical(benchmark::Bench& bench)
+{
+    Comparison(bench, Difference::NONE, [](const uint256& lhs, const uint256& rhs) { return lhs == rhs; });
+}
+
+void Uint256EqualFirstByteDifferent(benchmark::Bench& bench)
+{
+    Comparison(bench, Difference::FIRST_BYTE, [](const uint256& lhs, const uint256& rhs) { return lhs == rhs; });
+}
+
+void Uint256EqualLastByteDifferent(benchmark::Bench& bench)
+{
+    Comparison(bench, Difference::LAST_BYTE, [](const uint256& lhs, const uint256& rhs) { return lhs == rhs; });
+}
+
+void Uint256LessIdentical(benchmark::Bench& bench)
+{
+    Comparison(bench, Difference::NONE, [](const uint256& lhs, const uint256& rhs) { return lhs < rhs; });
+}
+
+void Uint256LessFirstByteDifferent(benchmark::Bench& bench)
+{
+    Comparison(bench, Difference::FIRST_BYTE, [](const uint256& lhs, const uint256& rhs) { return lhs < rhs; });
+}
+
+void Uint256LessLastByteDifferent(benchmark::Bench& bench)
+{
+    Comparison(bench, Difference::LAST_BYTE, [](const uint256& lhs, const uint256& rhs) { return lhs < rhs; });
+}
+
+} // namespace
+
+BENCHMARK(Uint256EqualIdentical);
+BENCHMARK(Uint256EqualFirstByteDifferent);
+BENCHMARK(Uint256EqualLastByteDifferent);
+BENCHMARK(Uint256LessIdentical);
+BENCHMARK(Uint256LessFirstByteDifferent);
+BENCHMARK(Uint256LessLastByteDifferent);
diff --git a/depend/bitcoin/src/bench/util_time.cpp b/depend/bitcoin/src/bench/util_time.cpp
index 19ffd0e0..0079549c 100644
--- a/depend/bitcoin/src/bench/util_time.cpp
+++ b/depend/bitcoin/src/bench/util_time.cpp
@@ -15,7 +15,7 @@ static void BenchTimeDeprecated(benchmark::Bench& bench)
 
 static void BenchTimeMock(benchmark::Bench& bench)
 {
-    NodeClockContext clock_ctx{111s};
+    FakeNodeClock clock{111s};
     bench.run([&] {
         (void)GetTime<std::chrono::seconds>();
     });
diff --git a/depend/bitcoin/src/bench/verify_script.cpp b/depend/bitcoin/src/bench/verify_script.cpp
index 8f07fd34..b6d73b86 100644
--- a/depend/bitcoin/src/bench/verify_script.cpp
+++ b/depend/bitcoin/src/bench/verify_script.cpp
@@ -4,20 +4,26 @@
 
 #include <addresstype.h>
 #include <bench/bench.h>
+#include <coins.h>
 #include <key.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/script_error.h>
+#include <script/sign.h>
+#include <script/signingprovider.h>
+#include <script/verify_flags.h>
 #include <span.h>
 #include <test/util/transaction_utils.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/translation.h>
 
-#include <array>
-#include <cassert>
-#include <cstdint>
+#include <cstddef>
+#include <map>
+#include <span>
 #include <vector>
 
 enum class ScriptType {
diff --git a/depend/bitcoin/src/bench/wallet_balance.cpp b/depend/bitcoin/src/bench/wallet_balance.cpp
index d9cd4bbb..76d0fd39 100644
--- a/depend/bitcoin/src/bench/wallet_balance.cpp
+++ b/depend/bitcoin/src/bench/wallet_balance.cpp
@@ -4,6 +4,7 @@
 
 #include <bench/bench.h>
 #include <interfaces/chain.h>
+#include <interfaces/handler.h>
 #include <kernel/chainparams.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
@@ -12,14 +13,15 @@
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
 #include <uint256.h>
-#include <util/time.h>
+#include <util/check.h>
 #include <validation.h>
+#include <wallet/db.h>
 #include <wallet/receive.h>
+#include <wallet/sqlite.h>
 #include <wallet/test/util.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
-#include <cassert>
 #include <memory>
 #include <optional>
 #include <string>
@@ -33,8 +35,8 @@ static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const b
 
     // Set clock to genesis block, so the descriptors/keys creation time don't interfere with the blocks scanning process.
     // The reason is 'generatetoaddress', which creates a chain with deterministic timestamps in the past.
-    NodeClockContext clock_ctx{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
-    CWallet wallet{test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase()};
+    FakeNodeClock clock{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
+    CWallet wallet{test_setup->m_node.chain.get(), "", MakeInMemoryWalletDatabase()};
     {
         LOCK(wallet.cs_wallet);
         wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
@@ -53,11 +55,14 @@ static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const b
 
     auto bal = GetBalance(wallet); // Cache
 
-    bench.run([&] {
-        if (set_dirty) wallet.MarkDirty();
-        bal = GetBalance(wallet);
-        if (add_mine) assert(bal.m_mine_trusted > 0);
-    });
+    bench.setup([&] {
+            if (set_dirty) wallet.MarkDirty();
+        })
+        .run([&] {
+            bal = GetBalance(wallet);
+            ankerl::nanobench::doNotOptimizeAway(bal);
+            assert(add_mine == (bal.m_mine_trusted > 0));
+        });
 }
 
 static void WalletBalanceDirty(benchmark::Bench& bench) { WalletBalance(bench, /*set_dirty=*/true, /*add_mine=*/true); }
diff --git a/depend/bitcoin/src/bench/wallet_create.cpp b/depend/bitcoin/src/bench/wallet_create.cpp
index d29ef339..13e8ee14 100644
--- a/depend/bitcoin/src/bench/wallet_create.cpp
+++ b/depend/bitcoin/src/bench/wallet_create.cpp
@@ -4,9 +4,9 @@
 
 #include <bench/bench.h>
 #include <random.h>
-#include <support/allocators/secure.h>
 #include <test/util/setup_common.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/fs.h>
 #include <util/translation.h>
 #include <wallet/context.h>
@@ -14,7 +14,6 @@
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
-#include <cassert>
 #include <memory>
 #include <optional>
 #include <string>
@@ -47,17 +46,21 @@ static void WalletCreate(benchmark::Bench& bench, bool encrypted)
     const auto wallet_path = test_setup->m_path_root / "test_wallet";
     const auto wallet_name = fs::PathToString(wallet_path);
 
-    bench.run([&] {
-        auto wallet = CreateWallet(context, wallet_name, /*load_on_start=*/std::nullopt, options, status, error_string, warnings);
-        assert(status == DatabaseStatus::SUCCESS);
-        assert(wallet != nullptr);
-
+    std::shared_ptr<CWallet> wallet;
+    auto cleanup{[&] {
+        if (!wallet) return;
         // Release wallet
-        RemoveWallet(context, wallet, /*load_on_start=*/ std::nullopt);
+        RemoveWallet(context, wallet, /*load_on_start=*/std::nullopt);
         WaitForDeleteWallet(std::move(wallet));
         fs::remove(wallet_path / "wallet.dat");
         fs::remove(wallet_path);
+    }};
+    bench.setup(cleanup).run([&] {
+        wallet = CreateWallet(context, wallet_name, /*load_on_start=*/std::nullopt, options, status, error_string, warnings);
+        assert(status == DatabaseStatus::SUCCESS);
+        assert(wallet != nullptr);
     });
+    cleanup();
 }
 
 static void WalletCreatePlain(benchmark::Bench& bench) { WalletCreate(bench, /*encrypted=*/false); }
diff --git a/depend/bitcoin/src/bench/wallet_create_tx.cpp b/depend/bitcoin/src/bench/wallet_create_tx.cpp
index 11125e26..b0140910 100644
--- a/depend/bitcoin/src/bench/wallet_create_tx.cpp
+++ b/depend/bitcoin/src/bench/wallet_create_tx.cpp
@@ -9,7 +9,6 @@
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
-#include <interfaces/chain.h>
 #include <kernel/chain.h>
 #include <kernel/types.h>
 #include <node/blockstorage.h>
@@ -22,28 +21,31 @@
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/result.h>
-#include <util/time.h>
 #include <validation.h>
 #include <versionbits.h>
 #include <wallet/coincontrol.h>
 #include <wallet/coinselection.h>
+#include <wallet/db.h>
 #include <wallet/spend.h>
+#include <wallet/sqlite.h>
 #include <wallet/test/util.h>
+#include <wallet/types.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
-#include <cassert>
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
+#include <string>
 #include <utility>
 #include <vector>
 
 using kernel::ChainstateRole;
 using wallet::CWallet;
-using wallet::CreateMockableWalletDatabase;
+using wallet::MakeInMemoryWalletDatabase;
 using wallet::WALLET_FLAG_DESCRIPTORS;
 
 struct TipBlock
@@ -118,8 +120,8 @@ static void WalletCreateTx(benchmark::Bench& bench, const OutputType output_type
     const auto test_setup = MakeNoLogFileContext<const TestingSetup>();
 
     // Set clock to genesis block, so the descriptors/keys creation time don't interfere with the blocks scanning process.
-    NodeClockContext clock_ctx{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
-    CWallet wallet{test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase()};
+    FakeNodeClock clock{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
+    CWallet wallet{test_setup->m_node.chain.get(), "", MakeInMemoryWalletDatabase()};
     {
         LOCK(wallet.cs_wallet);
         wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
@@ -173,8 +175,8 @@ static void AvailableCoins(benchmark::Bench& bench, const std::vector<OutputType
 {
     const auto test_setup = MakeNoLogFileContext<const TestingSetup>();
     // Set clock to genesis block, so the descriptors/keys creation time don't interfere with the blocks scanning process.
-    NodeClockContext clock_ctx{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
-    CWallet wallet{test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase()};
+    FakeNodeClock clock{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
+    CWallet wallet{test_setup->m_node.chain.get(), "", MakeInMemoryWalletDatabase()};
     {
         LOCK(wallet.cs_wallet);
         wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
diff --git a/depend/bitcoin/src/bench/wallet_encrypt.cpp b/depend/bitcoin/src/bench/wallet_encrypt.cpp
index 3d73081c..7f6ff3af 100644
--- a/depend/bitcoin/src/bench/wallet_encrypt.cpp
+++ b/depend/bitcoin/src/bench/wallet_encrypt.cpp
@@ -3,18 +3,30 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <key.h>
 #include <key_io.h>
-#include <outputtype.h>
 #include <random.h>
+#include <script/descriptor.h>
+#include <script/signingprovider.h>
 #include <support/allocators/secure.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
-#include <util/time.h>
+#include <test/util/time.h>
+#include <util/check.h>
 #include <wallet/context.h>
+#include <wallet/crypter.h>
+#include <wallet/db.h>
+#include <wallet/sqlite.h>
 #include <wallet/test/util.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
-#include <cassert>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace wallet {
 static void WalletEncrypt(benchmark::Bench& bench, unsigned int key_count)
@@ -30,48 +42,47 @@ static void WalletEncrypt(benchmark::Bench& bench, unsigned int key_count)
     context.chain = test_setup->m_node.chain.get();
 
     uint64_t create_flags = WALLET_FLAG_DESCRIPTORS;
-    auto database = CreateMockableWalletDatabase();
-    auto wallet = TestCreateWallet(std::move(database), context, create_flags);
 
-    {
-        LOCK(wallet->cs_wallet);
-        for (unsigned int i = 0; i < key_count; i++) {
-            CKey key = GenerateRandomKey();
-            FlatSigningProvider keys;
-            std::string error;
-            std::vector<std::unique_ptr<Descriptor>> desc = Parse("combo(" + EncodeSecret(key) + ")", keys, error, /*require_checksum=*/false);
-            WalletDescriptor w_desc(std::move(desc.at(0)), /*creation_time=*/0, /*range_start=*/0, /*range_end=*/0, /*next_index=*/0);
-            Assert(wallet->AddWalletDescriptor(w_desc, keys, /*label=*/"", /*internal=*/false));
-        }
+    std::vector<std::pair<WalletDescriptor, FlatSigningProvider>> descs;
+    descs.reserve(key_count);
+    for (unsigned int i = 0; i < key_count; i++) {
+        CKey key = GenerateRandomKey();
+        FlatSigningProvider keys;
+        std::string error;
+        std::vector<std::unique_ptr<Descriptor>> desc = Parse("combo(" + EncodeSecret(key) + ")", keys, error, /*require_checksum=*/false);
+        WalletDescriptor w_desc(std::move(desc.at(0)), /*creation_time=*/0, /*range_start=*/0, /*range_end=*/0, /*next_index=*/0);
+        descs.emplace_back(w_desc, keys);
     }
 
-    database = DuplicateMockDatabase(wallet->GetDatabase());
-
-    // reload the wallet for the actual benchmark
-    TestUnloadWallet(std::move(wallet));
-
     // Setting a mock time is necessary to force default derive iteration count during
     // wallet encryption.
-    SetMockTime(1);
-
-    // This benchmark has a lot of overhead, this should be good enough to catch
-    // any regressions, but for an accurate measurement of how long wallet
-    // encryption takes, this should be reworked after something like
-    // https://github.com/bitcoin/bitcoin/pull/34208 is merged.
-    bench.batch(key_count).unit("key").run([&] {
-        wallet = TestLoadWallet(std::move(database), context);
-
-        // Save a copy of the db before encrypting
-        database = DuplicateMockDatabase(wallet->GetDatabase());
-
-        wallet->EncryptWallet(secure_pass);
-
-        for (const auto& [_, key] : wallet->mapMasterKeys){
-            assert(key.nDeriveIterations == CMasterKey::DEFAULT_DERIVE_ITERATIONS);
-        }
-
-        TestUnloadWallet(std::move(wallet));
-    });
+    FakeNodeClock clock{1s};
+
+    std::unique_ptr<WalletDatabase> database;
+    std::shared_ptr<CWallet> wallet;
+    bench.batch(key_count).unit("key").setup([&] {
+            if (wallet) {
+                TestUnloadWallet(std::move(wallet));
+            }
+
+            std::unique_ptr<WalletDatabase> database = MakeInMemoryWalletDatabase();
+            wallet = TestCreateWallet(std::move(database), context, create_flags);
+
+            {
+                LOCK(wallet->cs_wallet);
+                for (auto& [desc, keys] : descs) {
+                    Assert(wallet->AddWalletDescriptor(desc, keys, /*label=*/"", /*internal=*/false));
+                }
+            }
+        })
+        .run([&] {
+            wallet->EncryptWallet(secure_pass);
+
+            for (const auto& [_, key] : wallet->mapMasterKeys){
+                assert(key.nDeriveIterations == CMasterKey::DEFAULT_DERIVE_ITERATIONS);
+            }
+        });
+    TestUnloadWallet(std::move(wallet));
 }
 
 constexpr unsigned int KEY_COUNT = 2000;
diff --git a/depend/bitcoin/src/bench/wallet_ismine.cpp b/depend/bitcoin/src/bench/wallet_ismine.cpp
index 6bfbb42d..4b059b34 100644
--- a/depend/bitcoin/src/bench/wallet_ismine.cpp
+++ b/depend/bitcoin/src/bench/wallet_ismine.cpp
@@ -11,17 +11,20 @@
 #include <script/signingprovider.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
+#include <util/check.h>
 #include <wallet/context.h>
 #include <wallet/db.h>
+#include <wallet/sqlite.h>
 #include <wallet/test/util.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
-#include <cassert>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 namespace wallet {
 static void WalletIsMine(benchmark::Bench& bench, int num_combo = 0)
@@ -35,7 +38,7 @@ static void WalletIsMine(benchmark::Bench& bench, int num_combo = 0)
     // Setup the wallet
     // Loading the wallet will also create it
     uint64_t create_flags = WALLET_FLAG_DESCRIPTORS;
-    auto database = CreateMockableWalletDatabase();
+    auto database = MakeInMemoryWalletDatabase();
     auto wallet = TestCreateWallet(std::move(database), context, create_flags);
 
     // For a descriptor wallet, fill with num_combo combo descriptors with random keys
diff --git a/depend/bitcoin/src/bench/wallet_loading.cpp b/depend/bitcoin/src/bench/wallet_loading.cpp
index 20997ff8..6b1208ea 100644
--- a/depend/bitcoin/src/bench/wallet_loading.cpp
+++ b/depend/bitcoin/src/bench/wallet_loading.cpp
@@ -7,8 +7,10 @@
 #include <consensus/amount.h>
 #include <outputtype.h>
 #include <primitives/transaction.h>
+#include <script/script.h>
 #include <test/util/setup_common.h>
 #include <util/check.h>
+#include <util/translation.h>
 #include <wallet/context.h>
 #include <wallet/db.h>
 #include <wallet/test/util.h>
@@ -18,6 +20,8 @@
 
 #include <cstdint>
 #include <memory>
+#include <optional>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -42,7 +46,12 @@ static void WalletLoadingDescriptors(benchmark::Bench& bench)
     // Setup the wallet
     // Loading the wallet will also create it
     uint64_t create_flags = WALLET_FLAG_DESCRIPTORS;
-    auto database = CreateMockableWalletDatabase();
+    DatabaseStatus status;
+    DatabaseOptions options;
+    options.require_format = DatabaseFormat::SQLITE;
+    options.require_create = true;
+    bilingual_str error;
+    auto database = MakeWalletDatabase("", options, status, error);
     auto wallet = TestCreateWallet(std::move(database), context, create_flags);
 
     // Generate a bunch of transactions and addresses to put into the wallet
@@ -50,18 +59,20 @@ static void WalletLoadingDescriptors(benchmark::Bench& bench)
         AddTx(*wallet);
     }
 
-    database = DuplicateMockDatabase(wallet->GetDatabase());
+    options.require_create = false;
+    options.require_existing = true;
 
-    // reload the wallet for the actual benchmark
-    TestUnloadWallet(std::move(wallet));
-
-    bench.epochs(5).run([&] {
-        wallet = TestLoadWallet(std::move(database), context);
+    bench.epochs(5)
+        .setup([&] {
+            TestUnloadWallet(std::move(wallet));
+            database = MakeWalletDatabase("", options, status, error);
+        })
+        .run([&] {
+            wallet = TestLoadWallet(std::move(database), context);
+        });
 
-        // Cleanup
-        database = DuplicateMockDatabase(wallet->GetDatabase());
-        TestUnloadWallet(std::move(wallet));
-    });
+    // Cleanup
+    TestUnloadWallet(std::move(wallet));
 }
 
 BENCHMARK(WalletLoadingDescriptors);
diff --git a/depend/bitcoin/src/bench/wallet_migration.cpp b/depend/bitcoin/src/bench/wallet_migration.cpp
index 7d7aca11..22caec75 100644
--- a/depend/bitcoin/src/bench/wallet_migration.cpp
+++ b/depend/bitcoin/src/bench/wallet_migration.cpp
@@ -2,20 +2,34 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
+#include <addresstype.h>
 #include <bench/bench.h>
-#include <interfaces/chain.h>
+#include <consensus/amount.h>
 #include <interfaces/wallet.h>
-#include <kernel/chain.h>
-#include <kernel/types.h>
-#include <node/context.h>
-#include <test/util/mining.h>
+#include <key.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <pubkey.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
-#include <wallet/context.h>
-#include <wallet/receive.h>
+#include <tinyformat.h>
+#include <util/check.h>
+#include <util/result.h>
+#include <wallet/db.h>
+#include <wallet/scriptpubkeyman.h>
 #include <wallet/test/util.h>
+#include <wallet/transaction.h>
 #include <wallet/wallet.h>
+#include <wallet/walletdb.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <memory>
 #include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace wallet{
 
@@ -27,53 +41,64 @@ static void WalletMigration(benchmark::Bench& bench)
     // Number of imported watch only addresses
     int NUM_WATCH_ONLY_ADDR = 20;
 
-    // Setup legacy wallet
-    std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase());
-    {
-        LegacyDataSPKM* legacy_spkm = wallet->GetOrCreateLegacyDataSPKM();
-        WalletBatch batch{wallet->GetDatabase()};
+    // Add watch-only addresses
+    std::vector<std::pair<CScript, CTxDestination>> scripts_watch_only;
+    for (int w = 0; w < NUM_WATCH_ONLY_ADDR; ++w) {
+        CKey key = GenerateRandomKey();
+        const PKHash dest{key.GetPubKey()};
+        scripts_watch_only.emplace_back(GetScriptForDestination(dest), dest);
+    }
+
+    // Generate transactions and local addresses
+    std::vector<CKey> keys(500);
+    std::ranges::generate(keys, []{ return GenerateRandomKey(); });
 
-        // Write a best block record as migration expects one to exist
-        CBlockLocator loc;
-        batch.WriteBestBlock(loc);
+    std::unique_ptr<CWallet> wallet;
+    size_t i = 0;
+    bench.epochs(/*numEpochs=*/1) // run the migration exactly once
+        .setup([&] {
+            // Setup legacy wallet
+            wallet = std::make_unique<CWallet>(test_setup->m_node.chain.get(), std::string(i++, 'A'), CreateMockableWalletDatabase());
+            LegacyDataSPKM* legacy_spkm = wallet->GetOrCreateLegacyDataSPKM();
+            WalletBatch batch{wallet->GetDatabase()};
 
-        // Add watch-only addresses
-        std::vector<CScript> scripts_watch_only;
-        for (int w = 0; w < NUM_WATCH_ONLY_ADDR; ++w) {
-            CKey key = GenerateRandomKey();
             LOCK(wallet->cs_wallet);
-            const PKHash dest{key.GetPubKey()};
-            const CScript& script = scripts_watch_only.emplace_back(GetScriptForDestination(dest));
-            assert(legacy_spkm->LoadWatchOnly(script));
-            assert(wallet->SetAddressBook(dest, strprintf("watch_%d", w), /*purpose=*/std::nullopt));
-            batch.WriteWatchOnly(script, CKeyMetadata());
-        }
 
-        // Generate transactions and local addresses
-        for (int j = 0; j < 500; ++j) {
-            CKey key = GenerateRandomKey();
-            CPubKey pubkey = key.GetPubKey();
-            // Load key, scripts and create address book record
-            Assert(legacy_spkm->LoadKey(key, pubkey));
-            CTxDestination dest{PKHash(pubkey)};
-            Assert(wallet->SetAddressBook(dest, strprintf("legacy_%d", j), /*purpose=*/std::nullopt));
+            // Write a best block record as migration expects one to exist
+            CBlockLocator loc;
+            batch.WriteBestBlock(loc);
 
-            CMutableTransaction mtx;
-            mtx.vout.emplace_back(COIN, GetScriptForDestination(dest));
-            mtx.vout.emplace_back(COIN, scripts_watch_only.at(j % NUM_WATCH_ONLY_ADDR));
-            mtx.vin.resize(2);
-            wallet->AddToWallet(MakeTransactionRef(mtx), TxStateInactive{}, /*update_wtx=*/nullptr, /*rescanning_old_block=*/true);
-            batch.WriteKey(pubkey, key.GetPrivKey(), CKeyMetadata());
-        }
-    }
+            // Add watch-only addresses
+            for (size_t w = 0; w < scripts_watch_only.size(); ++w) {
+                const auto& [script, dest] = scripts_watch_only.at(w);
+                assert(legacy_spkm->LoadWatchOnly(script));
+                assert(wallet->SetAddressBook(dest, strprintf("watch_%d", w), /*purpose=*/std::nullopt));
+                batch.WriteWatchOnly(script, CKeyMetadata());
+            }
+
+            // Generate transactions and local addresses
+            for (size_t j = 0; j < keys.size(); ++j) {
+                const CKey& key = keys.at(j);
+                // Load key, scripts and create address book record
+                CPubKey pubkey = key.GetPubKey();
+                Assert(legacy_spkm->LoadKey(key, pubkey));
+                CTxDestination dest{PKHash(pubkey)};
+                Assert(wallet->SetAddressBook(dest, strprintf("legacy_%d", j), /*purpose=*/std::nullopt));
 
-    bench.epochs(/*numEpochs=*/1).epochIterations(/*numIters=*/1) // run the migration exactly once
-         .run([&] {
-             auto res{MigrateLegacyToDescriptor(std::move(wallet), /*passphrase=*/"", *loader->context())};
-             assert(res);
-             assert(res->wallet);
-             assert(res->watchonly_wallet);
-         });
+                CMutableTransaction mtx;
+                mtx.vout.emplace_back(COIN, GetScriptForDestination(dest));
+                mtx.vout.emplace_back(COIN, scripts_watch_only.at(j % NUM_WATCH_ONLY_ADDR).first);
+                mtx.vin.resize(2);
+                wallet->AddToWallet(MakeTransactionRef(mtx), TxStateInactive{}, /*update_wtx=*/nullptr, /*rescanning_old_block=*/true);
+                batch.WriteKey(pubkey, key.GetPrivKey(), CKeyMetadata());
+            }
+        })
+        .run([&] {
+            auto res{MigrateLegacyToDescriptor(std::move(wallet), /*passphrase=*/"", *loader->context())};
+            assert(res);
+            assert(res->wallet);
+            assert(res->watchonly_wallet);
+        });
 }
 
 BENCHMARK(WalletMigration);
diff --git a/depend/bitcoin/src/bip324.h b/depend/bitcoin/src/bip324.h
index 396a28a4..276f71e4 100644
--- a/depend/bitcoin/src/bip324.h
+++ b/depend/bitcoin/src/bip324.h
@@ -15,6 +15,8 @@
 #include <pubkey.h>
 #include <span.h>
 
+inline constexpr unsigned BIP324_SHORTIDS_IMPLEMENTED{38};
+
 /** The BIP324 packet cipher, encapsulating its key derivation, stream cipher, and AEAD. */
 class BIP324Cipher
 {
diff --git a/depend/bitcoin/src/bitcoin-cli.cpp b/depend/bitcoin/src/bitcoin-cli.cpp
index 3455aea7..c4510e3f 100644
--- a/depend/bitcoin/src/bitcoin-cli.cpp
+++ b/depend/bitcoin/src/bitcoin-cli.cpp
@@ -10,11 +10,13 @@
 #include <common/args.h>
 #include <common/license_info.h>
 #include <common/system.h>
+#include <common/url.h>
 #include <compat/compat.h>
 #include <compat/stdin.h>
 #include <interfaces/init.h>
 #include <interfaces/ipc.h>
 #include <interfaces/rpc.h>
+#include <netbase.h>
 #include <policy/feerate.h>
 #include <rpc/client.h>
 #include <rpc/mining.h>
@@ -24,7 +26,9 @@
 #include <univalue.h>
 #include <util/chaintype.h>
 #include <util/exception.h>
+#include <util/sock.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <util/time.h>
 #include <util/translation.h>
 
@@ -33,19 +37,19 @@
 #include <cmath>
 #include <cstdio>
 #include <functional>
+#include <limits>
 #include <memory>
 #include <optional>
+#include <span>
 #include <string>
+#include <string_view>
+#include <thread>
 #include <tuple>
 
 #ifndef WIN32
 #include <unistd.h>
 #endif
 
-#include <event2/buffer.h>
-#include <event2/keyvalq_struct.h>
-#include <support/events.h>
-
 using util::Join;
 using util::ToString;
 
@@ -75,6 +79,65 @@ static const std::string DEFAULT_NBLOCKS = "1";
 /** Default -color setting. */
 static const std::string DEFAULT_COLOR_SETTING{"auto"};
 
+struct HTTPError : std::runtime_error {
+    explicit inline HTTPError(const std::string& msg) : std::runtime_error(msg) {}
+};
+
+/** Parses the headers of an HTTP response.
+ *
+ * May be replaced by the corresponding methods in HTTPHeaders from
+ * https://github.com/bitcoin/bitcoin/pull/35182 once that class is in a
+ * shared location.
+ */
+class HTTPResponseHeaders
+{
+    std::vector<std::pair<std::string, std::string>> m_headers;
+
+public:
+    void Read(util::LineReader& reader);
+    std::optional<std::string> FindFirst(std::string_view key) const;
+};
+
+// Named Read() in HTTPHeaders (see PR #35182).
+void HTTPResponseHeaders::Read(util::LineReader& reader)
+{
+    // Headers https://httpwg.org/specs/rfc9110.html#rfc.section.6.3
+    // A sequence of Field Lines https://httpwg.org/specs/rfc9110.html#rfc.section.5.2
+    while (auto maybe_line = reader.ReadLine()) {
+        const std::string_view line = *maybe_line;
+
+        // An empty line indicates end of the headers section https://www.rfc-editor.org/rfc/rfc2616#section-4
+        if (line.empty()) return;
+
+        // Header line must have at least one ":"
+        // keys are not allowed to have delimiters like ":" but values are
+        // https://httpwg.org/specs/rfc9110.html#rfc.section.5.6.2
+        const size_t pos{line.find(':')};
+        if (pos == std::string::npos) throw HTTPError{"Header missing colon (:)"};
+
+        // Whitespace is optional
+        std::string key = util::TrimString(std::string_view(line).substr(0, pos));
+        std::string value = util::TrimString(std::string_view(line).substr(pos + 1));
+
+        // Header keys are Field Names: https://httpwg.org/specs/rfc9110.html#fields.names
+        // which consist of "tokens": https://httpwg.org/specs/rfc9110.html#rfc.section.5.6.2
+        // that can not be empty.
+        if (key.empty()) throw HTTPError{"Empty header name"};
+
+        m_headers.emplace_back(std::move(key), std::move(value));
+    }
+}
+
+std::optional<std::string> HTTPResponseHeaders::FindFirst(std::string_view key) const
+{
+    for (const auto& item : m_headers) {
+        if (CaseInsensitiveEqual(key, item.first)) {
+            return item.second;
+        }
+    }
+    return std::nullopt;
+}
+
 static void SetupCliArgs(ArgsManager& argsman)
 {
     SetupHelpOptions(argsman);
@@ -102,7 +165,7 @@ static void SetupCliArgs(ArgsManager& argsman)
     argsman.AddArg("-color=<when>", strprintf("Color setting for CLI output (default: %s). Valid values: always, auto (add color codes when standard output is connected to a terminal and OS is not WIN32), never. Only applies to the output of -getinfo.", DEFAULT_COLOR_SETTING), ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS);
     argsman.AddArg("-named", strprintf("Pass named instead of positional arguments (default: %s)", DEFAULT_NAMED), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-rpcid=<id>", strprintf("Set a custom JSON-RPC request ID string (default: %s)", DEFAULT_RPC_REQ_ID), ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION | ArgsManager::DISALLOW_ELISION, OptionsCategory::OPTIONS);
-    argsman.AddArg("-rpcclienttimeout=<n>", strprintf("Timeout in seconds during HTTP requests, or 0 for no timeout. (default: %d)", DEFAULT_HTTP_CLIENT_TIMEOUT), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-rpcclienttimeout=<n>", strprintf("Timeout in seconds during HTTP requests, or 0 for no timeout. Not implemented for IPC connections (see -ipcconnect). (default: %d)", DEFAULT_HTTP_CLIENT_TIMEOUT), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-rpcconnect=<ip>", strprintf("Send commands to node running on <ip> (default: %s)", DEFAULT_RPCCONNECT), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-rpccookiefile=<loc>", "Location of the auth cookie. Relative paths will be prefixed by a net-specific datadir location. (default: data dir)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-rpcpassword=<pw>", "Password for JSON-RPC connections", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
@@ -124,15 +187,6 @@ std::optional<std::string> RpcWalletName(const ArgsManager& args)
     return args.GetArg("-rpcwallet");
 }
 
-/** libevent event log callback */
-static void libevent_log_cb(int severity, const char *msg)
-{
-    // Ignore everything other than errors
-    if (severity >= EVENT_LOG_ERR) {
-        throw std::runtime_error(strprintf("libevent error: %s", msg));
-    }
-}
-
 //
 // Exception thrown on connection error.  This error is used to determine
 // when to wait if -rpcwait is given.
@@ -200,68 +254,12 @@ static int AppInitRPC(int argc, char* argv[])
     return CONTINUE_EXECUTION;
 }
 
-
-/** Reply structure for request_done to fill in */
-struct HTTPReply
+struct HTTPResponse
 {
-    HTTPReply() = default;
-
     int status{0};
-    int error{-1};
     std::string body;
 };
 
-static std::string http_errorstring(int code)
-{
-    switch(code) {
-    case EVREQ_HTTP_TIMEOUT:
-        return "timeout reached";
-    case EVREQ_HTTP_EOF:
-        return "EOF reached";
-    case EVREQ_HTTP_INVALID_HEADER:
-        return "error while reading header, or invalid header";
-    case EVREQ_HTTP_BUFFER_ERROR:
-        return "error encountered while reading or writing";
-    case EVREQ_HTTP_REQUEST_CANCEL:
-        return "request was canceled";
-    case EVREQ_HTTP_DATA_TOO_LONG:
-        return "response body is larger than allowed";
-    default:
-        return "unknown";
-    }
-}
-
-static void http_request_done(struct evhttp_request *req, void *ctx)
-{
-    HTTPReply *reply = static_cast<HTTPReply*>(ctx);
-
-    if (req == nullptr) {
-        /* If req is nullptr, it means an error occurred while connecting: the
-         * error code will have been passed to http_error_cb.
-         */
-        reply->status = 0;
-        return;
-    }
-
-    reply->status = evhttp_request_get_response_code(req);
-
-    struct evbuffer *buf = evhttp_request_get_input_buffer(req);
-    if (buf)
-    {
-        size_t size = evbuffer_get_length(buf);
-        const char *data = (const char*)evbuffer_pullup(buf, size);
-        if (data)
-            reply->body = std::string(data, size);
-        evbuffer_drain(buf, size);
-    }
-}
-
-static void http_error_cb(enum evhttp_request_error err, void *ctx)
-{
-    HTTPReply *reply = static_cast<HTTPReply*>(ctx);
-    reply->error = err;
-}
-
 static int8_t NetworkStringToId(const std::string& str)
 {
     for (size_t i = 0; i < NETWORKS.size(); ++i) {
@@ -832,6 +830,328 @@ static std::optional<UniValue> CallIPC(BaseRequestHandler* rh, const std::string
     return rh->ProcessReply(reply);
 }
 
+/**
+ * Simple synchronous HTTP client using Sock class.
+ */
+class HTTPClient
+{
+public:
+    static HTTPClient Connect(const std::string& host, uint16_t port, std::chrono::seconds timeout);
+
+    HTTPResponse Post(const std::string& endpoint,
+                      std::span<const std::pair<std::string, std::string>> headers,
+                      const std::string& body);
+
+private:
+    // Signal that the peer closed the connection cleanly. Used in the read-until-close fallback.
+    struct RecvEOF : CConnectionFailed { using CConnectionFailed::CConnectionFailed; };
+
+    std::unique_ptr<Sock> m_socket;
+    std::string m_host;
+    std::chrono::seconds m_timeout;
+
+    HTTPClient(std::unique_ptr<Sock>&& socket, const std::string& host, std::chrono::seconds timeout)
+        : m_socket(std::move(socket)), m_host(host), m_timeout(timeout) {}
+    bool SendRequest(std::string_view request);
+    HTTPResponse ReadResponse();
+    std::optional<std::string> Recv(std::chrono::time_point<std::chrono::steady_clock> deadline);
+};
+
+HTTPClient HTTPClient::Connect(const std::string& host, uint16_t port, std::chrono::seconds timeout)
+{
+    std::vector<CService> services = Lookup(host, port, /*fAllowLookup=*/true, /*nMaxSolutions=*/256);
+    if (services.empty()) {
+        throw CConnectionFailed(strprintf("Could not resolve host: %s", host));
+    }
+
+    const auto deadline{std::chrono::steady_clock::now() + timeout};
+    for (const CService& service : services) {
+        const auto time_left{std::chrono::duration_cast<std::chrono::milliseconds>(deadline - std::chrono::steady_clock::now())};
+        if (time_left.count() <= 0) break;
+
+        auto sock = ConnectDirectly(service, /*manual_connection=*/true, time_left);
+        if (sock) return HTTPClient{std::move(sock), host, timeout};
+    }
+
+    throw CConnectionFailed{"Could not connect to the server"};
+}
+
+HTTPResponse HTTPClient::Post(const std::string& endpoint,
+                              std::span<const std::pair<std::string, std::string>> headers,
+                              const std::string& body)
+{
+    try {
+        // Build HTTP request
+        std::string request = strprintf("POST %s HTTP/1.1\r\n"
+                                        "Host: %s\r\n"
+                                        "Connection: close\r\n"
+                                        "Content-Length: %d\r\n",
+                                        endpoint, m_host, body.size());
+
+        for (const auto& [name, value] : headers) {
+            request += strprintf("%s: %s\r\n", name, value);
+        }
+        request += "\r\n";
+        request += body;
+
+        if (!SendRequest(request)) {
+            throw CConnectionFailed("Failed to send HTTP request");
+        }
+
+        return ReadResponse();
+    } catch (const HTTPError& e) {
+        throw CConnectionFailed(strprintf("HTTP error: %s", e.what()));
+    }
+}
+
+bool HTTPClient::SendRequest(std::string_view request)
+{
+    const auto deadline{std::chrono::steady_clock::now() + m_timeout};
+
+    while (!request.empty()) {
+        Sock::Event event{0};
+        auto time_left = std::chrono::duration_cast<std::chrono::milliseconds>(
+            deadline - std::chrono::steady_clock::now());
+        if (time_left.count() <= 0 || !m_socket->Wait(time_left, Sock::SendEvent, &event)) {
+            return false;
+        }
+
+        if (!(event & Sock::SendEvent)) {
+            continue;
+        }
+
+        ssize_t sent = m_socket->Send(request.data(), request.size(), MSG_NOSIGNAL);
+        if (sent < 0) {
+            int err = WSAGetLastError();
+            if (!IOErrorIsPermanent(err)) {
+                std::this_thread::yield();
+                continue;
+            }
+            return false;
+        }
+        request.remove_prefix(sent);
+    }
+    return true;
+}
+
+HTTPResponse HTTPClient::ReadResponse()
+{
+    HTTPResponse response;
+    std::string buffer;
+    const auto deadline{std::chrono::steady_clock::now() + m_timeout};
+
+    // Read data until we have complete headers
+    size_t headers_end = 0;
+
+    while (headers_end == 0) {
+        if (auto result{Recv(deadline)}) {
+            buffer.append(*result);
+        } else {
+            std::this_thread::yield();
+            continue;
+        }
+
+        // Check for header terminator
+        size_t pos = buffer.find("\r\n\r\n");
+        if (pos != std::string::npos) {
+            headers_end = pos + 4;
+        }
+    }
+
+    // Parse http status
+    util::LineReader reader(std::string_view{buffer.data(), headers_end}, headers_end);
+    auto status_line = reader.ReadLine();
+    if (!status_line) {
+        throw HTTPError{"Failed to read status line"};
+    }
+
+    const std::string_view status_str = *status_line;
+    // Minimum status line is "HTTP/X.Y NNN" (e.g. "HTTP/1.1 200"), 12 characters.
+    if (status_str.size() < 12 || !status_str.starts_with("HTTP/")) {
+        throw HTTPError{"Invalid status line"};
+    }
+
+    size_t space1 = status_str.find(' ');
+    if (space1 == std::string::npos || space1 + 4 > status_str.size()) {
+        throw HTTPError{"Invalid status line format"};
+    }
+
+    const std::string_view status_code_str = status_str.substr(space1 + 1, 3);
+    auto status_code = ToIntegral<int>(status_code_str);
+    if (!status_code) {
+        throw HTTPError{"Invalid status code"};
+    }
+    response.status = *status_code;
+
+    HTTPResponseHeaders headers;
+    headers.Read(reader);
+
+    // Determine body length
+    size_t content_length = 0;
+    bool chunked = false;
+
+    // RFC 9112 §6.3 says responses with both Transfer-Encoding and Content-Length
+    // must be rejected. We are more lenient: Transfer-Encoding takes precedence
+    // and Content-Length is ignored.
+    auto transfer_encoding = headers.FindFirst("transfer-encoding");
+    if (transfer_encoding && ToLower(*transfer_encoding).find("chunked") != std::string::npos) {
+        chunked = true;
+    } else {
+        auto content_length_header = headers.FindFirst("content-length");
+        if (content_length_header) {
+            auto maybe_len = ToIntegral<size_t>(*content_length_header);
+            if (!maybe_len) {
+                throw HTTPError{"Invalid Content-Length"};
+            }
+            content_length = *maybe_len;
+        }
+    }
+
+    // Remove headers data from buffer, so only initial body data remains
+    buffer.erase(0, headers_end);
+
+    // Read remaining body
+    if (chunked) {
+        // Handle chunked transfer encoding
+        std::string body;
+
+        while (true) {
+            // Try to parse a chunk from current buffer
+            std::string_view chunk_data{buffer};
+            size_t line_end = chunk_data.find("\r\n");
+
+            if (line_end != std::string::npos) {
+                // Parse chunk size
+                std::string_view size_str = chunk_data.substr(0, line_end);
+                // Ignore chunk extensions
+                size_t semi = size_str.find(';');
+                if (semi != std::string::npos) {
+                    size_str = size_str.substr(0, semi);
+                }
+
+                const auto chunk_size{ToIntegral<uint64_t>(util::TrimStringView(size_str), /*base=*/16)};
+                if (!chunk_size) {
+                    throw HTTPError{"Invalid chunk size"};
+                }
+
+                if (*chunk_size == 0) {
+                    // Allow (but ignore) Chunked Trailer section, by
+                    // reading CRLF-terminated lines until we read an empty line,
+                    // which indicates the end of this response.
+                    // See https://httpwg.org/specs/rfc9112.html#rfc.section.7.1.2
+                    buffer.erase(0, line_end + 2);
+                    while (true) {
+                        size_t crlf_pos = buffer.find("\r\n");
+                        if (crlf_pos == std::string::npos) {
+                            // Need more data
+                            if (auto result{Recv(deadline)}) {
+                                buffer.append(*result);
+                            } else {
+                                std::this_thread::yield();
+                            }
+                            continue;
+                        }
+                        buffer.erase(0, crlf_pos + 2);
+                        if (crlf_pos == 0) break;
+                    }
+                    break;
+                }
+
+                // Check if we have the full chunk
+                size_t chunk_start = line_end + 2;
+                if (*chunk_size > std::numeric_limits<size_t>::max() - chunk_start - 2) {
+                    throw HTTPError{"Chunk size too large"};
+                }
+                size_t chunk_end = chunk_start + *chunk_size + 2; // +2 for trailing CRLF
+
+                if (buffer.size() >= chunk_end) {
+                    // Extract chunk data
+                    body.append(buffer, chunk_start, *chunk_size);
+
+                    // Remove processed data
+                    buffer.erase(0, chunk_end);
+                    continue;
+                }
+            }
+
+            // Need more data
+            while (true) {
+                if (auto result{Recv(deadline)}) {
+                    buffer.append(*result);
+                    break;
+                } else {
+                    std::this_thread::yield();
+                }
+            }
+        }
+
+        response.body = std::move(body);
+    } else if (content_length > 0) {
+        // Fixed content length
+        while (buffer.size() < content_length) {
+            if (auto result{Recv(deadline)}) {
+                buffer.append(*result);
+            } else {
+                std::this_thread::yield();
+            }
+        }
+
+        // Possibly shrink buffer in case we got a larger response than
+        // originally specified.
+        buffer.resize(content_length);
+        response.body = std::move(buffer);
+    } else {
+        // No Content-Length and not chunked: read until the peer closes the
+        // connection (RFC 9112 §6.3, HTTP/1.0 fallback).
+        try {
+            while (true) {
+                if (auto result{Recv(deadline)}) {
+                    buffer.append(*result);
+                } else {
+                    std::this_thread::yield();
+                }
+            }
+        } catch (const RecvEOF&) {}
+        response.body = std::move(buffer);
+    }
+
+    return response;
+}
+
+std::optional<std::string> HTTPClient::Recv(const std::chrono::time_point<std::chrono::steady_clock> deadline)
+{
+    auto wait_for_readable{[this](std::chrono::milliseconds timeout) -> bool {
+        Sock::Event event{0};
+        if (!m_socket->Wait(timeout, Sock::RecvEvent, &event)) {
+            return false;
+        }
+        return (event & Sock::RecvEvent) != 0;
+    }};
+
+    auto time_left = std::chrono::duration_cast<std::chrono::milliseconds>(
+        deadline - std::chrono::steady_clock::now());
+    if (time_left.count() <= 0 || !wait_for_readable(time_left)) {
+        throw CConnectionFailed{"timeout"};
+    }
+
+    char recv_buf[4096];
+    ssize_t nrecv = m_socket->Recv(recv_buf, sizeof(recv_buf), /*flags=*/0);
+
+    if (nrecv < 0) {
+        int err = WSAGetLastError();
+        if (!IOErrorIsPermanent(err)) {
+            return std::nullopt;
+        }
+        throw CConnectionFailed{strprintf("Read error: %s", NetworkErrorString(err))};
+    }
+
+    if (nrecv == 0) {
+        throw RecvEOF{"EOF"};
+    }
+
+    return std::string{recv_buf, static_cast<size_t>(nrecv)};
+}
+
 static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, const std::vector<std::string>& args, const std::string& endpoint, const std::string& username)
 {
     std::string host;
@@ -876,34 +1196,16 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
         }
     }
 
-    // Obtain event base
-    raii_event_base base = obtain_event_base();
-
-    // Synchronously look up hostname
-    raii_evhttp_connection evcon = obtain_evhttp_connection_base(base.get(), host, port);
-
     // Set connection timeout
-    {
-        const int timeout = gArgs.GetIntArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT);
-        if (timeout > 0) {
-            evhttp_connection_set_timeout(evcon.get(), timeout);
-        } else {
-            // Indefinite request timeouts are not possible in libevent-http, so we
-            // set the timeout to a very long time period instead.
-
-            constexpr int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar
-            evhttp_connection_set_timeout(evcon.get(), 5 * YEAR_IN_SECONDS);
-        }
-    }
-
-    HTTPReply response;
-    raii_evhttp_request req = obtain_evhttp_request(http_request_done, (void*)&response);
-    if (req == nullptr) {
-        throw std::runtime_error("create http request failed");
+    const int timeout = gArgs.GetIntArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT);
+    std::chrono::seconds timeout_duration;
+    if (timeout > 0) {
+        timeout_duration = std::chrono::seconds(timeout);
+    } else {
+        // Use 5 year timeout for "indefinite"
+        timeout_duration = std::chrono::years(5);
     }
 
-    evhttp_request_set_error_cb(req.get(), http_error_cb);
-
     // Get credentials
     std::string rpc_credentials;
     std::optional<AuthCookieResult> auth_cookie_result;
@@ -914,36 +1216,25 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
         rpc_credentials = username + ":" + gArgs.GetArg("-rpcpassword", "");
     }
 
-    struct evkeyvalq* output_headers = evhttp_request_get_output_headers(req.get());
-    assert(output_headers);
-    evhttp_add_header(output_headers, "Host", host.c_str());
-    evhttp_add_header(output_headers, "Connection", "close");
-    evhttp_add_header(output_headers, "Content-Type", "application/json");
-    evhttp_add_header(output_headers, "Authorization", (std::string("Basic ") + EncodeBase64(rpc_credentials)).c_str());
-
-    // Attach request data
+    const std::pair<std::string, std::string> headers[]{
+        {"Content-Type", "application/json"},
+        {"Authorization", "Basic " + EncodeBase64(rpc_credentials)},
+    };
     std::string strRequest = rh->PrepareRequest(strMethod, args).write() + "\n";
-    struct evbuffer* output_buffer = evhttp_request_get_output_buffer(req.get());
-    assert(output_buffer);
-    evbuffer_add(output_buffer, strRequest.data(), strRequest.size());
 
-    int r = evhttp_make_request(evcon.get(), req.release(), EVHTTP_REQ_POST, endpoint.c_str());
-    if (r != 0) {
-        throw CConnectionFailed("send http request failed");
-    }
-
-    event_base_dispatch(base.get());
-
-    if (response.status == 0) {
-        std::string responseErrorMessage;
-        if (response.error != -1) {
-            responseErrorMessage = strprintf(" (error code %d - \"%s\")", response.error, http_errorstring(response.error));
-        }
-        throw CConnectionFailed(strprintf("Could not connect to the server %s:%d%s\n\n"
+    HTTPResponse response;
+    try {
+        HTTPClient client{HTTPClient::Connect(host, port, timeout_duration)};
+        response = client.Post(endpoint, headers, strRequest);
+    } catch (const CConnectionFailed& e) {
+        const std::string formatted_error{*e.what() ? strprintf(" (%s)", e.what()) : ""};
+        throw CConnectionFailed(strprintf("Error while attempting to communicate with server %s:%d%s\n\n"
                     "Make sure the bitcoind server is running and that you are connecting to the correct RPC port.\n"
                     "Use \"bitcoin-cli -help\" for more info.",
-                    host, port, responseErrorMessage));
-    } else if (response.status == HTTP_UNAUTHORIZED) {
+                    host, port, formatted_error));
+    }
+
+    if (response.status == HTTP_UNAUTHORIZED) {
         std::string error{"Authorization failed: "};
         if (auth_cookie_result.has_value()) {
             switch (*auth_cookie_result) {
@@ -1000,13 +1291,7 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
     // check if we should use a special wallet endpoint
     std::string endpoint = "/";
     if (rpcwallet) {
-        char* encodedURI = evhttp_uriencode(rpcwallet->data(), rpcwallet->size(), false);
-        if (encodedURI) {
-            endpoint = "/wallet/" + std::string(encodedURI);
-            free(encodedURI);
-        } else {
-            throw CConnectionFailed("uri-encode failed");
-        }
+        endpoint = "/wallet/" + UrlEncode(*rpcwallet);
     }
 
     std::string username{gArgs.GetArg("-rpcuser", "")};
@@ -1027,8 +1312,10 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
         } catch (const CConnectionFailed& e) {
             if (fWait && (timeout <= 0 || std::chrono::steady_clock::now() < deadline)) {
                 UninterruptibleSleep(1s);
-            } else {
+            } else if (fWait) {
                 throw CConnectionFailed(strprintf("timeout on transient error: %s", e.what()));
+            } else {
+                throw;
             }
         }
     } while (fWait);
@@ -1387,7 +1674,6 @@ MAIN_FUNCTION
         tfm::format(std::cerr, "Error: Initializing networking failed\n");
         return EXIT_FAILURE;
     }
-    event_set_log_callback(&libevent_log_cb);
 
     try {
         int ret = AppInitRPC(argc, argv);
diff --git a/depend/bitcoin/src/bitcoin-tx.cpp b/depend/bitcoin/src/bitcoin-tx.cpp
index f21db40f..017e8e1e 100644
--- a/depend/bitcoin/src/bitcoin-tx.cpp
+++ b/depend/bitcoin/src/bitcoin-tx.cpp
@@ -556,7 +556,7 @@ static CAmount AmountFromValue(const UniValue& value)
 {
     if (!value.isNum() && !value.isStr())
         throw std::runtime_error("Amount is not a number or string");
-    CAmount amount;
+    int64_t amount;
     if (!ParseFixedPoint(value.getValStr(), 8, &amount))
         throw std::runtime_error("Invalid amount");
     if (!MoneyRange(amount))
diff --git a/depend/bitcoin/src/bitcoin-util.cpp b/depend/bitcoin/src/bitcoin-util.cpp
index aa3fd306..7e774685 100644
--- a/depend/bitcoin/src/bitcoin-util.cpp
+++ b/depend/bitcoin/src/bitcoin-util.cpp
@@ -15,6 +15,7 @@
 #include <compat/compat.h>
 #include <core_io.h>
 #include <streams.h>
+#include <univalue.h>
 #include <util/exception.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
@@ -36,6 +37,7 @@ static void SetupBitcoinUtilArgs(ArgsManager &argsman)
     argsman.AddArg("-version", "Print version and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 
     argsman.AddCommand("grind", "Perform proof of work on hex header string");
+    argsman.AddCommand("getchainparams", "Get hardcoded parameters for the selected chain");
 
     SetupChainParamsBaseOptions(argsman);
 }
@@ -150,6 +152,63 @@ static int Grind(const std::vector<std::string>& args, std::string& strPrint)
     return EXIT_SUCCESS;
 }
 
+static int GetChainParams(const std::vector<std::string>& args, std::string& strPrint)
+{
+    if (!args.empty()) {
+        strPrint = "getchainparams does not take arguments";
+        return EXIT_FAILURE;
+    }
+
+    const auto& params = Params();
+    const auto& consensus = params.GetConsensus();
+
+    UniValue result{UniValue::VOBJ};
+    result.pushKV("chain", params.GetChainTypeString());
+    result.pushKV("test_chain", params.IsTestChain());
+    result.pushKV("genesis", HexStr(consensus.hashGenesisBlock));
+    result.pushKV("subsidy_halving_interval", consensus.nSubsidyHalvingInterval);
+
+    if (consensus.signet_blocks) {
+        UniValue signet{UniValue::VOBJ};
+        signet.pushKV("challenge", HexStr(consensus.signet_challenge));
+        result.pushKV("signet", signet);
+    }
+
+    {
+        UniValue pow{UniValue::VOBJ};
+        pow.pushKV("limit", consensus.powLimit.ToString());
+        if (!consensus.fPowNoRetargeting) {
+            pow.pushKV("target_spacing", TicksSeconds(consensus.PowTargetSpacing()));
+            pow.pushKV("difficulty_retarget_interval", consensus.DifficultyAdjustmentInterval());
+            std::string mindiff_blocks = (consensus.fPowAllowMinDifficultyBlocks ?
+                  (consensus.enforce_BIP94 ? "bip94" : "yes") : "no");
+            pow.pushKV("mindiff_blocks", mindiff_blocks);
+        }
+        result.pushKV("pow", pow);
+    }
+
+    {
+        UniValue net{UniValue::VOBJ};
+        net.pushKV("default_port", params.GetDefaultPort());
+        net.pushKV("magic", HexStr(params.MessageStart()));
+        UniValue dns{UniValue::VARR};
+        for (const auto& seed : params.DNSSeeds()) {
+            dns.push_back(seed);
+        }
+        net.pushKV("dns_seeds", dns);
+        result.pushKV("net", net);
+    }
+
+    {
+        UniValue addr{UniValue::VOBJ};
+        addr.pushKV("bech32_hrp", params.Bech32HRP());
+        result.pushKV("addresses", addr);
+    }
+
+    strPrint = result.write(/*prettyIndent=*/2);
+    return EXIT_SUCCESS;
+}
+
 MAIN_FUNCTION
 {
     ArgsManager& args = gArgs;
@@ -179,6 +238,8 @@ MAIN_FUNCTION
     try {
         if (cmd->command == "grind") {
             ret = Grind(cmd->args, strPrint);
+        } else if (cmd->command == "getchainparams") {
+            ret = GetChainParams(cmd->args, strPrint);
         } else {
             assert(false); // unknown command should be caught earlier
         }
diff --git a/depend/bitcoin/src/bitcoin-wallet.cpp b/depend/bitcoin/src/bitcoin-wallet.cpp
index 9b0136da..f72d33b0 100644
--- a/depend/bitcoin/src/bitcoin-wallet.cpp
+++ b/depend/bitcoin/src/bitcoin-wallet.cpp
@@ -37,14 +37,14 @@ static void SetupWalletToolArgs(ArgsManager& argsman)
     argsman.AddArg("-version", "Print version and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-datadir=<dir>", "Specify data directory", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS);
     argsman.AddArg("-wallet=<wallet-name>", "Specify wallet name", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::OPTIONS);
-    argsman.AddArg("-dumpfile=<file name>", "When used with 'dump', writes out the records to this file. When used with 'createfromdump', loads the records into a new wallet.", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS);
+    argsman.AddArg("-dumpfile=<file name>", "When used with 'dump', writes out the records to this file. When used with 'createfromdump', loads the records into a new wallet.", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::COMMAND_OPTIONS);
     argsman.AddArg("-debug=<category>", "Output debugging information (default: 0).", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -debug is true, 0 otherwise).", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
 
     argsman.AddCommand("info", "Get wallet info");
     argsman.AddCommand("create", "Create a new descriptor wallet file");
-    argsman.AddCommand("dump", "Print out all of the wallet key-value records");
-    argsman.AddCommand("createfromdump", "Create new wallet file from dumped records");
+    argsman.AddCommand("dump", "Print out all of the wallet key-value records", {"-dumpfile"});
+    argsman.AddCommand("createfromdump", "Create new wallet file from dumped records", {"-dumpfile"});
 }
 
 static std::optional<int> WalletAppInit(ArgsManager& args, int argc, char* argv[])
diff --git a/depend/bitcoin/src/bitcoind.cpp b/depend/bitcoin/src/bitcoind.cpp
index ac731587..88e73bea 100644
--- a/depend/bitcoin/src/bitcoind.cpp
+++ b/depend/bitcoin/src/bitcoind.cpp
@@ -16,6 +16,7 @@
 #include <interfaces/chain.h>
 #include <interfaces/init.h>
 #include <kernel/context.h>
+#include <logging.h>
 #include <node/context.h>
 #include <node/interface_ui.h>
 #include <node/warnings.h>
@@ -258,6 +259,7 @@ static bool AppInit(NodeContext& node)
     return fRet;
 }
 
+/// \anchor main
 MAIN_FUNCTION
 {
     NodeContext node;
diff --git a/depend/bitcoin/src/blockencodings.cpp b/depend/bitcoin/src/blockencodings.cpp
index 18799cd8..afa9df4f 100644
--- a/depend/bitcoin/src/blockencodings.cpp
+++ b/depend/bitcoin/src/blockencodings.cpp
@@ -9,10 +9,10 @@
 #include <consensus/validation.h>
 #include <crypto/sha256.h>
 #include <crypto/siphash.h>
-#include <logging.h>
 #include <random.h>
 #include <streams.h>
 #include <txmempool.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <unordered_map>
@@ -113,25 +113,25 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
     if (shorttxids.size() != cmpctblock.shorttxids.size())
         return READ_STATUS_FAILED; // Short ID collision
 
-    std::vector<bool> have_txn(txn_available.size());
+    enum class TxSource : uint8_t { NONE, MEMPOOL, EXTRA, COLLIDED };
+    std::vector<TxSource> tx_source(txn_available.size(), TxSource::NONE);
     {
     LOCK(pool->cs);
     for (const auto& [wtxid, txit] : pool->txns_randomized) {
         uint64_t shortid = cmpctblock.GetShortID(wtxid);
         std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(shortid);
         if (idit != shorttxids.end()) {
-            if (!have_txn[idit->second]) {
+            if (tx_source[idit->second] == TxSource::NONE) {
                 txn_available[idit->second] = txit->GetSharedTx();
-                have_txn[idit->second]  = true;
+                tx_source[idit->second] = TxSource::MEMPOOL;
                 mempool_count++;
-            } else {
+            } else if (tx_source[idit->second] != TxSource::COLLIDED) {
                 // If we find two mempool txn that match the short id, just request it.
                 // This should be rare enough that the extra bandwidth doesn't matter,
                 // but eating a round-trip due to FillBlock failure would be annoying
-                if (txn_available[idit->second]) {
-                    txn_available[idit->second].reset();
-                    mempool_count--;
-                }
+                txn_available[idit->second].reset();
+                mempool_count--;
+                tx_source[idit->second] = TxSource::COLLIDED;
             }
         }
         // Though ideally we'd continue scanning for the two-txn-match-shortid case,
@@ -146,24 +146,23 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         uint64_t shortid = cmpctblock.GetShortID(extra_txn[i].first);
         std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(shortid);
         if (idit != shorttxids.end()) {
-            if (!have_txn[idit->second]) {
+            if (tx_source[idit->second] == TxSource::NONE) {
                 txn_available[idit->second] = extra_txn[i].second;
-                have_txn[idit->second]  = true;
+                tx_source[idit->second] = TxSource::EXTRA;
                 mempool_count++;
                 extra_count++;
-            } else {
+            } else if (tx_source[idit->second] != TxSource::COLLIDED &&
+                       txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) {
                 // If we find two mempool/extra txn that match the short id, just
                 // request it.
                 // This should be rare enough that the extra bandwidth doesn't matter,
                 // but eating a round-trip due to FillBlock failure would be annoying
                 // Note that we don't want duplication between extra_txn and mempool to
                 // trigger this case, so we compare witness hashes first
-                if (txn_available[idit->second] &&
-                        txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) {
-                    txn_available[idit->second].reset();
-                    mempool_count--;
-                    extra_count--;
-                }
+                txn_available[idit->second].reset();
+                mempool_count--;
+                extra_count -= (tx_source[idit->second] == TxSource::EXTRA);
+                tx_source[idit->second] = TxSource::COLLIDED;
             }
         }
         // Though ideally we'd continue scanning for the two-txn-match-shortid case,
@@ -219,7 +218,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
         return READ_STATUS_FAILED; // Possible Short ID collision
     }
 
-    if (LogAcceptCategory(BCLog::CMPCTBLOCK, BCLog::Level::Debug)) {
+    if (util::log::ShouldDebugLog(BCLog::CMPCTBLOCK)) {
         const uint256 hash{block.GetHash()};
         uint32_t tx_missing_size{0};
         for (const auto& tx : vtx_missing) tx_missing_size += tx->ComputeTotalSize();
diff --git a/depend/bitcoin/src/blockfilter.h b/depend/bitcoin/src/blockfilter.h
index 225d3b16..26ddfb61 100644
--- a/depend/bitcoin/src/blockfilter.h
+++ b/depend/bitcoin/src/blockfilter.h
@@ -87,8 +87,8 @@ class GCSFilter
     bool MatchAny(const ElementSet& elements) const;
 };
 
-constexpr uint8_t BASIC_FILTER_P = 19;
-constexpr uint32_t BASIC_FILTER_M = 784931;
+inline constexpr uint8_t BASIC_FILTER_P = 19;
+inline constexpr uint32_t BASIC_FILTER_M = 784931;
 
 enum class BlockFilterType : uint8_t
 {
diff --git a/depend/bitcoin/src/chain.h b/depend/bitcoin/src/chain.h
index 7701e926..1ca21845 100644
--- a/depend/bitcoin/src/chain.h
+++ b/depend/bitcoin/src/chain.h
@@ -26,7 +26,7 @@
  * Maximum amount of time that a block timestamp is allowed to exceed the
  * current time before the block will be accepted.
  */
-static constexpr int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
+inline constexpr int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
 
 /**
  * Timestamp window used as a grace period by code that compares external
@@ -34,10 +34,10 @@ static constexpr int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
  * to block timestamps. This should be set at least as high as
  * MAX_FUTURE_BLOCK_TIME.
  */
-static constexpr int64_t TIMESTAMP_WINDOW = MAX_FUTURE_BLOCK_TIME;
+inline constexpr int64_t TIMESTAMP_WINDOW = MAX_FUTURE_BLOCK_TIME;
 //! Init values for CBlockIndex nSequenceId when loaded from disk
-static constexpr int32_t SEQ_ID_BEST_CHAIN_FROM_DISK = 0;
-static constexpr int32_t SEQ_ID_INIT_FROM_DISK = 1;
+inline constexpr int32_t SEQ_ID_BEST_CHAIN_FROM_DISK = 0;
+inline constexpr int32_t SEQ_ID_INIT_FROM_DISK = 1;
 
 enum BlockStatus : uint32_t {
     //! Unused.
diff --git a/depend/bitcoin/src/chainparams.cpp b/depend/bitcoin/src/chainparams.cpp
index 32c3bff7..bab43848 100644
--- a/depend/bitcoin/src/chainparams.cpp
+++ b/depend/bitcoin/src/chainparams.cpp
@@ -9,9 +9,9 @@
 #include <common/args.h>
 #include <consensus/params.h>
 #include <deploymentinfo.h>
-#include <logging.h>
 #include <tinyformat.h>
 #include <util/chaintype.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 
@@ -23,29 +23,8 @@
 
 using util::SplitString;
 
-void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& options)
-{
-    if (!args.GetArgs("-signetseednode").empty()) {
-        options.seeds.emplace(args.GetArgs("-signetseednode"));
-    }
-    if (!args.GetArgs("-signetchallenge").empty()) {
-        const auto signet_challenge = args.GetArgs("-signetchallenge");
-        if (signet_challenge.size() != 1) {
-            throw std::runtime_error("-signetchallenge cannot be multiple values.");
-        }
-        const auto val{TryParseHex<uint8_t>(signet_challenge[0])};
-        if (!val) {
-            throw std::runtime_error(strprintf("-signetchallenge must be hex, not '%s'.", signet_challenge[0]));
-        }
-        options.challenge.emplace(*val);
-    }
-}
-
-void ReadRegTestArgs(const ArgsManager& args, CChainParams::RegTestOptions& options)
+static void HandleDeploymentArgs(const ArgsManager& args, CChainParams::DeploymentOptions& options)
 {
-    if (auto value = args.GetBoolArg("-fastprune")) options.fastprune = *value;
-    if (HasTestOption(args, "bip94")) options.enforce_bip94 = true;
-
     for (const std::string& arg : args.GetArgs("-testactivationheight")) {
         const auto found{arg.find('@')};
         if (found == std::string::npos) {
@@ -107,6 +86,43 @@ void ReadRegTestArgs(const ArgsManager& args, CChainParams::RegTestOptions& opti
     }
 }
 
+void ReadMainNetArgs(const ArgsManager& args, CChainParams::MainNetOptions& options)
+{
+    HandleDeploymentArgs(args, options.dep_opts);
+}
+
+void ReadTestNetArgs(const ArgsManager& args, CChainParams::TestNetOptions& options)
+{
+    HandleDeploymentArgs(args, options.dep_opts);
+}
+
+void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& options)
+{
+    if (!args.GetArgs("-signetseednode").empty()) {
+        options.seeds.emplace(args.GetArgs("-signetseednode"));
+    }
+    if (!args.GetArgs("-signetchallenge").empty()) {
+        const auto signet_challenge = args.GetArgs("-signetchallenge");
+        if (signet_challenge.size() != 1) {
+            throw std::runtime_error("-signetchallenge cannot be multiple values.");
+        }
+        const auto val{TryParseHex<uint8_t>(signet_challenge[0])};
+        if (!val) {
+            throw std::runtime_error(strprintf("-signetchallenge must be hex, not '%s'.", signet_challenge[0]));
+        }
+        options.challenge.emplace(*val);
+    }
+    HandleDeploymentArgs(args, options.dep_opts);
+}
+
+void ReadRegTestArgs(const ArgsManager& args, CChainParams::RegTestOptions& options)
+{
+    if (auto value = args.GetBoolArg("-fastprune")) options.fastprune = *value;
+    if (HasTestOption(args, "bip94")) options.enforce_bip94 = true;
+
+    HandleDeploymentArgs(args, options.dep_opts);
+}
+
 static std::unique_ptr<const CChainParams> globalChainParams;
 
 const CChainParams &Params() {
@@ -117,12 +133,21 @@ const CChainParams &Params() {
 std::unique_ptr<const CChainParams> CreateChainParams(const ArgsManager& args, const ChainType chain)
 {
     switch (chain) {
-    case ChainType::MAIN:
-        return CChainParams::Main();
-    case ChainType::TESTNET:
-        return CChainParams::TestNet();
-    case ChainType::TESTNET4:
-        return CChainParams::TestNet4();
+    case ChainType::MAIN: {
+        auto opts = CChainParams::MainNetOptions{};
+        ReadMainNetArgs(args, opts);
+        return CChainParams::Main(opts);
+    }
+    case ChainType::TESTNET: {
+        auto opts = CChainParams::TestNetOptions{};
+        ReadTestNetArgs(args, opts);
+        return CChainParams::TestNet(opts);
+    }
+    case ChainType::TESTNET4: {
+        auto opts = CChainParams::TestNetOptions{};
+        ReadTestNetArgs(args, opts);
+        return CChainParams::TestNet4(opts);
+    }
     case ChainType::SIGNET: {
         auto opts = CChainParams::SigNetOptions{};
         ReadSigNetArgs(args, opts);
diff --git a/depend/bitcoin/src/chainparamsbase.cpp b/depend/bitcoin/src/chainparamsbase.cpp
index d816d1af..f62e455f 100644
--- a/depend/bitcoin/src/chainparamsbase.cpp
+++ b/depend/bitcoin/src/chainparamsbase.cpp
@@ -16,10 +16,10 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
     argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: main). Allowed values: " LIST_CHAIN_NAMES, ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
                  "This is intended for regression testing tools and app development. Equivalent to -chain=regtest.", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
-    argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (segwit, bip34, dersig, cltv, csv). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
+    argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (segwit, bip34, dersig, cltv, csv). (test-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-testnet", "Use the testnet3 chain. Equivalent to -chain=test. Support for testnet3 is deprecated and will be removed in an upcoming release. Consider moving to testnet4 now by using -testnet4.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-testnet4", "Use the testnet4 chain. Equivalent to -chain=testnet4.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
-    argsman.AddArg("-vbparams=deployment:start:end[:min_activation_height]", "Use given start/end times and min_activation_height for specified version bits deployment (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
+    argsman.AddArg("-vbparams=deployment:start:end[:min_activation_height]", "Use given start/end times and min_activation_height for specified version bits deployment (test-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-signet", "Use the signet chain. Equivalent to -chain=signet. Note that the network is defined by the -signetchallenge parameter", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-signetchallenge", "Blocks must satisfy the given script to be considered valid (only for signet networks; defaults to the global default signet test network challenge)", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-signetseednode", "Specify a seed node for the signet network, in the hostname[:port] format, e.g. sig.net:1234 (may be used multiple times to specify multiple seed nodes; defaults to the global default signet test network seed node(s))", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::CHAINPARAMS);
diff --git a/depend/bitcoin/src/chainparamsseeds.h b/depend/bitcoin/src/chainparamsseeds.h
index 5cf8d6ba..729d7050 100644
--- a/depend/bitcoin/src/chainparamsseeds.h
+++ b/depend/bitcoin/src/chainparamsseeds.h
@@ -10,7 +10,7 @@
  *
  * Each line contains a BIP155 serialized (networkID, addr, port) tuple.
  */
-static const uint8_t chainparams_seed_main[] = {
+inline constexpr uint8_t chainparams_seed_main[] = {
     0x06,0x10,0xfc,0x11,0xf7,0x69,0x16,0xe6,0x36,0x11,0x58,0xae,0x1d,0x4a,0xfc,0xf7,0x57,0xa4,0x20,0x8d,
     0x06,0x10,0xfc,0x17,0x43,0x69,0x54,0x14,0x4b,0x1f,0x56,0x89,0xd3,0xed,0x40,0x39,0x33,0x5c,0x20,0x8d,
     0x06,0x10,0xfc,0x1f,0x22,0xc3,0x95,0xdc,0xa3,0xaf,0x4a,0x93,0x82,0x51,0xbe,0xb9,0x18,0x58,0x20,0x8d,
@@ -2072,7 +2072,7 @@ static const uint8_t chainparams_seed_main[] = {
     0x04,0x20,0xce,0x07,0x95,0xf3,0xa5,0xc1,0x90,0xc4,0x50,0xd5,0x22,0x86,0xa7,0x26,0x37,0x08,0xa2,0x31,0x1e,0x0d,0x77,0x48,0x0d,0x46,0xe0,0xfb,0x3d,0x71,0x60,0xe7,0x1d,0xce,0x20,0x8d,
 };
 
-static const uint8_t chainparams_seed_signet[] = {
+inline constexpr uint8_t chainparams_seed_signet[] = {
     0x06,0x10,0xfc,0x1f,0x22,0xc3,0x95,0xdc,0xa3,0xaf,0x4a,0x93,0x82,0x51,0xbe,0xb9,0x18,0x58,0x95,0xbd,
     0x05,0x20,0xd7,0x4d,0xd9,0xc4,0x7c,0x80,0x24,0x1d,0x48,0x2f,0x52,0xba,0x2a,0xaf,0x5d,0xf2,0xfc,0x04,0x58,0x56,0x4a,0x61,0x0f,0xde,0x4e,0xd8,0x13,0x55,0x98,0x55,0x53,0xc1,0x00,0x00,
     0x05,0x20,0xd8,0xaf,0x32,0x40,0x0d,0x25,0x72,0x91,0xf5,0x14,0x2a,0xa7,0x7b,0x9f,0x6b,0xe8,0x02,0x9f,0x16,0x5e,0xa0,0xe0,0x6d,0x85,0xcc,0x79,0xf2,0xe2,0xc1,0x2b,0xe0,0x20,0x00,0x00,
@@ -2245,7 +2245,7 @@ static const uint8_t chainparams_seed_signet[] = {
     0x04,0x20,0xc9,0x95,0x5a,0xf7,0x9a,0x27,0x09,0x6a,0xa2,0x24,0x65,0xb7,0x07,0xf0,0x28,0xee,0x8b,0xa9,0x5e,0x7c,0x37,0x19,0x14,0xc4,0x36,0x73,0x42,0xd2,0x87,0xae,0xa2,0x47,0x95,0xbd,
 };
 
-static const uint8_t chainparams_seed_test[] = {
+inline constexpr uint8_t chainparams_seed_test[] = {
     0x06,0x10,0xfc,0x1f,0x22,0xc3,0x95,0xdc,0xa3,0xaf,0x4a,0x93,0x82,0x51,0xbe,0xb9,0x18,0x58,0x47,0x9d,
     0x05,0x20,0x39,0x06,0xc0,0x95,0x12,0xe1,0xf8,0x86,0xc2,0x36,0x76,0xa9,0x96,0x2a,0x9d,0xbd,0x3d,0x70,0x43,0xfc,0x99,0xbf,0x27,0x15,0xa4,0x9c,0x10,0xa1,0xd5,0xa3,0x9d,0x52,0x00,0x00,
     0x05,0x20,0x40,0x81,0xae,0x55,0xb2,0x9d,0xd0,0xff,0x99,0x51,0xd8,0xbc,0x35,0xb2,0x06,0xb7,0x1c,0xf6,0x16,0x35,0xae,0xc6,0xf7,0xa4,0x72,0xf8,0x37,0x41,0x8e,0x91,0x7b,0x2e,0x00,0x00,
@@ -2429,7 +2429,7 @@ static const uint8_t chainparams_seed_test[] = {
     0x04,0x20,0xcc,0x99,0x76,0x52,0x43,0xcc,0x45,0x0a,0x49,0x5d,0x3f,0xa5,0x82,0xc3,0xc0,0xdb,0xcf,0xe5,0xda,0xfb,0xb3,0xd0,0xb9,0xd1,0xbc,0x1b,0x15,0x19,0xed,0xe0,0xd1,0x5f,0x47,0x9d,
 };
 
-static const uint8_t chainparams_seed_testnet4[] = {
+inline constexpr uint8_t chainparams_seed_testnet4[] = {
     0x06,0x10,0xfc,0x1f,0x22,0xc3,0x95,0xdc,0xa3,0xaf,0x4a,0x93,0x82,0x51,0xbe,0xb9,0x18,0x58,0xbc,0xcd,
     0x05,0x20,0xd3,0xbc,0x25,0x95,0x63,0x7f,0x34,0x02,0x18,0x69,0x91,0x9a,0x79,0x57,0x10,0xc0,0xe0,0xf5,0xcd,0x84,0x56,0x95,0xec,0x43,0xa4,0x9d,0xba,0x1b,0xb3,0xea,0x34,0x60,0x00,0x00,
     0x05,0x20,0xd8,0xee,0x64,0x35,0x6c,0x53,0xe7,0x40,0xb8,0xc3,0x15,0x60,0x5b,0x9c,0x66,0x3d,0xbb,0xd9,0x7c,0x99,0xcc,0x3a,0x3a,0xf6,0xcb,0xd5,0xd4,0x51,0x98,0x04,0x68,0xad,0x00,0x00,
diff --git a/depend/bitcoin/src/checkqueue.h b/depend/bitcoin/src/checkqueue.h
index 5258d711..7d107a18 100644
--- a/depend/bitcoin/src/checkqueue.h
+++ b/depend/bitcoin/src/checkqueue.h
@@ -68,6 +68,7 @@ class CCheckQueue
     std::vector<std::thread> m_worker_threads;
     bool m_request_stop GUARDED_BY(m_mutex){false};
 
+    /// \anchor checkqueue
     /** Internal function that does bulk of the verification work. If fMaster, return the final result. */
     std::optional<R> Loop(bool fMaster) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
     {
@@ -148,7 +149,7 @@ class CCheckQueue
         m_worker_threads.reserve(worker_threads_num);
         for (int n = 0; n < worker_threads_num; ++n) {
             m_worker_threads.emplace_back([this, n]() {
-                util::ThreadRename(strprintf("scriptch.%i", n));
+                util::ThreadRename(strprintf("scriptch.%02i", n));
                 Loop(false /* worker thread */);
             });
         }
diff --git a/depend/bitcoin/src/clientversion.h b/depend/bitcoin/src/clientversion.h
index f4822a12..cbdb62b2 100644
--- a/depend/bitcoin/src/clientversion.h
+++ b/depend/bitcoin/src/clientversion.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-static const int CLIENT_VERSION =
+inline constexpr int CLIENT_VERSION =
                              10000 * CLIENT_VERSION_MAJOR
                          +     100 * CLIENT_VERSION_MINOR
                          +       1 * CLIENT_VERSION_BUILD;
diff --git a/depend/bitcoin/src/cluster_linearize.h b/depend/bitcoin/src/cluster_linearize.h
index 237efd89..7b262edb 100644
--- a/depend/bitcoin/src/cluster_linearize.h
+++ b/depend/bitcoin/src/cluster_linearize.h
@@ -9,6 +9,7 @@
 #include <cstdint>
 #include <numeric>
 #include <optional>
+#include <ranges>
 #include <utility>
 #include <vector>
 
@@ -316,7 +317,7 @@ class DepGraph
     {
         DepGraphIndex old_len = list.size();
         for (auto i : select) list.push_back(i);
-        std::sort(list.begin() + old_len, list.end(), [&](DepGraphIndex a, DepGraphIndex b) noexcept {
+        std::ranges::sort(std::span{list}.subspan(old_len), [&](DepGraphIndex a, DepGraphIndex b) noexcept {
             const auto a_anc_count = entries[a].ancestors.Count();
             const auto b_anc_count = entries[b].ancestors.Count();
             if (a_anc_count != b_anc_count) return a_anc_count < b_anc_count;
@@ -432,7 +433,7 @@ std::vector<SetInfo<SetType>> ChunkLinearizationInfo(const DepGraph<SetType>& de
         /** The new chunk to be added, initially a singleton. */
         SetInfo<SetType> new_chunk(depgraph, i);
         // As long as the new chunk has a higher feerate than the last chunk so far, absorb it.
-        while (!ret.empty() && new_chunk.feerate >> ret.back().feerate) {
+        while (!ret.empty() && ByRatio{new_chunk.feerate} > ByRatio{ret.back().feerate}) {
             new_chunk |= ret.back();
             ret.pop_back();
         }
@@ -452,7 +453,7 @@ std::vector<FeeFrac> ChunkLinearization(const DepGraph<SetType>& depgraph, std::
         /** The new chunk to be added, initially a singleton. */
         auto new_chunk = depgraph.FeeRate(i);
         // As long as the new chunk has a higher feerate than the last chunk so far, absorb it.
-        while (!ret.empty() && new_chunk >> ret.back()) {
+        while (!ret.empty() && ByRatio{new_chunk} > ByRatio{ret.back()}) {
             new_chunk += ret.back();
             ret.pop_back();
         }
@@ -953,11 +954,16 @@ class SpanningForestState
         Assume(m_chunk_idxs[bottom_idx]);
         auto& top_chunk_info = m_set_info[top_idx];
         auto& bottom_chunk_info = m_set_info[bottom_idx];
-        // Count the number of dependencies between bottom_chunk and top_chunk.
+        // Count the number of dependencies between bottom_chunk and top_chunk, remembering the
+        // per-transaction counts so the picking loop below does not need to recompute the
+        // intersections.
         unsigned num_deps{0};
+        std::array<SetIdx, SetType::Size()> counts;
         for (auto tx_idx : top_chunk_info.transactions) {
             auto& tx_data = m_tx_data[tx_idx];
-            num_deps += (tx_data.children & bottom_chunk_info.transactions).Count();
+            auto count = (tx_data.children & bottom_chunk_info.transactions).Count();
+            counts[tx_idx] = count;
+            num_deps += count;
         }
         m_cost.MergeChunksMid(/*num_txns=*/top_chunk_info.transactions.Count());
         Assume(num_deps > 0);
@@ -966,10 +972,10 @@ class SpanningForestState
         unsigned num_steps = 0;
         for (auto tx_idx : top_chunk_info.transactions) {
             ++num_steps;
-            auto& tx_data = m_tx_data[tx_idx];
-            auto intersect = tx_data.children & bottom_chunk_info.transactions;
-            auto count = intersect.Count();
+            auto count = counts[tx_idx];
             if (pick < count) {
+                auto& tx_data = m_tx_data[tx_idx];
+                auto intersect = tx_data.children & bottom_chunk_info.transactions;
                 for (auto child_idx : intersect) {
                     if (pick == 0) {
                         m_cost.MergeChunksEnd(/*num_steps=*/num_steps);
@@ -1031,8 +1037,8 @@ class SpanningForestState
             auto& reached_chunk_info = m_set_info[reached_chunk_idx];
             todo -= reached_chunk_info.transactions;
             // See if it has an acceptable feerate.
-            auto cmp = DownWard ? FeeRateCompare(best_other_chunk_feerate, reached_chunk_info.feerate)
-                                : FeeRateCompare(reached_chunk_info.feerate, best_other_chunk_feerate);
+            auto cmp = DownWard ? ByRatio{best_other_chunk_feerate} <=> ByRatio{reached_chunk_info.feerate}
+                                : ByRatio{reached_chunk_info.feerate} <=> ByRatio{best_other_chunk_feerate};
             if (cmp > 0) continue;
             uint64_t tiebreak = m_rng.rand64();
             if (cmp < 0 || tiebreak >= best_other_chunk_tiebreak) {
@@ -1154,7 +1160,7 @@ class SpanningForestState
                 auto& dep_top_info = m_set_info[tx_data.dep_top_idx[child_idx]];
                 // Skip if this dependency is ineligible (the top chunk that would be created
                 // does not have higher feerate than the chunk it is currently part of).
-                auto cmp = FeeRateCompare(dep_top_info.feerate, chunk_info.feerate);
+                auto cmp = ByRatio{dep_top_info.feerate} <=> ByRatio{chunk_info.feerate};
                 if (cmp <= 0) continue;
                 // Generate a random tiebreak for this dependency, and reject it if its tiebreak
                 // is worse than the best so far. This means that among all eligible
@@ -1182,6 +1188,7 @@ class SpanningForestState
         m_tx_data.resize(depgraph.PositionRange());
         m_set_info.resize(num_transactions);
         m_reachable.resize(num_transactions);
+        m_suboptimal_chunks.reserve(num_transactions);
         size_t num_chunks = 0;
         size_t num_deps = 0;
         for (auto tx_idx : m_transaction_idxs) {
@@ -1381,7 +1388,7 @@ class SpanningForestState
                 // Skip if this dependency does not have equal top and bottom set feerates. Note
                 // that the top cannot have higher feerate than the bottom, or OptimizeSteps would
                 // have dealt with it.
-                if (dep_top_info.feerate << chunk_info.feerate) continue;
+                if (ByRatio{dep_top_info.feerate} < ByRatio{chunk_info.feerate}) continue;
                 have_any = true;
                 // Skip if this dependency does not have pivot in the right place.
                 if (move_pivot_down == dep_top_info.transactions[pivot_idx]) continue;
@@ -1470,16 +1477,22 @@ class SpanningForestState
         /** A heap with all chunks (by set index) that can currently be included, sorted by
          *  chunk feerate (high to low), chunk size (small to large), and by least maximum element
          *  according to the fallback order (which is the second pair element). */
-        std::vector<std::pair<SetIdx, TxIdx>> ready_chunks;
+        std::array<std::pair<SetIdx, TxIdx>, SetType::Size()> ready_chunks;
+        /** The number of entries of ready_chunks in use. */
+        unsigned num_ready_chunks{0};
         /** For every chunk, indexed by SetIdx, the number of unmet dependencies the chunk has on
          *  other chunks (not including dependencies within the chunk itself). */
-        std::vector<TxIdx> chunk_deps(m_set_info.size(), 0);
+        std::array<TxIdx, SetType::Size()> chunk_deps;
+        std::fill_n(chunk_deps.begin(), m_set_info.size(), TxIdx{0});
         /** For every transaction, indexed by TxIdx, the number of unmet dependencies the
          *  transaction has. */
-        std::vector<TxIdx> tx_deps(m_tx_data.size(), 0);
+        std::array<TxIdx, SetType::Size()> tx_deps;
+        std::fill_n(tx_deps.begin(), m_tx_data.size(), TxIdx{0});
         /** A heap with all transactions within the current chunk that can be included, sorted by
          *  tx feerate (high to low), tx size (small to large), and fallback order. */
-        std::vector<TxIdx> ready_tx;
+        std::array<TxIdx, SetType::Size()> ready_tx;
+        /** The number of entries of ready_tx in use. */
+        unsigned num_ready_tx{0};
         // Populate chunk_deps and tx_deps.
         unsigned num_deps{0};
         for (TxIdx chl_idx : m_transaction_idxs) {
@@ -1510,7 +1523,7 @@ class SpanningForestState
             // First sort by increasing transaction feerate.
             auto& a_feerate = m_depgraph.FeeRate(a);
             auto& b_feerate = m_depgraph.FeeRate(b);
-            auto feerate_cmp = FeeRateCompare(a_feerate, b_feerate);
+            auto feerate_cmp = ByRatio{a_feerate} <=> ByRatio{b_feerate};
             if (feerate_cmp != 0) return feerate_cmp < 0;
             // Then by decreasing transaction size.
             if (a_feerate.size != b_feerate.size) {
@@ -1532,7 +1545,7 @@ class SpanningForestState
             // First sort by increasing chunk feerate.
             auto& chunk_feerate_a = m_set_info[a.first].feerate;
             auto& chunk_feerate_b = m_set_info[b.first].feerate;
-            auto feerate_cmp = FeeRateCompare(chunk_feerate_a, chunk_feerate_b);
+            auto feerate_cmp = ByRatio{chunk_feerate_a} <=> ByRatio{chunk_feerate_b};
             if (feerate_cmp != 0) return feerate_cmp < 0;
             // Then by decreasing chunk size.
             if (chunk_feerate_a.size != chunk_feerate_b.size) {
@@ -1548,31 +1561,31 @@ class SpanningForestState
         // Construct a heap with all chunks that have no out-of-chunk dependencies.
         for (SetIdx chunk_idx : m_chunk_idxs) {
             if (chunk_deps[chunk_idx] == 0) {
-                ready_chunks.emplace_back(chunk_idx, max_fallback_fn(chunk_idx));
+                ready_chunks[num_ready_chunks++] = {chunk_idx, max_fallback_fn(chunk_idx)};
             }
         }
-        std::make_heap(ready_chunks.begin(), ready_chunks.end(), chunk_cmp_fn);
+        std::make_heap(ready_chunks.begin(), ready_chunks.begin() + num_ready_chunks, chunk_cmp_fn);
         // Pop chunks off the heap.
-        while (!ready_chunks.empty()) {
+        while (num_ready_chunks > 0) {
             auto [chunk_idx, _rnd] = ready_chunks.front();
-            std::pop_heap(ready_chunks.begin(), ready_chunks.end(), chunk_cmp_fn);
-            ready_chunks.pop_back();
+            std::pop_heap(ready_chunks.begin(), ready_chunks.begin() + num_ready_chunks, chunk_cmp_fn);
+            --num_ready_chunks;
             Assume(chunk_deps[chunk_idx] == 0);
             const auto& chunk_txn = m_set_info[chunk_idx].transactions;
             // Build heap of all includable transactions in chunk.
-            Assume(ready_tx.empty());
+            Assume(num_ready_tx == 0);
             for (TxIdx tx_idx : chunk_txn) {
-                if (tx_deps[tx_idx] == 0) ready_tx.push_back(tx_idx);
+                if (tx_deps[tx_idx] == 0) ready_tx[num_ready_tx++] = tx_idx;
             }
-            Assume(!ready_tx.empty());
-            std::make_heap(ready_tx.begin(), ready_tx.end(), tx_cmp_fn);
+            Assume(num_ready_tx > 0);
+            std::make_heap(ready_tx.begin(), ready_tx.begin() + num_ready_tx, tx_cmp_fn);
             // Pick transactions from the ready heap, append them to linearization, and decrement
             // dependency counts.
-            while (!ready_tx.empty()) {
+            while (num_ready_tx > 0) {
                 // Pop an element from the tx_ready heap.
                 auto tx_idx = ready_tx.front();
-                std::pop_heap(ready_tx.begin(), ready_tx.end(), tx_cmp_fn);
-                ready_tx.pop_back();
+                std::pop_heap(ready_tx.begin(), ready_tx.begin() + num_ready_tx, tx_cmp_fn);
+                --num_ready_tx;
                 // Append to linearization.
                 ret.push_back(tx_idx);
                 // Decrement dependency counts.
@@ -1583,16 +1596,16 @@ class SpanningForestState
                     Assume(tx_deps[chl_idx] > 0);
                     if (--tx_deps[chl_idx] == 0 && chunk_txn[chl_idx]) {
                         // Child tx has no dependencies left, and is in this chunk. Add it to the tx heap.
-                        ready_tx.push_back(chl_idx);
-                        std::push_heap(ready_tx.begin(), ready_tx.end(), tx_cmp_fn);
+                        ready_tx[num_ready_tx++] = chl_idx;
+                        std::push_heap(ready_tx.begin(), ready_tx.begin() + num_ready_tx, tx_cmp_fn);
                     }
                     // Decrement chunk dependency count if this is out-of-chunk dependency.
                     if (chl_data.chunk_idx != chunk_idx) {
                         Assume(chunk_deps[chl_data.chunk_idx] > 0);
                         if (--chunk_deps[chl_data.chunk_idx] == 0) {
                             // Child chunk has no dependencies left. Add it to the chunk heap.
-                            ready_chunks.emplace_back(chl_data.chunk_idx, max_fallback_fn(chl_data.chunk_idx));
-                            std::push_heap(ready_chunks.begin(), ready_chunks.end(), chunk_cmp_fn);
+                            ready_chunks[num_ready_chunks++] = {chl_data.chunk_idx, max_fallback_fn(chl_data.chunk_idx)};
+                            std::push_heap(ready_chunks.begin(), ready_chunks.begin() + num_ready_chunks, chunk_cmp_fn);
                         }
                     }
                 }
@@ -1622,7 +1635,7 @@ class SpanningForestState
         for (auto chunk_idx : m_chunk_idxs) {
             ret.push_back(m_set_info[chunk_idx].feerate);
         }
-        std::sort(ret.begin(), ret.end(), std::greater{});
+        std::ranges::sort(ret, std::greater<ByRatioNegSize<FeeFrac>>{});
         return ret;
     }
 
@@ -1651,8 +1664,8 @@ class SpanningForestState
                 }
             }
         }
-        std::sort(expected_dependencies.begin(), expected_dependencies.end());
-        std::sort(all_dependencies.begin(), all_dependencies.end());
+        std::ranges::sort(expected_dependencies);
+        std::ranges::sort(all_dependencies);
         assert(expected_dependencies == all_dependencies);
 
         //
@@ -1976,7 +1989,7 @@ void PostLinearize(const DepGraph<SetType>& depgraph, std::span<DepGraphIndex> l
             DepGraphIndex next_group = SENTINEL; // We inserted at the end, so next group is sentinel.
             DepGraphIndex prev_group = entries[cur_group].prev_group;
             // Continue as long as the current group has higher feerate than the previous one.
-            while (entries[cur_group].feerate >> entries[prev_group].feerate) {
+            while (ByRatio{entries[cur_group].feerate} > ByRatio{entries[prev_group].feerate}) {
                 // prev_group/cur_group/next_group refer to (the last transactions of) 3
                 // consecutive entries in groups list.
                 Assume(cur_group == entries[next_group].prev_group);
diff --git a/depend/bitcoin/src/coins.cpp b/depend/bitcoin/src/coins.cpp
index c403e006..3d3e63fa 100644
--- a/depend/bitcoin/src/coins.cpp
+++ b/depend/bitcoin/src/coins.cpp
@@ -5,15 +5,27 @@
 #include <coins.h>
 
 #include <consensus/consensus.h>
+#include <primitives/block.h>
 #include <random.h>
 #include <uint256.h>
 #include <util/log.h>
+#include <util/threadpool.h>
 #include <util/trace.h>
 
+#include <ranges>
+#include <unordered_set>
+
 TRACEPOINT_SEMAPHORE(utxocache, add);
 TRACEPOINT_SEMAPHORE(utxocache, spent);
 TRACEPOINT_SEMAPHORE(utxocache, uncache);
 
+SaltedCoinsCacheHasher::SaltedCoinsCacheHasher(bool deterministic)
+    : m_hasher{
+          deterministic ? 0x8e819f2607a18de6 : FastRandomContext().rand64(),
+          deterministic ? 0xf4020d2e3983b0eb : FastRandomContext().rand64()}
+{
+}
+
 CoinsViewEmpty& CoinsViewEmpty::Get()
 {
     static CoinsViewEmpty instance;
@@ -30,7 +42,7 @@ std::optional<Coin> CCoinsViewCache::PeekCoin(const COutPoint& outpoint) const
 
 CCoinsViewCache::CCoinsViewCache(CCoinsView* in_base, bool deterministic) :
     CCoinsViewBacked(in_base), m_deterministic(deterministic),
-    cacheCoins(0, SaltedOutpointHasher(/*deterministic=*/deterministic), CCoinsMap::key_equal{}, &m_cache_coins_memory_resource)
+    cacheCoins(0, SaltedCoinsCacheHasher{/*deterministic=*/deterministic}, CCoinsMap::key_equal{}, &m_cache_coins_memory_resource)
 {
     m_sentinel.second.SelfRef(m_sentinel);
 }
@@ -108,9 +120,9 @@ void CCoinsViewCache::AddCoin(const COutPoint &outpoint, Coin&& coin, bool possi
            (bool)it->second.coin.IsCoinBase());
 }
 
-void CCoinsViewCache::EmplaceCoinInternalDANGER(COutPoint&& outpoint, Coin&& coin) {
+void CCoinsViewCache::EmplaceCoinInternalDANGER(const COutPoint& outpoint, Coin&& coin) {
     const auto mem_usage{coin.DynamicMemoryUsage()};
-    auto [it, inserted] = cacheCoins.try_emplace(std::move(outpoint), std::move(coin));
+    auto [it, inserted] = cacheCoins.try_emplace(outpoint, std::move(coin));
     if (inserted) {
         CCoinsCacheEntry::SetDirty(*it, m_sentinel);
         ++m_dirty_count;
@@ -326,7 +338,7 @@ void CCoinsViewCache::ReallocateCache()
     cacheCoins.~CCoinsMap();
     m_cache_coins_memory_resource.~CCoinsMapMemoryResource();
     ::new (&m_cache_coins_memory_resource) CCoinsMapMemoryResource{};
-    ::new (&cacheCoins) CCoinsMap{0, SaltedOutpointHasher{/*deterministic=*/m_deterministic}, CCoinsMap::key_equal{}, &m_cache_coins_memory_resource};
+    ::new (&cacheCoins) CCoinsMap{0, SaltedCoinsCacheHasher{/*deterministic=*/m_deterministic}, CCoinsMap::key_equal{}, &m_cache_coins_memory_resource};
 }
 
 void CCoinsViewCache::SanityCheck() const
@@ -361,6 +373,44 @@ void CCoinsViewCache::SanityCheck() const
     assert(recomputed_usage == cachedCoinsUsage);
 }
 
+CCoinsViewCache::ResetGuard CoinsViewOverlay::StartFetching(const CBlock& block LIFETIMEBOUND) noexcept
+{
+    Assert(m_futures.empty());
+    Assert(m_inputs.empty());
+    Assert(m_input_head.load(std::memory_order_relaxed) == 0);
+    Assert(m_input_tail == 0);
+    if (const auto workers_count{m_thread_pool->WorkersCount()}; workers_count > 0) {
+        // Loop through the block inputs and set their prevouts in the queue.
+        // Filter inputs that spend outputs created earlier in the same block. These outputs will be created
+        // directly in the cache from the tx that creates them, so they will not be requested from a base view.
+        std::unordered_set<Txid, SaltedCoinsCacheHasher> earlier_txids;
+        earlier_txids.reserve(block.vtx.size());
+        for (const auto& tx : block.vtx | std::views::drop(1)) {
+            for (const auto& input : tx->vin) {
+                if (!earlier_txids.contains(input.prevout.hash)) m_inputs.emplace_back(input.prevout);
+            }
+            earlier_txids.emplace(tx->GetHash());
+        }
+        // Only submit tasks if we have something to fetch.
+        if (m_inputs.size()) {
+            std::vector<std::function<void()>> tasks(workers_count, [this] {
+                while (ProcessInput()) {}
+            });
+            if (auto futures{m_thread_pool->Submit(std::move(tasks))}) {
+                m_futures = std::move(*futures);
+            } else {
+                // Submit can fail if a shared owner of the thread pool outside of this class calls Stop() or
+                // Interrupt() on a different thread after we call WorkersCount() above. In that case parallel
+                // fetching will not make progress, so we clear the inputs to fall back to single threaded fetching.
+                LogWarning("Failed to submit prevout fetch tasks; falling back to single-threaded fetching for this block.");
+                m_inputs.clear();
+                StopFetching(); // Assert nothing changed if we failed to start tasks.
+            }
+        }
+    }
+    return CreateResetGuard();
+}
+
 static const uint64_t MIN_TRANSACTION_OUTPUT_WEIGHT{WITNESS_SCALE_FACTOR * ::GetSerializeSize(CTxOut())};
 static const uint64_t MAX_OUTPUTS_PER_BLOCK{MAX_BLOCK_WEIGHT / MIN_TRANSACTION_OUTPUT_WEIGHT};
 
diff --git a/depend/bitcoin/src/coins.h b/depend/bitcoin/src/coins.h
index ae7f34f4..6fcf1092 100644
--- a/depend/bitcoin/src/coins.h
+++ b/depend/bitcoin/src/coins.h
@@ -9,20 +9,31 @@
 #include <attributes.h>
 #include <compressor.h>
 #include <core_memusage.h>
+#include <crypto/siphash.h>
 #include <memusage.h>
 #include <primitives/transaction.h>
+#include <primitives/transaction_identifier.h>
 #include <serialize.h>
 #include <support/allocators/pool.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/overflow.h>
-#include <util/hasher.h>
 
 #include <cassert>
 #include <cstdint>
 
+#include <atomic>
 #include <functional>
+#include <future>
+#include <memory>
+#include <optional>
 #include <unordered_map>
+#include <utility>
+#include <vector>
+
+class CBlock;
+class ThreadPool;
 
 /**
  * A UTXO entry.
@@ -208,6 +219,43 @@ struct CCoinsCacheEntry
     }
 };
 
+/**
+ * SipHash-1-3-UJ based hasher for the coins cache and related coins containers.
+ *
+ * Retained entries identify real transaction outputs, so their keys contain computed txids.
+ * Missing-input lookups may contain arbitrary claimed prevouts, but FetchCoin() immediately
+ * erases their temporary entries when the backend lookup fails, so non-hash keys cannot
+ * accumulate.
+ *
+ * The assumeutxo loader assumes snapshot txids are valid while loading and verifies the
+ * complete snapshot's content hash before activation.
+ *
+ * Hash values are process-local and must not be persisted, serialized, or compared across
+ * processes.
+ *
+ * Having the hash noexcept lets libstdc++ recalculate it during rehash instead of storing it in
+ * each node.
+ */
+class SaltedCoinsCacheHasher
+{
+    const SipHasher13UJ m_hasher;
+
+public:
+    SaltedCoinsCacheHasher(bool deterministic = false);
+
+    /** Hash a transaction ID, itself a cryptographic hash, as one jumbo block. */
+    size_t operator()(const Txid& id) const noexcept
+    {
+        return m_hasher.Hash(id.ToUint256());
+    }
+
+    /** Hash an outpoint as its txid jumbo block followed by the zero-extended index as one normal block. */
+    size_t operator()(const COutPoint& id) const noexcept
+    {
+        return m_hasher.Hash(id.hash.ToUint256(), uint64_t{id.n});
+    }
+};
+
 /**
  * PoolAllocator's MAX_BLOCK_SIZE_BYTES parameter here uses sizeof the data, and adds the size
  * of 4 pointers. We do not know the exact node size used in the std::unordered_node implementation
@@ -218,7 +266,7 @@ struct CCoinsCacheEntry
  */
 using CCoinsMap = std::unordered_map<COutPoint,
                                      CCoinsCacheEntry,
-                                     SaltedOutpointHasher,
+                                     SaltedCoinsCacheHasher,
                                      std::equal_to<COutPoint>,
                                      PoolAllocator<CoinsCachePair,
                                                    sizeof(CoinsCachePair) + sizeof(void*) * 4>>;
@@ -335,9 +383,6 @@ class CCoinsView
     //! The passed cursor is used to iterate through the coins.
     virtual void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) = 0;
 
-    //! Get a cursor to iterate over the whole state. Implementations may return nullptr.
-    virtual std::unique_ptr<CCoinsViewCursor> Cursor() const = 0;
-
     //! Estimate database size
     virtual size_t EstimateSize() const = 0;
 };
@@ -363,7 +408,6 @@ class CoinsViewEmpty : public CCoinsView
     {
         for (auto it{cursor.Begin()}; it != cursor.End(); it = cursor.NextAndMaybeErase(*it)) { }
     }
-    std::unique_ptr<CCoinsViewCursor> Cursor() const override { return {}; }
     size_t EstimateSize() const override { return 0; }
 };
 
@@ -384,7 +428,6 @@ class CCoinsViewBacked : public CCoinsView
     uint256 GetBestBlock() const override { return base->GetBestBlock(); }
     std::vector<uint256> GetHeadBlocks() const override { return base->GetHeadBlocks(); }
     void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override { base->BatchWrite(cursor, block_hash); }
-    std::unique_ptr<CCoinsViewCursor> Cursor() const override { return base->Cursor(); }
     size_t EstimateSize() const override { return base->EstimateSize(); }
 };
 
@@ -395,6 +438,19 @@ class CCoinsViewCache : public CCoinsViewBacked
 private:
     const bool m_deterministic;
 
+    //! Force a reallocation of the cache map. This is required when downsizing
+    //! the cache because the map's allocator may be hanging onto a lot of
+    //! memory despite having called .clear().
+    //!
+    //! See: https://stackoverflow.com/questions/42114044/how-to-release-unordered-map-memory
+    void ReallocateCache();
+
+    /**
+     * @note this is marked const, but may actually append to `cacheCoins`, increasing
+     * memory usage.
+     */
+    CCoinsMap::iterator FetchCoin(const COutPoint &outpoint) const;
+
 protected:
     /**
      * Make mutable so that we can "fill the cache" even from Get-methods
@@ -415,7 +471,7 @@ class CCoinsViewCache : public CCoinsViewBacked
      * Discard all modifications made to this cache without flushing to the base view.
      * This can be used to efficiently reuse a cache instance across multiple operations.
      */
-    void Reset() noexcept;
+    virtual void Reset() noexcept;
 
     /* Fetch the coin from base. Used for cache misses in FetchCoin. */
     virtual std::optional<Coin> FetchCoinFromBase(const COutPoint& outpoint) const;
@@ -435,9 +491,6 @@ class CCoinsViewCache : public CCoinsViewBacked
     uint256 GetBestBlock() const override;
     void SetBestBlock(const uint256& block_hash);
     void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override;
-    std::unique_ptr<CCoinsViewCursor> Cursor() const override {
-        throw std::logic_error("CCoinsViewCache cursor iteration not supported.");
-    }
 
     /**
      * Check if we have the given utxo already loaded in this cache.
@@ -471,7 +524,7 @@ class CCoinsViewCache : public CCoinsViewBacked
      * NOT FOR GENERAL USE. Used only when loading coins from a UTXO snapshot.
      * @sa ChainstateManager::PopulateAndValidateSnapshot()
      */
-    void EmplaceCoinInternalDANGER(COutPoint&& outpoint, Coin&& coin);
+    void EmplaceCoinInternalDANGER(const COutPoint& outpoint, Coin&& coin);
 
     /**
      * Spend a coin. Pass moveto in order to get the deleted data.
@@ -487,7 +540,7 @@ class CCoinsViewCache : public CCoinsViewBacked
      * If reallocate_cache is false, the cache will retain the same memory footprint
      * after flushing and should be destroyed to deallocate.
      */
-    void Flush(bool reallocate_cache = true);
+    virtual void Flush(bool reallocate_cache = true);
 
     /**
      * Push the modifications applied to this cache to its base while retaining
@@ -515,13 +568,6 @@ class CCoinsViewCache : public CCoinsViewBacked
     //! Check whether all prevouts of the transaction are present in the UTXO set represented by this view
     bool HaveInputs(const CTransaction& tx) const;
 
-    //! Force a reallocation of the cache map. This is required when downsizing
-    //! the cache because the map's allocator may be hanging onto a lot of
-    //! memory despite having called .clear().
-    //!
-    //! See: https://stackoverflow.com/questions/42114044/how-to-release-unordered-map-memory
-    void ReallocateCache();
-
     //! Run an internal sanity check on the cache data structure. */
     void SanityCheck() const;
 
@@ -543,34 +589,188 @@ class CCoinsViewCache : public CCoinsViewBacked
 
     //! Create a scoped guard that will call `Reset()` on this cache when it goes out of scope.
     [[nodiscard]] ResetGuard CreateResetGuard() noexcept { return ResetGuard{*this}; }
-
-private:
-    /**
-     * @note this is marked const, but may actually append to `cacheCoins`, increasing
-     * memory usage.
-     */
-    CCoinsMap::iterator FetchCoin(const COutPoint &outpoint) const;
 };
 
 /**
- * CCoinsViewCache overlay that avoids populating/mutating parent cache layers on cache misses.
+ * CCoinsViewCache subclass that asynchronously fetches most block input prevouts in parallel during ConnectBlock without
+ * mutating the base cache.
+ *
+ * Only used in ConnectBlock to pass as an ephemeral view that can be reset if the block is invalid.
+ * It provides the same interface as CCoinsViewCache.
+ * It adds an additional StartFetching method to provide the block.
+ *
+ * When a block is passed to StartFetching, the inputs of the block are flattened into a vector of InputToFetch
+ * objects. StartFetching then submits worker tasks to a ThreadPool and keeps the returned futures alive until fetching
+ * is stopped.
+ *
+ * ProcessInput() atomically fetches and increments m_input_head, so each thread can only access a single element of the
+ * m_inputs vector at a time. Workers race to claim inputs, so they may fetch elements in any order. If the fetched
+ * index is greater than or equal to the size of m_inputs, no more inputs can be fetched and false is returned.
+ *
+ * The worker claims the InputToFetch at this index, fetches the coin from the base cache and moves it into the
+ * InputToFetch object. The ready flag is then set with a release memory order. This allows the ready flag to be
+ * used as a memory fence, guaranteeing the coin being written to the object will have happened before another
+ * thread tests the flag with an acquire memory order.
+ * This assumes all base->PeekCoin() paths are safe for concurrent readers and do not mutate lower cache layers.
+ *
+ * When a coin is requested from the cache on the main thread and is not already in cacheCoins map, FetchCoinFromBase
+ * checks whether the next unconsumed entry in m_inputs has the requested outpoint. On a match, m_input_tail is advanced
+ * and the entry's ready flag is waited on with an acquire memory order until a worker has finished fetching it. The
+ * coin is then moved out and returned. Since the main thread is the only consumer of validation results, it blocks
+ * on the specific input it needs rather than racing workers for other inputs.
+ *
+ * StopFetching() is called in Flush() and in Reset() (the per-block teardown) so workers stop before the block they
+ * reference goes away. It stops fetching by moving m_input_head to the end of m_inputs (so workers quickly exit),
+ * then waits for all futures to complete and clears the per-block state (m_inputs and the head/tail counters).
+ *
+ *       Workers advance m_input_head to fetch inputs. Main thread advances m_input_tail to consume.
  *
- * This is achieved by fetching coins from the base view using PeekCoin() instead of GetCoin(),
- * so intermediate CCoinsViewCache layers are not filled.
+ *       Before workers start:
  *
- * Used during ConnectBlock() as an ephemeral, resettable top-level view that is flushed only
- * on success, so invalid blocks don't pollute the underlying cache.
+ *                 m_input_head
+ *                 m_input_tail
+ *                      │
+ *                      ▼
+ *                 ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
+ *       m_inputs: │ waiting │ waiting │ waiting │ waiting │ waiting │ waiting │ waiting │ waiting │ waiting │
+ *                 │         │         │         │         │         │         │         │         │         │
+ *                 └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
+ *
+ *       After workers start:
+ *
+ *                                       Worker 2            Worker 0  Worker 3  Worker 1  m_input_head
+ *                                          │                   │         │         │         │
+ *                                          ▼                   ▼         ▼         ▼         ▼
+ *                 ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
+ *       m_inputs: │  ready  │  ready  │fetching │  ready  │fetching │fetching │fetching │ waiting │ waiting │
+ *                 │consumed │    ✓    │    ●    │    ✓    │    ●    │    ●    │    ●    │         │         │
+ *                 └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
+ *                                ▲
+ *                                │
+ *                           m_input_tail
  */
 class CoinsViewOverlay : public CCoinsViewCache
 {
 private:
+    //! The latest input not yet being fetched. Workers atomically increment this when fetching.
+    std::atomic_uint32_t m_input_head{0};
+    //! The latest input not yet accessed by a consumer. Only the main thread increments this.
+    mutable uint32_t m_input_tail{0};
+
+    //! The inputs of the block which is being fetched.
+    struct InputToFetch {
+        //! Workers set this after setting the coin. The main thread tests this before reading the coin.
+        std::atomic_flag ready{};
+        //! The outpoint of the input to fetch.
+        const COutPoint& outpoint;
+        //! The coin that workers will fetch and main thread will insert into cache.
+        //! Mutable so it can be moved in FetchCoinFromBase.
+        mutable std::optional<Coin> coin{std::nullopt};
+
+        explicit InputToFetch(const COutPoint& o LIFETIMEBOUND) noexcept : outpoint{o} {}
+
+        //! Move ctor is required for resizing m_inputs in StartFetching. Elements will never move once parallel tasks
+        //! are started, so we can assert that coin is nullopt and ready is false.
+        InputToFetch(InputToFetch&& other) noexcept : outpoint{other.outpoint}
+        {
+            Assert(!other.coin);
+            Assert(!other.ready.test(std::memory_order_relaxed));
+        }
+    };
+    //! Must only be mutated when m_futures is empty. Elements may be mutated when m_futures is not empty.
+    std::vector<InputToFetch> m_inputs{};
+
+    /**
+     * Claim and fetch the next input in the queue.
+     *
+     * @return true if an input prevout was fetched
+     * @return false if there are no more input prevouts in the queue to fetch
+     */
+    bool ProcessInput() noexcept
+    {
+        const auto i{m_input_head.fetch_add(1, std::memory_order_relaxed)};
+        if (i >= m_inputs.size()) return false;
+
+        auto& input{m_inputs[i]};
+        input.coin = base->PeekCoin(input.outpoint);
+        // Use release so writing coin above happens before the main thread acquires.
+        Assert(!input.ready.test_and_set(std::memory_order_release));
+        input.ready.notify_one();
+        return true;
+    }
+
+    //! Stop all worker threads and clear fetching data.
+    //! Calling this is idempotent, and may safely be called if not fetching.
+    void StopFetching() noexcept
+    {
+        if (m_futures.empty()) {
+            Assert(m_inputs.empty());
+            Assert(m_input_head.load(std::memory_order_relaxed) == 0);
+            Assert(m_input_tail == 0);
+            return;
+        }
+        // Skip fetching the rest of the inputs by moving the head to the end.
+        m_input_head.store(m_inputs.size(), std::memory_order_relaxed);
+        // Wait for all threads to stop.
+        for (auto& future : m_futures) future.wait();
+        m_futures.clear();
+        m_inputs.clear();
+        m_input_head.store(0, std::memory_order_relaxed);
+        m_input_tail = 0;
+    }
+
     std::optional<Coin> FetchCoinFromBase(const COutPoint& outpoint) const override
     {
+        // This assumes ConnectBlock accesses all inputs in the same order as
+        // they are added to m_inputs in StartFetching.
+        if (m_input_tail < m_inputs.size() && m_inputs[m_input_tail].outpoint == outpoint) {
+            // We advance the tail since the input is cached and not accessed through this method again.
+            auto& input{m_inputs[m_input_tail++]};
+            // Wait until the coin is ready to be read. We need acquire so we match the worker thread's release.
+            input.ready.wait(/*old=*/false, std::memory_order_acquire);
+            // We can move the coin since we won't access this input again.
+            return std::move(input.coin);
+        }
+
+        // We will only get here for BIP30 checks, an invalid block, or if the threadpool has not been started.
         return base->PeekCoin(outpoint);
     }
 
+    //! Non-null. May have zero workers when input fetching is disabled.
+    std::shared_ptr<ThreadPool> m_thread_pool;
+    std::vector<std::future<void>> m_futures{};
+
+protected:
+    void Reset() noexcept override
+    {
+        StopFetching();
+        CCoinsViewCache::Reset();
+    }
+
 public:
-    using CCoinsViewCache::CCoinsViewCache;
+    explicit CoinsViewOverlay(CCoinsView* in_base, std::shared_ptr<ThreadPool> thread_pool,
+                              bool deterministic = false) noexcept
+        : CCoinsViewCache{in_base, deterministic}, m_thread_pool{std::move(thread_pool)}
+    {
+        Assert(m_thread_pool);
+    }
+
+    ~CoinsViewOverlay() noexcept override { StopFetching(); }
+
+    //! Start fetching inputs from block.
+    [[nodiscard]] ResetGuard StartFetching(const CBlock& block LIFETIMEBOUND) noexcept;
+
+    void Flush(bool reallocate_cache = true) override
+    {
+        if (!Assume(AllInputsConsumed())) {
+            LogWarning("Block %s input prevout prefetch queue was not fully consumed; inputs were accessed out of order, so prefetching degraded to serial lookups for this block.", GetBestBlock().ToString());
+        }
+        StopFetching();
+        CCoinsViewCache::Flush(reallocate_cache);
+    }
+
+    //! Verify that all parallel fetched input prevouts have been consumed.
+    bool AllInputsConsumed() const noexcept { return m_input_tail == m_inputs.size(); }
 };
 
 //! Utility function to add all of a transaction's outputs to a cache.
diff --git a/depend/bitcoin/src/common/args.cpp b/depend/bitcoin/src/common/args.cpp
index 12e0f26e..97b37eb4 100644
--- a/depend/bitcoin/src/common/args.cpp
+++ b/depend/bitcoin/src/common/args.cpp
@@ -7,7 +7,6 @@
 
 #include <chainparamsbase.h>
 #include <common/settings.h>
-#include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <univalue.h>
@@ -15,6 +14,7 @@
 #include <util/check.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 
@@ -23,8 +23,6 @@
 #endif
 
 #include <algorithm>
-#include <cassert>
-#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <map>
@@ -387,6 +385,40 @@ std::optional<const ArgsManager::Command> ArgsManager::GetCommand() const
     return ret;
 }
 
+bool ArgsManager::CheckCommandOptions(const std::string& command, std::vector<std::string>* errors) const
+{
+    LOCK(cs_args);
+
+    auto command_options = m_available_args.find(OptionsCategory::COMMAND_OPTIONS);
+    if (command_options == m_available_args.end()) {
+        // There are no command-specific options at all, so everything is fine
+        return true;
+    }
+
+    const auto command_args = m_command_args.find(command);
+    auto is_valid_opt = [&](const auto& opt) EXCLUSIVE_LOCKS_REQUIRED(cs_args) -> bool {
+        if (command_args == m_command_args.end()) {
+            // Caller may not have checked that command actually exists
+            // before calling this function.  In that case, treat it as
+            // having no valid command-specific options.
+            return false;
+        } else {
+            return command_args->second.contains(opt);
+        }
+    };
+
+    bool ok = true;
+    for (const auto& [arg, _] : command_options->second) {
+        if (!GetSetting_(arg).isNull() && !is_valid_opt(arg)) {
+            ok = false;
+            if (errors != nullptr) {
+                errors->emplace_back(strprintf("The %s option cannot be used with the '%s' command.", arg, command));
+            }
+        }
+    }
+    return ok;
+}
+
 std::vector<std::string> ArgsManager::GetArgs(const std::string& strArg) const
 {
     std::vector<std::string> result;
@@ -598,7 +630,7 @@ void ArgsManager::ForceSetArg(const std::string& strArg, const std::string& strV
     m_settings.forced_settings[SettingName(strArg)] = strValue;
 }
 
-void ArgsManager::AddCommand(const std::string& cmd, const std::string& help)
+void ArgsManager::AddCommand(const std::string& cmd, const std::string& help, std::set<std::string> options)
 {
     Assert(cmd.find('=') == std::string::npos);
     Assert(cmd.at(0) != '-');
@@ -607,6 +639,18 @@ void ArgsManager::AddCommand(const std::string& cmd, const std::string& help)
     m_accept_any_command = false; // latch to false
     std::map<std::string, Arg>& arg_map = m_available_args[OptionsCategory::COMMANDS];
     auto ret = arg_map.emplace(cmd, Arg{"", help, ArgsManager::COMMAND});
+    if (!options.empty()) {
+        auto& cmdopts = m_available_args[OptionsCategory::COMMAND_OPTIONS];
+        bool command_has_all_options_defined = true;
+        for (const auto& opt : options) {
+            if (!cmdopts.contains(opt)) {
+                command_has_all_options_defined = false;
+            }
+        }
+        Assert(command_has_all_options_defined);
+
+        m_command_args.try_emplace(cmd, std::move(options));
+    }
     Assert(ret.second); // Fail on duplicate commands
 }
 
@@ -622,6 +666,14 @@ void ArgsManager::AddArg(const std::string& name, const std::string& help, unsig
     std::string arg_name = name.substr(0, eq_index);
 
     LOCK(cs_args);
+
+    // Allow duplicates involving HIDDEN — it is used as a placeholder for args
+    // unavailable in this binary but tolerated for shared config files (see #13441).
+    for (const auto& arg_map : m_available_args) {
+        if (arg_map.first == OptionsCategory::HIDDEN || cat == OptionsCategory::HIDDEN) continue;
+        Assert(!arg_map.second.contains(arg_name));
+    }
+
     std::map<std::string, Arg>& arg_map = m_available_args[cat];
     auto ret = arg_map.emplace(arg_name, Arg{name.substr(eq_index, name.size() - eq_index), help, flags});
     assert(ret.second); // Make sure an insertion actually happened
@@ -643,6 +695,7 @@ void ArgsManager::ClearArgs()
     LOCK(cs_args);
     m_settings = {};
     m_available_args.clear();
+    m_command_args.clear();
     m_network_only_args.clear();
     m_config_sections.clear();
 }
@@ -670,8 +723,20 @@ std::string ArgsManager::GetHelpMessage() const
 
     std::string usage;
     LOCK(cs_args);
-    for (const auto& arg_map : m_available_args) {
-        switch(arg_map.first) {
+
+    const auto command_options = m_available_args.find(OptionsCategory::COMMAND_OPTIONS);
+    const auto for_matching_cmd_opts = [&](const std::set<std::string>& select, auto&& fn) EXCLUSIVE_LOCKS_REQUIRED(cs_args) {
+        if (select.empty()) return;
+        if (command_options == m_available_args.end()) return;
+        for (const auto& [name, info] : command_options->second) {
+            if (!show_debug && (info.m_flags & ArgsManager::DEBUG_ONLY)) continue;
+            if (!select.contains(name)) continue;
+            fn(name, info);
+        }
+    };
+
+    for (const auto& [category, category_args] : m_available_args) {
+        switch(category) {
             case OptionsCategory::OPTIONS:
                 usage += HelpMessageGroup("Options:");
                 break;
@@ -717,22 +782,27 @@ std::string ArgsManager::GetHelpMessage() const
             case OptionsCategory::CLI_COMMANDS:
                 usage += HelpMessageGroup("CLI Commands:");
                 break;
+            case OptionsCategory::COMMAND_OPTIONS:
             case OptionsCategory::HIDDEN:
                 break;
         } // no default case, so the compiler can warn about missing cases
 
+        if (category == OptionsCategory::COMMAND_OPTIONS) continue;
+
         // When we get to the hidden options, stop
-        if (arg_map.first == OptionsCategory::HIDDEN) break;
-
-        for (const auto& arg : arg_map.second) {
-            if (show_debug || !(arg.second.m_flags & ArgsManager::DEBUG_ONLY)) {
-                std::string name;
-                if (arg.second.m_help_param.empty()) {
-                    name = arg.first;
-                } else {
-                    name = arg.first + arg.second.m_help_param;
+        if (category == OptionsCategory::HIDDEN) break;
+
+        for (const auto& [arg_name, arg_info] : category_args) {
+            if (show_debug || !(arg_info.m_flags & ArgsManager::DEBUG_ONLY)) {
+                usage += HelpMessageOpt(arg_name, arg_info.m_help_param, arg_info.m_help_text);
+
+                if (category == OptionsCategory::COMMANDS) {
+                    const auto cmd_args = m_command_args.find(arg_name);
+                    if (cmd_args == m_command_args.end()) continue;
+                    for_matching_cmd_opts(cmd_args->second, [&](const auto& cmdopt_name, const auto& cmdopt_info) {
+                        usage += HelpMessageOpt(cmdopt_name, cmdopt_info.m_help_param, cmdopt_info.m_help_text, /*subopt=*/true);
+                    });
                 }
-                usage += HelpMessageOpt(name, arg.second.m_help_text);
             }
         }
     }
@@ -750,19 +820,26 @@ void SetupHelpOptions(ArgsManager& args)
     args.AddHiddenArgs({"-h", "-?"});
 }
 
-static const int screenWidth = 79;
-static const int optIndent = 2;
-static const int msgIndent = 7;
-
 std::string HelpMessageGroup(const std::string &message) {
     return std::string(message) + std::string("\n\n");
 }
 
-std::string HelpMessageOpt(const std::string &option, const std::string &message) {
-    return std::string(optIndent,' ') + std::string(option) +
-           std::string("\n") + std::string(msgIndent,' ') +
-           FormatParagraph(message, screenWidth - msgIndent, msgIndent) +
-           std::string("\n\n");
+std::string HelpMessageOpt(std::string_view option, std::string_view help_param, std::string_view message, bool subopt)
+{
+    constexpr int screen_width = 79;
+    int opt_indent = 2;
+    int msg_indent = 7;
+
+    if (subopt) {
+        int bump = msg_indent - opt_indent;
+        opt_indent += bump; // opt_indent now at the old msg_indent level
+        msg_indent += bump; // indent by the same amount
+    }
+    int msg_width = screen_width - msg_indent;
+
+    return strprintf("%*s%s%s\n%*s%s\n\n",
+                     opt_indent, "", option, help_param,
+                     msg_indent, "", FormatParagraph(message, msg_width, msg_indent));
 }
 
 const std::vector<std::string> TEST_OPTIONS_DOC{
diff --git a/depend/bitcoin/src/common/args.h b/depend/bitcoin/src/common/args.h
index de323d3c..0a83e143 100644
--- a/depend/bitcoin/src/common/args.h
+++ b/depend/bitcoin/src/common/args.h
@@ -6,7 +6,6 @@
 #define BITCOIN_COMMON_ARGS_H
 
 #include <common/settings.h>
-#include <compat/compat.h>
 #include <sync.h>
 #include <util/chaintype.h>
 #include <util/fs.h>
@@ -19,6 +18,7 @@
 #include <optional>
 #include <set>
 #include <string>
+#include <string_view>
 #include <variant>
 #include <vector>
 
@@ -67,6 +67,10 @@ enum class OptionsCategory {
     CLI_COMMANDS,
     IPC,
 
+    // Specific to one or more commands (OptionsCategory::COMMANDS)
+    // These are only included in help with their associated commands.
+    COMMAND_OPTIONS,
+
     HIDDEN // Always the last option to avoid printing these in the help
 };
 
@@ -142,6 +146,7 @@ class ArgsManager
     std::set<std::string> m_network_only_args GUARDED_BY(cs_args);
     std::map<OptionsCategory, std::map<std::string, Arg>> m_available_args GUARDED_BY(cs_args);
     std::optional<unsigned int> m_default_flags GUARDED_BY(cs_args){};
+    std::map<std::string, std::set<std::string>> m_command_args GUARDED_BY(cs_args);
     bool m_accept_any_command GUARDED_BY(cs_args){true};
     std::list<SectionInfo> m_config_sections GUARDED_BY(cs_args);
     std::optional<fs::path> m_config_path GUARDED_BY(cs_args);
@@ -219,6 +224,16 @@ class ArgsManager
      */
     std::optional<const Command> GetCommand() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
+    /**
+     * Check that any command-specific options the user specified are valid
+     * for the given command.
+     *
+     * @param[in] command   The command being run.
+     * @param[out] errors   If non-null, populated with a message for each invalid option.
+     * @return false if any command-specific options were specified that are not valid for this command
+     */
+    bool CheckCommandOptions(const std::string& command, std::vector<std::string>* errors = nullptr) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+
     /**
      * Get blocks directory path
      *
@@ -360,9 +375,9 @@ class ArgsManager
     void AddArg(const std::string& name, const std::string& help, unsigned int flags, const OptionsCategory& cat) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
-     * Add subcommand
+     * Add command
      */
-    void AddCommand(const std::string& cmd, const std::string& help) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+    void AddCommand(const std::string& cmd, const std::string& help, std::set<std::string> options = {}) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Add many hidden arguments
@@ -491,10 +506,12 @@ std::string HelpMessageGroup(const std::string& message);
 /**
  * Format a string to be used as option description in help messages
  *
- * @param option Option message (e.g. "-rpcuser=<user>")
+ * @param option Option name (e.g. "-rpcuser")
+ * @param help_param Help parameter (e.g. "=<user>" or "")
  * @param message Option description (e.g. "Username for JSON-RPC connections")
+ * @param subopt True if this is a suboption, instead of a top-level option.
  * @return the formatted string
  */
-std::string HelpMessageOpt(const std::string& option, const std::string& message);
+std::string HelpMessageOpt(std::string_view option, std::string_view help_param, std::string_view message, bool subopt = false);
 
 #endif // BITCOIN_COMMON_ARGS_H
diff --git a/depend/bitcoin/src/common/bloom.cpp b/depend/bitcoin/src/common/bloom.cpp
index 3ee78994..c15c8f78 100644
--- a/depend/bitcoin/src/common/bloom.cpp
+++ b/depend/bitcoin/src/common/bloom.cpp
@@ -16,8 +16,7 @@
 
 #include <algorithm>
 #include <cmath>
-#include <cstdlib>
-#include <limits>
+#include <compare>
 #include <vector>
 
 static constexpr double LN2SQUARED = 0.4804530139182014246671025263266649717305529515945455;
diff --git a/depend/bitcoin/src/common/bloom.h b/depend/bitcoin/src/common/bloom.h
index 97007e1f..18399bd8 100644
--- a/depend/bitcoin/src/common/bloom.h
+++ b/depend/bitcoin/src/common/bloom.h
@@ -6,16 +6,17 @@
 #define BITCOIN_COMMON_BLOOM_H
 
 #include <serialize.h>
-#include <span.h>
 
+#include <cstdint>
+#include <span>
 #include <vector>
 
 class COutPoint;
 class CTransaction;
 
 //! 20,000 items with fp rate < 0.1% or 10,000 items and <0.0001%
-static constexpr unsigned int MAX_BLOOM_FILTER_SIZE = 36000; // bytes
-static constexpr unsigned int MAX_HASH_FUNCS = 50;
+inline constexpr unsigned int MAX_BLOOM_FILTER_SIZE{36'000}; // bytes
+inline constexpr unsigned int MAX_HASH_FUNCS = 50;
 
 /**
  * First two bits of nFlags control how much IsRelevantAndUpdate actually updates
diff --git a/depend/bitcoin/src/common/config.cpp b/depend/bitcoin/src/common/config.cpp
index a05c20d6..8cf324ca 100644
--- a/depend/bitcoin/src/common/config.cpp
+++ b/depend/bitcoin/src/common/config.cpp
@@ -2,28 +2,25 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <common/args.h>
+#include <common/args.h> // IWYU pragma: associated
 
 #include <common/settings.h>
-#include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <univalue.h>
-#include <util/chaintype.h>
+#include <util/check.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/string.h>
 
 #include <algorithm>
-#include <cassert>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 #include <iostream>
-#include <sstream>
 #include <list>
 #include <map>
-#include <memory>
 #include <optional>
+#include <sstream>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/depend/bitcoin/src/common/init.cpp b/depend/bitcoin/src/common/init.cpp
index 7a1d664c..091b8d81 100644
--- a/depend/bitcoin/src/common/init.cpp
+++ b/depend/bitcoin/src/common/init.cpp
@@ -2,15 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <common/init.h>
+
 #include <chainparams.h>
 #include <common/args.h>
-#include <common/init.h>
-#include <logging.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/translation.h>
 
-#include <algorithm>
 #include <exception>
 #include <optional>
 
diff --git a/depend/bitcoin/src/common/interfaces.cpp b/depend/bitcoin/src/common/interfaces.cpp
index de028f9c..3873ca2e 100644
--- a/depend/bitcoin/src/common/interfaces.cpp
+++ b/depend/bitcoin/src/common/interfaces.cpp
@@ -2,9 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <btcsignals.h>
-#include <interfaces/echo.h>
-#include <interfaces/handler.h>
+#include <interfaces/echo.h>    // IWYU pragma: associated
+#include <interfaces/handler.h> // IWYU pragma: associated
+
+#include <util/btcsignals.h>
 
 #include <memory>
 #include <utility>
diff --git a/depend/bitcoin/src/common/messages.cpp b/depend/bitcoin/src/common/messages.cpp
index 12e32cae..e558442f 100644
--- a/depend/bitcoin/src/common/messages.cpp
+++ b/depend/bitcoin/src/common/messages.cpp
@@ -4,16 +4,17 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <common/messages.h>
+
 #include <common/types.h>
 #include <node/types.h>
 #include <policy/fees/block_policy_estimator.h>
 #include <tinyformat.h>
+#include <util/check.h>
 #include <util/fees.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/translation.h>
 
-#include <cassert>
 #include <map>
 #include <string>
 #include <string_view>
@@ -116,6 +117,8 @@ bilingual_str PSBTErrorString(PSBTError err)
             return Untranslated("Signer does not support PSBT");
         case PSBTError::INCOMPLETE:
             return Untranslated("Input needs additional signatures or other data");
+        case PSBTError::INVALID_TX:
+            return Untranslated("The transaction cannot be valid");
         case PSBTError::OK:
             return Untranslated("No errors");
     } // no default case, so the compiler can warn about missing cases
@@ -141,6 +144,8 @@ bilingual_str TransactionErrorString(const TransactionError err)
             return Untranslated("Unspendable output exceeds maximum configured by user (maxburnamount)");
         case TransactionError::INVALID_PACKAGE:
             return Untranslated("Transaction rejected due to invalid package");
+        case TransactionError::PRIVATE_BROADCAST_FULL:
+            return Untranslated("Private broadcast queue is full");
     } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
diff --git a/depend/bitcoin/src/common/messages.h b/depend/bitcoin/src/common/messages.h
index 60fdaa18..6dc3212f 100644
--- a/depend/bitcoin/src/common/messages.h
+++ b/depend/bitcoin/src/common/messages.h
@@ -13,17 +13,19 @@
 
 #include <string>
 #include <string_view>
+#include <utility>
 
 struct bilingual_str;
-
 enum class FeeEstimateMode;
 enum class FeeReason;
+
 namespace node {
 enum class TransactionError;
 } // namespace node
 
 namespace common {
 enum class PSBTError;
+
 bool FeeModeFromString(std::string_view mode_string, FeeEstimateMode& fee_estimate_mode);
 std::string StringForFeeReason(FeeReason reason);
 std::string FeeModes(const std::string& delimiter);
diff --git a/depend/bitcoin/src/common/netif.cpp b/depend/bitcoin/src/common/netif.cpp
index 8c0c4fa0..1120ee60 100644
--- a/depend/bitcoin/src/common/netif.cpp
+++ b/depend/bitcoin/src/common/netif.cpp
@@ -6,22 +6,26 @@
 
 #include <common/netif.h>
 
-#include <logging.h>
+#include <compat/compat.h>
 #include <netbase.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/sock.h>
-#include <util/syserror.h>
+
+#include <cerrno>
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <memory>
+#include <string>
+#include <type_traits>
 
 #if defined(__linux__)
+#include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #elif defined(__FreeBSD__)
-#include <osreldate.h>
-#if __FreeBSD_version >= 1400000
-// Workaround https://github.com/freebsd/freebsd-src/pull/1070.
-#define typeof __typeof
 #include <netlink/netlink.h>
 #include <netlink/netlink_route.h>
-#endif
 #elif defined(WIN32)
 #include <iphlpapi.h>
 #elif defined(__APPLE__)
@@ -30,12 +34,9 @@
 #endif
 
 #ifdef HAVE_IFADDRS
-#include <sys/types.h>
 #include <ifaddrs.h>
 #endif
 
-#include <type_traits>
-
 namespace {
 
 //! Return CNetAddr for the specified OS-level network address.
@@ -62,10 +63,8 @@ std::optional<CNetAddr> FromSockAddr(const struct sockaddr* addr, std::optional<
     return std::nullopt;
 }
 
-// Linux and FreeBSD 14.0+. For FreeBSD 13.2 the code can be compiled but
-// running it requires loading a special kernel module, otherwise socket(AF_NETLINK,...)
-// will fail, so we skip that.
-#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 1400000)
+// Linux and FreeBSD.
+#if defined(__linux__) || defined(__FreeBSD__)
 
 // Good for responses containing ~ 10,000-15,000 routes.
 static constexpr ssize_t NETLINK_MAX_RESPONSE_SIZE{1'048'576};
@@ -239,12 +238,12 @@ std::optional<CNetAddr> QueryDefaultGatewayImpl(sa_family_t family)
     // The size of the available data is determined by calling sysctl() with oldp=nullptr. See sysctl(3).
     size_t l = 0;
     if (sysctl(/*name=*/mib, /*namelen=*/sizeof(mib) / sizeof(int), /*oldp=*/nullptr, /*oldlenp=*/&l, /*newp=*/nullptr, /*newlen=*/0) < 0) {
-        LogError("Could not get sysctl length of routing table: %s\n", SysErrorString(errno));
+        LogError("Could not get sysctl length of routing table: %s\n", NetworkErrorString(errno));
         return std::nullopt;
     }
     std::vector<std::byte> buf(l);
     if (sysctl(/*name=*/mib, /*namelen=*/sizeof(mib) / sizeof(int), /*oldp=*/buf.data(), /*oldlenp=*/&l, /*newp=*/nullptr, /*newlen=*/0) < 0) {
-        LogError("Could not get sysctl data of routing table: %s\n", SysErrorString(errno));
+        LogError("Could not get sysctl data of routing table: %s\n", NetworkErrorString(errno));
         return std::nullopt;
     }
     // Iterate over messages (each message is a routing table entry).
diff --git a/depend/bitcoin/src/common/netif.h b/depend/bitcoin/src/common/netif.h
index 769bcbcc..84df00a2 100644
--- a/depend/bitcoin/src/common/netif.h
+++ b/depend/bitcoin/src/common/netif.h
@@ -8,6 +8,7 @@
 #include <netaddress.h>
 
 #include <optional>
+#include <vector>
 
 //! Query the OS for the default gateway for `network`. This only makes sense for NET_IPV4 and NET_IPV6.
 //! Returns std::nullopt if it cannot be found, or there is no support for this OS.
diff --git a/depend/bitcoin/src/common/pcp.cpp b/depend/bitcoin/src/common/pcp.cpp
index a640b823..96a85821 100644
--- a/depend/bitcoin/src/common/pcp.cpp
+++ b/depend/bitcoin/src/common/pcp.cpp
@@ -4,19 +4,30 @@
 
 #include <common/pcp.h>
 
-#include <atomic>
-#include <common/netif.h>
+#include <compat/compat.h>
 #include <crypto/common.h>
-#include <logging.h>
+#include <crypto/hex_base.h>
 #include <netaddress.h>
 #include <netbase.h>
-#include <random.h>
-#include <span.h>
+#include <tinyformat.h>
 #include <util/check.h>
-#include <util/readwritefile.h>
+#include <util/log.h>
 #include <util/sock.h>
-#include <util/strencodings.h>
+#include <util/string.h>
 #include <util/threadinterrupt.h>
+#include <util/time.h>
+
+#include <algorithm>
+#include <atomic>
+#include <compare>
+#include <cstring>
+#include <functional>
+#include <map>
+#include <memory>
+#include <optional>
+#include <span>
+#include <utility>
+#include <vector>
 
 namespace {
 
@@ -247,7 +258,7 @@ std::optional<std::vector<uint8_t>> PCPSendRecv(Sock &sock, const std::string &p
         while ((cur_time = time_point_cast<milliseconds>(MockableSteadyClock::now())) < deadline) {
             if (interrupt) return std::nullopt;
             Sock::Event occurred = 0;
-            if (!sock.Wait(deadline - cur_time, Sock::RECV, &occurred)) {
+            if (!sock.Wait(deadline - cur_time, Sock::RecvEvent, &occurred)) {
                 LogWarning("%s: Could not wait on socket: %s\n", protocol, NetworkErrorString(WSAGetLastError()));
                 return std::nullopt; // Network-level error, probably no use retrying.
             }
diff --git a/depend/bitcoin/src/common/pcp.h b/depend/bitcoin/src/common/pcp.h
index 121349b0..2c6b776f 100644
--- a/depend/bitcoin/src/common/pcp.h
+++ b/depend/bitcoin/src/common/pcp.h
@@ -6,15 +6,21 @@
 #define BITCOIN_COMMON_PCP_H
 
 #include <netaddress.h>
-#include <util/threadinterrupt.h>
+#include <util/time.h>
 
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <string>
 #include <variant>
 
+class CThreadInterrupt;
+
 // RFC6886 NAT-PMP and RFC6887 Port Control Protocol (PCP) implementation.
 // NAT-PMP and PCP use network byte order (big-endian).
 
 //! Mapping nonce size in bytes (see RFC6887 section 11.1).
-constexpr size_t PCP_MAP_NONCE_SIZE = 12;
+inline constexpr size_t PCP_MAP_NONCE_SIZE = 12;
 
 //! PCP mapping nonce. Arbitrary data chosen by the client to identify a mapping.
 typedef std::array<uint8_t, PCP_MAP_NONCE_SIZE> PCPMappingNonce;
diff --git a/depend/bitcoin/src/common/run_command.cpp b/depend/bitcoin/src/common/run_command.cpp
index 86f89e17..b4e81c40 100644
--- a/depend/bitcoin/src/common/run_command.cpp
+++ b/depend/bitcoin/src/common/run_command.cpp
@@ -2,21 +2,19 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bitcoin-build-config.h> // IWYU pragma: keep
-
 #include <common/run_command.h>
 
 #include <tinyformat.h>
 #include <univalue.h>
 #include <util/string.h>
-
-#ifdef ENABLE_EXTERNAL_SIGNER
 #include <util/subprocess.h>
-#endif // ENABLE_EXTERNAL_SIGNER
+
+#include <sstream>
+#include <stdexcept>
+#include <utility>
 
 UniValue RunCommandParseJSON(const std::vector<std::string>& cmd_args, const std::string& str_std_in)
 {
-#ifdef ENABLE_EXTERNAL_SIGNER
     namespace sp = subprocess;
 
     UniValue result_json;
@@ -43,7 +41,4 @@ UniValue RunCommandParseJSON(const std::vector<std::string>& cmd_args, const std
     if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
 
     return result_json;
-#else
-    throw std::runtime_error("Compiled without external signing support (required for external signing).");
-#endif // ENABLE_EXTERNAL_SIGNER
 }
diff --git a/depend/bitcoin/src/common/settings.cpp b/depend/bitcoin/src/common/settings.cpp
index e9b92979..eca29bec 100644
--- a/depend/bitcoin/src/common/settings.cpp
+++ b/depend/bitcoin/src/common/settings.cpp
@@ -2,15 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <common/settings.h>
-
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
+#include <common/settings.h>
+
 #include <tinyformat.h>
 #include <univalue.h>
 #include <util/fs.h>
 
-#include <algorithm>
 #include <fstream>
 #include <iterator>
 #include <map>
@@ -86,7 +85,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 +138,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/depend/bitcoin/src/common/settings.h b/depend/bitcoin/src/common/settings.h
index bc7b89a9..6f2579b1 100644
--- a/depend/bitcoin/src/common/settings.h
+++ b/depend/bitcoin/src/common/settings.h
@@ -12,7 +12,9 @@
 #include <string>
 #include <vector>
 
-class UniValue;
+// Users of this header need to explicitly #include <univalue.h>
+// IWYU pragma: no_include <univalue.h>
+class UniValue; // IWYU pragma: keep
 
 namespace common {
 
diff --git a/depend/bitcoin/src/common/signmessage.cpp b/depend/bitcoin/src/common/signmessage.cpp
index 0f9e1f5e..b45951f6 100644
--- a/depend/bitcoin/src/common/signmessage.cpp
+++ b/depend/bitcoin/src/common/signmessage.cpp
@@ -4,15 +4,18 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <common/signmessage.h>
+
+#include <addresstype.h>
 #include <hash.h>
 #include <key.h>
 #include <key_io.h>
 #include <pubkey.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/strencodings.h>
 
-#include <cassert>
 #include <optional>
+#include <span>
 #include <string>
 #include <variant>
 #include <vector>
diff --git a/depend/bitcoin/src/common/system.cpp b/depend/bitcoin/src/common/system.cpp
index 08c0c692..33918dd8 100644
--- a/depend/bitcoin/src/common/system.cpp
+++ b/depend/bitcoin/src/common/system.cpp
@@ -7,17 +7,17 @@
 
 #include <common/system.h>
 
-#include <logging.h>
+#include <util/log.h>
 #include <util/string.h>
 #include <util/time.h>
 
 #ifdef WIN32
-#include <cassert>
-#include <codecvt>
 #include <compat/compat.h>
+#include <util/check.h>
 #include <windows.h>
 #else
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 #endif
 
@@ -25,8 +25,6 @@
 #include <malloc.h>
 #endif
 
-#include <algorithm>
-#include <cstddef>
 #include <cstdint>
 #include <cstdlib>
 #include <locale>
@@ -50,11 +48,7 @@ std::string ShellEscape(const std::string& arg)
 void runCommand(const std::string& strCommand)
 {
     if (strCommand.empty()) return;
-#ifndef WIN32
     int nErr = ::system(strCommand.c_str());
-#else
-    int nErr = ::_wsystem(std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>,wchar_t>().from_bytes(strCommand).c_str());
-#endif
     if (nErr) {
         LogWarning("runCommand error: system(%s) returned %d", strCommand, nErr);
     }
@@ -111,20 +105,17 @@ int GetNumCores()
     return std::thread::hardware_concurrency();
 }
 
-std::optional<size_t> GetTotalRAM()
+std::optional<uint64_t> TryGetTotalRam()
 {
-    [[maybe_unused]] auto clamp{[](uint64_t v) { return size_t(std::min(v, uint64_t{std::numeric_limits<size_t>::max()})); }};
+    static const auto total_ram{[]() -> std::optional<uint64_t> {
 #ifdef WIN32
-    if (MEMORYSTATUSEX m{}; (m.dwLength = sizeof(m), GlobalMemoryStatusEx(&m))) return clamp(m.ullTotalPhys);
-#elif defined(__APPLE__) || \
-      defined(__FreeBSD__) || \
-      defined(__NetBSD__) || \
-      defined(__OpenBSD__) || \
-      defined(__illumos__) || \
-      defined(__linux__)
-    if (long p{sysconf(_SC_PHYS_PAGES)}, s{sysconf(_SC_PAGESIZE)}; p > 0 && s > 0) return clamp(1ULL * p * s);
+        if (MEMORYSTATUSEX m{}; (m.dwLength = sizeof(m), GlobalMemoryStatusEx(&m))) return m.ullTotalPhys;
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__illumos__) || defined(__linux__)
+        if (long p{sysconf(_SC_PHYS_PAGES)}, s{sysconf(_SC_PAGESIZE)}; p > 0 && s > 0) return 1ULL * p * s;
 #endif
-    return std::nullopt;
+        return std::nullopt;
+    }()};
+    return total_ram;
 }
 
 namespace {
diff --git a/depend/bitcoin/src/common/system.h b/depend/bitcoin/src/common/system.h
index a3100fec..ad217e0d 100644
--- a/depend/bitcoin/src/common/system.h
+++ b/depend/bitcoin/src/common/system.h
@@ -7,9 +7,9 @@
 #define BITCOIN_COMMON_SYSTEM_H
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
+
 #include <util/time.h>
 
-#include <chrono>
 #include <cstdint>
 #include <optional>
 #include <string>
@@ -35,6 +35,6 @@ int GetNumCores();
 /**
  * Return the total RAM available on the current system, if detectable.
  */
-std::optional<size_t> GetTotalRAM();
+std::optional<uint64_t> TryGetTotalRam();
 
 #endif // BITCOIN_COMMON_SYSTEM_H
diff --git a/depend/bitcoin/src/common/types.h b/depend/bitcoin/src/common/types.h
index c366a847..b9ebca15 100644
--- a/depend/bitcoin/src/common/types.h
+++ b/depend/bitcoin/src/common/types.h
@@ -23,6 +23,7 @@ enum class PSBTError {
     EXTERNAL_SIGNER_FAILED,
     UNSUPPORTED,
     INCOMPLETE,
+    INVALID_TX,
     OK,
 };
 /**
diff --git a/depend/bitcoin/src/common/url.cpp b/depend/bitcoin/src/common/url.cpp
index 30ac26a1..a186c512 100644
--- a/depend/bitcoin/src/common/url.cpp
+++ b/depend/bitcoin/src/common/url.cpp
@@ -5,6 +5,7 @@
 #include <common/url.h>
 
 #include <charconv>
+#include <cstddef>
 #include <string>
 #include <string_view>
 #include <system_error>
@@ -37,3 +38,25 @@ std::string UrlDecode(std::string_view url_encoded)
 
     return res;
 }
+
+std::string UrlEncode(std::string_view str)
+{
+    std::string res;
+    res.reserve(str.size() * 3); // worst case: every char needs encoding
+
+    for (char ch : str) {
+        auto c = static_cast<unsigned char>(ch);
+        // Unreserved characters per RFC 3986, Section 2.3
+        if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
+            (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '.' || c == '~') {
+            res += ch;
+        } else {
+            // Percent-encode all other characters
+            res += '%';
+            constexpr char hex_chars[] = "0123456789ABCDEF";
+            res += hex_chars[(c >> 4) & 0xF];
+            res += hex_chars[c & 0xF];
+        }
+    }
+    return res;
+}
diff --git a/depend/bitcoin/src/common/url.h b/depend/bitcoin/src/common/url.h
index 718a607f..3defaf98 100644
--- a/depend/bitcoin/src/common/url.h
+++ b/depend/bitcoin/src/common/url.h
@@ -14,4 +14,7 @@
  */
 std::string UrlDecode(std::string_view url_encoded);
 
+/* Encode a URL. */
+std::string UrlEncode(std::string_view str);
+
 #endif // BITCOIN_COMMON_URL_H
diff --git a/depend/bitcoin/src/compressor.h b/depend/bitcoin/src/compressor.h
index 95490b7b..b6b738f6 100644
--- a/depend/bitcoin/src/compressor.h
+++ b/depend/bitcoin/src/compressor.h
@@ -59,7 +59,7 @@ struct ScriptCompression
      * transactions, in which case this value becomes dependent on version
      * and nHeight of the enclosing transaction.
      */
-    static const unsigned int nSpecialScripts = 6;
+    static constexpr unsigned int nSpecialScripts{6};
 
     template<typename Stream>
     void Ser(Stream &s, const CScript& script) {
diff --git a/depend/bitcoin/src/consensus/amount.h b/depend/bitcoin/src/consensus/amount.h
index 2a65a831..a2a383cc 100644
--- a/depend/bitcoin/src/consensus/amount.h
+++ b/depend/bitcoin/src/consensus/amount.h
@@ -12,7 +12,7 @@
 typedef int64_t CAmount;
 
 /** The amount of satoshis in one BTC. */
-static constexpr CAmount COIN = 100000000;
+inline constexpr CAmount COIN{100'000'000};
 
 /** No amount larger than this (in satoshi) is valid.
  *
@@ -23,7 +23,7 @@ static constexpr CAmount COIN = 100000000;
  * critical; in unusual circumstances like a(nother) overflow bug that allowed
  * for the creation of coins out of thin air modification could lead to a fork.
  * */
-static constexpr CAmount MAX_MONEY = 21000000 * COIN;
+inline constexpr CAmount MAX_MONEY{21'000'000 * COIN};
 inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 
 #endif // BITCOIN_CONSENSUS_AMOUNT_H
diff --git a/depend/bitcoin/src/consensus/consensus.h b/depend/bitcoin/src/consensus/consensus.h
index 71b5fe24..96195e28 100644
--- a/depend/bitcoin/src/consensus/consensus.h
+++ b/depend/bitcoin/src/consensus/consensus.h
@@ -6,32 +6,32 @@
 #ifndef BITCOIN_CONSENSUS_CONSENSUS_H
 #define BITCOIN_CONSENSUS_CONSENSUS_H
 
+#include <cstddef>
 #include <cstdint>
-#include <cstdlib>
 
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
-static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
+inline constexpr unsigned int MAX_BLOCK_SERIALIZED_SIZE{4'000'000};
 /** The maximum allowed weight for a block, see BIP 141 (network rule) */
-static const unsigned int MAX_BLOCK_WEIGHT = 4000000;
+inline constexpr unsigned int MAX_BLOCK_WEIGHT{4'000'000};
 /** The maximum allowed number of signature check operations in a block (network rule) */
-static const int64_t MAX_BLOCK_SIGOPS_COST = 80000;
+inline constexpr int64_t MAX_BLOCK_SIGOPS_COST{80'000};
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
-static const int COINBASE_MATURITY = 100;
+inline constexpr int COINBASE_MATURITY = 100;
 
-static const int WITNESS_SCALE_FACTOR = 4;
+inline constexpr int WITNESS_SCALE_FACTOR = 4;
 
-static const size_t MIN_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 60; // 60 is the lower bound for the size of a valid serialized CTransaction
-static const size_t MIN_SERIALIZABLE_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 10; // 10 is the lower bound for the size of a serialized CTransaction
+inline constexpr size_t MIN_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 60; // 60 is the lower bound for the size of a valid serialized CTransaction
+inline constexpr size_t MIN_SERIALIZABLE_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 10; // 10 is the lower bound for the size of a serialized CTransaction
 
 /** Flags for nSequence and nLockTime locks */
 /** Interpret sequence numbers as relative lock-time constraints. */
-static constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0);
+inline constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0);
 
 /**
  * Maximum number of seconds that the timestamp of the first
  * block of a difficulty adjustment period is allowed to
  * be earlier than the last block of the previous period (BIP94).
  */
-static constexpr int64_t MAX_TIMEWARP = 600;
+inline constexpr int64_t MAX_TIMEWARP = 600;
 
 #endif // BITCOIN_CONSENSUS_CONSENSUS_H
diff --git a/depend/bitcoin/src/consensus/merkle.cpp b/depend/bitcoin/src/consensus/merkle.cpp
index c6ae81c6..dfa23cf8 100644
--- a/depend/bitcoin/src/consensus/merkle.cpp
+++ b/depend/bitcoin/src/consensus/merkle.cpp
@@ -3,9 +3,17 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/merkle.h>
+
+#include <crypto/sha256.h>
 #include <hash.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <util/check.h>
 
+#include <cstddef>
+#include <memory>
+#include <utility>
+
 /*     WARNING! If you're reading this because you're learning about crypto
        and/or designing a new system that will use merkle trees, keep in mind
        that the following merkle tree algorithm has a serious flaw related to
diff --git a/depend/bitcoin/src/consensus/merkle.h b/depend/bitcoin/src/consensus/merkle.h
index 03b5a1b5..446b2df7 100644
--- a/depend/bitcoin/src/consensus/merkle.h
+++ b/depend/bitcoin/src/consensus/merkle.h
@@ -5,10 +5,12 @@
 #ifndef BITCOIN_CONSENSUS_MERKLE_H
 #define BITCOIN_CONSENSUS_MERKLE_H
 
+#include <uint256.h>
+
+#include <cstdint>
 #include <vector>
 
-#include <primitives/block.h>
-#include <uint256.h>
+class CBlock;
 
 uint256 ComputeMerkleRoot(std::vector<uint256> hashes, bool* mutated = nullptr);
 
diff --git a/depend/bitcoin/src/consensus/params.h b/depend/bitcoin/src/consensus/params.h
index 7f567294..99096e06 100644
--- a/depend/bitcoin/src/consensus/params.h
+++ b/depend/bitcoin/src/consensus/params.h
@@ -11,6 +11,7 @@
 
 #include <array>
 #include <chrono>
+#include <cstdint>
 #include <limits>
 #include <map>
 #include <vector>
diff --git a/depend/bitcoin/src/consensus/tx_check.cpp b/depend/bitcoin/src/consensus/tx_check.cpp
index 251417c8..473538e4 100644
--- a/depend/bitcoin/src/consensus/tx_check.cpp
+++ b/depend/bitcoin/src/consensus/tx_check.cpp
@@ -5,8 +5,16 @@
 #include <consensus/tx_check.h>
 
 #include <consensus/amount.h>
-#include <primitives/transaction.h>
+#include <consensus/consensus.h>
 #include <consensus/validation.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <serialize.h>
+
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 bool CheckTransaction(const CTransaction& tx, TxValidationState& state)
 {
diff --git a/depend/bitcoin/src/consensus/tx_verify.cpp b/depend/bitcoin/src/consensus/tx_verify.cpp
index 4efed70f..e580a9d2 100644
--- a/depend/bitcoin/src/consensus/tx_verify.cpp
+++ b/depend/bitcoin/src/consensus/tx_verify.cpp
@@ -11,9 +11,15 @@
 #include <consensus/validation.h>
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
+#include <script/script.h>
+#include <tinyformat.h>
 #include <util/check.h>
 #include <util/moneystr.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <string>
+
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {
     if (tx.nLockTime == 0)
diff --git a/depend/bitcoin/src/consensus/tx_verify.h b/depend/bitcoin/src/consensus/tx_verify.h
index ed44d435..76faeaea 100644
--- a/depend/bitcoin/src/consensus/tx_verify.h
+++ b/depend/bitcoin/src/consensus/tx_verify.h
@@ -9,6 +9,7 @@
 #include <script/verify_flags.h>
 
 #include <cstdint>
+#include <utility>
 #include <vector>
 
 class CBlockIndex;
diff --git a/depend/bitcoin/src/consensus/validation.h b/depend/bitcoin/src/consensus/validation.h
index 37a40e76..1525a036 100644
--- a/depend/bitcoin/src/consensus/validation.h
+++ b/depend/bitcoin/src/consensus/validation.h
@@ -6,16 +6,24 @@
 #ifndef BITCOIN_CONSENSUS_VALIDATION_H
 #define BITCOIN_CONSENSUS_VALIDATION_H
 
-#include <string>
 #include <consensus/consensus.h>
-#include <primitives/transaction.h>
 #include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <serialize.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
 
 /** Index marker for when no witness commitment is present in a coinbase transaction. */
-static constexpr int NO_WITNESS_COMMITMENT{-1};
+inline constexpr int NO_WITNESS_COMMITMENT{-1};
 
 /** Minimum size of a witness commitment structure. Defined in BIP 141. **/
-static constexpr size_t MINIMUM_WITNESS_COMMITMENT{38};
+inline constexpr size_t MINIMUM_WITNESS_COMMITMENT{38};
 
 /** A "reason" why a transaction was invalid, suitable for determining whether the
   * provider of the transaction should be banned/ignored/disconnected/etc.
diff --git a/depend/bitcoin/src/core_io.cpp b/depend/bitcoin/src/core_io.cpp
index 584f823b..3650d708 100644
--- a/depend/bitcoin/src/core_io.cpp
+++ b/depend/bitcoin/src/core_io.cpp
@@ -11,6 +11,7 @@
 #include <consensus/validation.h>
 #include <crypto/hex_base.h>
 #include <key_io.h>
+#include <prevector.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/descriptor.h>
diff --git a/depend/bitcoin/src/crypto/CMakeLists.txt b/depend/bitcoin/src/crypto/CMakeLists.txt
index 4dc84664..e1993a7f 100644
--- a/depend/bitcoin/src/crypto/CMakeLists.txt
+++ b/depend/bitcoin/src/crypto/CMakeLists.txt
@@ -3,7 +3,7 @@
 # file COPYING or https://opensource.org/license/mit/.
 
 add_library(bitcoin_crypto STATIC EXCLUDE_FROM_ALL
-  aes.cpp
+  $<$<NOT:$<STREQUAL:${CMAKE_SYSTEM_NAME},Generic>>:aes.cpp>
   chacha20.cpp
   chacha20poly1305.cpp
   hex_base.cpp
@@ -20,7 +20,7 @@ add_library(bitcoin_crypto STATIC EXCLUDE_FROM_ALL
   sha512.cpp
   siphash.cpp
   ../support/cleanse.cpp
-  ../support/lockedpool.cpp
+  $<$<NOT:$<STREQUAL:${CMAKE_SYSTEM_NAME},Generic>>:../support/lockedpool.cpp>
 )
 
 target_link_libraries(bitcoin_crypto
diff --git a/depend/bitcoin/src/crypto/aes.h b/depend/bitcoin/src/crypto/aes.h
index 617bb62d..4892c097 100644
--- a/depend/bitcoin/src/crypto/aes.h
+++ b/depend/bitcoin/src/crypto/aes.h
@@ -12,8 +12,8 @@ extern "C" {
 #include <crypto/ctaes/ctaes.h>
 }
 
-static const int AES_BLOCKSIZE = 16;
-static const int AES256_KEYSIZE = 32;
+inline constexpr int AES_BLOCKSIZE = 16;
+inline constexpr int AES256_KEYSIZE = 32;
 
 /** An encryption class for AES-256. */
 class AES256Encrypt
diff --git a/depend/bitcoin/src/crypto/hkdf_sha256_32.h b/depend/bitcoin/src/crypto/hkdf_sha256_32.h
index 7c5d5a7f..ec705042 100644
--- a/depend/bitcoin/src/crypto/hkdf_sha256_32.h
+++ b/depend/bitcoin/src/crypto/hkdf_sha256_32.h
@@ -13,7 +13,7 @@ class CHKDF_HMAC_SHA256_L32
 {
 private:
     unsigned char m_prk[32];
-    static const size_t OUTPUT_SIZE = 32;
+    static constexpr size_t OUTPUT_SIZE{32};
 
 public:
     CHKDF_HMAC_SHA256_L32(const unsigned char* ikm, size_t ikmlen, const std::string& salt);
diff --git a/depend/bitcoin/src/crypto/hmac_sha256.cpp b/depend/bitcoin/src/crypto/hmac_sha256.cpp
index a95ef708..0796bbeb 100644
--- a/depend/bitcoin/src/crypto/hmac_sha256.cpp
+++ b/depend/bitcoin/src/crypto/hmac_sha256.cpp
@@ -5,6 +5,7 @@
 #include <crypto/hmac_sha256.h>
 
 #include <crypto/sha256.h>
+#include <support/cleanse.h>
 
 #include <cstring>
 
@@ -26,6 +27,8 @@ CHMAC_SHA256::CHMAC_SHA256(const unsigned char* key, size_t keylen)
     for (int n = 0; n < 64; n++)
         rkey[n] ^= 0x5c ^ 0x36;
     inner.Write(rkey, 64);
+
+    memory_cleanse(rkey, sizeof(rkey));
 }
 
 void CHMAC_SHA256::Finalize(unsigned char hash[OUTPUT_SIZE])
@@ -33,4 +36,5 @@ void CHMAC_SHA256::Finalize(unsigned char hash[OUTPUT_SIZE])
     unsigned char temp[32];
     inner.Finalize(temp);
     outer.Write(temp, 32).Finalize(hash);
+    memory_cleanse(temp, sizeof(temp));
 }
diff --git a/depend/bitcoin/src/crypto/hmac_sha256.h b/depend/bitcoin/src/crypto/hmac_sha256.h
index a26947d5..0bf424c9 100644
--- a/depend/bitcoin/src/crypto/hmac_sha256.h
+++ b/depend/bitcoin/src/crypto/hmac_sha256.h
@@ -17,7 +17,7 @@ class CHMAC_SHA256
     CSHA256 inner;
 
 public:
-    static const size_t OUTPUT_SIZE = 32;
+    static constexpr size_t OUTPUT_SIZE{32};
 
     CHMAC_SHA256(const unsigned char* key, size_t keylen);
     CHMAC_SHA256& Write(const unsigned char* data, size_t len)
diff --git a/depend/bitcoin/src/crypto/hmac_sha512.cpp b/depend/bitcoin/src/crypto/hmac_sha512.cpp
index f37e709d..0a9d1041 100644
--- a/depend/bitcoin/src/crypto/hmac_sha512.cpp
+++ b/depend/bitcoin/src/crypto/hmac_sha512.cpp
@@ -5,6 +5,7 @@
 #include <crypto/hmac_sha512.h>
 
 #include <crypto/sha512.h>
+#include <support/cleanse.h>
 
 #include <cstring>
 
@@ -26,6 +27,8 @@ CHMAC_SHA512::CHMAC_SHA512(const unsigned char* key, size_t keylen)
     for (int n = 0; n < 128; n++)
         rkey[n] ^= 0x5c ^ 0x36;
     inner.Write(rkey, 128);
+
+    memory_cleanse(rkey, sizeof(rkey));
 }
 
 void CHMAC_SHA512::Finalize(unsigned char hash[OUTPUT_SIZE])
@@ -33,4 +36,5 @@ void CHMAC_SHA512::Finalize(unsigned char hash[OUTPUT_SIZE])
     unsigned char temp[64];
     inner.Finalize(temp);
     outer.Write(temp, 64).Finalize(hash);
+    memory_cleanse(temp, sizeof(temp));
 }
diff --git a/depend/bitcoin/src/crypto/hmac_sha512.h b/depend/bitcoin/src/crypto/hmac_sha512.h
index dfae8d05..adcfb681 100644
--- a/depend/bitcoin/src/crypto/hmac_sha512.h
+++ b/depend/bitcoin/src/crypto/hmac_sha512.h
@@ -17,7 +17,7 @@ class CHMAC_SHA512
     CSHA512 inner;
 
 public:
-    static const size_t OUTPUT_SIZE = 64;
+    static constexpr size_t OUTPUT_SIZE{64};
 
     CHMAC_SHA512(const unsigned char* key, size_t keylen);
     CHMAC_SHA512& Write(const unsigned char* data, size_t len)
diff --git a/depend/bitcoin/src/crypto/ripemd160.h b/depend/bitcoin/src/crypto/ripemd160.h
index a06a3255..45afc419 100644
--- a/depend/bitcoin/src/crypto/ripemd160.h
+++ b/depend/bitcoin/src/crypto/ripemd160.h
@@ -17,7 +17,7 @@ class CRIPEMD160
     uint64_t bytes{0};
 
 public:
-    static const size_t OUTPUT_SIZE = 20;
+    static constexpr size_t OUTPUT_SIZE{20};
 
     CRIPEMD160();
     CRIPEMD160& Write(const unsigned char* data, size_t len);
diff --git a/depend/bitcoin/src/crypto/sha1.h b/depend/bitcoin/src/crypto/sha1.h
index fcb96ee6..1327ccfa 100644
--- a/depend/bitcoin/src/crypto/sha1.h
+++ b/depend/bitcoin/src/crypto/sha1.h
@@ -17,7 +17,7 @@ class CSHA1
     uint64_t bytes{0};
 
 public:
-    static const size_t OUTPUT_SIZE = 20;
+    static constexpr size_t OUTPUT_SIZE = 20;
 
     CSHA1();
     CSHA1& Write(const unsigned char* data, size_t len);
diff --git a/depend/bitcoin/src/crypto/sha256.h b/depend/bitcoin/src/crypto/sha256.h
index 3ac771c5..de47991e 100644
--- a/depend/bitcoin/src/crypto/sha256.h
+++ b/depend/bitcoin/src/crypto/sha256.h
@@ -18,7 +18,7 @@ class CSHA256
     uint64_t bytes{0};
 
 public:
-    static const size_t OUTPUT_SIZE = 32;
+    static constexpr size_t OUTPUT_SIZE{32};
 
     CSHA256();
     CSHA256& Write(const unsigned char* data, size_t len);
diff --git a/depend/bitcoin/src/crypto/sha256_arm_shani.cpp b/depend/bitcoin/src/crypto/sha256_arm_shani.cpp
index 2eaa6655..d2290030 100644
--- a/depend/bitcoin/src/crypto/sha256_arm_shani.cpp
+++ b/depend/bitcoin/src/crypto/sha256_arm_shani.cpp
@@ -40,7 +40,7 @@ alignas(uint32x4_t) static constexpr std::array<uint32_t, 64> K =
 namespace sha256_arm_shani {
 void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks)
 {
-    uint32x4_t STATE0, STATE1, ABEF_SAVE, CDGH_SAVE;
+    uint32x4_t STATE0, STATE1, ABCD_SAVE, EFGH_SAVE;
     uint32x4_t MSG0, MSG1, MSG2, MSG3;
     uint32x4_t TMP0, TMP2;
 
@@ -51,8 +51,8 @@ void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks)
     while (blocks--)
     {
         // Save state
-        ABEF_SAVE = STATE0;
-        CDGH_SAVE = STATE1;
+        ABCD_SAVE = STATE0;
+        EFGH_SAVE = STATE1;
 
         // Load and convert input chunk to Big Endian
         MSG0 = vreinterpretq_u32_u8(vrev32q_u8(vld1q_u8(chunk + 0)));
@@ -186,8 +186,8 @@ void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks)
         STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
 
         // Update state
-        STATE0 = vaddq_u32(STATE0, ABEF_SAVE);
-        STATE1 = vaddq_u32(STATE1, CDGH_SAVE);
+        STATE0 = vaddq_u32(STATE0, ABCD_SAVE);
+        STATE1 = vaddq_u32(STATE1, EFGH_SAVE);
     }
 
     // Save final state
@@ -235,7 +235,7 @@ void Transform_2way(unsigned char* output, const unsigned char* input)
     /* Padding processed in the 3rd transform (byteswapped). */
     alignas(uint32x4_t) static constexpr std::array<uint32_t, 8> FINAL = {0x80000000, 0, 0, 0, 0, 0, 0, 0x100};
 
-    uint32x4_t STATE0A, STATE0B, STATE1A, STATE1B, ABEF_SAVEA, ABEF_SAVEB, CDGH_SAVEA, CDGH_SAVEB;
+    uint32x4_t STATE0A, STATE0B, STATE1A, STATE1B, ABCD_SAVEA, ABCD_SAVEB, EFGH_SAVEA, EFGH_SAVEB;
     uint32x4_t MSG0A, MSG0B, MSG1A, MSG1B, MSG2A, MSG2B, MSG3A, MSG3B;
     uint32x4_t TMP0A, TMP0B, TMP2A, TMP2B, TMP;
 
@@ -488,10 +488,10 @@ void Transform_2way(unsigned char* output, const unsigned char* input)
     STATE1B = vaddq_u32(STATE1B, TMP);
 
     // Transform 2: Save state
-    ABEF_SAVEA = STATE0A;
-    ABEF_SAVEB = STATE0B;
-    CDGH_SAVEA = STATE1A;
-    CDGH_SAVEB = STATE1B;
+    ABCD_SAVEA = STATE0A;
+    ABCD_SAVEB = STATE0B;
+    EFGH_SAVEA = STATE1A;
+    EFGH_SAVEB = STATE1B;
 
     // Transform 2: Rounds 1-4
     TMP = vld1q_u32(&MIDS[0]);
@@ -638,10 +638,10 @@ void Transform_2way(unsigned char* output, const unsigned char* input)
     STATE1B = vsha256h2q_u32(STATE1B, TMP2B, TMP);
 
     // Transform 2: Update state
-    STATE0A = vaddq_u32(STATE0A, ABEF_SAVEA);
-    STATE0B = vaddq_u32(STATE0B, ABEF_SAVEB);
-    STATE1A = vaddq_u32(STATE1A, CDGH_SAVEA);
-    STATE1B = vaddq_u32(STATE1B, CDGH_SAVEB);
+    STATE0A = vaddq_u32(STATE0A, ABCD_SAVEA);
+    STATE0B = vaddq_u32(STATE0B, ABCD_SAVEB);
+    STATE1A = vaddq_u32(STATE1A, EFGH_SAVEA);
+    STATE1B = vaddq_u32(STATE1B, EFGH_SAVEB);
 
     // Transform 3: Pad previous output
     MSG0A = STATE0A;
diff --git a/depend/bitcoin/src/crypto/sha256_sse4.cpp b/depend/bitcoin/src/crypto/sha256_sse4.cpp
index 2d37d124..4464ec92 100644
--- a/depend/bitcoin/src/crypto/sha256_sse4.cpp
+++ b/depend/bitcoin/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,
diff --git a/depend/bitcoin/src/crypto/siphash.cpp b/depend/bitcoin/src/crypto/siphash.cpp
index 89dbad6f..333fad27 100644
--- a/depend/bitcoin/src/crypto/siphash.cpp
+++ b/depend/bitcoin/src/crypto/siphash.cpp
@@ -6,64 +6,36 @@
 
 #include <uint256.h>
 
-#include <bit>
 #include <cassert>
 #include <span>
 
-#define SIPROUND do { \
-    v0 += v1; v1 = std::rotl(v1, 13); v1 ^= v0; \
-    v0 = std::rotl(v0, 32); \
-    v2 += v3; v3 = std::rotl(v3, 16); v3 ^= v2; \
-    v0 += v3; v3 = std::rotl(v3, 21); v3 ^= v0; \
-    v2 += v1; v1 = std::rotl(v1, 17); v1 ^= v2; \
-    v2 = std::rotl(v2, 32); \
-} while (0)
-
 CSipHasher::CSipHasher(uint64_t k0, uint64_t k1) : m_state{k0, k1} {}
 
 CSipHasher& CSipHasher::Write(uint64_t data)
 {
-    uint64_t v0 = m_state.v[0], v1 = m_state.v[1], v2 = m_state.v[2], v3 = m_state.v[3];
-
     assert(m_count % 8 == 0);
-
-    v3 ^= data;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= data;
-
-    m_state.v[0] = v0;
-    m_state.v[1] = v1;
-    m_state.v[2] = v2;
-    m_state.v[3] = v3;
-
+    m_state.Compress2(data);
     m_count += 8;
     return *this;
 }
 
 CSipHasher& CSipHasher::Write(std::span<const unsigned char> data)
 {
-    uint64_t v0 = m_state.v[0], v1 = m_state.v[1], v2 = m_state.v[2], v3 = m_state.v[3];
-    uint64_t t = m_tmp;
-    uint8_t c = m_count;
+    SipHashState state{m_state.Copy()};
+    uint64_t t{m_tmp};
+    uint8_t c{m_count};
 
     while (data.size() > 0) {
         t |= uint64_t{data.front()} << (8 * (c % 8));
         c++;
         if ((c & 7) == 0) {
-            v3 ^= t;
-            SIPROUND;
-            SIPROUND;
-            v0 ^= t;
+            state.Compress2(t);
             t = 0;
         }
         data = data.subspan(1);
     }
 
-    m_state.v[0] = v0;
-    m_state.v[1] = v1;
-    m_state.v[2] = v2;
-    m_state.v[3] = v3;
+    m_state = state;
     m_count = c;
     m_tmp = t;
 
@@ -72,91 +44,46 @@ CSipHasher& CSipHasher::Write(std::span<const unsigned char> data)
 
 uint64_t CSipHasher::Finalize() const
 {
-    uint64_t v0 = m_state.v[0], v1 = m_state.v[1], v2 = m_state.v[2], v3 = m_state.v[3];
+    return m_state.Copy()
+                  .Compress2(m_tmp | (uint64_t{m_count} << 56))
+                  .Finalize4();
+}
 
-    uint64_t t = m_tmp | (((uint64_t)m_count) << 56);
+SipHasher13UJ& SipHasher13UJ::Write(uint64_t data) noexcept
+{
+    m_state.Compress1(data);
+    return *this;
+}
 
-    v3 ^= t;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= t;
-    v2 ^= 0xFF;
-    SIPROUND;
-    SIPROUND;
-    SIPROUND;
-    SIPROUND;
-    return v0 ^ v1 ^ v2 ^ v3;
+SipHasher13UJ& SipHasher13UJ::WriteJumbo(const uint256& hash) noexcept
+{
+    m_state.Compress1Jumbo(hash);
+    return *this;
 }
 
-uint64_t PresaltedSipHasher::operator()(const uint256& val) const noexcept
+uint64_t SipHasher13UJ::Finalize() const noexcept
 {
-    uint64_t v0 = m_state.v[0], v1 = m_state.v[1], v2 = m_state.v[2], v3 = m_state.v[3];
-    uint64_t d = val.GetUint64(0);
-    v3 ^= d;
+    return m_state.Copy().Finalize3U();
+}
 
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = val.GetUint64(1);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = val.GetUint64(2);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = val.GetUint64(3);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    v3 ^= (uint64_t{4}) << 59;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= (uint64_t{4}) << 59;
-    v2 ^= 0xFF;
-    SIPROUND;
-    SIPROUND;
-    SIPROUND;
-    SIPROUND;
-    return v0 ^ v1 ^ v2 ^ v3;
+uint64_t PresaltedSipHasher::operator()(const uint256& val) const noexcept
+{
+    return m_state.Copy()
+                  .Compress2(val.GetUint64(0))
+                  .Compress2(val.GetUint64(1))
+                  .Compress2(val.GetUint64(2))
+                  .Compress2(val.GetUint64(3))
+                  .Compress2(uint64_t{32} << 56)
+                  .Finalize4();
 }
 
-/** Specialized implementation for efficiency */
 uint64_t PresaltedSipHasher::operator()(const uint256& val, uint32_t extra) const noexcept
 {
-    uint64_t v0 = m_state.v[0], v1 = m_state.v[1], v2 = m_state.v[2], v3 = m_state.v[3];
-    uint64_t d = val.GetUint64(0);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = val.GetUint64(1);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = val.GetUint64(2);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = val.GetUint64(3);
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    d = ((uint64_t{36}) << 56) | extra;
-    v3 ^= d;
-    SIPROUND;
-    SIPROUND;
-    v0 ^= d;
-    v2 ^= 0xFF;
-    SIPROUND;
-    SIPROUND;
-    SIPROUND;
-    SIPROUND;
-    return v0 ^ v1 ^ v2 ^ v3;
+    return m_state.Copy()
+                  .Compress2(val.GetUint64(0))
+                  .Compress2(val.GetUint64(1))
+                  .Compress2(val.GetUint64(2))
+                  .Compress2(val.GetUint64(3))
+                  .Compress2((uint64_t{36} << 56) | extra)
+                  .Finalize4();
 }
diff --git a/depend/bitcoin/src/crypto/siphash.h b/depend/bitcoin/src/crypto/siphash.h
index 2f28473a..f7b9e051 100644
--- a/depend/bitcoin/src/crypto/siphash.h
+++ b/depend/bitcoin/src/crypto/siphash.h
@@ -5,21 +5,93 @@
 #ifndef BITCOIN_CRYPTO_SIPHASH_H
 #define BITCOIN_CRYPTO_SIPHASH_H
 
-#include <array>
+#include <attributes.h>
+#include <uint256.h>
+
+#include <bit>
 #include <cstdint>
 #include <span>
 
-class uint256;
-
-/** Shared SipHash internal state v[0..3], initialized from (k0, k1). */
+/** Shared SipHash state (v0..v3) with its round, compression, and finalization primitives.
+ *  Internal building block, only meant to be composed by the hasher classes below. */
 class SipHashState
 {
-    static constexpr uint64_t C0{0x736f6d6570736575ULL}, C1{0x646f72616e646f6dULL}, C2{0x6c7967656e657261ULL}, C3{0x7465646279746573ULL};
+    /** SipHash initialization constants. */
+    static constexpr uint64_t C0{0x736f6d6570736575}, C1{0x646f72616e646f6d}, C2{0x6c7967656e657261}, C3{0x7465646279746573};
+    /** SipHash v2 finalizer constant. */
+    static constexpr uint64_t FINALIZER{0xFF};
+    /** SipHash custom unpadded finalizer constant. */
+    static constexpr uint64_t FINALIZER_UNPADDED{0x6465646461706e75};
+    static_assert(FINALIZER_UNPADDED != FINALIZER);
 
-public:
-    explicit SipHashState(uint64_t k0, uint64_t k1) noexcept : v{C0 ^ k0, C1 ^ k1, C2 ^ k0, C3 ^ k1} {}
+    /** Construct a SipHashState with the specified values as state. */
+    ALWAYS_INLINE SipHashState(uint64_t v0, uint64_t v1, uint64_t v2, uint64_t v3) noexcept : m_v0{v0}, m_v1{v1}, m_v2{v2}, m_v3{v3} {}
 
-    std::array<uint64_t, 4> v{};
+    /** State variables. */
+    uint64_t m_v0, m_v1, m_v2, m_v3;
+
+    /** Mutably perform one SipRound on this state. */
+    ALWAYS_INLINE void SipRound() noexcept
+    {
+        m_v0 += m_v1; m_v1 = std::rotl(m_v1, 13); m_v1 ^= m_v0;
+        m_v0 = std::rotl(m_v0, 32);
+        m_v2 += m_v3; m_v3 = std::rotl(m_v3, 16); m_v3 ^= m_v2;
+        m_v0 += m_v3; m_v3 = std::rotl(m_v3, 21); m_v3 ^= m_v0;
+        m_v2 += m_v1; m_v1 = std::rotl(m_v1, 17); m_v1 ^= m_v2;
+        m_v2 = std::rotl(m_v2, 32);
+    }
+
+public:
+    /** Construct a SipHashState initialized with the specified key. */
+    explicit ALWAYS_INLINE SipHashState(uint64_t k0, uint64_t k1) noexcept : SipHashState{C0 ^ k0, C1 ^ k1, C2 ^ k0, C3 ^ k1} {}
+    /** Construct a copy of this state. */
+    ALWAYS_INLINE SipHashState Copy() const noexcept { return {m_v0, m_v1, m_v2, m_v3}; }
+    /** Mutably compress one block into this state, with 1 SipRound. */
+    ALWAYS_INLINE SipHashState& Compress1(uint64_t data) noexcept
+    {
+        m_v3 ^= data;
+        SipRound();
+        m_v0 ^= data;
+        return *this;
+    }
+    /** Mutably compress one jumbo block into this state, with 1 SipRound. */
+    ALWAYS_INLINE SipHashState& Compress1Jumbo(const uint256& data) noexcept
+    {
+        const uint64_t d0{data.GetUint64(0)}, d1{data.GetUint64(1)}, d2{data.GetUint64(2)}, d3{data.GetUint64(3)};
+        m_v3 ^= d0; m_v0 ^= d1; m_v1 ^= d2; m_v2 ^= d3;
+        SipRound();
+        m_v0 ^= d0; m_v1 ^= d1; m_v2 ^= d2; m_v3 ^= d3;
+        return *this;
+    }
+    /** Mutably compress one block into this state, with 2 SipRounds. */
+    ALWAYS_INLINE SipHashState& Compress2(uint64_t data) noexcept
+    {
+        m_v3 ^= data;
+        SipRound();
+        SipRound();
+        m_v0 ^= data;
+        return *this;
+    }
+    /** Mutably finalize this state with 4 SipRounds, and return the resulting hash. */
+    ALWAYS_INLINE uint64_t Finalize4() noexcept
+    {
+        m_v2 ^= FINALIZER;
+        SipRound();
+        SipRound();
+        SipRound();
+        SipRound();
+        return m_v0 ^ m_v1 ^ m_v2 ^ m_v3;
+    }
+    /** Mutably finalize this state with 3 SipRounds using the unpadded finalizer, and return the
+     *  resulting hash. */
+    ALWAYS_INLINE uint64_t Finalize3U() noexcept
+    {
+        m_v2 ^= FINALIZER_UNPADDED;
+        SipRound();
+        SipRound();
+        SipRound();
+        return m_v0 ^ m_v1 ^ m_v2 ^ m_v3;
+    }
 };
 
 /** General SipHash-2-4 implementation. */
@@ -43,10 +115,87 @@ class CSipHasher
     uint64_t Finalize() const;
 };
 
+/** A custom weaker variant of SipHash-1-3 without padding, and supporting "jumbo" inputs.
+ *
+ * Compared to the traditional SipHash-2-4, this incorporates 3 changes:
+ *
+ * - Use SipHash-1-3: This common variant reduces the number of rounds between input blocks from 2
+ *                    to 1, and the number of finalization rounds at the end from 4 to 3.
+ *                    It is a standard faster choice with weaker security guarantees. It is
+ *                    considered strong enough for use in hash tables and other applications with
+ *                    only weak security requirements, in particular when attackers cannot directly
+ *                    observe the hash function output, and cannot control k0 and k1.
+ *
+ * - Remove padding: Standard SipHash operates on byte-oriented inputs, which are converted into
+ *                   8-byte blocks internally by adding a padding of 1-8 bytes to obtain a multiple
+ *                   of 8 bytes. In this variant, the input is a sequence of blocks instead, which
+ *                   are used without padding. This saves 1 round for inputs that are a multiple of
+ *                   8 bytes already. The padding normally adds a commitment to the input's byte
+ *                   length, but since our input is block oriented, and there is one round per
+ *                   input, the function of that commitment is directly fulfilled by the number of
+ *                   rounds. The empty input is permitted; it yields the result of finalizing the
+ *                   initialization directly. Out of an abundance of caution the finalizing
+ *                   v2 ^= 0xff is changed to v2 ^= 0x6465646461706e75 ("unpadded" in LE64), to
+ *                   avoid collisions between standard SipHash-1-3 and this variant.
+ *
+ * - Jumbo blocks: We generalize the input to consist of a sequence of blocks which are each either
+ *                 exactly 8 bytes (normal blocks) or 32 bytes (jumbo blocks), and may be
+ *                 arbitrarily mixed. For hash-table use, cryptographic hash outputs must make up
+ *                 all but a small bounded number of retained jumbo blocks. Note that the block
+ *                 structure matters: hashing one jumbo block is not the same as hashing the same
+ *                 data split up into four normal blocks. Jumbo blocks are interpreted as 4 LE64 integers
+ *                 (d0,d1,d2,d3), and XOR'ed into the state before a round as
+ *                 (v0,v1,v2,v3) ^= (d1,d2,d3,d0), and XOR'ed into the state after a round as
+ *                 (v0,v1,v2,v3) ^= (d0,d1,d2,d3). This is a strict generalization of normal block
+ *                 processing, in the sense that if d1..d3=0, it is identical to processing a normal
+ *                 block d0 (a single LE64 integer). Of course, making d1..d3=0 should be impossible
+ *                 in the output of a cryptographic hash function. These jumbo blocks are acceptable
+ *                 because even though they may give the attacker more control within a single
+ *                 round, that control is limited by the cryptographic hash in between.
+ *
+ * Other components are unchanged: initialization constants, SipRound, and 64-bit output.
+ * This interface serves as an executable specification for fixed-width implementations.
+ * The Hash overloads optimize fixed-width inputs without modifying the accumulated state.
+ */
+class SipHasher13UJ
+{
+    SipHashState m_state;
+
+public:
+    /** Construct a SipHash-1-3-UJ calculator initialized with 128-bit key (k0, k1). */
+    SipHasher13UJ(uint64_t k0, uint64_t k1) noexcept : m_state{k0, k1} {}
+    /** Hash a normal 64-bit value. */
+    SipHasher13UJ& Write(uint64_t data) noexcept;
+    /** Hash a 256-bit value as a jumbo block. For hash-table use, non-hash inputs must remain few and bounded. */
+    SipHasher13UJ& WriteJumbo(const uint256& hash) noexcept;
+    /** Compute the 64-bit SipHash-1-3-UJ of the data written so far. The object remains untouched. */
+    uint64_t Finalize() const noexcept;
+
+    /** Hash a jumbo block after the data written so far and finalize without modifying the object. */
+    ALWAYS_INLINE uint64_t Hash(const uint256& hash) const noexcept
+    {
+        return m_state.Copy()
+                      .Compress1Jumbo(hash)
+                      .Finalize3U();
+    }
+
+    /**
+     * Hash a jumbo block followed by a normal block after the data written so far,
+     * and finalize without modifying the object.
+     */
+    ALWAYS_INLINE uint64_t Hash(const uint256& hash, uint64_t extra) const noexcept
+    {
+        return m_state.Copy()
+                      .Compress1Jumbo(hash)
+                      .Compress1(extra)
+                      .Finalize3U();
+    }
+};
+
 /**
  * Optimized SipHash-2-4 implementation for uint256.
  *
- * This class caches the initial SipHash v[0..3] state derived from (k0, k1)
+ * This class caches the initial SipHash state (v0..v3) derived from (k0, k1)
  * and implements a specialized hashing path for uint256 values, with or
  * without an extra 32-bit word. The internal state is immutable, so
  * PresaltedSipHasher instances can be reused for multiple hashes with the
diff --git a/depend/bitcoin/src/dbwrapper.cpp b/depend/bitcoin/src/dbwrapper.cpp
index 3c574f89..7406cecc 100644
--- a/depend/bitcoin/src/dbwrapper.cpp
+++ b/depend/bitcoin/src/dbwrapper.cpp
@@ -14,7 +14,6 @@
 #include <leveldb/slice.h>
 #include <leveldb/status.h>
 #include <leveldb/write_batch.h>
-#include <logging.h>
 #include <random.h>
 #include <serialize.h>
 #include <span.h>
@@ -59,7 +58,7 @@ class CBitcoinLevelDBLogger : public leveldb::Logger {
     // This code is adapted from posix_logger.h, which is why it is using vsprintf.
     // Please do not do this in normal code
     void Logv(const char * format, va_list ap) override {
-            if (!LogAcceptCategory(BCLog::LEVELDB, util::log::Level::Debug)) {
+            if (!util::log::ShouldDebugLog(BCLog::LEVELDB)) {
                 return;
             }
             char buffer[500];
@@ -137,12 +136,12 @@ static void SetMaxOpenFiles(leveldb::Options *options) {
              options->max_open_files, default_open_files);
 }
 
-static leveldb::Options GetOptions(size_t nCacheSize)
+static leveldb::Options GetOptions(size_t nCacheSize, bool bloom_filter)
 {
     leveldb::Options options;
     options.block_cache = leveldb::NewLRUCache(nCacheSize / 2);
     options.write_buffer_size = nCacheSize / 4; // up to two write buffers may be held in memory simultaneously
-    options.filter_policy = leveldb::NewBloomFilterPolicy(10);
+    options.filter_policy = bloom_filter ? leveldb::NewBloomFilterPolicy(10) : nullptr;
     options.compression = leveldb::kNoCompression;
     options.info_log = new CBitcoinLevelDBLogger();
     if (leveldb::kMajorVersion > 1 || (leveldb::kMajorVersion == 1 && leveldb::kMinorVersion >= 16)) {
@@ -150,11 +149,34 @@ static leveldb::Options GetOptions(size_t nCacheSize)
         // on corruption in later versions.
         options.paranoid_checks = true;
     }
-    options.max_file_size = std::max(options.max_file_size, DBWRAPPER_MAX_FILE_SIZE);
     SetMaxOpenFiles(&options);
     return options;
 }
 
+bool CDBWrapper::HasKeyStartingWith(const fs::path& path, uint8_t prefix)
+{
+    if (!fs::exists(path / "CURRENT")) return false;
+
+    CBitcoinLevelDBLogger logger;
+    leveldb::Options options;
+    options.paranoid_checks = true;
+    // Avoid creating or rotating LevelDB's LOG files during this probe.
+    options.info_log = &logger;
+
+    leveldb::DB* raw_db;
+    HandleError(leveldb::DB::Open(options, fs::PathToString(path), &raw_db));
+    const std::unique_ptr<leveldb::DB> db{raw_db};
+
+    leveldb::ReadOptions iteroptions;
+    iteroptions.verify_checksums = true;
+    iteroptions.fill_cache = false;
+    const std::unique_ptr<leveldb::Iterator> it{db->NewIterator(iteroptions)};
+    const leveldb::Slice prefix_slice{reinterpret_cast<const char*>(&prefix), sizeof(prefix)};
+    it->Seek(prefix_slice);
+    HandleError(it->status());
+    return it->Valid() && it->key().starts_with(prefix_slice);
+}
+
 struct CDBBatch::WriteBatchImpl {
     leveldb::WriteBatch batch;
 };
@@ -163,6 +185,8 @@ CDBBatch::CDBBatch(const CDBWrapper& _parent)
     : parent{_parent},
       m_impl_batch{std::make_unique<CDBBatch::WriteBatchImpl>()}
 {
+    m_key_scratch.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
+    m_value_scratch.reserve(DBWRAPPER_PREALLOC_VALUE_SIZE);
     Clear();
 };
 
@@ -171,13 +195,15 @@ CDBBatch::~CDBBatch() = default;
 void CDBBatch::Clear()
 {
     m_impl_batch->batch.Clear();
+    assert(m_key_scratch.empty());
+    assert(m_value_scratch.empty());
 }
 
-void CDBBatch::WriteImpl(std::span<const std::byte> key, DataStream& ssValue)
+void CDBBatch::WriteImpl(std::span<const std::byte> key, DataStream& value)
 {
     leveldb::Slice slKey(CharCast(key.data()), key.size());
-    dbwrapper_private::GetObfuscation(parent)(ssValue);
-    leveldb::Slice slValue(CharCast(ssValue.data()), ssValue.size());
+    dbwrapper_private::GetObfuscation(parent)(value);
+    leveldb::Slice slValue(CharCast(value.data()), value.size());
     m_impl_batch->batch.Put(slKey, slValue);
 }
 
@@ -223,18 +249,25 @@ CDBWrapper::CDBWrapper(const DBParams& params)
     DBContext().iteroptions.verify_checksums = true;
     DBContext().iteroptions.fill_cache = false;
     DBContext().syncoptions.sync = true;
-    DBContext().options = GetOptions(params.cache_bytes);
+    DBContext().options = GetOptions(params.cache_bytes, params.bloom_filter);
     DBContext().options.create_if_missing = true;
-    if (params.memory_only) {
+    DBContext().options.max_file_size = params.max_file_size;
+    assert(!(params.testing_env && params.memory_only));
+    if (params.testing_env) {
+        DBContext().options.env = params.testing_env;
+    } else if (params.memory_only) {
         DBContext().penv = leveldb::NewMemEnv(leveldb::Env::Default());
         DBContext().options.env = DBContext().penv;
-    } else {
+    }
+    if (!params.memory_only) {
         if (params.wipe_data) {
             LogInfo("Wiping LevelDB in %s", fs::PathToString(params.path));
             leveldb::Status result = leveldb::DestroyDB(fs::PathToString(params.path), DBContext().options);
             HandleError(result);
         }
-        TryCreateDirectories(params.path);
+        if (!params.testing_env) {
+            TryCreateDirectories(params.path);
+        }
         LogInfo("Opening LevelDB in %s", fs::PathToString(params.path));
     }
     // PathToString() return value is safe to pass to leveldb open function,
@@ -247,7 +280,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));
     }
 
@@ -278,7 +311,7 @@ CDBWrapper::~CDBWrapper()
 
 void CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
 {
-    const bool log_memory = LogAcceptCategory(BCLog::LEVELDB, util::log::Level::Debug);
+    const bool log_memory = util::log::ShouldDebugLog(BCLog::LEVELDB);
     double mem_before = 0;
     if (log_memory) {
         mem_before = DynamicMemoryUsage() / double(1_MiB);
@@ -292,11 +325,18 @@ 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;
+}
+
+void CDBWrapper::CompactFull() { DBContext().pdb->CompactRange(nullptr, nullptr); }
+
 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;
     }
@@ -356,7 +396,10 @@ struct CDBIterator::IteratorImpl {
 };
 
 CDBIterator::CDBIterator(const CDBWrapper& _parent, std::unique_ptr<IteratorImpl> _piter) : parent(_parent),
-                                                                                            m_impl_iter(std::move(_piter)) {}
+                                                                                            m_impl_iter(std::move(_piter))
+{
+    m_scratch.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
+}
 
 CDBIterator* CDBWrapper::NewIterator()
 {
diff --git a/depend/bitcoin/src/dbwrapper.h b/depend/bitcoin/src/dbwrapper.h
index 4710af16..e0046efb 100644
--- a/depend/bitcoin/src/dbwrapper.h
+++ b/depend/bitcoin/src/dbwrapper.h
@@ -12,17 +12,24 @@
 #include <util/byte_units.h>
 #include <util/check.h>
 #include <util/fs.h>
+#include <util/obfuscation.h>
 
 #include <cstddef>
+#include <cstdint>
 #include <exception>
 #include <memory>
 #include <optional>
+#include <span>
 #include <stdexcept>
 #include <string>
 
-static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
-static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
-static const size_t DBWRAPPER_MAX_FILE_SIZE{32_MiB};
+namespace leveldb {
+class Env;
+} // namespace leveldb
+
+inline constexpr size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
+inline constexpr size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
+inline constexpr size_t DBWRAPPER_MAX_FILE_SIZE{32_MiB};
 
 //! User-controlled performance and debug options.
 struct DBOptions {
@@ -35,7 +42,7 @@ struct DBParams {
     //! Location in the filesystem where leveldb data will be stored.
     fs::path path;
     //! Configures various leveldb cache settings.
-    size_t cache_bytes;
+    uint64_t cache_bytes;
     //! If true, use leveldb's memory environment.
     bool memory_only = false;
     //! If true, remove all existing data.
@@ -43,8 +50,16 @@ struct DBParams {
     //! If true, store data obfuscated via simple XOR. If false, XOR with a
     //! zero'd byte array.
     bool obfuscate = false;
+    //! If true, build a LevelDB bloom filter to accelerate point lookups.
+    bool bloom_filter = true;
     //! Passed-through options.
     DBOptions options{};
+    //! If non-null, use this as the leveldb::Env instead of the default.
+    //! Caller retains ownership.
+    leveldb::Env* testing_env = nullptr;
+    //! Maximum LevelDB SST file size. Larger values reduce the frequency
+    //! of compactions but increase their duration.
+    size_t max_file_size = DBWRAPPER_MAX_FILE_SIZE;
 };
 
 class dbwrapper_error : public std::runtime_error
@@ -79,10 +94,10 @@ class CDBBatch
     struct WriteBatchImpl;
     const std::unique_ptr<WriteBatchImpl> m_impl_batch;
 
-    DataStream ssKey{};
-    DataStream ssValue{};
+    DataStream m_key_scratch{};
+    DataStream m_value_scratch{};
 
-    void WriteImpl(std::span<const std::byte> key, DataStream& ssValue);
+    void WriteImpl(std::span<const std::byte> key, DataStream& value);
     void EraseImpl(std::span<const std::byte> key);
 
 public:
@@ -96,22 +111,18 @@ class CDBBatch
     template <typename K, typename V>
     void Write(const K& key, const V& value)
     {
-        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
-        ssValue.reserve(DBWRAPPER_PREALLOC_VALUE_SIZE);
-        ssKey << key;
-        ssValue << value;
-        WriteImpl(ssKey, ssValue);
-        ssKey.clear();
-        ssValue.clear();
+        ScopedDataStreamUsage scoped_key{m_key_scratch}, scoped_value{m_value_scratch};
+        m_key_scratch << key;
+        m_value_scratch << value;
+        WriteImpl(m_key_scratch, m_value_scratch);
     }
 
     template <typename K>
     void Erase(const K& key)
     {
-        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
-        ssKey << key;
-        EraseImpl(ssKey);
-        ssKey.clear();
+        ScopedDataStreamUsage scoped_key{m_key_scratch};
+        m_key_scratch << key;
+        EraseImpl(m_key_scratch);
     }
 
     size_t ApproximateSize() const;
@@ -125,6 +136,7 @@ class CDBIterator
 private:
     const CDBWrapper &parent;
     const std::unique_ptr<IteratorImpl> m_impl_iter;
+    DataStream m_scratch{};
 
     void SeekImpl(std::span<const std::byte> key);
     std::span<const std::byte> GetKeyImpl() const;
@@ -144,10 +156,9 @@ class CDBIterator
     void SeekToFirst();
 
     template<typename K> void Seek(const K& key) {
-        DataStream ssKey{};
-        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
-        ssKey << key;
-        SeekImpl(ssKey);
+        ScopedDataStreamUsage scoped_scratch{m_scratch};
+        m_scratch << key;
+        SeekImpl(m_scratch);
     }
 
     void Next();
@@ -164,9 +175,10 @@ class CDBIterator
 
     template<typename V> bool GetValue(V& value) {
         try {
-            DataStream ssValue{GetValueImpl()};
-            dbwrapper_private::GetObfuscation(parent)(ssValue);
-            ssValue >> value;
+            ScopedDataStreamUsage scoped_scratch{m_scratch};
+            m_scratch.write(GetValueImpl());
+            dbwrapper_private::GetObfuscation(parent)(m_scratch);
+            m_scratch >> value;
         } catch (const std::exception&) {
             return false;
         }
@@ -251,6 +263,12 @@ class CDBWrapper
 
     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;
+
     // Get an estimate of LevelDB memory usage (in bytes).
     size_t DynamicMemoryUsage() const;
 
@@ -261,6 +279,11 @@ class CDBWrapper
      */
     bool IsEmpty();
 
+    //! Probe an unopened database for a key prefix. Return true if a database at
+    //! path exists and contains at least 1 entry beginning with prefix; missing
+    //! or empty databases return false, and database errors throw dbwrapper_error.
+    static bool HasKeyStartingWith(const fs::path& path, uint8_t prefix);
+
     template<typename K>
     size_t EstimateSize(const K& key_begin, const K& key_end) const
     {
diff --git a/depend/bitcoin/src/dummywallet.cpp b/depend/bitcoin/src/dummywallet.cpp
index 24952fea..27e23800 100644
--- a/depend/bitcoin/src/dummywallet.cpp
+++ b/depend/bitcoin/src/dummywallet.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <common/args.h>
-#include <logging.h>
+#include <util/log.h>
 #include <walletinitinterface.h>
 
 class ArgsManager;
diff --git a/depend/bitcoin/src/external_signer.cpp b/depend/bitcoin/src/external_signer.cpp
index 3790f4d3..cb49cedc 100644
--- a/depend/bitcoin/src/external_signer.cpp
+++ b/depend/bitcoin/src/external_signer.cpp
@@ -48,12 +48,15 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
             throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command));
         }
         const std::string& fingerprintStr{fingerprint.get_str()};
+        if (fingerprintStr.size() != 8 || !IsHex(fingerprintStr)) {
+            throw std::runtime_error(strprintf("'%s' received invalid fingerprint, must be 8 hex characters", command));
+        }
         // Skip duplicate signer
         bool duplicate = false;
         for (const ExternalSigner& signer : signers) {
             if (signer.m_fingerprint.compare(fingerprintStr) == 0) duplicate = true;
         }
-        if (duplicate) break;
+        if (duplicate) continue;
         std::string name;
         const UniValue& model_field = signer.find_value("model");
         if (model_field.isStr() && model_field.getValStr() != "") {
@@ -112,14 +115,13 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
         return false;
     }
 
-    PartiallySignedTransaction signer_psbtx;
-    std::string signer_psbt_error;
-    if (!DecodeBase64PSBT(signer_psbtx, signer_result.find_value("psbt").get_str(), signer_psbt_error)) {
-        error = strprintf("TX decode failed %s", signer_psbt_error);
+    util::Result<PartiallySignedTransaction> signer_psbtx = DecodeBase64PSBT(signer_result.find_value("psbt").get_str());
+    if (!signer_psbtx) {
+        error = strprintf("TX decode failed %s", util::ErrorString(signer_psbtx).original);
         return false;
     }
 
-    psbtx = signer_psbtx;
+    psbtx = *signer_psbtx;
 
     return true;
 }
diff --git a/depend/bitcoin/src/external_signer.h b/depend/bitcoin/src/external_signer.h
index 5ba37c06..5131a207 100644
--- a/depend/bitcoin/src/external_signer.h
+++ b/depend/bitcoin/src/external_signer.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-struct PartiallySignedTransaction;
+class PartiallySignedTransaction;
 
 //! Enables interaction with an external signing device or service, such as
 //! a hardware wallet. See doc/external-signer.md
@@ -29,7 +29,7 @@ class ExternalSigner
 public:
     //! @param[in] command      the command which handles interaction with the external signer
     //! @param[in] fingerprint  master key fingerprint of the signer
-    //! @param[in] chain        "main", "test", "regtest" or "signet"
+    //! @param[in] chain        "main", "test", "signet", "regtest" or "testnet4"
     //! @param[in] name         device name
     ExternalSigner(std::vector<std::string> command, std::string chain, std::string fingerprint, std::string name);
 
@@ -42,23 +42,26 @@ class ExternalSigner
     //! Obtain a list of signers. Calls `<command> enumerate`.
     //! @param[in]              command the command which handles interaction with the external signer
     //! @param[in,out] signers  vector to which new signers (with a unique master key fingerprint) are added
-    //! @param chain            "main", "test", "regtest" or "signet"
+    //! @param chain            "main", "test", "signet", "regtest" or "testnet4"
     //! @returns success
     static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, const std::string& chain);
 
-    //! Display address on the device. Calls `<command> displayaddress --desc <descriptor>`.
+    //! Display address on the device. Calls `<command> --fingerprint <fingerprint> --chain <chain>
+    //! displayaddress --desc <descriptor>`.
     //! @param[in] descriptor Descriptor specifying which address to display.
     //!            Must include a public key or xpub, as well as key origin.
     UniValue DisplayAddress(const std::string& descriptor) const;
 
     //! Get receive and change Descriptor(s) from device for a given account.
-    //! Calls `<command> getdescriptors --account <account>`
+    //! Calls `<command> --fingerprint <fingerprint> --chain <chain> getdescriptors
+    //! --account <account>`.
     //! @param[in] account  which BIP32 account to use (e.g. `m/44'/0'/account'`)
     //! @returns see doc/external-signer.md
     UniValue GetDescriptors(int account);
 
     //! Sign PartiallySignedTransaction on the device.
-    //! Calls `<command> signtransaction` and passes the PSBT via stdin.
+    //! Calls `<command> --stdin --fingerprint <fingerprint> --chain <chain>` and passes the
+    //! `signtx` command and PSBT via stdin.
     //! @param[in,out] psbt  PartiallySignedTransaction to be signed
     bool SignTransaction(PartiallySignedTransaction& psbt, std::string& error);
 };
diff --git a/depend/bitcoin/src/hash.h b/depend/bitcoin/src/hash.h
index 34486af6..eabcf18b 100644
--- a/depend/bitcoin/src/hash.h
+++ b/depend/bitcoin/src/hash.h
@@ -13,19 +13,27 @@
 #include <prevector.h>
 #include <serialize.h>
 #include <span.h>
+#include <support/cleanse.h>
 #include <uint256.h>
 
 #include <string>
 #include <vector>
 
-typedef uint256 ChainCode;
+/** A BIP32 chain code. Cleansed on destruction. */
+class ChainCode : public base_blob<256> {
+public:
+    constexpr ChainCode() = default;
+    constexpr explicit ChainCode(std::span<const unsigned char> vch) : base_blob<256>(vch) {}
+    constexpr explicit ChainCode(const base_blob<256>& b) : base_blob<256>(b) {}
+    ~ChainCode() { memory_cleanse(data(), size()); }
+};
 
 /** A hasher class for Bitcoin's 256-bit hash (double SHA-256). */
 class CHash256 {
 private:
     CSHA256 sha;
 public:
-    static const size_t OUTPUT_SIZE = CSHA256::OUTPUT_SIZE;
+    static constexpr size_t OUTPUT_SIZE{CSHA256::OUTPUT_SIZE};
 
     void Finalize(std::span<unsigned char> output) {
         assert(output.size() == OUTPUT_SIZE);
@@ -50,7 +58,7 @@ class CHash160 {
 private:
     CSHA256 sha;
 public:
-    static const size_t OUTPUT_SIZE = CRIPEMD160::OUTPUT_SIZE;
+    static constexpr size_t OUTPUT_SIZE{CRIPEMD160::OUTPUT_SIZE};
 
     void Finalize(std::span<unsigned char> output) {
         assert(output.size() == OUTPUT_SIZE);
diff --git a/depend/bitcoin/src/headerssync.cpp b/depend/bitcoin/src/headerssync.cpp
index 039e7f68..633ffef5 100644
--- a/depend/bitcoin/src/headerssync.cpp
+++ b/depend/bitcoin/src/headerssync.cpp
@@ -4,9 +4,9 @@
 
 #include <headerssync.h>
 
-#include <logging.h>
 #include <pow.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/time.h>
 #include <util/vector.h>
 
diff --git a/depend/bitcoin/src/httprpc.cpp b/depend/bitcoin/src/httprpc.cpp
index 9a076996..ed068a34 100644
--- a/depend/bitcoin/src/httprpc.cpp
+++ b/depend/bitcoin/src/httprpc.cpp
@@ -7,12 +7,12 @@
 #include <common/args.h>
 #include <crypto/hmac_sha256.h>
 #include <httpserver.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <walletinitinterface.h>
@@ -26,6 +26,7 @@
 #include <string>
 #include <vector>
 
+using http_bitcoin::HTTPRequest;
 using util::SplitString;
 using util::TrimStringView;
 
@@ -196,7 +197,7 @@ UniValue ExecuteHTTPRPC(const UniValue& valRequest, JSONRPCRequest& jreq, HTTPSt
 static void HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
 {
     // JSONRPC handles only POST
-    if (req->GetRequestMethod() != HTTPRequest::POST) {
+    if (req->GetRequestMethod() != HTTPRequestMethod::POST) {
         req->WriteReply(HTTP_BAD_METHOD, "JSONRPC server handles only POST requests");
         return;
     }
@@ -347,8 +348,6 @@ bool StartHTTPRPC(const std::any& context)
     if (g_wallet_init_interface.HasWalletSupport()) {
         RegisterHTTPHandler("/wallet/", false, handle_rpc);
     }
-    struct event_base* eventBase = EventBase();
-    assert(eventBase);
     return true;
 }
 
diff --git a/depend/bitcoin/src/httpserver.cpp b/depend/bitcoin/src/httpserver.cpp
index b84f0da0..f78e5071 100644
--- a/depend/bitcoin/src/httpserver.cpp
+++ b/depend/bitcoin/src/httpserver.cpp
@@ -2,32 +2,39 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <bitcoin-build-config.h> // IWYU pragma: keep
+
 #include <httpserver.h>
 
 #include <chainparamsbase.h>
 #include <common/args.h>
 #include <common/messages.h>
+#include <common/url.h>
 #include <compat/compat.h>
 #include <logging.h>
 #include <netbase.h>
 #include <node/interface_ui.h>
 #include <rpc/protocol.h>
+#include <span.h>
 #include <sync.h>
 #include <util/check.h>
 #include <util/signalinterrupt.h>
+#include <util/sock.h>
 #include <util/strencodings.h>
+#include <util/thread.h>
 #include <util/threadnames.h>
 #include <util/threadpool.h>
+#include <util/time.h>
 #include <util/translation.h>
 
 #include <condition_variable>
 #include <cstdio>
 #include <cstdlib>
-#include <deque>
 #include <memory>
 #include <optional>
 #include <span>
 #include <string>
+#include <string_view>
 #include <thread>
 #include <unordered_map>
 #include <vector>
@@ -35,20 +42,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/http.h>
-#include <event2/http_struct.h>
-#include <event2/keyvalq_struct.h>
-#include <event2/thread.h>
-#include <event2/util.h>
+//! The set of sockets cannot be modified while waiting, so
+//! the sleep time needs to be small to avoid new sockets stalling.
+static constexpr auto SELECT_TIMEOUT{50ms};
 
-#include <support/events.h>
+//! Explicit alias for setting socket option methods.
+static constexpr int SOCKET_OPTION_TRUE{1};
 
 using common::InvalidPortErrMsg;
-
-/** Maximum size of http request (request line + headers) */
-static const size_t MAX_HEADERS_SIZE = 8192;
+using http_bitcoin::HTTPRequest;
 
 struct HTTPPathHandler
 {
@@ -63,93 +65,37 @@ struct HTTPPathHandler
 
 /** HTTP module state */
 
-//! libevent event loop
-static struct event_base* eventBase = nullptr;
-//! HTTP server
-static struct evhttp* eventHTTP = nullptr;
-//! List of subnets to allow RPC connections from
-static std::vector<CSubNet> rpc_allow_subnets;
+static std::unique_ptr<http_bitcoin::HTTPServer> g_http_server{nullptr};
 //! Handlers for (sub)paths
 static GlobalMutex g_httppathhandlers_mutex;
 static std::vector<HTTPPathHandler> pathHandlers GUARDED_BY(g_httppathhandlers_mutex);
-//! Bound listening sockets
-static std::vector<evhttp_bound_socket *> boundSockets;
+/// \anchor http_pool
 //! Http thread pool - future: encapsulate in HttpContext
 static ThreadPool g_threadpool_http("http");
 static int g_max_queue_depth{100};
 
-/**
- * @brief Helps keep track of open `evhttp_connection`s with active `evhttp_requests`
- *
- */
-class HTTPRequestTracker
-{
-private:
-    mutable Mutex m_mutex;
-    mutable std::condition_variable m_cv;
-    //! For each connection, keep a counter of how many requests are open
-    std::unordered_map<const evhttp_connection*, size_t> m_tracker GUARDED_BY(m_mutex);
-
-    void RemoveConnectionInternal(const decltype(m_tracker)::iterator it) EXCLUSIVE_LOCKS_REQUIRED(m_mutex)
-    {
-        m_tracker.erase(it);
-        if (m_tracker.empty()) m_cv.notify_all();
-    }
-public:
-    //! Increase request counter for the associated connection by 1
-    void AddRequest(evhttp_request* req) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
-    {
-        const evhttp_connection* conn{Assert(evhttp_request_get_connection(Assert(req)))};
-        WITH_LOCK(m_mutex, ++m_tracker[conn]);
-    }
-    //! Decrease request counter for the associated connection by 1, remove connection if counter is 0
-    void RemoveRequest(evhttp_request* req) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
-    {
-        const evhttp_connection* conn{Assert(evhttp_request_get_connection(Assert(req)))};
-        LOCK(m_mutex);
-        auto it{m_tracker.find(conn)};
-        if (it != m_tracker.end() && it->second > 0) {
-            if (--(it->second) == 0) RemoveConnectionInternal(it);
-        }
-    }
-    //! Remove a connection entirely
-    void RemoveConnection(const evhttp_connection* conn) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
-    {
-        LOCK(m_mutex);
-        auto it{m_tracker.find(Assert(conn))};
-        if (it != m_tracker.end()) RemoveConnectionInternal(it);
-    }
-    size_t CountActiveConnections() const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
-    {
-        return WITH_LOCK(m_mutex, return m_tracker.size());
-    }
-    //! Wait until there are no more connections with active requests in the tracker
-    void WaitUntilEmpty() const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
-    {
-        WAIT_LOCK(m_mutex, lock);
-        m_cv.wait(lock, [this]() EXCLUSIVE_LOCKS_REQUIRED(m_mutex) { return m_tracker.empty(); });
-    }
-};
-//! Track active requests
-static HTTPRequestTracker g_requests;
-
+namespace http_bitcoin {
 /** Check if a network address is allowed to access the HTTP server */
-static bool ClientAllowed(const CNetAddr& netaddr)
+bool HTTPServer::ClientAllowed(const CNetAddr& netaddr) const
 {
     if (!netaddr.IsValid())
         return false;
-    for(const CSubNet& subnet : rpc_allow_subnets)
+    for(const CSubNet& subnet : m_allow_subnets)
         if (subnet.Match(netaddr))
             return true;
     return false;
 }
 
 /** Initialize ACL list for HTTP server */
-static bool InitHTTPAllowList()
+bool HTTPServer::InitHTTPAllowList()
 {
-    rpc_allow_subnets.clear();
-    rpc_allow_subnets.emplace_back(LookupHost("127.0.0.1", false).value(), 8);  // always allow IPv4 local subnet
-    rpc_allow_subnets.emplace_back(LookupHost("::1", false).value());  // always allow IPv6 localhost
+    // Must be run before StartSocketThreads() because ThreadSocketHandler()
+    // will check m_allow_subnets from the I/O thread.
+    Assume(!m_thread_socket_handler.joinable());
+
+    m_allow_subnets.clear();
+    m_allow_subnets.emplace_back(LookupHost("127.0.0.1", false).value(), 8);  // always allow IPv4 local subnet
+    m_allow_subnets.emplace_back(LookupHost("::1", false).value());  // always allow IPv6 localhost
     for (const std::string& strAllow : gArgs.GetArgs("-rpcallowip")) {
         const CSubNet subnet{LookupSubNet(strAllow)};
         if (!subnet.IsValid()) {
@@ -158,80 +104,46 @@ static bool InitHTTPAllowList()
                 CClientUIInterface::MSG_ERROR);
             return false;
         }
-        rpc_allow_subnets.push_back(subnet);
+        m_allow_subnets.push_back(subnet);
     }
     std::string strAllowed;
-    for (const CSubNet& subnet : rpc_allow_subnets)
+    for (const CSubNet& subnet : m_allow_subnets)
         strAllowed += subnet.ToString() + " ";
     LogDebug(BCLog::HTTP, "Allowing HTTP connections from: %s\n", strAllowed);
     return true;
 }
+} // namespace http_bitcoin
 
 /** HTTP request method as string - use for logging only */
-std::string RequestMethodString(HTTPRequest::RequestMethod m)
+std::string_view RequestMethodString(HTTPRequestMethod m)
 {
     switch (m) {
-    case HTTPRequest::GET:
-        return "GET";
-    case HTTPRequest::POST:
-        return "POST";
-    case HTTPRequest::HEAD:
-        return "HEAD";
-    case HTTPRequest::PUT:
-        return "PUT";
-    case HTTPRequest::UNKNOWN:
-        return "unknown";
+    using enum HTTPRequestMethod;
+    case GET: return "GET";
+    case POST: return "POST";
+    case HEAD: return "HEAD";
+    case PUT: return "PUT";
+    case UNKNOWN: return "unknown";
     } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
 
-/** HTTP request callback */
-static void http_request_cb(struct evhttp_request* req, void* arg)
+static void WriteNoStoreErrorReply(HTTPRequest& req, HTTPStatusCode status, std::string_view reply = {})
 {
-    evhttp_connection* conn{evhttp_request_get_connection(req)};
-    // Track active requests
-    {
-        g_requests.AddRequest(req);
-        evhttp_request_set_on_complete_cb(req, [](struct evhttp_request* req, void*) {
-            g_requests.RemoveRequest(req);
-        }, nullptr);
-        evhttp_connection_set_closecb(conn, [](evhttp_connection* conn, void* arg) {
-            g_requests.RemoveConnection(conn);
-        }, nullptr);
-    }
-
-    // Disable reading to work around a libevent bug, fixed in 2.1.9
-    // See https://github.com/libevent/libevent/commit/5ff8eb26371c4dc56f384b2de35bea2d87814779
-    // and https://github.com/bitcoin/bitcoin/pull/11593.
-    if (event_get_version_number() >= 0x02010600 && event_get_version_number() < 0x02010900) {
-        if (conn) {
-            bufferevent* bev = evhttp_connection_get_bufferevent(conn);
-            if (bev) {
-                bufferevent_disable(bev, EV_READ);
-            }
-        }
-    }
-    auto hreq{std::make_shared<HTTPRequest>(req, *static_cast<const util::SignalInterrupt*>(arg))};
-
-    // Early address-based allow check
-    if (!ClientAllowed(hreq->GetPeer())) {
-        LogDebug(BCLog::HTTP, "HTTP request from %s rejected: Client network is not allowed RPC access\n",
-                 hreq->GetPeer().ToStringAddrPort());
-        hreq->WriteReply(HTTP_FORBIDDEN);
-        return;
-    }
+    req.WriteHeader("Cache-Control", "no-store");
+    req.WriteReply(status, reply);
+}
 
+static void MaybeDispatchRequestToWorker(std::shared_ptr<HTTPRequest> hreq)
+{
     // Early reject unknown HTTP methods
-    if (hreq->GetRequestMethod() == HTTPRequest::UNKNOWN) {
+    if (hreq->GetRequestMethod() == HTTPRequestMethod::UNKNOWN) {
         LogDebug(BCLog::HTTP, "HTTP request from %s rejected: Unknown HTTP request method\n",
                  hreq->GetPeer().ToStringAddrPort());
-        hreq->WriteReply(HTTP_BAD_METHOD);
+        WriteNoStoreErrorReply(*hreq, HTTP_BAD_METHOD);
         return;
     }
 
-    LogDebug(BCLog::HTTP, "Received a %s request for %s from %s\n",
-             RequestMethodString(hreq->GetRequestMethod()), SanitizeString(hreq->GetURI(), SAFE_CHARS_URI).substr(0, 100), hreq->GetPeer().ToStringAddrPort());
-
     // Find registered handler for prefix
     std::string strURI = hreq->GetURI();
     std::string path;
@@ -254,7 +166,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
     if (i != iend) {
         if (static_cast<int>(g_threadpool_http.WorkQueueSize()) >= g_max_queue_depth) {
             LogWarning("Request rejected because http work queue depth exceeded, it can be increased with the -rpcworkqueue= setting");
-            hreq->WriteReply(HTTP_SERVICE_UNAVAILABLE, "Work queue depth exceeded");
+            WriteNoStoreErrorReply(*hreq, HTTP_SERVICE_UNAVAILABLE, "Work queue depth exceeded");
             return;
         }
 
@@ -273,40 +185,28 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
             // Reply so the client doesn't hang waiting for the response.
             req->WriteHeader("Connection", "close");
             // TODO: Implement specific error formatting for the REST and JSON-RPC servers responses.
-            req->WriteReply(HTTP_INTERNAL_SERVER_ERROR, err_msg);
+            WriteNoStoreErrorReply(*req, HTTP_INTERNAL_SERVER_ERROR, err_msg);
         };
 
         if (auto res = g_threadpool_http.Submit(std::move(item)); !res.has_value()) {
             Assume(hreq.use_count() == 1); // ensure request will be deleted
             // Both SubmitError::Inactive and SubmitError::Interrupted mean shutdown
             LogWarning("HTTP request rejected during server shutdown: '%s'", SubmitErrorString(res.error()));
-            hreq->WriteReply(HTTP_SERVICE_UNAVAILABLE, "Request rejected during server shutdown");
+            WriteNoStoreErrorReply(*hreq, HTTP_SERVICE_UNAVAILABLE, "Request rejected during server shutdown");
             return;
         }
     } else {
-        hreq->WriteReply(HTTP_NOT_FOUND);
+        WriteNoStoreErrorReply(*hreq, HTTP_NOT_FOUND);
     }
 }
 
-/** Callback to reject HTTP requests after shutdown. */
-static void http_reject_request_cb(struct evhttp_request* req, void*)
-{
-    LogDebug(BCLog::HTTP, "Rejecting request while shutting down\n");
-    evhttp_send_error(req, HTTP_SERVUNAVAIL, nullptr);
-}
-
-/** Event dispatcher thread */
-static void ThreadHTTP(struct event_base* base)
+static void RejectRequest(std::unique_ptr<http_bitcoin::HTTPRequest> hreq)
 {
-    util::ThreadRename("http");
-    LogDebug(BCLog::HTTP, "Entering http event loop\n");
-    event_base_dispatch(base);
-    // Event loop will be interrupted by InterruptHTTPServer()
-    LogDebug(BCLog::HTTP, "Exited http event loop\n");
+    LogDebug(BCLog::HTTP, "Rejecting request while shutting down");
+    WriteNoStoreErrorReply(*hreq, HTTP_SERVICE_UNAVAILABLE);
 }
 
-/** Bind HTTP server to specified addresses */
-static bool HTTPBindAddresses(struct evhttp* http)
+static std::vector<std::pair<std::string, uint16_t>> GetBindAddresses()
 {
     uint16_t http_port{static_cast<uint16_t>(gArgs.GetIntArg("-rpcport", BaseParams().RPCPort()))};
     std::vector<std::pair<std::string, uint16_t>> endpoints;
@@ -331,378 +231,1141 @@ static bool HTTPBindAddresses(struct evhttp* http)
             std::string host;
             if (!SplitHostPort(strRPCBind, port, host)) {
                 LogError("%s\n", InvalidPortErrMsg("-rpcbind", strRPCBind).original);
-                return false;
+                return {}; // empty
             }
             endpoints.emplace_back(host, port);
         }
     }
+    return endpoints;
+}
 
-    // Bind addresses
-    for (std::vector<std::pair<std::string, uint16_t> >::iterator i = endpoints.begin(); i != endpoints.end(); ++i) {
-        LogInfo("Binding RPC on address %s port %i", i->first, i->second);
-        evhttp_bound_socket *bind_handle = evhttp_bind_socket_with_handle(http, i->first.empty() ? nullptr : i->first.c_str(), i->second);
-        if (bind_handle) {
-            const std::optional<CNetAddr> addr{LookupHost(i->first, false)};
-            if (i->first.empty() || (addr.has_value() && addr->IsBindAny())) {
-                LogWarning("The RPC server is not safe to expose to untrusted networks such as the public internet");
-            }
-            // Set the no-delay option (disable Nagle's algorithm) on the TCP socket.
-            evutil_socket_t fd = evhttp_bound_socket_get_fd(bind_handle);
-            int one = 1;
-            if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&one), sizeof(one)) == SOCKET_ERROR) {
-                LogInfo("WARNING: Unable to set TCP_NODELAY on RPC server socket, continuing anyway\n");
-            }
-            boundSockets.push_back(bind_handle);
-        } else {
-            LogWarning("Binding RPC on address %s port %i failed.", i->first, i->second);
-        }
+void RegisterHTTPHandler(const std::string &prefix, bool exactMatch, const HTTPRequestHandler &handler)
+{
+    LogDebug(BCLog::HTTP, "Registering HTTP handler for %s (exactmatch %d)\n", prefix, exactMatch);
+    LOCK(g_httppathhandlers_mutex);
+    pathHandlers.emplace_back(prefix, exactMatch, handler);
+}
+
+void UnregisterHTTPHandler(const std::string &prefix, bool exactMatch)
+{
+    LOCK(g_httppathhandlers_mutex);
+    std::vector<HTTPPathHandler>::iterator i = pathHandlers.begin();
+    std::vector<HTTPPathHandler>::iterator iend = pathHandlers.end();
+    for (; i != iend; ++i)
+        if (i->prefix == prefix && i->exactMatch == exactMatch)
+            break;
+    if (i != iend)
+    {
+        LogDebug(BCLog::HTTP, "Unregistering HTTP handler for %s (exactmatch %d)\n", prefix, exactMatch);
+        pathHandlers.erase(i);
     }
-    return !boundSockets.empty();
 }
 
-/** libevent event log callback */
-static void libevent_log_cb(int severity, const char *msg)
+namespace http_bitcoin {
+using util::Split;
+
+std::optional<std::string> HTTPHeaders::FindFirst(const std::string_view key) const
 {
-    switch (severity) {
-    case EVENT_LOG_DEBUG:
-        LogDebug(BCLog::LIBEVENT, "%s", msg);
-        break;
-    case EVENT_LOG_MSG:
-        LogInfo("libevent: %s", msg);
-        break;
-    case EVENT_LOG_WARN:
-        LogWarning("libevent: %s", msg);
-        break;
-    default: // EVENT_LOG_ERR and others are mapped to error
-        LogError("libevent: %s", msg);
-        break;
+    for (const auto& item : m_headers) {
+        if (CaseInsensitiveEqual(key, item.first)) {
+            return item.second;
+        }
     }
+    return std::nullopt;
 }
 
-bool InitHTTPServer(const util::SignalInterrupt& interrupt)
+std::vector<std::string_view> HTTPHeaders::FindAll(const std::string_view key) const
 {
-    if (!InitHTTPAllowList())
-        return false;
+    std::vector<std::string_view> ret;
+    for (const auto& item : m_headers) {
+        if (CaseInsensitiveEqual(key, item.first)) {
+            ret.push_back(item.second);
+        }
+    }
+    return ret;
+}
 
-    // Redirect libevent's logging to our own log
-    event_set_log_callback(&libevent_log_cb);
-    // Update libevent's log handling.
-    UpdateHTTPServerLogging(LogInstance().WillLogCategory(BCLog::LIBEVENT));
+void HTTPHeaders::Write(std::string&& key, std::string&& value)
+{
+    m_headers.emplace_back(std::move(key), std::move(value));
+}
 
-#ifdef WIN32
-    evthread_use_windows_threads();
-#else
-    evthread_use_pthreads();
-#endif
+void HTTPHeaders::RemoveAll(std::string_view key)
+{
+    auto moved = std::ranges::remove_if(m_headers, [key] (auto& pair) {
+        return CaseInsensitiveEqual(key, pair.first);
+    });
+    m_headers.erase(moved.begin(), moved.end());
+}
 
-    raii_event_base base_ctr = obtain_event_base();
+bool HTTPHeaders::Read(util::LineReader& reader, bool write)
+{
+    // Headers https://httpwg.org/specs/rfc9110.html#rfc.section.6.3
+    // A sequence of Field Lines https://httpwg.org/specs/rfc9110.html#rfc.section.5.2
+    size_t start{reader.Consumed()};
+    while (auto maybe_line = reader.ReadLine()) {
+        if (reader.Consumed() - start + m_consumed > MAX_HEADERS_SIZE) throw std::runtime_error("HTTP headers exceed size limit");
+
+        const std::string_view& line = *maybe_line;
+
+        // An empty line indicates end of the headers section https://www.rfc-editor.org/rfc/rfc2616#section-4
+        if (line.empty()) {
+            // Ensure all headers are accounted for in case there is a chunked trailer
+            m_consumed += reader.Consumed() - start;
+            return true;
+        }
 
-    /* Create a new evhttp object to handle requests. */
-    raii_evhttp http_ctr = obtain_evhttp(base_ctr.get());
-    struct evhttp* http = http_ctr.get();
-    if (!http) {
-        LogError("Couldn't create evhttp. Exiting.");
-        return false;
+        // "Field values containing CR, LF, or NUL characters are invalid and dangerous"
+        // https://httpwg.org/specs/rfc9110.html#rfc.section.5.5
+        // A sender MUST NOT generate a bare CR (a CR character not immediately followed by LF)
+        // within any protocol elements other than the content.
+        // A recipient of such a bare CR MUST consider that element to be invalid...
+        // https://httpwg.org/specs/rfc9112.html#rfc.section.2.2
+        if (line.find_first_of("\r\n\0", 0, 3) != std::string_view::npos) throw std::runtime_error("Header contains invalid character");
+
+        // Header line must have at least one ":"
+        // keys are not allowed to have delimiters like ":" but values are
+        // https://httpwg.org/specs/rfc9110.html#rfc.section.5.6.2
+        const size_t pos{line.find(':')};
+        if (pos == std::string_view::npos) throw std::runtime_error("HTTP header missing colon (:)");
+
+        // Whitespace is strictly not allowed in the field-name (key)
+        // https://www.rfc-editor.org/rfc/rfc9110.html#section-5.6.2
+        std::string_view key = line.substr(0, pos);
+        if (key.find_first_of(" \t\n\r\f\v") != std::string_view::npos) throw std::runtime_error("Invalid header field-name contains whitespace");
+        // Whitespace is optional in the value and can be trimmed
+        std::string value = util::TrimString(std::string_view(line).substr(pos + 1));
+
+        // Header keys are Field Names: https://httpwg.org/specs/rfc9110.html#fields.names
+        // which consist of "tokens": https://httpwg.org/specs/rfc9110.html#rfc.section.5.6.2
+        // that can not be empty.
+        if (key.empty()) throw std::runtime_error("Empty HTTP header name");
+
+        if (write) {
+            Write(std::string(key), std::move(value));
+        }
     }
 
-    evhttp_set_timeout(http, gArgs.GetIntArg("-rpcservertimeout", DEFAULT_HTTP_SERVER_TIMEOUT));
-    evhttp_set_max_headers_size(http, MAX_HEADERS_SIZE);
-    evhttp_set_max_body_size(http, MAX_SIZE);
-    evhttp_set_gencb(http, http_request_cb, (void*)&interrupt);
+    // We have not received all the request headers yet.
+    // Keep track of how much data we have already consumed to enforce
+    // the total limit over multiple read operations.
+    m_consumed += reader.Consumed() - start;
 
-    if (!HTTPBindAddresses(http)) {
-        LogError("Unable to bind any endpoint for RPC server");
-        return false;
+    return false;
+}
+
+std::string HTTPHeaders::Stringify() const
+{
+    std::string out;
+    for (const auto& [key, value] : m_headers) {
+        out += key + ": " + value + "\r\n";
     }
 
-    LogDebug(BCLog::HTTP, "Initialized HTTP server\n");
-    g_max_queue_depth = std::max(gArgs.GetArg("-rpcworkqueue", DEFAULT_HTTP_WORKQUEUE), 1);
-    LogDebug(BCLog::HTTP, "set work queue of depth %d", g_max_queue_depth);
+    // Headers are terminated by an empty line
+    out += "\r\n";
 
-    // transfer ownership to eventBase/HTTP via .release()
-    eventBase = base_ctr.release();
-    eventHTTP = http_ctr.release();
-    return true;
+    return out;
+}
+
+std::string HTTPResponse::StringifyHeaders() const
+{
+    return strprintf("HTTP/%d.%d %d %s\r\n%s",
+                     m_version.major,
+                     m_version.minor,
+                     m_status,
+                     HTTPStatusReasonString(m_status),
+                     m_headers.Stringify());
 }
 
-void UpdateHTTPServerLogging(bool enable) {
-    if (enable) {
-        event_enable_debug_logging(EVENT_DBG_ALL);
+bool HTTPRequest::LoadControlData(LineReader& reader)
+{
+    auto maybe_line = reader.ReadLine();
+    if (!maybe_line) return false;
+    const std::string_view& request_line = *maybe_line;
+
+    // Request Line aka Control Data https://httpwg.org/specs/rfc9110.html#rfc.section.6.2
+    // Three words separated by spaces, terminated by \n or \r\n
+    if (request_line.length() < MIN_REQUEST_LINE_LENGTH) throw std::runtime_error("HTTP request line too short");
+
+    // NUL is not a valid tchar and would silently truncate
+    // C-string-based parsers rather than being rejected as malformed.
+    // tchar: https://www.rfc-editor.org/info/rfc7230/#section-3.2.6
+    if (request_line.find('\0') != std::string_view::npos) throw std::runtime_error("Invalid request line contains NUL");
+
+    const std::vector<std::string_view> parts{Split<std::string_view>(request_line, " ")};
+    if (parts.size() != 3) throw std::runtime_error("HTTP request line malformed");
+
+    if (parts[0] == "GET") {
+        m_method = HTTPRequestMethod::GET;
+    } else if (parts[0] == "POST") {
+        m_method = HTTPRequestMethod::POST;
+    } else if (parts[0] == "HEAD") {
+        m_method = HTTPRequestMethod::HEAD;
+    } else if (parts[0] == "PUT") {
+        m_method = HTTPRequestMethod::PUT;
     } else {
-        event_enable_debug_logging(EVENT_DBG_NONE);
+        m_method = HTTPRequestMethod::UNKNOWN;
     }
-}
 
-static std::thread g_thread_http;
+    m_target = parts[1];
 
-void StartHTTPServer()
+    if (parts[2].rfind("HTTP/") != 0) throw std::runtime_error("HTTP request line malformed");
+
+    // Version is exactly two decimal digits separated by a decimal point
+    // https://httpwg.org/specs/rfc9110.html#rfc.section.2.5
+    const std::vector<std::string_view> version_parts{Split<std::string_view>(parts[2].substr(5), ".")};
+    if (version_parts.size() != 2) throw std::runtime_error("HTTP request line malformed");
+    if (version_parts[0].size() != 1 || version_parts[1].size() != 1) throw std::runtime_error("HTTP bad version");
+    auto major = ToIntegral<uint8_t>(version_parts[0]);
+    auto minor = ToIntegral<uint8_t>(version_parts[1]);
+    if (!major || !minor || major != 1 || minor > 9) throw std::runtime_error("HTTP bad version");
+    m_version.major = major.value();
+    m_version.minor = minor.value();
+
+    return true;
+}
+
+bool HTTPRequest::LoadHeaders(LineReader& reader)
 {
-    int rpcThreads = std::max(gArgs.GetArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1);
-    LogInfo("Starting HTTP server with %d worker threads", rpcThreads);
-    g_threadpool_http.Start(rpcThreads);
-    g_thread_http = std::thread(ThreadHTTP, eventBase);
+    return m_headers.Read(reader);
 }
 
-void InterruptHTTPServer()
+bool HTTPRequest::LoadBody(LineReader& reader)
 {
-    LogDebug(BCLog::HTTP, "Interrupting HTTP server\n");
-    if (eventHTTP) {
-        // Reject requests on current connections
-        evhttp_set_gencb(eventHTTP, http_reject_request_cb, nullptr);
+    // https://httpwg.org/specs/rfc9112.html#message.body
+    auto transfer_encoding_header = m_headers.FindFirst("Transfer-Encoding");
+    if (transfer_encoding_header && ToLower(transfer_encoding_header.value()) == "chunked") {
+        // Transfer-Encoding: https://datatracker.ietf.org/doc/html/rfc7230.html#section-3.3.1
+        // Chunked Transfer Coding: https://datatracker.ietf.org/doc/html/rfc7230.html#section-4.1
+        // see evhttp_handle_chunked_read() in libevent http.c
+        while (reader.Remaining() > 0) {
+            if (!m_chunk_size) {
+                auto maybe_chunk_size = reader.ReadLine();
+                if (!maybe_chunk_size) return false;
+
+                // Allow (but ignore) Chunk Extensions
+                // See https://www.rfc-editor.org/rfc/rfc9112.html#name-chunk-extensions
+                std::string_view chunk_size_noext{maybe_chunk_size.value()};
+                const auto semicolon_pos = chunk_size_noext.find(';');
+                if (semicolon_pos != chunk_size_noext.npos) {
+                    chunk_size_noext.remove_suffix(chunk_size_noext.size() - semicolon_pos);
+                }
+
+                m_chunk_size = ToIntegral<uint64_t>(util::TrimStringView(chunk_size_noext), /*base=*/16);
+                if (!m_chunk_size) throw std::runtime_error("Cannot parse chunk length value");
+
+                if ((m_body.size() > MAX_BODY_SIZE) ||
+                    (*m_chunk_size > MAX_BODY_SIZE - m_body.size()))
+                    throw ContentTooLargeError("Chunk will exceed max body size");
+            }
+
+            // We either just read the chunk size, or we have it saved
+            // from a prior I/O loop iteration
+            Assume(m_chunk_size);
+
+            // Last chunk has size 0
+            if (*m_chunk_size == 0) {
+                // Validate Chunked Trailer section, which is used for
+                // additional headers sent at the end of the message.
+                // Data consumed here is counted towards MAX_HEADERS_SIZE
+                // along with the headers we read in the beginning of the request.
+                // At this time we ignore and drop these data after validating.
+                // See https://httpwg.org/specs/rfc9112.html#rfc.section.7.1.2
+                return m_headers.Read(reader, /*write=*/false);
+            }
+
+            // We have not read the entire chunk from the buffer yet
+            if (m_chunk_read < *m_chunk_size) {
+                // Get what we can from the buffer
+                const uint64_t chunk_need{*m_chunk_size - m_chunk_read};
+                const uint64_t buffer_has{std::min(chunk_need, static_cast<uint64_t>(reader.Remaining()))};
+
+                // Pack [partial] chunk onto body and update state
+                m_body += reader.ReadLength(buffer_has);
+                m_chunk_read += buffer_has;
+            }
+
+            // Even though every chunk size is explicitly declared,
+            // they are still terminated by a CRLF we don't need,
+            // just consume it here.
+            if (m_chunk_read == *m_chunk_size) {
+                auto crlf = reader.ReadLine();
+                if (!crlf) {
+                    // CRLF not found before end of buffer: it has not been received by our socket yet.
+                    return false;
+                }
+                // CRLF was found but there was unexpected data after the chunk_sized chunk
+                if (!crlf.value().empty()) throw std::runtime_error("Improperly terminated chunk");
+
+                // Clear state for next chunk
+                m_chunk_size.reset();
+                m_chunk_read = 0;
+            }
+        }
+
+        // We read all the chunks but never got the last chunk, wait for client to send more
+        return false;
+    } else {
+        // No Content-length or Transfer-Encoding header means no body, see libevent evhttp_get_body()
+        auto content_length_values{m_headers.FindAll("Content-Length")};
+        if (content_length_values.empty()) return true;
+
+        // Duplicate Content-Length headers are allowed only if they all have the same value
+        // https://www.rfc-editor.org/rfc/rfc7230#section-3.3.3
+        const auto& first_content_length_value{content_length_values[0]};
+        for (size_t i = 1; i < content_length_values.size(); ++i) {
+            if (content_length_values[i] != first_content_length_value) throw std::runtime_error("Differing Content-Length values");
+        }
+
+        const auto content_length{ToIntegral<uint64_t>(first_content_length_value)};
+        if (!content_length) throw std::runtime_error("Cannot parse Content-Length value");
+
+        if (*content_length > MAX_BODY_SIZE) throw ContentTooLargeError("Max body size exceeded");
+
+        // A large body may arrive over multiple I/O loop iterations. Copy
+        // whatever the buffer has now; m_body's size tracks our progress.
+        const uint64_t body_need{*content_length - m_body.size()};
+        const uint64_t buffer_has{std::min(body_need, static_cast<uint64_t>(reader.Remaining()))};
+
+        // Pack [partial] body on and update state
+        m_body += reader.ReadLength(buffer_has);
+
+        return m_body.size() == *content_length;
     }
-    // Interrupt pool after disabling requests
-    g_threadpool_http.Interrupt();
 }
 
-void StopHTTPServer()
+void HTTPRequest::WriteReply(HTTPStatusCode status, std::span<const std::byte> reply_body)
 {
-    LogDebug(BCLog::HTTP, "Stopping HTTP server\n");
+    HTTPResponse res;
+
+    // Some response headers are determined in advance and stored in the request
+    res.m_headers = std::move(m_response_headers);
+
+    // Response version matches request version
+    res.m_version = m_version;
+
+    // Add response code
+    res.m_status = status;
+
+    // See libevent evhttp_response_needs_body()
+    // Response headers are different if no body is needed
+    bool needs_body{status != HTTP_NO_CONTENT && (status < 100 || status >= 200)};
+    bool needs_content_length{false};
+
+    bool keep_alive{false};
+
+    // See libevent evhttp_make_header_response()
+    // Expected response headers depend on protocol version
+    if (m_version.major == 1) {
+        // HTTP/1.0
+        if (m_version.minor == 0) {
+            auto connection_header{m_headers.FindFirst("Connection")};
+            if (connection_header && ToLower(connection_header.value()) == "keep-alive") {
+                res.m_headers.Write("Connection", "keep-alive");
+                keep_alive = true;
+                // HTTP/1.0 connections are closed by default so EOF is sufficient
+                // to indicate end of the body. Adding Content-Length a special case.
+                if (needs_body) needs_content_length = true;
+            }
+        }
 
-    LogDebug(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");
-    g_threadpool_http.Stop();
+        // HTTP/1.1
+        if (m_version.minor >= 1) {
+            const int64_t now_seconds{TicksSinceEpoch<std::chrono::seconds>(NodeClock::now())};
+            res.m_headers.Write("Date", FormatRFC1123DateTime(now_seconds));
+
+            // HTTP/1.1 connections are kept alive by default and always require Content-Length.
+            if (needs_body) needs_content_length = true;
+
+            // Default for HTTP/1.1
+            keep_alive = true;
+        }
+    }
+
+    if (needs_content_length) {
+        res.m_headers.Write("Content-Length", util::ToString(reply_body.size()));
+    }
+
+    if (needs_body && !res.m_headers.FindFirst("Content-Type")) {
+        // Default type from libevent evhttp_new_object()
+        res.m_headers.Write("Content-Type", "text/html; charset=ISO-8859-1");
+    }
+
+    auto connection_header{m_headers.FindFirst("Connection")};
+    if (connection_header && ToLower(connection_header.value()) == "close") {
+        // Might not exist already but we need to replace it, not append to it
+        res.m_headers.RemoveAll("Connection");
 
-    // Unlisten sockets, these are what make the event loop running, which means
-    // that after this and all connections are closed the event loop will quit.
-    for (evhttp_bound_socket *socket : boundSockets) {
-        evhttp_del_accept_socket(eventHTTP, socket);
+        res.m_headers.Write("Connection", "close");
+        keep_alive = false;
     }
-    boundSockets.clear();
+
+    std::shared_ptr client{m_client.lock()};
+    if (!client) return;
+
+    client->m_keep_alive = keep_alive;
+
+    // Serialize the response headers
+    const std::string headers{res.StringifyHeaders()};
+    const auto headers_bytes{std::as_bytes(std::span{headers})};
+
+    bool send_buffer_was_empty{false};
+    // Fill the send buffer with the complete serialized response headers + body
     {
-        if (const auto n_connections{g_requests.CountActiveConnections()}; n_connections != 0) {
-            LogDebug(BCLog::HTTP, "Waiting for %d connections to stop HTTP server\n", n_connections);
-        }
-        g_requests.WaitUntilEmpty();
+        LOCK(client->m_send_mutex);
+        send_buffer_was_empty = client->m_send_buffer.empty();
+        client->m_send_buffer.insert(client->m_send_buffer.end(), headers_bytes.begin(), headers_bytes.end());
+
+        // We've been using std::span up until now but it is finally time to copy
+        // data. The original data will go out of scope when WriteReply() returns.
+        // This is analogous to the memcpy() in libevent's evbuffer_add()
+        client->m_send_buffer.insert(client->m_send_buffer.end(), reply_body.begin(), reply_body.end());
+
+        // If the buffer already held data, the I/O thread is (or soon will be)
+        // draining it, so flag that there is more data to send. This must happen
+        // while holding m_send_mutex and while the buffer is known non-empty:
+        // setting m_send_ready after releasing the lock would race with the I/O
+        // thread draining the buffer to empty and clearing m_send_ready in
+        // between, leaving m_send_ready set on an empty buffer. The I/O loop would
+        // then only ever poll the socket for writeability, never read the client's
+        // next request, and wedge the connection.
+        if (!send_buffer_was_empty) client->m_send_ready = true;
     }
-    if (eventHTTP) {
-        // Schedule a callback to call evhttp_free in the event base thread, so
-        // that evhttp_free does not need to be called again after the handling
-        // of unfinished request connections that follows.
-        event_base_once(eventBase, -1, EV_TIMEOUT, [](evutil_socket_t, short, void*) {
-            evhttp_free(eventHTTP);
-            eventHTTP = nullptr;
-        }, nullptr, nullptr);
+
+    LogDebug(
+        BCLog::HTTP,
+        "HTTPResponse (status code: %d size: %lld) added to send buffer for client %s (id=%llu)",
+        status,
+        headers_bytes.size() + reply_body.size(),
+        client->m_origin,
+        client->m_id);
+
+    // If the send buffer was empty before we wrote this reply, we can try an
+    // optimistic send akin to CConnman::PushMessage() in which we
+    // push the data directly out the socket to client right now, instead
+    // of waiting for the next iteration of the I/O loop.
+    if (send_buffer_was_empty) {
+        client->MaybeSendBytesFromBuffer();
     }
-    if (eventBase) {
-        LogDebug(BCLog::HTTP, "Waiting for HTTP event thread to exit\n");
-        if (g_thread_http.joinable()) g_thread_http.join();
-        event_base_free(eventBase);
-        eventBase = nullptr;
+
+    // Signal to the I/O loop that we are ready to handle the next request.
+    client->m_req_busy = false;
+}
+
+CService HTTPRequest::GetPeer() const
+{
+    if (std::shared_ptr c{m_client.lock()}) {
+        return c->m_addr;
+    } else {
+        return {};
     }
-    LogDebug(BCLog::HTTP, "Stopped HTTP server\n");
 }
 
-struct event_base* EventBase()
+std::optional<std::string> HTTPRequest::GetQueryParameter(const std::string_view key) const
 {
-    return eventBase;
+    return GetQueryParameterFromUri(m_target, key);
 }
 
-static void httpevent_callback_fn(evutil_socket_t, short, void* data)
+// See libevent http.c evhttp_parse_query_impl()
+// and https://www.rfc-editor.org/rfc/rfc3986#section-3.4
+std::optional<std::string> GetQueryParameterFromUri(const std::string_view uri, const std::string_view key)
 {
-    // Static handler: simply call inner handler
-    HTTPEvent *self = static_cast<HTTPEvent*>(data);
-    self->handler();
-    if (self->deleteWhenTriggered)
-        delete self;
+    // find query in URI
+    size_t start = uri.find('?');
+    if (start == std::string::npos) return std::nullopt;
+    size_t end = uri.find('#', start);
+    if (end == std::string::npos) {
+        end = uri.length();
+    }
+    const std::string_view query{uri.data() + start + 1, end - start - 1};
+    // find requested parameter in query
+    const std::vector<std::string_view> params{Split<std::string_view>(query, "&")};
+    for (const std::string_view& param : params) {
+        size_t delim = param.find('=');
+        if (key == UrlDecode(param.substr(0, delim))) {
+            if (delim == std::string::npos) {
+                return "";
+            } else {
+                return std::string(UrlDecode(param.substr(delim + 1)));
+            }
+        }
+    }
+    return std::nullopt;
 }
 
-HTTPEvent::HTTPEvent(struct event_base* base, bool _deleteWhenTriggered, const std::function<void()>& _handler):
-    deleteWhenTriggered(_deleteWhenTriggered), handler(_handler)
+std::pair<bool, std::string> HTTPRequest::GetHeader(const std::string_view hdr) const
 {
-    ev = event_new(base, -1, 0, httpevent_callback_fn, this);
-    assert(ev);
+    std::optional<std::string> found{m_headers.FindFirst(hdr)};
+    return std::pair{found.has_value(), std::move(found).value_or("")};
 }
-HTTPEvent::~HTTPEvent()
+
+void HTTPRequest::WriteHeader(std::string&& hdr, std::string&& value)
 {
-    event_free(ev);
+    m_response_headers.Write(std::move(hdr), std::move(value));
 }
-void HTTPEvent::trigger(struct timeval* tv)
+
+util::Expected<void, std::string> HTTPServer::BindAndStartListening(const CService& to)
 {
-    if (tv == nullptr)
-        event_active(ev, 0, 0); // immediately trigger event in main thread
-    else
-        evtimer_add(ev, tv); // trigger after timeval passed
+    // Create socket for listening for incoming connections
+    sockaddr_storage storage;
+    auto sa = reinterpret_cast<sockaddr*>(&storage);
+    socklen_t len{sizeof(storage)};
+    if (!to.GetSockAddr(sa, &len)) {
+        return util::Unexpected{strprintf("Bind address family for %s not supported", to.ToStringAddrPort())};
+    }
+
+    std::unique_ptr<Sock> sock{CreateSock(to.GetSAFamily(), SOCK_STREAM, IPPROTO_TCP)};
+    if (!sock) {
+        return util::Unexpected{strprintf("Cannot create %s listen socket: %s",
+                                          to.ToStringAddrPort(),
+                                          NetworkErrorString(WSAGetLastError()))};
+    }
+
+    // Allow binding if the port is still in TIME_WAIT state after
+    // the program was closed and restarted.
+    if (sock->SetSockOpt(SOL_SOCKET, SO_REUSEADDR, &SOCKET_OPTION_TRUE, sizeof(SOCKET_OPTION_TRUE)) == SOCKET_ERROR) {
+        LogDebug(BCLog::HTTP,
+                 "Cannot set SO_REUSEADDR on %s listen socket: %s, continuing anyway",
+                 to.ToStringAddrPort(),
+                 NetworkErrorString(WSAGetLastError()));
+    }
+
+    // some systems don't have IPV6_V6ONLY but are always v6only; others do have the option
+    // and enable it by default or not. Try to enable it, if possible.
+    if (to.IsIPv6()) {
+#ifdef IPV6_V6ONLY
+        if (sock->SetSockOpt(IPPROTO_IPV6, IPV6_V6ONLY, &SOCKET_OPTION_TRUE, sizeof(SOCKET_OPTION_TRUE)) == SOCKET_ERROR) {
+            LogDebug(BCLog::HTTP,
+                     "Cannot set IPV6_V6ONLY on %s listen socket: %s, continuing anyway",
+                     to.ToStringAddrPort(),
+                     NetworkErrorString(WSAGetLastError()));
+        }
+#endif
+#ifdef WIN32
+        int prot_level{PROTECTION_LEVEL_UNRESTRICTED};
+        if (sock->SetSockOpt(IPPROTO_IPV6,
+                             IPV6_PROTECTION_LEVEL,
+                             &prot_level,
+                             sizeof(prot_level)) == SOCKET_ERROR) {
+            LogDebug(BCLog::HTTP,
+                     "Cannot set IPV6_PROTECTION_LEVEL on %s listen socket: %s, continuing anyway",
+                     to.ToStringAddrPort(),
+                     NetworkErrorString(WSAGetLastError()));
+        }
+#endif
+    }
+
+    if (sock->Bind(sa, len) == SOCKET_ERROR) {
+        const int err{WSAGetLastError()};
+        if (err == WSAEADDRINUSE) {
+            return util::Unexpected{strprintf("Unable to bind to %s on this computer. %s is probably already running.",
+                                              to.ToStringAddrPort(),
+                                              CLIENT_NAME)};
+        } else {
+            return util::Unexpected{strprintf("Unable to bind to %s on this computer (bind returned error %s)",
+                                              to.ToStringAddrPort(),
+                                              NetworkErrorString(err))};
+        }
+    }
+
+    // Listen for incoming connections
+    if (sock->Listen(SOMAXCONN) == SOCKET_ERROR) {
+        return util::Unexpected{strprintf("Cannot listen on %s: %s",
+                                          to.ToStringAddrPort(),
+                                          NetworkErrorString(WSAGetLastError()))};
+    }
+
+    m_listen.emplace_back(std::move(sock));
+
+    return {};
 }
-HTTPRequest::HTTPRequest(struct evhttp_request* _req, const util::SignalInterrupt& interrupt, bool _replySent)
-    : req(_req), m_interrupt(interrupt), replySent(_replySent)
+
+void HTTPServer::StopListening()
 {
+    m_listen.clear();
 }
 
-HTTPRequest::~HTTPRequest()
+void HTTPServer::StartSocketsThreads()
 {
-    if (!replySent) {
-        // Keep track of whether reply was sent to avoid request leaks
-        LogWarning("Unhandled HTTP request");
-        WriteReply(HTTP_INTERNAL_SERVER_ERROR, "Unhandled request");
-    }
-    // evhttpd cleans up the request, as long as a reply was sent.
+    // The socket handler reads m_allow_subnets in ClientAllowed(). InitHTTPAllowList()
+    // must have populated it first; localhost entries are always added, so an empty
+    // list means it was never called and every connection is rejected.
+    Assume(!m_allow_subnets.empty());
+
+    m_thread_socket_handler = std::thread(&util::TraceThread,
+                                          "http",
+                                          [this] { ThreadSocketHandler(); });
 }
 
-std::pair<bool, std::string> HTTPRequest::GetHeader(const std::string& hdr) const
+void HTTPServer::JoinSocketsThreads()
 {
-    const struct evkeyvalq* headers = evhttp_request_get_input_headers(req);
-    assert(headers);
-    const char* val = evhttp_find_header(headers, hdr.c_str());
-    if (val)
-        return std::make_pair(true, val);
-    else
-        return std::make_pair(false, "");
+    if (m_thread_socket_handler.joinable()) {
+        m_thread_socket_handler.join();
+    }
 }
 
-std::string HTTPRequest::ReadBody()
+std::unique_ptr<Sock> HTTPServer::AcceptConnection(const Sock& listen_sock, CService& addr)
 {
-    struct evbuffer* buf = evhttp_request_get_input_buffer(req);
-    if (!buf)
-        return "";
-    size_t size = evbuffer_get_length(buf);
-    /** Trivial implementation: if this is ever a performance bottleneck,
-     * internal copying can be avoided in multi-segment buffers by using
-     * evbuffer_peek and an awkward loop. Though in that case, it'd be even
-     * better to not copy into an intermediate string but use a stream
-     * abstraction to consume the evbuffer on the fly in the parsing algorithm.
-     */
-    const char* data = (const char*)evbuffer_pullup(buf, size);
-    if (!data) // returns nullptr in case of empty buffer
-        return "";
-    std::string rv(data, size);
-    evbuffer_drain(buf, size);
-    return rv;
+    // Make sure we only operate on our own listening sockets
+    Assume(std::ranges::any_of(m_listen, [&](const auto& sock) { return sock.get() == &listen_sock; }));
+
+    sockaddr_storage storage;
+    socklen_t len{sizeof(storage)};
+    auto sa = reinterpret_cast<sockaddr*>(&storage);
+
+    auto sock{listen_sock.Accept(sa, &len)};
+
+    if (!sock) {
+        const int err{WSAGetLastError()};
+        if (err != WSAEWOULDBLOCK) {
+            LogDebug(BCLog::HTTP,
+                     "Cannot accept new connection: %s",
+                     NetworkErrorString(err));
+        }
+        return {};
+    }
+
+    // The OS handed us a valid socket but we can't determine its source address.
+    if (!addr.SetSockAddr(sa, len)) {
+        LogDebug(BCLog::HTTP,
+                 "Unknown socket family");
+    }
+
+    // Early address-based allow check
+    if (!ClientAllowed(addr)) {
+        LogDebug(BCLog::HTTP, "Connection from %s rejected: Client network is not allowed HTTP access\n",
+                 addr.ToStringAddrPort());
+        // Socket destroyed, connection aborted
+        return {};
+    }
+
+    return sock;
 }
 
-void HTTPRequest::WriteHeader(const std::string& hdr, const std::string& value)
+HTTPServer::Id HTTPServer::GetNewId()
 {
-    struct evkeyvalq* headers = evhttp_request_get_output_headers(req);
-    assert(headers);
-    evhttp_add_header(headers, hdr.c_str(), value.c_str());
+    return m_next_id.fetch_add(1, std::memory_order_relaxed);
 }
 
-/** Closure sent to main thread to request a reply to be sent to
- * a HTTP request.
- * Replies must be sent in the main loop in the main http thread,
- * this cannot be done from worker threads.
- */
-void HTTPRequest::WriteReply(int nStatus, std::span<const std::byte> reply)
+void HTTPServer::NewSockAccepted(std::unique_ptr<Sock>&& sock, const CService& addr)
 {
-    assert(!replySent && req);
-    if (m_interrupt) {
-        WriteHeader("Connection", "close");
+    if (!sock->IsSelectable()) {
+        LogDebug(BCLog::HTTP,
+                 "connection from %s dropped: non-selectable socket",
+                 addr.ToStringAddrPort());
+        return;
+    }
+
+    // According to the internet TCP_NODELAY is not carried into accepted sockets
+    // on all platforms.  Set it again here just to be sure.
+    if (sock->SetSockOpt(IPPROTO_TCP, TCP_NODELAY, &SOCKET_OPTION_TRUE, sizeof(SOCKET_OPTION_TRUE)) == SOCKET_ERROR) {
+        LogDebug(BCLog::HTTP, "connection from %s: unable to set TCP_NODELAY, continuing anyway",
+                 addr.ToStringAddrPort());
     }
-    // Send event to main http thread to send reply message
-    struct evbuffer* evb = evhttp_request_get_output_buffer(req);
-    assert(evb);
-    evbuffer_add(evb, reply.data(), reply.size());
-    auto req_copy = req;
-    HTTPEvent* ev = new HTTPEvent(eventBase, true, [req_copy, nStatus]{
-        evhttp_send_reply(req_copy, nStatus, nullptr, nullptr);
-        // Re-enable reading from the socket. This is the second part of the libevent
-        // workaround above.
-        if (event_get_version_number() >= 0x02010600 && event_get_version_number() < 0x02010900) {
-            evhttp_connection* conn = evhttp_request_get_connection(req_copy);
-            if (conn) {
-                bufferevent* bev = evhttp_connection_get_bufferevent(conn);
-                if (bev) {
-                    bufferevent_enable(bev, EV_READ | EV_WRITE);
+
+    const Id id{GetNewId()};
+
+    m_connected.push_back(std::make_shared<HTTPRemoteClient>(id, addr, std::move(sock)));
+    // Report back to the main thread
+    m_connected_size.fetch_add(1, std::memory_order_relaxed);
+
+    LogDebug(BCLog::HTTP,
+             "HTTP Connection accepted from %s (id=%llu)",
+             addr.ToStringAddrPort(), id);
+}
+
+void HTTPServer::SocketHandlerConnected(const IOReadiness& io_readiness) const
+{
+    for (const auto& [sock, events] : io_readiness.events_per_sock) {
+        if (m_interrupt_net) {
+            return;
+        }
+
+        auto it{io_readiness.httpclients_per_sock.find(sock)};
+        if (it == io_readiness.httpclients_per_sock.end()) {
+            continue;
+        }
+        const std::shared_ptr<HTTPRemoteClient>& client{it->second};
+
+        bool send_ready = events.occurred & Sock::SendEvent;
+        bool recv_ready = events.occurred & Sock::RecvEvent;
+        bool err_ready = events.occurred & Sock::ErrorEvent;
+
+        if (send_ready) {
+            // Try to send as much data as is ready for this client.
+            // If there's an error we can skip the receive phase for this client
+            // because we need to disconnect.
+            if (!client->MaybeSendBytesFromBuffer()) {
+                recv_ready = false;
+            }
+        }
+
+        if (recv_ready || err_ready) {
+            char buf[0x10000]; // typical socket buffer is 8K-64K
+
+            const ssize_t nrecv{WITH_LOCK(
+                client->m_sock_mutex,
+                return client->m_sock->Recv(buf, sizeof(buf), MSG_DONTWAIT);)};
+
+            if (nrecv < 0) {
+                const int err = WSAGetLastError();
+                if (IOErrorIsPermanent(err)) {
+                    LogDebug(
+                        BCLog::HTTP,
+                        "Permanent read error from %s (id=%llu): %s",
+                        client->m_origin,
+                        client->m_id,
+                        NetworkErrorString(err));
+                    client->m_disconnect = true;
                 }
+            } else if (nrecv == 0) {
+                LogDebug(
+                    BCLog::HTTP,
+                    "Received EOF from %s (id=%llu)",
+                    client->m_origin,
+                    client->m_id);
+                client->m_disconnect = true;
+            } else {
+                // Reset idle timeout
+                client->m_idle_since = Now<SteadySeconds>();
+
+                // Prevent disconnect until all requests are completely handled.
+                client->m_connection_busy = true;
+
+                // Copy data from socket buffer to client receive buffer
+                client->m_recv_buffer.insert(
+                    client->m_recv_buffer.end(),
+                    buf,
+                    buf + nrecv);
             }
         }
-    });
-    ev->trigger(nullptr);
-    replySent = true;
-    req = nullptr; // transferred back to main thread
+        // Process as much received data as we can.
+        // This executes for every client whether or not reading or writing
+        // took place because it also (might) parse a request we have already
+        // received and pass it to a worker thread.
+        MaybeDispatchRequestsFromClient(client);
+    }
 }
 
-CService HTTPRequest::GetPeer() const
+void HTTPServer::SocketHandlerListening(const Sock::EventsPerSock& events_per_sock)
 {
-    evhttp_connection* con = evhttp_request_get_connection(req);
-    CService peer;
-    if (con) {
-        // evhttp retains ownership over returned address string
-        const char* address = "";
-        uint16_t port = 0;
+    if (m_stop_accepting) return;
+    for (const auto& sock : m_listen) {
+        if (m_interrupt_net) {
+            return;
+        }
+        const auto it = events_per_sock.find(sock);
+        if (it != events_per_sock.end() && it->second.occurred & Sock::RecvEvent) {
+            CService addr_accepted;
 
-#ifdef HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR
-        evhttp_connection_get_peer(con, &address, &port);
-#else
-        evhttp_connection_get_peer(con, (char**)&address, &port);
-#endif // HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR
+            auto sock_accepted{AcceptConnection(*sock, addr_accepted)};
 
-        peer = MaybeFlipIPv6toCJDNS(LookupNumeric(address, port));
+            if (sock_accepted) {
+                NewSockAccepted(std::move(sock_accepted), addr_accepted);
+            }
+        }
     }
-    return peer;
 }
 
-std::string HTTPRequest::GetURI() const
+HTTPServer::IOReadiness HTTPServer::GenerateWaitSockets() const
 {
-    return evhttp_request_get_uri(req);
+    IOReadiness io_readiness;
+
+    for (const auto& sock : m_listen) {
+        io_readiness.events_per_sock.emplace(sock, Sock::Events{Sock::RecvEvent});
+    }
+
+    for (const auto& http_client : m_connected) {
+        // Safely copy the shared pointer to the socket
+        std::shared_ptr<Sock> sock{WITH_LOCK(http_client->m_sock_mutex, return http_client->m_sock;)};
+
+        // Check if client is ready to send data. Don't try to receive again
+        // until the send buffer is cleared (all data sent to client).
+        // Keep this as a separate critical section from the m_sock_mutex one above:
+        // never hold m_sock_mutex and m_send_mutex at the same time here.
+        // MaybeSendBytesFromBuffer() locks m_send_mutex then m_sock_mutex, so nesting
+        // them in the opposite order here would risk a lock-order inversion deadlock.
+        const bool send_ready{WITH_LOCK(http_client->m_send_mutex, return http_client->m_send_ready;)};
+        Sock::Event event = (send_ready ? Sock::SendEvent : Sock::RecvEvent);
+        io_readiness.events_per_sock.emplace(sock, Sock::Events{event});
+        io_readiness.httpclients_per_sock.emplace(sock, http_client);
+    }
+
+    return io_readiness;
 }
 
-HTTPRequest::RequestMethod HTTPRequest::GetRequestMethod() const
+/// \anchor http
+void HTTPServer::ThreadSocketHandler()
 {
-    switch (evhttp_request_get_command(req)) {
-    case EVHTTP_REQ_GET:
-        return GET;
-    case EVHTTP_REQ_POST:
-        return POST;
-    case EVHTTP_REQ_HEAD:
-        return HEAD;
-    case EVHTTP_REQ_PUT:
-        return PUT;
-    default:
-        return UNKNOWN;
+    while (!m_interrupt_net) {
+        // Check for the readiness of the already connected sockets and the
+        // listening sockets in one call ("readiness" as in poll(2) or
+        // select(2)). If none are ready, wait for a short while and return
+        // empty sets.
+        auto io_readiness{GenerateWaitSockets()};
+        if (io_readiness.events_per_sock.empty() ||
+            // WaitMany() may as well be a static method, the context of the first Sock in the vector is not relevant.
+            !io_readiness.events_per_sock.begin()->first->WaitMany(SELECT_TIMEOUT,
+                                                                   io_readiness.events_per_sock)) {
+            m_interrupt_net.sleep_for(SELECT_TIMEOUT);
+        }
+
+        // Service (send/receive) each of the already connected sockets.
+        SocketHandlerConnected(io_readiness);
+
+        // Accept new connections from listening sockets.
+        SocketHandlerListening(io_readiness.events_per_sock);
+
+        // Disconnect any clients that have been flagged.
+        DisconnectClients();
     }
 }
 
-std::optional<std::string> HTTPRequest::GetQueryParameter(const std::string& key) const
+void HTTPServer::MaybeDispatchRequestsFromClient(const std::shared_ptr<HTTPRemoteClient>& client) const
 {
-    const char* uri{evhttp_request_get_uri(req)};
+    // If we are already handling a request from
+    // this client, do nothing. We'll check again on the next I/O
+    // loop iteration.
+    if (client->m_req_busy) return;
 
-    return GetQueryParameterFromUri(uri, key);
+    if (!client->m_req) {
+        client->m_req = std::make_unique<HTTPRequest>(client);
+    }
+
+    try {
+        // Read data from the buffer into the current request
+        client->ReadRequest(*client->m_req);
+    } catch (const ContentTooLargeError& e) {
+        LogDebug(
+            BCLog::HTTP,
+            "HTTP request body too large from client %s (id=%llu): %s",
+            client->m_origin,
+            client->m_id,
+            e.what());
+
+        WriteNoStoreErrorReply(*client->m_req, HTTP_CONTENT_TOO_LARGE);
+        client->m_disconnect = true;
+        return;
+    } catch (const std::runtime_error& e) {
+        LogDebug(
+            BCLog::HTTP,
+            "Error reading HTTP request from client %s (id=%llu): %s",
+            client->m_origin,
+            client->m_id,
+            e.what());
+
+        // We failed to read a complete request from the buffer
+        WriteNoStoreErrorReply(*client->m_req, HTTP_BAD_REQUEST);
+        client->m_disconnect = true;
+        return;
+    }
+
+    // If the request is ready, hand it to a worker.
+    if (client->m_req->GetState() == HTTPRequest::State::Complete) {
+        LogDebug(
+            BCLog::HTTP,
+            "Received a %s request for %s from %s (id=%llu)",
+            RequestMethodString(client->m_req->m_method),
+            client->m_req->m_target,
+            client->m_origin,
+            client->m_id);
+
+        LOCK(m_request_dispatcher_mutex);
+        client->m_req_busy = true;
+        m_request_dispatcher(std::move(client->m_req));
+    }
 }
 
-std::optional<std::string> GetQueryParameterFromUri(const char* uri, const std::string& key)
+void HTTPServer::DisconnectClients()
 {
-    evhttp_uri* uri_parsed{evhttp_uri_parse(uri)};
-    if (!uri_parsed) {
-        throw std::runtime_error("URI parsing failed, it likely contained RFC 3986 invalid characters");
+    const auto now{Now<SteadySeconds>()};
+    size_t erased = std::erase_if(m_connected,
+                                  [&](auto& client) {
+                                        // First check for idle timeout. We reset the timer when we send and receive data,
+                                        // but if the server is busy handling a request we should ignore the timeout until
+                                        // the reply is sent. If we did erase the shared_ptr<HTTPRemoteClient> reference in m_connected
+                                        // while the server is busy with a request, there would still be a reference in a worker
+                                        // thread keeping the socket open even after "disconnecting".
+                                        const bool is_idle{m_rpcservertimeout.count() > 0 &&
+                                                           now - client->m_idle_since.load() > m_rpcservertimeout &&
+                                                           !client->m_req_busy};
+
+                                        // Disconnect this client due to error, end of communication, or idle timeout.
+                                        // May drop unsent data if we are closing due to error.
+                                        if (client->m_disconnect || is_idle) {
+                                            if (is_idle) {
+                                                LogDebug(BCLog::HTTP,
+                                                         "HTTP client idle timeout %s (id=%llu)",
+                                                         client->m_origin,
+                                                         client->m_id);
+                                            }
+                                        } else {
+                                            // Disconnect this client because the server is shutting
+                                            // down and we need to disconnect all clients...
+                                            if (m_disconnect_all_clients) {
+                                                // ...unless we still have data for this client.
+                                                if (client->m_connection_busy) {
+                                                    // There is still data for this healthy-connected client.
+                                                    // Continue the I/O loop until all data is sent or an error is encountered.
+                                                    return false;
+                                                } else {
+                                                    // This is a healthy persistent connection (e.g. keep-alive)
+                                                    // but it's time to say goodbye.
+                                                    ;
+                                                }
+                                            } else {
+                                                // No reason to disconnect.
+                                                return false;
+                                            }
+                                        }
+                                        // No reason NOT to disconnect, log and remove.
+                                        LogDebug(BCLog::HTTP,
+                                                 "Disconnecting HTTP client %s (id=%llu)",
+                                                 client->m_origin,
+                                                 client->m_id);
+                                        return true;
+                                    });
+    if (erased > 0) {
+        // Report back to the main thread
+        m_connected_size.fetch_sub(erased, std::memory_order_relaxed);
     }
-    const char* query{evhttp_uri_get_query(uri_parsed)};
-    std::optional<std::string> result;
+}
 
-    if (query) {
-        // Parse the query string into a key-value queue and iterate over it
-        struct evkeyvalq params_q;
-        evhttp_parse_query_str(query, &params_q);
+void HTTPServer::ClearConnectedClients()
+{
+    Assume(!m_thread_socket_handler.joinable()); // must be called after JoinSocketsThreads()
+    if (m_connected.empty()) return;
+    LogWarning("Force-disconnecting %d HTTP client(s) that did not disconnect gracefully", m_connected.size());
+    m_connected_size.fetch_sub(m_connected.size(), std::memory_order_relaxed);
+    m_connected.clear();
+}
 
-        for (struct evkeyval* param{params_q.tqh_first}; param != nullptr; param = param->next.tqe_next) {
-            if (param->key == key) {
-                result = param->value;
-                break;
+void HTTPRemoteClient::ReadRequest(HTTPRequest& req)
+{
+    if (m_recv_buffer.empty()) return;
+
+    LineReader reader(m_recv_buffer, MAX_HEADERS_SIZE);
+
+    try {
+        switch (req.GetState()) {
+        case HTTPRequest::State::Init:
+            if (!req.LoadControlData(reader)) break;
+            req.SetState(HTTPRequest::State::NeedsHeaders);
+            [[fallthrough]];
+
+        case HTTPRequest::State::NeedsHeaders:
+            if (!req.LoadHeaders(reader)) break;
+            req.SetState(HTTPRequest::State::NeedsBody);
+            [[fallthrough]];
+
+        case HTTPRequest::State::NeedsBody:
+            if (!req.LoadBody(reader)) break;
+            req.SetState(HTTPRequest::State::Complete);
+            [[fallthrough]];
+
+        case HTTPRequest::State::Complete:
+            break;
+
+        case HTTPRequest::State::Error:
+            break;
+        }
+    } catch (...) {
+        // Don't try to read any more data for this request
+        req.SetState(HTTPRequest::State::Error);
+        // Clear the memory allocated to this client, caller must disconnect
+        m_recv_buffer.clear();
+        throw;
+    }
+
+    // Remove the bytes read out of the buffer.
+    m_recv_buffer.erase(
+        m_recv_buffer.begin(),
+        m_recv_buffer.begin() + reader.Consumed());
+}
+
+bool HTTPRemoteClient::MaybeSendBytesFromBuffer()
+{
+    // Send as much data from this client's buffer as we can
+    LOCK(m_send_mutex);
+    if (!m_send_buffer.empty()) {
+        // Socket flags (See kernel docs for send(2) and tcp(7) for more details).
+        // MSG_NOSIGNAL: If the remote end of the connection is closed,
+        //               fail with EPIPE (an error) as opposed to triggering
+        //               SIGPIPE which terminates the process.
+        // MSG_DONTWAIT: Makes the send operation non-blocking regardless of socket blocking mode.
+        // MSG_MORE:     We do not set this flag here because http responses are usually
+        //               small and we want the kernel to send them right away. Setting MSG_MORE
+        //               would "cork" the socket to prevent sending out partial frames.
+        int flags{MSG_NOSIGNAL | MSG_DONTWAIT};
+
+        // Try to send bytes through socket
+        ssize_t bytes_sent;
+        {
+            LOCK(m_sock_mutex);
+            bytes_sent = m_sock->Send(m_send_buffer.data(),
+                                      m_send_buffer.size(),
+                                      flags);
+        }
+
+        if (bytes_sent < 0) {
+            // Something went wrong
+            const int err{WSAGetLastError()};
+            if (!IOErrorIsPermanent(err)) {
+                // The error can be safely ignored, try the send again on the next I/O loop.
+                m_send_ready = true;
+                m_connection_busy = true;
+                return true;
+            } else {
+                // Unrecoverable error, log and disconnect client.
+                LogDebug(
+                    BCLog::HTTP,
+                    "Error sending HTTP response data to client %s (id=%llu): %s",
+                    m_origin,
+                    m_id,
+                    NetworkErrorString(err));
+                m_send_ready = false;
+                m_disconnect = true;
+
+                // Do not attempt to read from this client.
+                return false;
             }
         }
-        evhttp_clear_headers(&params_q);
+
+        // Successful send, remove sent bytes from our local buffer.
+        Assume(static_cast<size_t>(bytes_sent) <= m_send_buffer.size());
+        m_send_buffer.erase(m_send_buffer.begin(),
+                            m_send_buffer.begin() + bytes_sent);
+
+        LogDebug(
+            BCLog::HTTP,
+            "Sent %d bytes to client %s (id=%llu)",
+            bytes_sent,
+            m_origin,
+            m_id);
+
+        // This check is inside the if(!empty) block meaning "there was data but now its gone".
+        // We wouldn't want to change the flags if MaybeSendBytesFromBuffer() was called
+        // on an already-empty m_send_buffer because the connection might have just been opened.
+        if (m_send_buffer.empty()) {
+            m_send_ready = false;
+            m_connection_busy = false;
+
+            // Our work is done here
+            if (!m_keep_alive) {
+                m_disconnect = true;
+                // Do not attempt to read from this client.
+                return false;
+            }
+        } else {
+            // The send buffer isn't flushed yet, try to push more on the next loop.
+            m_send_ready = true;
+            m_connection_busy = true;
+        }
+
+        // Finally, reset idle timeout
+        m_idle_since = Now<SteadySeconds>();
     }
-    evhttp_uri_free(uri_parsed);
 
-    return result;
+    return true;
 }
 
-void RegisterHTTPHandler(const std::string &prefix, bool exactMatch, const HTTPRequestHandler &handler)
+bool InitHTTPServer()
 {
-    LogDebug(BCLog::HTTP, "Registering HTTP handler for %s (exactmatch %d)\n", prefix, exactMatch);
-    LOCK(g_httppathhandlers_mutex);
-    pathHandlers.emplace_back(prefix, exactMatch, handler);
+    // Create HTTPServer
+    g_http_server = std::make_unique<HTTPServer>(MaybeDispatchRequestToWorker);
+
+    if (!g_http_server->InitHTTPAllowList()) {
+        return false;
+    }
+
+    g_http_server->SetServerTimeout(std::chrono::seconds(gArgs.GetIntArg("-rpcservertimeout", DEFAULT_HTTP_SERVER_TIMEOUT)));
+
+    // Bind HTTP server to specified addresses
+    std::vector<std::pair<std::string, uint16_t>> endpoints{GetBindAddresses()};
+    bool bind_success{false};
+    for (const auto& [address_string, port] : endpoints) {
+        LogInfo("Binding RPC on address %s port %i", address_string, port);
+        const std::optional<CService> addr{Lookup(address_string, port, false)};
+        if (addr) {
+            if (addr->IsBindAny()) {
+                LogWarning("The RPC server is not safe to expose to untrusted networks such as the public internet");
+            }
+            auto result{g_http_server->BindAndStartListening(addr.value())};
+            if (!result) {
+                LogWarning("Binding RPC on address %s failed: %s", addr->ToStringAddrPort(), result.error());
+            } else {
+                bind_success = true;
+            }
+        } else {
+            LogWarning("Could not bind RPC on address %s port %i: Address lookup failed.", address_string, port);
+        }
+    }
+
+    if (!bind_success) {
+        LogError("Unable to bind any endpoint for RPC server");
+        return false;
+    }
+
+    LogDebug(BCLog::HTTP, "Initialized HTTP server");
+
+    g_max_queue_depth = std::max(gArgs.GetArg<int>("-rpcworkqueue", DEFAULT_HTTP_WORKQUEUE), 1);
+    LogDebug(BCLog::HTTP, "set work queue of depth %d\n", g_max_queue_depth);
+
+    return true;
 }
 
-void UnregisterHTTPHandler(const std::string &prefix, bool exactMatch)
+void StartHTTPServer()
 {
-    LOCK(g_httppathhandlers_mutex);
-    std::vector<HTTPPathHandler>::iterator i = pathHandlers.begin();
-    std::vector<HTTPPathHandler>::iterator iend = pathHandlers.end();
-    for (; i != iend; ++i)
-        if (i->prefix == prefix && i->exactMatch == exactMatch)
-            break;
-    if (i != iend)
-    {
-        LogDebug(BCLog::HTTP, "Unregistering HTTP handler for %s (exactmatch %d)\n", prefix, exactMatch);
-        pathHandlers.erase(i);
+    auto rpcThreads{std::max(gArgs.GetArg<int>("-rpcthreads", DEFAULT_HTTP_THREADS), 1)};
+    LogInfo("Starting HTTP server with %d worker threads", rpcThreads);
+    g_threadpool_http.Start(rpcThreads);
+    g_http_server->StartSocketsThreads();
+}
+
+void InterruptHTTPServer()
+{
+    LogDebug(BCLog::HTTP, "Interrupting HTTP server");
+    if (g_http_server) {
+        // Reject all new requests
+        g_http_server->SetRequestHandler(RejectRequest);
+    }
+
+    // Interrupt pool after disabling requests
+    g_threadpool_http.Interrupt();
+}
+
+void StopHTTPServer()
+{
+    LogDebug(BCLog::HTTP, "Stopping HTTP server");
+
+    LogDebug(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");
+    g_threadpool_http.Stop();
+
+    if (g_http_server) {
+        // Must precede DisconnectAllClients(): a connection accepted after
+        // GetConnectionsCount() returns 0 would survive into the destructor.
+        g_http_server->StopAccepting();
+        // Disconnect clients as their remaining responses are flushed
+        g_http_server->DisconnectAllClients();
+        // Wait 30 seconds for all disconnections
+        LogDebug(BCLog::HTTP, "Waiting for HTTP clients to disconnect gracefully");
+        const auto deadline{NodeClock::now() + 30s};
+        while (g_http_server->GetConnectionsCount() != 0) {
+            if (NodeClock::now() > deadline) {
+                LogWarning("Timeout waiting for HTTP clients to disconnect gracefully, continuing shutdown");
+                break;
+            }
+            std::this_thread::sleep_for(50ms);
+        }
+        // Break HTTPServer I/O loop: stop accepting connections, sending and receiving data
+        g_http_server->InterruptNet();
+        // Wait for HTTPServer I/O thread to exit
+        g_http_server->JoinSocketsThreads();
+        // Force-remove any clients that survived the graceful wait
+        g_http_server->ClearConnectedClients();
+        // Close all listening sockets
+        g_http_server->StopListening();
     }
+    LogDebug(BCLog::HTTP, "Stopped HTTP server");
 }
+} // namespace http_bitcoin
diff --git a/depend/bitcoin/src/httpserver.h b/depend/bitcoin/src/httpserver.h
index 76381a38..6730d3bb 100644
--- a/depend/bitcoin/src/httpserver.h
+++ b/depend/bitcoin/src/httpserver.h
@@ -5,10 +5,24 @@
 #ifndef BITCOIN_HTTPSERVER_H
 #define BITCOIN_HTTPSERVER_H
 
+#include <atomic>
 #include <functional>
+#include <memory>
 #include <optional>
 #include <span>
+#include <stdexcept>
 #include <string>
+#include <vector>
+
+#include <netaddress.h>
+#include <rpc/protocol.h>
+#include <util/byte_units.h>
+#include <util/expected.h>
+#include <util/sock.h>
+#include <util/strencodings.h>
+#include <util/string.h>
+#include <util/threadinterrupt.h>
+#include <util/time.h>
 
 namespace util {
 class SignalInterrupt;
@@ -17,40 +31,30 @@ class SignalInterrupt;
 /**
  * The default value for `-rpcthreads`. This number of threads will be created at startup.
  */
-static const int DEFAULT_HTTP_THREADS=16;
+inline constexpr int DEFAULT_HTTP_THREADS=16;
 
 /**
  * The default value for `-rpcworkqueue`. This is the maximum depth of the work queue,
  * we don't allocate this number of work queue items upfront.
  */
-static const int DEFAULT_HTTP_WORKQUEUE=64;
-
-static const int DEFAULT_HTTP_SERVER_TIMEOUT=30;
+inline constexpr int DEFAULT_HTTP_WORKQUEUE=64;
 
-struct evhttp_request;
-struct event_base;
-class CService;
-class HTTPRequest;
+inline constexpr int DEFAULT_HTTP_SERVER_TIMEOUT=30;
 
-/** Initialize HTTP server.
- * Call this before RegisterHTTPHandler or EventBase().
- */
-bool InitHTTPServer(const util::SignalInterrupt& interrupt);
-/** Start HTTP server.
- * This is separate from InitHTTPServer to give users race-condition-free time
- * to register their handlers between InitHTTPServer and StartHTTPServer.
- */
-void StartHTTPServer();
-/** Interrupt HTTP server threads */
-void InterruptHTTPServer();
-/** Stop HTTP server */
-void StopHTTPServer();
-
-/** Change logging level for libevent. */
-void UpdateHTTPServerLogging(bool enable);
+enum class HTTPRequestMethod {
+    UNKNOWN,
+    GET,
+    POST,
+    HEAD,
+    PUT
+};
 
+namespace http_bitcoin {
+    class HTTPRequest;
+}
 /** Handler for requests to a certain HTTP path */
-typedef std::function<void(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
+using HTTPRequestHandler = std::function<void(http_bitcoin::HTTPRequest* req, const std::string&)>;
+
 /** Register handler for prefix.
  * If multiple handlers match a prefix, the first-registered one will
  * be invoked.
@@ -59,127 +63,553 @@ void RegisterHTTPHandler(const std::string &prefix, bool exactMatch, const HTTPR
 /** Unregister handler for prefix */
 void UnregisterHTTPHandler(const std::string &prefix, bool exactMatch);
 
-/** Return evhttp event base. This can be used by submodules to
- * queue timers or custom events.
- */
-struct event_base* EventBase();
+namespace http_bitcoin {
+using util::LineReader;
 
-/** In-flight HTTP request.
- * Thin C++ wrapper around evhttp_request.
- */
-class HTTPRequest
+//! Shortest valid request line, used by libevent in evhttp_parse_request_line()
+inline constexpr size_t MIN_REQUEST_LINE_LENGTH = std::string_view("GET / HTTP/1.0").size();
+
+//! Maximum size of each headers line in an HTTP request,
+//! also the maximum size of all headers total.
+//! See https://github.com/bitcoin/bitcoin/pull/6859
+//! And libevent http.c evhttp_parse_headers_()
+inline constexpr size_t MAX_HEADERS_SIZE{8192};
+
+//! Maximum size of an HTTP request body
+inline constexpr uint64_t MAX_BODY_SIZE{32_MiB};
+
+//! Thrown when a request body exceeds MAX_BODY_SIZE (or *will* exceed, in chunked transfer)
+//! so the server can reply with more specific code 413 (content too large) vs general 400 (bad request)
+struct ContentTooLargeError : std::runtime_error {
+    using std::runtime_error::runtime_error;
+};
+
+class HTTPHeaders
 {
+public:
+    /**
+     * @param[in] key The field-name of the header to search for
+     * @returns The value of the first header that matches the provided key
+     *          nullopt if key is not found
+     */
+    std::optional<std::string> FindFirst(std::string_view key) const;
+    /**
+     * @param[in] key The field-name of the header to search for
+     * @returns Views into all values matching the provided key (valid while this object is alive)
+     */
+    std::vector<std::string_view> FindAll(std::string_view key) const;
+    void Write(std::string&& key, std::string&& value);
+    /**
+     * @param[in] key The field-name of the header to search for and delete
+     */
+    void RemoveAll(std::string_view key);
+    /**
+     * @param[in] reader A LineReader instance initialized with the client's receive buffer.
+     * @param[in] write  Whether or not to write the parsed data to the object after validation.
+     * @returns false if LineReader hits the end of the buffer before reading an
+     *                \n, meaning that we are still waiting on more data from the client.
+     *          true  after reading an entire HTTP headers section, terminated
+     *                by an empty line and \n.
+     * @throws on exceeded read limit and on bad headers syntax (e.g. no ":" in a line)
+     */
+    bool Read(util::LineReader& reader, bool write = true);
+    std::string Stringify() const;
+
 private:
-    struct evhttp_request* req;
-    const util::SignalInterrupt& m_interrupt;
-    bool replySent;
+    /**
+     * Headers can have duplicate field names, so we use a vector of key-value pairs instead of a map.
+     * https://httpwg.org/specs/rfc9110.html#rfc.section.5.2
+     */
+    std::vector<std::pair<std::string, std::string>> m_headers;
+
+    //! Track total bytes consumed in Read() for limit checks
+    size_t m_consumed{0};
+};
+
+struct HTTPVersion {
+    /**
+     * Default HTTP protocol version 1.1 is used by error responses
+     * when a request is unreadable.
+     */
+    /// @{
+    uint8_t major{1};
+    uint8_t minor{1};
+    /// @}
+};
+
+
+class HTTPResponse
+{
+public:
+    HTTPVersion m_version;
 
+    HTTPStatusCode m_status{HTTP_INTERNAL_SERVER_ERROR};
+    HTTPHeaders m_headers;
+
+    std::string StringifyHeaders() const;
+};
+
+class HTTPRemoteClient;
+
+class HTTPRequest
+{
 public:
-    explicit HTTPRequest(struct evhttp_request* req, const util::SignalInterrupt& interrupt, bool replySent = false);
-    ~HTTPRequest();
-
-    enum RequestMethod {
-        UNKNOWN,
-        GET,
-        POST,
-        HEAD,
-        PUT
+    HTTPRequestMethod m_method;
+    std::string m_target;
+    HTTPVersion m_version;
+    HTTPHeaders m_headers;
+    std::string m_body;
+
+    //! Pointer to the client that made the request so we know who to respond to.
+    std::weak_ptr<HTTPRemoteClient> m_client;
+
+    //! Response headers may be set in advance before response body is known
+    HTTPHeaders m_response_headers;
+
+    explicit HTTPRequest(const std::shared_ptr<HTTPRemoteClient>& client) : m_client{client} {}
+    //! Construct with a null client for unit tests
+    explicit HTTPRequest() : m_client{} {}
+
+    /**
+     * Methods that attempt to parse HTTP request fields line-by-line
+     * from a receive buffer.
+     * @param[in]   reader  A LineReader object constructed over a span of data.
+     * @returns     true    If the request field was parsed.
+     *              false   If there was not enough data in the buffer to complete the field.
+     * @throws      std::runtime_error if data is invalid.
+     */
+    /// @{
+    bool LoadControlData(LineReader& reader);
+    bool LoadHeaders(LineReader& reader);
+    bool LoadBody(LineReader& reader);
+    /// @}
+
+    void WriteReply(HTTPStatusCode status, std::span<const std::byte> reply_body = {});
+    void WriteReply(HTTPStatusCode status, std::string_view reply_body_view)
+    {
+        WriteReply(status, std::as_bytes(std::span{reply_body_view}));
+    }
+
+    // These methods reimplement the API from http_libevent::HTTPRequest
+    // for downstream JSONRPC and REST modules.
+    std::string GetURI() const { return m_target; }
+    CService GetPeer() const;
+    HTTPRequestMethod GetRequestMethod() const { return m_method; }
+    std::optional<std::string> GetQueryParameter(std::string_view key) const;
+    std::pair<bool, std::string> GetHeader(std::string_view hdr) const;
+    std::string ReadBody() const { return m_body; }
+    void WriteHeader(std::string&& hdr, std::string&& value);
+
+    enum class State {
+        Init,
+        NeedsHeaders,
+        NeedsBody,
+        Complete,
+        Error
     };
+    State GetState() const { return m_state; }
+    void SetState(State state) { m_state = state; }
+
+    // If a large request is sent with "Transfer-encoding: chunked" we may
+    // read the chunk size in a separate I/O loop iteration than the chunk
+    // of data itself. Store the chunk size value here until the chunk is read.
+    std::optional<uint64_t> m_chunk_size;
+    // We may also read a large chunk over multiple loop iterations.
+    // Track the progress of the chunk here.
+    uint64_t m_chunk_read{0};
 
-    /** Get requested URI.
+private:
+    State m_state = State::Init;
+};
+
+class HTTPServer
+{
+public:
+    /**
+     * Each connection is assigned an unique id of this type.
      */
-    std::string GetURI() const;
+    using Id = uint64_t;
+
+    explicit HTTPServer(std::function<void(std::unique_ptr<HTTPRequest>&&)> func)
+        : m_request_dispatcher{std::move(func)} {}
 
-    /** Get CService (address:ip) for the origin of the http request.
+    virtual ~HTTPServer()
+    {
+        Assume(!m_thread_socket_handler.joinable()); // Missing call to JoinSocketsThreads()
+        Assume(m_connected.empty()); // Missing call to DisconnectClients(), or disconnect flags not set
+        Assume(m_listen.empty()); // Missing call to StopListening()
+    }
+
+    /**
+     * Parse the user's -rpcallowip settings and populate m_allow_subnets
      */
-    CService GetPeer() const;
+    bool InitHTTPAllowList();
 
-    /** Get request method.
+    /**
+     * Bind to a new address:port, start listening and add the listen socket to `m_listen`.
+     * @param[in] to Where to bind.
+     * @returns {} or the reason for failure.
      */
-    RequestMethod GetRequestMethod() const;
+    util::Expected<void, std::string> BindAndStartListening(const CService& to);
 
-    /** Get the query parameter value from request uri for a specified key, or std::nullopt if the
-     * key is not found.
-     *
-     * If the query string contains duplicate keys, the first value is returned. Many web frameworks
-     * would instead parse this as an array of values, but this is not (yet) implemented as it is
-     * currently not needed in any of the endpoints.
-     *
-     * @param[in] key represents the query parameter of which the value is returned
+    /**
+     * Stop listening by closing all listening sockets.
      */
-    std::optional<std::string> GetQueryParameter(const std::string& key) const;
+    void StopListening();
 
     /**
-     * Get the request header specified by hdr, or an empty string.
-     * Return a pair (isPresent,string).
+     * Get the number of sockets the server is bound to and listening on
      */
-    std::pair<bool, std::string> GetHeader(const std::string& hdr) const;
+    size_t GetListeningSocketCount() const { return m_listen.size(); }
 
     /**
-     * Read request body.
-     *
-     * @note As this consumes the underlying buffer, call this only once.
-     * Repeated calls will return an empty string.
+     * Get the number of HTTPRemoteClients we are connected to
      */
-    std::string ReadBody();
+    size_t GetConnectionsCount() const { return m_connected_size.load(std::memory_order_acquire); }
 
     /**
-     * Write output header.
-     *
-     * @note call this before calling WriteErrorReply or Reply.
+     * Start the necessary threads for sockets IO.
      */
-    void WriteHeader(const std::string& hdr, const std::string& value);
+    void StartSocketsThreads();
 
     /**
-     * Write HTTP reply.
-     * nStatus is the HTTP status code to send.
-     * reply is the body of the reply. Keep it empty to send a standard message.
-     *
-     * @note Can be called only once. As this will give the request back to the
-     * main thread, do not call any other HTTPRequest methods after calling this.
+     * Join (wait for) the threads started by `StartSocketsThreads()` to exit.
      */
-    void WriteReply(int nStatus, std::string_view reply = "")
+    void JoinSocketsThreads();
+
+    /**
+     * Stop network activity
+     */
+    void InterruptNet() { m_interrupt_net(); }
+
+    /**
+     * Start disconnecting clients when possible in the I/O loop
+     */
+    void DisconnectAllClients() { m_disconnect_all_clients = true; }
+
+    /**
+     * Update the request handler method.
+     * Used for shutdown to reject new requests.
+     */
+    void SetRequestHandler(std::function<void(std::unique_ptr<HTTPRequest>&&)> func)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_request_dispatcher_mutex)
     {
-        WriteReply(nStatus, std::as_bytes(std::span{reply}));
+        WITH_LOCK(m_request_dispatcher_mutex,
+                  m_request_dispatcher = std::move(func));
     }
-    void WriteReply(int nStatus, std::span<const std::byte> reply);
+
+    /**
+     * Stop accepting new connections in the I/O loop.
+     * Must be called first in StopHTTPServer() before DisconnectAllClients().
+     * A connection accepted after the "wait for 0 connections" loop exits would
+     * remain in m_connected when the destructor is called.
+     */
+    void StopAccepting() { m_stop_accepting = true; }
+
+    /**
+     * Set the idle client timeout (-rpcservertimeout)
+     */
+    void SetServerTimeout(std::chrono::seconds seconds) { m_rpcservertimeout = seconds; }
+
+    /**
+     * Force-remove all remaining clients from m_connected without waiting for
+     * graceful disconnection. Must only be called after JoinSocketsThreads().
+     */
+    void ClearConnectedClients();
+
+private:
+    /**
+     * List of listening sockets.
+     */
+    std::vector<std::shared_ptr<Sock>> m_listen;
+
+    /**
+     * The id to assign to the next created connection.
+     */
+    std::atomic<Id> m_next_id{0};
+
+    /**
+     * List of HTTPRemoteClients with connected sockets.
+     * Connections will only be added and removed in the I/O thread, but
+     * shared pointers may be passed to worker threads to handle requests
+     * and send replies.
+     */
+    std::vector<std::shared_ptr<HTTPRemoteClient>> m_connected;
+
+    /**
+     * Flag used during shutdown to stop accepting new connections.
+     * Set by main thread and read by the I/O thread.
+     */
+    std::atomic_bool m_stop_accepting{false};
+
+    /**
+     * Flag used during shutdown.
+     * Overrides HTTPRemoteClient flags m_keep_alive and m_connection_busy.
+     * Set by main thread and read by the I/O thread.
+     */
+    std::atomic_bool m_disconnect_all_clients{false};
+
+    /**
+     * The number of connected sockets.
+     * Updated from the I/O thread but safely readable from
+     * the main thread without locks.
+     */
+    std::atomic<size_t> m_connected_size{0};
+
+    /**
+     * Info about which socket has which event ready and a reverse map
+     * back to the HTTPRemoteClient that owns the socket.
+     */
+    struct IOReadiness {
+        /**
+         * Map of socket -> socket events. For example:
+         * socket1 -> { requested = SendEvent|RecvEvent, occurred = RecvEvent }
+         * socket2 -> { requested = SendEvent, occurred = SendEvent }
+         */
+        Sock::EventsPerSock events_per_sock;
+
+        /**
+         * Map of socket -> HTTPRemoteClient. For example:
+         * socket1 -> HTTPRemoteClient{ id=23 }
+         * socket2 -> HTTPRemoteClient{ id=56 }
+         */
+        std::unordered_map<Sock::EventsPerSock::key_type,
+                           std::shared_ptr<HTTPRemoteClient>,
+                           Sock::HashSharedPtrSock,
+                           Sock::EqualSharedPtrSock>
+            httpclients_per_sock;
+    };
+
+    /**
+     * This is signaled when network activity should cease.
+     */
+    CThreadInterrupt m_interrupt_net;
+
+    /**
+     * Thread that sends to and receives from sockets and accepts connections.
+     * Executes the I/O loop of the server.
+     */
+    std::thread m_thread_socket_handler;
+
+    /*
+     * What to do with HTTP requests once received, validated and parsed.
+     * Set in main thread by server start and interrupt but read in
+     * worker threads.
+     */
+    /// @{
+    mutable Mutex m_request_dispatcher_mutex;
+    std::function<void(std::unique_ptr<HTTPRequest>&&)> m_request_dispatcher GUARDED_BY(m_request_dispatcher_mutex);
+    /// @}
+
+    /**
+     * Idle timeout after which clients are disconnected
+     */
+    std::chrono::seconds m_rpcservertimeout{DEFAULT_HTTP_SERVER_TIMEOUT};
+
+    /**
+     * List of subnets to allow HTTP connections from
+     */
+    std::vector<CSubNet> m_allow_subnets;
+
+    /**
+     * Check an incoming connection's source IP against the allow list
+     */
+    bool ClientAllowed(const CNetAddr& netaddr) const;
+
+    /**
+     * Accept a connection.
+     * @param[in] listen_sock Socket on which to accept the connection.
+     * @param[out] addr Address of the peer that was accepted.
+     * @return Newly created socket for the accepted connection.
+     */
+    std::unique_ptr<Sock> AcceptConnection(const Sock& listen_sock, CService& addr);
+
+    /**
+     * Generate an id for a newly created connection.
+     */
+    Id GetNewId();
+
+    /**
+     * After a new socket with a client has been created, configure its flags,
+     * make a new HTTPRemoteClient and Id and save its shared pointer.
+     * @param[in] sock The newly created socket.
+     * @param[in] addr Address of the new peer.
+     */
+    void NewSockAccepted(std::unique_ptr<Sock>&& sock, const CService& addr);
+
+    /**
+     * Do the read/write for connected sockets that are ready for IO.
+     * @param[in] io_readiness Which sockets are ready and their corresponding HTTPRemoteClients.
+     */
+    void SocketHandlerConnected(const IOReadiness& io_readiness) const
+        EXCLUSIVE_LOCKS_REQUIRED(!m_request_dispatcher_mutex);
+
+    /**
+     * Accept incoming connections, one from each read-ready listening socket.
+     * @param[in] events_per_sock Sockets that are ready for IO.
+     */
+    void SocketHandlerListening(const Sock::EventsPerSock& events_per_sock);
+
+    /**
+     * Generate a collection of sockets to check for IO readiness.
+     * @return Sockets to check for readiness plus an aux map to find the
+     * corresponding HTTPRemoteClient given a socket.
+     */
+    IOReadiness GenerateWaitSockets() const;
+
+    /**
+     * Check connected and listening sockets for IO readiness and process them accordingly.
+     * This is the main I/O loop of the server.
+     */
+    void ThreadSocketHandler() EXCLUSIVE_LOCKS_REQUIRED(!m_request_dispatcher_mutex);
+
+    /**
+     * Try to read HTTPRequests from a client's receive buffer.
+     * Complete requests are dispatched, incomplete requests are
+     * left in the buffer to wait for more data. Some read errors
+     * will mark this client for disconnection.
+     * @param[in] client The HTTPRemoteClient to read requests from
+     */
+    void MaybeDispatchRequestsFromClient(const std::shared_ptr<HTTPRemoteClient>& client) const
+        EXCLUSIVE_LOCKS_REQUIRED(!m_request_dispatcher_mutex);
+
+    /**
+     * Close underlying socket connections for flagged clients
+     * by removing their shared pointer from m_connected. If an HTTPRemoteClient
+     * is busy in a worker thread, its connection will be closed once that
+     * job is done and the HTTPRequest is out of scope.
+     */
+    void DisconnectClients();
 };
 
-/** Get the query parameter value from request uri for a specified key, or std::nullopt if the key
- * is not found.
- *
- * If the query string contains duplicate keys, the first value is returned. Many web frameworks
- * would instead parse this as an array of values, but this is not (yet) implemented as it is
- * currently not needed in any of the endpoints.
- *
- * Helper function for HTTPRequest::GetQueryParameter.
- *
- * @param[in] uri is the entire request uri
- * @param[in] key represents the query parameter of which the value is returned
- */
-std::optional<std::string> GetQueryParameterFromUri(const char* uri, const std::string& key);
+std::optional<std::string> GetQueryParameterFromUri(std::string_view uri, std::string_view key);
 
-/** Event class. This can be used either as a cross-thread trigger or as a timer.
- */
-class HTTPEvent
+class HTTPRemoteClient
 {
 public:
-    /** Create a new event.
-     * deleteWhenTriggered deletes this event object after the event is triggered (and the handler called)
-     * handler is the handler to call when the event is triggered.
+    //! ID provided by HTTPServer upon connection and instantiation
+    const HTTPServer::Id m_id;
+
+    //! Remote address of connected client
+    const CService m_addr;
+
+    //! IP:port of connected client, cached for logging purposes
+    const std::string m_origin;
+
+    /**
+     * In lieu of an intermediate transport class like p2p uses,
+     * we copy data from the socket buffer to the client object
+     * and attempt to read HTTP requests from here.
      */
-    HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void()>& handler);
-    ~HTTPEvent();
+    std::string m_recv_buffer{};
 
-    /** Trigger the event. If tv is 0, trigger it immediately. Otherwise trigger it after
-     * the given time has elapsed.
+    //! Requests from a client must be processed in the order in which
+    //! they were received, blocking on a per-client basis. We read
+    //! one request at a time from the socket buffer then pass it to a worker.
+    std::unique_ptr<HTTPRequest> m_req;
+
+    //! Set to true by the I/O thread when a request is popped off
+    //! and passed to a worker thread, reset to false by the worker thread.
+    std::atomic_bool m_req_busy{false};
+
+    /**
+     * Response data destined for this client.
+     * Written to by http worker threads, read and erased by HTTPServer I/O thread
      */
-    void trigger(struct timeval* tv);
+    /// @{
+    Mutex m_send_mutex;
+    std::vector<std::byte> m_send_buffer GUARDED_BY(m_send_mutex);
+    /// @}
 
-    bool deleteWhenTriggered;
-    std::function<void()> handler;
-private:
-    struct event* ev;
+    /**
+    * Set true by worker threads after writing a response to m_send_buffer.
+    * Set false by the HTTPServer I/O thread after flushing m_send_buffer.
+    * Checked in the HTTPServer I/O loop to decide whether to poll the socket for
+    * writeability or readability.
+    * Guarded by m_send_mutex so it stays consistent with m_send_buffer's emptiness:
+    * the two must always be updated together under the same lock.
+    */
+    bool m_send_ready GUARDED_BY(m_send_mutex){false};
+
+    /**
+     * Mutex that serializes the Send() and Recv() calls on `m_sock`. Reading
+     * from the client occurs in the I/O thread but writing back to a client
+     * may occur in a worker thread.
+     */
+    Mutex m_sock_mutex;
+
+    /**
+     * Underlying socket.
+     * `shared_ptr` (instead of `unique_ptr`) is used to avoid premature close of the
+     * underlying file descriptor by one thread while another thread is poll(2)-ing
+     * it for activity.
+     * @see https://github.com/bitcoin/bitcoin/issues/21744 for details.
+     */
+    std::shared_ptr<Sock> m_sock GUARDED_BY(m_sock_mutex);
+
+    //! Initialized to true while server waits for first request from client.
+    //! Set to false after data is written to m_send_buffer and then that buffer is flushed to client.
+    //! Reset to true when we receive new request data from client.
+    //! Checked during DisconnectClients() and set by read/write operations
+    //! called in either the HTTPServer I/O loop or by a worker thread during an "optimistic send".
+    //! `m_connection_busy=true` can be overridden by `m_disconnect=true` (we disconnect).
+    std::atomic_bool m_connection_busy{true};
+
+    //! Client has requested to keep the connection open after all requests have been responded to.
+    //! Set by (potentially multiple) worker threads and checked in the HTTPServer I/O loop.
+    //! `m_keep_alive=true` can be overridden `by HTTPServer.m_disconnect_all_clients` (we disconnect).
+    std::atomic_bool m_keep_alive{false};
+
+    //! Flag this client for disconnection on next loop.
+    //! Either we have encountered a permanent error, or both sides of the socket are done
+    //! with the connection, e.g. our reply to a "Connection: close" request has been sent.
+    //! Might be set in a worker thread or in the I/O thread. When set to `true` we disconnect,
+    //! possibly overriding all other disconnect flags.
+    std::atomic_bool m_disconnect{false};
+
+    //! Timestamp of last send or receive activity, used for -rpcservertimeout.
+    //! Due to optimistic sends it may be updated in either a worker thread or in the
+    //! I/O thread. It is checked in the I/O thread to disconnect idle clients.
+    std::atomic<SteadySeconds> m_idle_since;
+
+    explicit HTTPRemoteClient(HTTPServer::Id id, const CService& addr, std::unique_ptr<Sock> socket)
+        : m_id(id), m_addr(addr), m_origin(addr.ToStringAddrPort()), m_sock{std::move(socket)}, m_idle_since{Now<SteadySeconds>()} {}
+
+    // Disable copies (should only be used as shared pointers)
+    HTTPRemoteClient(const HTTPRemoteClient&) = delete;
+    HTTPRemoteClient& operator=(const HTTPRemoteClient&) = delete;
+
+    /**
+     * Try to read an HTTP request from the receive buffer.
+     * Updates HTTPRequest.m_state and drains buffer on error.
+     * @param[in]   req     A HTTPRequest to read into
+     * @throws std::runtime_error if request is unreadable or violates protocol
+     */
+    void ReadRequest(HTTPRequest& req);
+
+    /**
+     * Push data (if there is any) from client's m_send_buffer to the connected socket.
+     * @returns false if we are done with this client and HTTPServer can skip the next read operation from it.
+     */
+    bool MaybeSendBytesFromBuffer() EXCLUSIVE_LOCKS_REQUIRED(!m_send_mutex, !m_sock_mutex);
 };
 
+/** Initialize HTTP server.
+ * Call this before RegisterHTTPHandler or EventBase().
+ */
+bool InitHTTPServer();
+
+/** Start HTTP server.
+ * This is separate from InitHTTPServer to give users race-condition-free time
+ * to register their handlers between InitHTTPServer and StartHTTPServer.
+ */
+void StartHTTPServer();
+
+/** Interrupt HTTP server threads */
+void InterruptHTTPServer();
+
+/** Stop HTTP server */
+void StopHTTPServer();
+} // namespace http_bitcoin
+
 #endif // BITCOIN_HTTPSERVER_H
diff --git a/depend/bitcoin/src/i2p.cpp b/depend/bitcoin/src/i2p.cpp
index 04093ea1..f71fd656 100644
--- a/depend/bitcoin/src/i2p.cpp
+++ b/depend/bitcoin/src/i2p.cpp
@@ -8,7 +8,6 @@
 #include <compat/endian.h>
 #include <crypto/sha256.h>
 #include <i2p.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <random.h>
@@ -16,6 +15,7 @@
 #include <sync.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/readwritefile.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
@@ -164,7 +164,7 @@ bool Session::Accept(Connection& conn)
 
     while (!m_interrupt->interrupted()) {
         Sock::Event occurred;
-        if (!conn.sock->Wait(MAX_WAIT_FOR_IO, Sock::RECV, &occurred)) {
+        if (!conn.sock->Wait(MAX_WAIT_FOR_IO, Sock::RecvEvent, &occurred)) {
             errmsg = "wait on socket failed";
             break;
         }
@@ -285,7 +285,7 @@ std::string Session::Reply::Get(const std::string& key) const
     const auto& pos = keys.find(key);
     if (pos == keys.end() || !pos->second.has_value()) {
         throw std::runtime_error(
-            strprintf("Missing %s= in the reply to \"%s\": \"%s\"", key, request, full));
+            strprintf("Missing %s= in the reply to \"%s\"", key, request));
     }
     return pos->second.value();
 }
@@ -320,7 +320,7 @@ Session::Reply Session::SendRequestAndGetReply(const Sock& sock,
 
     if (check_result_ok && reply.Get("RESULT") != "OK") {
         throw std::runtime_error(
-            strprintf("Unexpected reply to \"%s\": \"%s\"", request, reply.full));
+            strprintf("Reply to \"%s\": had a RESULT not equal to OK.", reply.request));
     }
 
     return reply;
@@ -352,7 +352,7 @@ void Session::CheckControlSock()
 
 void Session::DestGenerate(const Sock& sock)
 {
-    // https://geti2p.net/spec/common-structures#key-certificates
+    // https://i2p.net/en/docs/specs/common-structures/#key-certificates
     // "7" or "EdDSA_SHA512_Ed25519" - "Recent Router Identities and Destinations".
     // Use "7" because i2pd <2.24.0 does not recognize the textual form.
     // If SIGNATURE_TYPE is not specified, then the default one is DSA_SHA1.
@@ -375,7 +375,7 @@ void Session::GenerateAndSavePrivateKey(const Sock& sock)
 
 Binary Session::MyDestination() const
 {
-    // From https://geti2p.net/spec/common-structures#destination:
+    // From https://i2p.net/en/docs/specs/common-structures/#destination:
     // "They are 387 bytes plus the certificate length specified at bytes 385-386, which may be
     // non-zero"
     static constexpr size_t DEST_LEN_BASE = 387;
diff --git a/depend/bitcoin/src/i2p.h b/depend/bitcoin/src/i2p.h
index 0eb005dd..3da2c105 100644
--- a/depend/bitcoin/src/i2p.h
+++ b/depend/bitcoin/src/i2p.h
@@ -48,7 +48,7 @@ namespace sam {
  * The longest known message is ~1400 bytes, so this is high enough not to be triggered during
  * normal operation, yet low enough to avoid a malicious proxy from filling our memory.
  */
-static constexpr size_t MAX_MSG_SIZE{65536};
+inline constexpr size_t MAX_MSG_SIZE{65'536};
 
 /**
  * I2P SAM session.
@@ -193,7 +193,7 @@ class Session
 
     /**
      * Derive own destination from `m_private_key`.
-     * @see https://geti2p.net/spec/common-structures#destination
+     * @see https://i2p.net/en/docs/specs/common-structures/#destination
      * @return an I2P destination
      */
     Binary MyDestination() const EXCLUSIVE_LOCKS_REQUIRED(m_mutex);
@@ -240,7 +240,7 @@ class Session
 
     /**
      * The private key of this peer.
-     * @see The reply to the "DEST GENERATE" command in https://geti2p.net/en/docs/api/samv3
+     * @see The reply to the "DEST GENERATE" command in https://i2p.net/en/docs/api/samv3
      */
     Binary m_private_key GUARDED_BY(m_mutex);
 
@@ -251,7 +251,7 @@ class Session
      * other connections to the SAM service to accept incoming I2P
      * connections and make outgoing ones.
      * If not connected then this unique_ptr will be empty.
-     * See https://geti2p.net/en/docs/api/samv3
+     * See https://i2p.net/en/docs/api/samv3
      */
     std::unique_ptr<Sock> m_control_sock GUARDED_BY(m_mutex);
 
diff --git a/depend/bitcoin/src/index/base.cpp b/depend/bitcoin/src/index/base.cpp
index bb41cc2a..5820448b 100644
--- a/depend/bitcoin/src/index/base.cpp
+++ b/depend/bitcoin/src/index/base.cpp
@@ -65,13 +65,14 @@ CBlockLocator GetLocator(interfaces::Chain& chain, const uint256& block_hash)
     return locator;
 }
 
-BaseIndex::DB::DB(const fs::path& path, size_t n_cache_size, bool f_memory, bool f_wipe, bool f_obfuscate) :
+BaseIndex::DB::DB(const fs::path& path, size_t n_cache_size, bool f_memory, bool f_wipe, bool f_obfuscate, bool f_bloom) :
     CDBWrapper{DBParams{
         .path = path,
         .cache_bytes = n_cache_size,
         .memory_only = f_memory,
         .wipe_data = f_wipe,
         .obfuscate = f_obfuscate,
+        .bloom_filter = f_bloom,
         .options = [] { DBOptions options; node::ReadDatabaseArgs(gArgs, options); return options; }()}}
 {}
 
@@ -92,8 +93,8 @@ void BaseIndex::DB::WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator
     batch.Write(DB_BEST_BLOCK, locator);
 }
 
-BaseIndex::BaseIndex(std::unique_ptr<interfaces::Chain> chain, std::string name)
-    : m_chain{std::move(chain)}, m_name{std::move(name)} {}
+BaseIndex::BaseIndex(std::unique_ptr<interfaces::Chain> chain, std::string name, std::string thread_name)
+    : m_chain{std::move(chain)}, m_name{std::move(name)}, m_thread_name{std::move(thread_name)} {}
 
 BaseIndex::~BaseIndex()
 {
@@ -273,12 +274,23 @@ void BaseIndex::Sync()
     }
 }
 
-bool BaseIndex::Commit()
+void BaseIndex::Commit()
 {
     // Don't commit anything if we haven't indexed any block yet
     // (this could happen if init is interrupted).
     bool ok = m_best_block_index != nullptr;
     if (ok) {
+        // Don't commit if the index best block is not an ancestor of the chainstate's last flushed
+        // block. Otherwise, after an unclean shutdown, the index could be
+        // persisted ahead of a chainstate it can no longer roll back to, which
+        // would corrupt indexes with state (e.g. coinstatsindex).
+        const CBlockIndex* index_tip = m_best_block_index.load();
+        const CBlockIndex* last_flushed = WITH_LOCK(::cs_main, return m_chainstate->GetLastFlushedBlock());
+        if (!last_flushed || last_flushed->GetAncestor(index_tip->nHeight) != index_tip) {
+            LogDebug(BCLog::COINDB, "Skipping commit, index is ahead of flushed chainstate (index height %d, last flush at height %d)",
+                    index_tip->nHeight, last_flushed ? last_flushed->nHeight : -1);
+            return;
+        }
         CDBBatch batch(GetDB());
         ok = CustomCommit(batch);
         if (ok) {
@@ -288,9 +300,7 @@ bool BaseIndex::Commit()
     }
     if (!ok) {
         LogError("Failed to commit latest %s state", GetName());
-        return false;
     }
-    return true;
 }
 
 bool BaseIndex::Rewind(const CBlockIndex* current_tip, const CBlockIndex* new_tip)
@@ -460,7 +470,7 @@ bool BaseIndex::StartBackgroundSync()
 {
     if (!m_init) throw std::logic_error("Error: Cannot start a non-initialized index");
 
-    m_thread_sync = std::thread(&util::TraceThread, GetName(), [this] { Sync(); });
+    m_thread_sync = std::thread(&util::TraceThread, m_thread_name, [this] { Sync(); });
     return true;
 }
 
diff --git a/depend/bitcoin/src/index/base.h b/depend/bitcoin/src/index/base.h
index 63f60be0..731bbd26 100644
--- a/depend/bitcoin/src/index/base.h
+++ b/depend/bitcoin/src/index/base.h
@@ -65,14 +65,15 @@ class BaseIndex : public CValidationInterface
     {
     public:
         DB(const fs::path& path, size_t n_cache_size,
-           bool f_memory = false, bool f_wipe = false, bool f_obfuscate = false);
+           bool f_memory = false, bool f_wipe = false, bool f_obfuscate = false, bool f_bloom = true);
+        virtual ~DB() = default;
 
         /// Read block locator of the chain that the index is in sync with.
         /// Note, the returned locator will be empty if no record exists.
-        CBlockLocator ReadBestBlock() const;
+        virtual CBlockLocator ReadBestBlock() const;
 
         /// Write block locator of the chain that the index is in sync with.
-        void WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator);
+        virtual void WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator);
     };
 
 private:
@@ -94,14 +95,10 @@ class BaseIndex : public CValidationInterface
     CThreadInterrupt m_interrupt;
 
     /// Write the current index state (eg. chain block locator and subclass-specific items) to disk.
-    ///
-    /// Recommendations for error handling:
-    /// If called on a successor of the previous committed best block in the index, the index can
-    /// continue processing without risk of corruption, though the index state will need to catch up
-    /// from further behind on reboot. If the new state is not a successor of the previous state (due
-    /// to a chain reorganization), the index must halt until Commit succeeds or else it could end up
-    /// getting corrupted.
-    bool Commit();
+    /// Will skip the commit if no block has been indexed yet or if the index's best block is
+    /// ahead of the chainstate's last flushed block. This avoids persisting state an unclean shutdown
+    /// could not roll back from. A later call commits when the chainstate has flushed far enough.
+    void Commit();
 
     /// Loop over disconnected blocks and call CustomRemove.
     bool Rewind(const CBlockIndex* current_tip, const CBlockIndex* new_tip);
@@ -117,6 +114,7 @@ class BaseIndex : public CValidationInterface
     std::unique_ptr<interfaces::Chain> m_chain;
     Chainstate* m_chainstate{nullptr};
     const std::string m_name;
+    const std::string m_thread_name;
 
     void BlockConnected(const kernel::ChainstateRole& role, const std::shared_ptr<const CBlock>& block, const CBlockIndex* pindex) override;
 
@@ -141,7 +139,7 @@ class BaseIndex : public CValidationInterface
     void SetBestBlockIndex(const CBlockIndex* block);
 
 public:
-    BaseIndex(std::unique_ptr<interfaces::Chain> chain, std::string name);
+    BaseIndex(std::unique_ptr<interfaces::Chain> chain, std::string name, std::string thread_name);
     /// Destructor interrupts sync thread if running and blocks until it exits.
     virtual ~BaseIndex();
 
@@ -167,6 +165,7 @@ class BaseIndex : public CValidationInterface
     /// Starts the initial sync process on a background thread.
     [[nodiscard]] bool StartBackgroundSync();
 
+    /// \anchor index_sync
     /// Sync the index with the block index starting from the current best block.
     /// Intended to be run in its own thread, m_thread_sync, and can be
     /// interrupted with m_interrupt. Once the index gets in sync, the m_synced
diff --git a/depend/bitcoin/src/index/blockfilterindex.cpp b/depend/bitcoin/src/index/blockfilterindex.cpp
index d4fd7025..5c4a1813 100644
--- a/depend/bitcoin/src/index/blockfilterindex.cpp
+++ b/depend/bitcoin/src/index/blockfilterindex.cpp
@@ -61,6 +61,15 @@ constexpr size_t CF_HEADERS_CACHE_MAX_SZ{2000};
 
 namespace {
 
+std::string BlockFilterThreadName(BlockFilterType filter_type)
+{
+    switch (filter_type) {
+    case BlockFilterType::BASIC: return "blkfltbscidx";
+    case BlockFilterType::INVALID: return "";
+    } // no default case, so the compiler can warn about missing cases
+    assert(false);
+}
+
 struct DBVal {
     uint256 hash;
     uint256 header;
@@ -75,7 +84,7 @@ static std::map<BlockFilterType, BlockFilterIndex> g_filter_indexes;
 
 BlockFilterIndex::BlockFilterIndex(std::unique_ptr<interfaces::Chain> chain, BlockFilterType filter_type,
                                    size_t n_cache_size, bool f_memory, bool f_wipe)
-    : BaseIndex(std::move(chain), BlockFilterTypeName(filter_type) + " block filter index")
+    : BaseIndex(std::move(chain), BlockFilterTypeName(filter_type) + " block filter index", BlockFilterThreadName(filter_type))
     , m_filter_type(filter_type)
 {
     const std::string& filter_name = BlockFilterTypeName(filter_type);
diff --git a/depend/bitcoin/src/index/blockfilterindex.h b/depend/bitcoin/src/index/blockfilterindex.h
index 0bb4a74e..12b57411 100644
--- a/depend/bitcoin/src/index/blockfilterindex.h
+++ b/depend/bitcoin/src/index/blockfilterindex.h
@@ -25,10 +25,10 @@ class BlockFilter;
 class CBlockIndex;
 enum class BlockFilterType : uint8_t;
 
-static const char* const DEFAULT_BLOCKFILTERINDEX = "0";
+inline constexpr const char* DEFAULT_BLOCKFILTERINDEX{"0"};
 
 /** Interval between compact filter checkpoints. See BIP 157. */
-static constexpr int CFCHECKPT_INTERVAL = 1000;
+inline constexpr int CFCHECKPT_INTERVAL = 1000;
 
 /**
  * BlockFilterIndex is used to store and retrieve block filters, hashes, and headers for a range of
diff --git a/depend/bitcoin/src/index/coinstatsindex.cpp b/depend/bitcoin/src/index/coinstatsindex.cpp
index 80a6d8df..204f4341 100644
--- a/depend/bitcoin/src/index/coinstatsindex.cpp
+++ b/depend/bitcoin/src/index/coinstatsindex.cpp
@@ -87,7 +87,7 @@ struct DBVal {
 std::unique_ptr<CoinStatsIndex> g_coin_stats_index;
 
 CoinStatsIndex::CoinStatsIndex(std::unique_ptr<interfaces::Chain> chain, size_t n_cache_size, bool f_memory, bool f_wipe)
-    : BaseIndex(std::move(chain), "coinstatsindex")
+    : BaseIndex(std::move(chain), "coinstatsindex", "coinstatsidx")
 {
     // An earlier version of the index used "indexes/coinstats" but it contained
     // a bug and is superseded by a fixed version at "indexes/coinstatsindex".
diff --git a/depend/bitcoin/src/index/coinstatsindex.h b/depend/bitcoin/src/index/coinstatsindex.h
index 0e26fba5..fe61cbc7 100644
--- a/depend/bitcoin/src/index/coinstatsindex.h
+++ b/depend/bitcoin/src/index/coinstatsindex.h
@@ -22,7 +22,7 @@ namespace kernel {
 struct CCoinsStats;
 }
 
-static constexpr bool DEFAULT_COINSTATSINDEX{false};
+inline constexpr bool DEFAULT_COINSTATSINDEX{false};
 
 /**
  * CoinStatsIndex maintains statistics on the UTXO set.
diff --git a/depend/bitcoin/src/index/db_key.h b/depend/bitcoin/src/index/db_key.h
index b7334c81..ffea70db 100644
--- a/depend/bitcoin/src/index/db_key.h
+++ b/depend/bitcoin/src/index/db_key.h
@@ -7,9 +7,9 @@
 
 #include <dbwrapper.h>
 #include <interfaces/types.h>
-#include <logging.h>
 #include <serialize.h>
 #include <uint256.h>
+#include <util/log.h>
 
 #include <cstdint>
 #include <ios>
@@ -26,8 +26,8 @@ namespace index_util {
  * Keys for the hash index have the type [DB_BLOCK_HASH, uint256].
  */
 
-static constexpr uint8_t DB_BLOCK_HASH{'s'};
-static constexpr uint8_t DB_BLOCK_HEIGHT{'t'};
+inline constexpr uint8_t DB_BLOCK_HASH{'s'};
+inline constexpr uint8_t DB_BLOCK_HEIGHT{'t'};
 
 struct DBHeightKey {
     int height;
diff --git a/depend/bitcoin/src/index/txindex.cpp b/depend/bitcoin/src/index/txindex.cpp
index 4b0c8287..53c086d2 100644
--- a/depend/bitcoin/src/index/txindex.cpp
+++ b/depend/bitcoin/src/index/txindex.cpp
@@ -4,34 +4,54 @@
 
 #include <index/txindex.h>
 
+#include <chain.h>
 #include <common/args.h>
+#include <crypto/siphash.h>
 #include <dbwrapper.h>
 #include <flatfile.h>
 #include <index/base.h>
 #include <index/disktxpos.h>
+#include <index/txindex_key.h>
 #include <interfaces/chain.h>
 #include <node/blockstorage.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
+#include <random.h>
 #include <serialize.h>
 #include <streams.h>
+#include <sync.h>
 #include <uint256.h>
 #include <util/fs.h>
 #include <util/log.h>
 #include <validation.h>
 
+#include <algorithm>
+#include <array>
 #include <cassert>
 #include <cstdint>
 #include <cstdio>
 #include <exception>
+#include <functional>
+#include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
-constexpr uint8_t DB_TXINDEX{'t'};
-
 std::unique_ptr<TxIndex> g_txindex;
 
+namespace {
+SipHasher13UJ ReadOrCreateTxidHasher(CDBWrapper& db)
+{
+    std::pair<uint64_t, uint64_t> salt;
+    if (!db.Read(txindex::DB_TXID_HASH_SALT, salt)) {
+        FastRandomContext rng{};
+        salt = {rng.rand64(), rng.rand64()};
+        db.Write(txindex::DB_TXID_HASH_SALT, salt, /*fSync=*/true);
+    }
+    return SipHasher13UJ{salt.first, salt.second};
+}
+} // namespace
 
 /** Access to the txindex database (indexes/txindex/) */
 class TxIndex::DB : public BaseIndex::DB
@@ -39,35 +59,88 @@ class TxIndex::DB : public BaseIndex::DB
 public:
     explicit DB(size_t n_cache_size, bool f_memory = false, bool f_wipe = false);
 
-    /// Read the disk location of the transaction data with the given hash. Returns false if the
-    /// transaction hash is not indexed.
-    bool ReadTxPos(const Txid& txid, CDiskTxPos& pos) const;
+    /// Write a block of transaction positions to the DB.
+    void WriteTxs(const interfaces::BlockInfo& block);
 
-    /// Write a batch of transaction positions to the DB.
-    void WriteTxs(const std::vector<std::pair<Txid, CDiskTxPos>>& v_pos);
+    /// Used to hash the txid to compute the prefix.
+    const SipHasher13UJ m_hasher;
+
+    /// Whether the database contains any legacy ('t' + txid) entries.
+    const bool m_has_legacy;
+
+    CBlockLocator ReadBestBlock() const override;
+    void WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator) override;
+
+private:
+    DB(size_t n_cache_size, bool f_memory, bool f_wipe, bool has_legacy);
 };
 
+static fs::path TxIndexDBPath() { return gArgs.GetDataDirNet() / "indexes" / "txindex"; }
+
 TxIndex::DB::DB(size_t n_cache_size, bool f_memory, bool f_wipe) :
-    BaseIndex::DB(gArgs.GetDataDirNet() / "indexes" / "txindex", n_cache_size, f_memory, f_wipe)
+    // Bloom filters are built for every key but only consulted by point reads,
+    // which iterators bypass: the per-tx hashed ('x') lookups seek with an
+    // iterator, and the 's'/'h' point reads are at most one per block against a
+    // tiny keyspace. Only the legacy entries' per-tx point lookups benefit, so
+    // enable the filters only for databases still containing them.
+    DB(n_cache_size, f_memory, f_wipe,
+       /*has_legacy=*/!f_memory && !f_wipe && CDBWrapper::HasKeyStartingWith(TxIndexDBPath(), txindex::DB_TXINDEX))
 {}
 
-bool TxIndex::DB::ReadTxPos(const Txid& txid, CDiskTxPos& pos) const
+TxIndex::DB::DB(size_t n_cache_size, bool f_memory, bool f_wipe, bool has_legacy) :
+    BaseIndex::DB(TxIndexDBPath(), n_cache_size, f_memory, f_wipe, /*f_obfuscate=*/false, /*f_bloom=*/has_legacy),
+    m_hasher{ReadOrCreateTxidHasher(*this)},
+    m_has_legacy{has_legacy}
+{}
+
+CBlockLocator TxIndex::DB::ReadBestBlock() const
 {
-    return Read(std::make_pair(DB_TXINDEX, txid.ToUint256()), pos);
+    CBlockLocator locator;
+    if (Read(txindex::DB_BEST_BLOCK_V2, locator)) {
+        return locator;
+    }
+    // If we don't have a locator yet, start from the legacy best block.
+    return BaseIndex::DB::ReadBestBlock();
 }
 
-void TxIndex::DB::WriteTxs(const std::vector<std::pair<Txid, CDiskTxPos>>& v_pos)
+void TxIndex::DB::WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator)
 {
+    batch.Write(txindex::DB_BEST_BLOCK_V2, locator);
+}
+
+void TxIndex::DB::WriteTxs(const interfaces::BlockInfo& block)
+{
+    // A block may be submitted again after it was already indexed, e.g. when it
+    // reconnects after a reorg or is re-processed after an unclean shutdown. It
+    // keeps its original sequence number, so skip it to avoid duplicate entries.
+    if (Exists(txindex::BlockHashKey{block.hash})) return;
+
+    uint32_t block_seq{0};
+    Read(txindex::DB_NEXT_BLOCK_SEQ, block_seq);
+
     CDBBatch batch(*this);
-    for (const auto& [txid, pos] : v_pos) {
-        batch.Write(std::make_pair(DB_TXINDEX, txid.ToUint256()), pos);
+    batch.Write(txindex::BlockHashKey{block.hash}, block_seq);
+    batch.Write(txindex::BlockSeqKey{block_seq}, block.hash);
+    batch.Write(txindex::DB_NEXT_BLOCK_SEQ, block_seq + 1);
+    uint32_t tx_offset_in_block{txindex::BLOCK_HEADER_SIZE + GetSizeOfCompactSize(block.data->vtx.size())};
+    for (const auto& tx : block.data->vtx) {
+        const txindex::DBKey key{txindex::CreateKeyPrefix(m_hasher, tx->GetHash()),
+                                 txindex::BlockTxPosition{block_seq, tx_offset_in_block}};
+        batch.Write(key, txindex::EMPTY_VALUE);
+        tx_offset_in_block += tx->ComputeTotalSize();
     }
     WriteBatch(batch);
 }
 
 TxIndex::TxIndex(std::unique_ptr<interfaces::Chain> chain, size_t n_cache_size, bool f_memory, bool f_wipe)
-    : BaseIndex(std::move(chain), "txindex"), m_db(std::make_unique<TxIndex::DB>(n_cache_size, f_memory, f_wipe))
-{}
+    : BaseIndex(std::move(chain), "txindex", "txidx"), m_db(std::make_unique<TxIndex::DB>(n_cache_size, f_memory, f_wipe))
+{
+    if (m_db->m_has_legacy) {
+        LogInfo("txindex contains entries in the legacy format, which uses excessive disk space. "
+                "To reclaim disk space, stop the node, delete %s and restart to rebuild the index.",
+                fs::PathToString(TxIndexDBPath()));
+    }
+}
 
 TxIndex::~TxIndex() = default;
 
@@ -77,44 +150,98 @@ bool TxIndex::CustomAppend(const interfaces::BlockInfo& block)
     if (block.height == 0) return true;
 
     assert(block.data);
-    CDiskTxPos pos({block.file_number, block.data_pos}, GetSizeOfCompactSize(block.data->vtx.size()));
-    std::vector<std::pair<Txid, CDiskTxPos>> vPos;
-    vPos.reserve(block.data->vtx.size());
-    for (const auto& tx : block.data->vtx) {
-        vPos.emplace_back(tx->GetHash(), pos);
-        pos.nTxOffset += ::GetSerializeSize(TX_WITH_WITNESS(*tx));
-    }
-    m_db->WriteTxs(vPos);
+    m_db->WriteTxs(block);
     return true;
 }
 
 BaseIndex::DB& TxIndex::GetDB() const { return *m_db; }
 
-bool TxIndex::FindTx(const Txid& tx_hash, uint256& block_hash, CTransactionRef& tx) const
+std::optional<TxIndexResult> TxIndex::FindTx(const Txid& tx_hash) const
+{
+    struct Candidate {
+        FlatFilePos tx_position;
+        uint256 block_hash;
+        uint32_t block_seq;
+        //! Whether this candidate's block is currently in the active chain.
+        //! Active chain candidates are attempted first, so duplicate entries
+        //! in both active and stale blocks will always return the active block hash.
+        bool in_active_chain;
+    };
+    std::vector<Candidate> candidates;
+    {
+        std::unique_ptr<CDBIterator> it{m_db->NewIterator()};
+        const txindex::TxHashKeyPrefix prefix{txindex::CreateKeyPrefix(m_db->m_hasher, tx_hash)};
+        txindex::DBKey key{prefix, {}};
+        for (it->Seek(key); it->Valid() && it->GetKey(key) && key.hash_prefix == prefix; it->Next()) {
+            uint256 candidate_block_hash;
+            if (!m_db->Read(txindex::BlockSeqKey{key.pos.block_seq}, candidate_block_hash)) {
+                LogWarning("Block sequence %u not found for txid %s", key.pos.block_seq, tx_hash.ToString());
+                continue;
+            }
+            LOCK(cs_main);
+            const CBlockIndex* block_index{m_chainstate->m_blockman.LookupBlockIndex(candidate_block_hash)};
+            if (!block_index) {
+                LogWarning("Block index entry %s not found for txid %s", candidate_block_hash.ToString(), tx_hash.ToString());
+                continue;
+            }
+            if (!(block_index->nStatus & BLOCK_HAVE_DATA)) continue;
+            const FlatFilePos tx_position{block_index->nFile, block_index->nDataPos + key.pos.tx_offset_in_block};
+            candidates.emplace_back(tx_position, candidate_block_hash, key.pos.block_seq, m_chainstate->m_chain.Contains(*block_index));
+        }
+    }
+
+    // Prefer active-chain matches, then later-connected blocks.
+    std::ranges::sort(candidates, std::greater{}, [](const Candidate& c) {
+        return std::pair{c.in_active_chain, c.block_seq};
+    });
+
+    for (const auto& candidate : candidates) {
+        AutoFile file{m_chainstate->m_blockman.OpenBlockFile(candidate.tx_position, /*fReadOnly=*/true)};
+        if (file.IsNull()) {
+            LogWarning("OpenBlockFile failed for txid %s", tx_hash.ToString());
+            continue;
+        }
+        CTransactionRef tx;
+        try {
+            file >> TX_WITH_WITNESS(tx);
+        } catch (const std::exception& e) {
+            LogWarning("Deserialize or I/O error - %s", e.what());
+            continue;
+        }
+        if (tx->GetHash() == tx_hash) {
+            return TxIndexResult{candidate.block_hash, std::move(tx)};
+        }
+    }
+    // Fall back to legacy if no hashed entry matched. This makes misses pay an
+    // extra lookup, but keeps existing full-txid entries readable after upgrade.
+    return m_db->m_has_legacy ? FindLegacyTx(tx_hash) : std::nullopt;
+}
+
+std::optional<TxIndexResult> TxIndex::FindLegacyTx(const Txid& tx_hash) const
 {
     CDiskTxPos postx;
-    if (!m_db->ReadTxPos(tx_hash, postx)) {
-        return false;
+    if (!m_db->Read(txindex::LegacyTxKey(tx_hash), postx)) {
+        return std::nullopt;
     }
 
-    AutoFile file{m_chainstate->m_blockman.OpenBlockFile(postx, true)};
+    AutoFile file{m_chainstate->m_blockman.OpenBlockFile(postx, /*fReadOnly=*/true)};
     if (file.IsNull()) {
         LogError("OpenBlockFile failed");
-        return false;
+        return std::nullopt;
     }
     CBlockHeader header;
+    CTransactionRef tx;
     try {
         file >> header;
         file.seek(postx.nTxOffset, SEEK_CUR);
         file >> TX_WITH_WITNESS(tx);
     } catch (const std::exception& e) {
         LogError("Deserialize or I/O error - %s", e.what());
-        return false;
+        return std::nullopt;
     }
     if (tx->GetHash() != tx_hash) {
         LogError("txid mismatch");
-        return false;
+        return std::nullopt;
     }
-    block_hash = header.GetHash();
-    return true;
+    return TxIndexResult{header.GetHash(), std::move(tx)};
 }
diff --git a/depend/bitcoin/src/index/txindex.h b/depend/bitcoin/src/index/txindex.h
index 0358e0ae..23fb17d4 100644
--- a/depend/bitcoin/src/index/txindex.h
+++ b/depend/bitcoin/src/index/txindex.h
@@ -7,21 +7,31 @@
 
 #include <index/base.h>
 #include <primitives/transaction.h>
+#include <uint256.h>
 
 #include <cstddef>
 #include <memory>
+#include <optional>
 
-class uint256;
 namespace interfaces {
 class Chain;
 }
+namespace txindex_tests {
+class TxIndexTest;
+}
+
+inline constexpr bool DEFAULT_TXINDEX{false};
 
-static constexpr bool DEFAULT_TXINDEX{false};
+/// A found transaction and the hash of the block that contains it.
+struct TxIndexResult {
+    uint256 block_hash;
+    CTransactionRef tx;
+};
 
 /**
  * TxIndex is used to look up transactions included in the blockchain by hash.
- * The index is written to a LevelDB database and records the filesystem
- * location of each transaction by transaction hash.
+ * The index is written to a LevelDB database and records the block sequence
+ * number and serialized block offset of each transaction by transaction hash.
  */
 class TxIndex final : public BaseIndex
 {
@@ -29,10 +39,14 @@ class TxIndex final : public BaseIndex
     class DB;
 
 private:
+    friend class txindex_tests::TxIndexTest;
     const std::unique_ptr<DB> m_db;
 
     bool AllowPrune() const override { return false; }
 
+    /// Look up a transaction among the legacy (full-txid) entries.
+    std::optional<TxIndexResult> FindLegacyTx(const Txid& tx_hash) const;
+
 protected:
     bool CustomAppend(const interfaces::BlockInfo& block) override;
 
@@ -48,10 +62,8 @@ class TxIndex final : public BaseIndex
     /// Look up a transaction by hash.
     ///
     /// @param[in]   tx_hash  The hash of the transaction to be returned.
-    /// @param[out]  block_hash  The hash of the block the transaction is found in.
-    /// @param[out]  tx  The transaction itself.
-    /// @return  true if transaction is found, false otherwise
-    bool FindTx(const Txid& tx_hash, uint256& block_hash, CTransactionRef& tx) const;
+    /// @return  the transaction and containing block hash, or nullopt if it is not found
+    std::optional<TxIndexResult> FindTx(const Txid& tx_hash) const;
 };
 
 /// The global transaction index, used in GetTransaction. May be null.
diff --git a/depend/bitcoin/src/index/txindex_key.h b/depend/bitcoin/src/index/txindex_key.h
new file mode 100644
index 00000000..6ad9b81e
--- /dev/null
+++ b/depend/bitcoin/src/index/txindex_key.h
@@ -0,0 +1,128 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_INDEX_TXINDEX_KEY_H
+#define BITCOIN_INDEX_TXINDEX_KEY_H
+
+#include <consensus/consensus.h>
+#include <crypto/siphash.h>
+#include <primitives/transaction_identifier.h>
+#include <serialize.h>
+#include <uint256.h>
+
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <ios>
+#include <string>
+#include <utility>
+
+namespace txindex {
+/*
+ * Database layout:
+ *
+ *   ['x', hash prefix, block seq, tx offset] -> (empty)
+ *   ['s', block seq]                         -> block hash
+ *   ['h', block hash]                        -> block seq
+ *   ["next_block_seq"]                       -> next block seq to assign
+ *   ["txid_hash_salt"]                       -> txid hasher salt
+ *   ["best_block_v2"]                        -> current sync locator
+ *   ['t', txid]                              -> legacy CDiskTxPos
+ *   ['B']                                    -> legacy sync locator
+ */
+
+constexpr uint8_t DB_TXINDEX_HASHED{'x'};
+constexpr uint8_t DB_BLOCK_SEQ{'s'};
+constexpr uint8_t DB_BLOCK_HASH{'h'};
+inline const std::string DB_NEXT_BLOCK_SEQ{"next_block_seq"};
+inline const std::string DB_TXID_HASH_SALT{"txid_hash_salt"};
+inline const std::string DB_BEST_BLOCK_V2{"best_block_v2"};
+//! Prefix of a legacy (pre-hashing) txindex row.
+constexpr uint8_t DB_TXINDEX{'t'};
+
+//! Empty value of a hashed txindex row, whose position is encoded in its key.
+inline constexpr std::array<std::byte, 0> EMPTY_VALUE{};
+
+//! Serialized size of a block header, the offset of the first byte after it.
+constexpr uint32_t BLOCK_HEADER_SIZE{80};
+
+//! The location of a transaction: the sequence number of the block that contains it
+//! and the transaction's serialized byte offset from the start of that block
+//! (including the header), so the on-disk position is simply
+//! block_data_pos + tx_offset_in_block.
+//!
+struct BlockTxPosition {
+    uint32_t block_seq{0};
+    uint32_t tx_offset_in_block{0};
+
+    friend bool operator==(const BlockTxPosition&, const BlockTxPosition&) = default;
+
+    // tx_offset is encoded in 3-byte big-endian integer.
+    // This can hold up to 16,777,216, which is >4x the maximum 4 million block weight position
+    static constexpr uint32_t TX_OFFSET_SIZE{3};
+    static_assert(MAX_BLOCK_SERIALIZED_SIZE <= BigEndianFormatter<TX_OFFSET_SIZE>::MAX);
+
+    SERIALIZE_METHODS(BlockTxPosition, obj)
+    {
+        READWRITE(VARINT(obj.block_seq),
+                  Using<BigEndianFormatter<TX_OFFSET_SIZE>>(obj.tx_offset_in_block));
+    }
+};
+
+//! Key for looking up the hash of the block with the given sequence number.
+struct BlockSeqKey {
+    uint32_t block_seq{0};
+
+    SERIALIZE_METHODS(BlockSeqKey, obj)
+    {
+        uint8_t prefix{DB_BLOCK_SEQ};
+        READWRITE(prefix);
+        if (ser_action.ForRead() && prefix != DB_BLOCK_SEQ) throw std::ios_base::failure("Invalid format for txindex block seq key");
+        READWRITE(VARINT(obj.block_seq));
+    }
+};
+
+//! Key for looking up the sequence number assigned to the block with the given hash.
+struct BlockHashKey {
+    uint256 block_hash;
+
+    SERIALIZE_METHODS(BlockHashKey, obj)
+    {
+        uint8_t prefix{DB_BLOCK_HASH};
+        READWRITE(prefix);
+        if (ser_action.ForRead() && prefix != DB_BLOCK_HASH) throw std::ios_base::failure("Invalid format for txindex block hash key");
+        READWRITE(obj.block_hash);
+    }
+};
+
+constexpr int HASH_PREFIX_SIZE{5};
+using TxHashKeyPrefix = uint64_t;
+
+inline TxHashKeyPrefix CreateKeyPrefix(const SipHasher13UJ& hasher, const Txid& txid)
+{
+    return hasher.Hash(txid.ToUint256()) >> (8 * (sizeof(TxHashKeyPrefix) - HASH_PREFIX_SIZE));
+}
+
+struct DBKey {
+    TxHashKeyPrefix hash_prefix{0};
+    BlockTxPosition pos;
+
+    SERIALIZE_METHODS(DBKey, obj)
+    {
+        uint8_t prefix{DB_TXINDEX_HASHED};
+        READWRITE(prefix);
+        if (ser_action.ForRead() && prefix != DB_TXINDEX_HASHED) throw std::ios_base::failure("Invalid format for txindex DB key");
+        READWRITE(Using<BigEndianFormatter<HASH_PREFIX_SIZE>>(obj.hash_prefix), obj.pos);
+    }
+};
+
+//! Key of a legacy (pre-hashing) txindex row: the full txid under the 't' prefix.
+inline std::pair<uint8_t, uint256> LegacyTxKey(const Txid& txid)
+{
+    return {DB_TXINDEX, txid.ToUint256()};
+}
+
+} // namespace txindex
+
+#endif // BITCOIN_INDEX_TXINDEX_KEY_H
diff --git a/depend/bitcoin/src/index/txospenderindex.cpp b/depend/bitcoin/src/index/txospenderindex.cpp
index f0d559a9..304104df 100644
--- a/depend/bitcoin/src/index/txospenderindex.cpp
+++ b/depend/bitcoin/src/index/txospenderindex.cpp
@@ -23,15 +23,17 @@
 #include <util/fs.h>
 #include <validation.h>
 
+#include <cstddef>
 #include <cstdio>
 #include <exception>
 #include <ios>
+#include <span>
 #include <string>
 #include <utility>
 #include <vector>
 
 /* The database is used to find the spending transaction of a given utxo.
- * For every input of every transaction it stores a key that is a pair(siphash(input outpoint), transaction location on disk) and an empty value.
+ * For every input of every transaction it stores a key that is a pair(siphash(input outpoint), transaction location on disk) and a zero-byte value.
  * To find the spending transaction of an outpoint, we perform a range query on siphash(outpoint), and for each returned key load the transaction
  * and return it if it does spend the provided outpoint.
  */
@@ -60,7 +62,7 @@ struct DBKey {
 };
 
 TxoSpenderIndex::TxoSpenderIndex(std::unique_ptr<interfaces::Chain> chain, size_t n_cache_size, bool f_memory, bool f_wipe)
-    : BaseIndex(std::move(chain), "txospenderindex"), m_db{std::make_unique<DB>(gArgs.GetDataDirNet() / "indexes" / "txospenderindex" / "db", n_cache_size, f_memory, f_wipe)}
+    : BaseIndex(std::move(chain), "txospenderindex", "txospenderidx"), m_db{std::make_unique<DB>(gArgs.GetDataDirNet() / "indexes" / "txospenderindex" / "db", n_cache_size, f_memory, f_wipe, /*f_obfuscate=*/false, /*f_bloom=*/false)}
 {
     if (!m_db->Read("siphash_key", m_siphash_key)) {
         FastRandomContext rng(false);
@@ -91,8 +93,9 @@ void TxoSpenderIndex::WriteSpenderInfos(const std::vector<std::pair<COutPoint, C
     CDBBatch batch(*m_db);
     for (const auto& [outpoint, pos] : items) {
         DBKey key(CreateKey(m_siphash_key, outpoint, pos));
-        // key is hash(spent outpoint) | disk pos, value is empty
-        batch.Write(key, "");
+        // The key encodes the spent outpoint hash and disk position. The value is only a marker.
+        // Older entries may contain serialized empty strings; FindSpender() reads only keys.
+        batch.Write(key, std::span<const std::byte>{});
     }
     m_db->WriteBatch(batch);
 }
diff --git a/depend/bitcoin/src/index/txospenderindex.h b/depend/bitcoin/src/index/txospenderindex.h
index 35ca30d8..9a2103ca 100644
--- a/depend/bitcoin/src/index/txospenderindex.h
+++ b/depend/bitcoin/src/index/txospenderindex.h
@@ -21,7 +21,7 @@
 
 struct CDiskTxPos;
 
-static constexpr bool DEFAULT_TXOSPENDERINDEX{false};
+inline constexpr bool DEFAULT_TXOSPENDERINDEX{false};
 
 struct TxoSpender {
     CTransactionRef tx;
diff --git a/depend/bitcoin/src/init.cpp b/depend/bitcoin/src/init.cpp
index c53e5ed6..c25e07bf 100644
--- a/depend/bitcoin/src/init.cpp
+++ b/depend/bitcoin/src/init.cpp
@@ -7,24 +7,24 @@
 
 #include <init.h>
 
-#include <kernel/checks.h>
-
+#include <addrdb.h>
 #include <addrman.h>
 #include <banman.h>
 #include <blockfilter.h>
-#include <btcsignals.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <chainparamsbase.h>
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/messages.h>
 #include <common/system.h>
-#include <consensus/amount.h>
-#include <consensus/consensus.h>
-#include <deploymentstatus.h>
-#include <hash.h>
+#include <compat/compat.h>
+#include <consensus/params.h>
+#include <crypto/hex_base.h>
+#include <dbwrapper.h>
 #include <httprpc.h>
 #include <httpserver.h>
+#include <index/base.h>
 #include <index/blockfilterindex.h>
 #include <index/coinstatsindex.h>
 #include <index/txindex.h>
@@ -36,14 +36,19 @@
 #include <interfaces/mining.h>
 #include <interfaces/node.h>
 #include <ipc/exception.h>
+#include <kernel/blockmanager_opts.h>
 #include <kernel/caches.h>
+#include <kernel/chainstatemanager_opts.h>
+#include <kernel/checks.h>
 #include <kernel/context.h>
+#include <kernel/notifications_interface.h>
 #include <key.h>
 #include <logging.h>
 #include <mapport.h>
 #include <net.h>
 #include <net_permissions.h>
 #include <net_processing.h>
+#include <netaddress.h>
 #include <netbase.h>
 #include <netgroup.h>
 #include <node/blockmanager_args.h>
@@ -57,7 +62,8 @@
 #include <node/mempool_args.h>
 #include <node/mempool_persist.h>
 #include <node/mempool_persist_args.h>
-#include <node/miner.h>
+#include <node/mining_args.h>
+#include <node/mining_types.h>
 #include <node/peerman_args.h>
 #include <policy/feerate.h>
 #include <policy/fees/block_policy_estimator.h>
@@ -65,19 +71,21 @@
 #include <policy/policy.h>
 #include <policy/settings.h>
 #include <protocol.h>
-#include <rpc/blockchain.h>
+#include <random.h>
 #include <rpc/register.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <scheduler.h>
 #include <script/sigcache.h>
 #include <sync.h>
+#include <tinyformat.h>
 #include <torcontrol.h>
-#include <txdb.h>
+#include <txgraph.h>
 #include <txmempool.h>
+#include <uint256.h>
 #include <util/asmap.h>
 #include <util/batchpriority.h>
-#include <util/byte_units.h>
+#include <util/btcsignals.h>
 #include <util/chaintype.h>
 #include <util/check.h>
 #include <util/fs.h>
@@ -97,21 +105,31 @@
 #include <walletinitinterface.h>
 
 #include <algorithm>
+#include <any>
 #include <cerrno>
 #include <condition_variable>
 #include <cstddef>
 #include <cstdint>
-#include <cstdio>
+#include <exception>
 #include <fstream>
 #include <functional>
+#include <initializer_list>
+#include <list>
+#include <memory>
+#include <new>
+#include <optional>
 #include <set>
+#include <span>
 #include <string>
+#include <system_error>
 #include <thread>
+#include <tuple>
+#include <utility>
+#include <variant>
 #include <vector>
 
 #ifndef WIN32
 #include <csignal>
-#include <sys/stat.h>
 #endif
 
 #ifdef ENABLE_ZMQ
@@ -124,10 +142,13 @@
 #include <node/data/ip_asn.dat.h>
 #endif
 
-using common::AmountErrMsg;
 using common::InvalidPortErrMsg;
 using common::ResolveErrMsg;
 
+using http_bitcoin::InitHTTPServer;
+using http_bitcoin::InterruptHTTPServer;
+using http_bitcoin::StartHTTPServer;
+using http_bitcoin::StopHTTPServer;
 using node::ApplyArgsManOptions;
 using node::BlockManager;
 using node::CalculateCacheSizes;
@@ -148,6 +169,7 @@ using node::VerifyLoadedChainstate;
 using util::Join;
 using util::ReplaceAll;
 using util::ToString;
+using util::TrimStringView;
 
 static constexpr bool DEFAULT_PROXYRANDOMIZE{true};
 static constexpr bool DEFAULT_REST_ENABLE{false};
@@ -508,7 +530,7 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
     argsman.AddArg("-conf=<file>", strprintf("Specify path to read-only configuration file. Relative paths will be prefixed by datadir location (only useable from command line, not configuration file) (default: %s)", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-datadir=<dir>", "Specify data directory", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS);
     argsman.AddArg("-dbbatchsize", strprintf("Maximum database write batch size in bytes (default: %u)", DEFAULT_DB_CACHE_BATCH), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
-    argsman.AddArg("-dbcache=<n>", strprintf("Maximum database cache size <n> MiB (minimum %d, default: %d). Make sure you have enough RAM. In addition, unused memory allocated to the mempool is shared with this cache (see -maxmempool).", MIN_DB_CACHE >> 20, node::GetDefaultDBCache() >> 20), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-dbcache=<n>", strprintf("Maximum database cache size <n> MiB (minimum %d, default: %d). Make sure you have enough RAM. In addition, unused memory allocated to the mempool is shared with this cache (see -maxmempool).", MIN_DBCACHE_BYTES / 1_MiB, node::GetDefaultDBCache() / 1_MiB), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-includeconf=<file>", "Specify additional configuration file, relative to the -datadir path (only useable from configuration file, not command line)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-allowignoredconf", strprintf("For backwards compatibility, treat an unused %s file in the datadir as a warning, not an error.", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-loadblock=<file>", "Imports blocks from an external file on startup. Obfuscated blocks are not supported.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
@@ -517,6 +539,7 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
     argsman.AddArg("-minimumchainwork=<hex>", strprintf("Minimum work assumed to exist on a valid chain in hex (default: %s, testnet3: %s, testnet4: %s, signet: %s)", defaultChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnetChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnet4ChainParams->GetConsensus().nMinimumChainWork.GetHex(), signetChainParams->GetConsensus().nMinimumChainWork.GetHex()), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
     argsman.AddArg("-par=<n>", strprintf("Set the number of script verification threads (0 = auto, up to %d, <0 = leave that many cores free, default: %d)",
         MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-prevoutfetchthreads=<n>", strprintf("Set the number of threads used to prefetch block input prevouts from the chainstate database (0 disables, up to %d, default: %d). Negative values are rejected.", MAX_PREVOUTFETCH_THREADS, DEFAULT_PREVOUTFETCH_THREADS), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-persistmempool", strprintf("Whether to save the mempool on shutdown and load on restart (default: %u)", DEFAULT_PERSIST_MEMPOOL), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-persistmempoolv1",
                    strprintf("Whether a mempool.dat file created by -persistmempool or the savemempool RPC will be written in the legacy format "
@@ -525,7 +548,7 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
                    ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-pid=<file>", strprintf("Specify pid file. Relative paths will be prefixed by a net-specific datadir location. (default: %s)", BITCOIN_PID_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-prune=<n>", strprintf("Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex. "
-            "Warning: Reverting this setting requires re-downloading the entire blockchain. "
+            "Warning: Reverting this setting requires re-downloading the entire blockchain. Wallets and indexes should be loaded at startup and kept active while pruning is enabled so they stay synchronized before old block data is deleted; wallets or indexes that fall behind pruned data may require a reindex. "
             "(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >=%u = automatically prune block files to stay under the specified target size in MiB)", MIN_DISK_SPACE_FOR_BLOCK_FILES / 1_MiB), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-reindex", "If enabled, wipe chain state and block index, and rebuild them from blk*.dat files on disk. Also wipe and rebuild other optional indexes that are active. If an assumeutxo snapshot was loaded, its chainstate will be wiped as well. The snapshot can then be reloaded via RPC.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-reindex-chainstate", "If enabled, wipe chain state, and rebuild it from blk*.dat files on disk. If an assumeutxo snapshot was loaded, its chainstate will be wiped as well. The snapshot can then be reloaded via RPC.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
@@ -561,7 +584,12 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
     argsman.AddArg("-forcednsseed", strprintf("Always query for peer addresses via DNS lookup (default: %u)", DEFAULT_FORCEDNSSEED), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     argsman.AddArg("-listen", strprintf("Accept connections from outside (default: %u if no -proxy, -connect or -maxconnections=0)", DEFAULT_LISTEN), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     argsman.AddArg("-listenonion", strprintf("Automatically create Tor onion service (default: %d)", DEFAULT_LISTEN_ONION), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
-    argsman.AddArg("-maxconnections=<n>", strprintf("Maintain at most <n> automatic connections to peers (default: %u). This limit does not apply to connections manually added via -addnode or the addnode RPC, which have a separate limit of %u. It does not apply to short-lived private broadcast connections either, which have a separate limit of %u.", DEFAULT_MAX_PEER_CONNECTIONS, MAX_ADDNODE_CONNECTIONS, MAX_PRIVATE_BROADCAST_CONNECTIONS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
+    argsman.AddArg("-maxconnections=<n>", strprintf("Maintain at most <n> automatic connections to peers (default: %u). %u slots of these are reserved for outgoing connections. See -inboundrelaypercent for more information about limits applied to transaction relay inbound peers. "
+                                                    "This limit does not apply to connections manually added via -addnode or the addnode RPC, which have a separate limit of %u. "
+                                                    "It does not apply to short-lived private broadcast connections either, which have a separate limit of %u.",
+                                                    DEFAULT_MAX_PEER_CONNECTIONS, MAX_OUTBOUND_FULL_RELAY_CONNECTIONS + MAX_BLOCK_RELAY_ONLY_CONNECTIONS + MAX_FEELER_CONNECTIONS, MAX_ADDNODE_CONNECTIONS, MAX_PRIVATE_BROADCAST_CONNECTIONS),
+                   ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
+    argsman.AddArg("-inboundrelaypercent=<n>", strprintf("Permit a maximum percent of inbound connections to relay transactions, to limit memory utilization (0 to 100, default: %u).", DEFAULT_FULL_RELAY_INBOUND_PCT), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     argsman.AddArg("-maxreceivebuffer=<n>", strprintf("Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)", DEFAULT_MAXRECEIVEBUFFER), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     argsman.AddArg("-maxsendbuffer=<n>", strprintf("Maximum per-connection memory usage for the send buffer, <n>*1000 bytes (default: %u)", DEFAULT_MAXSENDBUFFER), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     argsman.AddArg("-maxuploadtarget=<n>", strprintf("Tries to keep outbound traffic under the given target per 24h. Limit does not apply to peers with 'download' permission or blocks created within past week. 0 = no limit (default: %s). Optional suffix units [k|K|m|M|g|G|t|T] (default: M). Lowercase is 1000 base while uppercase is 1024 base", DEFAULT_MAX_UPLOAD_TARGET), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
@@ -689,6 +717,10 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
                    OptionsCategory::NODE_RELAY);
     argsman.AddArg("-minrelaytxfee=<amt>", strprintf("Fees (in %s/kvB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)",
         CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE)), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
+    argsman.AddArg("-txsendrate=<n>",
+                   strprintf("Set the maximum ongoing rate for sending transactions to (inbound) peers (default: %u tx/s)",
+                             DEFAULT_TX_SEND_RATE),
+                   ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY);
     argsman.AddArg("-privatebroadcast",
                    strprintf(
                        "Broadcast transactions submitted via sendrawtransaction RPC using short-lived "
@@ -753,7 +785,7 @@ static void StartupNotify(const ArgsManager& args)
 static bool AppInitServers(NodeContext& node)
 {
     const ArgsManager& args = *Assert(node.args);
-    if (!InitHTTPServer(*Assert(node.shutdown_signal))) {
+    if (!InitHTTPServer()) {
         return false;
     }
     StartRPC();
@@ -1074,27 +1106,9 @@ bool AppInitParameterInteraction(const ArgsManager& args)
         return InitError(Untranslated("peertimeout must be a positive integer."));
     }
 
-    if (const auto arg{args.GetArg("-blockmintxfee")}) {
-        if (!ParseMoney(*arg)) {
-            return InitError(AmountErrMsg("blockmintxfee", *arg));
-        }
-    }
-
-    {
-        const auto max_block_weight = args.GetIntArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT);
-        if (max_block_weight > MAX_BLOCK_WEIGHT) {
-            return InitError(strprintf(_("Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)"), max_block_weight, MAX_BLOCK_WEIGHT));
-        }
-    }
-
-    {
-        const auto block_reserved_weight = args.GetIntArg("-blockreservedweight", DEFAULT_BLOCK_RESERVED_WEIGHT);
-        if (block_reserved_weight > MAX_BLOCK_WEIGHT) {
-            return InitError(strprintf(_("Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)"), block_reserved_weight, MAX_BLOCK_WEIGHT));
-        }
-        if (block_reserved_weight < MINIMUM_BLOCK_RESERVED_WEIGHT) {
-            return InitError(strprintf(_("Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)"), block_reserved_weight, MINIMUM_BLOCK_RESERVED_WEIGHT));
-        }
+    auto mining_result{node::ReadMiningArgs(args)};
+    if (!mining_result) {
+        return InitError(util::ErrorString(mining_result));
     }
 
     nBytesPerSigOp = args.GetIntArg("-bytespersigop", nBytesPerSigOp);
@@ -1125,6 +1139,16 @@ bool AppInitParameterInteraction(const ArgsManager& args)
         }
     }
 
+    // Prevent setting deployment parameters on mainnet.
+    if (chainparams.GetChainType() == ChainType::MAIN) {
+        if (args.IsArgSet("-testactivationheight")) {
+            return InitError(_("The -testactivationheight option may not be used on mainnet."));
+        }
+        if (args.IsArgSet("-vbparams")) {
+            return InitError(_("The -vbparams option may not be used on mainnet."));
+        }
+    }
+
     // Also report errors from parsing before daemonization
     {
         kernel::Notifications notifications{};
@@ -1328,6 +1352,9 @@ static ChainstateLoadResult InitAndLoadChainstate(
     if (!mempool_error.empty()) {
         return {ChainstateLoadStatus::FAILURE_FATAL, mempool_error};
     }
+    auto mining_args{node::ReadMiningArgs(args)};
+    Assert(mining_args); // no error can happen, already checked in AppInitParameterInteraction
+    node.mining_args = std::move(*mining_args);
     LogInfo("* Using %.1f MiB for in-memory UTXO set (plus up to %.1f MiB of unused mempool space)",
             cache_sizes.coins / double(1_MiB),
             mempool_opts.max_size_bytes / double(1_MiB));
@@ -1561,7 +1588,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
      * be disabled when initialisation is finished.
      */
     if (args.GetBoolArg("-server", false)) {
-        uiInterface.InitMessage_connect(SetRPCWarmupStatus);
+        uiInterface.InitMessage.connect(SetRPCWarmupStatus);
         if (!AppInitServers(node))
             return InitError(_("Unable to start HTTP server. See debug log for details."));
     }
@@ -1808,7 +1835,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     for (const std::string& strAddr : args.GetArgs("-externalip")) {
         const std::optional<CService> addrLocal{Lookup(strAddr, GetListenPort(), fNameLookup)};
         if (addrLocal.has_value() && addrLocal->IsValid())
-            AddLocal(addrLocal.value(), LOCAL_MANUAL);
+            AddLocal(addrLocal.value(), LOCAL_MANUAL, /*add_even_if_unreachable=*/true);
         else
             return InitError(ResolveErrMsg("externalip", strAddr));
     }
@@ -2013,7 +2040,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 #if HAVE_SYSTEM
     const std::string block_notify = args.GetArg("-blocknotify", "");
     if (!block_notify.empty()) {
-        uiInterface.NotifyBlockTip_connect([block_notify](SynchronizationState sync_state, const CBlockIndex& block, double /* verification_progress */) {
+        uiInterface.NotifyBlockTip.connect([block_notify](SynchronizationState sync_state, const CBlockIndex& block, double /* verification_progress */) {
             if (sync_state != SynchronizationState::POST_INIT) return;
             std::string command = block_notify;
             ReplaceAll(command, "%s", block.GetBlockHash().GetHex());
@@ -2028,10 +2055,17 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         vImportFiles.push_back(fs::PathFromString(strFile));
     }
 
-    node.background_init_thread = std::thread(&util::TraceThread, "initload", [=, &chainman, &args, &node] {
+    /// \anchor initload
+    node.background_init_thread = std::thread(&util::TraceThread, "initload", [=, &chainman, &args, &kernel_notifications, &node] {
         ScheduleBatchPriority();
         // Import blocks and ActivateBestChain()
         ImportBlocks(chainman, vImportFiles);
+        // An interrupted import may return without activating genesis. Wake
+        // the init thread's genesis wait, which is otherwise only notified
+        // on blockTip, and that never fires when the import was interrupted
+        // before activating genesis. This wakeup lets the wait observe the
+        // shutdown request.
+        WITH_LOCK(kernel_notifications.m_tip_block_mutex, kernel_notifications.m_tip_block_cv.notify_all());
         WITH_LOCK(::cs_main, chainman.UpdateIBDStatus());
         if (args.GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {
             LogInfo("Stopping after block import");
@@ -2104,12 +2138,21 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     CConnman::Options connOptions;
     connOptions.m_local_services = g_local_services;
     connOptions.m_max_automatic_connections = nMaxConnections;
+    connOptions.m_full_relay_inbound_percent = std::clamp<int>(args.GetIntArg("-inboundrelaypercent", DEFAULT_FULL_RELAY_INBOUND_PCT), 0, 100);
     connOptions.uiInterface = &uiInterface;
     connOptions.m_banman = node.banman.get();
     connOptions.m_msgproc = node.peerman.get();
     connOptions.nSendBufferMaxSize = 1000 * args.GetIntArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
     connOptions.nReceiveFloodSize = 1000 * args.GetIntArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
-    connOptions.m_added_nodes = args.GetArgs("-addnode");
+    for (const std::string& added_node : args.GetArgs("-addnode")) {
+        // Such a value is not a valid connection target, but would otherwise be
+        // treated as one and retried indefinitely.
+        if (TrimStringView(added_node).empty()) {
+            LogWarning("Ignoring empty -addnode value");
+            continue;
+        }
+        connOptions.m_added_nodes.push_back(added_node);
+    }
     connOptions.nMaxOutboundLimit = *opt_max_upload;
     connOptions.m_peer_connect_timeout = peer_connect_timeout;
     connOptions.whitelist_forcerelay = args.GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY);
diff --git a/depend/bitcoin/src/init.h b/depend/bitcoin/src/init.h
index f3a55da3..ef0588a9 100644
--- a/depend/bitcoin/src/init.h
+++ b/depend/bitcoin/src/init.h
@@ -9,9 +9,9 @@
 #include <atomic>
 
 //! Default value for -daemon option
-static constexpr bool DEFAULT_DAEMON = false;
+inline constexpr bool DEFAULT_DAEMON = false;
 //! Default value for -daemonwait option
-static constexpr bool DEFAULT_DAEMONWAIT = false;
+inline constexpr bool DEFAULT_DAEMONWAIT = false;
 
 class ArgsManager;
 namespace interfaces {
diff --git a/depend/bitcoin/src/init/common.cpp b/depend/bitcoin/src/init/common.cpp
index f65e3c92..91305689 100644
--- a/depend/bitcoin/src/init/common.cpp
+++ b/depend/bitcoin/src/init/common.cpp
@@ -38,7 +38,7 @@ void AddLoggingArgs(ArgsManager& argsman)
     argsman.AddArg("-logsourcelocations", strprintf("Prepend debug output with name of the originating source location (source file, line number and function name) (default: %u)", DEFAULT_LOGSOURCELOCATIONS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logtimemicros", strprintf("Add microsecond precision to debug timestamps (default: %u)", DEFAULT_LOGTIMEMICROS), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-loglevelalways", strprintf("Always prepend a category and level (default: %u)", DEFAULT_LOGLEVELALWAYS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
-    argsman.AddArg("-logratelimit", strprintf("Apply rate limiting to unconditional logging to mitigate disk-filling attacks (default: %u)", BCLog::DEFAULT_LOGRATELIMIT), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
+    argsman.AddArg("-logratelimit", strprintf("Apply rate limiting to unconditional logging to mitigate disk-filling attacks (default: %u)", BCLog::DEFAULT_LOGRATELIMIT), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -daemon. To disable logging to file, set -nodebuglogfile)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-shrinkdebugfile", "Shrink debug log file on client startup (default: 1 when no -debug)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
 }
diff --git a/depend/bitcoin/src/interfaces/mining.h b/depend/bitcoin/src/interfaces/mining.h
index f4c42e20..c8e96971 100644
--- a/depend/bitcoin/src/interfaces/mining.h
+++ b/depend/bitcoin/src/interfaces/mining.h
@@ -7,7 +7,7 @@
 
 #include <consensus/amount.h>
 #include <interfaces/types.h>
-#include <node/types.h>
+#include <node/mining_types.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <uint256.h>
@@ -16,15 +16,14 @@
 #include <cstdint>
 #include <memory>
 #include <optional>
+#include <stdexcept>
+#include <string>
 #include <vector>
 
 namespace node {
 struct NodeContext;
 } // namespace node
 
-class BlockValidationState;
-class CScript;
-
 namespace interfaces {
 
 //! Block template interface
@@ -34,7 +33,8 @@ class BlockTemplate
     virtual ~BlockTemplate() = default;
 
     virtual CBlockHeader getBlockHeader() = 0;
-    // Block contains a dummy coinbase transaction that should not be used.
+    // Block contains a dummy coinbase transaction that should not be used and
+    // it may not match a transaction constructed from getCoinbaseTx().
     virtual CBlock getBlock() = 0;
 
     // Fees per transaction, not including coinbase transaction.
@@ -60,17 +60,28 @@ class BlockTemplate
      * @param[in] timestamp time block header field (unix timestamp)
      * @param[in] nonce nonce block header field
      * @param[in] coinbase complete coinbase transaction (including witness)
+     * @param[out] reason failure reason (BIP22)
+     * @param[out] debug  more detailed rejection reason
      *
-     * @note unlike the submitblock RPC, this method does NOT add the
-     *       coinbase witness automatically.
+     * @note Unlike the submitblock RPC, this method does not call
+     *       UpdateUncommittedBlockStructures to add a missing coinbase witness
+     *       reserved value. Callers must provide a complete coinbase transaction,
+     *       including the witness when a witness commitment is present.
      *
-     * @returns if the block was processed, does not necessarily indicate validity.
+     * @note for heights <= 16, the BIP34 height push in getCoinbaseTx().script_sig_prefix
+     *       is only one byte long, so the coinbase scriptSig needs at least
+     *       one additional byte of data to avoid bad-cb-length.
      *
-     * @note Returns true if the block is already known, which can happen if
-     *       the solved block is constructed and broadcast by multiple nodes
-     *       (e.g. both the miner who constructed the template and the pool).
+     * @returns true if the block was accepted as a new block
      */
-    virtual bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CTransactionRef coinbase) = 0;
+    virtual bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CTransactionRef coinbase, std::string& reason, std::string& debug) = 0;
+
+    //! Deprecated older method preserved to return an explicit error for IPC
+    //! clients using mining.capnp @7.
+    virtual bool submitSolutionOld7(uint32_t, uint32_t, uint32_t, CTransactionRef)
+    {
+        throw std::runtime_error("Old submitSolution (@7) not supported. Please update your client!");
+    }
 
     /**
      * Waits for fees in the next block to rise, a new tip or the timeout.
@@ -154,9 +165,48 @@ class Mining
      */
     virtual bool checkBlock(const CBlock& block, const node::BlockCheckOptions& options, std::string& reason, std::string& debug) = 0;
 
+    /**
+     * Process a fully assembled block.
+     *
+     * Similar to the submitblock RPC. Accepts a complete block, validates
+     * it, and if accepted as new, processes it into chainstate. Accepted
+     * blocks may then be announced to peers through normal validation signals.
+     *
+     * @param[in]  block  the complete block to submit
+     * @param[out] reason failure reason (BIP22)
+     * @param[out] debug  more detailed rejection reason
+     * @returns           true if the block was accepted as a new block. Returns
+     *                    false and sets reason if the block is a duplicate or
+     *                    the validation result is inconclusive.
+     *
+     * @note Unlike the submitblock RPC, this method does not call
+     *       UpdateUncommittedBlockStructures to add a missing coinbase witness
+     *       reserved value. Callers must submit a fully formed block, including
+     *       the coinbase witness when a witness commitment is present.
+     */
+    virtual bool submitBlock(const CBlock& block, std::string& reason, std::string& debug) = 0;
+
+    /**
+     * Fetch raw transactions from the mempool by txid.
+     *
+     * @param[in] txids   transaction ids to look up
+     * @returns           one entry per requested txid containing the
+     *                    transaction if found, otherwise nullptr
+     */
+    virtual std::vector<CTransactionRef> getTransactionsByTxID(const std::vector<Txid>& txids) = 0;
+
+    /**
+     * Fetch raw transactions from the mempool by wtxid.
+     *
+     * @param[in] wtxids   witness transaction ids to look up
+     * @returns            one entry per requested wtxid containing the
+     *                     transaction if found, otherwise nullptr
+     */
+    virtual std::vector<CTransactionRef> getTransactionsByWitnessID(const std::vector<Wtxid>& wtxids) = 0;
+
     //! Get internal node context. Useful for RPC and testing,
     //! but not accessible across processes.
-    virtual node::NodeContext* context() { return nullptr; }
+    virtual const node::NodeContext* context() { return nullptr; }
 };
 
 //! Return implementation of Mining interface.
@@ -164,7 +214,7 @@ class Mining
 //! @param[in] wait_loaded waits for chainstate data to be loaded before
 //!                        returning. Used to prevent external clients from
 //!                        being able to crash the node during startup.
-std::unique_ptr<Mining> MakeMining(node::NodeContext& node, bool wait_loaded=true);
+std::unique_ptr<Mining> MakeMining(const node::NodeContext& node, bool wait_loaded=true);
 
 } // namespace interfaces
 
diff --git a/depend/bitcoin/src/interfaces/node.h b/depend/bitcoin/src/interfaces/node.h
index f6d8209f..8b8402ec 100644
--- a/depend/bitcoin/src/interfaces/node.h
+++ b/depend/bitcoin/src/interfaces/node.h
@@ -7,12 +7,12 @@
 
 #include <common/settings.h>
 #include <consensus/amount.h>
-#include <logging.h>
 #include <net.h>
 #include <net_types.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <support/allocators/secure.h>
+#include <util/log.h>
 #include <util/translation.h>
 
 #include <cstddef>
@@ -219,8 +219,7 @@ class Node
     virtual std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) = 0;
 
     //! Register handler for message box messages.
-    using MessageBoxFn =
-        std::function<bool(const bilingual_str& message, unsigned int style)>;
+    using MessageBoxFn = std::function<void(const bilingual_str& message, unsigned int style)>;
     virtual std::unique_ptr<Handler> handleMessageBox(MessageBoxFn fn) = 0;
 
     //! Register handler for question messages.
diff --git a/depend/bitcoin/src/interfaces/wallet.h b/depend/bitcoin/src/interfaces/wallet.h
index ab142080..f78e3da0 100644
--- a/depend/bitcoin/src/interfaces/wallet.h
+++ b/depend/bitcoin/src/interfaces/wallet.h
@@ -32,7 +32,7 @@ class CFeeRate;
 class CKey;
 enum class FeeReason;
 enum class OutputType;
-struct PartiallySignedTransaction;
+class PartiallySignedTransaction;
 struct bilingual_str;
 namespace common {
 enum class PSBTError;
@@ -59,9 +59,6 @@ struct WalletTxOut;
 struct WalletTxStatus;
 struct WalletMigrationResult;
 
-using WalletOrderForm = std::vector<std::pair<std::string, std::string>>;
-using WalletValueMap = std::map<std::string, std::string>;
-
 //! Interface for accessing a wallet.
 class Wallet
 {
@@ -150,9 +147,7 @@ class Wallet
         std::optional<unsigned int> change_pos) = 0;
 
     //! Commit transaction.
-    virtual void commitTransaction(CTransactionRef tx,
-        WalletValueMap value_map,
-        WalletOrderForm order_form) = 0;
+    virtual void commitTransaction(CTransactionRef tx, const std::vector<std::string>& messages) = 0;
 
     //! Return whether transaction can be abandoned.
     virtual bool transactionCanBeAbandoned(const Txid& txid) = 0;
@@ -198,7 +193,8 @@ class Wallet
     //! Get transaction details.
     virtual WalletTx getWalletTxDetails(const Txid& txid,
         WalletTxStatus& tx_status,
-        WalletOrderForm& order_form,
+        std::vector<std::string>& messages,
+        std::vector<std::string>& payment_requests,
         bool& in_mempool,
         int& num_blocks) = 0;
 
@@ -306,6 +302,9 @@ class Wallet
 
     //! Return pointer to internal wallet class, useful for testing.
     virtual wallet::CWallet* wallet() { return nullptr; }
+
+    //! Export a watchonly wallet file. See CWallet::ExportWatchOnlyWallet
+    virtual util::Result<std::string> exportWatchOnlyWallet(const fs::path& destination) = 0;
 };
 
 //! Wallet chain client that in addition to having chain client methods for
@@ -327,7 +326,7 @@ class WalletLoader : public ChainClient
     virtual util::Result<std::unique_ptr<Wallet>> restoreWallet(const fs::path& backup_file, const std::string& wallet_name, std::vector<bilingual_str>& warnings, bool load_after_restore) = 0;
 
     //! Migrate a wallet
-    virtual util::Result<WalletMigrationResult> migrateWallet(const std::string& name, const SecureString& passphrase) = 0;
+    virtual util::Result<WalletMigrationResult> migrateWallet(const std::string& name, const SecureString& passphrase, bool load_wallet) = 0;
 
     //! Returns true if wallet stores encryption keys
     virtual bool isEncrypted(const std::string& wallet_name) = 0;
@@ -392,7 +391,10 @@ struct WalletTx
     CAmount debit;
     CAmount change;
     int64_t time;
-    std::map<std::string, std::string> value_map;
+    std::optional<std::string> from; // Deprecated
+    std::optional<std::string> message; // Deprecated
+    std::optional<std::string> comment;
+    std::optional<std::string> comment_to;
     bool is_coinbase;
 
     bool operator<(const WalletTx& a) const { return tx->GetHash() < a.tx->GetHash(); }
diff --git a/depend/bitcoin/src/ipc/CMakeLists.txt b/depend/bitcoin/src/ipc/CMakeLists.txt
index 8326423d..caf1776e 100644
--- a/depend/bitcoin/src/ipc/CMakeLists.txt
+++ b/depend/bitcoin/src/ipc/CMakeLists.txt
@@ -31,8 +31,8 @@ if(BUILD_TESTS)
   # compiler only allows importing by relative path when the importing and
   # imported files are underneath the same compilation source prefix, so the
   # source prefix must be src/ipc, not src/ipc/test/
-  add_library(bitcoin_ipc_test STATIC EXCLUDE_FROM_ALL
-    test/ipc_test.cpp
+  add_library(bitcoin_ipc_test OBJECT EXCLUDE_FROM_ALL
+    test/ipc_tests.cpp
   )
   target_capnp_sources(bitcoin_ipc_test ${CMAKE_CURRENT_SOURCE_DIR}
     test/ipc_test.capnp
@@ -47,4 +47,19 @@ if(BUILD_TESTS)
   )
 endif()
 
+if (BUILD_FUZZ_BINARY)
+  add_library(bitcoin_ipc_fuzz STATIC EXCLUDE_FROM_ALL)
+  target_capnp_sources(bitcoin_ipc_fuzz ${CMAKE_CURRENT_SOURCE_DIR}
+    test/fuzz/ipc_fuzz.capnp
+  )
+  add_dependencies(bitcoin_ipc_fuzz bitcoin_ipc_headers)
+
+  target_link_libraries(bitcoin_ipc_fuzz
+    PRIVATE
+      core_interface
+      univalue
+      Boost::headers
+  )
+endif()
+
 configure_file(.clang-tidy.in .clang-tidy USE_SOURCE_PERMISSIONS COPYONLY)
diff --git a/depend/bitcoin/src/ipc/capnp/common-types.h b/depend/bitcoin/src/ipc/capnp/common-types.h
index 309799b8..9b6fa464 100644
--- a/depend/bitcoin/src/ipc/capnp/common-types.h
+++ b/depend/bitcoin/src/ipc/capnp/common-types.h
@@ -127,6 +127,18 @@ decltype(auto) CustomReadField(TypeList<UniValue>, Priority<1>, InvokeContext& i
     });
 }
 
+//! Interpret empty Data fields as null CTransactionRef values. This is safe to
+//! do because no CTransaction is ever serialized as empty Data, and it is
+//! convenient because this allows std::vector<CTransactionRef> to be passed as
+//! List(Data) even if the vector contains null values, and even though Cap'n
+//! Proto does not (currently) allow distinguishing between null and empty Data
+//! values in a List. Interpreting empty Data values as null CTransactionRef
+//! values works well for this purpose.
+template <typename Input>
+bool CustomHasField(TypeList<CTransaction>, InvokeContext& invoke_context, const Input& input)
+{
+    return input.get().size() > 0;
+}
 } // namespace mp
 
 #endif // BITCOIN_IPC_CAPNP_COMMON_TYPES_H
diff --git a/depend/bitcoin/src/ipc/capnp/mining.capnp b/depend/bitcoin/src/ipc/capnp/mining.capnp
index 64cad4d4..e8da538f 100644
--- a/depend/bitcoin/src/ipc/capnp/mining.capnp
+++ b/depend/bitcoin/src/ipc/capnp/mining.capnp
@@ -25,6 +25,9 @@ interface Mining $Proxy.wrap("interfaces::Mining") {
     createNewBlock @4 (context :Proxy.Context, options: BlockCreateOptions, cooldown: Bool = true) -> (result: BlockTemplate);
     checkBlock @5 (context :Proxy.Context, block: Data, options: BlockCheckOptions) -> (reason: Text, debug: Text, result: Bool);
     interrupt @6 () -> ();
+    submitBlock @7 (context :Proxy.Context, block: Data) -> (reason: Text, debug: Text, result: Bool);
+    getTransactionsByTxID @8 (context :Proxy.Context, txids: List(Data)) -> (result: List(Data));
+    getTransactionsByWitnessID @9 (context :Proxy.Context, wtxids: List(Data)) -> (result: List(Data));
 }
 
 interface BlockTemplate $Proxy.wrap("interfaces::BlockTemplate") {
@@ -35,9 +38,12 @@ interface BlockTemplate $Proxy.wrap("interfaces::BlockTemplate") {
     getTxSigops @4 (context: Proxy.Context) -> (result: List(Int64));
     getCoinbaseTx @5 (context: Proxy.Context) -> (result: CoinbaseTx);
     getCoinbaseMerklePath @6 (context: Proxy.Context) -> (result: List(Data));
-    submitSolution @7 (context: Proxy.Context, version: UInt32, timestamp: UInt32, nonce: UInt32, coinbase :Data) -> (result: Bool);
+    submitSolution @10 (context: Proxy.Context, version: UInt32, timestamp: UInt32, nonce: UInt32, coinbase :Data) -> (reason: Text, debug: Text, result: Bool);
     waitNext @8 (context: Proxy.Context, options: BlockWaitOptions) -> (result: BlockTemplate);
     interruptWait @9() -> ();
+
+    # DEPRECATED: older version of submitSolution which returns an error.
+    submitSolutionOld7 @7 (context: Proxy.Context, version: UInt32, timestamp: UInt32, nonce: UInt32, coinbase :Data) -> (result: Bool);
 }
 
 struct BlockCreateOptions $Proxy.wrap("node::BlockCreateOptions") {
diff --git a/depend/bitcoin/src/ipc/capnp/protocol.cpp b/depend/bitcoin/src/ipc/capnp/protocol.cpp
index 2645e46f..e7eaf643 100644
--- a/depend/bitcoin/src/ipc/capnp/protocol.cpp
+++ b/depend/bitcoin/src/ipc/capnp/protocol.cpp
@@ -10,10 +10,10 @@
 #include <ipc/exception.h>
 #include <ipc/protocol.h>
 #include <kj/async.h>
-#include <logging.h>
 #include <mp/proxy-io.h>
 #include <mp/proxy-types.h>
 #include <mp/util.h>
+#include <util/log.h>
 #include <util/threadnames.h>
 
 #include <cassert>
@@ -33,8 +33,8 @@ namespace {
 
 mp::Log GetRequestedIPCLogLevel()
 {
-    if (LogAcceptCategory(BCLog::IPC, BCLog::Level::Trace)) return mp::Log::Trace;
-    if (LogAcceptCategory(BCLog::IPC, BCLog::Level::Debug)) return mp::Log::Debug;
+    if (util::log::ShouldTraceLog(BCLog::IPC)) return mp::Log::Trace;
+    if (util::log::ShouldDebugLog(BCLog::IPC)) return mp::Log::Debug;
 
     // Info, Warning, and Error are logged unconditionally
     return mp::Log::Info;
@@ -71,36 +71,36 @@ void IpcLogFn(mp::LogMessage message)
 class CapnpProtocol : public Protocol
 {
 public:
+    CapnpProtocol(const char* exe_name) : m_exe_name{exe_name} {}
     ~CapnpProtocol() noexcept(true)
     {
         m_loop_ref.reset();
         if (m_loop_thread.joinable()) m_loop_thread.join();
         assert(!m_loop);
     };
-    std::unique_ptr<interfaces::Init> connect(int fd, const char* exe_name) override
+    std::unique_ptr<interfaces::Init> connect(mp::Stream stream) override
     {
-        startLoop(exe_name);
-        return mp::ConnectStream<messages::Init>(*m_loop, fd);
+        startLoop();
+        return mp::ConnectStream<messages::Init>(*m_loop, std::move(stream));
     }
-    void listen(int listen_fd, const char* exe_name, interfaces::Init& init) override
+    void listen(mp::SocketId listen_fd, interfaces::Init& init) override
     {
-        startLoop(exe_name);
+        startLoop();
         if (::listen(listen_fd, /*backlog=*/5) != 0) {
             throw std::system_error(errno, std::system_category());
         }
         mp::ListenConnections<messages::Init>(*m_loop, listen_fd, init);
     }
-    void serve(int fd, const char* exe_name, interfaces::Init& init, const std::function<void()>& ready_fn = {}) override
+    void serve(interfaces::Init& init, const std::function<mp::Stream()>& make_stream) override
     {
         assert(!m_loop);
-        mp::g_thread_context.thread_name = mp::ThreadName(exe_name);
+        mp::CurrentThread().thread_name = mp::ThreadName(m_exe_name);
         mp::LogOptions opts = {
             .log_fn = IpcLogFn,
             .log_level = GetRequestedIPCLogLevel()
         };
-        m_loop.emplace(exe_name, std::move(opts), &m_context);
-        if (ready_fn) ready_fn();
-        mp::ServeStream<messages::Init>(*m_loop, fd, init);
+        m_loop.emplace(m_exe_name, std::move(opts), &m_context);
+        mp::ServeStream<messages::Init>(*m_loop, make_stream(), init);
         m_parent_connection = &m_loop->m_incoming_connections.back();
         m_loop->loop();
         m_loop.reset();
@@ -115,12 +115,17 @@ class CapnpProtocol : public Protocol
             m_loop->m_incoming_connections.remove_if([this](mp::Connection& c) { return &c != m_parent_connection; });
         });
     }
+    mp::Stream makeStream(mp::SocketId socket) override
+    {
+        startLoop();
+        return mp::MakeStream(*m_loop, socket);
+    }
     void addCleanup(std::type_index type, void* iface, std::function<void()> cleanup) override
     {
         mp::ProxyTypeRegister::types().at(type)(iface).cleanup_fns.emplace_back(std::move(cleanup));
     }
     Context& context() override { return m_context; }
-    void startLoop(const char* exe_name)
+    void startLoop()
     {
         if (m_loop) return;
         std::promise<void> promise;
@@ -130,7 +135,7 @@ class CapnpProtocol : public Protocol
                 .log_fn = IpcLogFn,
                 .log_level = GetRequestedIPCLogLevel()
             };
-            m_loop.emplace(exe_name, std::move(opts), &m_context);
+            m_loop.emplace(m_exe_name, std::move(opts), &m_context);
             m_loop_ref.emplace(*m_loop);
             promise.set_value();
             m_loop->loop();
@@ -138,8 +143,8 @@ class CapnpProtocol : public Protocol
         });
         promise.get_future().wait();
     }
+    const char* m_exe_name;
     Context m_context;
-    std::thread m_loop_thread;
     //! EventLoop object which manages I/O events for all connections.
     std::optional<mp::EventLoop> m_loop;
     //! Reference to the same EventLoop. Increments the loop’s refcount on
@@ -148,9 +153,10 @@ class CapnpProtocol : public Protocol
     std::optional<mp::EventLoopRef> m_loop_ref;
     //! Connection to parent, if this is a child process spawned by a parent process.
     mp::Connection* m_parent_connection{nullptr};
+    std::thread m_loop_thread;
 };
 } // namespace
 
-std::unique_ptr<Protocol> MakeCapnpProtocol() { return std::make_unique<CapnpProtocol>(); }
+std::unique_ptr<Protocol> MakeCapnpProtocol(const char* exe_name) { return std::make_unique<CapnpProtocol>(exe_name); }
 } // namespace capnp
 } // namespace ipc
diff --git a/depend/bitcoin/src/ipc/capnp/protocol.h b/depend/bitcoin/src/ipc/capnp/protocol.h
index 54a8ae6e..ef828cd4 100644
--- a/depend/bitcoin/src/ipc/capnp/protocol.h
+++ b/depend/bitcoin/src/ipc/capnp/protocol.h
@@ -10,7 +10,7 @@
 namespace ipc {
 class Protocol;
 namespace capnp {
-std::unique_ptr<Protocol> MakeCapnpProtocol();
+std::unique_ptr<Protocol> MakeCapnpProtocol(const char* exe_name);
 } // namespace capnp
 } // namespace ipc
 
diff --git a/depend/bitcoin/src/ipc/interfaces.cpp b/depend/bitcoin/src/ipc/interfaces.cpp
index 1171f706..40cddb4b 100644
--- a/depend/bitcoin/src/ipc/interfaces.cpp
+++ b/depend/bitcoin/src/ipc/interfaces.cpp
@@ -9,9 +9,9 @@
 #include <ipc/capnp/protocol.h>
 #include <ipc/process.h>
 #include <ipc/protocol.h>
-#include <logging.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 
 #include <csignal>
 #include <cstdio>
@@ -21,10 +21,13 @@
 #include <memory>
 #include <stdexcept>
 #include <string>
-#include <unistd.h>
 #include <utility>
 #include <vector>
 
+#ifndef WIN32
+#include <unistd.h>
+#endif
+
 namespace ipc {
 namespace {
 #ifndef WIN32
@@ -54,15 +57,14 @@ class IpcImpl : public interfaces::Ipc
 public:
     IpcImpl(const char* exe_name, const char* process_argv0, interfaces::Init& init)
         : m_exe_name(exe_name), m_process_argv0(process_argv0), m_init(init),
-          m_protocol(ipc::capnp::MakeCapnpProtocol()), m_process(ipc::MakeProcess())
+          m_protocol(ipc::capnp::MakeCapnpProtocol(exe_name)), m_process(ipc::MakeProcess())
     {
     }
     std::unique_ptr<interfaces::Init> spawnProcess(const char* new_exe_name) override
     {
-        int pid;
-        int fd = m_process->spawn(new_exe_name, m_process_argv0, pid);
+        const auto [pid, socket] = m_process->spawn(new_exe_name, m_process_argv0);
         LogDebug(::BCLog::IPC, "Process %s pid %i launched\n", new_exe_name, pid);
-        auto init = m_protocol->connect(fd, m_exe_name);
+        auto init = m_protocol->connect(m_protocol->makeStream(socket));
         Ipc::addCleanup(*init, [this, new_exe_name, pid] {
             int status = m_process->waitSpawned(pid);
             LogDebug(::BCLog::IPC, "Process %s pid %i exited with status %i\n", new_exe_name, pid, status);
@@ -72,19 +74,19 @@ class IpcImpl : public interfaces::Ipc
     bool startSpawnedProcess(int argc, char* argv[], int& exit_status) override
     {
         exit_status = EXIT_FAILURE;
-        int32_t fd = -1;
-        if (!m_process->checkSpawned(argc, argv, fd)) {
+        mp::SocketId socket{mp::SocketError};
+        if (!m_process->checkSpawned(argc, argv, socket)) {
             return false;
         }
         IgnoreCtrlC(strprintf("[%s] SIGINT received — waiting for parent to shut down.\n", m_exe_name));
-        m_protocol->serve(fd, m_exe_name, m_init);
+        m_protocol->serve(m_init, [&] { return m_protocol->makeStream(socket); } );
         exit_status = EXIT_SUCCESS;
         return true;
     }
     std::unique_ptr<interfaces::Init> connectAddress(std::string& address) override
     {
         if (address.empty() || address == "0") return nullptr;
-        int fd;
+        mp::SocketId fd;
         if (address == "auto") {
             // Treat "auto" the same as "unix" except don't treat it an as error
             // if the connection is not accepted. Just return null so the caller
@@ -106,12 +108,12 @@ class IpcImpl : public interfaces::Ipc
         } else {
             fd = m_process->connect(gArgs.GetDataDirNet(), "bitcoin-node", address);
         }
-        return m_protocol->connect(fd, m_exe_name);
+        return m_protocol->connect(m_protocol->makeStream(fd));
     }
     void listenAddress(std::string& address) override
     {
-        int fd = m_process->bind(gArgs.GetDataDirNet(), m_exe_name, address);
-        m_protocol->listen(fd, m_exe_name, m_init);
+        mp::SocketId fd = m_process->bind(gArgs.GetDataDirNet(), m_exe_name, address);
+        m_protocol->listen(fd, m_init);
     }
     void disconnectIncoming() override
     {
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml b/depend/bitcoin/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml
index e6ac83f0..a48b186a 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml
+++ b/depend/bitcoin/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml
@@ -43,7 +43,6 @@ jobs:
               clang-22
               llvm-22
               libclang-rt-22-dev
-              libevent-dev
               libboost-dev
               libsqlite3-dev
               libcapnp-dev
@@ -65,7 +64,7 @@ jobs:
             nproc_multiplier: 2
             functional_timeout_factor: 40
             runner: macos-15
-            brew-packages: ccache capnp boost libevent sqlite pkgconf ninja
+            brew-packages: ccache capnp boost sqlite pkgconf ninja
             pip-packages: --break-system-packages pycapnp
             cmake-args: |-
               -DREDUCE_EXPORTS=ON
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/CMakeLists.txt b/depend/bitcoin/src/ipc/libmultiprocess/CMakeLists.txt
index a36023b1..ea91f98f 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/CMakeLists.txt
+++ b/depend/bitcoin/src/ipc/libmultiprocess/CMakeLists.txt
@@ -90,13 +90,6 @@ if(MP_ENABLE_CLANG_TIDY)
     message(FATAL_ERROR "MP_ENABLE_CLANG_TIDY is ON but clang-tidy is not found.")
   endif()
   set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE}")
-
-  # Workaround for nix from https://gitlab.kitware.com/cmake/cmake/-/issues/20912#note_793338
-  # Nix injects header paths via $NIX_CFLAGS_COMPILE; CMake tags these as
-  # CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES and omits them from the compile
-  # database, so clang-tidy, which ignores $NIX_CFLAGS_COMPILE, can't find capnp
-  # headers. Setting them as standard passes them to clang-tidy.
-  set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
 endif()
 
 option(MP_ENABLE_IWYU "Run include-what-you-use with the compiler." OFF)
@@ -111,6 +104,15 @@ if(MP_ENABLE_IWYU)
   endif()
 endif()
 
+if(MP_ENABLE_CLANG_TIDY OR MP_ENABLE_IWYU)
+  # Workaround for nix from https://gitlab.kitware.com/cmake/cmake/-/issues/20912#note_793338
+  # Nix injects header paths via $NIX_CFLAGS_COMPILE; CMake tags these as
+  # CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES and omits them from the compile
+  # database, so clang-tidy, which ignores $NIX_CFLAGS_COMPILE, can't find capnp
+  # headers. Setting them as standard passes them to clang-tidy.
+  set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
+endif()
+
 include("cmake/compat_config.cmake")
 include("cmake/pthread_checks.cmake")
 include(GNUInstallDirs)
@@ -137,6 +139,10 @@ configure_file(include/mp/config.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/mp/co
 # Generated C++ Capn'Proto schema files
 capnp_generate_cpp(MP_PROXY_SRCS MP_PROXY_HDRS include/mp/proxy.capnp)
 set_source_files_properties("${MP_PROXY_SRCS}" PROPERTIES SKIP_LINTING TRUE) # Ignored before cmake 3.27
+# Build-graph node for generated headers. This lets targets that include
+# the headers order themselves after generation without depending on the
+# library target that also uses them.
+add_custom_target(mp_headers DEPENDS ${MP_PROXY_HDRS})
 
 # util library
 add_library(mputil OBJECT src/mp/util.cpp)
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/cmake/TargetCapnpSources.cmake b/depend/bitcoin/src/ipc/libmultiprocess/cmake/TargetCapnpSources.cmake
index abcca70f..f04a9657 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/cmake/TargetCapnpSources.cmake
+++ b/depend/bitcoin/src/ipc/libmultiprocess/cmake/TargetCapnpSources.cmake
@@ -27,10 +27,8 @@ Arguments:
 
       #include <schema.capnp.h>
 
-    The specified include_prefix should be ${CMAKE_SOURCE_DIR} or a
-    subdirectory of it to include files relative to the project root. It can
-    be ${CMAKE_CURRENT_SOURCE_DIR} to include files relative to the current
-    source directory.
+    Pass ${CMAKE_CURRENT_SOURCE_DIR} or a subdirectory of it to include files
+    relative to the current source directory (the typical usage).
 
 Additional Unnamed Arguments:
 
@@ -43,12 +41,19 @@ Optional Keyword Arguments:
   IMPORT_PATHS: Specifies additional directories to search for imported
     `.capnp` files.
 
+  ONLY_CAPNP: If specified, only the Cap'n Proto serialization files
+    (`.capnp.h`, `.capnp.c++`) are generated and compiled. The mpgen proxy
+    files (`.capnp.proxy-client.c++`, `.capnp.proxy-server.c++`,
+    `.capnp.proxy-types.c++`, etc.) are skipped. Useful when you need
+    Cap'n Proto serialization without the multiprocess RPC proxy
+    infrastructure.
+
 Example:
   # Assuming `my_library` is a target and `lib/` contains `.capnp` schema
   # files with imports from `include/`.
-  target_capnp_sources(my_library "${CMAKE_SOURCE_DIR}"
+  target_capnp_sources(my_library "${CMAKE_CURRENT_SOURCE_DIR}"
                        lib/schema1.capnp lib/schema2.capnp
-                       IMPORT_PATHS ${CMAKE_SOURCE_DIR}/include)
+                       IMPORT_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 #]=]
 
@@ -98,8 +103,8 @@ function(target_capnp_sources target include_prefix)
 
   # Translate include_prefix from a source path to a binary path and add it as a
   # target include directory.
-  set(build_include_prefix ${CMAKE_BINARY_DIR})
-  file(RELATIVE_PATH relative_path ${CMAKE_SOURCE_DIR} ${include_prefix})
+  set(build_include_prefix ${CMAKE_CURRENT_BINARY_DIR})
+  file(RELATIVE_PATH relative_path ${CMAKE_CURRENT_SOURCE_DIR} ${include_prefix})
   if(relative_path)
     string(APPEND build_include_prefix "/" "${relative_path}")
   endif()
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/doc/design.md b/depend/bitcoin/src/ipc/libmultiprocess/doc/design.md
index 113cafc4..b8bc5fd0 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/doc/design.md
+++ b/depend/bitcoin/src/ipc/libmultiprocess/doc/design.md
@@ -15,7 +15,7 @@ Libmultiprocess acts as a pure wrapper or layer over the underlying protocol. Cl
 
 ## Core Architecture
 
-The `ProxyClient` and `ProxyServer` generated classes are not directly exposed to the user, as described in [usage.md](usage.md). Instead, they wrap C++ interfaces and appear to the user as pointers to an interface. They are first instantiated when calling `ConnectStream` and `ServeStream` respectively for creating the `InitInterface`. These methods establish connections through sockets, internally creating `Connection` objects wrapping a `capnp::RpcSystem` configured for client and server mode respectively.
+The `ProxyServer` generated class is not directly exposed to the user. The `ProxyClient` generated class inherits from the C++ interface class, so user code interacts with it through the abstract interface type, and the `ProxyClient` type itself is generally not visible or accessible without a cast. `ConnectStream` returns a `unique_ptr<ProxyClient<InitInterface>>` as an exception for the root Init interface, but even there users typically treat it as a pointer to the abstract `InitInterface`. For all interfaces returned by Init methods (e.g., `Printer`, `Calculator`), the return type is the abstract class pointer, hiding the underlying `ProxyClient` entirely. They are first instantiated when calling `ConnectStream` and `ServeStream` respectively for creating the `InitInterface`. These methods establish connections through sockets, internally creating `Connection` objects wrapping a `capnp::RpcSystem` configured for client and server mode respectively.
 
 The `InitInterface` interface will typically have methods which return other interfaces, giving the connecting process the ability to call other functions in the serving process. Interfaces can also have methods accepting other interfaces as parameters, giving serving processes the ability to call back and invoke functions in connecting processes. Creating new interfaces does not create new connections, and typically many interface objects will share the same connection.
 
@@ -134,6 +134,8 @@ sequenceDiagram
     SF1->>serverInvoke: return
 ```
 
+Destroy methods are a special case: a capnp interface can declare a `destroy` method that is handled by `ServerDestroy` instead of `ServerCall`. Rather than dispatching through the `ServerField`/`ServerRet`/`ServerCall` chain to a C++ interface method, `ServerDestroy` calls `invokeDestroy()` on the `ProxyServer`, which resets `m_impl` and runs any registered cleanup functions, giving the client a way to synchronously destroy the wrapped object on the server side.
+
 ## Advanced Features
 
 ### Callbacks
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/doc/usage.md b/depend/bitcoin/src/ipc/libmultiprocess/doc/usage.md
index f387db4d..df103e9f 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/doc/usage.md
+++ b/depend/bitcoin/src/ipc/libmultiprocess/doc/usage.md
@@ -10,7 +10,7 @@ _libmultiprocess_ is a library and code generator that allows calling C++ class
 
 The `*.capnp` data definition files are consumed by the _libmultiprocess_ code generator and each `X.capnp` file generates `X.capnp.c++`, `X.capnp.h`, `X.capnp.proxy-client.c++`, `X.capnp.proxy-server.c++`, `X.capnp.proxy-types.c++`, `X.capnp.proxy-types.h`, and `X.capnp.proxy.h` output files. The generated files include `mp::ProxyClient<Interface>` and `mp::ProxyServer<Interface>` class specializations for all the interfaces in the `.capnp` files. These allow methods on C++ objects in one process to be called from other processes over IPC sockets.
 
-The `ProxyServer` objects help translate IPC requests from a socket to method calls on a local object. The `ProxyServer` objects are just used internally by the `mp::ServeStream(loop, socket, wrapped_object)` and `mp::ListenConnections(loop, socket, wrapped_object)` functions, and aren't exposed externally. The `ProxyClient` classes are exposed, and returned from the `mp::ConnectStream(loop, socket)` function and meant to be used directly. The classes implement methods described in `.capnp` definitions, and whenever any method is called, a request with the method arguments is sent over the associated IPC connection, and the corresponding `wrapped_object` method on the other end of the connection is called, with the `ProxyClient` method blocking until it returns and forwarding back any return value to the `ProxyClient` method caller.
+The `ProxyServer` objects help translate IPC requests from a socket to method calls on a local object. The `ProxyServer` objects are just used internally by the `mp::ServeStream(loop, socket, wrapped_object)` and `mp::ListenConnections(loop, socket, wrapped_object[, max_connections])` functions, and aren't exposed externally. The `ProxyClient` classes are exposed, and returned from the `mp::ConnectStream(loop, socket)` function and meant to be used directly. The classes implement methods described in `.capnp` definitions, and whenever any method is called, a request with the method arguments is sent over the associated IPC connection, and the corresponding `wrapped_object` method on the other end of the connection is called, with the `ProxyClient` method blocking until it returns and forwarding back any return value to the `ProxyClient` method caller.
 
 ## Example
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/doc/versions.md b/depend/bitcoin/src/ipc/libmultiprocess/doc/versions.md
index 2c2ec50e..35ae76bd 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/doc/versions.md
+++ b/depend/bitcoin/src/ipc/libmultiprocess/doc/versions.md
@@ -7,72 +7,97 @@ Library versions are tracked with simple
 Versioning policy is described in the [version.h](../include/mp/version.h)
 include.
 
-## v10
+## v13
 - Current unstable version.
 
+## [v12.0](https://github.com/bitcoin-core/libmultiprocess/commits/v12.0)
+- Adds an optional `max_connections` parameter to `ListenConnections` ([#269](https://github.com/bitcoin-core/libmultiprocess/pull/269)).
+- Used in Bitcoin Core 32.x and newer releases with [#35684](https://github.com/bitcoin/bitcoin/pull/35684).
+
+## [v11.0](https://github.com/bitcoin-core/libmultiprocess/commits/v11.0)
+- Adds `makePool` method on `ThreadMap` to support thread pool routing, allowing requests without a specific client thread to be dispatched to a pool using a shortest-queue strategy ([#283](https://github.com/bitcoin-core/libmultiprocess/pull/283)).
+- Adds `std::unordered_set` support, a `BuildList` helper, and a `ReadList` helper to reduce duplication in list build and read handlers ([#277](https://github.com/bitcoin-core/libmultiprocess/pull/277), [#285](https://github.com/bitcoin-core/libmultiprocess/pull/285)).
+- Adds support for translating C++ `std::optional<T>` struct fields to pairs of `T` + `hasT :Bool` Cap'n Proto struct fields, allowing unset optional primitive fields to be represented ([#243](https://github.com/bitcoin-core/libmultiprocess/pull/243)).
+- Produces more readable log output for Proxy object lifecycle events and IPC server-side failures ([#218](https://github.com/bitcoin-core/libmultiprocess/pull/218)).
+- Handles exceptions thrown by `destroy` methods by logging instead of aborting ([#273](https://github.com/bitcoin-core/libmultiprocess/pull/273)). This can prevent server crashes when non-libmultiprocess clients disconnect without destroying objects, in the case where a server object owns client objects and the server destructor tries to call the disconnected client to free them ([#219](https://github.com/bitcoin-core/libmultiprocess/issues/219)).
+- Handles unexpected exceptions thrown by callbacks (that should never happen) by logging errors instead of deadlocking ([#260](https://github.com/bitcoin-core/libmultiprocess/pull/260)).
+- Fixes a rare mptest hang on musl builds caused by a lost wakeup bug in `Waiter` ([#295](https://github.com/bitcoin-core/libmultiprocess/pull/295)).
+- Fixes a race condition in a log print detected by TSan ([#286](https://github.com/bitcoin-core/libmultiprocess/pull/286)).
+- Build improvements: makes `target_capnp_sources` work correctly when libmultiprocess is used as a CMake subproject ([#289](https://github.com/bitcoin-core/libmultiprocess/pull/289)), adds `mp_headers` target for better lint tool support ([#291](https://github.com/bitcoin-core/libmultiprocess/pull/291)), and fixes compatibility with recent Nix and CMake 4.0 ([#238](https://github.com/bitcoin-core/libmultiprocess/pull/238)).
+- Test, CI, documentation, and minor code improvements: design document corrections ([#278](https://github.com/bitcoin-core/libmultiprocess/pull/278)), field constant comments ([#279](https://github.com/bitcoin-core/libmultiprocess/pull/279)), clang-tidy fix ([#292](https://github.com/bitcoin-core/libmultiprocess/pull/292)), new smoke test for double-precision float values ([#294](https://github.com/bitcoin-core/libmultiprocess/pull/294)), new test for recursive async IPC calls ([#301](https://github.com/bitcoin-core/libmultiprocess/pull/301)), removal of libevent from Core CI builds ([#299](https://github.com/bitcoin-core/libmultiprocess/pull/299)), and rename of `EventLoop::m_num_clients` to `m_num_refs` ([#302](https://github.com/bitcoin-core/libmultiprocess/pull/302)).
+- Used in Bitcoin Core 32.x and newer releases with [#35661](https://github.com/bitcoin/bitcoin/pull/35661).
+
+## [v10.0](https://github.com/bitcoin-core/libmultiprocess/commits/v10.0)
+- Increases spawn test timeout to avoid spurious failures.
+- Uses `throwRecoverableException` instead of raw `throw` to improve runtime error messages in macOS builds.
+- Used in Bitcoin Core 31.0rc3 and newer releases with [#34977](https://github.com/bitcoin/bitcoin/pull/34977) and backport [#35028](https://github.com/bitcoin/bitcoin/pull/35028).
+
 ## [v9.0](https://github.com/bitcoin-core/libmultiprocess/commits/v9.0)
 - Fixes race conditions where worker thread could be used after destruction, where getParams() could be called after request cancel, and where m_on_cancel could be called after request finishes.
 - Adds `CustomHasField` hook to map Cap'n Proto null values to C++ null values.
 - Improves `CustomBuildField` for `std::optional` to use move semantics.
 - Adds LLVM 22 compatibility fix in type-map.
-- Used in Bitcoin Core master branch, pulled in by [#34804](https://github.com/bitcoin/bitcoin/pull/34804). Also pulled into Bitcoin Core 31.x stable branch by [#34952](https://github.com/bitcoin/bitcoin/pull/34952).
+- Used in Bitcoin Core 31.0rc3 and newer releases with [#34804](https://github.com/bitcoin/bitcoin/pull/34804) and backport [#34952](https://github.com/bitcoin/bitcoin/pull/34952).
 
 ## [v8.0](https://github.com/bitcoin-core/libmultiprocess/commits/v8.0)
 - Better support for non-libmultiprocess IPC clients: avoiding errors on unclean disconnects, and allowing simultaneous requests to worker threads which previously triggered "thread busy" errors.
-- Intermediate version used in Bitcoin Core master branch between 30.x and 31.x branches, pulled in by [#34422](https://github.com/bitcoin/bitcoin/pull/34422).
+- Used in Bitcoin Core 31.x and newer releases with [#34422](https://github.com/bitcoin/bitcoin/pull/34422).
 
 ## [v7.0](https://github.com/bitcoin-core/libmultiprocess/commits/v7.0)
 - Adds SpawnProcess race fix, cmake `target_capnp_sources` option, ci and documentation improvements. Adds `version.h` header declaring major and minor version numbers.
-- Intermediate version used in Bitcoin Core master branch between 30.x and 31.x branches, pulled in by [#34363](https://github.com/bitcoin/bitcoin/pull/34363).
+- Used in Bitcoin Core 31.x and newer releases with [#34363](https://github.com/bitcoin/bitcoin/pull/34363).
 
 ## [v7.0-pre2](https://github.com/bitcoin-core/libmultiprocess/commits/v7.0-pre2)
 - Fixes intermittent mptest hang and makes other minor improvements.
-- Used in Bitcoin Core 30.1 and 30.2 releases and 30.x branch, pulled in by [#33518](https://github.com/bitcoin/bitcoin/pull/33518) and [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
+- Used in Bitcoin Core 30.1 and newer releases with [#33518](https://github.com/bitcoin/bitcoin/pull/33518) and backport [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
 
 ## [v7.0-pre1](https://github.com/bitcoin-core/libmultiprocess/commits/v7.0-pre1)
 - Adds support for log levels to reduce logging and "thread busy" error to avoid a crash on misuse.
-- Minimum required version since Bitcoin Core 30.1, pulled in by [#33412](https://github.com/bitcoin/bitcoin/pull/33412), [#33518](https://github.com/bitcoin/bitcoin/pull/33518), and [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
+- Used in Bitcoin Core 30.1 and newer releases with [#33412](https://github.com/bitcoin/bitcoin/pull/33412) and [#33518](https://github.com/bitcoin/bitcoin/pull/33518) and backport [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
+- Minimum required version since Bitcoin Core 30.1 due to [#33517](https://github.com/bitcoin/bitcoin/pull/33517) and backport [#33609](https://github.com/bitcoin/bitcoin/pull/33609).
 
 ## [v6.0](https://github.com/bitcoin-core/libmultiprocess/commits/v6.0)
 - Adds CI scripts and build and test fixes.
-- Used in Bitcoin Core 30.0 release, pulled in by [#32345](https://github.com/bitcoin/bitcoin/pull/32345), [#33241](https://github.com/bitcoin/bitcoin/pull/33241), and [#33322](https://github.com/bitcoin/bitcoin/pull/33322).
+- Used in Bitcoin Core 30.x and newer releases with [#32345](https://github.com/bitcoin/bitcoin/pull/32345), [#33241](https://github.com/bitcoin/bitcoin/pull/33241), and [#33322](https://github.com/bitcoin/bitcoin/pull/33322).
 
 ## [v6.0-pre1](https://github.com/bitcoin-core/libmultiprocess/commits/v6.0-pre1)
 - Adds fixes for unclean shutdowns and thread sanitizer issues.
 - Drops `EventLoop::addClient` and `EventLoop::removeClient` methods,
   requiring clients to use new `EventLoopRef` class instead.
-- Minimum required version for Bitcoin Core 30.0 release, pulled in by [#31741](https://github.com/bitcoin/bitcoin/pull/31741), [#32641](https://github.com/bitcoin/bitcoin/pull/32641), and [#32345](https://github.com/bitcoin/bitcoin/pull/32345).
+- Used in Bitcoin Core 30.x and newer releases with [#31741](https://github.com/bitcoin/bitcoin/pull/31741), [#32641](https://github.com/bitcoin/bitcoin/pull/32641), and [#32345](https://github.com/bitcoin/bitcoin/pull/32345).
+- Minimum required version since Bitcoin Core 30.0 due to [#32345](https://github.com/bitcoin/bitcoin/pull/32345).
 
 ## [v5.0](https://github.com/bitcoin-core/libmultiprocess/commits/v5.0)
 - Adds build improvements and tidy/warning fixes.
-- Used in Bitcoin Core 29 releases, pulled in by [#31945](https://github.com/bitcoin/bitcoin/pull/31945).
+- Used in Bitcoin Core 29.x and newer releases with [#31945](https://github.com/bitcoin/bitcoin/pull/31945).
 
 ## [v5.0-pre1](https://github.com/bitcoin-core/libmultiprocess/commits/v5.0-pre1)
 - Adds many improvements to Bitcoin Core mining interface: splitting up type headers, fixing shutdown bugs, adding subtree build support.
 - Broke up `proxy-types.h` into `type-*.h` files requiring clients to explicitly
   include overloads needed for C++ ↔️ Cap'n Proto type conversions.
 - Now requires C++ 20 support.
-- Minimum required version for Bitcoin Core 29 releases, pulled in by [#30509](https://github.com/bitcoin/bitcoin/pull/30509), [#30510](https://github.com/bitcoin/bitcoin/pull/30510), [#31105](https://github.com/bitcoin/bitcoin/pull/31105), [#31740](https://github.com/bitcoin/bitcoin/pull/31740).
+- Used in Bitcoin Core 29.x and newer releases with [#30509](https://github.com/bitcoin/bitcoin/pull/30509), [#30510](https://github.com/bitcoin/bitcoin/pull/30510), [#31105](https://github.com/bitcoin/bitcoin/pull/31105), [#31740](https://github.com/bitcoin/bitcoin/pull/31740).
+- Minimum required version since Bitcoin Core 29.0 due to [#31740](https://github.com/bitcoin/bitcoin/pull/31740).
 
 ## [v4.0](https://github.com/bitcoin-core/libmultiprocess/commits/v4.0)
 - Added better cmake support, installing cmake package files so clients do not
   need to use pkgconfig.
-- Used in Bitcoin Core 28 releases, pulled in by [#30490](https://github.com/bitcoin/bitcoin/pull/30490) and [#30513](https://github.com/bitcoin/bitcoin/pull/30513).
+- Used in Bitcoin Core 28.x and newer releases with [#30490](https://github.com/bitcoin/bitcoin/pull/30490) and [#30513](https://github.com/bitcoin/bitcoin/pull/30513).
 
 ## [v3.0](https://github.com/bitcoin-core/libmultiprocess/commits/v3.0)
 - Dropped compatibility with Cap'n Proto versions before 0.7.
-- Used in Bitcoin Core 27 releases, pulled in by [#28735](https://github.com/bitcoin/bitcoin/pull/28735), [#28907](https://github.com/bitcoin/bitcoin/pull/28907), and [#29276](https://github.com/bitcoin/bitcoin/pull/29276).
+- Used in Bitcoin Core 27.x and newer releases with [#28735](https://github.com/bitcoin/bitcoin/pull/28735), [#28907](https://github.com/bitcoin/bitcoin/pull/28907), and [#29276](https://github.com/bitcoin/bitcoin/pull/29276).
 
 ## [v2.0](https://github.com/bitcoin-core/libmultiprocess/commits/v2.0)
 - Changed `PassField` function signature.
 - Now requires C++17 support.
-- Used in Bitcoin Core 25 and 26 releases, pulled in by [#26672](https://github.com/bitcoin/bitcoin/pull/26672).
+- Used in Bitcoin Core 25.x and newer releases with [#26672](https://github.com/bitcoin/bitcoin/pull/26672).
 
 ## [v1.0](https://github.com/bitcoin-core/libmultiprocess/commits/v1.0)
 - Dropped hardcoded includes in generated files, now requiring `include` and
   `includeTypes` annotations.
-- Used in Bitcoin Core 22, 23, and 24 releases, pulled in by [#19160](https://github.com/bitcoin/bitcoin/pull/19160).
+- Used in Bitcoin Core 22.x and newer releases with [#19160](https://github.com/bitcoin/bitcoin/pull/19160).
 
 ## [v0.0](https://github.com/bitcoin-core/libmultiprocess/commits/v0.0)
 - Initial version used in a downstream release.
-- Used in Bitcoin Core 21 releases, pulled in by [#16367](https://github.com/bitcoin/bitcoin/pull/16367), [#18588](https://github.com/bitcoin/bitcoin/pull/18588), and [#18677](https://github.com/bitcoin/bitcoin/pull/18677).
+- Used in Bitcoin Core 21.x and newer releases with [#16367](https://github.com/bitcoin/bitcoin/pull/16367), [#18588](https://github.com/bitcoin/bitcoin/pull/18588), and [#18677](https://github.com/bitcoin/bitcoin/pull/18677).
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-io.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-io.h
index d7b9f0e5..ec9a1539 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-io.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-io.h
@@ -13,7 +13,9 @@
 #include <capnp/rpc-twoparty.h>
 
 #include <assert.h>
+#include <algorithm>
 #include <condition_variable>
+#include <cstdlib>
 #include <functional>
 #include <kj/function.h>
 #include <map>
@@ -25,6 +27,7 @@
 
 namespace mp {
 struct ThreadContext;
+struct Listener;
 
 struct InvokeContext
 {
@@ -255,7 +258,7 @@ class EventLoop
 
     //! Run event loop. Does not return until shutdown. This should only be
     //! called once from the m_thread_id thread. This will block until
-    //! the m_num_clients reference count is 0.
+    //! the m_num_refs reference count is 0.
     void loop();
 
     //! Run function on event loop thread. Does not return until function completes.
@@ -314,9 +317,13 @@ class EventLoop
     //! Pipe write handle used to wake up the event loop thread.
     int m_post_fd = -1;
 
-    //! Number of clients holding references to ProxyServerBase objects that
-    //! reference this event loop.
-    int m_num_clients MP_GUARDED_BY(m_mutex) = 0;
+    //! Number of EventLoopRef instances referencing this event loop. This is a
+    //! sum of the number of client and server objects (Connection, ProxyClient,
+    //! ProxyServer) using the loop, plus temporary references held while
+    //! posting functions to the loop, plus any references held by external code
+    //! to keep the loop running. The loop() method exits when this count drops
+    //! to 0 (and m_async_fns is empty).
+    int m_num_refs MP_GUARDED_BY(m_mutex) = 0;
 
     //! Mutex and condition variable used to post tasks to event loop and async
     //! thread.
@@ -356,6 +363,12 @@ class EventLoop
 
     //! Hook called on the worker thread just before returning results.
     std::function<void()> testing_hook_async_request_done;
+
+    //! Hook called on the event loop thread when a client has connected.
+    std::function<void()> testing_hook_connected;
+
+    //! Hook called on the event loop thread when a client has disconnected.
+    std::function<void()> testing_hook_disconnected;
 };
 
 //! Single element task queue used to handle recursive capnp calls. (If the
@@ -384,7 +397,7 @@ struct Waiter
     }
 
     template <class Predicate>
-    void wait(Lock& lock, Predicate pred)
+    void wait(Lock& lock, Predicate pred) MP_REQUIRES(m_mutex)
     {
         m_cv.wait(lock.m_lock, [&]() MP_REQUIRES(m_mutex) {
             // Important for this to be "while (m_fn)", not "if (m_fn)" to avoid
@@ -410,7 +423,7 @@ struct Waiter
     //! EventLoop::m_mutex as long as Waiter::mutex is locked first and
     //! EventLoop::m_mutex is locked second.
     Mutex m_mutex;
-    std::condition_variable m_cv;
+    std::condition_variable m_cv MP_GUARDED_BY(m_mutex);
     std::optional<kj::Function<void()>> m_fn MP_GUARDED_BY(m_mutex);
 };
 
@@ -477,6 +490,13 @@ class Connection
     //! ThreadMap.makeThread) used to service requests to clients.
     ::capnp::CapabilityServerSet<Thread> m_threads;
 
+    //! A thread created by makePool with associated pending work queue. Vector is filled once by makePool() and never resized.
+    struct PoolSlot {
+        Thread::Client client;
+        size_t depth{0};
+    };
+    std::vector<PoolSlot> m_thread_pool;
+
     //! Canceler for canceling promises that we want to discard when the
     //! connection is destroyed. This is used to interrupt method calls that are
     //! still executing at time of disconnection.
@@ -511,6 +531,7 @@ ProxyClientBase<Interface, Impl>::ProxyClientBase(typename Interface::Client cli
     : m_client(std::move(client)), m_context(connection)
 
 {
+    MP_LOG(*m_context.loop, Log::Debug) << "Creating " << CxxTypeName(*this) << " " << this;
     // Handler for the connection getting destroyed before this client object.
     auto disconnect_cb = m_context.connection->addSyncCleanup([this]() {
         // Release client capability by move-assigning to temporary.
@@ -538,7 +559,12 @@ ProxyClientBase<Interface, Impl>::ProxyClientBase(typename Interface::Client cli
         // the remote object, waiting for it to be deleted server side. If the
         // capnp interface does not define a destroy method, this will just call
         // an empty stub defined in the ProxyClientBase class and do nothing.
-        Sub::destroy(*this);
+        // Exceptions are caught and logged rather than propagated because
+        // ~ProxyClientBase is noexcept and the peer may be gone by the time
+        // this runs.
+        if (kj::runCatchingExceptions([&]{ Sub::destroy(*this); }) != nullptr) {
+            MP_LOG(*m_context.loop, Log::Warning) << "Remote destroy call failed during cleanup. Continuing.";
+        }
 
         // FIXME: Could just invoke removed addCleanup fn here instead of duplicating code
         m_context.loop->sync([&]() {
@@ -567,13 +593,16 @@ ProxyClientBase<Interface, Impl>::ProxyClientBase(typename Interface::Client cli
 template <typename Interface, typename Impl>
 ProxyClientBase<Interface, Impl>::~ProxyClientBase() noexcept
 {
+    MP_LOG(*m_context.loop, Log::Debug) << "Cleaning up " << CxxTypeName(*this) << " " << this;
     CleanupRun(m_context.cleanup_fns);
+    MP_LOG(*m_context.loop, Log::Debug) << "Destroying " << CxxTypeName(*this) << " " << this;
 }
 
 template <typename Interface, typename Impl>
 ProxyServerBase<Interface, Impl>::ProxyServerBase(std::shared_ptr<Impl> impl, Connection& connection)
     : m_impl(std::move(impl)), m_context(&connection)
 {
+    MP_LOG(*m_context.loop, Log::Debug) << "Creating " << CxxTypeName(*this) << " " << this;
     assert(m_impl);
 }
 
@@ -592,6 +621,7 @@ ProxyServerBase<Interface, Impl>::ProxyServerBase(std::shared_ptr<Impl> impl, Co
 template <typename Interface, typename Impl>
 ProxyServerBase<Interface, Impl>::~ProxyServerBase()
 {
+    MP_LOG(*m_context.loop, Log::Debug) << "Cleaning up " << CxxTypeName(*this) << " " << this;
     if (m_impl) {
         // If impl is non-null at this point, it means no client is waiting for
         // the m_impl server object to be destroyed synchronously. This can
@@ -618,6 +648,7 @@ ProxyServerBase<Interface, Impl>::~ProxyServerBase()
         });
     }
     assert(m_context.cleanup_fns.empty());
+    MP_LOG(*m_context.loop, Log::Debug) << "Destroying " << CxxTypeName(*this) << " " << this;
 }
 
 //! If the capnp interface defined a special "destroy" method, as described the
@@ -820,8 +851,8 @@ std::unique_ptr<ProxyClient<InitInterface>> ConnectStream(EventLoop& loop, int f
 //! handles requests from the stream by calling the init object. Embed the
 //! ProxyServer in a Connection object that is stored and erased if
 //! disconnected. This should be called from the event loop thread.
-template <typename InitInterface, typename InitImpl>
-void _Serve(EventLoop& loop, kj::Own<kj::AsyncIoStream>&& stream, InitImpl& init)
+template <typename InitInterface, typename InitImpl, typename OnDisconnect>
+void _Serve(EventLoop& loop, kj::Own<kj::AsyncIoStream>&& stream, InitImpl& init, OnDisconnect&& on_disconnect)
 {
     loop.m_incoming_connections.emplace_front(loop, kj::mv(stream), [&](Connection& connection) {
         // Disable deleter so proxy server object doesn't attempt to delete the
@@ -831,23 +862,46 @@ void _Serve(EventLoop& loop, kj::Own<kj::AsyncIoStream>&& stream, InitImpl& init
     });
     auto it = loop.m_incoming_connections.begin();
     MP_LOG(loop, Log::Info) << "IPC server: socket connected.";
-    it->onDisconnect([&loop, it] {
+    if (loop.testing_hook_connected) loop.testing_hook_connected();
+    it->onDisconnect([&loop, it, on_disconnect = std::forward<OnDisconnect>(on_disconnect)]() mutable {
         MP_LOG(loop, Log::Info) << "IPC server: socket disconnected.";
         loop.m_incoming_connections.erase(it);
+        on_disconnect();
+        if (loop.testing_hook_disconnected) loop.testing_hook_disconnected();
     });
 }
 
-//! Given connection receiver and an init object, handle incoming connections by
-//! calling _Serve, to create ProxyServer objects and forward requests to the
-//! init object.
+struct Listener
+{
+    explicit Listener(kj::Own<kj::ConnectionReceiver>&& receiver, std::optional<size_t> max_connections)
+        : m_receiver(kj::mv(receiver)), m_max_connections(max_connections) {}
+
+    bool atCapacity() const
+    {
+        return m_max_connections && m_active_connections >= *m_max_connections;
+    }
+
+    kj::Own<kj::ConnectionReceiver> m_receiver;
+    std::optional<size_t> m_max_connections;
+    size_t m_active_connections{0};
+};
+
 template <typename InitInterface, typename InitImpl>
-void _Listen(EventLoop& loop, kj::Own<kj::ConnectionReceiver>&& listener, InitImpl& init)
+void _Listen(const std::shared_ptr<Listener>& listener, EventLoop& loop, InitImpl& init)
 {
-    auto* ptr = listener.get();
-    loop.m_task_set->add(ptr->accept().then(
-        [&loop, &init, listener = kj::mv(listener)](kj::Own<kj::AsyncIoStream>&& stream) mutable {
-            _Serve<InitInterface>(loop, kj::mv(stream), init);
-            _Listen<InitInterface>(loop, kj::mv(listener), init);
+    if (listener->atCapacity()) return;
+
+    auto* receiver = listener->m_receiver.get();
+    loop.m_task_set->add(receiver->accept().then(
+        [&loop, &init, listener](kj::Own<kj::AsyncIoStream>&& stream) {
+            ++listener->m_active_connections;
+            _Serve<InitInterface>(loop, kj::mv(stream), init, [&loop, &init, listener] {
+                const bool resume_accept{listener->atCapacity()};
+                assert(listener->m_active_connections > 0);
+                --listener->m_active_connections;
+                if (resume_accept) _Listen<InitInterface>(listener, loop, init);
+            });
+            _Listen<InitInterface>(listener, loop, init);
         }));
 }
 
@@ -857,18 +911,22 @@ template <typename InitInterface, typename InitImpl>
 void ServeStream(EventLoop& loop, int fd, InitImpl& init)
 {
     _Serve<InitInterface>(
-        loop, loop.m_io_context.lowLevelProvider->wrapSocketFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP), init);
+        loop,
+        loop.m_io_context.lowLevelProvider->wrapSocketFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP),
+        init,
+        [] {});
 }
 
 //! Given listening socket file descriptor and an init object, handle incoming
 //! connections and requests by calling methods on the Init object.
 template <typename InitInterface, typename InitImpl>
-void ListenConnections(EventLoop& loop, int fd, InitImpl& init)
+void ListenConnections(EventLoop& loop, int fd, InitImpl& init, std::optional<size_t> max_connections = std::nullopt)
 {
     loop.sync([&]() {
-        _Listen<InitInterface>(loop,
+        auto listener{std::make_shared<Listener>(
             loop.m_io_context.lowLevelProvider->wrapListenSocketFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP),
-            init);
+            max_connections)};
+        _Listen<InitInterface>(listener, loop, init);
     });
 }
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-types.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-types.h
index c13debf3..f1127da5 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-types.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy-types.h
@@ -280,6 +280,32 @@ struct ListOutput<::capnp::List<T, kind>>
     // clang-format on
 };
 
+template <typename LocalType, typename Value, typename Output>
+void BuildList(TypeList<LocalType>, InvokeContext& invoke_context, Output&& output, Value&& value)
+{
+    auto list = output.init(value.size());
+    size_t i = 0;
+    for (const auto& elem : value) {
+        BuildField(TypeList<LocalType>(), invoke_context, ListOutput<typename decltype(list)::Builds>(list, i), elem);
+        ++i;
+    }
+}
+
+template <typename LocalType, typename Input, typename ReadDest, typename InitFn, typename EmplaceFn>
+decltype(auto) ReadList(TypeList<LocalType>, InvokeContext& invoke_context, Input&& input, ReadDest&& read_dest, InitFn&& init, EmplaceFn&& emplace)
+{
+    return read_dest.update([&](auto& value) {
+        auto data = input.get();
+        init(value, data.size());
+        for (auto item : data) {
+            ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
+                      ReadDestEmplace(TypeList<LocalType>(), [&emplace, &value](auto&&... args) -> decltype(auto) {
+                          return emplace(value, std::forward<decltype(args)>(args)...);
+                      }));
+        }
+    });
+}
+
 template <typename LocalType, typename Value, typename Output>
 void CustomBuildField(TypeList<LocalType>, Priority<0>, InvokeContext& invoke_context, Value&& value, Output&& output)
 {
@@ -644,17 +670,13 @@ struct CapRequestTraits<::capnp::Request<_Params, _Results>>
 template <typename Client>
 void clientDestroy(Client& client)
 {
-    if (client.m_context.connection) {
-        MP_LOG(*client.m_context.loop, Log::Debug) << "IPC client destroy " << typeid(client).name();
-    } else {
-        KJ_LOG(INFO, "IPC interrupted client destroy", typeid(client).name());
-    }
+    MP_LOG(*client.m_context.loop, Log::Debug) << "IPC client destroy " << CxxTypeName(client);
 }
 
 template <typename Server>
 void serverDestroy(Server& server)
 {
-    MP_LOG(*server.m_context.loop, Log::Debug) << "IPC server destroy " << typeid(server).name();
+    MP_LOG(*server.m_context.loop, Log::Debug) << "IPC server destroy " << CxxTypeName(server);
 }
 
 //! Entry point called by generated client code that looks like:
@@ -780,10 +802,11 @@ kj::Promise<void> serverInvoke(Server& server, CallContext& call_context, Fn fn)
     using Params = decltype(params);
     using Results = typename decltype(call_context.getResults())::Builds;
 
+    EventLoop& loop = *server.m_context.loop;
     int req = ++server_reqs;
-    MP_LOG(*server.m_context.loop, Log::Debug) << "IPC server recv request  #" << req << " "
-                                     << TypeName<typename Params::Reads>();
-    MP_LOG(*server.m_context.loop, Log::Trace) << "request data: "
+    MP_LOG(loop, Log::Debug) << "IPC server recv request  #" << req << " "
+        << TypeName<typename Params::Reads>();
+    MP_LOG(loop, Log::Trace) << "request data: "
         << LogEscape(params.toString(), server.m_context.loop->m_log_opts.max_chars);
 
     try {
@@ -799,16 +822,23 @@ kj::Promise<void> serverInvoke(Server& server, CallContext& call_context, Fn fn)
         // and waiting for it to complete.
         return ReplaceVoid([&]() { return fn.invoke(server_context, ArgList()); },
             [&]() { return kj::Promise<CallContext>(kj::mv(call_context)); })
-            .then([&server, req](CallContext call_context) {
-                MP_LOG(*server.m_context.loop, Log::Debug) << "IPC server send response #" << req << " " << TypeName<Results>();
-                MP_LOG(*server.m_context.loop, Log::Trace) << "response data: "
-                    << LogEscape(call_context.getResults().toString(), server.m_context.loop->m_log_opts.max_chars);
+            .then([&loop, req](CallContext call_context) {
+                MP_LOG(loop, Log::Debug) << "IPC server send response #" << req << " " << TypeName<Results>();
+                MP_LOG(loop, Log::Trace) << "response data: "
+                    << LogEscape(call_context.getResults().toString(), loop.m_log_opts.max_chars);
+            }).catch_([&loop, req](::kj::Exception&& e) -> kj::Promise<void> {
+                // Call failed for some reason. Cap'n Proto will try to send
+                // this error to the client as well, but it is good to log the
+                // failure early here and include the request number.
+                MP_LOG(loop, Log::Error) << "IPC server error request #" << req << " " << TypeName<Results>()
+                    << " " << kj::str("kj::Exception: ", e.getDescription()).cStr();
+                return kj::mv(e);
             });
     } catch (const std::exception& e) {
-        MP_LOG(*server.m_context.loop, Log::Error) << "IPC server unhandled exception: " << e.what();
+        MP_LOG(loop, Log::Error) << "IPC server unhandled exception: " << e.what();
         throw;
     } catch (...) {
-        MP_LOG(*server.m_context.loop, Log::Error) << "IPC server unhandled exception";
+        MP_LOG(loop, Log::Error) << "IPC server unhandled exception";
         throw;
     }
 }
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.capnp b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.capnp
index 386f8f7a..e0a66fd9 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.capnp
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.capnp
@@ -45,6 +45,10 @@ interface ThreadMap $count(0) {
     # execute on. Clients create and name threads and pass the thread handle as
     # a call parameter.
     makeThread @0 (name :Text) -> (result :Thread);
+    # Pre-allocate a pool of server threads for implicit dispatch. When a
+    # request arrives with no context.thread set, the server dispatches it
+    # through this pool via a shared work queue.
+    makePool @1 (count :UInt32) -> ();
 }
 
 interface Thread {
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.h
index c55380c1..57362f4e 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/proxy.h
@@ -44,7 +44,7 @@ inline void CleanupRun(CleanupList& fns) {
     }
 }
 
-//! Event loop smart pointer automatically managing m_num_clients.
+//! Event loop smart pointer automatically managing m_num_refs.
 //! If a lock pointer argument is passed, the specified lock will be used,
 //! otherwise EventLoop::m_mutex will be locked when needed.
 class EventLoopRef
@@ -304,20 +304,31 @@ struct ProxyServerMethodTraits : public ProxyMethodTraits<MethodParams>
 {
 };
 
-static constexpr int FIELD_IN = 1;
-static constexpr int FIELD_OUT = 2;
-static constexpr int FIELD_OPTIONAL = 4;
-static constexpr int FIELD_REQUESTED = 8;
-static constexpr int FIELD_BOXED = 16;
+static constexpr int FIELD_IN = 1;        //!< See Accessor::in.
+static constexpr int FIELD_OUT = 2;       //!< See Accessor::out.
+static constexpr int FIELD_OPTIONAL = 4;  //!< See Accessor::optional.
+static constexpr int FIELD_REQUESTED = 8; //!< See Accessor::requested.
+static constexpr int FIELD_BOXED = 16;    //!< See Accessor::boxed.
 
 //! Accessor type holding flags that determine how to access a message field.
 template <typename Field, int flags>
 struct Accessor : public Field
 {
+    //! Field is present from the Cap'n Proto Params struct (client -> server).
     static const bool in = flags & FIELD_IN;
+    //! Field is present from the Cap'n Proto Results struct (server -> client).
     static const bool out = flags & FIELD_OUT;
+    //! Field has a companion has{Name} boolean field in the Cap'n Proto struct.
+    //! This is used to represent optional primitive values (e.g. C++
+    //! std::optional<int>) because Cap'n Proto doesn't allow primitive fields to
+    //! be unset.
     static const bool optional = flags & FIELD_OPTIONAL;
+    //! Results field has a companion want{Name} boolean field in the Params
+    //! struct. Used for optional output parameters (e.g. C++ int*) and set to
+    //! true if the caller passed a non-null pointer and wants the result.
     static const bool requested = flags & FIELD_REQUESTED;
+    //! Field is a Cap'n Proto pointer type (struct, list, text, data,
+    //! interface) as opposed to a primitive type (bool, int, float, enum).
     static const bool boxed = flags & FIELD_BOXED;
 };
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-context.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-context.h
index 46952f49..7e47ca8a 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-context.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-context.h
@@ -200,29 +200,95 @@ auto PassField(Priority<1>, TypeList<>, ServerContext& server_context, const Fn&
     // asynchronously with getLocalServer().
     const auto& params = server_context.call_context.getParams();
     Context::Reader context_arg = Accessor::get(params);
-    auto thread_client = context_arg.getThread();
-    auto result = server.m_context.connection->m_threads.getLocalServer(thread_client)
-        .then([&loop, invoke = kj::mv(invoke), req](const kj::Maybe<Thread::Server&>& perhaps) mutable {
-            // Assuming the thread object is found, pass it a pointer to the
-            // `invoke` lambda above which will invoke the function on that
-            // thread.
-            KJ_IF_MAYBE (thread_server, perhaps) {
-                auto& thread = static_cast<ProxyServer<Thread>&>(*thread_server);
-                MP_LOG(loop, Log::Debug)
-                    << "IPC server post request  #" << req << " {" << thread.m_thread_context.thread_name << "}";
-                return thread.template post<typename ServerContext::CallContext>(std::move(invoke));
-            } else {
-                MP_LOG(loop, Log::Error)
-                    << "IPC server error request #" << req << ", missing thread to execute request";
-                throw std::runtime_error("invalid thread handle");
-            }
-        });
-    // Use connection m_canceler object to cancel the result promise if the
-    // connection is destroyed. (By default Cap'n Proto does not cancel requests
-    // on disconnect, since it's possible clients might want to make requests
-    // and immediately disconnect without waiting for results, but not want the
-    // requests to be canceled.)
-    return server.m_context.connection->m_canceler.wrap(kj::mv(result));
+    if (!context_arg.hasThread()) {
+        // No client thread specified — dispatch through the server thread
+        // pool, picking the slot with the smallest in-flight depth.
+        auto* connection = server.m_context.connection;
+        auto& pool = connection->m_thread_pool;
+        if (pool.empty()) {
+            MP_LOG(loop, Log::Error)
+                << "IPC server error request #" << req << ", no thread specified and no pool configured";
+            throw std::runtime_error("no thread specified and no pool configured");
+        }
+        auto* slot = &pool[0];
+        for (size_t i = 1; i < pool.size(); ++i) {
+            if (pool[i].depth < slot->depth) slot = &pool[i];
+        }
+        ++slot->depth;
+        auto result = connection->m_threads.getLocalServer(slot->client)
+            .then([&loop, invoke = kj::mv(invoke), req](const kj::Maybe<Thread::Server&>& perhaps) mutable -> kj::Promise<typename ServerContext::CallContext> {
+                KJ_IF_MAYBE (thread_server, perhaps) {
+                    auto& thread = static_cast<ProxyServer<Thread>&>(*thread_server);
+                    MP_LOG(loop, Log::Debug)
+                        << "IPC server post request  #" << req << " {" << thread.m_thread_context.thread_name << "}";
+                    return thread.template post<typename ServerContext::CallContext>(std::move(invoke));
+                } else {
+                    MP_LOG(loop, Log::Error)
+                        << "IPC server error request #" << req << ", pool thread not found";
+                    throw std::runtime_error("pool thread not found");
+                }
+            })
+            .attach(kj::defer([slot] { --slot->depth; }));
+        return connection->m_canceler.wrap(kj::mv(result));
+    } else {
+        auto thread_client = context_arg.getThread();
+        auto result = server.m_context.connection->m_threads.getLocalServer(thread_client)
+            .then([&loop, invoke = kj::mv(invoke), req](const kj::Maybe<Thread::Server&>& perhaps) mutable {
+                // Assuming the thread object is found, pass it a pointer to the
+                // `invoke` lambda above which will invoke the function on that
+                // thread.
+                KJ_IF_MAYBE (thread_server, perhaps) {
+                    auto& thread = static_cast<ProxyServer<Thread>&>(*thread_server);
+                    MP_LOG(loop, Log::Debug)
+                        << "IPC server post request  #" << req << " {" << thread.m_thread_context.thread_name << "}";
+                    return thread.template post<typename ServerContext::CallContext>(std::move(invoke));
+                } else {
+                    MP_LOG(loop, Log::Error)
+                        << "IPC server error request #" << req << ", missing thread to execute request";
+                    throw std::runtime_error("invalid thread handle");
+                }
+            }, [&loop, req](::kj::Exception&& e) -> kj::Promise<typename ServerContext::CallContext> {
+                // If you see the error "(remote):0: failed: remote exception:
+                // Called null capability" here, it probably means your Init class
+                // is missing a declaration like:
+                //
+                //   construct @0 (threadMap: Proxy.ThreadMap) -> (threadMap :Proxy.ThreadMap);
+                //
+                // which passes a ThreadMap reference from the client to the server,
+                // allowing the server to create threads to run IPC calls on the
+                // client, and also returns a ThreadMap reference from the server to
+                // the client, allowing the client to create threads on the server.
+                // (Typically the latter ThreadMap is used more often because there
+                // are more client-to-server calls.)
+                //
+                // If the other side of the connection did not previously get a
+                // ThreadMap reference from this side of the connection, when the
+                // other side calls `m_thread_map.makeThreadRequest()` in
+                // `BuildField` above, `m_thread_map` will be null, but that call
+                // will not fail immediately due to Cap'n Proto's request pipelining
+                // and delayed execution. Instead that call will return an invalid
+                // Thread reference, and when that reference is passed to this side
+                // of the connection as `thread_client` above, the
+                // `getLocalServer(thread_client)` call there will be the first
+                // thing to overtly fail, leading to an error here.
+                //
+                // Potentially there are also other things that could cause errors
+                // here, but this is the most likely cause.
+                //
+                // The log statement here is not strictly necessary since the same
+                // exception will also be logged in serverInvoke, but this logging
+                // may provide extra context that could be helpful for debugging.
+                MP_LOG(loop, Log::Info)
+                    << "IPC server error request #" << req << " CapabilityServerSet<Thread>::getLocalServer call failed, did you forget to provide a ThreadMap to the client prior to this IPC call?";
+                return kj::mv(e);
+            });
+        // Use connection m_canceler object to cancel the result promise if the
+        // connection is destroyed. (By default Cap'n Proto does not cancel requests
+        // on disconnect, since it's possible clients might want to make requests
+        // and immediately disconnect without waiting for results, but not want the
+        // requests to be canceled.)
+        return server.m_context.connection->m_canceler.wrap(kj::mv(result));
+    }
 }
 } // namespace mp
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-data.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-data.h
index cdcdd30e..09c93df9 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-data.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-data.h
@@ -9,6 +9,7 @@
 
 #include <concepts>
 #include <span>
+#include <ranges>
 
 namespace mp {
 template <typename T, typename U>
@@ -33,7 +34,7 @@ requires (std::is_same_v<decltype(output.get()), ::capnp::Data::Builder> && IsBy
 {
     auto data = std::span{value};
     auto result = output.init(data.size());
-    memcpy(result.begin(), data.data(), data.size());
+    std::ranges::copy(data, result.begin());
 }
 
 template <typename LocalType, typename Input, typename ReadDest>
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-map.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-map.h
index 50a590cb..e00a7813 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-map.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-map.h
@@ -17,14 +17,7 @@ void CustomBuildField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
     Value&& value,
     Output&& output)
 {
-    // FIXME dededup with vector handler above
-    auto list = output.init(value.size());
-    size_t i = 0;
-    for (const auto& elem : value) {
-        BuildField(TypeList<std::pair<KeyLocalType, ValueLocalType>>(), invoke_context,
-            ListOutput<typename decltype(list)::Builds>(list, i), elem);
-        ++i;
-    }
+    BuildList(TypeList<std::pair<KeyLocalType, ValueLocalType>>(), invoke_context, output, value);
 }
 
 // Replacement for `m.emplace(piecewise_construct, t1, t2)` to work around a
@@ -63,18 +56,12 @@ decltype(auto) CustomReadField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
     Input&& input,
     ReadDest&& read_dest)
 {
-    return read_dest.update([&](auto& value) {
-        auto data = input.get();
-        value.clear();
-        for (auto item : data) {
-            ReadField(TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), invoke_context,
-                Make<ValueField>(item),
-                ReadDestEmplace(
-                    TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), [&](auto&&... args) -> auto& {
-                        return *EmplacePiecewiseSafe(value, std::forward<decltype(args)>(args)...).first;
-                    }));
-        }
-    });
+    return ReadList(
+        TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), invoke_context, input, read_dest,
+        [&](auto& value, size_t) { value.clear(); },
+        [&](auto& value, auto&&... args) -> auto& {
+            return *EmplacePiecewiseSafe(value, std::forward<decltype(args)>(args)...).first;
+        });
 }
 } // namespace mp
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-number.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-number.h
index 5c997f54..ddff5cdd 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-number.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-number.h
@@ -82,7 +82,7 @@ decltype(auto) CustomReadField(TypeList<LocalType>,
     InvokeContext& invoke_context,
     Input&& input,
     ReadDest&& read_dest,
-    typename std::enable_if<std::is_floating_point<LocalType>::value>::type* enable = 0)
+    typename std::enable_if<std::is_floating_point<LocalType>::value>::type* enable = nullptr)
 {
     auto value = input.get();
     static_assert(std::is_same<LocalType, decltype(value)>::value, "floating point type mismatch");
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-set.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-set.h
index 699c6e9e..902dd614 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-set.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-set.h
@@ -16,13 +16,7 @@ void CustomBuildField(TypeList<std::set<LocalType>>,
     Value&& value,
     Output&& output)
 {
-    // FIXME dededup with vector handler above
-    auto list = output.init(value.size());
-    size_t i = 0;
-    for (const auto& elem : value) {
-        BuildField(TypeList<LocalType>(), invoke_context, ListOutput<typename decltype(list)::Builds>(list, i), elem);
-        ++i;
-    }
+    BuildList(TypeList<LocalType>(), invoke_context, output, value);
 }
 
 template <typename LocalType, typename Input, typename ReadDest>
@@ -32,16 +26,12 @@ decltype(auto) CustomReadField(TypeList<std::set<LocalType>>,
     Input&& input,
     ReadDest&& read_dest)
 {
-    return read_dest.update([&](auto& value) {
-        auto data = input.get();
-        value.clear();
-        for (auto item : data) {
-            ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
-                ReadDestEmplace(TypeList<const LocalType>(), [&](auto&&... args) -> auto& {
-                    return *value.emplace(std::forward<decltype(args)>(args)...).first;
-                }));
-        }
-    });
+    return ReadList(
+        TypeList<LocalType>(), invoke_context, input, read_dest,
+        [&](auto& value, size_t) { value.clear(); },
+        [&](auto& value, auto&&... args) -> auto& {
+            return *value.emplace(std::forward<decltype(args)>(args)...).first;
+        });
 }
 } // namespace mp
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-threadmap.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-threadmap.h
index 3005d9de..c38c2ac4 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-threadmap.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-threadmap.h
@@ -14,6 +14,7 @@ struct ProxyServer<ThreadMap> final : public virtual ThreadMap::Server
 public:
     ProxyServer(Connection& connection);
     kj::Promise<void> makeThread(MakeThreadContext context) override;
+    kj::Promise<void> makePool(MakePoolContext context) override;
     Connection& m_connection;
 };
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-unordered-set.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-unordered-set.h
new file mode 100644
index 00000000..d1c714b2
--- /dev/null
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-unordered-set.h
@@ -0,0 +1,42 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef MP_PROXY_TYPE_UNORDERED_SET_H
+#define MP_PROXY_TYPE_UNORDERED_SET_H
+
+#include <mp/proxy-types.h>
+#include <mp/util.h>
+#include <unordered_set>
+
+namespace mp {
+template <typename LocalType, typename Value, typename Output>
+void CustomBuildField(TypeList<std::unordered_set<LocalType>>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Value&& value,
+    Output&& output)
+{
+    BuildList(TypeList<LocalType>(), invoke_context, output, value);
+}
+
+template <typename LocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<std::unordered_set<LocalType>>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    ReadDest&& read_dest)
+{
+    return ReadList(
+        TypeList<LocalType>(), invoke_context, input, read_dest,
+        [&](auto& value, size_t size) {
+            value.clear();
+            value.reserve(size);
+        },
+        [&](auto& value, auto&&... args) -> auto& {
+            return *value.emplace(std::forward<decltype(args)>(args)...).first;
+        });
+}
+} // namespace mp
+
+#endif // MP_PROXY_TYPE_UNORDERED_SET_H
\ No newline at end of file
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-vector.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-vector.h
index 90605ddf..7b5197ff 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-vector.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/type-vector.h
@@ -16,12 +16,7 @@ void CustomBuildField(TypeList<std::vector<LocalType>>,
     Value&& value,
     Output&& output)
 {
-    // FIXME dedup with set handler below
-    auto list = output.init(value.size());
-    size_t i = 0;
-    for (auto it = value.begin(); it != value.end(); ++it, ++i) {
-        BuildField(TypeList<LocalType>(), invoke_context, ListOutput<typename decltype(list)::Builds>(list, i), *it);
-    }
+    BuildList(TypeList<LocalType>(), invoke_context, output, value);
 }
 
 inline static bool BuildPrimitive(InvokeContext& invoke_context, std::vector<bool>::const_reference value, TypeList<bool>)
@@ -36,35 +31,16 @@ decltype(auto) CustomReadField(TypeList<std::vector<LocalType>>,
     Input&& input,
     ReadDest&& read_dest)
 {
-    return read_dest.update([&](auto& value) {
-        auto data = input.get();
-        value.clear();
-        value.reserve(data.size());
-        for (auto item : data) {
-            ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
-                ReadDestEmplace(TypeList<LocalType>(), [&](auto&&... args) -> auto& {
-                    value.emplace_back(std::forward<decltype(args)>(args)...);
-                    return value.back();
-                }));
-        }
-    });
-}
-
-template <typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<std::vector<bool>>,
-                               Priority<1>,
-                               InvokeContext& invoke_context,
-                               Input&& input,
-                               ReadDest&& read_dest)
-{
-    return read_dest.update([&](auto& value) {
-        auto data = input.get();
-        value.clear();
-        value.reserve(data.size());
-        for (auto item : data) {
-            value.push_back(ReadField(TypeList<bool>(), invoke_context, Make<ValueField>(item), ReadDestTemp<bool>()));
-        }
-    });
+    return ReadList(
+        TypeList<LocalType>(), invoke_context, input, read_dest,
+        [&](auto& value, size_t size) {
+            value.clear();
+            value.reserve(size);
+        },
+        [&](auto& value, auto&&... args) -> decltype(auto) {
+            value.emplace_back(std::forward<decltype(args)>(args)...);
+            return value.back();
+        });
 }
 } // namespace mp
 
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/util.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/util.h
index a3db1282..380a142f 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/util.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/util.h
@@ -7,7 +7,7 @@
 
 #include <capnp/schema.h>
 #include <cassert>
-#include <cstddef>
+#include <cstdlib>
 #include <cstring>
 #include <exception>
 #include <functional>
@@ -15,11 +15,17 @@
 #include <mutex>
 #include <string>
 #include <tuple>
+#include <typeinfo>
 #include <type_traits>
 #include <utility>
 #include <variant>
 #include <vector>
 
+#if __has_include(<cxxabi.h>)
+#include <cxxabi.h>
+#include <memory>
+#endif
+
 namespace mp {
 
 //! Generic utility functions used by capnp code.
@@ -274,6 +280,28 @@ inline char* CharCast(unsigned char* c) { return (char*)c; }
 inline const char* CharCast(const char* c) { return c; }
 inline const char* CharCast(const unsigned char* c) { return (const char*)c; }
 
+#if __has_include(<cxxabi.h>)   // GCC & Clang ─ use <cxxabi.h> to demangle
+inline std::string _demangle(const char* m)
+{
+    int status = 0;
+    std::unique_ptr<char, void(*)(void*)> p{
+        abi::__cxa_demangle(m, /*output_buffer=*/nullptr, /*length=*/nullptr, &status), std::free};
+    return (status == 0 && p) ? p.get() : m;   // fall back on mangled if needed
+}
+#else                           // MSVC or other ─ no demangling available
+inline std::string _demangle(const char* m) { return m; }
+#endif
+
+template<class T>
+std::string CxxTypeName(const T& /*unused*/)
+{
+#ifdef __cpp_rtti
+    return _demangle(typeid(std::decay_t<T>).name());
+#else
+    return "<type information unavailable without rtti>";
+#endif
+}
+
 //! Exception thrown from code executing an IPC call that is interrupted.
 struct InterruptException final : std::exception {
     explicit InterruptException(std::string message) : m_message(std::move(message)) {}
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/version.h b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/version.h
index 964667a9..bbf54524 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/include/mp/version.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/include/mp/version.h
@@ -24,7 +24,7 @@
 //! pointing at the prior merge commit. The /doc/versions.md file should also be
 //! updated, noting any significant or incompatible changes made since the
 //! previous version.
-#define MP_MAJOR_VERSION 10
+#define MP_MAJOR_VERSION 13
 
 //! Minor version number. Should be incremented in stable branches after
 //! backporting changes. The /doc/versions.md file should also be updated to
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/shell.nix b/depend/bitcoin/src/ipc/libmultiprocess/shell.nix
index 9ebbc0a0..1a4614e3 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/shell.nix
+++ b/depend/bitcoin/src/ipc/libmultiprocess/shell.nix
@@ -39,6 +39,7 @@ let
       hash  = lib.attrByPath [capnprotoVersion] "" capnprotoHashes;
     };
     patches = lib.optionals (lib.versionAtLeast capnprotoVersion "0.9.0" && lib.versionOlder capnprotoVersion "0.10.4") [ ./ci/patches/spaceship.patch ];
+    cmakeFlags = (old.cmakeFlags or []) ++ (lib.optionals (lib.versionAtLeast "1.1.0" capnprotoVersion) ["-DCMAKE_POLICY_VERSION_MINIMUM=3.5"]);
   } // (lib.optionalAttrs (lib.versionOlder capnprotoVersion "0.10") {
     env = { }; # Drop -std=c++20 flag forced by nixpkgs
   }));
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/src/mp/gen.cpp b/depend/bitcoin/src/ipc/libmultiprocess/src/mp/gen.cpp
index 603f9ccb..c8db469d 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/src/mp/gen.cpp
+++ b/depend/bitcoin/src/ipc/libmultiprocess/src/mp/gen.cpp
@@ -6,6 +6,7 @@
 #include <mp/util.h>
 
 #include <algorithm>
+#include <capnp/schema.capnp.h> // IWYU pragma: keep
 #include <capnp/schema.h>
 #include <capnp/schema-parser.h>
 #include <cerrno>
@@ -125,6 +126,109 @@ static bool BoxedType(const ::capnp::Type& type)
              type.isFloat64() || type.isEnum());
 }
 
+struct Field
+{
+    ::capnp::StructSchema::Field param;
+    bool param_is_set = false;
+    ::capnp::StructSchema::Field result;
+    bool result_is_set = false;
+    int args = 0;
+    bool retval = false;
+    bool optional = false;
+    bool requested = false;
+    bool skip = false;
+    kj::StringPtr exception;
+};
+
+struct FieldList
+{
+    std::vector<Field> fields;
+    std::map<kj::StringPtr, int> field_idx; // name -> args index
+    bool has_result = false;
+
+    void addField(const ::capnp::StructSchema::Field& schema_field, bool param, bool result)
+    {
+        auto field_name = schema_field.getProto().getName();
+        auto inserted = field_idx.emplace(field_name, fields.size());
+        if (inserted.second) {
+            fields.emplace_back();
+        }
+        auto& field = fields[inserted.first->second];
+        if (param) {
+            field.param = schema_field;
+            field.param_is_set = true;
+        }
+        if (result) {
+            field.result = schema_field;
+            field.result_is_set = true;
+        }
+
+        if (!param && field_name == kj::StringPtr{"result"}) {
+            field.retval = true;
+            has_result = true;
+        }
+
+        if (AnnotationExists(schema_field.getProto(), SKIP_ANNOTATION_ID)) {
+            field.skip = true;
+        }
+        GetAnnotationText(schema_field.getProto(), EXCEPTION_ANNOTATION_ID, &field.exception);
+
+        int32_t count = 1;
+        if (!GetAnnotationInt32(schema_field.getProto(), COUNT_ANNOTATION_ID, &count)) {
+            if (schema_field.getType().isStruct()) {
+                GetAnnotationInt32(schema_field.getType().asStruct().getProto(),
+                        COUNT_ANNOTATION_ID, &count);
+            } else if (schema_field.getType().isInterface()) {
+                GetAnnotationInt32(schema_field.getType().asInterface().getProto(),
+                        COUNT_ANNOTATION_ID, &count);
+            }
+        }
+
+
+        if (inserted.second && !field.retval && !field.exception.size()) {
+            field.args = count;
+        }
+    }
+
+    void mergeFields()
+    {
+        for (auto& field : field_idx) {
+            auto has_field = field_idx.find("has" + Cap(field.first));
+            if (has_field != field_idx.end()) {
+                fields[has_field->second].skip = true;
+                fields[field.second].optional = true;
+            }
+            auto want_field = field_idx.find("want" + Cap(field.first));
+            if (want_field != field_idx.end() && fields[want_field->second].param_is_set) {
+                fields[want_field->second].skip = true;
+                fields[field.second].requested = true;
+            }
+        }
+    }
+};
+
+std::string AccessorType(kj::StringPtr base_name, const Field& field)
+{
+    const auto& f = field.param_is_set ? field.param : field.result;
+    const auto field_name = f.getProto().getName();
+    const auto field_type = f.getType();
+
+    std::ostringstream out;
+    out << "Accessor<" << base_name  << "_fields::" << Cap(field_name) << ", ";
+    if (!field.param_is_set) {
+        out << "FIELD_OUT";
+    } else if (field.result_is_set) {
+        out << "FIELD_IN | FIELD_OUT";
+    } else {
+        out << "FIELD_IN";
+    }
+    if (field.optional) out << " | FIELD_OPTIONAL";
+    if (field.requested) out << " | FIELD_REQUESTED";
+    if (BoxedType(field_type)) out << " | FIELD_BOXED";
+    out << ">";
+    return out.str();
+}
+
 // src_file is path to .capnp file to generate stub code from.
 //
 // src_prefix can be used to generate outputs in a different directory than the
@@ -226,12 +330,17 @@ static void Generate(kj::StringPtr src_prefix,
     cpp_client << "#include <" << include_path << ".h>\n";
     cpp_client << "#include <" << include_path << ".proxy.h>\n";
     cpp_client << "#include <" << include_path << ".proxy-types.h>\n";
+    cpp_client << "#include <capnp/capability.h>\n";
+    cpp_client << "#include <capnp/common.h>\n";
     cpp_client << "#include <capnp/generated-header-support.h>\n";
     cpp_client << "#include <cstring>\n";
-    cpp_client << "#include <vector>\n";
+    cpp_client << "#include <functional>\n";
     cpp_client << "#include <kj/common.h>\n";
+    cpp_client << "#include <map>\n";
     cpp_client << "#include <mp/proxy.h>\n";
     cpp_client << "#include <mp/util.h>\n";
+    cpp_client << "#include <string>\n";
+    cpp_client << "#include <vector>\n";
     cpp_client << "#include <" << PROXY_TYPES << ">\n";
     cpp_client << "// IWYU pragma: end_keep\n\n";
     cpp_client << "namespace mp {\n";
@@ -240,6 +349,7 @@ static void Generate(kj::StringPtr src_prefix,
     cpp_types << "// Generated by " PROXY_BIN " from " << src_file << "\n\n";
     cpp_types << "// IWYU pragma: no_include \"mp/proxy.h\"\n";
     cpp_types << "// IWYU pragma: no_include \"mp/proxy-io.h\"\n";
+    cpp_types << "#include <" << include_path << ".h> // IWYU pragma: keep\n";
     cpp_types << "#include <" << include_path << ".proxy.h>\n";
     cpp_types << "#include <" << include_path << ".proxy-types.h> // IWYU pragma: keep\n";
     cpp_types << "#include <" << PROXY_TYPES << ">\n\n";
@@ -332,6 +442,13 @@ static void Generate(kj::StringPtr src_prefix,
 
         if (node.getProto().isStruct()) {
             const auto& struc = node.asStruct();
+
+            FieldList fields;
+            for (const auto schema_field : struc.getFields()) {
+                fields.addField(schema_field, true, true);
+            }
+            fields.mergeFields();
+
             std::ostringstream generic_name;
             generic_name << node_name;
             dec << "template<";
@@ -352,22 +469,18 @@ static void Generate(kj::StringPtr src_prefix,
             dec << "struct ProxyStruct<" << message_namespace << "::" << generic_name.str() << ">\n";
             dec << "{\n";
             dec << "    using Struct = " << message_namespace << "::" << generic_name.str() << ";\n";
-            for (const auto field : struc.getFields()) {
-                auto field_name = field.getProto().getName();
+            for (const auto& field : fields.fields) {
+                auto field_name = field.param.getProto().getName();
                 add_accessor(field_name);
-                dec << "    using " << Cap(field_name) << "Accessor = Accessor<" << base_name
-                    << "_fields::" << Cap(field_name) << ", FIELD_IN | FIELD_OUT";
-                if (BoxedType(field.getType())) dec << " | FIELD_BOXED";
-                dec << ">;\n";
+                dec << "    using " << Cap(field_name) << "Accessor = "
+                    << AccessorType(base_name, field) << ";\n";
             }
             dec << "    using Accessors = std::tuple<";
             size_t i = 0;
-            for (const auto field : struc.getFields()) {
-                if (AnnotationExists(field.getProto(), SKIP_ANNOTATION_ID)) {
-                    continue;
-                }
+            for (const auto& field : fields.fields) {
+                if (field.skip) continue;
                 if (i) dec << ", ";
-                dec << Cap(field.getProto().getName()) << "Accessor";
+                dec << Cap(field.param.getProto().getName()) << "Accessor";
                 ++i;
             }
             dec << ">;\n";
@@ -381,13 +494,11 @@ static void Generate(kj::StringPtr src_prefix,
                 inl << "public:\n";
                 inl << "    using Struct = " << message_namespace << "::" << node_name << ";\n";
                 size_t i = 0;
-                for (const auto field : struc.getFields()) {
-                    if (AnnotationExists(field.getProto(), SKIP_ANNOTATION_ID)) {
-                        continue;
-                    }
-                    auto field_name = field.getProto().getName();
+                for (const auto& field : fields.fields) {
+                    if (field.skip) continue;
+                    auto field_name = field.param.getProto().getName();
                     auto member_name = field_name;
-                    GetAnnotationText(field.getProto(), NAME_ANNOTATION_ID, &member_name);
+                    GetAnnotationText(field.param.getProto(), NAME_ANNOTATION_ID, &member_name);
                     inl << "    static decltype(auto) get(std::integral_constant<size_t, " << i << ">) { return "
                         << "&" << proxied_class_type << "::" << member_name << "; }\n";
                     ++i;
@@ -430,85 +541,14 @@ static void Generate(kj::StringPtr src_prefix,
                 const bool is_construct = method_name == kj::StringPtr{"construct"};
                 const bool is_destroy = method_name == kj::StringPtr{"destroy"};
 
-                struct Field
-                {
-                    ::capnp::StructSchema::Field param;
-                    bool param_is_set = false;
-                    ::capnp::StructSchema::Field result;
-                    bool result_is_set = false;
-                    int args = 0;
-                    bool retval = false;
-                    bool optional = false;
-                    bool requested = false;
-                    bool skip = false;
-                    kj::StringPtr exception;
-                };
-
-                std::vector<Field> fields;
-                std::map<kj::StringPtr, int> field_idx; // name -> args index
-                bool has_result = false;
-
-                auto add_field = [&](const ::capnp::StructSchema::Field& schema_field, bool param) {
-                    if (AnnotationExists(schema_field.getProto(), SKIP_ANNOTATION_ID)) {
-                        return;
-                    }
-
-                    auto field_name = schema_field.getProto().getName();
-                    auto inserted = field_idx.emplace(field_name, fields.size());
-                    if (inserted.second) {
-                        fields.emplace_back();
-                    }
-                    auto& field = fields[inserted.first->second];
-                    if (param) {
-                        field.param = schema_field;
-                        field.param_is_set = true;
-                    } else {
-                        field.result = schema_field;
-                        field.result_is_set = true;
-                    }
-
-                    if (!param && field_name == kj::StringPtr{"result"}) {
-                        field.retval = true;
-                        has_result = true;
-                    }
-
-                    GetAnnotationText(schema_field.getProto(), EXCEPTION_ANNOTATION_ID, &field.exception);
-
-                    int32_t count = 1;
-                    if (!GetAnnotationInt32(schema_field.getProto(), COUNT_ANNOTATION_ID, &count)) {
-                        if (schema_field.getType().isStruct()) {
-                            GetAnnotationInt32(schema_field.getType().asStruct().getProto(),
-                                    COUNT_ANNOTATION_ID, &count);
-                        } else if (schema_field.getType().isInterface()) {
-                            GetAnnotationInt32(schema_field.getType().asInterface().getProto(),
-                                    COUNT_ANNOTATION_ID, &count);
-                        }
-                    }
-
-
-                    if (inserted.second && !field.retval && !field.exception.size()) {
-                        field.args = count;
-                    }
-                };
-
+                FieldList fields;
                 for (const auto schema_field : method.getParamType().getFields()) {
-                    add_field(schema_field, true);
+                    fields.addField(schema_field, true, false);
                 }
                 for (const auto schema_field : method.getResultType().getFields()) {
-                    add_field(schema_field, false);
-                }
-                for (auto& field : field_idx) {
-                    auto has_field = field_idx.find("has" + Cap(field.first));
-                    if (has_field != field_idx.end()) {
-                        fields[has_field->second].skip = true;
-                        fields[field.second].optional = true;
-                    }
-                    auto want_field = field_idx.find("want" + Cap(field.first));
-                    if (want_field != field_idx.end() && fields[want_field->second].param_is_set) {
-                        fields[want_field->second].skip = true;
-                        fields[field.second].requested = true;
-                    }
+                    fields.addField(schema_field, false, true);
                 }
+                fields.mergeFields();
 
                 if (!is_construct && !is_destroy && (&method_interface == &interface)) {
                     methods << "template<>\n";
@@ -524,25 +564,11 @@ static void Generate(kj::StringPtr src_prefix,
                 std::ostringstream server_invoke_start;
                 std::ostringstream server_invoke_end;
                 int argc = 0;
-                for (const auto& field : fields) {
+                for (const auto& field : fields.fields) {
                     if (field.skip) continue;
 
                     const auto& f = field.param_is_set ? field.param : field.result;
                     auto field_name = f.getProto().getName();
-                    auto field_type = f.getType();
-
-                    std::ostringstream field_flags;
-                    if (!field.param_is_set) {
-                        field_flags << "FIELD_OUT";
-                    } else if (field.result_is_set) {
-                        field_flags << "FIELD_IN | FIELD_OUT";
-                    } else {
-                        field_flags << "FIELD_IN";
-                    }
-                    if (field.optional) field_flags << " | FIELD_OPTIONAL";
-                    if (field.requested) field_flags << " | FIELD_REQUESTED";
-                    if (BoxedType(field_type)) field_flags << " | FIELD_BOXED";
-
                     add_accessor(field_name);
 
                     std::ostringstream fwd_args;
@@ -569,8 +595,7 @@ static void Generate(kj::StringPtr src_prefix,
                         client_invoke << "MakeClientParam<";
                     }
 
-                    client_invoke << "Accessor<" << base_name << "_fields::" << Cap(field_name) << ", "
-                                  << field_flags.str() << ">>(";
+                    client_invoke << AccessorType(base_name, field) << ">(";
 
                     if (field.retval) {
                         client_invoke << field_name;
@@ -586,8 +611,7 @@ static void Generate(kj::StringPtr src_prefix,
                     } else {
                         server_invoke_start << "MakeServerField<" << field.args;
                     }
-                    server_invoke_start << ", Accessor<" << base_name << "_fields::" << Cap(field_name) << ", "
-                                        << field_flags.str() << ">>(";
+                    server_invoke_start << ", " << AccessorType(base_name, field) << ">(";
                     server_invoke_end << ")";
                 }
 
@@ -603,12 +627,12 @@ static void Generate(kj::StringPtr src_prefix,
                 def_client << "ProxyClient<" << message_namespace << "::" << node_name << ">::M" << method_ordinal
                            << "::Result ProxyClient<" << message_namespace << "::" << node_name << ">::" << method_name
                            << "(" << super_str << client_args.str() << ") {\n";
-                if (has_result) {
+                if (fields.has_result) {
                     def_client << "    typename M" << method_ordinal << "::Result result;\n";
                 }
                 def_client << "    clientInvoke(" << self_str << ", &" << message_namespace << "::" << node_name
                            << "::Client::" << method_name << "Request" << client_invoke.str() << ");\n";
-                if (has_result) def_client << "    return result;\n";
+                if (fields.has_result) def_client << "    return result;\n";
                 def_client << "}\n";
 
                 server << "    kj::Promise<void> " << method_name << "(" << Cap(method_name)
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/src/mp/proxy.cpp b/depend/bitcoin/src/ipc/libmultiprocess/src/mp/proxy.cpp
index d24208db..c1d2f3b0 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/src/mp/proxy.cpp
+++ b/depend/bitcoin/src/ipc/libmultiprocess/src/mp/proxy.cpp
@@ -22,9 +22,11 @@
 #include <kj/async-prelude.h>
 #include <kj/common.h>
 #include <kj/debug.h>
+#include <kj/exception.h>
 #include <kj/function.h>
 #include <kj/memory.h>
 #include <kj/string.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
@@ -35,6 +37,7 @@
 #include <tuple>
 #include <unistd.h>
 #include <utility>
+#include <vector>
 
 namespace mp {
 
@@ -50,7 +53,7 @@ EventLoopRef::EventLoopRef(EventLoop& loop, Lock* lock) : m_loop(&loop), m_lock(
 {
     auto loop_lock{PtrOrValue{m_lock, m_loop->m_mutex}};
     loop_lock->assert_locked(m_loop->m_mutex);
-    m_loop->m_num_clients += 1;
+    m_loop->m_num_refs += 1;
 }
 
 // Due to the conditionals in this function, MP_NO_TSA is required to avoid
@@ -62,8 +65,8 @@ void EventLoopRef::reset(bool relock) MP_NO_TSA
         m_loop = nullptr;
         auto loop_lock{PtrOrValue{m_lock, loop->m_mutex}};
         loop_lock->assert_locked(loop->m_mutex);
-        assert(loop->m_num_clients > 0);
-        loop->m_num_clients -= 1;
+        assert(loop->m_num_refs > 0);
+        loop->m_num_refs -= 1;
         if (loop->done()) {
             loop->m_cv.notify_all();
             int post_fd{loop->m_post_fd};
@@ -217,7 +220,7 @@ EventLoop::~EventLoop()
     KJ_ASSERT(!m_async_fns);
     KJ_ASSERT(m_wait_fd == -1);
     KJ_ASSERT(m_post_fd == -1);
-    KJ_ASSERT(m_num_clients == 0);
+    KJ_ASSERT(m_num_refs == 0);
 
     // Spin event loop. wait for any promises triggered by RPC shutdown.
     // auto cleanup = kj::evalLater([]{});
@@ -245,7 +248,12 @@ void EventLoop::loop()
         if (read_bytes != 1) throw std::logic_error("EventLoop wait_stream closed unexpectedly");
         Lock lock(m_mutex);
         if (m_post_fn) {
-            Unlock(lock, *m_post_fn);
+            // m_post_fn throwing is never expected. If it does happen, the caller
+            // of EventLoop::post() will return without any indication of failure,
+            // which will likely cause other bugs. Log the error and continue.
+            KJ_IF_MAYBE(exception, kj::runCatchingExceptions([&]() MP_REQUIRES(m_mutex) { Unlock(lock, *m_post_fn); })) {
+                MP_LOG(*this, Log::Error) << "EventLoop: m_post_fn threw: " << kj::str(*exception).cStr();
+            }
             m_post_fn = nullptr;
             m_cv.notify_all();
         } else if (done()) {
@@ -314,8 +322,8 @@ void EventLoop::startAsyncThread()
 
 bool EventLoop::done() const
 {
-    assert(m_num_clients >= 0);
-    return m_num_clients == 0 && m_async_fns->empty();
+    assert(m_num_refs >= 0);
+    return m_num_refs == 0 && m_async_fns->empty();
 }
 
 std::tuple<ConnThread, bool> SetThread(GuardedRef<ConnThreads> threads, Connection* connection, const std::function<Thread::Client()>& make_thread)
@@ -409,6 +417,29 @@ kj::Promise<void> ProxyServer<Thread>::getName(GetNameContext context)
 
 ProxyServer<ThreadMap>::ProxyServer(Connection& connection) : m_connection(connection) {}
 
+kj::Promise<void> ProxyServer<ThreadMap>::makePool(MakePoolContext context)
+{
+    if (!m_connection.m_thread_pool.empty()) {
+        throw std::runtime_error("makePool called on connection with existing pool");
+    }
+    EventLoop& loop{*m_connection.m_loop};
+    const uint32_t count = context.getParams().getCount();
+    for (uint32_t i = 0; i < count; ++i) {
+        const std::string thread_name = "pool/" + std::to_string(i);
+        std::promise<ThreadContext*> thread_context;
+        std::thread thread([&loop, &thread_context, thread_name]() {
+            g_thread_context.thread_name = ThreadName(loop.m_exe_name) + " (" + thread_name + ")";
+            g_thread_context.waiter = std::make_unique<Waiter>();
+            Lock lock(g_thread_context.waiter->m_mutex);
+            thread_context.set_value(&g_thread_context);
+            g_thread_context.waiter->wait(lock, [] { return !g_thread_context.waiter; });
+        });
+        auto thread_server = kj::heap<ProxyServer<Thread>>(m_connection, *thread_context.get_future().get(), std::move(thread));
+        m_connection.m_thread_pool.push_back({m_connection.m_threads.add(kj::mv(thread_server))});
+    }
+    return kj::READY_NOW;
+}
+
 kj::Promise<void> ProxyServer<ThreadMap>::makeThread(MakeThreadContext context)
 {
     EventLoop& loop{*m_connection.m_loop};
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/test/CMakeLists.txt b/depend/bitcoin/src/ipc/libmultiprocess/test/CMakeLists.txt
index 1f21ba44..13246293 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/test/CMakeLists.txt
+++ b/depend/bitcoin/src/ipc/libmultiprocess/test/CMakeLists.txt
@@ -26,6 +26,7 @@ if(BUILD_TESTING AND TARGET CapnProto::kj-test)
     ${MP_PROXY_HDRS}
     mp/test/foo-types.h
     mp/test/foo.h
+    mp/test/listen_tests.cpp
     mp/test/spawn_tests.cpp
     mp/test/test.cpp
   )
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo-types.h b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo-types.h
index 735adb76..b96eabfc 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo-types.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo-types.h
@@ -20,11 +20,13 @@
 #include <mp/type-map.h>
 #include <mp/type-message.h>
 #include <mp/type-number.h>
+#include <mp/type-optional.h>
 #include <mp/type-pointer.h>
 #include <mp/type-set.h>
 #include <mp/type-string.h>
 #include <mp/type-struct.h>
 #include <mp/type-threadmap.h>
+#include <mp/type-unordered-set.h>
 #include <mp/type-vector.h>
 #include <string>
 #include <type_traits>
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.capnp b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.capnp
index 5bdee257..9e6213fd 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.capnp
+++ b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.capnp
@@ -27,9 +27,11 @@ interface FooInterface $Proxy.wrap("mp::test::FooImplementation") {
     callbackExtended @10 (context :Proxy.Context, callback :ExtendedCallback, arg: Int32) -> (result :Int32);
     passCustom @11 (arg :FooCustom) -> (result :FooCustom);
     passEmpty @12 (arg :FooEmpty) -> (result :FooEmpty);
+    passData @24 (arg :Data) -> (result :Data);
     passMessage @13 (arg :FooMessage) -> (result :FooMessage);
     passMutable @14 (arg :FooMutable) -> (arg :FooMutable);
     passEnum @15 (arg :Int32) -> (result :Int32);
+    passDouble @23 (arg :Float64) -> (result :Float64);
     passFn @16 (context :Proxy.Context, fn :FooFn) -> (result :Int32);
     callFn @17 () -> ();
     callFnAsync @18 (context :Proxy.Context) -> ();
@@ -53,8 +55,12 @@ interface FooFn $Proxy.wrap("ProxyCallback<std::function<int()>>") {
 
 struct FooStruct $Proxy.wrap("mp::test::FooStruct") {
     name @0 :Text;
-    setint @1 :List(Int32);
-    vbool @2 :List(Bool);
+    setInt @1 :List(Int32) $Proxy.name("set_int");
+    vectorBool @2 :List(Bool) $Proxy.name("vector_bool");
+    optionalInt @3 :Int32 $Proxy.name("optional_int");
+    hasOptionalInt @4 :Bool;
+    unorderedSetInt @5 :List(Int32) $Proxy.name("unordered_set_int");
+    mapStringInt @6 :List(StringIntPair) $Proxy.name("map_string_int");
 }
 
 struct FooCustom $Proxy.wrap("mp::test::FooCustom") {
@@ -77,3 +83,8 @@ struct Pair(T1, T2) {
     first @0 :T1;
     second @1 :T2;
 }
+
+struct StringIntPair {
+    first @0 :Text;
+    second @1 :Int32;
+}
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.h b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.h
index 317af025..779c8db1 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.h
+++ b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/foo.h
@@ -9,8 +9,10 @@
 #include <functional>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <set>
+#include <unordered_set>
 #include <vector>
 
 namespace mp {
@@ -19,8 +21,11 @@ namespace test {
 struct FooStruct
 {
     std::string name;
-    std::set<int> setint;
-    std::vector<bool> vbool;
+    std::set<int> set_int;
+    std::vector<bool> vector_bool;
+    std::optional<int> optional_int;
+    std::unordered_set<int> unordered_set_int;
+    std::map<std::string, int> map_string_int;
 };
 
 enum class FooEnum : uint8_t { ONE = 1, TWO = 2, };
@@ -79,9 +84,11 @@ class FooImplementation
     int callbackExtended(ExtendedCallback& callback, int arg) { return callback.callExtended(arg); }
     FooCustom passCustom(FooCustom foo) { return foo; }
     FooEmpty passEmpty(FooEmpty foo) { return foo; }
+    FooData passData(FooData foo) { return foo; }
     FooMessage passMessage(FooMessage foo) { foo.message += " call"; return foo; }
     void passMutable(FooMutable& foo) { foo.message += " call"; }
     FooEnum passEnum(FooEnum foo) { return foo; }
+    double passDouble(double value) { return value; }
     int passFn(std::function<int()> fn) { return fn(); }
     std::vector<FooDataRef> passDataPointers(std::vector<FooDataRef> values) { return values; }
     std::shared_ptr<FooCallback> m_callback;
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/listen_tests.cpp b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/listen_tests.cpp
new file mode 100644
index 00000000..4e579d99
--- /dev/null
+++ b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/listen_tests.cpp
@@ -0,0 +1,294 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <cassert>
+#include <filesystem>
+#include <mp/test/foo.capnp.h>
+#include <mp/test/foo.capnp.proxy.h>
+
+#include <chrono>
+#include <condition_variable>
+#include <cstdlib>
+#include <cstring>
+#include <future>
+#include <functional>
+#include <kj/async.h>
+#include <kj/common.h>
+#include <kj/debug.h>
+#include <kj/memory.h>
+#include <kj/test.h>
+#include <memory>
+#include <mp/proxy.h>
+#include <mp/proxy-io.h>
+#include <mp/util.h>
+#include <ratio> // IWYU pragma: keep
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <thread>
+#include <unistd.h>
+
+namespace mp {
+namespace test {
+namespace {
+
+constexpr auto FAILURE_TIMEOUT = std::chrono::seconds{30};
+
+//! Owns a temporary Unix-domain listening socket used by ListenSetup. Tests call
+//! Connect() to create client socket FDs and release() to transfer the listening
+//! FD to ListenConnections().
+class UnixListener
+{
+public:
+    UnixListener()
+    {
+        std::string dir_template = (std::filesystem::temp_directory_path() / "mptest-listener-XXXXXX").string();
+        char* dir = mkdtemp(dir_template.data());
+        KJ_REQUIRE(dir != nullptr);
+        m_dir = dir;
+        m_path = m_dir + "/socket";
+
+        m_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        KJ_REQUIRE(m_fd >= 0);
+
+        sockaddr_un addr{};
+        addr.sun_family = AF_UNIX;
+        KJ_REQUIRE(m_path.size() < sizeof(addr.sun_path));
+        std::strncpy(addr.sun_path, m_path.c_str(), sizeof(addr.sun_path) - 1);
+        KJ_REQUIRE(bind(m_fd, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) == 0);
+        KJ_REQUIRE(listen(m_fd, SOMAXCONN) == 0);
+    }
+
+    ~UnixListener()
+    {
+        if (m_fd >= 0) close(m_fd);
+        if (!m_path.empty()) unlink(m_path.c_str());
+        if (!m_dir.empty()) rmdir(m_dir.c_str());
+    }
+
+    int release()
+    {
+        assert(m_fd >= 0);
+        int fd = m_fd;
+        m_fd = -1;
+        return fd;
+    }
+
+    int MakeConnectedSocket() const
+    {
+        int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        KJ_REQUIRE(fd >= 0);
+
+        sockaddr_un addr{};
+        addr.sun_family = AF_UNIX;
+        KJ_REQUIRE(m_path.size() < sizeof(addr.sun_path));
+        std::strncpy(addr.sun_path, m_path.c_str(), sizeof(addr.sun_path) - 1);
+        KJ_REQUIRE(connect(fd, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) == 0);
+        return fd;
+    }
+
+private:
+    int m_fd{-1};
+    std::string m_dir;
+    std::string m_path;
+};
+
+//! Runs a client EventLoop on its own thread and connects one socket FD to the
+//! server. The constructed ProxyClient can be used by the test thread to make
+//! calls over that connection.
+class ClientSetup
+{
+public:
+    explicit ClientSetup(int fd)
+        : thread([this, fd] {
+              EventLoop loop("mptest-client", [](mp::LogMessage log) {
+                  KJ_LOG(INFO, log.level, log.message);
+                  if (log.level == mp::Log::Raise) throw std::runtime_error(log.message);
+              });
+              client_promise.set_value(ConnectStream<messages::FooInterface>(loop, fd));
+              loop.loop();
+          })
+    {
+        client = client_promise.get_future().get();
+    }
+
+    ~ClientSetup()
+    {
+        client.reset();
+        thread.join();
+    }
+
+    std::promise<std::unique_ptr<ProxyClient<messages::FooInterface>>> client_promise;
+    std::unique_ptr<ProxyClient<messages::FooInterface>> client;
+
+    //! Thread variable should be after other struct members so the thread does
+    //! not start until the other members are initialized.
+    std::thread thread;
+};
+
+//! Runs a server EventLoop on its own thread, starts ListenConnections() on a
+//! UnixListener socket, and records connection/disconnection counts through
+//! EventLoop test hooks
+class ListenSetup
+{
+public:
+    explicit ListenSetup(std::optional<size_t> max_connections = std::nullopt)
+        : thread([this, max_connections] {
+              EventLoop loop("mptest-server", [](mp::LogMessage log) {
+                  KJ_LOG(INFO, log.level, log.message);
+                  if (log.level == mp::Log::Raise) throw std::runtime_error(log.message);
+              });
+              loop.testing_hook_disconnected = [&] {
+                  Lock lock(counter_mutex);
+                  ++disconnected_count;
+                  counter_cv.notify_all();
+              };
+              loop.testing_hook_connected = [&] {
+                  Lock lock(counter_mutex);
+                  ++connected_count;
+                  counter_cv.notify_all();
+              };
+              m_loop_ref.emplace(loop);
+              FooImplementation foo;
+              ListenConnections<messages::FooInterface>(loop, listener.release(), foo, max_connections);
+              ready_promise.set_value();
+              loop.loop();
+          })
+    {
+        ready_promise.get_future().get();
+    }
+
+    ~ListenSetup()
+    {
+        m_loop_ref.reset();
+        thread.join();
+    }
+
+    size_t ConnectedCount()
+    {
+        Lock lock(counter_mutex);
+        return connected_count;
+    }
+
+    size_t DisconnectedCount()
+    {
+        Lock lock(counter_mutex);
+        return disconnected_count;
+    }
+
+    void WaitForConnectedCount(size_t expected_count)
+    {
+        Lock lock(counter_mutex);
+        const auto deadline = std::chrono::steady_clock::now() + FAILURE_TIMEOUT;
+        const bool matched = counter_cv.wait_until(lock.m_lock, deadline, [&]() MP_REQUIRES(counter_mutex) {
+            return connected_count >= expected_count;
+        });
+        KJ_REQUIRE(matched);
+    }
+
+    void WaitForDisconnectedCount(size_t expected_count)
+    {
+        Lock lock(counter_mutex);
+        const auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(5);
+        const bool matched = counter_cv.wait_until(lock.m_lock, deadline, [&]() MP_REQUIRES(counter_mutex) {
+            return disconnected_count >= expected_count;
+        });
+        KJ_REQUIRE(matched);
+    }
+
+    UnixListener listener;
+    std::promise<void> ready_promise;
+    std::optional<EventLoopRef> m_loop_ref;
+    Mutex counter_mutex;
+    std::condition_variable counter_cv;
+    size_t connected_count MP_GUARDED_BY(counter_mutex) {0};
+    size_t disconnected_count MP_GUARDED_BY(counter_mutex) {0};
+    //! Thread variable should be after other struct members so the thread does
+    //! not start until the other members are initialized.
+    std::thread thread;
+};
+
+KJ_TEST("ListenConnections accepts incoming connections")
+{
+    ListenSetup server;
+    KJ_EXPECT(server.ConnectedCount() == 0)
+    auto client = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+
+    server.WaitForConnectedCount(1);
+    KJ_EXPECT(client->client->add(1, 2) == 3);
+}
+
+KJ_TEST("ListenConnections enforces a local connection limit")
+{
+    // With max-connections=1, the second socket can connect to the kernel
+    // backlog, but ListenConnections should not accept or serve it until the
+    // first accepts clients disconnects.
+
+    ListenSetup server(/*max_connections=*/1);
+
+    KJ_EXPECT(server.ConnectedCount() == 0)
+    auto client1 = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+    server.WaitForConnectedCount(1);
+
+    KJ_EXPECT(client1->client->add(1, 2) == 3);
+
+    auto client2 = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+    // Without this sync, ConnectedCount() == 1 might pass even if
+    // max_connections was not enforced because the event loop has not accepted
+    // client2 yet.
+    (**server.m_loop_ref).sync([] {});
+
+    KJ_EXPECT(server.ConnectedCount() == 1);
+    KJ_EXPECT(server.DisconnectedCount() == 0);
+    client1.reset();
+    server.WaitForDisconnectedCount(1);
+    server.WaitForConnectedCount(2);
+
+    KJ_EXPECT(client2->client->add(2, 3) == 5);
+
+    KJ_EXPECT(server.DisconnectedCount() == 1);
+    client2.reset();
+    server.WaitForDisconnectedCount(2);
+
+    KJ_EXPECT(server.DisconnectedCount() == 2);
+    auto client3 = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+    server.WaitForConnectedCount(3);
+    KJ_EXPECT(client3->client->add(3, 4) == 7);
+}
+
+KJ_TEST("ListenConnections accepts multiple connections")
+{
+    // With max-connections=2, two clients should be accepted and usable at the
+    // same time, while a third waits until one active client disconnects.
+
+    ListenSetup server(/*max_connections=*/2);
+
+    KJ_EXPECT(server.ConnectedCount() == 0);
+    auto client1 = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+    auto client2 = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+    server.WaitForConnectedCount(2);
+
+    KJ_EXPECT(client1->client->add(1, 2) == 3);
+    KJ_EXPECT(client2->client->add(2, 3) == 5);
+
+    auto client3 = std::make_unique<ClientSetup>(server.listener.MakeConnectedSocket());
+    // Without this sync, ConnectedCount() == 2 might pass even if
+    // max_connections was not enforced because the event loop has not accepted
+    // client3 yet.
+    (**server.m_loop_ref).sync([] {});
+
+    KJ_EXPECT(server.ConnectedCount() == 2);
+    KJ_EXPECT(server.DisconnectedCount() == 0);
+    client1.reset();
+    server.WaitForDisconnectedCount(1);
+    server.WaitForConnectedCount(3);
+
+    KJ_EXPECT(client3->client->add(3, 4) == 7);
+}
+
+} // namespace
+} // namespace test
+} // namespace mp
diff --git a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/test.cpp b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/test.cpp
index d91edb40..7a0940c8 100644
--- a/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/test.cpp
+++ b/depend/bitcoin/src/ipc/libmultiprocess/test/mp/test/test.cpp
@@ -18,9 +18,12 @@
 #include <kj/async.h>
 #include <kj/async-io.h>
 #include <kj/common.h>
+#include <kj/exception.h>
 #include <kj/debug.h>
 #include <kj/memory.h>
+#include <kj/string.h>
 #include <kj/test.h>
+#include <map>
 #include <memory>
 #include <mp/proxy.h>
 #include <mp/proxy.capnp.h>
@@ -34,9 +37,19 @@
 #include <string_view>
 #include <thread>
 #include <type_traits>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
+//! Assert that a call throws std::runtime_error with the given message.
+#define EXPECT_EXCEPTION(call, message)                                           \
+    try {                                                                         \
+        call;                                                                     \
+        KJ_EXPECT(false);                                                         \
+    } catch (const std::runtime_error& e) {                                       \
+        KJ_EXPECT(std::string_view{e.what()} == message);                         \
+    }
+
 namespace mp {
 namespace test {
 
@@ -141,21 +154,41 @@ KJ_TEST("Call FooInterface methods")
 
     FooStruct in;
     in.name = "name";
-    in.setint.insert(2);
-    in.setint.insert(1);
-    in.vbool.push_back(false);
-    in.vbool.push_back(true);
-    in.vbool.push_back(false);
+    in.set_int.insert(2);
+    in.set_int.insert(1);
+    in.unordered_set_int.insert(2);
+    in.unordered_set_int.insert(1);
+    in.vector_bool.push_back(false);
+    in.vector_bool.push_back(true);
+    in.vector_bool.push_back(false);
+    in.optional_int = 3;
+    in.map_string_int.emplace("a", 1);
+    in.map_string_int.emplace("b", 2);
     FooStruct out = foo->pass(in);
     KJ_EXPECT(in.name == out.name);
-    KJ_EXPECT(in.setint.size() == out.setint.size());
-    for (auto init{in.setint.begin()}, outit{out.setint.begin()}; init != in.setint.end() && outit != out.setint.end(); ++init, ++outit) {
+    KJ_EXPECT(in.set_int.size() == out.set_int.size());
+    for (auto init{in.set_int.begin()}, outit{out.set_int.begin()}; init != in.set_int.end() && outit != out.set_int.end(); ++init, ++outit) {
         KJ_EXPECT(*init == *outit);
     }
-    KJ_EXPECT(in.vbool.size() == out.vbool.size());
-    for (size_t i = 0; i < in.vbool.size(); ++i) {
-        KJ_EXPECT(in.vbool[i] == out.vbool[i]);
+    KJ_EXPECT(in.unordered_set_int.size() == out.unordered_set_int.size());
+    for (const auto& elem : in.unordered_set_int) {
+        KJ_EXPECT(out.unordered_set_int.count(elem) == 1);
+    }
+    KJ_EXPECT(in.vector_bool.size() == out.vector_bool.size());
+    for (size_t i = 0; i < in.vector_bool.size(); ++i) {
+        KJ_EXPECT(in.vector_bool[i] == out.vector_bool[i]);
     }
+    KJ_EXPECT(in.optional_int == out.optional_int);
+    KJ_EXPECT(in.map_string_int.size() == out.map_string_int.size());
+    for (auto init{in.map_string_int.begin()}, outit{out.map_string_int.begin()}; init != in.map_string_int.end() && outit != out.map_string_int.end(); ++init, ++outit) {
+        KJ_EXPECT(init->first == outit->first);
+        KJ_EXPECT(init->second == outit->second);
+    }
+
+    // Additional checks for std::optional member
+    KJ_EXPECT(foo->pass(in).optional_int == 3);
+    in.optional_int.reset();
+    KJ_EXPECT(!foo->pass(in).optional_int);
 
     FooStruct err;
     try {
@@ -206,6 +239,9 @@ KJ_TEST("Call FooInterface methods")
 
     foo->passEmpty(FooEmpty{});
 
+    FooData empty_data_out = foo->passData(FooData{});
+    KJ_EXPECT(empty_data_out.empty());
+
     FooMessage message1;
     message1.message = "init";
     FooMessage message2{foo->passMessage(message1)};
@@ -216,8 +252,15 @@ KJ_TEST("Call FooInterface methods")
     foo->passMutable(mut);
     KJ_EXPECT(mut.message == "init build pass call return read");
 
+    KJ_EXPECT(foo->passDouble(1.25) == 1.25);
+
     KJ_EXPECT(foo->passFn([]{ return 10; }) == 10);
 
+    // Recursive async IPC calls
+    KJ_EXPECT(foo->passFn([foo]{
+        return foo->passFn([]{ return 1; });
+    }) == 1);
+
     std::vector<FooDataRef> data_in;
     data_in.push_back(std::make_shared<FooData>(FooData{'H', 'i'}));
     data_in.push_back(nullptr);
@@ -235,14 +278,7 @@ KJ_TEST("Call IPC method after client connection is closed")
     KJ_EXPECT(foo->add(1, 2) == 3);
     setup.client_disconnect();
 
-    bool disconnected{false};
-    try {
-        foo->add(1, 2);
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method called after disconnect.");
-        disconnected = true;
-    }
-    KJ_EXPECT(disconnected);
+    EXPECT_EXCEPTION(foo->add(1, 2), "IPC client method called after disconnect.");
 }
 
 KJ_TEST("Calling IPC method after server connection is closed")
@@ -252,14 +288,7 @@ KJ_TEST("Calling IPC method after server connection is closed")
     KJ_EXPECT(foo->add(1, 2) == 3);
     setup.server_disconnect();
 
-    bool disconnected{false};
-    try {
-        foo->add(1, 2);
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
-        disconnected = true;
-    }
-    KJ_EXPECT(disconnected);
+    EXPECT_EXCEPTION(foo->add(1, 2), "IPC client method call interrupted by disconnect.");
 }
 
 KJ_TEST("Calling IPC method and disconnecting during the call")
@@ -272,14 +301,7 @@ KJ_TEST("Calling IPC method and disconnecting during the call")
     // handling the callFn call to make sure this case is handled cleanly.
     setup.server->m_impl->m_fn = setup.client_disconnect;
 
-    bool disconnected{false};
-    try {
-        foo->callFn();
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
-        disconnected = true;
-    }
-    KJ_EXPECT(disconnected);
+    EXPECT_EXCEPTION(foo->callFn(), "IPC client method call interrupted by disconnect.");
 }
 
 KJ_TEST("Calling IPC method, disconnecting and blocking during the call")
@@ -314,14 +336,7 @@ KJ_TEST("Calling IPC method, disconnecting and blocking during the call")
         signal.get_future().get();
     };
 
-    bool disconnected{false};
-    try {
-        foo->callFnAsync();
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
-        disconnected = true;
-    }
-    KJ_EXPECT(disconnected);
+    EXPECT_EXCEPTION(foo->callFnAsync(), "IPC client method call interrupted by disconnect.");
 
     // Now that the disconnect has been detected, set signal allowing the
     // callFnAsync() IPC call to return. Since signalling may not wake up the
@@ -358,14 +373,7 @@ KJ_TEST("Worker thread destroyed before it is initialized")
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     };
 
-    bool disconnected{false};
-    try {
-        foo->callFnAsync();
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
-        disconnected = true;
-    }
-    KJ_EXPECT(disconnected);
+    EXPECT_EXCEPTION(foo->callFnAsync(), "IPC client method call interrupted by disconnect.");
 }
 
 KJ_TEST("Calling async IPC method, with server disconnect racing the call")
@@ -390,12 +398,7 @@ KJ_TEST("Calling async IPC method, with server disconnect racing the call")
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     };
 
-    try {
-        foo->callFnAsync();
-        KJ_EXPECT(false);
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
-    }
+    EXPECT_EXCEPTION(foo->callFnAsync(), "IPC client method call interrupted by disconnect.");
 }
 
 KJ_TEST("Calling async IPC method, with server disconnect after cleanup")
@@ -419,12 +422,33 @@ KJ_TEST("Calling async IPC method, with server disconnect after cleanup")
         setup.server_disconnect();
     };
 
-    try {
-        foo->callFnAsync();
-        KJ_EXPECT(false);
-    } catch (const std::runtime_error& e) {
-        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
-    }
+    EXPECT_EXCEPTION(foo->callFnAsync(), "IPC client method call interrupted by disconnect.");
+}
+
+KJ_TEST("Destroying ProxyClient<> with destroy method after peer disconnect")
+{
+    // Regression test for bitcoin-core/libmultiprocess#219 where
+    // ~ProxyClientBase would call std::terminate if the remote destroy RPC
+    // failed during teardown.
+    //
+    // Save a callback on the server so it holds a ProxyClient<FooCallback>
+    // pointing back to this side, then disconnect. When the server is torn
+    // down, the ProxyClient<FooCallback> destructor issues a destroy RPC over
+    // the now dead connection; without the bugfix the exception escapes the
+    // noexcept destructor and aborts the process.
+
+    TestSetup setup{/*client_owns_connection=*/false};
+    ProxyClient<messages::FooInterface>* foo = setup.client.get();
+    foo->initThreadMap();
+
+    class Callback : public FooCallback
+    {
+    public:
+        int call(int arg) override { return arg; }
+    };
+
+    foo->saveCallback(std::make_shared<Callback>());
+    setup.client_disconnect();
 }
 
 KJ_TEST("Make simultaneous IPC calls on single remote thread")
@@ -470,6 +494,7 @@ KJ_TEST("Make simultaneous IPC calls on single remote thread")
                 [&running, &tc, i](auto&& results) {
                     assert(results.getResult() == static_cast<int32_t>(100 * (i+1)));
                     running -= 1;
+                    Lock lock(tc.waiter->m_mutex);
                     tc.waiter->m_cv.notify_all();
                 }));
         }
@@ -481,5 +506,76 @@ KJ_TEST("Make simultaneous IPC calls on single remote thread")
     KJ_EXPECT(expected == 400);
 }
 
+KJ_TEST("Call async IPC method dispatched to pool thread")
+{
+    TestSetup setup;
+    ProxyClient<messages::FooInterface>* foo = setup.client.get();
+
+    // Set up the thread map exchange so the client has the server's ThreadMap,
+    // then call makePool to pre-allocate two server threads.
+    foo->initThreadMap();
+    setup.server->m_impl->m_int_fn = [](int n) { return n * 2; };
+
+    ThreadContext& tc{g_thread_context};
+    std::atomic<size_t> running{3};
+    std::promise<void> pool_ready;
+    foo->m_context.loop->sync([&] {
+        auto pool_req = foo->m_context.connection->m_thread_map.makePoolRequest();
+        pool_req.setCount(2);
+        foo->m_context.loop->m_task_set->add(
+            pool_req.send().then([&](auto&&) { pool_ready.set_value(); }));
+    });
+    pool_ready.get_future().get();
+
+    // Send three callIntFnAsync requests with no context.thread set.
+    // The server should dispatch each to a pool thread.
+    auto client{foo->m_client};
+    foo->m_context.loop->sync([&] {
+        for (size_t i = 0; i < running; ++i) {
+            auto request{client.callIntFnAsyncRequest()};
+            request.initContext(); // context present but thread unset
+            request.setArg(static_cast<int32_t>(i + 1));
+            foo->m_context.loop->m_task_set->add(request.send().then(
+                [&running, &tc, i](auto&& results) {
+                    assert(results.getResult() == static_cast<int32_t>((i + 1) * 2));
+                    running -= 1;
+                    Lock lock(tc.waiter->m_mutex);
+                    tc.waiter->m_cv.notify_all();
+                }));
+        }
+    });
+    {
+        Lock lock(tc.waiter->m_mutex);
+        tc.waiter->wait(lock, [&running] { return running == 0; });
+    }
+}
+
+KJ_TEST("Call async IPC method without thread or pool errors correctly")
+{
+    TestSetup setup;
+    ProxyClient<messages::FooInterface>* foo = setup.client.get();
+    setup.server->m_impl->m_fn = [] {};
+
+    // Send a callFnAsync request with no context.thread and no pool configured.
+    // The server should throw the "no thread specified and no pool configured" error.
+    std::promise<void> done;
+    bool error_thrown{false};
+    foo->m_context.loop->sync([&] {
+        auto request{foo->m_client.callFnAsyncRequest()};
+        request.initContext();
+        foo->m_context.loop->m_task_set->add(
+            request.send().then(
+                [&](auto&&) { done.set_value(); },
+                [&](kj::Exception&& e) {
+                    error_thrown = true;
+                    KJ_EXPECT(std::string_view{e.getDescription().cStr()}.find(
+                        "no thread specified and no pool configured") != std::string_view::npos);
+                    done.set_value();
+                }));
+    });
+    done.get_future().get();
+    KJ_EXPECT(error_thrown);
+}
+
 } // namespace test
 } // namespace mp
diff --git a/depend/bitcoin/src/ipc/process.cpp b/depend/bitcoin/src/ipc/process.cpp
index e89414be..a9aa47ae 100644
--- a/depend/bitcoin/src/ipc/process.cpp
+++ b/depend/bitcoin/src/ipc/process.cpp
@@ -4,10 +4,10 @@
 
 #include <ipc/process.h>
 #include <ipc/protocol.h>
-#include <logging.h>
 #include <mp/util.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/syserror.h>
 
@@ -18,11 +18,12 @@
 #include <exception>
 #include <iostream>
 #include <stdexcept>
+#include <utility>
+#include <vector>
+
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include <utility>
-#include <vector>
 
 using util::RemovePrefixView;
 
@@ -31,17 +32,17 @@ namespace {
 class ProcessImpl : public Process
 {
 public:
-    int spawn(const std::string& new_exe_name, const fs::path& argv0_path, int& pid) override
+    std::tuple<mp::ProcessId, mp::SocketId> spawn(const std::string& new_exe_name, const fs::path& argv0_path) override
     {
-        return mp::SpawnProcess(pid, [&](int fd) {
+        return mp::SpawnProcess([&](std::string connect_info) {
             fs::path path = argv0_path;
             path.remove_filename();
             path /= fs::PathFromString(new_exe_name);
-            return std::vector<std::string>{fs::PathToString(path), "-ipcfd", strprintf("%i", fd)};
+            return std::vector<std::string>{fs::PathToString(path), "-ipcfd", std::move(connect_info)};
         });
     }
-    int waitSpawned(int pid) override { return mp::WaitProcess(pid); }
-    bool checkSpawned(int argc, char* argv[], int& fd) override
+    int waitSpawned(mp::ProcessId pid) override { return mp::WaitProcess(pid); }
+    bool checkSpawned(int argc, char* argv[], mp::SocketId& socket) override
     {
         // If this process was not started with a single -ipcfd argument, it is
         // not a process spawned by the spawn() call above, so return false and
@@ -55,17 +56,17 @@ class ProcessImpl : public Process
         // in combination with other arguments because the parent process
         // should be able to control the child process through the IPC protocol
         // without passing information out of band.
-        const auto maybe_fd{ToIntegral<int32_t>(argv[2])};
-        if (!maybe_fd) {
-            throw std::runtime_error(strprintf("Invalid -ipcfd number '%s'", argv[2]));
+        try {
+           socket = mp::StartSpawned(argv[2]);
+        } catch (const std::exception& e) {
+           throw std::runtime_error(strprintf("Invalid -ipcfd number '%s' (%s)", argv[2], e.what()));
         }
-        fd = *maybe_fd;
         return true;
     }
-    int connect(const fs::path& data_dir,
+    mp::SocketId connect(const fs::path& data_dir,
                 const std::string& dest_exe_name,
                 std::string& address) override;
-    int bind(const fs::path& data_dir, const std::string& exe_name, std::string& address) override;
+    mp::SocketId bind(const fs::path& data_dir, const std::string& exe_name, std::string& address) override;
 };
 
 static bool ParseAddress(std::string& address,
@@ -97,7 +98,7 @@ static bool ParseAddress(std::string& address,
     return false;
 }
 
-int ProcessImpl::connect(const fs::path& data_dir,
+mp::SocketId ProcessImpl::connect(const fs::path& data_dir,
                          const std::string& dest_exe_name,
                          std::string& address)
 {
@@ -107,8 +108,8 @@ int ProcessImpl::connect(const fs::path& data_dir,
         throw std::invalid_argument(error);
     }
 
-    int fd;
-    if ((fd = ::socket(addr.sun_family, SOCK_STREAM, 0)) == -1) {
+    mp::SocketId fd;
+    if ((fd = ::socket(addr.sun_family, SOCK_STREAM, 0)) == mp::SocketError) {
         throw std::system_error(errno, std::system_category());
     }
     if (::connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
@@ -121,7 +122,7 @@ int ProcessImpl::connect(const fs::path& data_dir,
     throw std::system_error(connect_error, std::system_category());
 }
 
-int ProcessImpl::bind(const fs::path& data_dir, const std::string& exe_name, std::string& address)
+mp::SocketId ProcessImpl::bind(const fs::path& data_dir, const std::string& exe_name, std::string& address)
 {
     struct sockaddr_un addr;
     std::string error;
@@ -137,8 +138,8 @@ int ProcessImpl::bind(const fs::path& data_dir, const std::string& exe_name, std
         }
     }
 
-    int fd;
-    if ((fd = ::socket(addr.sun_family, SOCK_STREAM, 0)) == -1) {
+    mp::SocketId fd;
+    if ((fd = ::socket(addr.sun_family, SOCK_STREAM, 0)) == mp::SocketError) {
         throw std::system_error(errno, std::system_category());
     }
 
diff --git a/depend/bitcoin/src/ipc/process.h b/depend/bitcoin/src/ipc/process.h
index 67c69593..ac597cb0 100644
--- a/depend/bitcoin/src/ipc/process.h
+++ b/depend/bitcoin/src/ipc/process.h
@@ -8,6 +8,7 @@
 #include <util/fs.h>
 
 #include <memory>
+#include <ipc/util.h>
 #include <string>
 
 namespace ipc {
@@ -23,25 +24,24 @@ class Process
 public:
     virtual ~Process() = default;
 
-    //! Spawn process and return socket file descriptor for communicating with
-    //! it.
-    virtual int spawn(const std::string& new_exe_name, const fs::path& argv0_path, int& pid) = 0;
+    //! Spawn process and return socket id for communicating with it.
+    virtual std::tuple<mp::ProcessId, mp::SocketId> spawn(const std::string& new_exe_name, const fs::path& argv0_path) = 0;
 
     //! Wait for spawned process to exit and return its exit code.
-    virtual int waitSpawned(int pid) = 0;
+    virtual int waitSpawned(mp::ProcessId pid) = 0;
 
     //! Parse command line and determine if current process is a spawned child
-    //! process. If so, return true and a file descriptor for communicating
+    //! process. If so, return true and a socket id for communicating
     //! with the parent process.
-    virtual bool checkSpawned(int argc, char* argv[], int& fd) = 0;
+    virtual bool checkSpawned(int argc, char* argv[], mp::SocketId& socket) = 0;
 
-    //! Canonicalize and connect to address, returning socket descriptor.
-    virtual int connect(const fs::path& data_dir,
+    //! Canonicalize and connect to address, returning socket id.
+    virtual mp::SocketId connect(const fs::path& data_dir,
                         const std::string& dest_exe_name,
                         std::string& address) = 0;
 
-    //! Create listening socket, bind and canonicalize address, and return socket descriptor.
-    virtual int bind(const fs::path& data_dir,
+    //! Create listening socket, bind and canonicalize address, and return socket id.
+    virtual mp::SocketId bind(const fs::path& data_dir,
                      const std::string& exe_name,
                      std::string& address) = 0;
 };
diff --git a/depend/bitcoin/src/ipc/protocol.h b/depend/bitcoin/src/ipc/protocol.h
index e7d66887..66aab9fb 100644
--- a/depend/bitcoin/src/ipc/protocol.h
+++ b/depend/bitcoin/src/ipc/protocol.h
@@ -6,6 +6,7 @@
 #define BITCOIN_IPC_PROTOCOL_H
 
 #include <interfaces/init.h>
+#include <ipc/util.h>
 
 #include <functional>
 #include <memory>
@@ -23,8 +24,8 @@ class Protocol
 public:
     virtual ~Protocol() = default;
 
-    //! Return Init interface that forwards requests over given socket descriptor.
-    //! Socket communication is handled on a background thread.
+    //! Return Init interface that forwards requests over given connection
+    //! stream. Socket communication is handled on a background thread.
     //!
     //! @note It could be potentially useful in the future to add
     //! std::function<void()> on_disconnect callback argument here. But there
@@ -32,31 +33,31 @@ class Protocol
     //! up its own state (calling ProxyServer destructors, etc) on disconnect,
     //! and any client calls will just throw ipc::Exception errors after a
     //! disconnect.
-    virtual std::unique_ptr<interfaces::Init> connect(int fd, const char* exe_name) = 0;
+    virtual std::unique_ptr<interfaces::Init> connect(mp::Stream stream) = 0;
 
-    //! Listen for connections on provided socket descriptor, accept them, and
-    //! handle requests on accepted connections. This method doesn't block, and
+    //! Listen for connections on provided socket id, accept them, and handle
+    //! requests on accepted connections. This method doesn't block, and
     //! performs I/O on a background thread.
-    virtual void listen(int listen_fd, const char* exe_name, interfaces::Init& init) = 0;
+    virtual void listen(mp::SocketId listen_fd, interfaces::Init& init) = 0;
 
-    //! Handle requests on provided socket descriptor, forwarding them to the
-    //! provided Init interface. Socket communication is handled on the
-    //! current thread, and this call blocks until the socket is closed.
+    //! Handle requests from a stream provided by the make_stream callback,
+    //! forwarding them to the provided Init interface. Socket communication is
+    //! handled on the current thread, and this call blocks until the socket is
+    //! closed. A callback is used to specify the stream because this method
+    //! initializes the event loop and it may not be possible to create the
+    //! stream before the event loop is initialized.
     //!
-    //! @note: If this method is called, it needs be called before connect() or
-    //! listen() methods, because for ease of implementation it's inflexible and
-    //! always runs the event loop in the foreground thread. It can share its
-    //! event loop with the other methods but can't share an event loop that was
-    //! created by them. This isn't really a problem because serve() is only
-    //! called by spawned child processes that call it immediately to
+    //! @note: If this method is called, it needs to be called before connect()
+    //! or listen() methods, because for ease of implementation this method is
+    //! inflexible and always runs the event loop in the foreground thread. It
+    //! can share its event loop with the other methods but can't share an event
+    //! loop that was created by them. This isn't a problem because serve() is
+    //! only called by spawned child processes that call it immediately to
     //! communicate back with parent processes.
-    //
-    //! The optional `ready_fn` callback will be called after the event loop is
-    //! created but before it is started. This can be useful in tests to trigger
-    //! client connections from another thread as soon as the event loop is
-    //! available, but should not be necessary in normal code which starts
-    //! clients and servers independently.
-    virtual void serve(int fd, const char* exe_name, interfaces::Init& init, const std::function<void()>& ready_fn = {}) = 0;
+    virtual void serve(interfaces::Init& init, const std::function<mp::Stream()>& make_stream) = 0;
+
+    //! Make stream object from socket id.
+    virtual mp::Stream makeStream(mp::SocketId socket) = 0;
 
     //! Disconnect any incoming connections that are still connected.
     virtual void disconnectIncoming() = 0;
diff --git a/depend/bitcoin/src/ipc/test/CMakeLists.txt b/depend/bitcoin/src/ipc/test/CMakeLists.txt
index e71bc2bc..91aa2a5e 100644
--- a/depend/bitcoin/src/ipc/test/CMakeLists.txt
+++ b/depend/bitcoin/src/ipc/test/CMakeLists.txt
@@ -2,11 +2,6 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit/.
 
-# Do not use generator expressions in test sources because the
-# SOURCES property is processed to gather test suite macros.
-target_sources(test_bitcoin
-  PRIVATE
-    ipc_tests.cpp
-)
-
 target_link_libraries(test_bitcoin bitcoin_ipc_test bitcoin_ipc)
+
+add_boost_test(${CMAKE_CURRENT_SOURCE_DIR}/ipc_tests.cpp)
diff --git a/depend/bitcoin/src/ipc/test/fuzz/CMakeLists.txt b/depend/bitcoin/src/ipc/test/fuzz/CMakeLists.txt
new file mode 100644
index 00000000..deefa801
--- /dev/null
+++ b/depend/bitcoin/src/ipc/test/fuzz/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit/.
+
+target_sources(fuzz PRIVATE ${PROJECT_SOURCE_DIR}/src/ipc/test/fuzz/ipc.cpp)
+target_link_libraries(fuzz bitcoin_ipc_fuzz Libmultiprocess::multiprocess)
diff --git a/depend/bitcoin/src/ipc/test/fuzz/ipc.cpp b/depend/bitcoin/src/ipc/test/fuzz/ipc.cpp
new file mode 100644
index 00000000..5935e9af
--- /dev/null
+++ b/depend/bitcoin/src/ipc/test/fuzz/ipc.cpp
@@ -0,0 +1,135 @@
+// 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.
+
+#include <primitives/transaction.h>
+#include <capnp/capability.h>
+#include <capnp/rpc.h>
+#include <ipc/util.h>
+#include <kj/memory.h>
+#include <mp/proxy-io.h>
+#include <mp/proxy.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <ipc/test/fuzz/ipc_fuzz.capnp.h>
+#include <ipc/test/fuzz/ipc_fuzz.capnp.proxy.h>
+#include <ipc/test/fuzz/ipc_fuzz.h>
+#include <test/fuzz/util.h>
+#include <test/util/setup_common.h>
+
+#include <future>
+#include <memory>
+#include <stdexcept>
+#include <thread>
+
+namespace {
+class IpcFuzzSetup
+{
+public:
+    IpcFuzzSetup()
+    {
+        std::promise<std::unique_ptr<mp::ProxyClient<test::fuzz::messages::IpcFuzzInterface>>> client_promise;
+        auto client_future{client_promise.get_future()};
+        m_loop_thread = std::thread([&client_promise] {
+            mp::EventLoop loop("ipc-fuzz", [](mp::LogMessage message) {
+                if (message.level == mp::Log::Raise) throw std::runtime_error(message.message);
+            });
+            auto pipe = loop.m_io_context.provider->newTwoWayPipe();
+
+            auto server_connection = std::make_unique<mp::Connection>(
+                loop,
+                kj::mv(pipe.ends[0]),
+                [&](mp::Connection& connection) {
+                    auto server_proxy = kj::heap<mp::ProxyServer<test::fuzz::messages::IpcFuzzInterface>>(
+                        std::make_shared<IpcFuzzImplementation>(), connection);
+                    return capnp::Capability::Client(kj::mv(server_proxy));
+                });
+            server_connection->onDisconnect([&] { server_connection.reset(); });
+
+            auto client_connection = std::make_unique<mp::Connection>(loop, kj::mv(pipe.ends[1]));
+            auto client_proxy = std::make_unique<mp::ProxyClient<test::fuzz::messages::IpcFuzzInterface>>(
+                client_connection->m_rpc_system->bootstrap(mp::ServerVatId().vat_id)
+                    .castAs<test::fuzz::messages::IpcFuzzInterface>(),
+                client_connection.get(),
+                /* destroy_connection= */ true);
+            (void)client_connection.release();
+
+            client_promise.set_value(std::move(client_proxy));
+            loop.loop();
+        });
+        m_client = client_future.get();
+    }
+
+    ~IpcFuzzSetup()
+    {
+        m_client.reset();
+        if (m_loop_thread.joinable()) m_loop_thread.join();
+    }
+
+    std::unique_ptr<mp::ProxyClient<test::fuzz::messages::IpcFuzzInterface>> m_client;
+
+private:
+    std::thread m_loop_thread;
+};
+
+static IpcFuzzSetup* g_ipc;
+
+static void initialize_ipc()
+{
+    static const auto testing_setup = MakeNoLogFileContext<>();
+    (void)testing_setup;
+
+    // Ensure the thread's ThreadContext is created before the IPC setup, so
+    // it is destroyed after it, since C++ destroys thread_local objects in
+    // reverse construction order.
+    mp::CurrentThread();
+
+    thread_local static IpcFuzzSetup ipc; // NOLINT(bitcoin-nontrivial-threadlocal)
+    g_ipc = &ipc;
+}
+
+FUZZ_TARGET(ipc, .init = initialize_ipc)
+{
+    auto& ipc = *g_ipc;
+    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 64) {
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                static constexpr int MIN_ADD{-1'000'000};
+                static constexpr int MAX_ADD{1'000'000};
+                const int a = fuzzed_data_provider.ConsumeIntegralInRange<int>(MIN_ADD, MAX_ADD);
+                const int b = fuzzed_data_provider.ConsumeIntegralInRange<int>(MIN_ADD, MAX_ADD);
+                assert(ipc.m_client->add(a, b) == a + b);
+            },
+            [&] {
+                COutPoint outpoint{Txid::FromUint256(ConsumeUInt256(fuzzed_data_provider)),
+                                   fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
+                COutPoint expected{outpoint.hash, outpoint.n ^ 0xFFFFFFFFu};
+                assert(ipc.m_client->passOutPoint(outpoint) == expected);
+            },
+            [&] {
+                std::vector<uint8_t> value = ConsumeRandomLengthByteVector<uint8_t>(fuzzed_data_provider, 512);
+                std::vector<uint8_t> expected{value.rbegin(), value.rend()};
+                assert(ipc.m_client->passVectorUint8(value) == expected);
+            },
+            [&] {
+                CScript script{ConsumeScript(fuzzed_data_provider)};
+                CScript expected{script};
+                expected << OP_NOP;
+                assert(ipc.m_client->passScript(script) == expected);
+            },
+            [&] {
+                UniValue value;
+                if (!value.read(fuzzed_data_provider.ConsumeRandomLengthString(512))) return;
+                assert(ipc.m_client->passUniValue(value).write() == value.write());
+            },
+            [&] {
+                const CMutableTransaction mutable_tx = ConsumeTransaction(fuzzed_data_provider, std::nullopt);
+                if (mutable_tx.vin.empty()) return;
+                const CTransactionRef tx = MakeTransactionRef(mutable_tx);
+                assert(*ipc.m_client->passTransaction(tx) == *tx);
+            });
+    }
+}
+} // namespace
diff --git a/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz.capnp b/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz.capnp
new file mode 100644
index 00000000..3e7ec8b3
--- /dev/null
+++ b/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz.capnp
@@ -0,0 +1,21 @@
+# 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.
+
+@0xf918ff05f5bf04d1;
+
+using Cxx = import "/capnp/c++.capnp";
+$Cxx.namespace("test::fuzz::messages");
+
+using Proxy = import "/mp/proxy.capnp";
+$Proxy.include("ipc/test/fuzz/ipc_fuzz.h");
+$Proxy.includeTypes("ipc/test/fuzz/ipc_fuzz_types.h");
+
+interface IpcFuzzInterface $Proxy.wrap("IpcFuzzImplementation") {
+    add @0 (a :Int32, b :Int32) -> (result :Int32);
+    passOutPoint @1 (arg :Data) -> (result :Data);
+    passVectorUint8 @2 (arg :Data) -> (result :Data);
+    passScript @3 (arg :Data) -> (result :Data);
+    passUniValue @4 (arg :Text) -> (result :Text);
+    passTransaction @5 (arg :Data) -> (result :Data);
+}
diff --git a/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz.h b/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz.h
new file mode 100644
index 00000000..b3c89908
--- /dev/null
+++ b/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz.h
@@ -0,0 +1,26 @@
+// 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.
+
+#ifndef BITCOIN_IPC_TEST_FUZZ_IPC_FUZZ_H
+#define BITCOIN_IPC_TEST_FUZZ_IPC_FUZZ_H
+
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <univalue.h>
+
+#include <algorithm>
+#include <vector>
+
+class IpcFuzzImplementation
+{
+public:
+    int add(int a, int b) { return a + b; }
+    COutPoint passOutPoint(COutPoint o) { return COutPoint{o.hash, o.n ^ 0xFFFFFFFFu}; }
+    std::vector<uint8_t> passVectorUint8(std::vector<uint8_t> v) { std::reverse(v.begin(), v.end()); return v; }
+    CScript passScript(CScript s) { s << OP_NOP; return s; }
+    UniValue passUniValue(UniValue v) { return v; }
+    CTransactionRef passTransaction(CTransactionRef t) { return t; }
+};
+
+#endif // BITCOIN_IPC_TEST_FUZZ_IPC_FUZZ_H
diff --git a/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz_types.h b/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz_types.h
new file mode 100644
index 00000000..52cb7328
--- /dev/null
+++ b/depend/bitcoin/src/ipc/test/fuzz/ipc_fuzz_types.h
@@ -0,0 +1,11 @@
+// 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.
+
+#ifndef BITCOIN_IPC_TEST_FUZZ_IPC_FUZZ_TYPES_H
+#define BITCOIN_IPC_TEST_FUZZ_IPC_FUZZ_TYPES_H
+
+#include <ipc/capnp/common-types.h>
+#include <ipc/test/fuzz/ipc_fuzz.capnp.h>
+
+#endif // BITCOIN_IPC_TEST_FUZZ_IPC_FUZZ_TYPES_H
diff --git a/depend/bitcoin/src/ipc/test/ipc_test.capnp b/depend/bitcoin/src/ipc/test/ipc_test.capnp
index adb92825..4aa196b6 100644
--- a/depend/bitcoin/src/ipc/test/ipc_test.capnp
+++ b/depend/bitcoin/src/ipc/test/ipc_test.capnp
@@ -18,6 +18,7 @@ interface FooInterface $Proxy.wrap("FooImplementation") {
     passOutPoint @1 (arg :Data) -> (result :Data);
     passUniValue @2 (arg :Text) -> (result :Text);
     passTransaction @3 (arg :Data) -> (result :Data);
+    passTransactions @6 (arg :List(Data)) -> (result :List(Data));
     passVectorChar @4 (arg :Data) -> (result :Data);
     passScript @5 (arg :Data) -> (result :Data);
 }
diff --git a/depend/bitcoin/src/ipc/test/ipc_test.cpp b/depend/bitcoin/src/ipc/test/ipc_test.cpp
deleted file mode 100644
index 31607299..00000000
--- a/depend/bitcoin/src/ipc/test/ipc_test.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) 2023-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.
-
-#include <interfaces/init.h>
-#include <ipc/capnp/protocol.h>
-#include <ipc/process.h>
-#include <ipc/protocol.h>
-#include <logging.h>
-#include <mp/proxy-types.h>
-#include <ipc/capnp/mining.capnp.h>
-#include <ipc/test/ipc_test.capnp.h>
-#include <ipc/test/ipc_test.capnp.proxy.h>
-#include <ipc/test/ipc_test.h>
-#include <tinyformat.h>
-#include <validation.h>
-
-#include <future>
-#include <thread>
-#include <kj/common.h>
-#include <kj/memory.h>
-#include <kj/test.h>
-#include <stdexcept>
-
-#include <boost/test/unit_test.hpp>
-
-static_assert(ipc::capnp::messages::MAX_MONEY == MAX_MONEY);
-static_assert(ipc::capnp::messages::MAX_DOUBLE == std::numeric_limits<double>::max());
-static_assert(ipc::capnp::messages::DEFAULT_BLOCK_RESERVED_WEIGHT == DEFAULT_BLOCK_RESERVED_WEIGHT);
-static_assert(ipc::capnp::messages::DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS == DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS);
-
-//! Remote init class.
-class TestInit : public interfaces::Init
-{
-public:
-    std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
-};
-
-//! Generate a temporary path with temp_directory_path and mkstemp
-static std::string TempPath(std::string_view pattern)
-{
-    std::string temp{fs::PathToString(fs::path{fs::temp_directory_path()} / fs::PathFromString(std::string{pattern}))};
-    temp.push_back('\0');
-    int fd{mkstemp(temp.data())};
-    BOOST_CHECK_GE(fd, 0);
-    BOOST_CHECK_EQUAL(close(fd), 0);
-    temp.resize(temp.size() - 1);
-    fs::remove(fs::PathFromString(temp));
-    return temp;
-}
-
-//! Unit test that tests execution of IPC calls without actually creating a
-//! separate process. This test is primarily intended to verify behavior of type
-//! conversion code that converts C++ objects to Cap'n Proto messages and vice
-//! versa.
-//!
-//! The test creates a thread which creates a FooImplementation object (defined
-//! in ipc_test.h) and a two-way pipe accepting IPC requests which call methods
-//! on the object through FooInterface (defined in ipc_test.capnp).
-void IpcPipeTest()
-{
-    // Setup: create FooImplementation object and listen for FooInterface requests
-    std::promise<std::unique_ptr<mp::ProxyClient<gen::FooInterface>>> foo_promise;
-    std::thread thread([&]() {
-        mp::EventLoop loop("IpcPipeTest", [](bool raise, const std::string& log) { LogInfo("LOG%i: %s", raise, log); });
-        auto pipe = loop.m_io_context.provider->newTwoWayPipe();
-
-        auto connection_client = std::make_unique<mp::Connection>(loop, kj::mv(pipe.ends[0]));
-        auto foo_client = std::make_unique<mp::ProxyClient<gen::FooInterface>>(
-            connection_client->m_rpc_system->bootstrap(mp::ServerVatId().vat_id).castAs<gen::FooInterface>(),
-            connection_client.get(), /* destroy_connection= */ true);
-        (void)connection_client.release();
-        foo_promise.set_value(std::move(foo_client));
-
-        auto connection_server = std::make_unique<mp::Connection>(loop, kj::mv(pipe.ends[1]), [&](mp::Connection& connection) {
-            auto foo_server = kj::heap<mp::ProxyServer<gen::FooInterface>>(std::make_shared<FooImplementation>(), connection);
-            return capnp::Capability::Client(kj::mv(foo_server));
-        });
-        connection_server->onDisconnect([&] { connection_server.reset(); });
-        loop.loop();
-    });
-    std::unique_ptr<mp::ProxyClient<gen::FooInterface>> foo{foo_promise.get_future().get()};
-
-    // Test: make sure arguments were sent and return value is received
-    BOOST_CHECK_EQUAL(foo->add(1, 2), 3);
-
-    COutPoint txout1{Txid::FromUint256(uint256{100}), 200};
-    COutPoint txout2{foo->passOutPoint(txout1)};
-    BOOST_CHECK(txout1 == txout2);
-
-    UniValue uni1{UniValue::VOBJ};
-    uni1.pushKV("i", 1);
-    uni1.pushKV("s", "two");
-    UniValue uni2{foo->passUniValue(uni1)};
-    BOOST_CHECK_EQUAL(uni1.write(), uni2.write());
-
-    CMutableTransaction mtx;
-    mtx.version = 2;
-    mtx.nLockTime = 3;
-    mtx.vin.emplace_back(txout1);
-    mtx.vout.emplace_back(COIN, CScript());
-    CTransactionRef tx1{MakeTransactionRef(mtx)};
-    CTransactionRef tx2{foo->passTransaction(tx1)};
-    BOOST_CHECK(*Assert(tx1) == *Assert(tx2));
-
-    std::vector<char> vec1{'H', 'e', 'l', 'l', 'o'};
-    std::vector<char> vec2{foo->passVectorChar(vec1)};
-    BOOST_CHECK_EQUAL(std::string_view(vec1.begin(), vec1.end()), std::string_view(vec2.begin(), vec2.end()));
-
-    auto script1{CScript() << OP_11};
-    auto script2{foo->passScript(script1)};
-    BOOST_CHECK_EQUAL(HexStr(script1), HexStr(script2));
-
-    // Test cleanup: disconnect and join thread
-    foo.reset();
-    thread.join();
-}
-
-//! Test ipc::Protocol connect() and serve() methods connecting over a socketpair.
-void IpcSocketPairTest()
-{
-    int fds[2];
-    BOOST_CHECK_EQUAL(socketpair(AF_UNIX, SOCK_STREAM, 0, fds), 0);
-    std::unique_ptr<interfaces::Init> init{std::make_unique<TestInit>()};
-    std::unique_ptr<ipc::Protocol> protocol{ipc::capnp::MakeCapnpProtocol()};
-    std::promise<void> promise;
-    std::thread thread([&]() {
-        protocol->serve(fds[0], "test-serve", *init, [&] { promise.set_value(); });
-    });
-    promise.get_future().wait();
-    std::unique_ptr<interfaces::Init> remote_init{protocol->connect(fds[1], "test-connect")};
-    std::unique_ptr<interfaces::Echo> remote_echo{remote_init->makeEcho()};
-    BOOST_CHECK_EQUAL(remote_echo->echo("echo test"), "echo test");
-    remote_echo.reset();
-    remote_init.reset();
-    thread.join();
-}
-
-//! Test ipc::Process bind() and connect() methods connecting over a unix socket.
-void IpcSocketTest(const fs::path& datadir)
-{
-    std::unique_ptr<interfaces::Init> init{std::make_unique<TestInit>()};
-    std::unique_ptr<ipc::Protocol> protocol{ipc::capnp::MakeCapnpProtocol()};
-    std::unique_ptr<ipc::Process> process{ipc::MakeProcess()};
-
-    std::string invalid_bind{"invalid:"};
-    BOOST_CHECK_THROW(process->bind(datadir, "test_bitcoin", invalid_bind), std::invalid_argument);
-    BOOST_CHECK_THROW(process->connect(datadir, "test_bitcoin", invalid_bind), std::invalid_argument);
-
-    auto bind_and_listen{[&](const std::string& bind_address) {
-        std::string address{bind_address};
-        int serve_fd = process->bind(datadir, "test_bitcoin", address);
-        BOOST_CHECK_GE(serve_fd, 0);
-        BOOST_CHECK_EQUAL(address, bind_address);
-        protocol->listen(serve_fd, "test-serve", *init);
-    }};
-
-    auto connect_and_test{[&](const std::string& connect_address) {
-        std::string address{connect_address};
-        int connect_fd{process->connect(datadir, "test_bitcoin", address)};
-        BOOST_CHECK_EQUAL(address, connect_address);
-        std::unique_ptr<interfaces::Init> remote_init{protocol->connect(connect_fd, "test-connect")};
-        std::unique_ptr<interfaces::Echo> remote_echo{remote_init->makeEcho()};
-        BOOST_CHECK_EQUAL(remote_echo->echo("echo test"), "echo test");
-    }};
-
-    // Need to specify explicit socket addresses outside the data directory, because the data
-    // directory path is so long that the default socket address and any other
-    // addresses in the data directory would fail with errors like:
-    //   Address 'unix' path '"/tmp/test_common_Bitcoin Core/ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff/test_bitcoin.sock"' exceeded maximum socket path length
-    std::vector<std::string> addresses{
-        strprintf("unix:%s", TempPath("bitcoin_sock0_XXXXXX")),
-        strprintf("unix:%s", TempPath("bitcoin_sock1_XXXXXX")),
-    };
-
-    // Bind and listen on multiple addresses
-    for (const auto& address : addresses) {
-        bind_and_listen(address);
-    }
-
-    // Connect and test each address multiple times.
-    for (int i : {0, 1, 0, 0, 1}) {
-        connect_and_test(addresses[i]);
-    }
-}
diff --git a/depend/bitcoin/src/ipc/test/ipc_test.h b/depend/bitcoin/src/ipc/test/ipc_test.h
index 8ef3bc90..c0a81150 100644
--- a/depend/bitcoin/src/ipc/test/ipc_test.h
+++ b/depend/bitcoin/src/ipc/test/ipc_test.h
@@ -18,13 +18,10 @@ class FooImplementation
     COutPoint passOutPoint(COutPoint o) { return o; }
     UniValue passUniValue(UniValue v) { return v; }
     CTransactionRef passTransaction(CTransactionRef t) { return t; }
+    std::vector<CTransactionRef> passTransactions(std::vector<CTransactionRef> t) { return t; }
     std::vector<char> passVectorChar(std::vector<char> v) { return v; }
     BlockValidationState passBlockState(BlockValidationState s) { return s; }
     CScript passScript(CScript s) { return s; }
 };
 
-void IpcPipeTest();
-void IpcSocketPairTest();
-void IpcSocketTest(const fs::path& datadir);
-
 #endif // BITCOIN_IPC_TEST_IPC_TEST_H
diff --git a/depend/bitcoin/src/ipc/test/ipc_tests.cpp b/depend/bitcoin/src/ipc/test/ipc_tests.cpp
index ebe4b397..e353a7ee 100644
--- a/depend/bitcoin/src/ipc/test/ipc_tests.cpp
+++ b/depend/bitcoin/src/ipc/test/ipc_tests.cpp
@@ -2,13 +2,202 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <interfaces/init.h>
+#include <ipc/capnp/mining.capnp.h>
+#include <ipc/capnp/protocol.h>
 #include <ipc/process.h>
+#include <ipc/protocol.h>
+#include <ipc/test/ipc_test.capnp.h>
+#include <ipc/test/ipc_test.capnp.proxy.h>
 #include <ipc/test/ipc_test.h>
-
+#include <mp/proxy-types.h>
 #include <test/util/common.h>
 #include <test/util/setup_common.h>
+#include <tinyformat.h>
+#include <util/log.h>
+#include <validation.h>
+
+#include <future>
+#include <thread>
+#include <kj/common.h>
+#include <kj/memory.h>
+#include <kj/test.h>
+#include <stdexcept>
+
 #include <boost/test/unit_test.hpp>
 
+static_assert(ipc::capnp::messages::MAX_MONEY == MAX_MONEY);
+static_assert(ipc::capnp::messages::MAX_DOUBLE == std::numeric_limits<double>::max());
+static_assert(ipc::capnp::messages::DEFAULT_BLOCK_RESERVED_WEIGHT == DEFAULT_BLOCK_RESERVED_WEIGHT);
+static_assert(ipc::capnp::messages::DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS == DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS);
+
+//! Remote init class.
+class TestInit : public interfaces::Init
+{
+public:
+    std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
+};
+
+//! Generate a temporary path with temp_directory_path and mkstemp
+static std::string TempPath(std::string_view pattern)
+{
+    std::string temp{fs::PathToString(fs::path{fs::temp_directory_path()} / fs::PathFromString(std::string{pattern}))};
+    temp.push_back('\0');
+    int fd{mkstemp(temp.data())};
+    BOOST_CHECK_GE(fd, 0);
+    BOOST_CHECK_EQUAL(close(fd), 0);
+    temp.resize(temp.size() - 1);
+    fs::remove(fs::PathFromString(temp));
+    return temp;
+}
+
+//! Unit test that tests execution of IPC calls without actually creating a
+//! separate process. This test is primarily intended to verify behavior of type
+//! conversion code that converts C++ objects to Cap'n Proto messages and vice
+//! versa.
+//!
+//! The test creates a thread which creates a FooImplementation object (defined
+//! in ipc_test.h) and a two-way pipe accepting IPC requests which call methods
+//! on the object through FooInterface (defined in ipc_test.capnp).
+void IpcPipeTest()
+{
+    // Setup: create FooImplementation object and listen for FooInterface requests
+    std::promise<std::unique_ptr<mp::ProxyClient<gen::FooInterface>>> foo_promise;
+    std::thread thread([&]() {
+        mp::EventLoop loop("IpcPipeTest", [](bool raise, const std::string& log) { LogInfo("LOG%i: %s", raise, log); });
+        auto pipe = loop.m_io_context.provider->newTwoWayPipe();
+
+        auto connection_client = std::make_unique<mp::Connection>(loop, kj::mv(pipe.ends[0]));
+        auto foo_client = std::make_unique<mp::ProxyClient<gen::FooInterface>>(
+            connection_client->m_rpc_system->bootstrap(mp::ServerVatId().vat_id).castAs<gen::FooInterface>(),
+            connection_client.get(), /* destroy_connection= */ true);
+        (void)connection_client.release();
+        foo_promise.set_value(std::move(foo_client));
+
+        auto connection_server = std::make_unique<mp::Connection>(loop, kj::mv(pipe.ends[1]), [&](mp::Connection& connection) {
+            auto foo_server = kj::heap<mp::ProxyServer<gen::FooInterface>>(std::make_shared<FooImplementation>(), connection);
+            return capnp::Capability::Client(kj::mv(foo_server));
+        });
+        connection_server->onDisconnect([&] { connection_server.reset(); });
+        loop.loop();
+    });
+    std::unique_ptr<mp::ProxyClient<gen::FooInterface>> foo{foo_promise.get_future().get()};
+
+    // Test: make sure arguments were sent and return value is received
+    BOOST_CHECK_EQUAL(foo->add(1, 2), 3);
+
+    COutPoint txout1{Txid::FromUint256(uint256{100}), 200};
+    COutPoint txout2{foo->passOutPoint(txout1)};
+    BOOST_CHECK(txout1 == txout2);
+
+    UniValue uni1{UniValue::VOBJ};
+    uni1.pushKV("i", 1);
+    uni1.pushKV("s", "two");
+    UniValue uni2{foo->passUniValue(uni1)};
+    BOOST_CHECK_EQUAL(uni1.write(), uni2.write());
+
+    CMutableTransaction mtx;
+    mtx.version = 2;
+    mtx.nLockTime = 3;
+    mtx.vin.emplace_back(txout1);
+    mtx.vout.emplace_back(COIN, CScript());
+    CTransactionRef tx1{MakeTransactionRef(mtx)};
+    CTransactionRef tx2{foo->passTransaction(tx1)};
+    BOOST_CHECK(*Assert(tx1) == *Assert(tx2));
+
+    std::vector<CTransactionRef> txs1;
+    txs1.push_back(tx1);
+    txs1.push_back(nullptr);
+    std::vector<CTransactionRef> txs2(foo->passTransactions(txs1));
+    BOOST_CHECK_EQUAL(txs2.size(), 2);
+    BOOST_CHECK(*Assert(txs1[0]) == *Assert(txs2[0]));
+    BOOST_CHECK(!txs2[1]);
+
+    std::vector<char> vec1{'H', 'e', 'l', 'l', 'o'};
+    std::vector<char> vec2{foo->passVectorChar(vec1)};
+    BOOST_CHECK_EQUAL(std::string_view(vec1.begin(), vec1.end()), std::string_view(vec2.begin(), vec2.end()));
+
+    auto script1{CScript() << OP_11};
+    auto script2{foo->passScript(script1)};
+    BOOST_CHECK_EQUAL(HexStr(script1), HexStr(script2));
+
+    // Test cleanup: disconnect and join thread
+    foo.reset();
+    thread.join();
+}
+
+//! Test ipc::Protocol connect() and serve() methods connecting over a socketpair.
+void IpcSocketPairTest()
+{
+    std::unique_ptr<interfaces::Init> init{std::make_unique<TestInit>()};
+    std::unique_ptr<ipc::Protocol> protocol{ipc::capnp::MakeCapnpProtocol("IpcSocketPairTest")};
+    mp::Stream client_stream;
+    std::promise<void> promise;
+    std::thread thread([&]() {
+        protocol->serve(*init, [&] {
+            auto pair{mp::SocketPair()};
+            client_stream = protocol->makeStream(pair[0]);
+            promise.set_value();
+            return protocol->makeStream(pair[1]);
+        });
+    });
+    promise.get_future().wait();
+    std::unique_ptr<interfaces::Init> remote_init{protocol->connect(std::move(client_stream))};
+    std::unique_ptr<interfaces::Echo> remote_echo{remote_init->makeEcho()};
+    BOOST_CHECK_EQUAL(remote_echo->echo("echo test"), "echo test");
+    remote_echo.reset();
+    remote_init.reset();
+    thread.join();
+}
+
+//! Test ipc::Process bind() and connect() methods connecting over a unix socket.
+void IpcSocketTest(const fs::path& datadir)
+{
+    std::unique_ptr<interfaces::Init> init{std::make_unique<TestInit>()};
+    std::unique_ptr<ipc::Protocol> protocol{ipc::capnp::MakeCapnpProtocol("IpcSocketTest")};
+    std::unique_ptr<ipc::Process> process{ipc::MakeProcess()};
+
+    std::string invalid_bind{"invalid:"};
+    BOOST_CHECK_THROW(process->bind(datadir, "test_bitcoin", invalid_bind), std::invalid_argument);
+    BOOST_CHECK_THROW(process->connect(datadir, "test_bitcoin", invalid_bind), std::invalid_argument);
+
+    auto bind_and_listen{[&](const std::string& bind_address) {
+        std::string address{bind_address};
+        mp::SocketId serve_fd = process->bind(datadir, "test_bitcoin", address);
+        BOOST_CHECK_NE(serve_fd, mp::SocketError);
+        BOOST_CHECK_EQUAL(address, bind_address);
+        protocol->listen(serve_fd, *init);
+    }};
+
+    auto connect_and_test{[&](const std::string& connect_address) {
+        std::string address{connect_address};
+        mp::SocketId connect_fd{process->connect(datadir, "test_bitcoin", address)};
+        BOOST_CHECK_EQUAL(address, connect_address);
+        std::unique_ptr<interfaces::Init> remote_init{protocol->connect(protocol->makeStream(connect_fd))};
+        std::unique_ptr<interfaces::Echo> remote_echo{remote_init->makeEcho()};
+        BOOST_CHECK_EQUAL(remote_echo->echo("echo test"), "echo test");
+    }};
+
+    // Need to specify explicit socket addresses outside the data directory, because the data
+    // directory path is so long that the default socket address and any other
+    // addresses in the data directory would fail with errors like:
+    //   Address 'unix' path '"/tmp/test_common_Bitcoin Core/ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff/test_bitcoin.sock"' exceeded maximum socket path length
+    std::vector<std::string> addresses{
+        strprintf("unix:%s", TempPath("bitcoin_sock0_XXXXXX")),
+        strprintf("unix:%s", TempPath("bitcoin_sock1_XXXXXX")),
+    };
+
+    // Bind and listen on multiple addresses
+    for (const auto& address : addresses) {
+        bind_and_listen(address);
+    }
+
+    // Connect and test each address multiple times.
+    for (int i : {0, 1, 0, 0, 1}) {
+        connect_and_test(addresses[i]);
+    }
+}
+
 BOOST_FIXTURE_TEST_SUITE(ipc_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(ipc_tests)
 {
@@ -31,12 +220,13 @@ BOOST_AUTO_TEST_CASE(parse_address_test)
         }
         BOOST_CHECK_EQUAL(address, expect_address);
     }};
-    check_address("unix", "unix:/var/empty/notexist/test_bitcoin.sock", "");
-    check_address("unix:", "unix:/var/empty/notexist/test_bitcoin.sock", "");
-    check_address("unix:path.sock", "unix:/var/empty/notexist/path.sock", "");
+    std::string prefix{fs::PathToString(datadir / "")};
+    check_address("unix", "unix:" + prefix + "test_bitcoin.sock", "");
+    check_address("unix:", "unix:" + prefix + "test_bitcoin.sock", "");
+    check_address("unix:path.sock", "unix:" + prefix + "path.sock", "");
     check_address("unix:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.sock",
-                  "unix:/var/empty/notexist/0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.sock",
-                  "Unix address path \"/var/empty/notexist/0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.sock\" exceeded maximum socket path length");
+                  "unix:" + prefix + "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.sock",
+                  "Unix address path \"" + prefix + "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.sock\" exceeded maximum socket path length");
     check_address("invalid", "invalid", "Unrecognized address 'invalid'");
 }
 
diff --git a/depend/bitcoin/src/ipc/util.h b/depend/bitcoin/src/ipc/util.h
new file mode 100644
index 00000000..03ce1534
--- /dev/null
+++ b/depend/bitcoin/src/ipc/util.h
@@ -0,0 +1,64 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_IPC_UTIL_H
+#define BITCOIN_IPC_UTIL_H
+
+#include <tinyformat.h>
+#include <util/strencodings.h>
+
+#include <array>
+#include <cstdint>
+#include <functional>
+#include <kj/debug.h>
+#include <mp/proxy-io.h>
+#include <mp/util.h>
+#include <mp/version.h>
+#include <sys/socket.h>
+
+namespace mp {
+// Definitions that can be deleted when libmultiprocess subtree is updated to
+// v14. Having these allows Bitcoin Core changes to be decoupled from
+// libmultiprocess changes so they don't have to be reviewed in a single PR.
+#if MP_MAJOR_VERSION < 14
+class EventLoop;
+using ProcessId = int;
+using SocketId = int;
+inline constexpr SocketId SocketError{-1};
+
+using Stream = SocketId;
+inline Stream MakeStream(EventLoop&, SocketId socket)
+{
+    return socket;
+}
+
+inline std::array<SocketId, 2> SocketPair()
+{
+    int pair[2];
+    KJ_SYSCALL(socketpair(AF_UNIX, SOCK_STREAM, 0, pair));
+    return {pair[0], pair[1]};
+}
+
+inline std::tuple<ProcessId, SocketId> SpawnProcess(const std::function<std::vector<std::string>(std::string)>& spawn_argv)
+{
+    ProcessId pid;
+    SocketId socket = SpawnProcess(pid, [&](int fd) { return spawn_argv(strprintf("%d", fd)); });
+    return {pid, socket};
+}
+
+inline SocketId StartSpawned(const std::string& connect_info)
+{
+    auto socket = ToIntegral<SocketId>(connect_info);
+    if (!socket) throw std::invalid_argument(strprintf("Invalid socket descriptor '%s'", connect_info));
+    return *socket;
+}
+
+inline ThreadContext& CurrentThread()
+{
+    return g_thread_context;
+}
+#endif
+} // namespace mp
+
+#endif // BITCOIN_IPC_UTIL_H
diff --git a/depend/bitcoin/src/kernel/CMakeLists.txt b/depend/bitcoin/src/kernel/CMakeLists.txt
index 541f10b3..d2a467f6 100644
--- a/depend/bitcoin/src/kernel/CMakeLists.txt
+++ b/depend/bitcoin/src/kernel/CMakeLists.txt
@@ -61,6 +61,7 @@ add_library(bitcoinkernel
   ../uint256.cpp
   ../util/chaintype.cpp
   ../util/check.cpp
+  ../util/exception.cpp
   ../util/expected.cpp
   ../util/feefrac.cpp
   ../util/fs.cpp
@@ -70,6 +71,7 @@ add_library(bitcoinkernel
   ../util/rbf.cpp
   ../util/signalinterrupt.cpp
   ../util/syserror.cpp
+  ../util/thread.cpp
   ../util/threadnames.cpp
   ../util/time.cpp
   ../util/tokenpipe.cpp
diff --git a/depend/bitcoin/src/kernel/bitcoinkernel.cpp b/depend/bitcoin/src/kernel/bitcoinkernel.cpp
index f21ea041..4c73fdc0 100644
--- a/depend/bitcoin/src/kernel/bitcoinkernel.cpp
+++ b/depend/bitcoin/src/kernel/bitcoinkernel.cpp
@@ -8,6 +8,7 @@
 
 #include <chain.h>
 #include <coins.h>
+#include <consensus/tx_check.h>
 #include <consensus/validation.h>
 #include <dbwrapper.h>
 #include <kernel/caches.h>
@@ -23,6 +24,7 @@
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/verify_flags.h>
 #include <serialize.h>
 #include <streams.h>
 #include <sync.h>
@@ -33,6 +35,7 @@
 #include <util/result.h>
 #include <util/signalinterrupt.h>
 #include <util/task_runner.h>
+#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <validationinterface.h>
@@ -41,8 +44,10 @@
 #include <cstring>
 #include <exception>
 #include <functional>
+#include <limits>
 #include <list>
 #include <memory>
+#include <optional>
 #include <span>
 #include <stdexcept>
 #include <string>
@@ -146,6 +151,7 @@ struct Handle {
 struct btck_BlockTreeEntry: Handle<btck_BlockTreeEntry, CBlockIndex> {};
 struct btck_Block : Handle<btck_Block, std::shared_ptr<const CBlock>> {};
 struct btck_BlockValidationState : Handle<btck_BlockValidationState, BlockValidationState> {};
+struct btck_TxValidationState : Handle<btck_TxValidationState, TxValidationState> {};
 
 namespace {
 
@@ -451,6 +457,7 @@ struct ChainstateManagerOptions {
     node::BlockManager::Options m_blockman_options GUARDED_BY(m_mutex);
     std::shared_ptr<const Context> m_context;
     node::ChainstateLoadOptions m_chainstate_load_options GUARDED_BY(m_mutex);
+    uint64_t m_db_cache_bytes GUARDED_BY(m_mutex){DEFAULT_KERNEL_CACHE};
 
     ChainstateManagerOptions(const std::shared_ptr<const Context>& context, const fs::path& data_dir, const fs::path& blocks_dir)
         : m_chainman_options{ChainstateManager::Options{
@@ -496,6 +503,7 @@ struct btck_TransactionSpentOutputs : Handle<btck_TransactionSpentOutputs, CTxUn
 struct btck_Coin : Handle<btck_Coin, Coin> {};
 struct btck_BlockHash : Handle<btck_BlockHash, uint256> {};
 struct btck_TransactionInput : Handle<btck_TransactionInput, CTxIn> {};
+struct btck_WitnessStack : Handle<btck_WitnessStack, CScriptWitness> {};
 struct btck_TransactionOutPoint: Handle<btck_TransactionOutPoint, COutPoint> {};
 struct btck_Txid: Handle<btck_Txid, Txid> {};
 struct btck_PrecomputedTransactionData : Handle<btck_PrecomputedTransactionData, PrecomputedTransactionData> {};
@@ -504,9 +512,7 @@ struct btck_ConsensusParams: Handle<btck_ConsensusParams, Consensus::Params> {};
 
 btck_Transaction* btck_transaction_create(const void* raw_transaction, size_t raw_transaction_len)
 {
-    if (raw_transaction == nullptr && raw_transaction_len != 0) {
-        return nullptr;
-    }
+    assert(raw_transaction != nullptr || raw_transaction_len == 0);
     try {
         SpanReader stream{std::span{reinterpret_cast<const std::byte*>(raw_transaction), raw_transaction_len}};
         return btck_Transaction::create(std::make_shared<const CTransaction>(deserialize, TX_WITH_WITNESS, stream));
@@ -571,9 +577,7 @@ void btck_transaction_destroy(btck_Transaction* transaction)
 
 btck_ScriptPubkey* btck_script_pubkey_create(const void* script_pubkey, size_t script_pubkey_len)
 {
-    if (script_pubkey == nullptr && script_pubkey_len != 0) {
-        return nullptr;
-    }
+    assert(script_pubkey != nullptr || script_pubkey_len == 0);
     auto data = std::span{reinterpret_cast<const uint8_t*>(script_pubkey), script_pubkey_len};
     return btck_ScriptPubkey::create(data.begin(), data.end());
 }
@@ -707,11 +711,44 @@ uint32_t btck_transaction_input_get_sequence(const btck_TransactionInput* input)
     return btck_TransactionInput::get(input).nSequence;
 }
 
+const btck_WitnessStack* btck_transaction_input_get_witness_stack(const btck_TransactionInput* input)
+{
+    return btck_WitnessStack::ref(&btck_TransactionInput::get(input).scriptWitness);
+}
+
+int btck_transaction_input_get_script_sig(const btck_TransactionInput* input, btck_WriteBytes writer, void* user_data)
+{
+    const auto& script_sig{btck_TransactionInput::get(input).scriptSig};
+    return writer(script_sig.data(), script_sig.size(), user_data);
+}
+
 void btck_transaction_input_destroy(btck_TransactionInput* input)
 {
     delete input;
 }
 
+size_t btck_witness_stack_count_items(const btck_WitnessStack* witness_stack)
+{
+    return btck_WitnessStack::get(witness_stack).stack.size();
+}
+
+int btck_witness_stack_get_item_at(const btck_WitnessStack* witness_stack, size_t index, btck_WriteBytes writer, void* user_data)
+{
+    const auto& stack{btck_WitnessStack::get(witness_stack).stack};
+    assert(index < stack.size());
+    return writer(stack[index].data(), stack[index].size(), user_data);
+}
+
+btck_WitnessStack* btck_witness_stack_copy(const btck_WitnessStack* witness_stack)
+{
+    return btck_WitnessStack::copy(witness_stack);
+}
+
+void btck_witness_stack_destroy(btck_WitnessStack* witness_stack)
+{
+    delete witness_stack;
+}
+
 btck_TransactionOutPoint* btck_transaction_out_point_copy(const btck_TransactionOutPoint* out_point)
 {
     return btck_TransactionOutPoint::copy(out_point);
@@ -814,15 +851,25 @@ btck_ChainParameters* btck_chain_parameters_create(const btck_ChainType chain_ty
         return btck_ChainParameters::ref(const_cast<CChainParams*>(CChainParams::TestNet4().release()));
     }
     case btck_ChainType_SIGNET: {
-        return btck_ChainParameters::ref(const_cast<CChainParams*>(CChainParams::SigNet({}).release()));
+        return btck_ChainParameters::ref(const_cast<CChainParams*>(CChainParams::SigNet().release()));
     }
     case btck_ChainType_REGTEST: {
-        return btck_ChainParameters::ref(const_cast<CChainParams*>(CChainParams::RegTest({}).release()));
+        return btck_ChainParameters::ref(const_cast<CChainParams*>(CChainParams::RegTest().release()));
     }
     }
     assert(false);
 }
 
+btck_ChainParameters* btck_chain_parameters_create_signet(const void* challenge, size_t challenge_len)
+{
+    assert(challenge != nullptr || challenge_len == 0);
+    const uint8_t* p = static_cast<const uint8_t*>(challenge);
+    CChainParams::SigNetOptions options{
+        .challenge = std::vector<uint8_t>{p, p + challenge_len},
+    };
+    return btck_ChainParameters::ref(const_cast<CChainParams*>(CChainParams::SigNet(options).release()));
+}
+
 btck_ChainParameters* btck_chain_parameters_copy(const btck_ChainParameters* chain_parameters)
 {
     return btck_ChainParameters::copy(chain_parameters);
@@ -963,7 +1010,9 @@ btck_BlockValidationResult btck_block_validation_state_get_block_validation_resu
 
 btck_ChainstateManagerOptions* btck_chainstate_manager_options_create(const btck_Context* context, const char* data_dir, size_t data_dir_len, const char* blocks_dir, size_t blocks_dir_len)
 {
-    if (data_dir == nullptr || data_dir_len == 0 || blocks_dir == nullptr || blocks_dir_len == 0) {
+    assert(data_dir != nullptr || data_dir_len == 0);
+    assert(blocks_dir != nullptr || blocks_dir_len == 0);
+    if (data_dir_len == 0 || blocks_dir_len == 0) {
         LogError("Failed to create chainstate manager options: dir must be non-null and non-empty");
         return nullptr;
     }
@@ -985,6 +1034,20 @@ void btck_chainstate_manager_options_set_worker_threads_num(btck_ChainstateManag
     btck_ChainstateManagerOptions::get(opts).m_chainman_options.worker_threads_num = worker_threads;
 }
 
+int btck_chainstate_manager_options_set_database_cache_bytes(btck_ChainstateManagerOptions* chainman_opts, uint64_t database_cache_bytes)
+{
+    if (database_cache_bytes < MIN_DBCACHE_BYTES || database_cache_bytes > MAX_DBCACHE_BYTES) {
+        LogError("Failed to set database cache: size is outside the supported range.");
+        return -1;
+    }
+
+    auto& opts{btck_ChainstateManagerOptions::get(chainman_opts)};
+    LOCK(opts.m_mutex);
+    opts.m_db_cache_bytes = database_cache_bytes;
+    opts.m_blockman_options.block_tree_db_params.cache_bytes = kernel::CacheSizes{database_cache_bytes}.block_tree_db;
+    return 0;
+}
+
 void btck_chainstate_manager_options_destroy(btck_ChainstateManagerOptions* options)
 {
     delete options;
@@ -1037,7 +1100,7 @@ btck_ChainstateManager* btck_chainstate_manager_create(
     try {
         const auto chainstate_load_opts{WITH_LOCK(opts.m_mutex, return opts.m_chainstate_load_options)};
 
-        kernel::CacheSizes cache_sizes{DEFAULT_KERNEL_CACHE};
+        const kernel::CacheSizes cache_sizes{WITH_LOCK(opts.m_mutex, return opts.m_db_cache_bytes)};
         auto [status, chainstate_err]{node::LoadChainstate(*chainman, cache_sizes, chainstate_load_opts)};
         if (status != node::ChainstateLoadStatus::SUCCESS) {
             LogError("Failed to load chain state from your data directory: %s", chainstate_err.original);
@@ -1114,9 +1177,7 @@ int btck_chainstate_manager_import_blocks(btck_ChainstateManager* chainman, cons
 
 btck_Block* btck_block_create(const void* raw_block, size_t raw_block_length)
 {
-    if (raw_block == nullptr && raw_block_length != 0) {
-        return nullptr;
-    }
+    assert(raw_block != nullptr || raw_block_length == 0);
     auto block{std::make_shared<CBlock>()};
 
     SpanReader stream{std::span{reinterpret_cast<const std::byte*>(raw_block), raw_block_length}};
@@ -1338,19 +1399,20 @@ int btck_chainstate_manager_process_block(
     return result ? 0 : -1;
 }
 
-int btck_chainstate_manager_process_block_header(
+btck_BlockValidationState* btck_chainstate_manager_process_block_header(
     btck_ChainstateManager* chainstate_manager,
-    const btck_BlockHeader* header,
-    btck_BlockValidationState* state)
+    const btck_BlockHeader* header)
 {
     try {
         auto& chainman = btck_ChainstateManager::get(chainstate_manager).m_chainman;
-        auto result = chainman->ProcessNewBlockHeaders({&btck_BlockHeader::get(header), 1}, /*min_pow_checked=*/true, btck_BlockValidationState::get(state), /*ppindex=*/nullptr);
 
-        return result ? 0 : -1;
+        auto state = btck_BlockValidationState::create();
+        bool result{chainman->ProcessNewBlockHeaders({&btck_BlockHeader::get(header), 1}, /*min_pow_checked=*/true, btck_BlockValidationState::get(state))};
+        assert(result == btck_BlockValidationState::get(state).IsValid());
+        return state;
     } catch (const std::exception& e) {
         LogError("Failed to process block header: %s", e.what());
-        return -1;
+        return nullptr;
     }
 }
 
@@ -1379,9 +1441,7 @@ int btck_chain_contains(const btck_Chain* chain, const btck_BlockTreeEntry* entr
 
 btck_BlockHeader* btck_block_header_create(const void* raw_block_header, size_t raw_block_header_len)
 {
-    if (raw_block_header == nullptr && raw_block_header_len != 0) {
-        return nullptr;
-    }
+    assert(raw_block_header != nullptr && raw_block_header_len == 80);
     auto header{std::make_unique<CBlockHeader>()};
     SpanReader stream{std::span{reinterpret_cast<const std::byte*>(raw_block_header), raw_block_header_len}};
 
@@ -1444,3 +1504,59 @@ void btck_block_header_destroy(btck_BlockHeader* header)
 {
     delete header;
 }
+
+btck_ValidationMode btck_tx_validation_state_get_validation_mode(const btck_TxValidationState* state_)
+{
+    const auto& state = btck_TxValidationState::get(state_);
+    if (state.IsValid()) return btck_ValidationMode_VALID;
+    if (state.IsInvalid()) return btck_ValidationMode_INVALID;
+    return btck_ValidationMode_INTERNAL_ERROR;
+}
+
+btck_TxValidationState* btck_tx_validation_state_create()
+{
+    return btck_TxValidationState::create();
+}
+
+btck_TxValidationResult btck_tx_validation_state_get_tx_validation_result(const btck_TxValidationState* state_)
+{
+    switch (btck_TxValidationState::get(state_).GetResult()) {
+    case TxValidationResult::TX_RESULT_UNSET:        return btck_TxValidationResult_UNSET;
+    case TxValidationResult::TX_CONSENSUS:           return btck_TxValidationResult_CONSENSUS;
+    case TxValidationResult::TX_INPUTS_NOT_STANDARD: return btck_TxValidationResult_INPUTS_NOT_STANDARD;
+    case TxValidationResult::TX_NOT_STANDARD:        return btck_TxValidationResult_NOT_STANDARD;
+    case TxValidationResult::TX_MISSING_INPUTS:      return btck_TxValidationResult_MISSING_INPUTS;
+    case TxValidationResult::TX_PREMATURE_SPEND:     return btck_TxValidationResult_PREMATURE_SPEND;
+    case TxValidationResult::TX_WITNESS_MUTATED:     return btck_TxValidationResult_WITNESS_MUTATED;
+    case TxValidationResult::TX_WITNESS_STRIPPED:    return btck_TxValidationResult_WITNESS_STRIPPED;
+    case TxValidationResult::TX_CONFLICT:            return btck_TxValidationResult_CONFLICT;
+    case TxValidationResult::TX_MEMPOOL_POLICY:      return btck_TxValidationResult_MEMPOOL_POLICY;
+    case TxValidationResult::TX_NO_MEMPOOL:          return btck_TxValidationResult_NO_MEMPOOL;
+    case TxValidationResult::TX_RECONSIDERABLE:      return btck_TxValidationResult_RECONSIDERABLE;
+    case TxValidationResult::TX_UNKNOWN:             return btck_TxValidationResult_UNKNOWN;
+    } // no default case, so the compiler can warn about missing cases
+    assert(false);
+}
+
+void btck_tx_validation_state_destroy(btck_TxValidationState* state)
+{
+    delete state;
+}
+
+int btck_transaction_check(const btck_Transaction* tx, btck_TxValidationState* validation_state)
+{
+    auto& state = btck_TxValidationState::get(validation_state);
+    state = TxValidationState{};
+    const bool ok = CheckTransaction(*btck_Transaction::get(tx), state);
+    return ok ? 1 : 0;
+}
+
+int btck_set_mock_time(int64_t timestamp)
+{
+    constexpr int64_t max_time{std::numeric_limits<uint32_t>::max()};
+    if (timestamp < 0 || timestamp > max_time) {
+        return -1;
+    }
+    SetMockTime(std::chrono::seconds{timestamp});
+    return 0;
+}
diff --git a/depend/bitcoin/src/kernel/bitcoinkernel.h b/depend/bitcoin/src/kernel/bitcoinkernel.h
index d3028729..066f2d58 100644
--- a/depend/bitcoin/src/kernel/bitcoinkernel.h
+++ b/depend/bitcoin/src/kernel/bitcoinkernel.h
@@ -29,7 +29,15 @@
     #endif
 #endif
 
-/* Warning attributes */
+/**
+ * BITCOINKERNEL_WARN_UNUSED_RESULT is a compiler attribute used to indicate
+ * that ignoring a function's return value is almost certainly a bug.
+ *
+ * It is used in cases such as a resource leak (e.g. an owning handle returned
+ * by a *_create or *_copy function), or when the returned value is itself an
+ * error/status code. It is not used merely because discarding the result is
+ * wasteful, e.g. on getters or predicates.
+ */
 #if defined(__GNUC__)
     #define BITCOINKERNEL_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
 #else
@@ -242,6 +250,14 @@ typedef struct btck_ConsensusParams btck_ConsensusParams;
  */
 typedef struct btck_Chain btck_Chain;
 
+/**
+ * Opaque data structure for holding the state of a transaction during validation.
+ *
+ * Contains information indicating whether validation was successful, and if not
+ * which step during transaction validation failed.
+ */
+typedef struct btck_TxValidationState btck_TxValidationState;
+
 /**
  * Opaque data structure for holding a block's spent outputs.
  *
@@ -282,10 +298,17 @@ typedef struct btck_BlockHash btck_BlockHash;
 /**
  * Opaque data structure for holding a transaction input.
  *
- * Holds information on the @ref btck_TransactionOutPoint held within.
+ * Holds information on the @ref btck_TransactionOutPoint, @ref btck_WitnessStack and script_sig held within.
  */
 typedef struct btck_TransactionInput btck_TransactionInput;
 
+/**
+ * Opaque data structure for holding a witness stack.
+ *
+ * Holds a sequence of witness stack items.
+ */
+typedef struct btck_WitnessStack btck_WitnessStack;
+
 /**
  * Opaque data structure for holding a transaction out point.
  *
@@ -388,6 +411,25 @@ typedef uint32_t btck_BlockValidationResult;
 #define btck_BlockValidationResult_TIME_FUTURE ((btck_BlockValidationResult)(7))     //!< block timestamp was > 2 hours in the future (or our clock is bad)
 #define btck_BlockValidationResult_HEADER_LOW_WORK ((btck_BlockValidationResult)(8)) //!< the block header may be on a too-little-work chain
 
+/**
+ * Indicates the reason why a transaction failed validation. The subset of
+ * values reachable depends on which validation function was used.
+ */
+typedef uint32_t btck_TxValidationResult;
+#define btck_TxValidationResult_UNSET               ((btck_TxValidationResult)(0))  //!< initial value. Tx has not yet been rejected
+#define btck_TxValidationResult_CONSENSUS           ((btck_TxValidationResult)(1))  //!< invalid by consensus rules
+#define btck_TxValidationResult_INPUTS_NOT_STANDARD ((btck_TxValidationResult)(2))  //!< inputs (covered by txid) failed policy rules
+#define btck_TxValidationResult_NOT_STANDARD        ((btck_TxValidationResult)(3))  //!< otherwise didn't meet local policy rules
+#define btck_TxValidationResult_MISSING_INPUTS      ((btck_TxValidationResult)(4))  //!< transaction was missing some of its inputs
+#define btck_TxValidationResult_PREMATURE_SPEND     ((btck_TxValidationResult)(5))  //!< transaction spends a coinbase too early, or violates locktime/sequence locks
+#define btck_TxValidationResult_WITNESS_MUTATED     ((btck_TxValidationResult)(6))  //!< witness may have been malleated or is prior to SegWit activation
+#define btck_TxValidationResult_WITNESS_STRIPPED    ((btck_TxValidationResult)(7))  //!< transaction is missing a witness
+#define btck_TxValidationResult_CONFLICT            ((btck_TxValidationResult)(8))  //!< tx already in mempool or conflicts with a tx in the chain
+#define btck_TxValidationResult_MEMPOOL_POLICY      ((btck_TxValidationResult)(9))  //!< violated mempool's fee/size/descendant/RBF/etc limits
+#define btck_TxValidationResult_NO_MEMPOOL          ((btck_TxValidationResult)(10)) //!< this node does not have a mempool so can't validate the transaction
+#define btck_TxValidationResult_RECONSIDERABLE      ((btck_TxValidationResult)(11)) //!< fails some policy, but might be acceptable if submitted in a (different) package
+#define btck_TxValidationResult_UNKNOWN             ((btck_TxValidationResult)(12)) //!< transaction was not validated because package failed
+
 /**
  * Holds the validation interface callbacks. The user data pointer may be used
  * to point to user-defined structures to make processing the validation
@@ -505,6 +547,40 @@ typedef uint8_t btck_ChainType;
 #define btck_ChainType_SIGNET ((btck_ChainType)(3))
 #define btck_ChainType_REGTEST ((btck_ChainType)(4))
 
+/** @name TxValidationState
+ *  Introspection for transaction validation state.
+ */
+///@{
+
+/**
+ * Create a new btck_TxValidationState.
+ */
+BITCOINKERNEL_API btck_TxValidationState* BITCOINKERNEL_WARN_UNUSED_RESULT btck_tx_validation_state_create();
+
+/**
+ * Returns the validation mode from an opaque btck_TxValidationState pointer.
+ */
+BITCOINKERNEL_API btck_ValidationMode btck_tx_validation_state_get_validation_mode(
+    const btck_TxValidationState* state) BITCOINKERNEL_ARG_NONNULL(1);
+
+/**
+ * Returns the validation result from an opaque btck_TxValidationState pointer.
+ *
+ * btck_transaction_check currently produces only btck_TxValidationResult_UNSET
+ * for valid transactions and btck_TxValidationResult_CONSENSUS for invalid
+ * ones. Other values remain exposed for forward compatibility with higher-level
+ * validation entry points.
+ */
+BITCOINKERNEL_API btck_TxValidationResult btck_tx_validation_state_get_tx_validation_result(
+    const btck_TxValidationState* state) BITCOINKERNEL_ARG_NONNULL(1);
+
+/**
+ * Destroy the btck_TxValidationState.
+ */
+BITCOINKERNEL_API void btck_tx_validation_state_destroy(btck_TxValidationState* state);
+
+///@}
+
 /** @name Transaction
  * Functions for working with transactions.
  */
@@ -540,7 +616,7 @@ BITCOINKERNEL_API btck_Transaction* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transa
  *                        passed back through the writer callback.
  * @return                0 on success.
  */
-BITCOINKERNEL_API int btck_transaction_to_bytes(
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_to_bytes(
     const btck_Transaction* transaction,
     btck_WriteBytes writer,
     void* user_data) BITCOINKERNEL_ARG_NONNULL(1, 2);
@@ -551,7 +627,7 @@ BITCOINKERNEL_API int btck_transaction_to_bytes(
  * @param[in] transaction Non-null.
  * @return                The number of outputs.
  */
-BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_count_outputs(
+BITCOINKERNEL_API size_t btck_transaction_count_outputs(
     const btck_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -563,7 +639,7 @@ BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_count
  * @param[in] output_index The index of the transaction output to be retrieved.
  * @return                 The transaction output
  */
-BITCOINKERNEL_API const btck_TransactionOutput* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_get_output_at(
+BITCOINKERNEL_API const btck_TransactionOutput* btck_transaction_get_output_at(
     const btck_Transaction* transaction, size_t output_index) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -575,7 +651,7 @@ BITCOINKERNEL_API const btck_TransactionOutput* BITCOINKERNEL_WARN_UNUSED_RESULT
  * @param[in] input_index The index of the transaction input to be retrieved.
  * @return                 The transaction input
  */
-BITCOINKERNEL_API const btck_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_get_input_at(
+BITCOINKERNEL_API const btck_TransactionInput* btck_transaction_get_input_at(
     const btck_Transaction* transaction, size_t input_index) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -584,7 +660,7 @@ BITCOINKERNEL_API const btck_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT
  * @param[in] transaction Non-null.
  * @return                The number of inputs.
  */
-BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_count_inputs(
+BITCOINKERNEL_API size_t btck_transaction_count_inputs(
     const btck_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -593,7 +669,7 @@ BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_count
  * @param[in] transaction Non-null.
  * @return                The nLockTime value.
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_get_locktime(
+BITCOINKERNEL_API uint32_t btck_transaction_get_locktime(
     const btck_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -603,9 +679,29 @@ BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_get
  * @param[in] transaction Non-null.
  * @return                The txid.
  */
-BITCOINKERNEL_API const btck_Txid* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_get_txid(
+BITCOINKERNEL_API const btck_Txid* btck_transaction_get_txid(
     const btck_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Run context-free consensus validation on a btck_Transaction.
+ *
+ * Performs basic structural consensus checks (consensus/tx_check::CheckTransaction)
+ * without requiring blockchain state.
+ *
+ * @param[in]  tx               Non-null, the transaction to validate.
+ * @param[out] validation_state Non-null, previously created with
+ *                              btck_tx_validation_state_create.
+ *                              Overwritten in-place with the validation
+ *                              result.
+ * @return                      1 if valid, 0 if invalid.
+ * @note                        Only btck_TxValidationResult_UNSET and
+ *                              btck_TxValidationResult_CONSENSUS are
+ *                              reachable via this function.
+ */
+BITCOINKERNEL_API int btck_transaction_check(
+    const btck_Transaction* tx,
+    btck_TxValidationState* validation_state) BITCOINKERNEL_ARG_NONNULL(1, 2);
+
 /**
  * Destroy the transaction.
  */
@@ -706,7 +802,7 @@ BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_script_pubkey_verify
  *                          passed back through the writer callback.
  * @return                  0 on success.
  */
-BITCOINKERNEL_API int btck_script_pubkey_to_bytes(
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_script_pubkey_to_bytes(
     const btck_ScriptPubkey* script_pubkey,
     btck_WriteBytes writer,
     void* user_data) BITCOINKERNEL_ARG_NONNULL(1, 2);
@@ -742,7 +838,7 @@ BITCOINKERNEL_API btck_TransactionOutput* BITCOINKERNEL_WARN_UNUSED_RESULT btck_
  * @param[in] transaction_output Non-null.
  * @return                       The script pubkey.
  */
-BITCOINKERNEL_API const btck_ScriptPubkey* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_output_get_script_pubkey(
+BITCOINKERNEL_API const btck_ScriptPubkey* btck_transaction_output_get_script_pubkey(
     const btck_TransactionOutput* transaction_output) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -751,7 +847,7 @@ BITCOINKERNEL_API const btck_ScriptPubkey* BITCOINKERNEL_WARN_UNUSED_RESULT btck
  * @param[in] transaction_output Non-null.
  * @return                       The amount.
  */
-BITCOINKERNEL_API int64_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_output_get_amount(
+BITCOINKERNEL_API int64_t btck_transaction_output_get_amount(
     const btck_TransactionOutput* transaction_output) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -869,6 +965,18 @@ BITCOINKERNEL_API void btck_logging_connection_destroy(btck_LoggingConnection* l
 BITCOINKERNEL_API btck_ChainParameters* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_parameters_create(
     btck_ChainType chain_type);
 
+/**
+ * @brief Create a signet chain parameters struct with a user-provided
+ * challenge.
+ *
+ * @param[in] challenge     The signet challenge value. Blocks must satisfy it in
+ *                          order to be valid.
+ * @param[in] challenge_len The length of the signet challenge.
+ * @return                  An allocated chain parameters opaque struct.
+ */
+BITCOINKERNEL_API btck_ChainParameters* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_parameters_create_signet(
+    const void* challenge, size_t challenge_len);
+
 /**
  * Copy the chain parameters.
  */
@@ -883,7 +991,7 @@ BITCOINKERNEL_API btck_ChainParameters* BITCOINKERNEL_WARN_UNUSED_RESULT btck_ch
  * @param[in] chain_parameters  Non-null.
  * @return                      The btck_ConsensusParams.
  */
-BITCOINKERNEL_API const btck_ConsensusParams* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_parameters_get_consensus_params(
+BITCOINKERNEL_API const btck_ConsensusParams* btck_chain_parameters_get_consensus_params(
     const btck_ChainParameters* chain_parameters) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -998,7 +1106,7 @@ BITCOINKERNEL_API void btck_context_destroy(btck_Context* context);
  * @param[in] block_tree_entry Non-null.
  * @return                     The previous block tree entry, or null on error or if the current block tree entry is the genesis block.
  */
-BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_get_previous(
+BITCOINKERNEL_API const btck_BlockTreeEntry* btck_block_tree_entry_get_previous(
     const btck_BlockTreeEntry* block_tree_entry) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1016,7 +1124,7 @@ BITCOINKERNEL_API btck_BlockHeader* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_
  * @param[in] block_tree_entry Non-null.
  * @return                     The block height.
  */
-BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_get_height(
+BITCOINKERNEL_API int32_t btck_block_tree_entry_get_height(
     const btck_BlockTreeEntry* block_tree_entry) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1025,7 +1133,7 @@ BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry
  * @param[in] block_tree_entry Non-null.
  * @return                     The block hash.
  */
-BITCOINKERNEL_API const btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_get_block_hash(
+BITCOINKERNEL_API const btck_BlockHash* btck_block_tree_entry_get_block_hash(
     const btck_BlockTreeEntry* block_tree_entry) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1036,7 +1144,7 @@ BITCOINKERNEL_API const btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_bl
  * @param[in] entry2 Non-null.
  * @return           1 if the block tree entries are equal, 0 otherwise.
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_equals(
+BITCOINKERNEL_API int btck_block_tree_entry_equals(
     const btck_BlockTreeEntry* entry1, const btck_BlockTreeEntry* entry2) BITCOINKERNEL_ARG_NONNULL(1, 2);
 
 /**
@@ -1046,7 +1154,7 @@ BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_equ
  * @param[in] height           The height of the requested ancestor.
  * @return                     The ancestor at the given height.
  */
-BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_get_ancestor(
+BITCOINKERNEL_API const btck_BlockTreeEntry* btck_block_tree_entry_get_ancestor(
     const btck_BlockTreeEntry* block_tree_entry,
     int32_t height) BITCOINKERNEL_ARG_NONNULL(1);
 
@@ -1062,12 +1170,11 @@ BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT bt
  *
  * @param[in] context          Non-null, the created options and through it the chainstate manager will
  *                             associate with this kernel context for the duration of their lifetimes.
- * @param[in] data_directory   Non-null, non-empty path string of the directory containing the
- *                             chainstate data. If the directory does not exist yet, it will be
- *                             created.
- * @param[in] blocks_directory Non-null, non-empty path string of the directory containing the block
- *                             data. If the directory does not exist yet, it will be created.
- * @return                     The allocated chainstate manager options, or null on error.
+ * @param[in] data_directory   Path string of the directory containing the chainstate data. If the directory
+ *                             does not exist yet, it will be created.
+ * @param[in] blocks_directory Path string of the directory containing the block data. If the directory
+ *                             does not exist yet, it will be created.
+ * @return                     The allocated chainstate manager options, or null on error (e.g. if a path is invalid).
  */
 BITCOINKERNEL_API btck_ChainstateManagerOptions* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_options_create(
     const btck_Context* context,
@@ -1088,6 +1195,22 @@ BITCOINKERNEL_API void btck_chainstate_manager_options_set_worker_threads_num(
     btck_ChainstateManagerOptions* chainstate_manager_options,
     int worker_threads) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Set the total database cache used by the chainstate manager.
+ *
+ * The total cache is split internally between the block tree database,
+ * chainstate database, and in-memory coins cache. If this function is not
+ * called, the total cache defaults to 450 MiB.
+ *
+ * @param[in] chainstate_manager_options Non-null, options to be set.
+ * @param[in] database_cache_bytes       The total database cache size in bytes. Values below 4 MiB are rejected.
+ *                                       On 32-bit systems, values above 1 GiB are also rejected.
+ * @return                               0 if the set was successful, non-zero if the set failed.
+ */
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_options_set_database_cache_bytes(
+    btck_ChainstateManagerOptions* chainstate_manager_options,
+    uint64_t database_cache_bytes) BITCOINKERNEL_ARG_NONNULL(1);
+
 /**
  * @brief Sets wipe db in the options. In combination with calling
  * @ref btck_chainstate_manager_import_blocks this triggers either a full reindex,
@@ -1097,6 +1220,8 @@ BITCOINKERNEL_API void btck_chainstate_manager_options_set_worker_threads_num(
  * @param[in] wipe_block_tree_db         Set wipe block tree db. Should only be 1 if wipe_chainstate_db is 1 too.
  * @param[in] wipe_chainstate_db         Set wipe chainstate db.
  * @return                               0 if the set was successful, non-zero if the set failed.
+ * @note                                 When a wipe is set, the caller must invoke @ref btck_chainstate_manager_import_blocks
+ *                                       on the resulting chainstate manager before using it for anything else.
  */
 BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_options_set_wipe_dbs(
     btck_ChainstateManagerOptions* chainstate_manager_options,
@@ -1151,9 +1276,9 @@ BITCOINKERNEL_API btck_ChainstateManager* BITCOINKERNEL_WARN_UNUSED_RESULT btck_
  * known cumulative proof of work.
  *
  * @param[in] chainstate_manager Non-null.
- * @return                       The btck_BlockTreeEntry.
+ * @return                       The btck_BlockTreeEntry, or null if no block headers have been loaded.
  */
-BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_get_best_entry(
+BITCOINKERNEL_API const btck_BlockTreeEntry* btck_chainstate_manager_get_best_entry(
     const btck_ChainstateManager* chainstate_manager) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1161,13 +1286,11 @@ BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT bt
  *
  * @param[in] chainstate_manager        Non-null.
  * @param[in] header                    Non-null btck_BlockHeader to be validated.
- * @param[out] block_validation_state   The result of the btck_BlockHeader validation.
- * @return                              0 if btck_BlockHeader processing completed successfully, non-zero on error.
+ * @return                              The btck_BlockValidationState containing validation result, or null on error.
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_process_block_header(
+BITCOINKERNEL_API btck_BlockValidationState* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_process_block_header(
     btck_ChainstateManager* chainstate_manager,
-    const btck_BlockHeader* header,
-    btck_BlockValidationState* block_validation_state) BITCOINKERNEL_ARG_NONNULL(1, 2, 3);
+    const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1, 2);
 
 /**
  * @brief Triggers the start of a reindex if the wipe options were previously
@@ -1221,7 +1344,7 @@ BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_p
  * @param[in] chainstate_manager Non-null.
  * @return                       The chain.
  */
-BITCOINKERNEL_API const btck_Chain* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_get_active_chain(
+BITCOINKERNEL_API const btck_Chain* btck_chainstate_manager_get_active_chain(
     const btck_ChainstateManager* chainstate_manager) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1232,7 +1355,7 @@ BITCOINKERNEL_API const btck_Chain* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chains
  * @return                       The block tree entry of the block with the passed in hash, or null if
  *                               the block hash is not found.
  */
-BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chainstate_manager_get_block_tree_entry_by_hash(
+BITCOINKERNEL_API const btck_BlockTreeEntry* btck_chainstate_manager_get_block_tree_entry_by_hash(
     const btck_ChainstateManager* chainstate_manager,
     const btck_BlockHash* block_hash) BITCOINKERNEL_ARG_NONNULL(1, 2);
 
@@ -1303,12 +1426,13 @@ typedef uint32_t btck_BlockCheckFlags;
  *                                  optional POW and merkle-root checks. Use
  *                                  btck_BlockCheckFlags_BASE to run only the base
  *                                  checks.
- * @param[in,out] validation_state  Non-null, previously created with
- *                                  btck_block_validation_state_create and updated
- *                                  in-place with the validation result.
+ * @param[out]    validation_state  Non-null, previously created with
+ *                                  btck_block_validation_state_create.
+ *                                  Overwritten in-place with the validation
+ *                                  result.
  * @return                          1 if the btck_Block passed the checks, 0 otherwise.
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_check(
+BITCOINKERNEL_API int btck_block_check(
     const btck_Block* block,
     const btck_ConsensusParams* consensus_params,
     btck_BlockCheckFlags flags,
@@ -1320,7 +1444,7 @@ BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_check(
  * @param[in] block Non-null.
  * @return          The number of transactions in the block.
  */
-BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_count_transactions(
+BITCOINKERNEL_API size_t btck_block_count_transactions(
     const btck_Block* block) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1331,7 +1455,7 @@ BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_count_trans
  * @param[in] transaction_index The index of the transaction to be retrieved.
  * @return                      The transaction.
  */
-BITCOINKERNEL_API const btck_Transaction* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_get_transaction_at(
+BITCOINKERNEL_API const btck_Transaction* btck_block_get_transaction_at(
     const btck_Block* block, size_t transaction_index) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1364,7 +1488,7 @@ BITCOINKERNEL_API btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_ge
  *                      passed back through the writer callback.
  * @return              0 on success.
  */
-BITCOINKERNEL_API int btck_block_to_bytes(
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_to_bytes(
     const btck_Block* block,
     btck_WriteBytes writer,
     void* user_data) BITCOINKERNEL_ARG_NONNULL(1, 2);
@@ -1426,7 +1550,7 @@ BITCOINKERNEL_API void btck_block_validation_state_destroy(
  * @param[in] chain Non-null.
  * @return          The current height.
  */
-BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_get_height(
+BITCOINKERNEL_API int32_t btck_chain_get_height(
     const btck_Chain* chain) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1438,7 +1562,7 @@ BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_get_height
  * @return                 The block tree entry at a certain height in the currently active chain, or null
  *                         if the height is out of bounds.
  */
-BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_get_by_height(
+BITCOINKERNEL_API const btck_BlockTreeEntry* btck_chain_get_by_height(
     const btck_Chain* chain,
     int32_t block_height) BITCOINKERNEL_ARG_NONNULL(1);
 
@@ -1450,7 +1574,7 @@ BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT bt
  * @return                     1 if the block_tree_entry is in the chain, 0 otherwise.
  *
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_contains(
+BITCOINKERNEL_API int btck_chain_contains(
     const btck_Chain* chain,
     const btck_BlockTreeEntry* block_tree_entry) BITCOINKERNEL_ARG_NONNULL(1, 2);
 
@@ -1489,7 +1613,7 @@ BITCOINKERNEL_API btck_BlockSpentOutputs* BITCOINKERNEL_WARN_UNUSED_RESULT btck_
  * @param[in] block_spent_outputs Non-null.
  * @return                        The number of transaction spent outputs data in the block spent outputs.
  */
-BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_spent_outputs_count(
+BITCOINKERNEL_API size_t btck_block_spent_outputs_count(
     const btck_BlockSpentOutputs* block_spent_outputs) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1501,7 +1625,7 @@ BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_spent_outpu
  * @param[in] transaction_spent_outputs_index The index of the transaction spent outputs within the block spent outputs.
  * @return                                    A transaction spent outputs pointer.
  */
-BITCOINKERNEL_API const btck_TransactionSpentOutputs* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_spent_outputs_get_transaction_spent_outputs_at(
+BITCOINKERNEL_API const btck_TransactionSpentOutputs* btck_block_spent_outputs_get_transaction_spent_outputs_at(
     const btck_BlockSpentOutputs* block_spent_outputs,
     size_t transaction_spent_outputs_index) BITCOINKERNEL_ARG_NONNULL(1);
 
@@ -1533,7 +1657,7 @@ BITCOINKERNEL_API btck_TransactionSpentOutputs* BITCOINKERNEL_WARN_UNUSED_RESULT
  * @param[in] transaction_spent_outputs Non-null
  * @return                              The number of spent transaction outputs for the transaction.
  */
-BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_spent_outputs_count(
+BITCOINKERNEL_API size_t btck_transaction_spent_outputs_count(
     const btck_TransactionSpentOutputs* transaction_spent_outputs) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1546,7 +1670,7 @@ BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_spent
  *                                      transaction spent outputs.
  * @return                              A coin pointer.
  */
-BITCOINKERNEL_API const btck_Coin* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_spent_outputs_get_coin_at(
+BITCOINKERNEL_API const btck_Coin* btck_transaction_spent_outputs_get_coin_at(
     const btck_TransactionSpentOutputs* transaction_spent_outputs,
     size_t coin_index) BITCOINKERNEL_ARG_NONNULL(1);
 
@@ -1578,7 +1702,7 @@ BITCOINKERNEL_API btck_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT btck_t
  * @param[in] transaction_input Non-null.
  * @return                      The transaction out point.
  */
-BITCOINKERNEL_API const btck_TransactionOutPoint* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_input_get_out_point(
+BITCOINKERNEL_API const btck_TransactionOutPoint* btck_transaction_input_get_out_point(
     const btck_TransactionInput* transaction_input) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1587,9 +1711,33 @@ BITCOINKERNEL_API const btck_TransactionOutPoint* BITCOINKERNEL_WARN_UNUSED_RESU
  * @param[in] transaction_input Non-null.
  * @return                      The nSequence value.
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_input_get_sequence(
+BITCOINKERNEL_API uint32_t btck_transaction_input_get_sequence(
+    const btck_TransactionInput* transaction_input) BITCOINKERNEL_ARG_NONNULL(1);
+
+/**
+ * @brief Get the witness stack of a transaction input. The returned witness
+ * stack is not owned and depends on the lifetime of the transaction input.
+ *
+ * @param[in] transaction_input Non-null.
+ * @return                      The witness stack.
+ */
+BITCOINKERNEL_API const btck_WitnessStack* btck_transaction_input_get_witness_stack(
     const btck_TransactionInput* transaction_input) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Serialize the script sig of a transaction input through the passed
+ * in callback.
+ *
+ * @param[in] transaction_input Non-null.
+ * @param[in] writer            Non-null, function pointer for writing bytes.
+ * @param[in] user_data         Nullable, passed back through the writer callback.
+ * @return                      The return value of the writer.
+ */
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_input_get_script_sig(
+    const btck_TransactionInput* transaction_input,
+    btck_WriteBytes writer,
+    void* user_data) BITCOINKERNEL_ARG_NONNULL(1, 2);
+
 /**
  * Destroy the transaction input.
  */
@@ -1597,6 +1745,53 @@ BITCOINKERNEL_API void btck_transaction_input_destroy(btck_TransactionInput* tra
 
 ///@}
 
+/** @name Witness Stack
+ * Functions for working with witness stacks.
+ */
+///@{
+
+/**
+ * @brief Return the number of items in a witness stack.
+ *
+ * @param[in] witness_stack Non-null.
+ * @return                  The number of witness stack items.
+ */
+BITCOINKERNEL_API size_t btck_witness_stack_count_items(
+    const btck_WitnessStack* witness_stack) BITCOINKERNEL_ARG_NONNULL(1);
+
+/**
+ * @brief Serialize a witness stack item at a given index through the passed in
+ * callback.
+ *
+ * @param[in] witness_stack Non-null.
+ * @param[in] index         Index of the item in the witness stack.
+ * @param[in] writer        Non-null, function pointer for writing bytes.
+ * @param[in] user_data     Nullable, passed back through the writer callback.
+ * @return                  The return value of the writer.
+ * @pre                    index < btck_witness_stack_count_items(witness_stack)
+ */
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_witness_stack_get_item_at(
+    const btck_WitnessStack* witness_stack,
+    size_t index,
+    btck_WriteBytes writer,
+    void* user_data) BITCOINKERNEL_ARG_NONNULL(1, 3);
+
+/**
+ * @brief Copy a witness stack.
+ *
+ * @param[in] witness_stack Non-null.
+ * @return                  The copied witness stack.
+ */
+BITCOINKERNEL_API btck_WitnessStack* BITCOINKERNEL_WARN_UNUSED_RESULT btck_witness_stack_copy(
+    const btck_WitnessStack* witness_stack) BITCOINKERNEL_ARG_NONNULL(1);
+
+/**
+ * Destroy the witness stack.
+ */
+BITCOINKERNEL_API void btck_witness_stack_destroy(btck_WitnessStack* witness_stack);
+
+///@}
+
 /** @name Transaction Out Point
  * Functions for working with transaction out points.
  */
@@ -1617,7 +1812,7 @@ BITCOINKERNEL_API btck_TransactionOutPoint* BITCOINKERNEL_WARN_UNUSED_RESULT btc
  * @param[in] transaction_out_point Non-null.
  * @return                          The output index.
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_out_point_get_index(
+BITCOINKERNEL_API uint32_t btck_transaction_out_point_get_index(
     const btck_TransactionOutPoint* transaction_out_point) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1627,7 +1822,7 @@ BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_out
  * @param[in] transaction_out_point Non-null.
  * @return                          The txid.
  */
-BITCOINKERNEL_API const btck_Txid* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_out_point_get_txid(
+BITCOINKERNEL_API const btck_Txid* btck_transaction_out_point_get_txid(
     const btck_TransactionOutPoint* transaction_out_point) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1658,7 +1853,7 @@ BITCOINKERNEL_API btck_Txid* BITCOINKERNEL_WARN_UNUSED_RESULT btck_txid_copy(
  * @param[in] txid2 Non-null.
  * @return          0 if the txid is not equal.
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_txid_equals(
+BITCOINKERNEL_API int btck_txid_equals(
     const btck_Txid* txid1, const btck_Txid* txid2) BITCOINKERNEL_ARG_NONNULL(1, 2);
 
 /**
@@ -1698,7 +1893,7 @@ BITCOINKERNEL_API btck_Coin* BITCOINKERNEL_WARN_UNUSED_RESULT btck_coin_copy(
  * @param[in] coin Non-null.
  * @return         The block height of the coin.
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_coin_confirmation_height(
+BITCOINKERNEL_API uint32_t btck_coin_confirmation_height(
     const btck_Coin* coin) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1707,7 +1902,7 @@ BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_coin_confirmati
  * @param[in] coin Non-null.
  * @return         1 if the coin is a coinbase coin, 0 otherwise.
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_coin_is_coinbase(
+BITCOINKERNEL_API int btck_coin_is_coinbase(
     const btck_Coin* coin) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1717,7 +1912,7 @@ BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_coin_is_coinbase(
  * @param[in] coin Non-null.
  * @return         A transaction output pointer.
  */
-BITCOINKERNEL_API const btck_TransactionOutput* BITCOINKERNEL_WARN_UNUSED_RESULT btck_coin_get_output(
+BITCOINKERNEL_API const btck_TransactionOutput* btck_coin_get_output(
     const btck_Coin* coin) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1745,7 +1940,7 @@ BITCOINKERNEL_API btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_ha
  * @param[in] hash2 Non-null.
  * @return          0 if the block hashes are not equal.
  */
-BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_hash_equals(
+BITCOINKERNEL_API int btck_block_hash_equals(
     const btck_BlockHash* hash1, const btck_BlockHash* hash2) BITCOINKERNEL_ARG_NONNULL(1, 2);
 
 /**
@@ -1787,7 +1982,7 @@ BITCOINKERNEL_API void btck_block_hash_destroy(btck_BlockHash* block_hash);
  * @return                          btck_BlockHeader, or null on error.
  */
 BITCOINKERNEL_API btck_BlockHeader* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_create(
-    const void* raw_block_header, size_t raw_block_header_len);
+    const void* raw_block_header, size_t raw_block_header_len) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
  * @brief Copy a btck_BlockHeader.
@@ -1814,7 +2009,7 @@ BITCOINKERNEL_API btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_he
  * @param[in] header    Non-null btck_BlockHeader
  * @return              Previous btck_BlockHash
  */
-BITCOINKERNEL_API const btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get_prev_hash(
+BITCOINKERNEL_API const btck_BlockHash* btck_block_header_get_prev_hash(
     const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1823,7 +2018,7 @@ BITCOINKERNEL_API const btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_bl
  * @param[in] header    Non-null btck_BlockHeader
  * @return              Block timestamp (Unix epoch seconds)
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get_timestamp(
+BITCOINKERNEL_API uint32_t btck_block_header_get_timestamp(
     const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1832,7 +2027,7 @@ BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_ge
  * @param[in] header    Non-null btck_BlockHeader
  * @return              Difficulty target (compact format)
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get_bits(
+BITCOINKERNEL_API uint32_t btck_block_header_get_bits(
     const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1841,7 +2036,7 @@ BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_ge
  * @param[in] header    Non-null btck_BlockHeader
  * @return              Block version
  */
-BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get_version(
+BITCOINKERNEL_API int32_t btck_block_header_get_version(
     const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1850,7 +2045,7 @@ BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get
  * @param[in] header    Non-null btck_BlockHeader
  * @return              Nonce
  */
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get_nonce(
+BITCOINKERNEL_API uint32_t btck_block_header_get_nonce(
     const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1);
 
 /**
@@ -1871,6 +2066,28 @@ BITCOINKERNEL_API void btck_block_header_destroy(btck_BlockHeader* header);
 
 ///@}
 
+/** @name Testing
+ * Functions intended for testing purposes only.
+ */
+///@{
+
+/**
+ * @brief Override the current time with a fixed timestamp for testing.
+ *
+ * Affects all kernel time reads globally. The caller is responsible
+ * for gating usage (e.g. restricting to regtest) if desired.
+ *
+ * The upper bound (4294967295) matches the maximum value of a block header
+ * timestamp.
+ *
+ * @param[in] timestamp Unix epoch seconds, or 0 to restore the system clock.
+ * @return              0 on success, non-zero if timestamp is outside the
+ *                      valid [0, 4294967295] range.
+ */
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_set_mock_time(int64_t timestamp);
+
+///@}
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff --git a/depend/bitcoin/src/kernel/bitcoinkernel_wrapper.h b/depend/bitcoin/src/kernel/bitcoinkernel_wrapper.h
index 2be5e223..b929bcc1 100644
--- a/depend/bitcoin/src/kernel/bitcoinkernel_wrapper.h
+++ b/depend/bitcoin/src/kernel/bitcoinkernel_wrapper.h
@@ -8,6 +8,7 @@
 #include <kernel/bitcoinkernel.h>
 
 #include <array>
+#include <chrono>
 #include <exception>
 #include <functional>
 #include <memory>
@@ -79,6 +80,22 @@ enum class BlockValidationResult : btck_BlockValidationResult {
     HEADER_LOW_WORK = btck_BlockValidationResult_HEADER_LOW_WORK
 };
 
+enum class TxValidationResult : btck_TxValidationResult {
+    UNSET               = btck_TxValidationResult_UNSET,
+    CONSENSUS           = btck_TxValidationResult_CONSENSUS,
+    INPUTS_NOT_STANDARD = btck_TxValidationResult_INPUTS_NOT_STANDARD,
+    NOT_STANDARD        = btck_TxValidationResult_NOT_STANDARD,
+    MISSING_INPUTS      = btck_TxValidationResult_MISSING_INPUTS,
+    PREMATURE_SPEND     = btck_TxValidationResult_PREMATURE_SPEND,
+    WITNESS_MUTATED     = btck_TxValidationResult_WITNESS_MUTATED,
+    WITNESS_STRIPPED    = btck_TxValidationResult_WITNESS_STRIPPED,
+    CONFLICT            = btck_TxValidationResult_CONFLICT,
+    MEMPOOL_POLICY      = btck_TxValidationResult_MEMPOOL_POLICY,
+    NO_MEMPOOL          = btck_TxValidationResult_NO_MEMPOOL,
+    RECONSIDERABLE      = btck_TxValidationResult_RECONSIDERABLE,
+    UNKNOWN             = btck_TxValidationResult_UNKNOWN
+};
+
 enum class ScriptVerifyStatus : btck_ScriptVerifyStatus {
     OK = btck_ScriptVerifyStatus_OK,
     ERROR_INVALID_FLAGS_COMBINATION = btck_ScriptVerifyStatus_ERROR_INVALID_FLAGS_COMBINATION,
@@ -173,7 +190,7 @@ T check(T ptr)
     return ptr;
 }
 
-template <typename Collection, typename ValueType>
+template <typename Collection, typename ValueType, auto GetFunc>
 class Iterator
 {
 public:
@@ -192,8 +209,7 @@ class Iterator
     Iterator(const Collection* ptr, size_t idx) : m_collection{ptr}, m_idx{idx} {}
 
     // This is just a view, so return a copy.
-    auto operator*() const { return (*m_collection)[m_idx]; }
-    auto operator->() const { return (*m_collection)[m_idx]; }
+    auto operator*() const { return std::invoke(GetFunc, *m_collection, m_idx); }
 
     auto& operator++() { m_idx++; return *this; }
     auto operator++(int) { Iterator tmp = *this; ++(*this); return tmp; }
@@ -209,7 +225,7 @@ class Iterator
 
     auto operator-(const Iterator& other) const { return static_cast<difference_type>(m_idx) - static_cast<difference_type>(other.m_idx); }
 
-    ValueType operator[](difference_type n) const { return (*m_collection)[m_idx + n]; }
+    ValueType operator[](difference_type n) const { return *(*this + n); }
 
     auto operator<=>(const Iterator& other) const { return m_idx <=> other.m_idx; }
 
@@ -232,7 +248,7 @@ class Range
 public:
     using value_type = std::invoke_result_t<decltype(GetFunc), const Container&, size_t>;
     using difference_type = std::ptrdiff_t;
-    using iterator = Iterator<Range, value_type>;
+    using iterator = Iterator<Container, value_type, GetFunc>;
     using const_iterator = iterator;
 
 private:
@@ -244,8 +260,8 @@ class Range
         static_assert(std::ranges::random_access_range<Range>);
     }
 
-    iterator begin() const { return iterator(this, 0); }
-    iterator end() const { return iterator(this, size()); }
+    iterator begin() const { return iterator(m_container, 0); }
+    iterator end() const { return iterator(m_container, size()); }
 
     const_iterator cbegin() const { return begin(); }
     const_iterator cend() const { return end(); }
@@ -548,6 +564,49 @@ class OutPoint : public Handle<btck_TransactionOutPoint, btck_transaction_out_po
         : Handle(view) {}
 };
 
+template <typename Derived>
+class WitnessStackApi
+{
+private:
+    auto impl() const
+    {
+        return static_cast<const Derived*>(this)->get();
+    }
+
+    friend Derived;
+    WitnessStackApi() = default;
+
+public:
+    size_t CountItems() const
+    {
+        return btck_witness_stack_count_items(impl());
+    }
+
+    std::vector<std::byte> GetItem(size_t index) const
+    {
+        struct Item { const btck_WitnessStack* stack; size_t index; };
+        Item item{impl(), index};
+        return write_bytes(&item, +[](const Item* c, btck_WriteBytes w, void* ud) {
+            return btck_witness_stack_get_item_at(c->stack, c->index, w, ud);
+        });
+    }
+
+    MAKE_RANGE_METHOD(Items, Derived, &WitnessStackApi<Derived>::CountItems, &WitnessStackApi<Derived>::GetItem, *static_cast<const Derived*>(this))
+};
+
+class WitnessStackView : public View<btck_WitnessStack>, public WitnessStackApi<WitnessStackView>
+{
+public:
+    explicit WitnessStackView(const btck_WitnessStack* ptr) : View{ptr} {}
+};
+
+class WitnessStack : public Handle<btck_WitnessStack, btck_witness_stack_copy, btck_witness_stack_destroy>, public WitnessStackApi<WitnessStack>
+{
+public:
+    WitnessStack(const WitnessStackView& view)
+        : Handle(view) {}
+};
+
 template <typename Derived>
 class TransactionInputApi
 {
@@ -570,6 +629,16 @@ class TransactionInputApi
     {
         return btck_transaction_input_get_sequence(impl());
     }
+
+    WitnessStackView GetWitnessStack() const
+    {
+        return WitnessStackView{btck_transaction_input_get_witness_stack(impl())};
+    }
+
+    std::vector<std::byte> GetScriptSig() const
+    {
+        return write_bytes(impl(), btck_transaction_input_get_script_sig);
+    }
 };
 
 class TransactionInputView : public View<btck_TransactionInput>, public TransactionInputApi<TransactionInputView>
@@ -989,7 +1058,9 @@ class BlockValidationState : public Handle<btck_BlockValidationState, btck_block
 public:
     explicit BlockValidationState() : Handle{btck_block_validation_state_create()} {}
 
-    BlockValidationState(const BlockValidationStateView& view) : Handle{view} {}
+    explicit BlockValidationState(const BlockValidationStateView& view) : Handle{view} {}
+
+    explicit BlockValidationState(btck_BlockValidationState* state) : Handle{state} {}
 };
 
 inline bool Block::Check(const ConsensusParamsView& consensus_params,
@@ -999,6 +1070,28 @@ inline bool Block::Check(const ConsensusParamsView& consensus_params,
     return btck_block_check(get(), consensus_params.get(), static_cast<btck_BlockCheckFlags>(flags), state.get()) == 1;
 }
 
+class TxValidationState : public UniqueHandle<btck_TxValidationState, btck_tx_validation_state_destroy>
+{
+public:
+    using UniqueHandle::UniqueHandle; // inherit ctor
+    explicit TxValidationState() : UniqueHandle{btck_tx_validation_state_create()} {}
+
+    ValidationMode GetValidationMode() const
+    {
+        return static_cast<ValidationMode>(btck_tx_validation_state_get_validation_mode(get()));
+    }
+
+    TxValidationResult GetTxValidationResult() const
+    {
+        return static_cast<TxValidationResult>(btck_tx_validation_state_get_tx_validation_result(get()));
+    }
+};
+
+inline bool CheckTransaction(const Transaction& tx, TxValidationState& state)
+{
+    return btck_transaction_check(tx.get(), state.get()) == 1;
+}
+
 class ValidationInterface
 {
 public:
@@ -1016,9 +1109,12 @@ class ValidationInterface
 class ChainParams : public Handle<btck_ChainParameters, btck_chain_parameters_copy, btck_chain_parameters_destroy>
 {
 public:
-    ChainParams(ChainType chain_type)
+    explicit ChainParams(ChainType chain_type)
         : Handle{btck_chain_parameters_create(static_cast<btck_ChainType>(chain_type))} {}
 
+    explicit ChainParams(std::span<const std::byte> signet_challenge)
+        : Handle{btck_chain_parameters_create_signet(signet_challenge.data(), signet_challenge.size())} {}
+
     ConsensusParamsView GetConsensusParams() const
     {
         return ConsensusParamsView{btck_chain_parameters_get_consensus_params(get())};
@@ -1104,6 +1200,11 @@ class ChainstateManagerOptions : public UniqueHandle<btck_ChainstateManagerOptio
         btck_chainstate_manager_options_set_worker_threads_num(get(), worker_threads);
     }
 
+    bool SetDatabaseCacheBytes(uint64_t database_cache_bytes)
+    {
+        return btck_chainstate_manager_options_set_database_cache_bytes(get(), database_cache_bytes) == 0;
+    }
+
     bool SetWipeDbs(bool wipe_block_tree, bool wipe_chainstate)
     {
         return btck_chainstate_manager_options_set_wipe_dbs(get(), wipe_block_tree, wipe_chainstate) == 0;
@@ -1279,9 +1380,10 @@ class ChainMan : UniqueHandle<btck_ChainstateManager, btck_chainstate_manager_de
         return res == 0;
     }
 
-    bool ProcessBlockHeader(const BlockHeader& header, BlockValidationState& state)
+    BlockValidationState ProcessBlockHeader(const BlockHeader& header)
     {
-        return btck_chainstate_manager_process_block_header(get(), header.get(), state.get()) == 0;
+        auto state = btck_chainstate_manager_process_block_header(get(), header.get());
+        return BlockValidationState{state};
     }
 
     ChainView GetChain() const
@@ -1314,6 +1416,13 @@ class ChainMan : UniqueHandle<btck_ChainstateManager, btck_chainstate_manager_de
     }
 };
 
+inline void set_mock_time(std::chrono::seconds timestamp)
+{
+    if (btck_set_mock_time(timestamp.count()) != 0) {
+        throw std::runtime_error("timestamp out of range");
+    }
+}
+
 } // namespace btck
 
 #endif // BITCOIN_KERNEL_BITCOINKERNEL_WRAPPER_H
diff --git a/depend/bitcoin/src/kernel/blockmanager_opts.h b/depend/bitcoin/src/kernel/blockmanager_opts.h
index 3d8af68b..396a3ff1 100644
--- a/depend/bitcoin/src/kernel/blockmanager_opts.h
+++ b/depend/bitcoin/src/kernel/blockmanager_opts.h
@@ -15,7 +15,7 @@ class CChainParams;
 
 namespace kernel {
 
-static constexpr bool DEFAULT_XOR_BLOCKSDIR{true};
+inline constexpr bool DEFAULT_XOR_BLOCKSDIR{true};
 
 /**
  * An options struct for `BlockManager`, more ergonomically referred to as
diff --git a/depend/bitcoin/src/kernel/caches.h b/depend/bitcoin/src/kernel/caches.h
index aa3214e5..c355ed0a 100644
--- a/depend/bitcoin/src/kernel/caches.h
+++ b/depend/bitcoin/src/kernel/caches.h
@@ -8,24 +8,30 @@
 #include <util/byte_units.h>
 
 #include <algorithm>
+#include <cstdint>
+#include <limits>
 
+//! Minimum total database cache (bytes)
+inline constexpr uint64_t MIN_DBCACHE_BYTES{4_MiB};
+//! Maximum total database cache on current architecture (bytes)
+inline constexpr uint64_t MAX_DBCACHE_BYTES{sizeof(void*) == 4 ? 1_GiB : std::numeric_limits<uint64_t>::max()};
 //! Suggested default amount of cache reserved for the kernel (bytes)
-static constexpr size_t DEFAULT_KERNEL_CACHE{450_MiB};
+inline constexpr uint64_t DEFAULT_KERNEL_CACHE{450_MiB};
 //! Default LevelDB write batch size
-static constexpr size_t DEFAULT_DB_CACHE_BATCH{32_MiB};
+inline constexpr uint64_t DEFAULT_DB_CACHE_BATCH{32_MiB};
 
 //! Max memory allocated to block tree DB specific cache (bytes)
-static constexpr size_t MAX_BLOCK_DB_CACHE{2_MiB};
+inline constexpr uint64_t MAX_BLOCK_DB_CACHE{2_MiB};
 //! Max memory allocated to coin DB specific cache (bytes)
-static constexpr size_t MAX_COINS_DB_CACHE{8_MiB};
+inline constexpr uint64_t MAX_COINS_DB_CACHE{8_MiB};
 
 namespace kernel {
 struct CacheSizes {
-    size_t block_tree_db;
-    size_t coins_db;
-    size_t coins;
+    uint64_t block_tree_db;
+    uint64_t coins_db;
+    uint64_t coins;
 
-    CacheSizes(size_t total_cache)
+    CacheSizes(uint64_t total_cache)
     {
         block_tree_db = std::min(total_cache / 8, MAX_BLOCK_DB_CACHE);
         total_cache -= block_tree_db;
diff --git a/depend/bitcoin/src/kernel/chainparams.cpp b/depend/bitcoin/src/kernel/chainparams.cpp
index 02c7ae9d..9764ba95 100644
--- a/depend/bitcoin/src/kernel/chainparams.cpp
+++ b/depend/bitcoin/src/kernel/chainparams.cpp
@@ -16,6 +16,7 @@
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/verify_flags.h>
 #include <uint256.h>
 #include <util/chaintype.h>
 #include <util/log.h>
@@ -72,12 +73,41 @@ static CBlock CreateGenesisBlock(uint32_t nTime, uint32_t nNonce, uint32_t nBits
     return CreateGenesisBlock(pszTimestamp, genesisOutputScript, nTime, nNonce, nBits, nVersion, genesisReward);
 }
 
+void CChainParams::ApplyDeploymentOptions(const DeploymentOptions& opts)
+{
+    for (const auto& [dep, height] : opts.activation_heights) {
+        switch (dep) {
+        case Consensus::BuriedDeployment::DEPLOYMENT_SEGWIT:
+            consensus.SegwitHeight = int{height};
+            break;
+        case Consensus::BuriedDeployment::DEPLOYMENT_HEIGHTINCB:
+            consensus.BIP34Height = int{height};
+            break;
+        case Consensus::BuriedDeployment::DEPLOYMENT_DERSIG:
+            consensus.BIP66Height = int{height};
+            break;
+        case Consensus::BuriedDeployment::DEPLOYMENT_CLTV:
+            consensus.BIP65Height = int{height};
+            break;
+        case Consensus::BuriedDeployment::DEPLOYMENT_CSV:
+            consensus.CSVHeight = int{height};
+            break;
+        }
+    }
+
+    for (const auto& [deployment_pos, version_bits_params] : opts.version_bits_parameters) {
+        consensus.vDeployments[deployment_pos].nStartTime = version_bits_params.start_time;
+        consensus.vDeployments[deployment_pos].nTimeout = version_bits_params.timeout;
+        consensus.vDeployments[deployment_pos].min_activation_height = version_bits_params.min_activation_height;
+    }
+}
+
 /**
  * Main network on which people trade goods and services.
  */
 class CMainParams : public CChainParams {
 public:
-    CMainParams() {
+    CMainParams(const MainNetOptions& opts) {
         m_chain_type = ChainType::MAIN;
         consensus.signet_blocks = false;
         consensus.signet_challenge.clear();
@@ -106,6 +136,8 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1815; // 90%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
+        ApplyDeploymentOptions(opts.dep_opts);
+
         consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000001128750f82f4c366153a3a030"};
         consensus.defaultAssumeValid = uint256{"00000000000000000000ccebd6d74d9194d8dcdc1d177c478e094bfad51ba5ac"}; // 938343
 
@@ -133,7 +165,6 @@ class CMainParams : public CChainParams {
         // This is fine at runtime as we'll fall back to using them as an addrfetch if they don't support the
         // service bits we want, but we should get them updated to support all service bits wanted by any
         // release ASAP to avoid it where possible.
-        vSeeds.emplace_back("seed.bitcoin.sipa.be."); // Pieter Wuille, only supports x1, x5, x9, and xd
         vSeeds.emplace_back("dnsseed.bluematt.me."); // Matt Corallo, only supports x9
         vSeeds.emplace_back("seed.bitcoin.jonasschnelli.ch."); // Jonas Schnelli, only supports x1, x5, x9, and xd
         vSeeds.emplace_back("seed.btc.petertodd.net."); // Peter Todd, only supports x1, x5, x9, and xd
@@ -202,7 +233,7 @@ class CMainParams : public CChainParams {
  */
 class CTestNetParams : public CChainParams {
 public:
-    CTestNetParams() {
+    CTestNetParams(const TestNetOptions& opts) {
         m_chain_type = ChainType::TESTNET;
         consensus.signet_blocks = false;
         consensus.signet_challenge.clear();
@@ -229,6 +260,8 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1512; // 75%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
+        ApplyDeploymentOptions(opts.dep_opts);
+
         consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000017dde1c649f3708d14b6"};
         consensus.defaultAssumeValid = uint256{"000000007a61e4230b28ac5cb6b5e5a0130de37ac1faf2f8987d2fa6505b67f4"}; // 4842348
 
@@ -251,7 +284,6 @@ class CTestNetParams : public CChainParams {
         // nodes with support for servicebits filtering should be at the top
         vSeeds.emplace_back("testnet-seed.bitcoin.jonasschnelli.ch.");
         vSeeds.emplace_back("seed.tbtc.petertodd.net.");
-        vSeeds.emplace_back("seed.testnet.bitcoin.sprovoost.nl.");
         vSeeds.emplace_back("testnet-seed.bluematt.me."); // Just a static list of stable node(s), only supports x9
         vSeeds.emplace_back("seed.testnet.achownodes.xyz."); // Ava Chow, only supports x1, x5, x9, x49, x809, x849, xd, x400, x404, x408, x448, xc08, xc48, x40c
 
@@ -303,7 +335,7 @@ class CTestNetParams : public CChainParams {
  */
 class CTestNet4Params : public CChainParams {
 public:
-    CTestNet4Params() {
+    CTestNet4Params(const TestNetOptions& opts) {
         m_chain_type = ChainType::TESTNET4;
         consensus.signet_blocks = false;
         consensus.signet_challenge.clear();
@@ -329,6 +361,8 @@ class CTestNet4Params : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1512; // 75%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
+        ApplyDeploymentOptions(opts.dep_opts);
+
         consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000009a0fe15d0177d086304"};
         consensus.defaultAssumeValid = uint256{"0000000002368b1e4ee27e2e85676ae6f9f9e69579b29093e9a82c170bf7cf8a"}; // 123613
 
@@ -472,6 +506,8 @@ class SigNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1815; // 90%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
+        ApplyDeploymentOptions(options.dep_opts);
+
         // message start is defined as the first 4 bytes of the sha256d of the block script
         HashWriter h{};
         h << consensus.signet_challenge;
@@ -566,31 +602,7 @@ class CRegTestParams : public CChainParams
         m_assumed_blockchain_size = 0;
         m_assumed_chain_state_size = 0;
 
-        for (const auto& [dep, height] : opts.activation_heights) {
-            switch (dep) {
-            case Consensus::BuriedDeployment::DEPLOYMENT_SEGWIT:
-                consensus.SegwitHeight = int{height};
-                break;
-            case Consensus::BuriedDeployment::DEPLOYMENT_HEIGHTINCB:
-                consensus.BIP34Height = int{height};
-                break;
-            case Consensus::BuriedDeployment::DEPLOYMENT_DERSIG:
-                consensus.BIP66Height = int{height};
-                break;
-            case Consensus::BuriedDeployment::DEPLOYMENT_CLTV:
-                consensus.BIP65Height = int{height};
-                break;
-            case Consensus::BuriedDeployment::DEPLOYMENT_CSV:
-                consensus.CSVHeight = int{height};
-                break;
-            }
-        }
-
-        for (const auto& [deployment_pos, version_bits_params] : opts.version_bits_parameters) {
-            consensus.vDeployments[deployment_pos].nStartTime = version_bits_params.start_time;
-            consensus.vDeployments[deployment_pos].nTimeout = version_bits_params.timeout;
-            consensus.vDeployments[deployment_pos].min_activation_height = version_bits_params.min_activation_height;
-        }
+        ApplyDeploymentOptions(opts.dep_opts);
 
         genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
@@ -607,9 +619,9 @@ class CRegTestParams : public CChainParams
         m_assumeutxo_data = {
             {   // For use by unit tests
                 .height = 110,
-                .hash_serialized = AssumeutxoHash{uint256{"b952555c8ab81fec46f3d4253b7af256d766ceb39fb7752b9d18cdf4a0141327"}},
+                .hash_serialized = AssumeutxoHash{uint256{"86e9a1205b418b16dde3a18a78c730e30137e28466bda5dbf6b33ab8fc05447c"}},
                 .m_chain_tx_count = 111,
-                .blockhash = uint256{"6affe030b7965ab538f820a56ef56c8149b7dc1d1c144af57113be080db7c397"},
+                .blockhash = uint256{"135eec25a6fb277884e5824e7aa7d052c4868161c99a5122170b5266f86c273d"},
             },
             {
                 // For use by fuzz target src/test/fuzz/utxo_snapshot.cpp
@@ -621,9 +633,9 @@ class CRegTestParams : public CChainParams
             {
                 // For use by test/functional/feature_assumeutxo.py and test/functional/tool_bitcoin_chainstate.py
                 .height = 299,
-                .hash_serialized = AssumeutxoHash{uint256{"d2b051ff5e8eef46520350776f4100dd710a63447a8e01d917e92e79751a63e2"}},
+                .hash_serialized = AssumeutxoHash{uint256{"106b2c56233e378a824cf0d5ff2be42ed32c72f1605c9be288d00942908a40ac"}},
                 .m_chain_tx_count = 334,
-                .blockhash = uint256{"7cc695046fec709f8c9394b6f928f81e81fd3ac20977bb68760fa1faa7916ea2"},
+                .blockhash = uint256{"0c552ced4721c249a389eb9b08cb8da261cd46f0e7b5f9d064d48f3113406853"},
             },
         };
 
@@ -659,19 +671,19 @@ std::unique_ptr<const CChainParams> CChainParams::RegTest(const RegTestOptions&
     return std::make_unique<const CRegTestParams>(options);
 }
 
-std::unique_ptr<const CChainParams> CChainParams::Main()
+std::unique_ptr<const CChainParams> CChainParams::Main(const MainNetOptions& options)
 {
-    return std::make_unique<const CMainParams>();
+    return std::make_unique<const CMainParams>(options);
 }
 
-std::unique_ptr<const CChainParams> CChainParams::TestNet()
+std::unique_ptr<const CChainParams> CChainParams::TestNet(const TestNetOptions& options)
 {
-    return std::make_unique<const CTestNetParams>();
+    return std::make_unique<const CTestNetParams>(options);
 }
 
-std::unique_ptr<const CChainParams> CChainParams::TestNet4()
+std::unique_ptr<const CChainParams> CChainParams::TestNet4(const TestNetOptions& options)
 {
-    return std::make_unique<const CTestNet4Params>();
+    return std::make_unique<const CTestNet4Params>(options);
 }
 
 std::vector<int> CChainParams::GetAvailableSnapshotHeights() const
@@ -690,8 +702,8 @@ std::optional<ChainType> GetNetworkForMagic(const MessageStartChars& message)
     const auto mainnet_msg = CChainParams::Main()->MessageStart();
     const auto testnet_msg = CChainParams::TestNet()->MessageStart();
     const auto testnet4_msg = CChainParams::TestNet4()->MessageStart();
-    const auto regtest_msg = CChainParams::RegTest({})->MessageStart();
-    const auto signet_msg = CChainParams::SigNet({})->MessageStart();
+    const auto regtest_msg = CChainParams::RegTest()->MessageStart();
+    const auto signet_msg = CChainParams::SigNet()->MessageStart();
 
     if (std::ranges::equal(message, mainnet_msg)) {
         return ChainType::MAIN;
diff --git a/depend/bitcoin/src/kernel/chainparams.h b/depend/bitcoin/src/kernel/chainparams.h
index f7209bee..2c85b8e8 100644
--- a/depend/bitcoin/src/kernel/chainparams.h
+++ b/depend/bitcoin/src/kernel/chainparams.h
@@ -127,14 +127,6 @@ class CChainParams
 
     const ChainTxData& TxData() const { return chainTxData; }
 
-    /**
-     * SigNetOptions holds configurations for creating a signet CChainParams.
-     */
-    struct SigNetOptions {
-        std::optional<std::vector<uint8_t>> challenge{};
-        std::optional<std::vector<std::string>> seeds{};
-    };
-
     /**
      * VersionBitsParameters holds activation parameters
      */
@@ -144,21 +136,47 @@ class CChainParams
         int min_activation_height;
     };
 
+    struct DeploymentOptions {
+        std::unordered_map<Consensus::DeploymentPos, VersionBitsParameters> version_bits_parameters{};
+        std::unordered_map<Consensus::BuriedDeployment, int> activation_heights{};
+    };
+
+    /**
+     * SigNetOptions holds configurations for creating a signet CChainParams.
+     */
+    struct SigNetOptions {
+        DeploymentOptions dep_opts{};
+        std::optional<std::vector<uint8_t>> challenge{};
+        std::optional<std::vector<std::string>> seeds{};
+    };
+
     /**
      * RegTestOptions holds configurations for creating a regtest CChainParams.
      */
     struct RegTestOptions {
-        std::unordered_map<Consensus::DeploymentPos, VersionBitsParameters> version_bits_parameters{};
-        std::unordered_map<Consensus::BuriedDeployment, int> activation_heights{};
+        DeploymentOptions dep_opts{};
         bool fastprune{false};
         bool enforce_bip94{false};
     };
 
+    struct MainNetOptions {
+        DeploymentOptions dep_opts{};
+    };
+
+    struct TestNetOptions {
+        DeploymentOptions dep_opts{};
+    };
+
     static std::unique_ptr<const CChainParams> RegTest(const RegTestOptions& options);
+    static std::unique_ptr<const CChainParams> RegTest() { const RegTestOptions opts{}; return RegTest(opts); }
     static std::unique_ptr<const CChainParams> SigNet(const SigNetOptions& options);
-    static std::unique_ptr<const CChainParams> Main();
-    static std::unique_ptr<const CChainParams> TestNet();
-    static std::unique_ptr<const CChainParams> TestNet4();
+    static std::unique_ptr<const CChainParams> SigNet() { const SigNetOptions opts{}; return SigNet(opts); }
+    static std::unique_ptr<const CChainParams> Main(const MainNetOptions& options);
+    static std::unique_ptr<const CChainParams> Main() { const MainNetOptions opts{}; return Main(opts); }
+    static std::unique_ptr<const CChainParams> TestNet(const TestNetOptions& options);
+    static std::unique_ptr<const CChainParams> TestNet() { const TestNetOptions opts{}; return TestNet(opts); }
+    static std::unique_ptr<const CChainParams> TestNet4(const TestNetOptions& options);
+    static std::unique_ptr<const CChainParams> TestNet4() { const TestNetOptions opts{}; return TestNet4(opts); }
 
 protected:
     CChainParams() = default;
@@ -180,6 +198,8 @@ class CChainParams
     std::vector<AssumeutxoData> m_assumeutxo_data;
     ChainTxData chainTxData;
     HeadersSyncParams m_headers_sync_params;
+
+    void ApplyDeploymentOptions(const DeploymentOptions& opts);
 };
 
 std::optional<ChainType> GetNetworkForMagic(const MessageStartChars& pchMessageStart);
diff --git a/depend/bitcoin/src/kernel/chainstatemanager_opts.h b/depend/bitcoin/src/kernel/chainstatemanager_opts.h
index 134b9319..806331ca 100644
--- a/depend/bitcoin/src/kernel/chainstatemanager_opts.h
+++ b/depend/bitcoin/src/kernel/chainstatemanager_opts.h
@@ -21,7 +21,8 @@
 class CChainParams;
 class ValidationSignals;
 
-static constexpr auto DEFAULT_MAX_TIP_AGE{24h};
+inline constexpr auto DEFAULT_MAX_TIP_AGE{24h};
+inline constexpr int32_t DEFAULT_PREVOUTFETCH_THREADS{8};
 
 namespace kernel {
 
@@ -46,6 +47,8 @@ struct ChainstateManagerOpts {
     ValidationSignals* signals{nullptr};
     //! Number of script check worker threads. Zero means no parallel verification.
     int worker_threads_num{0};
+    //! Number of worker threads used for prefetching block input prevouts. Zero means no parallel fetching.
+    int32_t prevoutfetch_threads_num{DEFAULT_PREVOUTFETCH_THREADS};
     size_t script_execution_cache_bytes{DEFAULT_SCRIPT_EXECUTION_CACHE_BYTES};
     size_t signature_cache_bytes{DEFAULT_SIGNATURE_CACHE_BYTES};
 };
diff --git a/depend/bitcoin/src/kernel/coinstats.cpp b/depend/bitcoin/src/kernel/coinstats.cpp
index 4f2f3fea..bc4986f3 100644
--- a/depend/bitcoin/src/kernel/coinstats.cpp
+++ b/depend/bitcoin/src/kernel/coinstats.cpp
@@ -14,6 +14,7 @@
 #include <span.h>
 #include <streams.h>
 #include <sync.h>
+#include <txdb.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/log.h>
@@ -108,16 +109,15 @@ static void ApplyStats(CCoinsStats& stats, const std::map<uint32_t, Coin>& outpu
 
 //! Calculate statistics about the unspent transaction output set
 template <typename T>
-static std::optional<CCoinsStats> ComputeUTXOStats(T hash_obj, CCoinsView* view, node::BlockManager& blockman, const std::function<void()>& interruption_point)
+static std::optional<CCoinsStats> ComputeUTXOStats(T hash_obj, const CCoinsViewDB& view, node::BlockManager& blockman, const std::function<void()>& interruption_point)
 {
     std::unique_ptr<CCoinsViewCursor> pcursor;
     CBlockIndex* pindex;
     {
         LOCK(::cs_main);
-        pcursor = view->Cursor();
+        pcursor = view.Cursor();
         pindex = blockman.LookupBlockIndex(pcursor->GetBestBlock());
     }
-    assert(pcursor);
     CCoinsStats stats{Assert(pindex)->nHeight, pindex->GetBlockHash()};
 
     Txid prevkey;
@@ -148,11 +148,11 @@ static std::optional<CCoinsStats> ComputeUTXOStats(T hash_obj, CCoinsView* view,
 
     FinalizeHash(hash_obj, stats);
 
-    stats.nDiskSize = view->EstimateSize();
+    stats.nDiskSize = view.EstimateSize();
     return stats;
 }
 
-std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, CCoinsView* view, node::BlockManager& blockman, const std::function<void()>& interruption_point)
+std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, const CCoinsViewDB& view, node::BlockManager& blockman, const std::function<void()>& interruption_point)
 {
     return [&]() -> std::optional<CCoinsStats> {
         switch (hash_type) {
diff --git a/depend/bitcoin/src/kernel/coinstats.h b/depend/bitcoin/src/kernel/coinstats.h
index 92ace06b..eda61b89 100644
--- a/depend/bitcoin/src/kernel/coinstats.h
+++ b/depend/bitcoin/src/kernel/coinstats.h
@@ -13,7 +13,7 @@
 #include <functional>
 #include <optional>
 
-class CCoinsView;
+class CCoinsViewDB;
 class Coin;
 class COutPoint;
 class CScript;
@@ -77,7 +77,7 @@ uint64_t GetBogoSize(const CScript& script_pub_key);
 void ApplyCoinHash(MuHash3072& muhash, const COutPoint& outpoint, const Coin& coin);
 void RemoveCoinHash(MuHash3072& muhash, const COutPoint& outpoint, const Coin& coin);
 
-std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, CCoinsView* view, node::BlockManager& blockman, const std::function<void()>& interruption_point = {});
+std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, const CCoinsViewDB& view, node::BlockManager& blockman, const std::function<void()>& interruption_point = {});
 } // namespace kernel
 
 #endif // BITCOIN_KERNEL_COINSTATS_H
diff --git a/depend/bitcoin/src/kernel/disconnected_transactions.h b/depend/bitcoin/src/kernel/disconnected_transactions.h
index 50eac519..c9f4d6f7 100644
--- a/depend/bitcoin/src/kernel/disconnected_transactions.h
+++ b/depend/bitcoin/src/kernel/disconnected_transactions.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 /** Maximum bytes for transactions to store for processing during reorg */
-static const unsigned int MAX_DISCONNECTED_TX_POOL_BYTES{20'000'000};
+inline constexpr unsigned int MAX_DISCONNECTED_TX_POOL_BYTES{20'000'000};
 /**
  * DisconnectedBlockTransactions
 
diff --git a/depend/bitcoin/src/kernel/mempool_options.h b/depend/bitcoin/src/kernel/mempool_options.h
index 392c837f..80b5316e 100644
--- a/depend/bitcoin/src/kernel/mempool_options.h
+++ b/depend/bitcoin/src/kernel/mempool_options.h
@@ -16,15 +16,15 @@
 class ValidationSignals;
 
 /** Default for -maxmempool, maximum megabytes of mempool memory usage */
-static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE_MB{300};
+inline constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE_MB{300};
 /** Default for -maxmempool when blocksonly is set */
-static constexpr unsigned int DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB{5};
+inline constexpr unsigned int DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB{5};
 /** Default for -mempoolexpiry, expiration time for mempool transactions in hours */
-static constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336};
+inline constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336};
 /** Whether to fall back to legacy V1 serialization when writing mempool.dat */
-static constexpr bool DEFAULT_PERSIST_V1_DAT{false};
+inline constexpr bool DEFAULT_PERSIST_V1_DAT{false};
 /** Default for -acceptnonstdtxn */
-static constexpr bool DEFAULT_ACCEPT_NON_STD_TXN{false};
+inline constexpr bool DEFAULT_ACCEPT_NON_STD_TXN{false};
 
 namespace kernel {
 /**
diff --git a/depend/bitcoin/src/key.cpp b/depend/bitcoin/src/key.cpp
index f17a2867..7bafc885 100644
--- a/depend/bitcoin/src/key.cpp
+++ b/depend/bitcoin/src/key.cpp
@@ -13,10 +13,11 @@
 #include <secp256k1.h>
 #include <secp256k1_ellswift.h>
 #include <secp256k1_extrakeys.h>
-#include <secp256k1_musig.h>
 #include <secp256k1_recovery.h>
 #include <secp256k1_schnorrsig.h>
 
+#include <algorithm>
+
 static secp256k1_context* secp256k1_context_sign = nullptr;
 
 /** These functions are taken from the libsecp256k1 distribution and are very ugly. */
@@ -350,128 +351,6 @@ KeyPair CKey::ComputeKeyPair(const uint256* merkle_root) const
     return KeyPair(*this, merkle_root);
 }
 
-std::vector<uint8_t> CKey::CreateMuSig2Nonce(MuSig2SecNonce& secnonce, const uint256& sighash, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys)
-{
-    // Get the keyagg cache and aggregate pubkey
-    secp256k1_musig_keyagg_cache keyagg_cache;
-    if (!MuSig2AggregatePubkeys(pubkeys, keyagg_cache, aggregate_pubkey)) return {};
-
-    // Parse participant pubkey
-    CPubKey our_pubkey = GetPubKey();
-    secp256k1_pubkey pubkey;
-    if (!secp256k1_ec_pubkey_parse(secp256k1_context_static, &pubkey, our_pubkey.data(), our_pubkey.size())) {
-        return {};
-    }
-
-    // Generate randomness for nonce
-    uint256 rand;
-    GetStrongRandBytes(rand);
-
-    // Generate nonce
-    secp256k1_musig_pubnonce pubnonce;
-    if (!secp256k1_musig_nonce_gen(secp256k1_context_sign, secnonce.Get(), &pubnonce, rand.data(), UCharCast(begin()), &pubkey, sighash.data(), &keyagg_cache, nullptr)) {
-        return {};
-    }
-
-    // Serialize pubnonce
-    std::vector<uint8_t> out;
-    out.resize(MUSIG2_PUBNONCE_SIZE);
-    if (!secp256k1_musig_pubnonce_serialize(secp256k1_context_static, out.data(), &pubnonce)) {
-        return {};
-    }
-
-    return out;
-}
-
-std::optional<uint256> CKey::CreateMuSig2PartialSig(const uint256& sighash, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys, const std::map<CPubKey, std::vector<uint8_t>>& pubnonces, MuSig2SecNonce& secnonce, const std::vector<std::pair<uint256, bool>>& tweaks)
-{
-    secp256k1_keypair keypair;
-    if (!secp256k1_keypair_create(secp256k1_context_sign, &keypair, UCharCast(begin()))) return std::nullopt;
-
-    // Get the keyagg cache and aggregate pubkey
-    secp256k1_musig_keyagg_cache keyagg_cache;
-    if (!MuSig2AggregatePubkeys(pubkeys, keyagg_cache, aggregate_pubkey)) return std::nullopt;
-
-    // Check that there are enough pubnonces
-    if (pubnonces.size() != pubkeys.size()) return std::nullopt;
-
-    // Parse the pubnonces
-    std::vector<std::pair<secp256k1_pubkey, secp256k1_musig_pubnonce>> signers_data;
-    std::vector<const secp256k1_musig_pubnonce*> pubnonce_ptrs;
-    std::optional<size_t> our_pubkey_idx;
-    CPubKey our_pubkey = GetPubKey();
-    for (const CPubKey& part_pk : pubkeys) {
-        const auto& pn_it = pubnonces.find(part_pk);
-        if (pn_it == pubnonces.end()) return std::nullopt;
-        const std::vector<uint8_t> pubnonce = pn_it->second;
-        if (pubnonce.size() != MUSIG2_PUBNONCE_SIZE) return std::nullopt;
-        if (part_pk == our_pubkey) {
-            our_pubkey_idx = signers_data.size();
-        }
-
-        auto& [secp_pk, secp_pn] = signers_data.emplace_back();
-
-        if (!secp256k1_ec_pubkey_parse(secp256k1_context_static, &secp_pk, part_pk.data(), part_pk.size())) {
-            return std::nullopt;
-        }
-
-        if (!secp256k1_musig_pubnonce_parse(secp256k1_context_static, &secp_pn, pubnonce.data())) {
-            return std::nullopt;
-        }
-    }
-    if (our_pubkey_idx == std::nullopt) {
-        return std::nullopt;
-    }
-    pubnonce_ptrs.reserve(signers_data.size());
-    for (auto& [_, pn] : signers_data) {
-        pubnonce_ptrs.push_back(&pn);
-    }
-
-    // Aggregate nonces
-    secp256k1_musig_aggnonce aggnonce;
-    if (!secp256k1_musig_nonce_agg(secp256k1_context_static, &aggnonce, pubnonce_ptrs.data(), pubnonce_ptrs.size())) {
-        return std::nullopt;
-    }
-
-    // Apply tweaks
-    for (const auto& [tweak, xonly] : tweaks) {
-        if (xonly) {
-            if (!secp256k1_musig_pubkey_xonly_tweak_add(secp256k1_context_static, nullptr, &keyagg_cache, tweak.data())) {
-                return std::nullopt;
-            }
-        } else if (!secp256k1_musig_pubkey_ec_tweak_add(secp256k1_context_static, nullptr, &keyagg_cache, tweak.data())) {
-            return std::nullopt;
-        }
-    }
-
-    // Create musig_session
-    secp256k1_musig_session session;
-    if (!secp256k1_musig_nonce_process(secp256k1_context_static, &session, &aggnonce, sighash.data(), &keyagg_cache)) {
-        return std::nullopt;
-    }
-
-    // Create partial signature
-    secp256k1_musig_partial_sig psig;
-    if (!secp256k1_musig_partial_sign(secp256k1_context_static, &psig, secnonce.Get(), &keypair, &keyagg_cache, &session)) {
-        return std::nullopt;
-    }
-    // The secnonce must be deleted after signing to prevent nonce reuse.
-    secnonce.Invalidate();
-
-    // Verify partial signature
-    if (!secp256k1_musig_partial_sig_verify(secp256k1_context_static, &psig, &(signers_data.at(*our_pubkey_idx).second), &(signers_data.at(*our_pubkey_idx).first), &keyagg_cache, &session)) {
-        return std::nullopt;
-    }
-
-    // Serialize
-    uint256 sig;
-    if (!secp256k1_musig_partial_sig_serialize(secp256k1_context_static, sig.data(), &psig)) {
-        return std::nullopt;
-    }
-
-    return sig;
-}
-
 CKey GenerateRandomKey(bool compressed) noexcept
 {
     CKey key;
@@ -482,14 +361,26 @@ CKey GenerateRandomKey(bool compressed) noexcept
 bool CExtKey::Derive(CExtKey &out, unsigned int _nChild) const {
     if (nDepth == std::numeric_limits<unsigned char>::max()) return false;
     out.nDepth = nDepth + 1;
-    CKeyID id = key.GetPubKey().GetID();
-    memcpy(out.vchFingerprint, &id, 4);
+    out.fingerprint = id_key_fingerprint();
     out.nChild = _nChild;
     return key.Derive(out.key, out.chaincode, _nChild, chaincode);
 }
 
+std::optional<std::pair<CExtKey, KeyOriginInfo>> DeriveExtKey(const CExtKey& ext_key, const std::vector<uint32_t>& path)
+{
+    CExtKey descendant = ext_key;
+    KeyOriginInfo origin;
+    origin.fingerprint = ext_key.id_key_fingerprint();
+    origin.path = path;
+    for (uint32_t i : path) {
+        if (!descendant.Derive(descendant, i)) return std::nullopt;
+    }
+    return std::make_pair(descendant, origin);
+}
+
 void CExtKey::SetSeed(std::span<const std::byte> seed)
 {
+    Assert(16 <= seed.size() && seed.size() <= 64);
     static const unsigned char hashkey[] = {'B','i','t','c','o','i','n',' ','s','e','e','d'};
     std::vector<unsigned char, secure_allocator<unsigned char>> vout(64);
     CHMAC_SHA512{hashkey, sizeof(hashkey)}.Write(UCharCast(seed.data()), seed.size()).Finalize(vout.data());
@@ -497,13 +388,13 @@ void CExtKey::SetSeed(std::span<const std::byte> seed)
     memcpy(chaincode.begin(), vout.data() + 32, 32);
     nDepth = 0;
     nChild = 0;
-    memset(vchFingerprint, 0, sizeof(vchFingerprint));
+    fingerprint.fill(0);
 }
 
 CExtPubKey CExtKey::Neuter() const {
     CExtPubKey ret;
     ret.nDepth = nDepth;
-    memcpy(ret.vchFingerprint, vchFingerprint, 4);
+    ret.fingerprint = fingerprint;
     ret.nChild = nChild;
     ret.pubkey = key.GetPubKey();
     ret.chaincode = chaincode;
@@ -512,7 +403,7 @@ CExtPubKey CExtKey::Neuter() const {
 
 void CExtKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
     code[0] = nDepth;
-    memcpy(code+1, vchFingerprint, 4);
+    std::ranges::copy(fingerprint, code+1);
     WriteBE32(code+5, nChild);
     memcpy(code+9, chaincode.begin(), 32);
     code[41] = 0;
@@ -522,11 +413,11 @@ void CExtKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
 
 void CExtKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) {
     nDepth = code[0];
-    memcpy(vchFingerprint, code+1, 4);
+    std::copy_n(code + 1, fingerprint.size(), fingerprint.begin());
     nChild = ReadBE32(code+5);
     memcpy(chaincode.begin(), code+9, 32);
     key.Set(code+42, code+BIP32_EXTKEY_SIZE, true);
-    if ((nDepth == 0 && (nChild != 0 || ReadLE32(vchFingerprint) != 0)) || code[41] != 0) key = CKey();
+    if ((nDepth == 0 && (nChild != 0 || ReadLE32(fingerprint.data()) != 0)) || code[41] != 0) key = CKey();
 }
 
 KeyPair::KeyPair(const CKey& key, const uint256* merkle_root)
@@ -568,6 +459,11 @@ bool ECC_InitSanityCheck() {
     return key.VerifyPubKey(pubkey);
 }
 
+secp256k1_context* GetSecp256k1SignContext()
+{
+    return secp256k1_context_sign;
+}
+
 /** Initialize the elliptic curve support. May not be called twice without calling ECC_Stop first. */
 static void ECC_Start() {
     assert(secp256k1_context_sign == nullptr);
diff --git a/depend/bitcoin/src/key.h b/depend/bitcoin/src/key.h
index f35f3cc0..f44d3bf4 100644
--- a/depend/bitcoin/src/key.h
+++ b/depend/bitcoin/src/key.h
@@ -7,15 +7,19 @@
 #ifndef BITCOIN_KEY_H
 #define BITCOIN_KEY_H
 
-#include <musig.h>
 #include <pubkey.h>
+#include <script/keyorigin.h>
 #include <serialize.h>
 #include <support/allocators/secure.h>
 #include <uint256.h>
 
+#include <optional>
 #include <stdexcept>
+#include <utility>
 #include <vector>
 
+struct secp256k1_context_struct;
+typedef struct secp256k1_context_struct secp256k1_context;
 
 /**
  * CPrivKey is a serialized private key, with all parameters included
@@ -24,7 +28,7 @@
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CPrivKey;
 
 /** Size of ECDH shared secrets. */
-constexpr static size_t ECDH_SECRET_SIZE = CSHA256::OUTPUT_SIZE;
+inline constexpr size_t ECDH_SECRET_SIZE = CSHA256::OUTPUT_SIZE;
 
 // Used to represent ECDH shared secret (ECDH_SECRET_SIZE bytes)
 using ECDHSecret = std::array<std::byte, ECDH_SECRET_SIZE>;
@@ -38,8 +42,8 @@ class CKey
     /**
      * secp256k1:
      */
-    static const unsigned int SIZE            = 279;
-    static const unsigned int COMPRESSED_SIZE = 214;
+    static constexpr unsigned int SIZE{279};
+    static constexpr unsigned int COMPRESSED_SIZE{214};
     /**
      * see www.keylength.com
      * script supports up to 75 for single byte push
@@ -221,16 +225,13 @@ class CKey
      *                               Merkle root of the script tree).
      */
     KeyPair ComputeKeyPair(const uint256* merkle_root) const;
-
-    std::vector<uint8_t> CreateMuSig2Nonce(MuSig2SecNonce& secnonce, const uint256& sighash, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys);
-    std::optional<uint256> CreateMuSig2PartialSig(const uint256& hash, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys, const std::map<CPubKey, std::vector<uint8_t>>& pubnonces, MuSig2SecNonce& secnonce, const std::vector<std::pair<uint256, bool>>& tweaks);
 };
 
 CKey GenerateRandomKey(bool compressed = true) noexcept;
 
 struct CExtKey {
     unsigned char nDepth;
-    unsigned char vchFingerprint[4];
+    KeyFingerprint fingerprint;
     unsigned int nChild;
     ChainCode chaincode;
     CKey key;
@@ -238,16 +239,18 @@ struct CExtKey {
     friend bool operator==(const CExtKey& a, const CExtKey& b)
     {
         return a.nDepth == b.nDepth &&
-            memcmp(a.vchFingerprint, b.vchFingerprint, sizeof(vchFingerprint)) == 0 &&
+            a.fingerprint == b.fingerprint &&
             a.nChild == b.nChild &&
             a.chaincode == b.chaincode &&
             a.key == b.key;
     }
 
     CExtKey() = default;
-    CExtKey(const CExtPubKey& xpub, const CKey& key_in) : nDepth(xpub.nDepth), nChild(xpub.nChild), chaincode(xpub.chaincode), key(key_in)
+    CExtKey(const CExtPubKey& xpub, const CKey& key_in) : nDepth(xpub.nDepth), fingerprint(xpub.fingerprint), nChild(xpub.nChild), chaincode(xpub.chaincode), key(key_in) {}
+
+    KeyFingerprint id_key_fingerprint() const
     {
-        std::copy(xpub.vchFingerprint, xpub.vchFingerprint + sizeof(xpub.vchFingerprint), vchFingerprint);
+        return key.GetPubKey().GetID().fingerprint();
     }
 
     void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
@@ -257,6 +260,12 @@ struct CExtKey {
     void SetSeed(std::span<const std::byte> seed);
 };
 
+//! Get extended key and origin info for a given path
+//! @param[in] ext_key The extended private key to derive from
+//! @param[in] path The BIP 32 path
+//! @return the resulting extended private key and origin info
+std::optional<std::pair<CExtKey, KeyOriginInfo>> DeriveExtKey(const CExtKey& ext_key, const std::vector<uint32_t>& path);
+
 /** KeyPair
  *
  *  Wraps a `secp256k1_keypair` type, an opaque data structure for holding a secret and public key.
@@ -315,6 +324,9 @@ class KeyPair
 /** Check that required EC support is available at runtime. */
 bool ECC_InitSanityCheck();
 
+/** Access the secp256k1 context used for signing and MuSig2 nonce generation. */
+secp256k1_context* GetSecp256k1SignContext();
+
 /**
  * RAII class initializing and deinitializing global state for elliptic curve support.
  * Only one instance may be initialized at a time.
diff --git a/depend/bitcoin/src/leveldb/.github/workflows/ci.yml b/depend/bitcoin/src/leveldb/.github/workflows/ci.yml
new file mode 100644
index 00000000..1b609fc6
--- /dev/null
+++ b/depend/bitcoin/src/leveldb/.github/workflows/ci.yml
@@ -0,0 +1,12 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - run: cmake -B build -DBUILD_SHARED_LIBS=OFF
+      - run: cmake --build build -j$(nproc)
+      - run: ctest --test-dir build --output-on-failure -j$(nproc)
diff --git a/depend/bitcoin/src/leveldb/CMakeLists.txt b/depend/bitcoin/src/leveldb/CMakeLists.txt
index cfd4faa3..78efde95 100644
--- a/depend/bitcoin/src/leveldb/CMakeLists.txt
+++ b/depend/bitcoin/src/leveldb/CMakeLists.txt
@@ -2,19 +2,25 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.22)
 # Keep the version below in sync with the one in db.h
 project(leveldb VERSION 1.22.0 LANGUAGES C CXX)
 
-# This project can use C11, but will gracefully decay down to C89.
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_C_STANDARD_REQUIRED OFF)
-set(CMAKE_C_EXTENSIONS OFF)
-
-# This project requires C++11.
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
+# C standard can be overridden when this is used as a sub-project.
+if(NOT CMAKE_C_STANDARD)
+  # This project can use C11, but will gracefully decay down to C89.
+  set(CMAKE_C_STANDARD 11)
+  set(CMAKE_C_STANDARD_REQUIRED OFF)
+  set(CMAKE_C_EXTENSIONS OFF)
+endif(NOT CMAKE_C_STANDARD)
+
+# C++ standard can be overridden when this is used as a sub-project.
+if(NOT CMAKE_CXX_STANDARD)
+  # This project requires C++17.
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+endif(NOT CMAKE_CXX_STANDARD)
 
 if (WIN32)
   set(LEVELDB_PLATFORM_NAME LEVELDB_PLATFORM_WINDOWS)
diff --git a/depend/bitcoin/src/leveldb/benchmarks/db_bench_sqlite3.cc b/depend/bitcoin/src/leveldb/benchmarks/db_bench_sqlite3.cc
index f183f4fc..45de7793 100644
--- a/depend/bitcoin/src/leveldb/benchmarks/db_bench_sqlite3.cc
+++ b/depend/bitcoin/src/leveldb/benchmarks/db_bench_sqlite3.cc
@@ -5,6 +5,7 @@
 #include <sqlite3.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "util/histogram.h"
 #include "util/random.h"
diff --git a/depend/bitcoin/src/leveldb/db/autocompact_test.cc b/depend/bitcoin/src/leveldb/db/autocompact_test.cc
index e6c97a05..f6e714c6 100644
--- a/depend/bitcoin/src/leveldb/db/autocompact_test.cc
+++ b/depend/bitcoin/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/depend/bitcoin/src/leveldb/db/db_test.cc b/depend/bitcoin/src/leveldb/db/db_test.cc
index 3c9f8942..16e8ecb9 100644
--- a/depend/bitcoin/src/leveldb/db/db_test.cc
+++ b/depend/bitcoin/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/depend/bitcoin/src/leveldb/db/version_set.cc b/depend/bitcoin/src/leveldb/db/version_set.cc
index cd07346e..2b56bbcd 100644
--- a/depend/bitcoin/src/leveldb/db/version_set.cc
+++ b/depend/bitcoin/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;
 
@@ -994,7 +991,7 @@ bool VersionSet::ReuseManifest(const std::string& dscname,
   }
   FileType manifest_type;
   uint64_t manifest_number;
-  uint64_t manifest_size;
+  uint64_t manifest_size = 0;
   if (!ParseFileName(dscbase, &manifest_number, &manifest_type) ||
       manifest_type != kDescriptorFile ||
       !env_->GetFileSize(dscname, &manifest_size).ok() ||
diff --git a/depend/bitcoin/src/leveldb/util/env_posix.cc b/depend/bitcoin/src/leveldb/util/env_posix.cc
index 8a33534e..81af271e 100644
--- a/depend/bitcoin/src/leveldb/util/env_posix.cc
+++ b/depend/bitcoin/src/leveldb/util/env_posix.cc
@@ -42,8 +42,8 @@ namespace {
 // Set by EnvPosixTestHelper::SetReadOnlyMMapLimit() and MaxOpenFiles().
 int g_open_read_only_file_limit = -1;
 
-// Up to 4096 mmap regions for 64-bit binaries; none for 32-bit.
-constexpr const int kDefaultMmapLimit = (sizeof(void*) >= 8) ? 4096 : 0;
+// Up to 1000 mmap regions for 64-bit binaries; none for 32-bit.
+constexpr const int kDefaultMmapLimit = (sizeof(void*) >= 8) ? 1000 : 0;
 
 // Can be set using EnvPosixTestHelper::SetReadOnlyMMapLimit().
 int g_mmap_limit = kDefaultMmapLimit;
@@ -730,9 +730,9 @@ class PosixEnv : public Env {
   }
 
  private:
-  void BackgroundThreadMain();
+  [[noreturn]] void BackgroundThreadMain();
 
-  static void BackgroundThreadEntryPoint(PosixEnv* env) {
+  [[noreturn]] static void BackgroundThreadEntryPoint(PosixEnv* env) {
     env->BackgroundThreadMain();
   }
 
diff --git a/depend/bitcoin/src/leveldb/util/env_windows.cc b/depend/bitcoin/src/leveldb/util/env_windows.cc
index 8897e2aa..43f117be 100644
--- a/depend/bitcoin/src/leveldb/util/env_windows.cc
+++ b/depend/bitcoin/src/leveldb/util/env_windows.cc
@@ -81,10 +81,7 @@ class ScopedHandle {
 
   ScopedHandle& operator=(const ScopedHandle&) = delete;
 
-  ScopedHandle& operator=(ScopedHandle&& rhs) noexcept {
-    if (this != &rhs) handle_ = rhs.Release();
-    return *this;
-  }
+  ScopedHandle& operator=(ScopedHandle&& rhs) = delete;
 
   bool Close() {
     if (!is_valid()) {
@@ -678,9 +675,9 @@ class WindowsEnv : public Env {
   }
 
  private:
-  void BackgroundThreadMain();
+  [[noreturn]] void BackgroundThreadMain();
 
-  static void BackgroundThreadEntryPoint(WindowsEnv* env) {
+  [[noreturn]] static void BackgroundThreadEntryPoint(WindowsEnv* env) {
     env->BackgroundThreadMain();
   }
 
diff --git a/depend/bitcoin/src/leveldb/util/hash.cc b/depend/bitcoin/src/leveldb/util/hash.cc
index 5432b618..6b277306 100644
--- a/depend/bitcoin/src/leveldb/util/hash.cc
+++ b/depend/bitcoin/src/leveldb/util/hash.cc
@@ -8,15 +8,6 @@
 
 #include "util/coding.h"
 
-// The FALLTHROUGH_INTENDED macro can be used to annotate implicit fall-through
-// between switch labels. The real definition should be provided externally.
-// This one is a fallback version for unsupported compilers.
-#ifndef FALLTHROUGH_INTENDED
-#define FALLTHROUGH_INTENDED \
-  do {                       \
-  } while (0)
-#endif
-
 namespace leveldb {
 
 uint32_t Hash(const char* data, size_t n, uint32_t seed) {
@@ -39,10 +30,10 @@ uint32_t Hash(const char* data, size_t n, uint32_t seed) {
   switch (limit - data) {
     case 3:
       h += static_cast<uint8_t>(data[2]) << 16;
-      FALLTHROUGH_INTENDED;
+      [[fallthrough]];
     case 2:
       h += static_cast<uint8_t>(data[1]) << 8;
-      FALLTHROUGH_INTENDED;
+      [[fallthrough]];
     case 1:
       h += static_cast<uint8_t>(data[0]);
       h *= m;
diff --git a/depend/bitcoin/src/logging.cpp b/depend/bitcoin/src/logging.cpp
index 3373063c..bbe5f043 100644
--- a/depend/bitcoin/src/logging.cpp
+++ b/depend/bitcoin/src/logging.cpp
@@ -194,7 +194,6 @@ static const std::map<std::string, BCLog::LogFlags, std::less<>> LOG_CATEGORIES_
     {"prune", BCLog::PRUNE},
     {"proxy", BCLog::PROXY},
     {"mempoolrej", BCLog::MEMPOOLREJ},
-    {"libevent", BCLog::LIBEVENT},
     {"coindb", BCLog::COINDB},
     {"qt", BCLog::QT},
     {"leveldb", BCLog::LEVELDB},
@@ -224,7 +223,7 @@ static const std::unordered_map<BCLog::LogFlags, std::string> LOG_CATEGORIES_BY_
     }(LOG_CATEGORIES_BY_STR)
 };
 
-std::optional<BCLog::LogFlags> GetLogCategory(std::string_view str)
+std::optional<BCLog::LogFlags> BCLog::Logger::GetLogCategory(std::string_view str)
 {
     if (str.empty() || str == "1" || str == "all") {
         return BCLog::ALL;
@@ -233,6 +232,10 @@ std::optional<BCLog::LogFlags> GetLogCategory(std::string_view str)
     if (it != LOG_CATEGORIES_BY_STR.end()) {
         return it->second;
     }
+    if (str == "libevent") {
+       LogWarning("The logging category `%s` is deprecated, does nothing, and will be removed in a future version", str);
+       return BCLog::NONE;
+    }
     return std::nullopt;
 }
 
@@ -514,6 +517,8 @@ void BCLog::Logger::LogPrint_(util::log::Entry entry)
 
 void BCLog::Logger::ShrinkDebugFile()
 {
+    STDLOCK(m_cs);
+
     // Amount of debug.log to save at end when shrinking (must fit in memory)
     constexpr size_t RECENT_DEBUG_HISTORY_SIZE = 10 * 1000000;
 
@@ -535,7 +540,14 @@ void BCLog::Logger::ShrinkDebugFile()
         // Restart the file with some of the end
         std::vector<char> vch(RECENT_DEBUG_HISTORY_SIZE, 0);
         if (fseek(file, -((long)vch.size()), SEEK_END)) {
-            LogWarning("Failed to shrink debug log file: fseek(...) failed");
+            // LogWarning, except with m_cs held
+            LogPrint_({
+                .category = BCLog::ALL,
+                .level = Level::Warning,
+                .should_ratelimit = true,
+                .source_loc = SourceLocation{__func__},
+                .message = "Failed to shrink debug log file: fseek(...) failed",
+            });
             fclose(file);
             return;
         }
@@ -563,8 +575,7 @@ void BCLog::LogRateLimiter::Reset()
     }
     for (const auto& [source_loc, stats] : source_locations) {
         if (stats.m_dropped_bytes == 0) continue;
-        LogPrintLevel_(
-            LogFlags::ALL, Level::Warning, /*should_ratelimit=*/false,
+        LogWarning(util::log::NO_RATE_LIMIT,
             "Restarting logging from %s:%d (%s): %d bytes were dropped during the last %ss.",
             source_loc.file_name(), source_loc.line(), source_loc.function_name_short(),
             stats.m_dropped_bytes, Ticks<std::chrono::seconds>(m_reset_window));
@@ -598,15 +609,21 @@ bool BCLog::Logger::SetCategoryLogLevel(std::string_view category_str, std::stri
 
     const auto level = GetLogLevel(level_str);
     if (!level.has_value() || level.value() > MAX_USER_SETABLE_SEVERITY_LEVEL) return false;
+    if (*flag == BCLog::NONE) return true;
 
     STDLOCK(m_cs);
     m_category_log_levels[*flag] = level.value();
     return true;
 }
 
-bool util::log::ShouldLog(Category category, Level level)
+bool util::log::ShouldDebugLog(Category category)
+{
+    return LogInstance().WillLogCategoryLevel(static_cast<BCLog::LogFlags>(category), util::log::Level::Debug);
+}
+
+bool util::log::ShouldTraceLog(Category category)
 {
-    return LogInstance().WillLogCategoryLevel(static_cast<BCLog::LogFlags>(category), level);
+    return LogInstance().WillLogCategoryLevel(static_cast<BCLog::LogFlags>(category), util::log::Level::Trace);
 }
 
 void util::log::Log(util::log::Entry entry)
diff --git a/depend/bitcoin/src/logging.h b/depend/bitcoin/src/logging.h
index 67f5d6ef..2bb8232b 100644
--- a/depend/bitcoin/src/logging.h
+++ b/depend/bitcoin/src/logging.h
@@ -27,12 +27,12 @@
 #include <unordered_map>
 #include <vector>
 
-static const bool DEFAULT_LOGTIMEMICROS = false;
-static const bool DEFAULT_LOGIPS        = false;
-static const bool DEFAULT_LOGTIMESTAMPS = true;
-static const bool DEFAULT_LOGTHREADNAMES = false;
-static const bool DEFAULT_LOGSOURCELOCATIONS = false;
-static constexpr bool DEFAULT_LOGLEVELALWAYS = false;
+inline constexpr bool DEFAULT_LOGTIMEMICROS = false;
+inline constexpr bool DEFAULT_LOGIPS        = false;
+inline constexpr bool DEFAULT_LOGTIMESTAMPS = true;
+inline constexpr bool DEFAULT_LOGTHREADNAMES = false;
+inline constexpr bool DEFAULT_LOGSOURCELOCATIONS = false;
+inline constexpr bool DEFAULT_LOGLEVELALWAYS = false;
 extern const char * const DEFAULT_DEBUGLOGFILE;
 
 extern bool fLogIPs;
@@ -227,7 +227,7 @@ namespace BCLog {
          */
         void DisableLogging() EXCLUSIVE_LOCKS_REQUIRED(!m_cs);
 
-        void ShrinkDebugFile();
+        void ShrinkDebugFile() EXCLUSIVE_LOCKS_REQUIRED(!m_cs);
 
         std::unordered_map<LogFlags, Level> CategoryLevels() const EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
@@ -275,19 +275,12 @@ namespace BCLog {
         static std::string LogLevelToStr(BCLog::Level level);
 
         bool DefaultShrinkDebugFile() const;
-    };
 
+        //! Return log flag if str parses as a log category.
+        static std::optional<BCLog::LogFlags> GetLogCategory(std::string_view str);
+    };
 } // namespace BCLog
 
 BCLog::Logger& LogInstance();
 
-/** Return true if log accepts specified category, at the specified level. */
-static inline bool LogAcceptCategory(BCLog::LogFlags category, BCLog::Level level)
-{
-    return LogInstance().WillLogCategoryLevel(category, level);
-}
-
-/// Return log flag if str parses as a log category.
-std::optional<BCLog::LogFlags> GetLogCategory(std::string_view str);
-
 #endif // BITCOIN_LOGGING_H
diff --git a/depend/bitcoin/src/logging/categories.h b/depend/bitcoin/src/logging/categories.h
index dff00ada..4bc8724a 100644
--- a/depend/bitcoin/src/logging/categories.h
+++ b/depend/bitcoin/src/logging/categories.h
@@ -30,22 +30,21 @@ enum LogFlags : CategoryMask {
     PRUNE = (CategoryMask{1} << 14),
     PROXY = (CategoryMask{1} << 15),
     MEMPOOLREJ = (CategoryMask{1} << 16),
-    LIBEVENT = (CategoryMask{1} << 17),
-    COINDB = (CategoryMask{1} << 18),
-    QT = (CategoryMask{1} << 19),
-    LEVELDB = (CategoryMask{1} << 20),
-    VALIDATION = (CategoryMask{1} << 21),
-    I2P = (CategoryMask{1} << 22),
-    IPC = (CategoryMask{1} << 23),
+    COINDB = (CategoryMask{1} << 17),
+    QT = (CategoryMask{1} << 18),
+    LEVELDB = (CategoryMask{1} << 19),
+    VALIDATION = (CategoryMask{1} << 20),
+    I2P = (CategoryMask{1} << 21),
+    IPC = (CategoryMask{1} << 22),
 #ifdef DEBUG_LOCKCONTENTION
-    LOCK = (CategoryMask{1} << 24),
+    LOCK = (CategoryMask{1} << 23),
 #endif
-    BLOCKSTORAGE = (CategoryMask{1} << 25),
-    TXRECONCILIATION = (CategoryMask{1} << 26),
-    SCAN = (CategoryMask{1} << 27),
-    TXPACKAGES = (CategoryMask{1} << 28),
-    KERNEL = (CategoryMask{1} << 29),
-    PRIVBROADCAST = (CategoryMask{1} << 30),
+    BLOCKSTORAGE = (CategoryMask{1} << 24),
+    TXRECONCILIATION = (CategoryMask{1} << 25),
+    SCAN = (CategoryMask{1} << 26),
+    TXPACKAGES = (CategoryMask{1} << 27),
+    KERNEL = (CategoryMask{1} << 28),
+    PRIVBROADCAST = (CategoryMask{1} << 29),
     ALL = ~NONE,
 };
 
diff --git a/depend/bitcoin/src/logging/timer.h b/depend/bitcoin/src/logging/timer.h
index 2b183822..1706c9e7 100644
--- a/depend/bitcoin/src/logging/timer.h
+++ b/depend/bitcoin/src/logging/timer.h
@@ -99,13 +99,13 @@ class Timer
 
 
 #define LOG_TIME_MICROS_WITH_CATEGORY(end_msg, log_category) \
-    BCLog::Timer<std::chrono::microseconds> UNIQUE_NAME(logging_timer)(__func__, end_msg, log_category)
+    BCLog::Timer<std::chrono::microseconds> BITCOIN_UNIQUE_NAME(logging_timer)(__func__, end_msg, log_category)
 #define LOG_TIME_MILLIS_WITH_CATEGORY(end_msg, log_category) \
-    BCLog::Timer<std::chrono::milliseconds> UNIQUE_NAME(logging_timer)(__func__, end_msg, log_category)
+    BCLog::Timer<std::chrono::milliseconds> BITCOIN_UNIQUE_NAME(logging_timer)(__func__, end_msg, log_category)
 #define LOG_TIME_MILLIS_WITH_CATEGORY_MSG_ONCE(end_msg, log_category) \
-    BCLog::Timer<std::chrono::milliseconds> UNIQUE_NAME(logging_timer)(__func__, end_msg, log_category, /* msg_on_completion=*/false)
+    BCLog::Timer<std::chrono::milliseconds> BITCOIN_UNIQUE_NAME(logging_timer)(__func__, end_msg, log_category, /* msg_on_completion=*/false)
 #define LOG_TIME_SECONDS(end_msg) \
-    BCLog::Timer<std::chrono::seconds> UNIQUE_NAME(logging_timer)(__func__, end_msg)
+    BCLog::Timer<std::chrono::seconds> BITCOIN_UNIQUE_NAME(logging_timer)(__func__, end_msg)
 
 
 #endif // BITCOIN_LOGGING_TIMER_H
diff --git a/depend/bitcoin/src/mapport.cpp b/depend/bitcoin/src/mapport.cpp
index 43918ebf..6a334802 100644
--- a/depend/bitcoin/src/mapport.cpp
+++ b/depend/bitcoin/src/mapport.cpp
@@ -8,11 +8,11 @@
 #include <common/netif.h>
 #include <common/pcp.h>
 #include <common/system.h>
-#include <logging.h>
 #include <net.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <random.h>
+#include <util/log.h>
 #include <util/thread.h>
 #include <util/threadinterrupt.h>
 
@@ -119,6 +119,7 @@ static void ProcessPCP()
     // we rather just choose a fairly short expiry time.
 }
 
+/// \anchor mapport
 static void ThreadMapPort()
 {
     do {
diff --git a/depend/bitcoin/src/mapport.h b/depend/bitcoin/src/mapport.h
index 2133907b..a33f9c60 100644
--- a/depend/bitcoin/src/mapport.h
+++ b/depend/bitcoin/src/mapport.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_MAPPORT_H
 #define BITCOIN_MAPPORT_H
 
-static constexpr bool DEFAULT_NATPMP = true;
+inline constexpr bool DEFAULT_NATPMP = true;
 
 void StartMapPort(bool enable);
 void InterruptMapPort();
diff --git a/depend/bitcoin/src/minisketch/src/fields/clmul_common_impl.h b/depend/bitcoin/src/minisketch/src/fields/clmul_common_impl.h
index 2cecbf58..7cb43908 100644
--- a/depend/bitcoin/src/minisketch/src/fields/clmul_common_impl.h
+++ b/depend/bitcoin/src/minisketch/src/fields/clmul_common_impl.h
@@ -12,6 +12,7 @@
 
 #include "../int_utils.h"
 #include "../lintrans.h"
+#include "../util.h"
 
 namespace {
 
@@ -28,7 +29,7 @@ namespace {
 #  define NO_SANITIZE_MEMORY
 #endif
 
-template<typename I, int BITS, I MOD> NO_SANITIZE_MEMORY I MulWithClMulReduce(I a, I b)
+template<typename I, int BITS, I MOD> NO_SANITIZE_MEMORY MAYBE_UNUSED I MulWithClMulReduce(I a, I b)
 {
     static constexpr I MASK = Mask<BITS, I>();
 
@@ -65,7 +66,7 @@ template<typename I, int BITS, I MOD> NO_SANITIZE_MEMORY I MulWithClMulReduce(I
     }
 }
 
-template<typename I, int BITS, int POS> NO_SANITIZE_MEMORY I MulTrinomial(I a, I b)
+template<typename I, int BITS, int POS> NO_SANITIZE_MEMORY MAYBE_UNUSED I MulTrinomial(I a, I b)
 {
     static constexpr I MASK = Mask<BITS, I>();
 
diff --git a/depend/bitcoin/src/minisketch/src/util.h b/depend/bitcoin/src/minisketch/src/util.h
index fdb3f3a2..50ee1aa0 100644
--- a/depend/bitcoin/src/minisketch/src/util.h
+++ b/depend/bitcoin/src/minisketch/src/util.h
@@ -26,6 +26,20 @@
 #define EXPECT(x,c) (x)
 #endif
 
+#if defined(__has_cpp_attribute)
+#  if __has_cpp_attribute(maybe_unused)
+#    define MAYBE_UNUSED [[maybe_unused]]
+#  endif
+#endif
+
+#ifndef MAYBE_UNUSED
+#  if defined(__GNUC__)
+#    define MAYBE_UNUSED __attribute__((unused))
+#  else
+#    define MAYBE_UNUSED
+#  endif
+#endif
+
 /* Assertion macros */
 
 /**
diff --git a/depend/bitcoin/src/musig.cpp b/depend/bitcoin/src/musig.cpp
index 706874be..38a49fa2 100644
--- a/depend/bitcoin/src/musig.cpp
+++ b/depend/bitcoin/src/musig.cpp
@@ -3,19 +3,22 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <musig.h>
+#include <key.h>
+#include <random.h>
 #include <support/allocators/secure.h>
 
 #include <secp256k1_musig.h>
 
 //! MuSig2 chaincode as defined by BIP 328
 using namespace util::hex_literals;
-constexpr uint256 MUSIG_CHAINCODE{
-    // Use immediate lambda to work around GCC-14 bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117966
-    []() consteval { return uint256{"868087ca02a6f974c4598924c36b57762d32cb45717167e300622c7167e38965"_hex_u8}; }(),
-};
+const ChainCode MUSIG_CHAINCODE{"868087ca02a6f974c4598924c36b57762d32cb45717167e300622c7167e38965"_hex_u8};
 
 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;
@@ -72,7 +75,7 @@ CExtPubKey CreateMuSig2SyntheticXpub(const CPubKey& pubkey)
 {
     CExtPubKey extpub;
     extpub.nDepth = 0;
-    std::memset(extpub.vchFingerprint, 0, 4);
+    extpub.fingerprint.fill(0);
     extpub.nChild = 0;
     extpub.chaincode = MUSIG_CHAINCODE;
     extpub.pubkey = pubkey;
@@ -119,13 +122,135 @@ bool MuSig2SecNonce::IsValid()
     return m_impl->IsValid();
 }
 
-uint256 MuSig2SessionID(const CPubKey& script_pubkey, const CPubKey& part_pubkey, const uint256& sighash)
+uint256 MuSig2SessionID(const CPubKey& script_pubkey, const CPubKey& part_pubkey, const uint256& sighash, const std::vector<uint8_t>& pubnonce)
 {
     HashWriter hasher;
-    hasher << script_pubkey << part_pubkey << sighash;
+    hasher << script_pubkey << part_pubkey << sighash << pubnonce;
     return hasher.GetSHA256();
 }
 
+std::vector<uint8_t> CreateMuSig2Nonce(MuSig2SecNonce& secnonce, const uint256& sighash, const CKey& our_seckey, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys)
+{
+    // Get the keyagg cache and aggregate pubkey
+    secp256k1_musig_keyagg_cache keyagg_cache;
+    if (!MuSig2AggregatePubkeys(pubkeys, keyagg_cache, aggregate_pubkey)) return {};
+
+    // Parse participant pubkey
+    CPubKey our_pubkey = our_seckey.GetPubKey();
+    secp256k1_pubkey pubkey;
+    if (!secp256k1_ec_pubkey_parse(secp256k1_context_static, &pubkey, our_pubkey.data(), our_pubkey.size())) {
+        return {};
+    }
+
+    // Generate randomness for nonce
+    uint256 rand;
+    GetStrongRandBytes(rand);
+
+    // Generate nonce
+    secp256k1_musig_pubnonce pubnonce;
+    if (!secp256k1_musig_nonce_gen(GetSecp256k1SignContext(), secnonce.Get(), &pubnonce, rand.data(), UCharCast(our_seckey.begin()), &pubkey, sighash.data(), &keyagg_cache, nullptr)) {
+        return {};
+    }
+
+    // Serialize pubnonce
+    std::vector<uint8_t> out;
+    out.resize(MUSIG2_PUBNONCE_SIZE);
+    if (!secp256k1_musig_pubnonce_serialize(secp256k1_context_static, out.data(), &pubnonce)) {
+        return {};
+    }
+
+    return out;
+}
+
+std::optional<uint256> CreateMuSig2PartialSig(const uint256& sighash, const CKey& our_seckey, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys, const std::map<CPubKey, std::vector<uint8_t>>& pubnonces, MuSig2SecNonce& secnonce, const std::vector<std::pair<uint256, bool>>& tweaks)
+{
+    secp256k1_keypair keypair;
+    if (!secp256k1_keypair_create(GetSecp256k1SignContext(), &keypair, UCharCast(our_seckey.begin()))) return std::nullopt;
+
+    // Get the keyagg cache and aggregate pubkey
+    secp256k1_musig_keyagg_cache keyagg_cache;
+    if (!MuSig2AggregatePubkeys(pubkeys, keyagg_cache, aggregate_pubkey)) return std::nullopt;
+
+    // Check that there are enough pubnonces
+    if (pubnonces.size() != pubkeys.size()) return std::nullopt;
+
+    // Parse the pubnonces
+    std::vector<std::pair<secp256k1_pubkey, secp256k1_musig_pubnonce>> signers_data;
+    std::vector<const secp256k1_musig_pubnonce*> pubnonce_ptrs;
+    std::optional<size_t> our_pubkey_idx;
+    CPubKey our_pubkey = our_seckey.GetPubKey();
+    for (const CPubKey& part_pk : pubkeys) {
+        const auto& pn_it = pubnonces.find(part_pk);
+        if (pn_it == pubnonces.end()) return std::nullopt;
+        const std::vector<uint8_t> pubnonce = pn_it->second;
+        if (pubnonce.size() != MUSIG2_PUBNONCE_SIZE) return std::nullopt;
+        if (part_pk == our_pubkey) {
+            our_pubkey_idx = signers_data.size();
+        }
+
+        auto& [secp_pk, secp_pn] = signers_data.emplace_back();
+
+        if (!secp256k1_ec_pubkey_parse(secp256k1_context_static, &secp_pk, part_pk.data(), part_pk.size())) {
+            return std::nullopt;
+        }
+
+        if (!secp256k1_musig_pubnonce_parse(secp256k1_context_static, &secp_pn, pubnonce.data())) {
+            return std::nullopt;
+        }
+    }
+    if (our_pubkey_idx == std::nullopt) {
+        return std::nullopt;
+    }
+    pubnonce_ptrs.reserve(signers_data.size());
+    for (auto& [_, pn] : signers_data) {
+        pubnonce_ptrs.push_back(&pn);
+    }
+
+    // Aggregate nonces
+    secp256k1_musig_aggnonce aggnonce;
+    if (!secp256k1_musig_nonce_agg(secp256k1_context_static, &aggnonce, pubnonce_ptrs.data(), pubnonce_ptrs.size())) {
+        return std::nullopt;
+    }
+
+    // Apply tweaks
+    for (const auto& [tweak, xonly] : tweaks) {
+        if (xonly) {
+            if (!secp256k1_musig_pubkey_xonly_tweak_add(secp256k1_context_static, nullptr, &keyagg_cache, tweak.data())) {
+                return std::nullopt;
+            }
+        } else if (!secp256k1_musig_pubkey_ec_tweak_add(secp256k1_context_static, nullptr, &keyagg_cache, tweak.data())) {
+            return std::nullopt;
+        }
+    }
+
+    // Create musig_session
+    secp256k1_musig_session session;
+    if (!secp256k1_musig_nonce_process(secp256k1_context_static, &session, &aggnonce, sighash.data(), &keyagg_cache)) {
+        return std::nullopt;
+    }
+
+    // Create partial signature
+    secp256k1_musig_partial_sig psig;
+    if (!secp256k1_musig_partial_sign(secp256k1_context_static, &psig, secnonce.Get(), &keypair, &keyagg_cache, &session)) {
+        return std::nullopt;
+    }
+    // The secnonce must be deleted after signing to prevent nonce reuse.
+    secnonce.Invalidate();
+
+    // Verify partial signature
+    if (!secp256k1_musig_partial_sig_verify(secp256k1_context_static, &psig, &(signers_data.at(*our_pubkey_idx).second), &(signers_data.at(*our_pubkey_idx).first), &keyagg_cache, &session)) {
+        return std::nullopt;
+    }
+
+    // Serialize
+    uint256 sig;
+    if (!secp256k1_musig_partial_sig_serialize(secp256k1_context_static, sig.data(), &psig)) {
+        return std::nullopt;
+    }
+
+    return sig;
+}
+
 std::optional<std::vector<uint8_t>> CreateMuSig2AggregateSig(const std::vector<CPubKey>& part_pubkeys, const CPubKey& aggregate_pubkey, const std::vector<std::pair<uint256, bool>>& tweaks, const uint256& sighash, const std::map<CPubKey, std::vector<uint8_t>>& pubnonces, const std::map<CPubKey, uint256>& partial_sigs)
 {
     if (!part_pubkeys.size()) return std::nullopt;
diff --git a/depend/bitcoin/src/musig.h b/depend/bitcoin/src/musig.h
index f518ae81..4fb69b29 100644
--- a/depend/bitcoin/src/musig.h
+++ b/depend/bitcoin/src/musig.h
@@ -10,11 +10,12 @@
 #include <optional>
 #include <vector>
 
+class CKey;
 struct secp256k1_musig_keyagg_cache;
 class MuSig2SecNonceImpl;
 struct secp256k1_musig_secnonce;
 
-constexpr size_t MUSIG2_PUBNONCE_SIZE{66};
+inline constexpr size_t MUSIG2_PUBNONCE_SIZE{66};
 
 //! Compute the full aggregate pubkey from the given participant pubkeys in their current order.
 //! Outputs the secp256k1_musig_keyagg_cache and validates that the computed aggregate pubkey matches an expected aggregate pubkey.
@@ -56,8 +57,14 @@ class MuSig2SecNonce
     bool IsValid();
 };
 
-uint256 MuSig2SessionID(const CPubKey& script_pubkey, const CPubKey& part_pubkey, const uint256& sighash);
+/**
+ * Computes an arbitrary unique session ID to identify ongoing signing sessions.
+ * It is the SHA256 of the signing (aggregate) pubkey, the participant pubkey, the sighash, and the pubnonce
+ */
+uint256 MuSig2SessionID(const CPubKey& script_pubkey, const CPubKey& part_pubkey, const uint256& sighash, const std::vector<uint8_t>& pubnonce);
 
+std::vector<uint8_t> CreateMuSig2Nonce(MuSig2SecNonce& secnonce, const uint256& sighash, const CKey& our_seckey, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys);
+std::optional<uint256> CreateMuSig2PartialSig(const uint256& hash, const CKey& our_seckey, const CPubKey& aggregate_pubkey, const std::vector<CPubKey>& pubkeys, const std::map<CPubKey, std::vector<uint8_t>>& pubnonces, MuSig2SecNonce& secnonce, const std::vector<std::pair<uint256, bool>>& tweaks);
 std::optional<std::vector<uint8_t>> CreateMuSig2AggregateSig(const std::vector<CPubKey>& participants, const CPubKey& aggregate_pubkey, const std::vector<std::pair<uint256, bool>>& tweaks, const uint256& sighash, const std::map<CPubKey, std::vector<uint8_t>>& pubnonces, const std::map<CPubKey, uint256>& partial_sigs);
 
 #endif // BITCOIN_MUSIG_H
diff --git a/depend/bitcoin/src/net.cpp b/depend/bitcoin/src/net.cpp
index d046c2a2..e890e291 100644
--- a/depend/bitcoin/src/net.cpp
+++ b/depend/bitcoin/src/net.cpp
@@ -29,6 +29,7 @@
 #include <random.h>
 #include <scheduler.h>
 #include <util/fs.h>
+#include <util/overflow.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
 #include <util/thread.h>
@@ -205,7 +206,7 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)
     while (!s.empty()) {
         CService endpoint;
         s >> endpoint;
-        CAddress addr{endpoint, SeedsServiceFlags()};
+        CAddress addr{endpoint, SeedsAssumedServiceFlags()};
         addr.nTime = rng.rand_uniform_delay(Now<NodeSeconds>() - one_week, -one_week);
         LogDebug(BCLog::NET, "Added hardcoded seed: %s\n", addr.ToStringAddrPort());
         vSeedsOut.push_back(addr);
@@ -274,7 +275,7 @@ void ClearLocal()
 }
 
 // learn a new local address
-bool AddLocal(const CService& addr_, int nScore)
+bool AddLocal(const CService& addr_, int nScore, bool add_even_if_unreachable)
 {
     CService addr{MaybeFlipIPv6toCJDNS(addr_)};
 
@@ -284,7 +285,7 @@ bool AddLocal(const CService& addr_, int nScore)
     if (!fDiscover && nScore < LOCAL_MANUAL)
         return false;
 
-    if (!g_reachable_nets.Contains(addr))
+    if (!g_reachable_nets.Contains(addr) && !add_even_if_unreachable)
         return false;
 
     if (fLogIPs) {
@@ -296,7 +297,7 @@ bool AddLocal(const CService& addr_, int nScore)
         const auto [it, is_newly_added] = mapLocalHost.emplace(addr, LocalServiceInfo());
         LocalServiceInfo &info = it->second;
         if (is_newly_added || nScore >= info.nScore) {
-            info.nScore = nScore + (is_newly_added ? 0 : 1);
+            info.nScore = SaturatingAdd(nScore, is_newly_added ? 0 : 1);
             info.nPort = addr.GetPort();
         }
     }
@@ -304,9 +305,9 @@ bool AddLocal(const CService& addr_, int nScore)
     return true;
 }
 
-bool AddLocal(const CNetAddr &addr, int nScore)
+bool AddLocal(const CNetAddr& addr, int nScore, bool add_even_if_unreachable)
 {
-    return AddLocal(CService(addr, GetListenPort()), nScore);
+    return AddLocal(CService(addr, GetListenPort()), nScore, add_even_if_unreachable);
 }
 
 void RemoveLocal(const CService& addr)
@@ -325,7 +326,7 @@ bool SeenLocal(const CService& addr)
     LOCK(g_maplocalhost_mutex);
     const auto it = mapLocalHost.find(addr);
     if (it == mapLocalHost.end()) return false;
-    ++it->second.nScore;
+    it->second.nScore = SaturatingAdd(it->second.nScore, 1);
     return true;
 }
 
@@ -381,6 +382,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                              bool use_v2transport,
                              const std::optional<Proxy>& proxy_override)
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_unused_i2p_sessions_mutex);
     assert(conn_type != ConnectionType::INBOUND);
 
@@ -487,8 +489,11 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                 LogDebug(BCLog::PROXY, "Using proxy: %s to connect to %s\n", use_proxy->ToString(), target_addr.ToStringAddrPort());
                 sock = ConnectThroughProxy(*use_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
@@ -538,6 +543,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,
@@ -916,7 +922,7 @@ namespace {
  * Only message types that are actually implemented in this codebase need to be listed, as other
  * messages get ignored anyway - whether we know how to decode them or not.
  */
-const std::array<std::string, 33> V2_MESSAGE_IDS = {
+const std::array<std::string, BIP324_SHORTIDS_IMPLEMENTED> V2_MESSAGE_IDS = {
     "", // 12 bytes follow encoding the message type like in V1
     NetMsgType::ADDR,
     NetMsgType::BLOCK,
@@ -946,11 +952,10 @@ const std::array<std::string, 33> V2_MESSAGE_IDS = {
     NetMsgType::GETCFCHECKPT,
     NetMsgType::CFCHECKPT,
     NetMsgType::ADDRV2,
-    // Unimplemented message types that are assigned in BIP324:
-    "",
-    "",
-    "",
-    ""
+    "", "", "", // Unimplemented message types 29-31
+    "", "", "", "", // Unimplemented message types 32-35
+    "",  // Unimplemented message type 36
+    NetMsgType::FEATURE,
 };
 
 class V2MessageMap
@@ -1678,7 +1683,7 @@ std::pair<size_t, bool> CConnman::SocketSendData(CNode& node) const
     return {nSentSize, data_left};
 }
 
-/** Try to find a connection to evict when the node is full.
+/** Try to find an inbound connection to evict.
  *  Extreme care must be taken to avoid opening the node to attacker
  *   triggered network partitioning.
  *  The strategy used here is to protect a small number of peers
@@ -1686,8 +1691,10 @@ std::pair<size_t, bool> CConnman::SocketSendData(CNode& node) const
  *   to forge.  In order to partition a node the attacker must be
  *   simultaneously better at all of them than honest peers.
  */
-bool CConnman::AttemptToEvictConnection()
+bool CConnman::AttemptToEvictConnection(bool evict_tx_relay_peer_only, std::optional<NodeId> protect_peer)
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     std::vector<NodeEvictionCandidate> vEvictionCandidates;
     {
 
@@ -1695,6 +1702,12 @@ bool CConnman::AttemptToEvictConnection()
         for (const CNode* node : m_nodes) {
             if (node->fDisconnect)
                 continue;
+            if (protect_peer.has_value() && node->GetId() == protect_peer) {
+                continue;
+            }
+            if (evict_tx_relay_peer_only && !node->m_relays_txs) {
+                continue;
+            }
             NodeEvictionCandidate candidate{
                 .id = node->GetId(),
                 .m_connected = node->m_connected,
@@ -1736,6 +1749,8 @@ bool CConnman::AttemptToEvictConnection()
 }
 
 void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
+    AssertLockNotHeld(m_nodes_mutex);
+
     struct sockaddr_storage sockaddr;
     socklen_t len = sizeof(sockaddr);
     auto sock = hListenSocket.sock->Accept((struct sockaddr*)&sockaddr, &len);
@@ -1768,6 +1783,8 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
                                             const CService& addr_bind,
                                             const CService& addr)
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     int nInbound = 0;
 
     const bool inbound_onion = std::find(m_onion_binds.begin(), m_onion_binds.end(), addr_bind) != m_onion_binds.end();
@@ -1819,7 +1836,7 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
 
     if (nInbound >= m_max_inbound)
     {
-        if (!AttemptToEvictConnection()) {
+        if (!AttemptToEvictConnection(/*evict_tx_relay_peer_only=*/false)) {
             // No connection to evict, disconnect the new connection
             LogDebug(BCLog::NET, "failed to find an eviction candidate - connection dropped (full)\n");
             return;
@@ -1875,6 +1892,7 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
 
 bool CConnman::AddConnection(const std::string& address, ConnectionType conn_type, bool use_v2transport = false)
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_unused_i2p_sessions_mutex);
     std::optional<int> max_connections;
     switch (conn_type) {
@@ -1907,7 +1925,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;
 }
 
@@ -1948,6 +1972,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,
@@ -1992,6 +2017,8 @@ void CConnman::DisconnectNodes()
 
 void CConnman::NotifyNumConnectionsChanged()
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     size_t nodes_size;
     {
         LOCK(m_nodes_mutex);
@@ -2068,7 +2095,7 @@ Sock::EventsPerSock CConnman::GenerateWaitSockets(std::span<CNode* const> nodes)
     Sock::EventsPerSock events_per_sock;
 
     for (const ListenSocket& hListenSocket : vhListenSocket) {
-        events_per_sock.emplace(hListenSocket.sock, Sock::Events{Sock::RECV});
+        events_per_sock.emplace(hListenSocket.sock, Sock::Events{Sock::RecvEvent});
     }
 
     for (CNode* pnode : nodes) {
@@ -2086,7 +2113,7 @@ Sock::EventsPerSock CConnman::GenerateWaitSockets(std::span<CNode* const> nodes)
 
         LOCK(pnode->m_sock_mutex);
         if (pnode->m_sock) {
-            Sock::Event event = (select_send ? Sock::SEND : 0) | (select_recv ? Sock::RECV : 0);
+            Sock::Event event = (select_send ? Sock::SendEvent : 0) | (select_recv ? Sock::RecvEvent : 0);
             events_per_sock.emplace(pnode->m_sock, Sock::Events{event});
         }
     }
@@ -2096,6 +2123,7 @@ Sock::EventsPerSock CConnman::GenerateWaitSockets(std::span<CNode* const> nodes)
 
 void CConnman::SocketHandler()
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_total_bytes_sent_mutex);
 
     Sock::EventsPerSock events_per_sock;
@@ -2147,9 +2175,9 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
             }
             const auto it = events_per_sock.find(pnode->m_sock);
             if (it != events_per_sock.end()) {
-                recvSet = it->second.occurred & Sock::RECV;
-                sendSet = it->second.occurred & Sock::SEND;
-                errorSet = it->second.occurred & Sock::ERR;
+                recvSet = it->second.occurred & Sock::RecvEvent;
+                sendSet = it->second.occurred & Sock::SendEvent;
+                errorSet = it->second.occurred & Sock::ErrorEvent;
             }
         }
 
@@ -2226,12 +2254,14 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
 
 void CConnman::SocketHandlerListening(const Sock::EventsPerSock& events_per_sock)
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     for (const ListenSocket& listen_socket : vhListenSocket) {
         if (m_interrupt_net->interrupted()) {
             return;
         }
         const auto it = events_per_sock.find(listen_socket.sock);
-        if (it != events_per_sock.end() && it->second.occurred & Sock::RECV) {
+        if (it != events_per_sock.end() && it->second.occurred & Sock::RecvEvent) {
             AcceptConnection(listen_socket);
         }
     }
@@ -2376,7 +2406,7 @@ void CConnman::ThreadDNSAddressSeed()
                 const auto addresses{LookupHost(host, nMaxIPs, true)};
                 if (!addresses.empty()) {
                     for (const CNetAddr& ip : addresses) {
-                        CAddress addr = CAddress(CService(ip, m_params.GetDefaultPort()), requiredServiceBits);
+                        CAddress addr = CAddress(CService(ip, m_params.GetDefaultPort()), SeedsAssumedServiceFlags());
                         addr.nTime = rng.rand_uniform_delay(Now<NodeSeconds>() - 3 * 24h, -4 * 24h); // use a random age between 3 and 7 days old
                         vAdd.push_back(addr);
                         found++;
@@ -2409,6 +2439,7 @@ void CConnman::DumpAddresses()
 
 void CConnman::ProcessAddrFetch()
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_unused_i2p_sessions_mutex);
     std::string strDest;
     {
@@ -2424,7 +2455,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);
     }
 }
 
@@ -2448,6 +2485,8 @@ void CConnman::StartExtraBlockRelayPeers()
 // Return the number of outbound connections that are full relay (not blocks only)
 int CConnman::GetFullOutboundConnCount() const
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     int nRelevant = 0;
     {
         LOCK(m_nodes_mutex);
@@ -2466,6 +2505,8 @@ int CConnman::GetFullOutboundConnCount() const
 // evict some peer that has finished the handshake)
 int CConnman::GetExtraFullOutboundCount() const
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     int full_outbound_peers = 0;
     {
         LOCK(m_nodes_mutex);
@@ -2480,6 +2521,8 @@ int CConnman::GetExtraFullOutboundCount() const
 
 int CConnman::GetExtraBlockRelayCount() const
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     int block_relay_peers = 0;
     {
         LOCK(m_nodes_mutex);
@@ -2492,6 +2535,23 @@ int CConnman::GetExtraBlockRelayCount() const
     return std::max(block_relay_peers - m_max_outbound_block_relay, 0);
 }
 
+bool CConnman::EvictTxPeerIfFull(std::optional<NodeId> protect_peer)
+{
+    int tx_inbound_peers{0};
+    {
+        LOCK(m_nodes_mutex);
+        for (const CNode* pnode : m_nodes) {
+            if (!pnode->fDisconnect && pnode->IsInboundConn() && pnode->m_relays_txs) {
+                ++tx_inbound_peers;
+            }
+        }
+    }
+    if (tx_inbound_peers > m_max_inbound_full_relay) {
+        return AttemptToEvictConnection(/*evict_tx_relay_peer_only=*/true, protect_peer);
+    }
+    return true;
+}
+
 std::unordered_set<Network> CConnman::GetReachableEmptyNetworks() const
 {
     std::unordered_set<Network> networks{};
@@ -2513,6 +2573,8 @@ bool CConnman::MultipleManualOrFullOutboundConns(Network net) const
 
 bool CConnman::MaybePickPreferredNetwork(std::optional<Network>& network)
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     std::array<Network, 5> nets{NET_IPV4, NET_IPV6, NET_ONION, NET_I2P, NET_CJDNS};
     std::shuffle(nets.begin(), nets.end(), FastRandomContext());
 
@@ -2529,8 +2591,10 @@ bool CConnman::MaybePickPreferredNetwork(std::optional<Network>& network)
 
 void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, std::span<const std::string> seed_nodes)
 {
-    AssertLockNotHeld(m_unused_i2p_sessions_mutex);
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_reconnections_mutex);
+    AssertLockNotHeld(m_unused_i2p_sessions_mutex);
+
     FastRandomContext rng;
     // Connect to specific addresses
     if (!connect.empty())
@@ -2542,8 +2606,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,13 +2962,20 @@ 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);
         }
     }
 }
 
 std::vector<CAddress> CConnman::GetCurrentBlockRelayOnlyConns() const
 {
+    AssertLockNotHeld(m_nodes_mutex);
     std::vector<CAddress> ret;
     LOCK(m_nodes_mutex);
     for (const CNode* pnode : m_nodes) {
@@ -2913,6 +2989,8 @@ std::vector<CAddress> CConnman::GetCurrentBlockRelayOnlyConns() const
 
 std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo(bool include_connected) const
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     std::vector<AddedNodeInfo> ret;
 
     std::list<AddedNodeParams> lAddresses(0);
@@ -2973,8 +3051,10 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo(bool include_connected) co
 
 void CConnman::ThreadOpenAddedConnections()
 {
-    AssertLockNotHeld(m_unused_i2p_sessions_mutex);
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_reconnections_mutex);
+    AssertLockNotHeld(m_unused_i2p_sessions_mutex);
+
     while (true)
     {
         CountingSemaphoreGrant<> grant(*semAddnode);
@@ -2987,8 +3067,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);
         }
@@ -3010,6 +3095,7 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect,
                                      bool use_v2transport,
                                      const std::optional<Proxy>& proxy_override)
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_unused_i2p_sessions_mutex);
     assert(conn_type != ConnectionType::INBOUND);
 
@@ -3129,6 +3215,8 @@ Mutex NetEventsInterface::g_msgproc_mutex;
 
 void CConnman::ThreadMessageHandler()
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     LOCK(NetEventsInterface::g_msgproc_mutex);
 
     while (!flagInterruptMsgProc)
@@ -3168,6 +3256,8 @@ void CConnman::ThreadMessageHandler()
 
 void CConnman::ThreadI2PAcceptIncoming()
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     static constexpr auto err_wait_begin = 1s;
     static constexpr auto err_wait_cap = 5min;
     auto err_wait = err_wait_begin;
@@ -3211,6 +3301,7 @@ void CConnman::ThreadI2PAcceptIncoming()
 
 void CConnman::ThreadPrivateBroadcast()
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_unused_i2p_sessions_mutex);
 
     size_t addrman_num_bad_addresses{0};
@@ -3640,6 +3731,7 @@ void CConnman::StopThreads()
 
 void CConnman::StopNodes()
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_reconnections_mutex);
 
     if (fAddressesInitialized) {
@@ -3804,6 +3896,8 @@ uint32_t CConnman::GetMappedAS(const CNetAddr& addr) const
 
 void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) const
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     vstats.clear();
     LOCK(m_nodes_mutex);
     vstats.reserve(m_nodes.size());
@@ -3829,6 +3923,7 @@ bool CConnman::DisconnectNode(std::string_view strNode)
 
 bool CConnman::DisconnectNode(const CSubNet& subnet)
 {
+    AssertLockNotHeld(m_nodes_mutex);
     bool disconnected = false;
     LOCK(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
@@ -3843,6 +3938,7 @@ bool CConnman::DisconnectNode(const CSubNet& subnet)
 
 bool CConnman::DisconnectNode(const CNetAddr& addr)
 {
+    AssertLockNotHeld(m_nodes_mutex);
     return DisconnectNode(CSubNet(addr));
 }
 
@@ -3988,6 +4084,7 @@ CNode::CNode(NodeId idIn,
       m_permission_flags{node_opts.permission_flags},
       m_sock{sock},
       m_connected{NodeClock::now()},
+      m_proxy_override{std::move(node_opts.proxy_override)},
       addr{addrIn},
       addrBind{addrBindIn},
       m_addr_name{addrNameIn.empty() ? addr.ToStringAddrPort() : addrNameIn},
@@ -4125,6 +4222,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 
 bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)
 {
+    AssertLockNotHeld(m_nodes_mutex);
+
     CNode* found = nullptr;
     LOCK(m_nodes_mutex);
     for (auto&& pnode : m_nodes) {
@@ -4150,6 +4249,7 @@ uint64_t CConnman::CalculateKeyedNetGroup(const CNetAddr& address) const
 
 void CConnman::PerformReconnections()
 {
+    AssertLockNotHeld(m_nodes_mutex);
     AssertLockNotHeld(m_reconnections_mutex);
     AssertLockNotHeld(m_unused_i2p_sessions_mutex);
     while (true) {
@@ -4171,7 +4271,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/depend/bitcoin/src/net.h b/depend/bitcoin/src/net.h
index 928d518e..ea0c651d 100644
--- a/depend/bitcoin/src/net.h
+++ b/depend/bitcoin/src/net.h
@@ -56,49 +56,51 @@ class CScheduler;
 struct bilingual_str;
 
 /** Time after which to disconnect, after waiting for a ping response (or inactivity). */
-static constexpr std::chrono::minutes TIMEOUT_INTERVAL{20};
+inline constexpr std::chrono::minutes TIMEOUT_INTERVAL{20};
 /** Run the feeler connection loop once every 2 minutes. **/
-static constexpr auto FEELER_INTERVAL = 2min;
+inline constexpr auto FEELER_INTERVAL = 2min;
 /** Run the extra block-relay-only connection loop once every 5 minutes. **/
-static constexpr auto EXTRA_BLOCK_RELAY_ONLY_PEER_INTERVAL = 5min;
+inline constexpr auto EXTRA_BLOCK_RELAY_ONLY_PEER_INTERVAL = 5min;
 /** Maximum length of incoming protocol messages (no message over 4 MB is currently acceptable). */
-static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;
+inline constexpr unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;
 /** Maximum length of the user agent string in `version` message */
-static const unsigned int MAX_SUBVERSION_LENGTH = 256;
+inline constexpr unsigned int MAX_SUBVERSION_LENGTH = 256;
 /** Maximum number of automatic outgoing nodes over which we'll relay everything (blocks, tx, addrs, etc) */
-static const int MAX_OUTBOUND_FULL_RELAY_CONNECTIONS = 8;
+inline constexpr int MAX_OUTBOUND_FULL_RELAY_CONNECTIONS = 8;
 /** Maximum number of addnode outgoing nodes */
-static const int MAX_ADDNODE_CONNECTIONS = 8;
+inline constexpr int MAX_ADDNODE_CONNECTIONS = 8;
 /** Maximum number of block-relay-only outgoing connections */
-static const int MAX_BLOCK_RELAY_ONLY_CONNECTIONS = 2;
+inline constexpr int MAX_BLOCK_RELAY_ONLY_CONNECTIONS = 2;
 /** Maximum number of feeler connections */
-static const int MAX_FEELER_CONNECTIONS = 1;
+inline constexpr int MAX_FEELER_CONNECTIONS = 1;
 /** Maximum number of private broadcast connections */
-static constexpr size_t MAX_PRIVATE_BROADCAST_CONNECTIONS{64};
+inline constexpr size_t MAX_PRIVATE_BROADCAST_CONNECTIONS{64};
 /** -listen default */
-static const bool DEFAULT_LISTEN = true;
+inline constexpr bool DEFAULT_LISTEN = true;
 /** The maximum number of peer connections to maintain. */
-static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125;
+inline constexpr unsigned int DEFAULT_MAX_PEER_CONNECTIONS{200};
+/** Default percentage of inbound connection slots that tx-relaying peers can use */
+inline constexpr int DEFAULT_FULL_RELAY_INBOUND_PCT{50};
 /** The default for -maxuploadtarget. 0 = Unlimited */
-static const std::string DEFAULT_MAX_UPLOAD_TARGET{"0M"};
+inline const std::string DEFAULT_MAX_UPLOAD_TARGET{"0M"};
 /** Default for blocks only*/
-static const bool DEFAULT_BLOCKSONLY = false;
+inline constexpr bool DEFAULT_BLOCKSONLY = false;
 /** -peertimeout default */
-static const int64_t DEFAULT_PEER_CONNECT_TIMEOUT = 60;
+inline constexpr int64_t DEFAULT_PEER_CONNECT_TIMEOUT = 60;
 /** Default for -privatebroadcast. */
-static constexpr bool DEFAULT_PRIVATE_BROADCAST{false};
+inline constexpr bool DEFAULT_PRIVATE_BROADCAST{false};
 /** Number of file descriptors required for message capture **/
-static const int NUM_FDS_MESSAGE_CAPTURE = 1;
+inline constexpr int NUM_FDS_MESSAGE_CAPTURE = 1;
 /** Interval for ASMap Health Check **/
-static constexpr std::chrono::hours ASMAP_HEALTH_CHECK_INTERVAL{24};
+inline constexpr std::chrono::hours ASMAP_HEALTH_CHECK_INTERVAL{24};
 
-static constexpr bool DEFAULT_FORCEDNSSEED{false};
-static constexpr bool DEFAULT_DNSSEED{true};
-static constexpr bool DEFAULT_FIXEDSEEDS{true};
-static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
-static const size_t DEFAULT_MAXSENDBUFFER    = 1 * 1000;
+inline constexpr bool DEFAULT_FORCEDNSSEED{false};
+inline constexpr bool DEFAULT_DNSSEED{true};
+inline constexpr bool DEFAULT_FIXEDSEEDS{true};
+inline constexpr size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
+inline constexpr size_t DEFAULT_MAXSENDBUFFER    = 1 * 1000;
 
-static constexpr bool DEFAULT_V2_TRANSPORT{true};
+inline constexpr bool DEFAULT_V2_TRANSPORT{true};
 
 typedef int64_t NodeId;
 
@@ -164,8 +166,8 @@ enum
 std::optional<CService> GetLocalAddrForPeer(CNode& node);
 
 void ClearLocal();
-bool AddLocal(const CService& addr, int nScore = LOCAL_NONE);
-bool AddLocal(const CNetAddr& addr, int nScore = LOCAL_NONE);
+bool AddLocal(const CService& addr, int nScore = LOCAL_NONE, bool add_even_if_unreachable = false);
+bool AddLocal(const CNetAddr& addr, int nScore = LOCAL_NONE, bool add_even_if_unreachable = false);
 void RemoveLocal(const CService& addr);
 bool SeenLocal(const CService& addr);
 bool IsLocal(const CService& addr);
@@ -669,6 +671,7 @@ class V2Transport final : public Transport
 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 +714,10 @@ class CNode
     std::atomic<NodeClock::time_point> m_last_recv{NodeClock::epoch};
     //! Unix epoch time at peer connection
     const NodeClock::time_point 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
@@ -826,6 +833,13 @@ class CNode
         return m_conn_type == ConnectionType::PRIVATE_BROADCAST;
     }
 
+    /** Protocol version advertised in our VERSION message.
+     *  Private broadcast connections use a fixed version to maximise anonymity. */
+    int AdvertisedVersion() const
+    {
+        return IsPrivateBroadcastConn() ? WTXID_RELAY_VERSION : PROTOCOL_VERSION;
+    }
+
     bool IsInboundConn() const {
         return m_conn_type == ConnectionType::INBOUND;
     }
@@ -1074,7 +1088,8 @@ class CConnman
     struct Options
     {
         ServiceFlags m_local_services = NODE_NONE;
-        int m_max_automatic_connections = 0;
+        int m_max_automatic_connections = DEFAULT_MAX_PEER_CONNECTIONS;
+        int m_full_relay_inbound_percent = DEFAULT_FULL_RELAY_INBOUND_PCT;
         CClientUIInterface* uiInterface = nullptr;
         NetEventsInterface* m_msgproc = nullptr;
         BanMan* m_banman = nullptr;
@@ -1110,6 +1125,7 @@ class CConnman
         m_max_outbound_block_relay = std::min(MAX_BLOCK_RELAY_ONLY_CONNECTIONS, m_max_automatic_connections - m_max_outbound_full_relay);
         m_max_automatic_outbound = m_max_outbound_full_relay + m_max_outbound_block_relay + m_max_feeler;
         m_max_inbound = std::max(0, m_max_automatic_connections - m_max_automatic_outbound);
+        m_max_inbound_full_relay = std::max(0, static_cast<int>(connOptions.m_full_relay_inbound_percent / 100.0 * m_max_inbound));
         m_use_addrman_outgoing = connOptions.m_use_addrman_outgoing;
         m_client_interface = connOptions.uiInterface;
         m_banman = connOptions.m_banman;
@@ -1154,9 +1170,10 @@ class CConnman
     bool Start(CScheduler& scheduler, const Options& options) EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !m_added_nodes_mutex, !m_addr_fetches_mutex, !mutexMsgProc);
 
     void StopThreads();
-    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_reconnections_mutex);
-    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!m_reconnections_mutex)
+    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_reconnections_mutex);
+    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_reconnections_mutex)
     {
+        AssertLockNotHeld(m_nodes_mutex);
         AssertLockNotHeld(m_reconnections_mutex);
         StopThreads();
         StopNodes();
@@ -1185,8 +1202,8 @@ class CConnman
                                const char* pszDest,
                                ConnectionType conn_type,
                                bool use_v2transport,
-                               const std::optional<Proxy>& proxy_override = std::nullopt)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
+                               const std::optional<Proxy>& proxy_override)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex);
 
     /// Group of private broadcast related members.
     class PrivateBroadcast
@@ -1254,18 +1271,18 @@ class CConnman
         friend struct ConnmanTestMsg;
     } m_private_broadcast;
 
-    bool CheckIncomingNonce(uint64_t nonce);
+    bool CheckIncomingNonce(uint64_t nonce) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     void ASMapHealthCheck();
 
     // alias for thread safety annotations only, not defined
-    RecursiveMutex& GetNodesMutex() const LOCK_RETURNED(m_nodes_mutex);
+    Mutex& GetNodesMutex() const LOCK_RETURNED(m_nodes_mutex);
 
-    bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
+    bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     void PushMessage(CNode* pnode, CSerializedNetMsg&& msg) EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex);
 
     using NodeFn = std::function<void(CNode*)>;
-    void ForEachNode(const NodeFn& func)
+    void ForEachNode(const NodeFn& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
@@ -1274,7 +1291,7 @@ class CConnman
         }
     };
 
-    void ForEachNode(const NodeFn& func) const
+    void ForEachNode(const NodeFn& func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
@@ -1320,21 +1337,32 @@ class CConnman
     void StartExtraBlockRelayPeers();
 
     // Count the number of full-relay peer we have.
-    int GetFullOutboundConnCount() const;
+    int GetFullOutboundConnCount() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     // Return the number of outbound peers we have in excess of our target (eg,
     // if we previously called SetTryNewOutboundPeer(true), and have since set
     // to false, we may have extra peers that we wish to disconnect). This may
     // return a value less than (num_outbound_connections - num_outbound_slots)
     // in cases where some outbound connections are not yet fully connected, or
     // not yet fully disconnected.
-    int GetExtraFullOutboundCount() const;
+    int GetExtraFullOutboundCount() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     // Count the number of block-relay-only peers we have over our limit.
-    int GetExtraBlockRelayCount() const;
+    int GetExtraBlockRelayCount() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    /**
+     * If we are at capacity for inbound tx-relay peers, attempt to evict one.
+     * @param[in]   protect_peer      NodeId of a peer we want to protect
+     * @return      bool              Returns true if successful (either there is
+     *                                no need for eviction, or a peer was evicted).
+     *                                Returns false, if we are full but couldn't find
+     *                                a peer to evict (all eligible peers are protected)
+     *                                so that the caller can deal with this.
+     */
+    bool EvictTxPeerIfFull(std::optional<NodeId> protect_peer = std::nullopt) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     bool AddNode(const AddedNodeParams& add) EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
     bool RemoveAddedNode(std::string_view node) EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
     bool AddedNodesContain(const CAddress& addr) const EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
-    std::vector<AddedNodeInfo> GetAddedNodeInfo(bool include_connected) const EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
+    std::vector<AddedNodeInfo> GetAddedNodeInfo(bool include_connected) const
+        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_nodes_mutex);
 
     /**
      * Attempts to open a connection. Currently only used from tests.
@@ -1349,16 +1377,17 @@ class CConnman
      *                          - Max total outbound connection capacity filled
      *                          - Max connection capacity for type is filled
      */
-    bool AddConnection(const std::string& address, ConnectionType conn_type, bool use_v2transport) EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
+    bool AddConnection(const std::string& address, ConnectionType conn_type, bool use_v2transport)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex);
 
-    size_t GetNodeCount(ConnectionDirection) const;
+    size_t GetNodeCount(ConnectionDirection) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     std::map<CNetAddr, LocalServiceInfo> getNetLocalAddresses() const;
     uint32_t GetMappedAS(const CNetAddr& addr) const;
-    void GetNodeStats(std::vector<CNodeStats>& vstats) const;
-    bool DisconnectNode(std::string_view node);
-    bool DisconnectNode(const CSubNet& subnet);
-    bool DisconnectNode(const CNetAddr& addr);
-    bool DisconnectNode(NodeId id);
+    void GetNodeStats(std::vector<CNodeStats>& vstats) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(std::string_view node) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(const CSubNet& subnet) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(const CNetAddr& addr) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(NodeId id) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     //! Used to convey which local services we are offering peers during node
     //! connection.
@@ -1422,14 +1451,32 @@ class CConnman
     bool Bind(const CService& addr, unsigned int flags, NetPermissionFlags permissions);
     bool InitBinds(const Options& options);
 
-    void ThreadOpenAddedConnections() EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex);
+    /// \anchor addcon
+    void ThreadOpenAddedConnections() EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex,
+                                                               !m_nodes_mutex,
+                                                               !m_reconnections_mutex,
+                                                               !m_unused_i2p_sessions_mutex);
+
     void AddAddrFetch(const std::string& strDest) EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex);
-    void ProcessAddrFetch() EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_unused_i2p_sessions_mutex);
-    void ThreadOpenConnections(std::vector<std::string> connect, std::span<const std::string> seed_nodes) EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_added_nodes_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex);
-    void ThreadMessageHandler() EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
-    void ThreadI2PAcceptIncoming();
-    void ThreadPrivateBroadcast() EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
-    void AcceptConnection(const ListenSocket& hListenSocket);
+
+    void ProcessAddrFetch() EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex,
+                                                     !m_nodes_mutex,
+                                                     !m_unused_i2p_sessions_mutex);
+
+    /// \anchor opencon
+    void ThreadOpenConnections(std::vector<std::string> connect, std::span<const std::string> seed_nodes)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex,
+                                 !m_addr_fetches_mutex,
+                                 !m_nodes_mutex,
+                                 !m_reconnections_mutex,
+                                 !m_unused_i2p_sessions_mutex);
+
+    /// \anchor msghand
+    void ThreadMessageHandler() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc);
+    /// \anchor i2paccept
+    void ThreadI2PAcceptIncoming() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    void ThreadPrivateBroadcast() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex);
+    void AcceptConnection(const ListenSocket& hListenSocket) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     /**
      * Create a `CNode` object from a socket that has just been accepted and add the node to
@@ -1442,10 +1489,11 @@ class CConnman
     void CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
                                       NetPermissionFlags permission_flags,
                                       const CService& addr_bind,
-                                      const CService& addr);
+                                      const CService& addr)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     void DisconnectNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_reconnections_mutex, !m_nodes_mutex);
-    void NotifyNumConnectionsChanged();
+    void NotifyNumConnectionsChanged() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     /** Return true if the peer is inactive and should be disconnected. */
     bool InactivityCheck(const CNode& node, NodeClock::time_point now) const;
 
@@ -1459,7 +1507,7 @@ class CConnman
     /**
      * Check connected and listening sockets for IO readiness and process them accordingly.
      */
-    void SocketHandler() EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc);
+    void SocketHandler() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_total_bytes_sent_mutex, !mutexMsgProc);
 
     /**
      * Do the read/write for connected sockets that are ready for IO.
@@ -1474,9 +1522,12 @@ class CConnman
      * Accept incoming connections, one from each read-ready listening socket.
      * @param[in] events_per_sock Sockets that are ready for IO.
      */
-    void SocketHandlerListening(const Sock::EventsPerSock& events_per_sock);
+    void SocketHandlerListening(const Sock::EventsPerSock& events_per_sock)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
+    /// \anchor net
     void ThreadSocketHandler() EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !m_nodes_mutex, !m_reconnections_mutex);
+    /// \anchor dnsseed
     void ThreadDNSAddressSeed() EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_nodes_mutex);
 
     uint64_t CalculateKeyedNetGroup(const CNetAddr& ad) const;
@@ -1488,7 +1539,7 @@ class CConnman
      * @param[in] host String of the form "host[:port]", e.g. "localhost" or "localhost:8333" or "1.2.3.4:8333".
      * @return true if connected to `host`.
      */
-    bool AlreadyConnectedToHost(std::string_view host) const;
+    bool AlreadyConnectedToHost(std::string_view host) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     /**
      * Determine whether we're already connected to a given address:port.
@@ -1497,14 +1548,20 @@ class CConnman
      * @param[in] addr_port Address and port to check.
      * @return true if connected to addr_port.
      */
-    bool AlreadyConnectedToAddressPort(const CService& addr_port) const;
+    bool AlreadyConnectedToAddressPort(const CService& addr_port) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     /**
      * Determine whether we're already connected to a given address.
      */
-    bool AlreadyConnectedToAddress(const CNetAddr& addr) const;
+    bool AlreadyConnectedToAddress(const CNetAddr& addr) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
-    bool AttemptToEvictConnection();
+    /**
+     * Try to find an inbound connection to evict.
+     * @param[in] evict_tx_relay_peer_only  Whether to only select full relay peers for eviction
+     * @param[in] protect_peer              Protect peer with node id
+     * @return                              True if a node was marked for disconnect
+     */
+    bool AttemptToEvictConnection(bool evict_tx_relay_peer_only, std::optional<NodeId> protect_peer = std::nullopt) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     /**
      * Open a new P2P connection.
@@ -1522,7 +1579,7 @@ class CConnman
                        ConnectionType conn_type,
                        bool use_v2transport,
                        const std::optional<Proxy>& proxy_override)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex);
 
     void AddWhitelistPermissionFlags(NetPermissionFlags& flags, std::optional<CNetAddr> addr, const std::vector<NetWhitelistPermissions>& ranges) const;
 
@@ -1548,7 +1605,7 @@ class CConnman
     /**
      * Return vector of current BLOCK_RELAY peers.
      */
-    std::vector<CAddress> GetCurrentBlockRelayOnlyConns() const;
+    std::vector<CAddress> GetCurrentBlockRelayOnlyConns() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     /**
      * Search for a "preferred" network, a reachable network to which we
@@ -1560,7 +1617,7 @@ class CConnman
      *
      * @return           bool        Whether a preferred network was found.
      */
-    bool MaybePickPreferredNetwork(std::optional<Network>& network);
+    bool MaybePickPreferredNetwork(std::optional<Network>& network) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     // Whether the node should be passed out in ForEach* callbacks
     static bool NodeFullyConnected(const CNode* pnode);
@@ -1604,7 +1661,7 @@ class CConnman
     mutable Mutex m_added_nodes_mutex;
     std::vector<CNode*> m_nodes GUARDED_BY(m_nodes_mutex);
     std::list<CNode*> m_nodes_disconnected;
-    mutable RecursiveMutex m_nodes_mutex;
+    mutable Mutex m_nodes_mutex;
     std::atomic<NodeId> nLastNodeId{0};
     unsigned int nPrevNodeCount{0};
 
@@ -1677,6 +1734,7 @@ class CConnman
     int m_max_feeler{MAX_FEELER_CONNECTIONS};
     int m_max_automatic_outbound;
     int m_max_inbound;
+    int m_max_inbound_full_relay;
 
     bool m_use_addrman_outgoing;
     CClientUIInterface* m_client_interface;
@@ -1777,6 +1835,7 @@ class CConnman
     /** Struct for entries in m_reconnections. */
     struct ReconnectionInfo
     {
+        std::optional<Proxy> proxy_override;
         CAddress addr_connect;
         CountingSemaphoreGrant<> grant;
         std::string destination;
@@ -1790,7 +1849,8 @@ class CConnman
     std::list<ReconnectionInfo> m_reconnections GUARDED_BY(m_reconnections_mutex);
 
     /** Attempt reconnections, if m_reconnections non-empty. */
-    void PerformReconnections() EXCLUSIVE_LOCKS_REQUIRED(!m_reconnections_mutex, !m_unused_i2p_sessions_mutex);
+    void PerformReconnections()
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_reconnections_mutex, !m_unused_i2p_sessions_mutex);
 
     /**
      * Cap on the size of `m_unused_i2p_sessions`, to ensure it does not
@@ -1806,6 +1866,7 @@ class CConnman
     {
     public:
         explicit NodesSnapshot(const CConnman& connman, bool shuffle)
+            EXCLUSIVE_LOCKS_REQUIRED(!connman.m_nodes_mutex)
         {
             {
                 LOCK(connman.m_nodes_mutex);
diff --git a/depend/bitcoin/src/net_permissions.h b/depend/bitcoin/src/net_permissions.h
index fbaa8f1d..8a713919 100644
--- a/depend/bitcoin/src/net_permissions.h
+++ b/depend/bitcoin/src/net_permissions.h
@@ -17,9 +17,9 @@ struct bilingual_str;
 extern const std::vector<std::string> NET_PERMISSIONS_DOC;
 
 /** Default for -whitelistrelay. */
-constexpr bool DEFAULT_WHITELISTRELAY = true;
+inline constexpr bool DEFAULT_WHITELISTRELAY = true;
 /** Default for -whitelistforcerelay. */
-constexpr bool DEFAULT_WHITELISTFORCERELAY = false;
+inline constexpr bool DEFAULT_WHITELISTFORCERELAY = false;
 
 enum class NetPermissionFlags : uint32_t {
     None = 0,
@@ -46,7 +46,7 @@ enum class NetPermissionFlags : uint32_t {
     Implicit = (1U << 31),
     All = BloomFilter | ForceRelay | Relay | NoBan | Mempool | Download | Addr,
 };
-static inline constexpr NetPermissionFlags operator|(NetPermissionFlags a, NetPermissionFlags b)
+constexpr NetPermissionFlags operator|(NetPermissionFlags a, NetPermissionFlags b)
 {
     using t = std::underlying_type_t<NetPermissionFlags>;
     return static_cast<NetPermissionFlags>(static_cast<t>(a) | static_cast<t>(b));
diff --git a/depend/bitcoin/src/net_processing.cpp b/depend/bitcoin/src/net_processing.cpp
index b870df66..6b6594f7 100644
--- a/depend/bitcoin/src/net_processing.cpp
+++ b/depend/bitcoin/src/net_processing.cpp
@@ -57,8 +57,10 @@
 #include <txmempool.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/hasher.h>
 #include <util/strencodings.h>
 #include <util/time.h>
+#include <util/tokenbucket.h>
 #include <util/trace.h>
 #include <validation.h>
 
@@ -84,6 +86,7 @@
 #include <set>
 #include <span>
 #include <typeinfo>
+#include <unordered_set>
 #include <utility>
 
 using kernel::ChainstateRole;
@@ -167,15 +170,16 @@ static constexpr auto INBOUND_INVENTORY_BROADCAST_INTERVAL{5s};
  *  Use a smaller delay as there is less privacy concern for them.
  *  Blocks and peers with NetPermissionFlags::NoBan permission bypass this. */
 static constexpr auto OUTBOUND_INVENTORY_BROADCAST_INTERVAL{2s};
-/** Maximum rate of inventory items to send per second.
- *  Limits the impact of low-fee transaction floods. */
-static constexpr unsigned int INVENTORY_BROADCAST_PER_SECOND{14};
-/** Target number of tx inventory items to send per transmission. */
-static constexpr unsigned int INVENTORY_BROADCAST_TARGET = INVENTORY_BROADCAST_PER_SECOND * count_seconds(INBOUND_INVENTORY_BROADCAST_INTERVAL);
-/** Maximum number of inventory items to send per transmission. */
-static constexpr unsigned int INVENTORY_BROADCAST_MAX = 1000;
-static_assert(INVENTORY_BROADCAST_MAX >= INVENTORY_BROADCAST_TARGET, "INVENTORY_BROADCAST_MAX too low");
-static_assert(INVENTORY_BROADCAST_MAX <= node::MAX_PEER_TX_ANNOUNCEMENTS, "INVENTORY_BROADCAST_MAX too high");
+/** Multiplier for the inventory bucket rate for outbounds */
+static constexpr double OUTBOUND_INVENTORY_BUCKET_MULTIPLIER{Ticks<SecondsDouble>(INBOUND_INVENTORY_BROADCAST_INTERVAL) / Ticks<SecondsDouble>(OUTBOUND_INVENTORY_BROADCAST_INTERVAL)};
+/** Delay between checking inventory bucket and backlog */
+static constexpr auto INVENTORY_BUCKET_CHECK_DELAY{100ms};
+/** Empty backlog target capacity */
+static constexpr size_t INVENTORY_BUCKET_BACKLOG_CAPACITY{300};
+/** Delay between inventory bucket backlog heartbeat log entries */
+static constexpr auto INVENTORY_BUCKET_BACKLOG_HEARTBEAT{2000ms};
+/** Minimum backlog to trigger heartbeat log entries */
+static constexpr size_t INVENTORY_BUCKET_BACKLOG_HEARTBEAT_MIN{100};
 /** Average delay between feefilter broadcasts in seconds. */
 static constexpr auto AVG_FEEFILTER_BROADCAST_INTERVAL{10min};
 /** Maximum feefilter broadcast delay after significant change. */
@@ -195,8 +199,6 @@ static constexpr double MAX_ADDR_RATE_PER_SECOND{0.1};
  *  based increments won't go above this, but the MAX_ADDR_TO_SEND increment following GETADDR
  *  is exempt from this limit). */
 static constexpr size_t MAX_ADDR_PROCESSING_TOKEN_BUCKET{MAX_ADDR_TO_SEND};
-/** The compactblocks version we support. See BIP 152. */
-static constexpr uint64_t CMPCTBLOCKS_VERSION{2};
 /** For private broadcast, send a transaction to this many peers. */
 static constexpr size_t NUM_PRIVATE_BROADCAST_PER_TX{3};
 /** Private broadcast connections must complete within this time. Disconnect the peer if it takes longer. */
@@ -301,11 +303,11 @@ struct Peer {
          *  us or we have announced to the peer. We use this to avoid announcing
          *  the same (w)txid to a peer that already has the transaction. */
         CRollingBloomFilter m_tx_inventory_known_filter GUARDED_BY(m_tx_inventory_mutex){50000, 0.000001};
-        /** Set of wtxids we still have to announce. For non-wtxid-relay peers,
+        /** Vector of wtxids we still have to announce. For non-wtxid-relay peers,
          *  we retrieve the txid from the corresponding mempool transaction when
          *  constructing the `inv` message. We use the mempool to sort transactions
          *  in dependency order before relay, so this does not have to be sorted. */
-        std::set<Wtxid> m_tx_inventory_to_send GUARDED_BY(m_tx_inventory_mutex);
+        std::vector<Wtxid> m_tx_inventory_to_send GUARDED_BY(m_tx_inventory_mutex);
         /** Whether the peer has requested us to send our complete mempool. Only
          *  permitted if the peer has NetPermissionFlags::Mempool or we advertise
          *  NODE_BLOOM. See BIP35. */
@@ -500,6 +502,68 @@ struct CNodeState {
     int64_t m_last_block_announcement{0};
 };
 
+struct InvToSendBucket {
+    const double count_floor{0};
+    std::vector<Wtxid> backlog;
+    util::TokenBucket<NodeClock> size_bucket;
+    util::TokenBucket<NodeClock> count_bucket;
+
+    /* Initialization rationale:
+     *
+     * Count bucket: Fills at rate*mult, total/initial capacity of 30s with mult=1
+     * Size bucket: Fills at 12MB every 600s, times mult so expected to be 6 times
+     *   the rate at which blocks can confirm transactions, but at least 3 times that in
+     *   the worst case. High limit to avoid triggering even with large spikes, but a
+     *   modest initial value to ensure that frequent node restarts don't raise the limit
+     *   too much.
+     * Count floor: In order to avoid sorting the global backlog too often, we ensure
+     *   that we always remove at least an average INV message's number of transactions
+     *   each time we do work. (Or 50kB if the size bucket is the limiting factor)
+     */
+
+    static constexpr double SIZE_INIT{12'000'000}; // 12 MB initially
+    static constexpr double SIZE_CAP{50'000'000}; // 50 MB maximum
+    static constexpr double SIZE_REFILL{20'000}; // 20kB/s = 12MB/600s
+
+    static constexpr double INBOUND_COUNT_SECONDS{30}; // cap/initial at 30s/mult worth of txs
+
+    InvToSendBucket(unsigned int rate, double mult)
+        : count_floor{-1.0 * rate * count_seconds(INBOUND_INVENTORY_BROADCAST_INTERVAL)},
+          size_bucket(/*rate=*/SIZE_REFILL * mult, /*value=*/SIZE_INIT, /*cap=*/SIZE_CAP),
+          count_bucket(/*rate=*/rate * mult, /*value=*/rate * INBOUND_COUNT_SECONDS, /*cap=*/rate * INBOUND_COUNT_SECONDS)
+    {
+    }
+
+    bool avail() const
+    {
+        return !backlog.empty() && size_bucket.value() > 0 && count_bucket.value() > 0;
+    }
+
+    void increment(NodeClock::time_point now)
+    {
+        size_bucket.increment(now);
+        count_bucket.increment(now);
+    }
+
+    std::vector<Wtxid> TakeForProcessing(CTxMemPool& mempool) EXCLUSIVE_LOCKS_REQUIRED(mempool.cs);
+
+    bool decrement(double size)
+    {
+        bool size_ok = size_bucket.decrement(size, /*floor=*/-50e3);
+        bool count_ok = count_bucket.decrement(1, /*floor=*/count_floor);
+        return size_ok && count_ok;
+    }
+
+    PeerManagerInfo::InvBucketInfo info() const
+    {
+        return {
+            .backlog_count = backlog.size(),
+            .count_bucket = count_bucket.value(),
+            .size_bucket = size_bucket.value(),
+        };
+    }
+};
+
 class PeerManagerImpl final : public PeerManager
 {
 public:
@@ -526,9 +590,9 @@ class PeerManagerImpl final : public PeerManager
     void FinalizeNode(const CNode& node) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_headers_presync_mutex, !m_tx_download_mutex);
     bool HasAllDesirableServiceFlags(ServiceFlags services) const override;
     bool ProcessMessages(CNode& node, std::atomic<bool>& interrupt) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, !m_headers_presync_mutex, g_msgproc_mutex, !m_tx_download_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, !m_headers_presync_mutex, g_msgproc_mutex, !m_tx_download_mutex, !m_inv_to_send_mutex);
     bool SendMessages(CNode& node) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, g_msgproc_mutex, !m_tx_download_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, g_msgproc_mutex, !m_tx_download_mutex, !m_inv_to_send_mutex);
 
     /** Implement PeerManager */
     void StartScheduledTasks(CScheduler& scheduler) override;
@@ -537,12 +601,12 @@ class PeerManagerImpl final : public PeerManager
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     bool GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) const override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     std::vector<node::TxOrphanage::OrphanInfo> GetOrphanTransactions() override EXCLUSIVE_LOCKS_REQUIRED(!m_tx_download_mutex);
-    PeerManagerInfo GetInfo() const override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    PeerManagerInfo GetInfo() const override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_inv_to_send_mutex);
     std::vector<PrivateBroadcast::TxBroadcastInfo> GetPrivateBroadcastInfo() const override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     std::vector<CTransactionRef> AbortPrivateBroadcast(const uint256& id) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void SendPings() override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
-    void InitiateTxBroadcastToAll(const Txid& txid, const Wtxid& wtxid) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
-    void InitiateTxBroadcastPrivate(const CTransactionRef& tx) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void InitiateTxBroadcastToAll(const Wtxid& wtxid) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_inv_to_send_mutex);
+    node::TransactionError InitiateTxBroadcastPrivate(const CTransactionRef& tx) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void SetBestBlock(int height, std::chrono::seconds time) override
     {
         m_best_height = height;
@@ -555,7 +619,7 @@ class PeerManagerImpl final : public PeerManager
 private:
     void ProcessMessage(Peer& peer, CNode& pfrom, const std::string& msg_type, DataStream& vRecv, NodeClock::time_point time_received,
                         const std::atomic<bool>& interruptMsgProc)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, !m_headers_presync_mutex, g_msgproc_mutex, !m_tx_download_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_most_recent_block_mutex, !m_headers_presync_mutex, g_msgproc_mutex, !m_tx_download_mutex, !m_inv_to_send_mutex);
 
     /** Consider evicting an outbound peer based on the amount of time they've been behind our tip */
     void ConsiderEviction(CNode& pto, Peer& peer, std::chrono::seconds time_in_seconds) EXCLUSIVE_LOCKS_REQUIRED(cs_main, g_msgproc_mutex);
@@ -564,7 +628,7 @@ class PeerManagerImpl final : public PeerManager
     void EvictExtraOutboundPeers(NodeClock::time_point now) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
     /** Retrieve unbroadcast transactions from the mempool and reattempt sending to peers */
-    void ReattemptInitialBroadcast(CScheduler& scheduler) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void ReattemptInitialBroadcast(CScheduler& scheduler) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_inv_to_send_mutex);
 
     /** Rebroadcast stale private transactions (already broadcast but not received back from the network). */
     void ReattemptPrivateBroadcast(CScheduler& scheduler);
@@ -577,6 +641,9 @@ class PeerManagerImpl final : public PeerManager
      *  May return an empty shared_ptr if the Peer object can't be found. */
     PeerRef RemovePeer(NodeId id) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
 
+    /// Get all existing peers in m_peer_map.
+    std::vector<PeerRef> GetAllPeers() const EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+
     /** Mark a peer as misbehaving, which will cause it to be disconnected and its
      *  address discouraged. */
     void Misbehaving(Peer& peer, const std::string& message);
@@ -601,6 +668,20 @@ class PeerManagerImpl final : public PeerManager
      */
     bool MaybeDiscourageAndDisconnect(CNode& pnode, Peer& peer);
 
+    /** If an inbound peer wants tx relay and we are at capacity for those, attempt to
+     *  evict a tx-relaying inbound peer - possibly node itself, unless it is protected.
+     *  Only if no peer can be evicted, disconnect node.
+     *
+     * @param[in]   node          The node that wants to relay txs to us.
+     * @param[in]   msg_type      The message that triggered this check, for logging.
+     * @param[in]   protect_peer  Peer that is exempt from being evicted.
+     * @return                    True if the node was disconnected because no eviction candidate
+     *                            was found. If false is returned, a non-protected node may still have
+     *                            been marked for disconnection via regular eviction.
+     */
+    bool MaybeDisconnectForTxRelayCapacity(CNode& node, const std::string& msg_type,
+                                           std::optional<NodeId> protect_peer = std::nullopt);
+
     /** Handle a transaction whose result was not MempoolAcceptResult::ResultType::VALID.
      * @param[in]   first_time_failure            Whether we should consider inserting into vExtraTxnForCompact, adding
      *                                            a new orphan to resolve, or looking for a package to submit.
@@ -619,13 +700,13 @@ class PeerManagerImpl final : public PeerManager
     /** Handle a transaction whose result was MempoolAcceptResult::ResultType::VALID.
      * Updates m_txrequest, m_orphanage, and vExtraTxnForCompact. Also queues the tx for relay. */
     void ProcessValidTx(NodeId nodeid, const CTransactionRef& tx, const std::list<CTransactionRef>& replaced_transactions)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, g_msgproc_mutex, m_tx_download_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, g_msgproc_mutex, m_tx_download_mutex, !m_inv_to_send_mutex);
 
     /** Handle the results of package validation: calls ProcessValidTx and ProcessInvalidTx for
      * individual transactions, and caches rejection for the package as a group.
      */
     void ProcessPackageResult(const node::PackageToValidate& package_to_validate, const PackageMempoolAcceptResult& package_result)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, g_msgproc_mutex, m_tx_download_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, g_msgproc_mutex, m_tx_download_mutex, !m_inv_to_send_mutex);
 
     /**
      * Reconsider orphan transactions after a parent has been accepted to the mempool.
@@ -639,7 +720,7 @@ class PeerManagerImpl final : public PeerManager
      *                     will be empty.
      */
     bool ProcessOrphanTx(Peer& peer)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, g_msgproc_mutex, !m_tx_download_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, g_msgproc_mutex, !m_tx_download_mutex, !m_inv_to_send_mutex);
 
     /** Process a single headers message from a peer.
      *
@@ -712,7 +793,7 @@ class PeerManagerImpl final : public PeerManager
     /** Potentially fetch blocks from this peer upon receipt of a new headers tip */
     void HeadersDirectFetchBlocks(CNode& pfrom, const Peer& peer, const CBlockIndex& last_header);
     /** Update peer state based on received headers message */
-    void UpdatePeerStateForReceivedHeaders(CNode& pfrom, Peer& peer, const CBlockIndex& last_header, bool received_new_header, bool may_have_more_headers)
+    void UpdatePeerStateForReceivedHeaders(CNode& pfrom, const CBlockIndex& last_header, bool received_new_header, bool may_have_more_headers)
         EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex);
 
     void SendBlockTransactions(CNode& pfrom, Peer& peer, const CBlock& block, const BlockTransactionsRequest& req);
@@ -724,6 +805,15 @@ class PeerManagerImpl final : public PeerManager
     {
         m_connman.PushMessage(&node, NetMsg::Make(std::move(msg_type), std::forward<Args>(args)...));
     }
+    template <typename... Args>
+    [[maybe_unused]] void MakeAndPushFeature(CNode& node, std::string_view feature_id, Args&&... args) const
+    {
+        if (!Assume(feature_id.size() >= 4 && feature_id.size() <= MAX_FEATUREID_LENGTH)) return;
+        std::vector<unsigned char> feature_data;
+        VectorWriter{feature_data, 0, std::forward<Args>(args)...};
+        if (!Assume(feature_data.size() <= MAX_FEATUREDATA_LENGTH)) return;
+        MakeAndPushMessage(node, NetMsgType::FEATURE, feature_id, std::move(feature_data));
+    }
 
     /** Send a version message to a peer */
     void PushNodeVersion(CNode& pnode, const Peer& peer);
@@ -754,6 +844,8 @@ class PeerManagerImpl final : public PeerManager
 
     FastRandomContext m_rng GUARDED_BY(NetEventsInterface::g_msgproc_mutex);
 
+    /** Copied into short-lived tx INV deduplication sets to avoid generating salts per message. */
+    const SaltedUint256Hasher m_txhash_hasher;
     FeeFilterRounder m_fee_filter_rounder GUARDED_BY(NetEventsInterface::g_msgproc_mutex);
 
     const CChainParams& m_chainparams;
@@ -1095,6 +1187,14 @@ class PeerManagerImpl final : public PeerManager
 
     /// The transactions to be broadcast privately.
     PrivateBroadcast m_tx_for_private_broadcast;
+
+    mutable Mutex m_inv_to_send_mutex ACQUIRED_BEFORE(m_mempool.cs);
+    InvToSendBucket m_inbound_inv_bucket GUARDED_BY(m_inv_to_send_mutex);
+    InvToSendBucket m_outbound_inv_bucket GUARDED_BY(m_inv_to_send_mutex);
+    std::atomic<NodeClock::time_point> m_next_inv_bucket_check{NodeClock::time_point::min()};
+    std::optional<NodeClock::time_point> m_next_inv_bucket_heartbeat GUARDED_BY(m_inv_to_send_mutex);
+
+    void ProcessInvBacklog(NodeClock::time_point now, bool backlog_bumped=false) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_inv_to_send_mutex);
 };
 
 const CNodeState* PeerManagerImpl::State(NodeId pnode) const
@@ -1309,25 +1409,25 @@ void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid)
             }
         }
     }
-    m_connman.ForNode(nodeid, [this](CNode* pfrom) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
+    const bool nodeid_was_appended{m_connman.ForNode(nodeid, [this](CNode* pfrom) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
         AssertLockHeld(::cs_main);
-        if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
-            // As per BIP152, we only get 3 of our peers to announce
-            // blocks using compact encodings.
-            m_connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [this](CNode* pnodeStop){
-                MakeAndPushMessage(*pnodeStop, NetMsgType::SENDCMPCT, /*high_bandwidth=*/false, /*version=*/CMPCTBLOCKS_VERSION);
-                // save BIP152 bandwidth state: we select peer to be low-bandwidth
-                pnodeStop->m_bip152_highbandwidth_to = false;
-                return true;
-            });
-            lNodesAnnouncingHeaderAndIDs.pop_front();
-        }
         MakeAndPushMessage(*pfrom, NetMsgType::SENDCMPCT, /*high_bandwidth=*/true, /*version=*/CMPCTBLOCKS_VERSION);
         // save BIP152 bandwidth state: we select peer to be high-bandwidth
         pfrom->m_bip152_highbandwidth_to = true;
         lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
         return true;
-    });
+    })};
+    if (nodeid_was_appended && lNodesAnnouncingHeaderAndIDs.size() > 3) {
+        // As per BIP152, we only get 3 of our peers to announce
+        // blocks using compact encodings.
+        m_connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [this](CNode* pnodeStop) {
+            MakeAndPushMessage(*pnodeStop, NetMsgType::SENDCMPCT, /*high_bandwidth=*/false, /*version=*/CMPCTBLOCKS_VERSION);
+            // save BIP152 bandwidth state: we select peer to be low-bandwidth
+            pnodeStop->m_bip152_highbandwidth_to = false;
+            return true;
+        });
+        lNodesAnnouncingHeaderAndIDs.pop_front();
+    }
 }
 
 bool PeerManagerImpl::TipMayBeStale()
@@ -1577,7 +1677,7 @@ void PeerManagerImpl::PushNodeVersion(CNode& pnode, const Peer& peer)
     MakeAndPushMessage(
         pnode,
         NetMsgType::VERSION,
-        PROTOCOL_VERSION,
+        pnode.AdvertisedVersion(),
         my_services,
         my_time,
         // your_services + CNetAddr::V1(your_addr) is the pre-version-31402 serialization of your_addr (without nTime)
@@ -1591,7 +1691,7 @@ void PeerManagerImpl::PushNodeVersion(CNode& pnode, const Peer& peer)
 
     LogDebug(
         BCLog::NET, "send version message: version=%d, blocks=%d%s, txrelay=%d, peer=%d\n",
-        PROTOCOL_VERSION, my_height,
+        pnode.AdvertisedVersion(), my_height,
         fLogIPs ? strprintf(", them=%s", your_addr.ToStringAddrPort()) : "",
         my_tx_relay, pnode.GetId());
 }
@@ -1631,7 +1731,7 @@ void PeerManagerImpl::ReattemptInitialBroadcast(CScheduler& scheduler)
         CTransactionRef tx = m_mempool.get(txid);
 
         if (tx != nullptr) {
-            InitiateTxBroadcastToAll(txid, tx->GetWitnessHash());
+            InitiateTxBroadcastToAll(tx->GetWitnessHash());
         } else {
             m_mempool.RemoveUnbroadcastTx(txid, true);
         }
@@ -1650,8 +1750,9 @@ void PeerManagerImpl::ReattemptPrivateBroadcast(CScheduler& scheduler)
     size_t num_for_rebroadcast{0};
     const auto stale_txs = m_tx_for_private_broadcast.GetStale();
     if (!stale_txs.empty()) {
-        LOCK(cs_main);
         for (const auto& stale_tx : stale_txs) {
+            // Only hold lock per single submission
+            LOCK(cs_main);
             auto mempool_acceptable = m_chainman.ProcessTransaction(stale_tx, /*test_accept=*/true);
             if (mempool_acceptable.m_result_type == MempoolAcceptResult::ResultType::VALID) {
                 LogDebug(BCLog::PRIVBROADCAST,
@@ -1787,6 +1888,17 @@ PeerRef PeerManagerImpl::RemovePeer(NodeId id)
     return ret;
 }
 
+std::vector<PeerRef> PeerManagerImpl::GetAllPeers() const
+{
+    std::vector<PeerRef> peers;
+    LOCK(m_peer_mutex);
+    peers.reserve(m_peer_map.size());
+    for (const auto& [_, peer] : m_peer_map) {
+        peers.push_back(peer);
+    }
+    return peers;
+}
+
 bool PeerManagerImpl::GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) const
 {
     {
@@ -1851,9 +1963,14 @@ std::vector<node::TxOrphanage::OrphanInfo> PeerManagerImpl::GetOrphanTransaction
 
 PeerManagerInfo PeerManagerImpl::GetInfo() const
 {
+    LOCK(m_inv_to_send_mutex);
     return PeerManagerInfo{
         .median_outbound_time_offset = m_outbound_time_offsets.Median(),
         .ignores_incoming_txs = m_opts.ignore_incoming_txs,
+        .private_broadcast = m_opts.private_broadcast,
+        .tx_send_rate = m_opts.tx_send_rate,
+        .inbound_bucket = m_inbound_inv_bucket.info(),
+        .outbound_bucket = m_outbound_inv_bucket.info(),
     };
 }
 
@@ -1885,11 +2002,13 @@ std::vector<CTransactionRef> PeerManagerImpl::AbortPrivateBroadcast(const uint25
 
 void PeerManagerImpl::AddToCompactExtraTransactions(const CTransactionRef& tx)
 {
-    if (m_opts.max_extra_txs <= 0)
-        return;
-    if (!vExtraTxnForCompact.size())
-        vExtraTxnForCompact.resize(m_opts.max_extra_txs);
-    vExtraTxnForCompact[vExtraTxnForCompactIt] = std::make_pair(tx->GetWitnessHash(), tx);
+    if (m_opts.max_extra_txs == 0) return;
+    if (vExtraTxnForCompact.size() < m_opts.max_extra_txs) {
+        if (vExtraTxnForCompact.empty()) vExtraTxnForCompact.reserve(m_opts.max_extra_txs);
+        vExtraTxnForCompact.emplace_back(tx->GetWitnessHash(), tx);
+    } else {
+        vExtraTxnForCompact[vExtraTxnForCompactIt] = std::make_pair(tx->GetWitnessHash(), tx);
+    }
     vExtraTxnForCompactIt = (vExtraTxnForCompactIt + 1) % m_opts.max_extra_txs;
 }
 
@@ -1964,6 +2083,12 @@ util::Expected<void, std::string> PeerManagerImpl::FetchBlock(NodeId peer_id, co
 {
     if (m_chainman.m_blockman.LoadingBlocks()) return util::Unexpected{"Loading blocks ..."};
 
+    // The lock must be taken here before fetching Peer so another thread does
+    // not delete the CNodeState from under the current thread, causing an
+    // assertion failure in BlockRequested. This lock can be replaced with a
+    // net-specific lock when more of CNodeState is moved into Peer.
+    LOCK(cs_main);
+
     // Ensure this peer exists and hasn't been disconnected
     PeerRef peer = GetPeerRef(peer_id);
     if (peer == nullptr) return util::Unexpected{"Peer does not exist"};
@@ -1971,8 +2096,6 @@ util::Expected<void, std::string> PeerManagerImpl::FetchBlock(NodeId peer_id, co
     // Ignore pre-segwit peers
     if (!CanServeWitnesses(*peer)) return util::Unexpected{"Pre-SegWit peer"};
 
-    LOCK(cs_main);
-
     // Forget about all prior requests
     RemoveBlockRequest(block_index.GetBlockHash(), std::nullopt);
 
@@ -2016,7 +2139,9 @@ PeerManagerImpl::PeerManagerImpl(CConnman& connman, AddrMan& addrman,
       m_mempool(pool),
       m_txdownloadman(node::TxDownloadOptions{pool, m_rng, opts.deterministic_rng}),
       m_warnings{warnings},
-      m_opts{opts}
+      m_opts{opts},
+      m_inbound_inv_bucket(/*rate=*/m_opts.tx_send_rate, /*mult=*/1.0),
+      m_outbound_inv_bucket(/*rate=*/m_opts.tx_send_rate, /*mult=*/OUTBOUND_INVENTORY_BUCKET_MULTIPLIER)
 {
     // While Erlay support is incomplete, it must be enabled explicitly via -txreconciliation.
     // This argument can go away after Erlay support is complete.
@@ -2243,38 +2368,144 @@ void PeerManagerImpl::SendPings()
     for(auto& it : m_peer_map) it.second->m_ping_queued = true;
 }
 
-void PeerManagerImpl::InitiateTxBroadcastToAll(const Txid& txid, const Wtxid& wtxid)
+std::vector<Wtxid> InvToSendBucket::TakeForProcessing(CTxMemPool& mempool)
 {
-    LOCK(m_peer_mutex);
-    for(auto& it : m_peer_map) {
-        Peer& peer = *it.second;
-        auto tx_relay = peer.GetTxRelay();
-        if (!tx_relay) continue;
+    AssertLockHeld(mempool.cs);
 
-        LOCK(tx_relay->m_tx_inventory_mutex);
-        // Only queue transactions for announcement once the version handshake
-        // is completed. The time of arrival for these transactions is
-        // otherwise at risk of leaking to a spy, if the spy is able to
-        // distinguish transactions received during the handshake from the rest
-        // in the announcement.
-        if (tx_relay->m_next_inv_send_time == 0s) continue;
+    size_t n_to_take = static_cast<size_t>(std::max<double>(count_bucket.value() - count_floor, 0));
+
+    std::vector<Wtxid> best;
+
+    auto itervec = mempool.ExtractBestByMiningScoreWithTopology(backlog, n_to_take);
+    bool tokens_left = true;
+    for (auto txiter : itervec) {
+        auto& wtxid = txiter->GetTx().GetWitnessHash();
+        if (tokens_left) {
+            best.push_back(wtxid);
+            if (!decrement(txiter->GetTx().ComputeTotalSize())) {
+                tokens_left = false;
+            }
+        } else {
+            backlog.push_back(wtxid);
+        }
+    }
+
+    // if the backlog is now empty, consider shrinking it if it's oversized
+    if (backlog.empty() && backlog.capacity() > INVENTORY_BUCKET_BACKLOG_CAPACITY) {
+        std::vector<Wtxid> dummy;
+        dummy.reserve(INVENTORY_BUCKET_BACKLOG_CAPACITY);
+        dummy.swap(backlog);
+    }
+
+    return best;
+}
+
+void PeerManagerImpl::ProcessInvBacklog(NodeClock::time_point now, bool backlog_bumped)
+{
+    // Don't run the body of this function unless it's been a little
+    // while since the last run, or we just added a new tx to the backlog.
+    if (!backlog_bumped && now <= m_next_inv_bucket_check.load()) return;
+    m_next_inv_bucket_check = now + INVENTORY_BUCKET_CHECK_DELAY;
+
+    LOCK(m_inv_to_send_mutex);
+    m_inbound_inv_bucket.increment(now);
+    m_outbound_inv_bucket.increment(now);
+
+    // Regular heartbeat logging when there's a backlog
+    if (!m_next_inv_bucket_heartbeat.has_value()) {
+        if (m_inbound_inv_bucket.backlog.size() >= INVENTORY_BUCKET_BACKLOG_HEARTBEAT_MIN || m_outbound_inv_bucket.backlog.size() >= INVENTORY_BUCKET_BACKLOG_HEARTBEAT_MIN) {
+            m_next_inv_bucket_heartbeat = now;
+        }
+    }
+    if (m_next_inv_bucket_heartbeat.has_value() && now >= *m_next_inv_bucket_heartbeat) {
+        LogDebug(BCLog::NET, "Transaction rate-limiting backlog inbound=%d itok=%.1f isz=%.1f outbound=%d otok=%.1f osz=%.1f",
+                 m_inbound_inv_bucket.backlog.size(),
+                 m_inbound_inv_bucket.count_bucket.value(),
+                 m_inbound_inv_bucket.size_bucket.value(),
+                 m_outbound_inv_bucket.backlog.size(),
+                 m_outbound_inv_bucket.count_bucket.value(),
+                 m_outbound_inv_bucket.size_bucket.value());
+        if (m_inbound_inv_bucket.backlog.empty() && m_outbound_inv_bucket.backlog.empty()) {
+            m_next_inv_bucket_heartbeat = std::nullopt;
+        } else {
+            m_next_inv_bucket_heartbeat = now + INVENTORY_BUCKET_BACKLOG_HEARTBEAT;
+        }
+    }
 
-        const uint256& hash{peer.m_wtxid_relay ? wtxid.ToUint256() : txid.ToUint256()};
-        if (!tx_relay->m_tx_inventory_known_filter.contains(hash)) {
-            tx_relay->m_tx_inventory_to_send.insert(wtxid);
+    // Early exit to skip pointlessly touching mempool lock
+    bool in_avail = m_inbound_inv_bucket.avail();
+    bool out_avail = m_outbound_inv_bucket.avail();
+    if (!in_avail && !out_avail) return;
+
+    std::vector<Wtxid> for_inbound;
+    std::vector<Wtxid> for_outbound;
+
+    {
+        LOCK(m_mempool.cs);
+        if (in_avail) for_inbound = m_inbound_inv_bucket.TakeForProcessing(m_mempool);
+        if (out_avail) for_outbound = m_outbound_inv_bucket.TakeForProcessing(m_mempool);
+    }
+
+    if (!for_inbound.empty() || !for_outbound.empty()) {
+        bool any_inbound_connected = false;
+        bool any_outbound_connected = false;
+        for (const PeerRef& peer_ref : GetAllPeers()) {
+            if (!peer_ref) continue;
+            Peer& peer{*peer_ref};
+            auto tx_relay = peer.GetTxRelay();
+            if (!tx_relay) continue;
+
+            LOCK(tx_relay->m_tx_inventory_mutex);
+            // Only queue transactions for announcement once the version handshake
+            // is completed. The time of arrival for these transactions is
+            // otherwise at risk of leaking to a spy, if the spy is able to
+            // distinguish transactions received during the handshake from the rest
+            // in the announcement.
+            if (tx_relay->m_next_inv_send_time == 0s) continue;
+            if (peer.m_is_inbound) {
+                any_inbound_connected = true;
+            } else {
+                any_outbound_connected = true;
+            }
+            for (auto& i : (peer.m_is_inbound ? for_inbound : for_outbound)) {
+                tx_relay->m_tx_inventory_to_send.push_back(i);
+            }
         }
+
+        // if the node has no in/outbound connections, clear the corresponding backlog entirely
+        // this reduces wasted memory, and avoids having the bucket artificially empty for when
+        // future peers do connect.
+        if (!any_inbound_connected) m_inbound_inv_bucket.backlog.clear();
+        if (!any_outbound_connected) m_outbound_inv_bucket.backlog.clear();
+    }
+}
+
+void PeerManagerImpl::InitiateTxBroadcastToAll(const Wtxid& wtxid)
+{
+    {
+        LOCK(m_inv_to_send_mutex);
+        m_inbound_inv_bucket.backlog.push_back(wtxid);
+        m_outbound_inv_bucket.backlog.push_back(wtxid);
     }
+    ProcessInvBacklog(NodeClock::now(), /*backlog_bumped=*/true);
 }
 
-void PeerManagerImpl::InitiateTxBroadcastPrivate(const CTransactionRef& tx)
+node::TransactionError PeerManagerImpl::InitiateTxBroadcastPrivate(const CTransactionRef& tx)
 {
     const auto txstr{strprintf("txid=%s, wtxid=%s", tx->GetHash().ToString(), tx->GetWitnessHash().ToString())};
-    if (m_tx_for_private_broadcast.Add(tx)) {
+    switch (m_tx_for_private_broadcast.Add(tx)) {
+    case PrivateBroadcast::AddResult::Added:
         LogDebug(BCLog::PRIVBROADCAST, "Requesting %d new connections due to %s", NUM_PRIVATE_BROADCAST_PER_TX, txstr);
         m_connman.m_private_broadcast.NumToOpenAdd(NUM_PRIVATE_BROADCAST_PER_TX);
-    } else {
+        return node::TransactionError::OK;
+    case PrivateBroadcast::AddResult::AlreadyPresent:
         LogDebug(BCLog::PRIVBROADCAST, "Ignoring unnecessary request to schedule an already scheduled transaction: %s", txstr);
-    }
+        return node::TransactionError::OK;
+    case PrivateBroadcast::AddResult::QueueFull:
+        LogDebug(BCLog::PRIVBROADCAST, "Rejecting private broadcast, queue full (cap=%u): %s", PrivateBroadcast::MAX_TRANSACTIONS, txstr);
+        return node::TransactionError::PRIVATE_BROADCAST_FULL;
+    } // no default case, so the compiler can warn about missing cases
+    assert(false);
 }
 
 void PeerManagerImpl::RelayAddress(NodeId originator,
@@ -2328,6 +2559,14 @@ void PeerManagerImpl::RelayAddress(NodeId originator,
 
 void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv& inv)
 {
+    // First perform the stateless checks:
+    // A filtered-block can only ever be requested if we offer NODE_BLOOM
+    if (inv.IsMsgFilteredBlk() && !(peer.m_our_services & NODE_BLOOM)) {
+        LogDebug(BCLog::NET, "filtered block request received when NODE_BLOOM service disabled, %s", pfrom.DisconnectMsg());
+        pfrom.fDisconnect = true;
+        return;
+    }
+
     std::shared_ptr<const CBlock> a_recent_block;
     std::shared_ptr<const CBlockHeaderAndShortTxIDs> a_recent_compact_block;
     {
@@ -2609,10 +2848,10 @@ void PeerManagerImpl::SendBlockTransactions(CNode& pfrom, Peer& peer, const CBlo
         resp.txn[i] = block.vtx[req.indexes[i]];
     }
 
-    if (LogAcceptCategory(BCLog::CMPCTBLOCK, BCLog::Level::Debug)) {
+    if (util::log::ShouldDebugLog(BCLog::CMPCTBLOCK)) {
         uint32_t tx_requested_size{0};
         for (const auto& tx : resp.txn) tx_requested_size += tx->ComputeTotalSize();
-        LogDebug(BCLog::CMPCTBLOCK, "Peer %d sent us a GETBLOCKTXN for block %s, sending a BLOCKTXN with %u txns. (%u bytes)\n", pfrom.GetId(), block.GetHash().ToString(), resp.txn.size(), tx_requested_size);
+        LogDebug(BCLog::CMPCTBLOCK, "%s sent us a GETBLOCKTXN for block %s, sending a BLOCKTXN with %u txns. (%u bytes)", pfrom.LogPeer(), block.GetHash().ToString(), resp.txn.size(), tx_requested_size);
     }
     MakeAndPushMessage(pfrom, NetMsgType::BLOCKTXN, resp);
 }
@@ -2908,7 +3147,7 @@ void PeerManagerImpl::HeadersDirectFetchBlocks(CNode& pfrom, const Peer& peer, c
  * whether that header was new and whether the headers message was full,
  * update the state we keep for the peer.
  */
-void PeerManagerImpl::UpdatePeerStateForReceivedHeaders(CNode& pfrom, Peer& peer,
+void PeerManagerImpl::UpdatePeerStateForReceivedHeaders(CNode& pfrom,
         const CBlockIndex& last_header, bool received_new_header, bool may_have_more_headers)
 {
     LOCK(cs_main);
@@ -3112,7 +3351,7 @@ void PeerManagerImpl::ProcessHeadersMessage(CNode& pfrom, Peer& peer,
         }
     }
 
-    UpdatePeerStateForReceivedHeaders(pfrom, peer, *pindexLast, received_new_header, nCount == m_opts.max_headers_result);
+    UpdatePeerStateForReceivedHeaders(pfrom, *pindexLast, received_new_header, nCount == m_opts.max_headers_result);
 
     // Consider immediately downloading blocks.
     HeadersDirectFetchBlocks(pfrom, peer, *pindexLast);
@@ -3161,7 +3400,7 @@ void PeerManagerImpl::ProcessValidTx(NodeId nodeid, const CTransactionRef& tx, c
              tx->GetWitnessHash().ToString(),
              m_mempool.size(), m_mempool.DynamicMemoryUsage() / 1000);
 
-    InitiateTxBroadcastToAll(tx->GetHash(), tx->GetWitnessHash());
+    InitiateTxBroadcastToAll(tx->GetWitnessHash());
 
     for (const CTransactionRef& removedTx : replaced_transactions) {
         AddToCompactExtraTransactions(removedTx);
@@ -3231,8 +3470,6 @@ bool PeerManagerImpl::ProcessOrphanTx(Peer& peer)
     AssertLockHeld(g_msgproc_mutex);
     LOCK2(::cs_main, m_tx_download_mutex);
 
-    CTransactionRef porphanTx = nullptr;
-
     while (CTransactionRef porphanTx = m_txdownloadman.GetTxToReconsider(peer.m_id)) {
         const MempoolAcceptResult result = m_chainman.ProcessTransaction(porphanTx);
         const TxValidationState& state = result.m_state;
@@ -3665,7 +3902,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
 
         // Change version
-        const int greatest_common_version = std::min(nVersion, PROTOCOL_VERSION);
+        const int greatest_common_version = std::min(nVersion, pfrom.AdvertisedVersion());
         pfrom.SetCommonVersion(greatest_common_version);
         pfrom.nVersion = nVersion;
 
@@ -3740,6 +3977,14 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
             }
         }
 
+        if (greatest_common_version >= FEATURE_VERSION) {
+            // announce supported features
+            // MakeAndPushFeature(pfrom, NetMsgFeature::FOO, uint32_t{1});
+        }
+
+        // If we have too many tx-relaying inbound peers, attempt to evict an existing one.
+        // Only if this fails, disconnect this peer.
+        if (MaybeDisconnectForTxRelayCapacity(pfrom, msg_type, /*protect_peer=*/pfrom.GetId())) return;
         MakeAndPushMessage(pfrom, NetMsgType::VERACK);
 
         // Potentially mark this peer as a preferred download peer.
@@ -3752,7 +3997,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
         // Attempt to initialize address relay for outbound peers and use result
         // to decide whether to send GETADDR, so that we don't send it to
-        // inbound or outbound block-relay-only peers.
+        // inbound, feelers, or outbound block-relay-only peers.
         bool send_getaddr{false};
         if (!pfrom.IsInboundConn()) {
             send_getaddr = SetupAddressRelay(pfrom, peer);
@@ -3903,10 +4148,17 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
     }
 
     if (msg_type == NetMsgType::SENDCMPCT) {
-        bool sendcmpct_hb{false};
+        uint8_t sendcmpct_hb{0};
         uint64_t sendcmpct_version{0};
         vRecv >> sendcmpct_hb >> sendcmpct_version;
 
+        // BIP152: the first integer is interpreted as a boolean and MUST have a
+        // value of either 1 or 0.
+        if (sendcmpct_hb > 1) {
+            Misbehaving(peer, "invalid sendcmpct announce field");
+            return;
+        }
+
         // Only support compact block relay with witnesses
         if (sendcmpct_version != CMPCTBLOCKS_VERSION) return;
 
@@ -3955,6 +4207,45 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         return;
     }
 
+    if (msg_type == NetMsgType::FEATURE) {
+        if (pfrom.fSuccessfullyConnected) {
+            // Disconnect peers that send a FEATURE message after VERACK.
+            LogDebug(BCLog::NET, "feature received after verack, %s", pfrom.DisconnectMsg());
+            pfrom.fDisconnect = true;
+            return;
+        } else if (pfrom.GetCommonVersion() < FEATURE_VERSION) {
+            // Disconnect peers that send a FEATURE message without valid version negotiation.
+            LogDebug(BCLog::NET, "feature received with incompatible version %d, %s", pfrom.GetCommonVersion(), pfrom.DisconnectMsg());
+            pfrom.fDisconnect = true;
+            return;
+        }
+
+        std::string feature_id;
+        DataStream feature_data;
+        try {
+            vRecv >> LIMITED_STRING(feature_id, MAX_FEATUREID_LENGTH);
+            std::vector<unsigned char> feature_data_vec;
+            vRecv >> LIMITED_VECTOR(feature_data_vec, MAX_FEATUREDATA_LENGTH);
+            feature_data = DataStream(feature_data_vec);
+        } catch (const std::exception&) {
+            feature_id.clear(); // use empty feature_id as error indicator
+        }
+        if (feature_id.size() < 4 || !vRecv.empty()) {
+            LogDebug(BCLog::NET, "invalid feature payload, %s", pfrom.DisconnectMsg());
+            pfrom.fDisconnect = true;
+            return;
+        }
+
+        // if (feature_id == NetMsgFeature::FOO) {
+        //     ...
+        //     return;
+        // }
+
+        // ignore unknown feature_id
+        LogDebug(BCLog::NET, "unknown feature advertised: %s", SanitizeString(feature_id));
+        return;
+    }
+
     // Received from a peer demonstrating readiness to announce transactions via reconciliations.
     // This feature negotiation must happen between VERSION and VERACK to avoid relay problems
     // from switching announcement protocols after the connection is up.
@@ -4048,6 +4339,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
 
         const bool reject_tx_invs{RejectIncomingTxs(pfrom)};
+        std::unordered_set<uint256, SaltedUint256Hasher> seen_txids{0, m_txhash_hasher};
+        std::unordered_set<uint256, SaltedUint256Hasher> seen_wtxids{0, m_txhash_hasher};
 
         LOCK2(cs_main, m_tx_download_mutex);
 
@@ -4086,6 +4379,9 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
                     pfrom.fDisconnect = true;
                     return;
                 }
+                // MSG_WITNESS_TX is treated as a txid, despite only being specified for getdata.
+                auto& seen_hashes{inv.IsMsgWtx() ? seen_wtxids : seen_txids};
+                if (!seen_hashes.insert(inv.hash).second) continue;
                 const GenTxid gtxid = ToGenTxid(inv);
                 AddKnownTx(peer, inv.hash);
 
@@ -4249,6 +4545,14 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
     if (msg_type == NetMsgType::GETBLOCKTXN) {
         BlockTransactionsRequest req;
         vRecv >> req;
+
+        // No legitimate reason to send indexes empty
+        if (req.indexes.empty()) {
+            LogDebug(BCLog::NET, "getblocktxn received with no transaction indexes, %s", pfrom.DisconnectMsg());
+            pfrom.fDisconnect = true;
+            return;
+        }
+
         // Verify differential encoding invariant: indexes must be strictly increasing
         // DifferenceFormatter should guarantee this property during deserialization
         for (size_t i = 1; i < req.indexes.size(); ++i) {
@@ -4432,7 +4736,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
                 } else {
                     LogInfo("Force relaying tx %s (wtxid=%s) from peer=%d\n",
                               txid.ToString(), wtxid.ToString(), pfrom.GetId());
-                    InitiateTxBroadcastToAll(txid, wtxid);
+                    InitiateTxBroadcastToAll(wtxid);
                 }
             }
 
@@ -4471,10 +4775,22 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
     {
         // Ignore cmpctblock received while importing
         if (m_chainman.m_blockman.LoadingBlocks()) {
-            LogDebug(BCLog::NET, "Unexpected cmpctblock message received from peer %d\n", pfrom.GetId());
+            LogDebug(BCLog::CMPCTBLOCK, "%s sent us a compact block even though we are still loading blocks!", pfrom.LogPeer());
+            return;
+        } else if (m_opts.ignore_incoming_txs) {
+            LogDebug(BCLog::CMPCTBLOCK, "%s sent us a compact block even though we are blocksonly!", pfrom.LogPeer());
             return;
         }
 
+        {
+            LOCK(cs_main);
+            const CNodeState *nodestate = State(pfrom.GetId());
+            if (!nodestate->m_provides_cmpctblocks) {
+                LogDebug(BCLog::CMPCTBLOCK, "%s sent us a compact block despite never having sent us a SENDCMPCT!", pfrom.LogPeer());
+                return;
+            }
+        }
+
         CBlockHeaderAndShortTxIDs cmpctblock;
         vRecv >> cmpctblock;
 
@@ -4558,6 +4874,11 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
             range_flight.first++;
         }
 
+        if (!requested_block_from_this_peer && !pfrom.m_bip152_highbandwidth_to) {
+            LogDebug(BCLog::CMPCTBLOCK, "%s, not marked as high-bandwidth, sent us an unsolicited compact block!", pfrom.LogPeer());
+            return;
+        }
+
         if (pindex->nChainWork <= m_chainman.ActiveChain().Tip()->nChainWork || // We know something better
                 pindex->nTx != 0) { // We had this block at some point, but pruned it
             if (requested_block_from_this_peer) {
@@ -4929,6 +5250,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
             }
             pfrom.m_bloom_filter_loaded = true;
             pfrom.m_relays_txs = true;
+            MaybeDisconnectForTxRelayCapacity(pfrom, msg_type);
         }
         return;
     }
@@ -4977,6 +5299,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
         pfrom.m_bloom_filter_loaded = false;
         pfrom.m_relays_txs = true;
+        MaybeDisconnectForTxRelayCapacity(pfrom, msg_type);
         return;
     }
 
@@ -5067,6 +5390,16 @@ bool PeerManagerImpl::MaybeDiscourageAndDisconnect(CNode& pnode, Peer& peer)
     return true;
 }
 
+bool PeerManagerImpl::MaybeDisconnectForTxRelayCapacity(CNode& node, const std::string& msg_type, std::optional<NodeId> protect_peer)
+{
+    if (!node.IsInboundConn() || !node.m_relays_txs) return false;
+    if (m_connman.EvictTxPeerIfFull(protect_peer)) return false;
+
+    LogDebug(BCLog::NET, "failed to find a tx-relaying eviction candidate - connection dropped after %s message, peer=%d\n", msg_type, node.GetId());
+    node.fDisconnect = true;
+    return true;
+}
+
 bool PeerManagerImpl::ProcessMessages(CNode& node, std::atomic<bool>& interruptMsgProc)
 {
     AssertLockNotHeld(m_tx_download_mutex);
@@ -5528,22 +5861,6 @@ void PeerManagerImpl::MaybeSendFeefilter(CNode& pto, Peer& peer, std::chrono::mi
     }
 }
 
-namespace {
-class CompareInvMempoolOrder
-{
-    const CTxMemPool* m_mempool;
-public:
-    explicit CompareInvMempoolOrder(CTxMemPool* mempool) : m_mempool{mempool} {}
-
-    bool operator()(std::set<Wtxid>::iterator a, std::set<Wtxid>::iterator b)
-    {
-        /* As std::make_heap produces a max-heap, we want the entries with the
-         * higher mining score to sort later. */
-        return m_mempool->CompareMiningScoreWithTopology(*b, *a);
-    }
-};
-} // namespace
-
 bool PeerManagerImpl::RejectIncomingTxs(const CNode& peer) const
 {
     // block-relay-only peers may never send txs to us
@@ -5621,6 +5938,11 @@ bool PeerManagerImpl::SetupAddressRelay(const CNode& node, Peer& peer)
     // information of addr traffic to infer the link.
     if (node.IsBlockOnlyConn()) return false;
 
+    // We don't participate in addr relay with feeler connections because
+    // they are disconnected shortly after the handshake completes,
+    // before the node will receive the addr response.
+    if (node.IsFeelerConn()) return false;
+
     if (!peer.m_addr_relay_enabled.exchange(true)) {
         // During version message processing (non-block-relay-only outbound peers)
         // or on first addr-related message we have received (inbound peers), initialize
@@ -5772,6 +6094,8 @@ bool PeerManagerImpl::SendMessages(CNode& node)
 
     MaybeSendSendHeaders(node, peer);
 
+    ProcessInvBacklog(now);
+
     {
         LOCK(cs_main);
 
@@ -5971,7 +6295,7 @@ bool PeerManagerImpl::SendMessages(CNode& node)
         std::vector<CInv> vInv;
         {
             LOCK(peer.m_block_inv_mutex);
-            vInv.reserve(std::max<size_t>(peer.m_blocks_for_inv_relay.size(), INVENTORY_BROADCAST_TARGET));
+            vInv.reserve(peer.m_blocks_for_inv_relay.size());
 
             // Add blocks
             for (const uint256& hash : peer.m_blocks_for_inv_relay) {
@@ -6006,9 +6330,16 @@ bool PeerManagerImpl::SendMessages(CNode& node)
                 // Respond to BIP35 mempool requests
                 if (fSendTrickle && tx_relay->m_send_mempool) {
                     auto vtxinfo = m_mempool.infoAll();
+
+                    // Ensure we'll respond to GETDATA requests for anything we're about to announce
+                    tx_relay->m_last_inv_sequence = WITH_LOCK(m_mempool.cs, return m_mempool.GetSequence());
+
                     tx_relay->m_send_mempool = false;
                     const CFeeRate filterrate{tx_relay->m_fee_filter_received.load()};
 
+                    // we'll send everything in the mempool momentarily, so this is redundant
+                    tx_relay->m_tx_inventory_to_send.clear();
+
                     LOCK(tx_relay->m_bloom_filter_mutex);
 
                     for (const auto& txinfo : vtxinfo) {
@@ -6017,7 +6348,6 @@ bool PeerManagerImpl::SendMessages(CNode& node)
                         const auto inv = peer.m_wtxid_relay ?
                                              CInv{MSG_WTX, wtxid.ToUint256()} :
                                              CInv{MSG_TX, txid.ToUint256()};
-                        tx_relay->m_tx_inventory_to_send.erase(wtxid);
 
                         // Don't send transactions that peers will not put into their mempool
                         if (txinfo.fee < filterrate.GetFee(txinfo.vsize)) {
@@ -6037,64 +6367,55 @@ bool PeerManagerImpl::SendMessages(CNode& node)
 
                 // Determine transactions to relay
                 if (fSendTrickle) {
-                    // Produce a vector with all candidates for sending
-                    std::vector<std::set<Wtxid>::iterator> vInvTx;
-                    vInvTx.reserve(tx_relay->m_tx_inventory_to_send.size());
-                    for (std::set<Wtxid>::iterator it = tx_relay->m_tx_inventory_to_send.begin(); it != tx_relay->m_tx_inventory_to_send.end(); it++) {
-                        vInvTx.push_back(it);
-                    }
-                    const CFeeRate filterrate{tx_relay->m_fee_filter_received.load()};
                     // Topologically and fee-rate sort the inventory we send for privacy and priority reasons.
-                    // A heap is used so that not all items need sorting if only a few are being sent.
-                    CompareInvMempoolOrder compareInvMempoolOrder(&m_mempool);
-                    std::make_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
-                    // No reason to drain out at many times the network's capacity,
-                    // especially since we have many peers and some will draw much shorter delays.
-                    unsigned int nRelayedTransactions = 0;
-                    LOCK(tx_relay->m_bloom_filter_mutex);
-                    size_t broadcast_max{INVENTORY_BROADCAST_TARGET + (tx_relay->m_tx_inventory_to_send.size()/1000)*5};
-                    broadcast_max = std::min<size_t>(INVENTORY_BROADCAST_MAX, broadcast_max);
-                    while (!vInvTx.empty() && nRelayedTransactions < broadcast_max) {
-                        // Fetch the top element from the heap
-                        std::pop_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
-                        std::set<Wtxid>::iterator it = vInvTx.back();
-                        vInvTx.pop_back();
-                        auto wtxid = *it;
-                        // Remove it from the to-be-sent set
-                        tx_relay->m_tx_inventory_to_send.erase(it);
-                        // Not in the mempool anymore? don't bother sending it.
-                        auto txinfo = m_mempool.info(wtxid);
-                        if (!txinfo.tx) {
-                            continue;
+                    // (sorted from higher priority to lowest, skipping low fee)
+                    const CFeeRate filterrate{tx_relay->m_fee_filter_received.load()};
+
+                    auto inv_tx = [&]() EXCLUSIVE_LOCKS_REQUIRED(tx_relay->m_tx_inventory_mutex) {
+                        auto& invs = tx_relay->m_tx_inventory_to_send;
+                        std::vector<CTransactionRef> res;
+
+                        if (invs.size() == 0) return res;
+
+                        // if previous allocations were excessive, shrink to the current size
+                        if (invs.capacity() > 2 * invs.size()) invs.shrink_to_fit();
+
+                        LOCK(m_mempool.cs);
+                        auto txiters = m_mempool.ExtractBestByMiningScoreWithTopology(invs, invs.size());
+                        res.reserve(txiters.size());
+                        for (auto txiter : txiters) {
+                            if (txiter->GetFee() < filterrate.GetFee(txiter->GetTxSize())) {
+                                continue; // higher feerate CPFP txs may follow, so just skip, don't stop
+                            }
+                            res.push_back(txiter->GetSharedTx());
                         }
+                        // Ensure we'll respond to GETDATA requests for anything we're about to announce
+                        tx_relay->m_last_inv_sequence = m_mempool.GetSequence();
+                        return res;
+                    }();
+
+                    LOCK(tx_relay->m_bloom_filter_mutex);
+                    vInv.reserve(std::min<size_t>(MAX_INV_SZ, vInv.size() + inv_tx.size()));
+                    for (auto& tx : inv_tx) {
                         // `TxRelay::m_tx_inventory_known_filter` contains either txids or wtxids
                         // depending on whether our peer supports wtxid-relay. Therefore, first
                         // construct the inv and then use its hash for the filter check.
                         const auto inv = peer.m_wtxid_relay ?
-                                             CInv{MSG_WTX, wtxid.ToUint256()} :
-                                             CInv{MSG_TX, txinfo.tx->GetHash().ToUint256()};
+                                             CInv{MSG_WTX, tx->GetWitnessHash().ToUint256()} :
+                                             CInv{MSG_TX, tx->GetHash().ToUint256()};
                         // Check if not in the filter already
                         if (tx_relay->m_tx_inventory_known_filter.contains(inv.hash)) {
                             continue;
                         }
-                        // Peer told you to not send transactions at that feerate? Don't bother sending it.
-                        if (txinfo.fee < filterrate.GetFee(txinfo.vsize)) {
-                            continue;
-                        }
-                        if (tx_relay->m_bloom_filter && !tx_relay->m_bloom_filter->IsRelevantAndUpdate(*txinfo.tx)) continue;
+                        if (tx_relay->m_bloom_filter && !tx_relay->m_bloom_filter->IsRelevantAndUpdate(*tx)) continue;
                         // Send
                         vInv.push_back(inv);
-                        nRelayedTransactions++;
                         if (vInv.size() == MAX_INV_SZ) {
                             MakeAndPushMessage(node, NetMsgType::INV, vInv);
                             vInv.clear();
                         }
                         tx_relay->m_tx_inventory_known_filter.insert(inv.hash);
                     }
-
-                    // Ensure we'll respond to GETDATA requests for anything we've just announced
-                    LOCK(m_mempool.cs);
-                    tx_relay->m_last_inv_sequence = m_mempool.GetSequence();
                 }
         }
         if (!vInv.empty())
diff --git a/depend/bitcoin/src/net_processing.h b/depend/bitcoin/src/net_processing.h
index 8b3f026d..f26b95c5 100644
--- a/depend/bitcoin/src/net_processing.h
+++ b/depend/bitcoin/src/net_processing.h
@@ -9,6 +9,7 @@
 #include <consensus/amount.h>
 #include <net.h>
 #include <node/txorphanage.h>
+#include <node/types.h>
 #include <private_broadcast.h>
 #include <protocol.h>
 #include <uint256.h>
@@ -37,17 +38,21 @@ class Warnings;
 } // namespace node
 
 /** Whether transaction reconciliation protocol should be enabled by default. */
-static constexpr bool DEFAULT_TXRECONCILIATION_ENABLE{false};
+inline constexpr bool DEFAULT_TXRECONCILIATION_ENABLE{false};
 /** Default number of non-mempool transactions to keep around for block reconstruction. Includes
     orphan, replaced, and rejected transactions. */
-static const uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100};
-static const bool DEFAULT_PEERBLOOMFILTERS = false;
-static const bool DEFAULT_PEERBLOCKFILTERS = false;
+inline constexpr uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100};
+/** Default maximum per-second rate for sending transaction inventory to peers. */
+inline constexpr unsigned int DEFAULT_TX_SEND_RATE{14};
+inline constexpr bool DEFAULT_PEERBLOOMFILTERS = false;
+inline constexpr bool DEFAULT_PEERBLOCKFILTERS = false;
 /** Maximum number of outstanding CMPCTBLOCK requests for the same block. */
-static const unsigned int MAX_CMPCTBLOCKS_INFLIGHT_PER_BLOCK = 3;
+inline constexpr unsigned int MAX_CMPCTBLOCKS_INFLIGHT_PER_BLOCK = 3;
 /** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
  *  less than this number, we reached its tip. Changing this value is a protocol upgrade. */
-static const unsigned int MAX_HEADERS_RESULTS = 2000;
+inline constexpr unsigned int MAX_HEADERS_RESULTS = 2000;
+/** The compactblocks version we support. See BIP 152. */
+inline constexpr uint64_t CMPCTBLOCKS_VERSION{2};
 
 struct CNodeStateStats {
     int nSyncHeight = -1;
@@ -67,8 +72,18 @@ struct CNodeStateStats {
 };
 
 struct PeerManagerInfo {
+    struct InvBucketInfo {
+        size_t backlog_count{0};
+        double count_bucket{0};
+        double size_bucket{0};
+    };
+
     std::chrono::seconds median_outbound_time_offset{0s};
     bool ignores_incoming_txs{false};
+    bool private_broadcast{DEFAULT_PRIVATE_BROADCAST};
+    unsigned int tx_send_rate{0};
+    InvBucketInfo inbound_bucket;
+    InvBucketInfo outbound_bucket;
 };
 
 class PeerManager : public CValidationInterface, public NetEventsInterface
@@ -92,6 +107,8 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
         uint32_t max_headers_result{MAX_HEADERS_RESULTS};
         //! Whether private broadcast is used for sending transactions.
         bool private_broadcast{DEFAULT_PRIVATE_BROADCAST};
+        //! Maximum per-second rate for sending transaction inventory to peers.
+        unsigned int tx_send_rate{DEFAULT_TX_SEND_RATE};
     };
 
     static std::unique_ptr<PeerManager> make(CConnman& connman, AddrMan& addrman,
@@ -135,17 +152,19 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
 
     /**
      * Initiate a transaction broadcast to eligible peers.
-     * Queue the witness transaction id to `Peer::TxRelay::m_tx_inventory_to_send`
-     * for each peer. Later, depending on `Peer::TxRelay::m_next_inv_send_time` and if
+     * Queue the witness transaction id to the inbound and outbound inv backlogs.
+     * Later, depending on `-txsendrate`, `Peer::TxRelay::m_next_inv_send_time` and if
      * the transaction is in the mempool, an `INV` about it may be sent to the peer.
      */
-    virtual void InitiateTxBroadcastToAll(const Txid& txid, const Wtxid& wtxid) = 0;
+    virtual void InitiateTxBroadcastToAll(const Wtxid& wtxid) = 0;
 
     /**
      * Initiate a private transaction broadcast. This is done
      * asynchronously via short-lived connections to peers on privacy networks.
+     * @retval node::TransactionError::OK The transaction is scheduled for private broadcast (or was already scheduled).
+     * @retval node::TransactionError::PRIVATE_BROADCAST_FULL Rejected because the private broadcast queue is full.
      */
-    virtual void InitiateTxBroadcastPrivate(const CTransactionRef& tx) = 0;
+    [[nodiscard]] virtual node::TransactionError InitiateTxBroadcastPrivate(const CTransactionRef& tx) = 0;
 
     /** Send ping message to all peers */
     virtual void SendPings() = 0;
diff --git a/depend/bitcoin/src/net_types.cpp b/depend/bitcoin/src/net_types.cpp
index 15a122a7..339d698a 100644
--- a/depend/bitcoin/src/net_types.cpp
+++ b/depend/bitcoin/src/net_types.cpp
@@ -4,10 +4,10 @@
 
 #include <net_types.h>
 
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <univalue.h>
+#include <util/log.h>
 
 static const char* BANMAN_JSON_VERSION_KEY{"version"};
 
diff --git a/depend/bitcoin/src/netaddress.h b/depend/bitcoin/src/netaddress.h
index 2191da54..bb452a11 100644
--- a/depend/bitcoin/src/netaddress.h
+++ b/depend/bitcoin/src/netaddress.h
@@ -59,14 +59,14 @@ enum Network {
 
 /// Prefix of an IPv6 address when it contains an embedded IPv4 address.
 /// Used when (un)serializing addresses in ADDRv1 format (pre-BIP155).
-static const std::array<uint8_t, 12> IPV4_IN_IPV6_PREFIX{
+inline constexpr std::array<uint8_t, 12> IPV4_IN_IPV6_PREFIX{
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF};
 
 /// Prefix of an IPv6 address when it contains an embedded TORv2 address.
 /// Used when (un)serializing addresses in ADDRv1 format (pre-BIP155).
 /// Such dummy IPv6 addresses are guaranteed to not be publicly routable as they
 /// fall under RFC4193's fc00::/7 subnet allocated to unique-local addresses.
-static const std::array<uint8_t, 6> TORV2_IN_IPV6_PREFIX{
+inline constexpr std::array<uint8_t, 6> TORV2_IN_IPV6_PREFIX{
     0xFD, 0x87, 0xD8, 0x7E, 0xEB, 0x43};
 
 /// Prefix of an IPv6 address when it contains an embedded "internal" address.
@@ -74,35 +74,35 @@ static const std::array<uint8_t, 6> TORV2_IN_IPV6_PREFIX{
 /// The prefix comes from 0xFD + SHA256("bitcoin")[0:5].
 /// Such dummy IPv6 addresses are guaranteed to not be publicly routable as they
 /// fall under RFC4193's fc00::/7 subnet allocated to unique-local addresses.
-static const std::array<uint8_t, 6> INTERNAL_IN_IPV6_PREFIX{
+inline constexpr std::array<uint8_t, 6> INTERNAL_IN_IPV6_PREFIX{
     0xFD, 0x6B, 0x88, 0xC0, 0x87, 0x24 // 0xFD + sha256("bitcoin")[0:5].
 };
 
 /// All CJDNS addresses start with 0xFC. See
 /// https://github.com/cjdelisle/cjdns/blob/master/doc/Whitepaper.md#pulling-it-all-together
-static constexpr uint8_t CJDNS_PREFIX{0xFC};
+inline constexpr uint8_t CJDNS_PREFIX{0xFC};
 
 /// Size of IPv4 address (in bytes).
-static constexpr size_t ADDR_IPV4_SIZE = 4;
+inline constexpr size_t ADDR_IPV4_SIZE = 4;
 
 /// Size of IPv6 address (in bytes).
-static constexpr size_t ADDR_IPV6_SIZE = 16;
+inline constexpr size_t ADDR_IPV6_SIZE = 16;
 
 /// Size of TORv3 address (in bytes). This is the length of just the address
 /// as used in BIP155, without the checksum and the version byte.
-static constexpr size_t ADDR_TORV3_SIZE = 32;
+inline constexpr size_t ADDR_TORV3_SIZE = 32;
 
 /// Size of I2P address (in bytes).
-static constexpr size_t ADDR_I2P_SIZE = 32;
+inline constexpr size_t ADDR_I2P_SIZE = 32;
 
 /// Size of CJDNS address (in bytes).
-static constexpr size_t ADDR_CJDNS_SIZE = 16;
+inline constexpr size_t ADDR_CJDNS_SIZE = 16;
 
 /// Size of "internal" (NET_INTERNAL) address (in bytes).
-static constexpr size_t ADDR_INTERNAL_SIZE = 10;
+inline constexpr size_t ADDR_INTERNAL_SIZE = 10;
 
 /// SAM 3.1 and earlier do not support specifying ports and force the port to 0.
-static constexpr uint16_t I2P_SAM31_PORT{0};
+inline constexpr uint16_t I2P_SAM31_PORT{0};
 
 std::string OnionToString(std::span<const uint8_t> addr);
 
diff --git a/depend/bitcoin/src/netbase.cpp b/depend/bitcoin/src/netbase.cpp
index 5434ec9f..002be572 100644
--- a/depend/bitcoin/src/netbase.cpp
+++ b/depend/bitcoin/src/netbase.cpp
@@ -8,9 +8,9 @@
 #include <netbase.h>
 
 #include <compat/compat.h>
-#include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
+#include <util/log.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
 #include <util/string.h>
@@ -333,7 +333,7 @@ static IntrRecvError InterruptibleRecv(uint8_t* data, size_t len, std::chrono::m
                 // we're approaching the end of the specified total timeout
                 const auto remaining = std::chrono::milliseconds{endTime - curTime};
                 const auto timeout = std::min(remaining, std::chrono::milliseconds{MAX_WAIT_FOR_IO});
-                if (!sock.Wait(timeout, Sock::RECV)) {
+                if (!sock.Wait(timeout, Sock::RecvEvent)) {
                     return IntrRecvError::NetworkError;
                 }
             } else {
@@ -587,7 +587,12 @@ static void LogConnectFailure(bool manual_connection, util::ConstevalFormatStrin
     }
 }
 
-static bool ConnectToSocket(const Sock& sock, struct sockaddr* sockaddr, socklen_t len, const std::string& dest_str, bool manual_connection)
+static bool ConnectToSocket(const Sock& sock,
+                            struct sockaddr* sockaddr,
+                            socklen_t len,
+                            const std::string& dest_str,
+                            bool manual_connection,
+                            std::chrono::milliseconds timeout)
 {
     // Connect to `sockaddr` using `sock`.
     if (sock.Connect(sockaddr, len) == SOCKET_ERROR) {
@@ -598,9 +603,9 @@ static bool ConnectToSocket(const Sock& sock, struct sockaddr* sockaddr, socklen
             // Connection didn't actually fail, but is being established
             // asynchronously. Thus, use async I/O api (select/poll)
             // synchronously to check for successful connection with a timeout.
-            const Sock::Event requested = Sock::RECV | Sock::SEND;
+            const Sock::Event requested = Sock::RecvEvent | Sock::SendEvent;
             Sock::Event occurred;
-            if (!sock.Wait(std::chrono::milliseconds{nConnectTimeout}, requested, &occurred)) {
+            if (!sock.Wait(timeout, requested, &occurred)) {
                 LogInfo("wait for connect to %s failed: %s\n",
                           dest_str,
                           NetworkErrorString(WSAGetLastError()));
@@ -643,6 +648,13 @@ static bool ConnectToSocket(const Sock& sock, struct sockaddr* sockaddr, socklen
 }
 
 std::unique_ptr<Sock> ConnectDirectly(const CService& dest, bool manual_connection)
+{
+    return ConnectDirectly(dest, manual_connection, std::chrono::milliseconds{nConnectTimeout});
+}
+
+std::unique_ptr<Sock> ConnectDirectly(const CService& dest,
+                                      bool manual_connection,
+                                      std::chrono::milliseconds timeout)
 {
     auto sock = CreateSock(dest.GetSAFamily(), SOCK_STREAM, IPPROTO_TCP);
     if (!sock) {
@@ -658,7 +670,7 @@ std::unique_ptr<Sock> ConnectDirectly(const CService& dest, bool manual_connecti
         return {};
     }
 
-    if (!ConnectToSocket(*sock, (struct sockaddr*)&sockaddr, len, dest.ToStringAddrPort(), manual_connection)) {
+    if (!ConnectToSocket(*sock, (struct sockaddr*)&sockaddr, len, dest.ToStringAddrPort(), manual_connection, timeout)) {
         return {};
     }
 
@@ -687,7 +699,12 @@ std::unique_ptr<Sock> Proxy::Connect() const
     memcpy(addrun.sun_path, path.c_str(), std::min(sizeof(addrun.sun_path) - 1, path.length()));
     socklen_t len = sizeof(addrun);
 
-    if(!ConnectToSocket(*sock, (struct sockaddr*)&addrun, len, path, /*manual_connection=*/true)) {
+    if (!ConnectToSocket(*sock,
+                         (struct sockaddr*)&addrun,
+                         len,
+                         path,
+                         /*manual_connection=*/true,
+                         std::chrono::milliseconds{nConnectTimeout})) {
         return {};
     }
 
diff --git a/depend/bitcoin/src/netbase.h b/depend/bitcoin/src/netbase.h
index 88cc6981..3bde9ad4 100644
--- a/depend/bitcoin/src/netbase.h
+++ b/depend/bitcoin/src/netbase.h
@@ -11,6 +11,7 @@
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
 
+#include <chrono>
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -24,12 +25,12 @@ extern int nConnectTimeout;
 extern bool fNameLookup;
 
 //! -timeout default
-static const int DEFAULT_CONNECT_TIMEOUT = 5000;
+inline constexpr int DEFAULT_CONNECT_TIMEOUT = 5000;
 //! -dns default
-static const int DEFAULT_NAME_LOOKUP = true;
+inline constexpr int DEFAULT_NAME_LOOKUP = true;
 
 /** Prefix for unix domain socket addresses (which are local filesystem paths) */
-const std::string ADDR_PREFIX_UNIX = "unix:";
+inline const std::string ADDR_PREFIX_UNIX = "unix:";
 
 enum class ConnectionDirection {
     None = 0,
@@ -305,6 +306,11 @@ extern std::function<std::unique_ptr<Sock>(int, int, int)> CreateSock;
  */
 std::unique_ptr<Sock> ConnectDirectly(const CService& dest, bool manual_connection);
 
+/** Create a socket and try to connect to the specified service, using the provided timeout. */
+std::unique_ptr<Sock> ConnectDirectly(const CService& dest,
+                                      bool manual_connection,
+                                      std::chrono::milliseconds timeout);
+
 /**
  * Connect to a specified destination service through a SOCKS5 proxy by first
  * connecting to the SOCKS5 proxy.
diff --git a/depend/bitcoin/src/netgroup.cpp b/depend/bitcoin/src/netgroup.cpp
index 9b0d4d8d..69fbef3e 100644
--- a/depend/bitcoin/src/netgroup.cpp
+++ b/depend/bitcoin/src/netgroup.cpp
@@ -5,9 +5,9 @@
 #include <netgroup.h>
 
 #include <hash.h>
-#include <logging.h>
 #include <uint256.h>
 #include <util/asmap.h>
+#include <util/log.h>
 
 #include <cstddef>
 
diff --git a/depend/bitcoin/src/node/blockstorage.cpp b/depend/bitcoin/src/node/blockstorage.cpp
index b0842a00..8771c353 100644
--- a/depend/bitcoin/src/node/blockstorage.cpp
+++ b/depend/bitcoin/src/node/blockstorage.cpp
@@ -255,10 +255,21 @@ CBlockIndex* BlockManager::AddToBlockIndex(const CBlockHeader& block, CBlockInde
     return pindexNew;
 }
 
+void BlockManager::AddUnlinkedBlock(CBlockIndex* block)
+{
+    AssertLockHeld(cs_main);
+    Assume(block != nullptr);
+    Assume(block->nStatus & BLOCK_HAVE_DATA);
+    auto range = m_blocks_unlinked.equal_range(block->pprev);
+    for (auto it = range.first; it != range.second; ++it) {
+        if (it->second == block) return;  // don't insert duplicates
+    }
+    m_blocks_unlinked.emplace(block->pprev, block);
+}
+
 void BlockManager::PruneOneBlockFile(const int fileNumber)
 {
     AssertLockHeld(cs_main);
-    LOCK(cs_LastBlockFile);
 
     for (auto& entry : m_block_index) {
         CBlockIndex* pindex = &entry.second;
@@ -296,7 +307,7 @@ void BlockManager::FindFilesToPruneManual(
 {
     assert(IsPruneMode() && nManualPruneHeight > 0);
 
-    LOCK2(cs_main, cs_LastBlockFile);
+    LOCK(::cs_main);
     if (chain.m_chain.Height() < 0) {
         return;
     }
@@ -324,7 +335,7 @@ void BlockManager::FindFilesToPrune(
     const Chainstate& chain,
     ChainstateManager& chainman)
 {
-    LOCK2(cs_main, cs_LastBlockFile);
+    LOCK(::cs_main);
     // Compute `target` value with maximum size (in bytes) of blocks below the
     // `last_prune` height which should be preserved and not pruned. The
     // `target` value will be derived from the -prune preference provided by the
@@ -487,7 +498,9 @@ bool BlockManager::LoadBlockIndex(const std::optional<uint256>& snapshot_blockha
                     pindex->m_chain_tx_count = pindex->pprev->m_chain_tx_count + pindex->nTx;
                 } else {
                     pindex->m_chain_tx_count = 0;
-                    m_blocks_unlinked.insert(std::make_pair(pindex->pprev, pindex));
+                    if (pindex->nStatus & BLOCK_HAVE_DATA) {
+                        AddUnlinkedBlock(pindex);
+                    }
                 }
             } else {
                 pindex->m_chain_tx_count = pindex->nTx;
@@ -528,12 +541,13 @@ void BlockManager::WriteBlockIndexDB()
         vBlocks.push_back(*it);
         m_dirty_blockindex.erase(it++);
     }
-    int max_blockfile = WITH_LOCK(cs_LastBlockFile, return this->MaxBlockfileNum());
+    int max_blockfile{this->MaxBlockfileNum()};
     m_block_tree_db->WriteBatchSync(vFiles, max_blockfile, vBlocks);
 }
 
 bool BlockManager::LoadBlockIndexDB(const std::optional<uint256>& snapshot_blockhash)
 {
+    AssertLockHeld(::cs_main);
     if (!LoadBlockIndex(snapshot_blockhash)) {
         return false;
     }
@@ -573,7 +587,6 @@ bool BlockManager::LoadBlockIndexDB(const std::optional<uint256>& snapshot_block
 
     {
         // Initialize the blockfile cursors.
-        LOCK(cs_LastBlockFile);
         for (size_t i = 0; i < m_blockfile_info.size(); ++i) {
             const auto last_height_in_file = m_blockfile_info[i].nHeightLast;
             m_blockfile_cursors[BlockfileTypeForHeight(last_height_in_file)] = {static_cast<int>(i), 0};
@@ -597,7 +610,7 @@ bool BlockManager::LoadBlockIndexDB(const std::optional<uint256>& snapshot_block
 void BlockManager::ScanAndUnlinkAlreadyPrunedFiles()
 {
     AssertLockHeld(::cs_main);
-    int max_blockfile = WITH_LOCK(cs_LastBlockFile, return this->MaxBlockfileNum());
+    int max_blockfile{this->MaxBlockfileNum()};
     if (!m_have_pruned) {
         return;
     }
@@ -695,8 +708,7 @@ void BlockManager::CleanupBlockRevFiles() const
 
 CBlockFileInfo* BlockManager::GetBlockFileInfo(size_t n)
 {
-    LOCK(cs_LastBlockFile);
-
+    AssertLockHeld(::cs_main);
     return &m_blockfile_info.at(n);
 }
 
@@ -747,8 +759,8 @@ bool BlockManager::FlushUndoFile(int block_file, bool finalize)
 
 bool BlockManager::FlushBlockFile(int blockfile_num, bool fFinalize, bool finalize_undo)
 {
+    AssertLockHeld(::cs_main);
     bool success = true;
-    LOCK(cs_LastBlockFile);
 
     if (m_blockfile_info.size() < 1) {
         // Return if we haven't loaded any blockfiles yet. This happens during
@@ -784,7 +796,7 @@ BlockfileType BlockManager::BlockfileTypeForHeight(int height)
 
 bool BlockManager::FlushChainstateBlockFile(int tip_height)
 {
-    LOCK(cs_LastBlockFile);
+    AssertLockHeld(::cs_main);
     auto& cursor = m_blockfile_cursors[BlockfileTypeForHeight(tip_height)];
     // If the cursor does not exist, it means an assumeutxo snapshot is loaded,
     // but no blocks past the snapshot height have been written yet, so there
@@ -798,8 +810,7 @@ bool BlockManager::FlushChainstateBlockFile(int tip_height)
 
 uint64_t BlockManager::CalculateCurrentUsage()
 {
-    LOCK(cs_LastBlockFile);
-
+    AssertLockHeld(::cs_main);
     uint64_t retval = 0;
     for (const CBlockFileInfo& file : m_blockfile_info) {
         retval += file.nSize + file.nUndoSize;
@@ -838,8 +849,7 @@ fs::path BlockManager::GetBlockPosFilename(const FlatFilePos& pos) const
 
 FlatFilePos BlockManager::FindNextBlockPos(unsigned int nAddSize, unsigned int nHeight, uint64_t nTime)
 {
-    LOCK(cs_LastBlockFile);
-
+    AssertLockHeld(::cs_main);
     const BlockfileType chain_type = BlockfileTypeForHeight(nHeight);
 
     if (!m_blockfile_cursors[chain_type]) {
@@ -928,8 +938,7 @@ FlatFilePos BlockManager::FindNextBlockPos(unsigned int nAddSize, unsigned int n
 
 void BlockManager::UpdateBlockInfo(const CBlock& block, unsigned int nHeight, const FlatFilePos& pos)
 {
-    LOCK(cs_LastBlockFile);
-
+    AssertLockHeld(::cs_main);
     // Update the cursor so it points to the last file.
     const BlockfileType chain_type{BlockfileTypeForHeight(nHeight)};
     auto& cursor{m_blockfile_cursors[chain_type]};
@@ -950,10 +959,9 @@ void BlockManager::UpdateBlockInfo(const CBlock& block, unsigned int nHeight, co
 
 bool BlockManager::FindUndoPos(BlockValidationState& state, int nFile, FlatFilePos& pos, unsigned int nAddSize)
 {
+    AssertLockHeld(::cs_main);
     pos.nFile = nFile;
 
-    LOCK(cs_LastBlockFile);
-
     pos.nPos = m_blockfile_info[nFile].nUndoSize;
     m_blockfile_info[nFile].nUndoSize += nAddSize;
     m_dirty_fileinfo.insert(nFile);
@@ -974,7 +982,7 @@ bool BlockManager::WriteBlockUndo(const CBlockUndo& blockundo, BlockValidationSt
 {
     AssertLockHeld(::cs_main);
     const BlockfileType type = BlockfileTypeForHeight(block.nHeight);
-    auto& cursor = *Assert(WITH_LOCK(cs_LastBlockFile, return m_blockfile_cursors[type]));
+    auto& cursor = *Assert(m_blockfile_cursors[type]);
 
     // Write undo information to disk
     if (block.GetUndoPos().IsNull()) {
@@ -1139,6 +1147,7 @@ BlockManager::ReadRawBlockResult BlockManager::ReadRawBlock(const FlatFilePos& p
 
 FlatFilePos BlockManager::WriteBlock(const CBlock& block, int nHeight)
 {
+    AssertLockHeld(::cs_main);
     const unsigned int block_size{static_cast<unsigned int>(GetSerializeSize(TX_WITH_WITNESS(block)))};
     FlatFilePos pos{FindNextBlockPos(block_size + STORAGE_HEADER_BYTES, nHeight, block.GetBlockTime())};
     if (pos.IsNull()) {
@@ -1296,7 +1305,7 @@ void ImportBlocks(ChainstateManager& chainman, std::span<const fs::path> import_
         chainman.m_blockman.m_blockfiles_indexed = true;
         LogInfo("Reindexing finished");
         // To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):
-        chainman.ActiveChainstate().LoadGenesisBlock();
+        (void)chainman.LoadGenesisBlock();
     }
 
     // -loadblock=
diff --git a/depend/bitcoin/src/node/blockstorage.h b/depend/bitcoin/src/node/blockstorage.h
index a081b954..c871bf3f 100644
--- a/depend/bitcoin/src/node/blockstorage.h
+++ b/depend/bitcoin/src/node/blockstorage.h
@@ -18,6 +18,8 @@
 #include <streams.h>
 #include <sync.h>
 #include <uint256.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/2014.
 #include <util/byte_units.h> // IWYU pragma: keep
 #include <util/expected.h>
 #include <util/fs.h>
@@ -117,17 +119,17 @@ using kernel::CBlockFileInfo;
 using kernel::BlockTreeDB;
 
 /** The pre-allocation chunk size for blk?????.dat files (since 0.8) */
-static const unsigned int BLOCKFILE_CHUNK_SIZE{16_MiB};
+inline constexpr unsigned int BLOCKFILE_CHUNK_SIZE{16_MiB};
 /** The pre-allocation chunk size for rev?????.dat files (since 0.8) */
-static const unsigned int UNDOFILE_CHUNK_SIZE{1_MiB};
+inline constexpr unsigned int UNDOFILE_CHUNK_SIZE{1_MiB};
 /** The maximum size of a blk?????.dat file (since 0.8) */
-static const unsigned int MAX_BLOCKFILE_SIZE{128_MiB};
+inline constexpr unsigned int MAX_BLOCKFILE_SIZE{128_MiB};
 
 /** Size of header written by WriteBlock before a serialized CBlock (8 bytes) */
-static constexpr uint32_t STORAGE_HEADER_BYTES{std::tuple_size_v<MessageStartChars> + sizeof(unsigned int)};
+inline constexpr uint32_t STORAGE_HEADER_BYTES{std::tuple_size_v<MessageStartChars> + sizeof(unsigned int)};
 
 /** Total overhead when writing undo data: header (8 bytes) plus checksum (32 bytes) */
-static constexpr uint32_t UNDO_DATA_DISK_OVERHEAD{STORAGE_HEADER_BYTES + uint256::size()};
+inline constexpr uint32_t UNDO_DATA_DISK_OVERHEAD{STORAGE_HEADER_BYTES + uint256::size()};
 
 // Because validation code takes pointers to the map's CBlockIndex objects, if
 // we ever switch to another associative container, we need to either use a
@@ -207,7 +209,7 @@ class BlockManager
         EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
     /** Return false if block file or undo file flushing fails. */
-    [[nodiscard]] bool FlushBlockFile(int blockfile_num, bool fFinalize, bool finalize_undo);
+    [[nodiscard]] bool FlushBlockFile(int blockfile_num, bool fFinalize, bool finalize_undo) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     /** Return false if undo file flushing fails. */
     [[nodiscard]] bool FlushUndoFile(int block_file, bool finalize = false);
@@ -221,9 +223,9 @@ class BlockManager
      * The nAddSize argument passed to this function should include not just the size of the serialized CBlock, but also the size of
      * separator fields (STORAGE_HEADER_BYTES).
      */
-    [[nodiscard]] FlatFilePos FindNextBlockPos(unsigned int nAddSize, unsigned int nHeight, uint64_t nTime);
-    [[nodiscard]] bool FlushChainstateBlockFile(int tip_height);
-    bool FindUndoPos(BlockValidationState& state, int nFile, FlatFilePos& pos, unsigned int nAddSize);
+    [[nodiscard]] FlatFilePos FindNextBlockPos(unsigned int nAddSize, unsigned int nHeight, uint64_t nTime) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    [[nodiscard]] bool FlushChainstateBlockFile(int tip_height) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    [[nodiscard]] bool FindUndoPos(BlockValidationState& state, int nFile, FlatFilePos& pos, unsigned int nAddSize) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     AutoFile OpenUndoFile(const FlatFilePos& pos, bool fReadOnly = false) const;
 
@@ -255,8 +257,6 @@ class BlockManager
         const Chainstate& chain,
         ChainstateManager& chainman);
 
-    RecursiveMutex cs_LastBlockFile;
-
     //! Since assumedvalid chainstates may be syncing a range of the chain that is very
     //! far away from the normal/background validation process, we should segment blockfiles
     //! for assumed chainstates. Otherwise, we might have wildly different height ranges
@@ -268,12 +268,13 @@ class BlockManager
     //!
     //! The first element is the NORMAL cursor, second is ASSUMED.
     std::array<std::optional<BlockfileCursor>, BlockfileType::NUM_TYPES>
-        m_blockfile_cursors GUARDED_BY(cs_LastBlockFile) = {
+        m_blockfile_cursors GUARDED_BY(::cs_main) = {
             BlockfileCursor{},
             std::nullopt,
     };
-    int MaxBlockfileNum() const EXCLUSIVE_LOCKS_REQUIRED(cs_LastBlockFile)
+    int MaxBlockfileNum() const EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
     {
+        AssertLockHeld(::cs_main);
         static const BlockfileCursor empty_cursor;
         const auto& normal = m_blockfile_cursors[BlockfileType::NORMAL].value_or(empty_cursor);
         const auto& assumed = m_blockfile_cursors[BlockfileType::ASSUMED].value_or(empty_cursor);
@@ -351,9 +352,9 @@ class BlockManager
 
     /**
      * All pairs A->B, where A (or one of its ancestors) misses transactions, but B has transactions.
-     * Pruned nodes may have entries where B is missing data.
      */
     std::multimap<CBlockIndex*, CBlockIndex*> m_blocks_unlinked;
+    void AddUnlinkedBlock(CBlockIndex* block) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
     std::unique_ptr<BlockTreeDB> m_block_tree_db GUARDED_BY(::cs_main);
 
@@ -379,7 +380,7 @@ class BlockManager
     const CBlockIndex* LookupBlockIndex(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
     /** Get block file info entry for one block file */
-    CBlockFileInfo* GetBlockFileInfo(size_t n);
+    CBlockFileInfo* GetBlockFileInfo(size_t n) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     bool WriteBlockUndo(const CBlockUndo& blockundo, BlockValidationState& state, CBlockIndex& block)
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
@@ -392,7 +393,7 @@ class BlockManager
      * @returns in case of success, the position to which the block was written to
      *          in case of an error, an empty FlatFilePos
      */
-    FlatFilePos WriteBlock(const CBlock& block, int nHeight);
+    FlatFilePos WriteBlock(const CBlock& block, int nHeight) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     /** Update blockfile info while processing a block during reindex. The block must be available on disk.
      *
@@ -400,7 +401,7 @@ class BlockManager
      * @param[in]  nHeight      the height of the block
      * @param[in]  pos          the position of the serialized CBlock on disk
      */
-    void UpdateBlockInfo(const CBlock& block, unsigned int nHeight, const FlatFilePos& pos);
+    void UpdateBlockInfo(const CBlock& block, unsigned int nHeight, const FlatFilePos& pos) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     /** Whether running in -prune mode. */
     [[nodiscard]] bool IsPruneMode() const { return m_prune_mode; }
@@ -412,7 +413,7 @@ class BlockManager
     [[nodiscard]] bool LoadingBlocks() const { return m_importing || !m_blockfiles_indexed; }
 
     /** Calculate the amount of disk space the block & undo files currently use */
-    uint64_t CalculateCurrentUsage();
+    uint64_t CalculateCurrentUsage() EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     //! Check if all blocks in the [upper_block, lower_block] range have data available as
     //! defined by the status mask.
diff --git a/depend/bitcoin/src/node/caches.cpp b/depend/bitcoin/src/node/caches.cpp
index 3250c51a..6eb2c0a3 100644
--- a/depend/bitcoin/src/node/caches.cpp
+++ b/depend/bitcoin/src/node/caches.cpp
@@ -9,75 +9,86 @@
 #include <index/txindex.h>
 #include <index/txospenderindex.h>
 #include <kernel/caches.h>
-#include <logging.h>
 #include <node/interface_ui.h>
 #include <tinyformat.h>
 #include <util/byte_units.h>
+#include <util/log.h>
+#include <util/overflow.h>
+#include <util/translation.h>
 
 #include <algorithm>
+#include <cstdint>
 #include <string>
 
 // Unlike for the UTXO database, for the txindex scenario the leveldb cache make
 // a meaningful difference: https://github.com/bitcoin/bitcoin/pull/8273#issuecomment-229601991
 //! Max memory allocated to tx index DB specific cache in bytes.
-static constexpr size_t MAX_TX_INDEX_CACHE{1_GiB};
+static constexpr uint64_t MAX_TX_INDEX_CACHE{1_GiB};
 //! Max memory allocated to all block filter index caches combined in bytes.
-static constexpr size_t MAX_FILTER_INDEX_CACHE{1_GiB};
+static constexpr uint64_t MAX_FILTER_INDEX_CACHE{1_GiB};
 //! Max memory allocated to tx spenderindex DB specific cache in bytes.
-static constexpr size_t MAX_TXOSPENDER_INDEX_CACHE{1_GiB};
-//! Maximum dbcache size on 32-bit systems.
-static constexpr size_t MAX_32BIT_DBCACHE{1_GiB};
+static constexpr uint64_t MAX_TXOSPENDER_INDEX_CACHE{1_GiB};
 //! Larger default dbcache on 64-bit systems with enough RAM.
-static constexpr size_t HIGH_DEFAULT_DBCACHE{1_GiB};
+static constexpr uint64_t HIGH_DEFAULT_DBCACHE{1_GiB};
 //! Minimum detected RAM required for HIGH_DEFAULT_DBCACHE.
 static constexpr uint64_t HIGH_DEFAULT_DBCACHE_MIN_TOTAL_RAM{4_GiB};
 
 namespace node {
-size_t GetDefaultDBCache()
+uint64_t GetDefaultDBCache()
 {
     if constexpr (sizeof(void*) >= 8) {
-        if (GetTotalRAM().value_or(0) >= HIGH_DEFAULT_DBCACHE_MIN_TOTAL_RAM) {
+        if (TryGetTotalRam().value_or(0) >= HIGH_DEFAULT_DBCACHE_MIN_TOTAL_RAM) {
             return HIGH_DEFAULT_DBCACHE;
         }
     }
-    return DEFAULT_DB_CACHE;
+    return DEFAULT_KERNEL_CACHE;
 }
 
-size_t CalculateDbCacheBytes(const ArgsManager& args)
+uint64_t CalculateDbCacheBytes(const ArgsManager& args)
 {
     if (auto db_cache{args.GetIntArg("-dbcache")}) {
         if (*db_cache < 0) db_cache = 0;
         const uint64_t db_cache_bytes{SaturatingLeftShift<uint64_t>(*db_cache, 20)};
-        constexpr auto max_db_cache{sizeof(void*) == 4 ? MAX_32BIT_DBCACHE : std::numeric_limits<size_t>::max()};
-        return std::max<size_t>(MIN_DB_CACHE, std::min<uint64_t>(db_cache_bytes, max_db_cache));
+        return std::max(MIN_DBCACHE_BYTES, std::min(db_cache_bytes, MAX_DBCACHE_BYTES));
     }
     return GetDefaultDBCache();
 }
 
 CacheSizes CalculateCacheSizes(const ArgsManager& args, size_t n_indexes)
 {
-    size_t total_cache{CalculateDbCacheBytes(args)};
+    uint64_t total_cache{CalculateDbCacheBytes(args)};
 
+    // Allocate proportional to usage pattern benefit:
+    // - txindex (10%): serves getrawtransaction RPCs with mostly unique,
+    //   non-repetitive lookups across the entire blockchain.
+    // - blockfilterindex (5%): serves BIP 157 light clients that repeatedly
+    //   query recent blocks, benefiting from LevelDB cache, but the
+    //   working set for a typical 2-week offline gap is ~200kiB, well within 5%
+    //   of the total cache.
+    // - txospenderindex (5%): serves gettxspendingprevout RPCs with very
+    //   specific, rarely repeated outpoint queries.
+    // - coinstatsindex: intentionally not included here, since usage pattern
+    //   does not seem to suggest it would be necessary to cache.
     IndexCacheSizes index_sizes;
-    index_sizes.tx_index = std::min(total_cache / 8, args.GetBoolArg("-txindex", DEFAULT_TXINDEX) ? MAX_TX_INDEX_CACHE : 0);
-    total_cache -= index_sizes.tx_index;
-    index_sizes.txospender_index = std::min(total_cache / 8, args.GetBoolArg("-txospenderindex", DEFAULT_TXOSPENDERINDEX) ? MAX_TXOSPENDER_INDEX_CACHE : 0);
-    total_cache -= index_sizes.txospender_index;
+    index_sizes.tx_index = std::min(total_cache * 10 / 100, args.GetBoolArg("-txindex", DEFAULT_TXINDEX) ? MAX_TX_INDEX_CACHE : 0);
+    index_sizes.txospender_index = std::min(total_cache * 5 / 100, args.GetBoolArg("-txospenderindex", DEFAULT_TXOSPENDERINDEX) ? MAX_TXOSPENDER_INDEX_CACHE : 0);
     if (n_indexes > 0) {
-        size_t max_cache = std::min(total_cache / 8, MAX_FILTER_INDEX_CACHE);
+        uint64_t max_cache = std::min(total_cache * 5 / 100, MAX_FILTER_INDEX_CACHE);
         index_sizes.filter_index = max_cache / n_indexes;
         total_cache -= index_sizes.filter_index * n_indexes;
     }
+    total_cache -= index_sizes.tx_index;
+    total_cache -= index_sizes.txospender_index;
     return {index_sizes, kernel::CacheSizes{total_cache}};
 }
 
 void LogOversizedDbCache(const ArgsManager& args) noexcept
 {
-    if (const auto total_ram{GetTotalRAM()}) {
-        const size_t db_cache{CalculateDbCacheBytes(args)};
+    if (const auto total_ram{TryGetTotalRam()}) {
+        const uint64_t db_cache{CalculateDbCacheBytes(args)};
         if (ShouldWarnOversizedDbCache(db_cache, *total_ram)) {
             InitWarning(bilingual_str{tfm::format(_("A %zu MiB dbcache may be too large for a system memory of only %zu MiB."),
-                        db_cache >> 20, *total_ram >> 20)});
+                        db_cache / 1_MiB, *total_ram / 1_MiB)});
         }
     }
 }
diff --git a/depend/bitcoin/src/node/caches.h b/depend/bitcoin/src/node/caches.h
index f4143bed..4e8b49b3 100644
--- a/depend/bitcoin/src/node/caches.h
+++ b/depend/bitcoin/src/node/caches.h
@@ -8,21 +8,21 @@
 #include <kernel/caches.h>
 #include <util/byte_units.h>
 
+#include <algorithm>
 #include <cstddef>
+#include <cstdint>
 
 class ArgsManager;
 
-//! min. -dbcache (bytes)
-static constexpr size_t MIN_DB_CACHE{4_MiB};
-//! -dbcache default (bytes)
-static constexpr size_t DEFAULT_DB_CACHE{DEFAULT_KERNEL_CACHE};
+//! Reserved non-dbcache memory usage.
+inline constexpr uint64_t DBCACHE_WARNING_RESERVED_RAM{2_GiB};
 
 namespace node {
-size_t GetDefaultDBCache();
+uint64_t GetDefaultDBCache();
 struct IndexCacheSizes {
-    size_t tx_index{0};
-    size_t filter_index{0};
-    size_t txospender_index{0};
+    uint64_t tx_index{0};
+    uint64_t filter_index{0};
+    uint64_t txospender_index{0};
 };
 struct CacheSizes {
     IndexCacheSizes index;
@@ -31,7 +31,8 @@ struct CacheSizes {
 CacheSizes CalculateCacheSizes(const ArgsManager& args, size_t n_indexes = 0);
 constexpr bool ShouldWarnOversizedDbCache(uint64_t dbcache, uint64_t total_ram) noexcept
 {
-    const uint64_t cap{(total_ram < 2_GiB) ? DEFAULT_DB_CACHE : (total_ram / 100) * 75};
+    const uint64_t available_ram{total_ram > DBCACHE_WARNING_RESERVED_RAM ? total_ram - DBCACHE_WARNING_RESERVED_RAM : 0};
+    const uint64_t cap{std::max(DEFAULT_KERNEL_CACHE, (available_ram / 4) * 3)};
     return dbcache > cap;
 }
 
diff --git a/depend/bitcoin/src/node/chainstate.cpp b/depend/bitcoin/src/node/chainstate.cpp
index 1725fe70..c27447b7 100644
--- a/depend/bitcoin/src/node/chainstate.cpp
+++ b/depend/bitcoin/src/node/chainstate.cpp
@@ -62,7 +62,7 @@ static ChainstateLoadResult CompleteChainstateInitialization(
     // If we're not mid-reindex (based on disk + args), add a genesis block on disk
     // (otherwise we use the one already on disk).
     // This is called again in ImportBlocks after the reindex completes.
-    if (chainman.m_blockman.m_blockfiles_indexed && !chainman.ActiveChainstate().LoadGenesisBlock()) {
+    if (chainman.m_blockman.m_blockfiles_indexed && !chainman.LoadGenesisBlock()) {
         return {ChainstateLoadStatus::FAILURE, _("Error initializing block database")};
     }
 
diff --git a/depend/bitcoin/src/node/chainstatemanager_args.cpp b/depend/bitcoin/src/node/chainstatemanager_args.cpp
index bf91a750..b4431490 100644
--- a/depend/bitcoin/src/node/chainstatemanager_args.cpp
+++ b/depend/bitcoin/src/node/chainstatemanager_args.cpp
@@ -7,12 +7,12 @@
 #include <arith_uint256.h>
 #include <common/args.h>
 #include <common/system.h>
-#include <logging.h>
 #include <node/coins_view_args.h>
 #include <node/database_args.h>
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/byte_units.h>
+#include <util/log.h>
 #include <util/result.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
@@ -60,6 +60,13 @@ util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManage
     // Subtract 1 because the main thread counts towards the par threads.
     opts.worker_threads_num = script_threads - 1;
 
+    if (auto value{args.GetArg<int32_t>("-prevoutfetchthreads")}) {
+        if (*value < 0) {
+            return util::Error{Untranslated(strprintf("-prevoutfetchthreads must be non-negative (got %d). Use 0 to disable parallel input fetching.", *value))};
+        }
+        opts.prevoutfetch_threads_num = std::min(*value, MAX_PREVOUTFETCH_THREADS);
+    }
+
     if (auto max_size = args.GetIntArg("-maxsigcachesize")) {
         // 1. When supplied with a max_size of 0, both the signature cache and
         //    script execution cache create the minimum possible cache (2
diff --git a/depend/bitcoin/src/node/chainstatemanager_args.h b/depend/bitcoin/src/node/chainstatemanager_args.h
index cbcbb6b4..9f62244f 100644
--- a/depend/bitcoin/src/node/chainstatemanager_args.h
+++ b/depend/bitcoin/src/node/chainstatemanager_args.h
@@ -11,7 +11,7 @@
 class ArgsManager;
 
 /** -par default (number of script-checking threads, 0 = auto) */
-static constexpr int DEFAULT_SCRIPTCHECK_THREADS{0};
+inline constexpr int DEFAULT_SCRIPTCHECK_THREADS{0};
 
 namespace node {
 [[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
diff --git a/depend/bitcoin/src/node/context.h b/depend/bitcoin/src/node/context.h
index 848c872f..b8b3274f 100644
--- a/depend/bitcoin/src/node/context.h
+++ b/depend/bitcoin/src/node/context.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_NODE_CONTEXT_H
 #define BITCOIN_NODE_CONTEXT_H
 
+#include <node/mining_types.h>
+
 #include <atomic>
 #include <cstdlib>
 #include <functional>
@@ -81,6 +83,11 @@ struct NodeContext {
     //! Reference to chain client that should used to load or create wallets
     //! opened by the gui.
     std::unique_ptr<interfaces::Mining> mining;
+    //! Mining options used to create block templates. This value member is an
+    //! exception to the dependency guidance above because BlockCreateOptions is
+    //! a minimal dependency. It could be moved to the BlockTemplateCache
+    //! proposed in bitcoin/bitcoin#33421.
+    BlockCreateOptions mining_args;
     interfaces::WalletLoader* wallet_loader{nullptr};
     std::unique_ptr<CScheduler> scheduler;
     std::function<void()> rpc_interruption_point = [] {};
diff --git a/depend/bitcoin/src/node/interface_ui.cpp b/depend/bitcoin/src/node/interface_ui.cpp
index 6b1fe72f..74922f21 100644
--- a/depend/bitcoin/src/node/interface_ui.cpp
+++ b/depend/bitcoin/src/node/interface_ui.cpp
@@ -4,7 +4,7 @@
 
 #include <node/interface_ui.h>
 
-#include <btcsignals.h>
+#include <util/btcsignals.h>
 #include <util/string.h>
 #include <util/translation.h>
 
@@ -12,51 +12,6 @@ using util::MakeUnorderedList;
 
 CClientUIInterface uiInterface;
 
-struct UISignals {
-    btcsignals::signal<CClientUIInterface::ThreadSafeMessageBoxSig, btcsignals::optional_last_value<bool>> ThreadSafeMessageBox;
-    btcsignals::signal<CClientUIInterface::ThreadSafeQuestionSig, btcsignals::optional_last_value<bool>> ThreadSafeQuestion;
-    btcsignals::signal<CClientUIInterface::InitMessageSig> InitMessage;
-    btcsignals::signal<CClientUIInterface::InitWalletSig> InitWallet;
-    btcsignals::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged;
-    btcsignals::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
-    btcsignals::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged;
-    btcsignals::signal<CClientUIInterface::ShowProgressSig> ShowProgress;
-    btcsignals::signal<CClientUIInterface::NotifyBlockTipSig> NotifyBlockTip;
-    btcsignals::signal<CClientUIInterface::NotifyHeaderTipSig> NotifyHeaderTip;
-    btcsignals::signal<CClientUIInterface::BannedListChangedSig> BannedListChanged;
-};
-static UISignals g_ui_signals;
-
-#define ADD_SIGNALS_IMPL_WRAPPER(signal_name)                                                                 \
-    btcsignals::connection CClientUIInterface::signal_name##_connect(std::function<signal_name##Sig> fn) \
-    {                                                                                                         \
-        return g_ui_signals.signal_name.connect(fn);                                                          \
-    }
-
-ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox);
-ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion);
-ADD_SIGNALS_IMPL_WRAPPER(InitMessage);
-ADD_SIGNALS_IMPL_WRAPPER(InitWallet);
-ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged);
-ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged);
-ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged);
-ADD_SIGNALS_IMPL_WRAPPER(ShowProgress);
-ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip);
-ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip);
-ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged);
-
-bool CClientUIInterface::ThreadSafeMessageBox(const bilingual_str& message, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, style).value_or(false);}
-bool CClientUIInterface::ThreadSafeQuestion(const bilingual_str& message, const std::string& non_interactive_message, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, style).value_or(false);}
-void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); }
-void CClientUIInterface::InitWallet() { return g_ui_signals.InitWallet(); }
-void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); }
-void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); }
-void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); }
-void CClientUIInterface::ShowProgress(const std::string& title, int nProgress, bool resume_possible) { return g_ui_signals.ShowProgress(title, nProgress, resume_possible); }
-void CClientUIInterface::NotifyBlockTip(SynchronizationState s, const CBlockIndex& block, double verification_progress) { return g_ui_signals.NotifyBlockTip(s, block, verification_progress); }
-void CClientUIInterface::NotifyHeaderTip(SynchronizationState s, int64_t height, int64_t timestamp, bool presync) { return g_ui_signals.NotifyHeaderTip(s, height, timestamp, presync); }
-void CClientUIInterface::BannedListChanged() { return g_ui_signals.BannedListChanged(); }
-
 bool InitError(const bilingual_str& str)
 {
     uiInterface.ThreadSafeMessageBox(str, CClientUIInterface::MSG_ERROR);
diff --git a/depend/bitcoin/src/node/interface_ui.h b/depend/bitcoin/src/node/interface_ui.h
index 8175683f..96159196 100644
--- a/depend/bitcoin/src/node/interface_ui.h
+++ b/depend/bitcoin/src/node/interface_ui.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_NODE_INTERFACE_UI_H
 #define BITCOIN_NODE_INTERFACE_UI_H
 
+#include <util/btcsignals.h>
+
 #include <cstdint>
 #include <functional>
 #include <string>
@@ -15,10 +17,6 @@ class CBlockIndex;
 enum class SynchronizationState;
 struct bilingual_str;
 
-namespace btcsignals {
-    class connection;
-} // namespace btcsignals
-
 /** Signals for UI communication. */
 class CClientUIInterface
 {
@@ -66,48 +64,43 @@ class CClientUIInterface
         MSG_ERROR = (ICON_ERROR | BTN_OK | MODAL)
     };
 
-#define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...)                                  \
-    rtype signal_name(__VA_ARGS__);                                                        \
-    using signal_name##Sig = rtype(__VA_ARGS__);                                           \
-    btcsignals::connection signal_name##_connect(std::function<signal_name##Sig> fn)
-
     /** Show message box. */
-    ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const bilingual_str& message, unsigned int style);
+    btcsignals::signal<void(const bilingual_str& message, unsigned int style)> ThreadSafeMessageBox;
 
     /** If possible, ask the user a question. If not, falls back to ThreadSafeMessageBox(noninteractive_message, style) and returns false. */
-    ADD_SIGNALS_DECL_WRAPPER(ThreadSafeQuestion, bool, const bilingual_str& message, const std::string& noninteractive_message, unsigned int style);
+    btcsignals::signal<bool(const bilingual_str& message, const std::string& noninteractive_message, unsigned int style), btcsignals::any_of> ThreadSafeQuestion;
 
     /** Progress message during initialization. */
-    ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message);
+    btcsignals::signal<void(const std::string& message)> InitMessage;
 
     /** Wallet loader created. */
-    ADD_SIGNALS_DECL_WRAPPER(InitWallet, void, );
+    btcsignals::signal<void()> InitWallet;
 
     /** Number of network connections changed. */
-    ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections);
+    btcsignals::signal<void(int newNumConnections)> NotifyNumConnectionsChanged;
 
     /** Network activity state changed. */
-    ADD_SIGNALS_DECL_WRAPPER(NotifyNetworkActiveChanged, void, bool networkActive);
+    btcsignals::signal<void(bool networkActive)> NotifyNetworkActiveChanged;
 
     /**
      * Status bar alerts changed.
      */
-    ADD_SIGNALS_DECL_WRAPPER(NotifyAlertChanged, void, );
+    btcsignals::signal<void()> NotifyAlertChanged;
 
     /**
      * Show progress e.g. for verifychain.
      * resume_possible indicates shutting down now will result in the current progress action resuming upon restart.
      */
-    ADD_SIGNALS_DECL_WRAPPER(ShowProgress, void, const std::string& title, int nProgress, bool resume_possible);
+    btcsignals::signal<void(const std::string& title, int nProgress, bool resume_possible)> ShowProgress;
 
     /** New block has been accepted */
-    ADD_SIGNALS_DECL_WRAPPER(NotifyBlockTip, void, SynchronizationState, const CBlockIndex& block, double verification_progress);
+    btcsignals::signal<void(SynchronizationState, const CBlockIndex& block, double verification_progress)> NotifyBlockTip;
 
     /** Best header has changed */
-    ADD_SIGNALS_DECL_WRAPPER(NotifyHeaderTip, void, SynchronizationState, int64_t height, int64_t timestamp, bool presync);
+    btcsignals::signal<void(SynchronizationState, int64_t height, int64_t timestamp, bool presync)> NotifyHeaderTip;
 
     /** Banlist did change. */
-    ADD_SIGNALS_DECL_WRAPPER(BannedListChanged, void, void);
+    btcsignals::signal<void(void)> BannedListChanged;
 };
 
 /** Show warning message **/
diff --git a/depend/bitcoin/src/node/interfaces.cpp b/depend/bitcoin/src/node/interfaces.cpp
index 16db8692..afb6ea48 100644
--- a/depend/bitcoin/src/node/interfaces.cpp
+++ b/depend/bitcoin/src/node/interfaces.cpp
@@ -2,16 +2,18 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <addrdb.h>
+#include <bitcoin-build-config.h> // IWYU pragma: keep
+
 #include <banman.h>
 #include <blockfilter.h>
-#include <btcsignals.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <coins.h>
 #include <common/args.h>
+#include <common/settings.h>
+#include <consensus/amount.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <deploymentstatus.h>
 #include <external_signer.h>
 #include <httprpc.h>
 #include <index/blockfilterindex.h>
@@ -22,23 +24,24 @@
 #include <interfaces/node.h>
 #include <interfaces/rpc.h>
 #include <interfaces/types.h>
-#include <interfaces/wallet.h>
-#include <kernel/chain.h>
 #include <kernel/context.h>
-#include <kernel/mempool_entry.h>
+#include <key.h>
 #include <logging.h>
 #include <mapport.h>
 #include <net.h>
 #include <net_processing.h>
+#include <net_types.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <node/blockstorage.h>
 #include <node/coin.h>
 #include <node/context.h>
 #include <node/interface_ui.h>
-#include <node/mini_miner.h>
-#include <node/miner.h>
 #include <node/kernel_notifications.h>
+#include <node/miner.h>
+#include <node/mini_miner.h>
+#include <node/mining_args.h>
+#include <node/mining_types.h>
 #include <node/transaction.h>
 #include <node/types.h>
 #include <node/warnings.h>
@@ -46,32 +49,39 @@
 #include <policy/fees/block_policy_estimator.h>
 #include <policy/policy.h>
 #include <policy/rbf.h>
-#include <policy/settings.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <rpc/blockchain.h>
 #include <rpc/protocol.h>
+#include <rpc/request.h>
 #include <rpc/server.h>
-#include <support/allocators/secure.h>
 #include <sync.h>
 #include <txmempool.h>
 #include <uint256.h>
 #include <univalue.h>
+#include <util/btcsignals.h>
 #include <util/check.h>
 #include <util/result.h>
 #include <util/signalinterrupt.h>
 #include <util/string.h>
+#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <bitcoin-build-config.h> // IWYU pragma: keep
-
 #include <any>
+#include <atomic>
+#include <condition_variable>
+#include <cstdint>
+#include <cstdlib>
+#include <functional>
+#include <map>
 #include <memory>
 #include <optional>
-#include <stdexcept>
+#include <string>
+#include <tuple>
 #include <utility>
+#include <vector>
 
 using interfaces::BlockRef;
 using interfaces::BlockTemplate;
@@ -86,6 +96,7 @@ using interfaces::Rpc;
 using interfaces::WalletLoader;
 using kernel::ChainstateRole;
 using node::BlockAssembler;
+using node::BlockCreateOptions;
 using node::BlockWaitOptions;
 using node::CoinbaseTx;
 using util::Join;
@@ -375,50 +386,50 @@ class NodeImpl : public Node
     }
     std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.InitMessage_connect(fn));
+        return MakeSignalHandler(::uiInterface.InitMessage.connect(fn));
     }
     std::unique_ptr<Handler> handleMessageBox(MessageBoxFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));
+        return MakeSignalHandler(::uiInterface.ThreadSafeMessageBox.connect(fn));
     }
     std::unique_ptr<Handler> handleQuestion(QuestionFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.ThreadSafeQuestion_connect(fn));
+        return MakeSignalHandler(::uiInterface.ThreadSafeQuestion.connect(fn));
     }
     std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.ShowProgress_connect(fn));
+        return MakeSignalHandler(::uiInterface.ShowProgress.connect(fn));
     }
     std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.InitWallet_connect(fn));
+        return MakeSignalHandler(::uiInterface.InitWallet.connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.NotifyNumConnectionsChanged.connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyNetworkActiveChanged(NotifyNetworkActiveChangedFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.NotifyNetworkActiveChanged.connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyAlertChanged(NotifyAlertChangedFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.NotifyAlertChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.NotifyAlertChanged.connect(fn));
     }
     std::unique_ptr<Handler> handleBannedListChanged(BannedListChangedFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.BannedListChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.BannedListChanged.connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyBlockTip(NotifyBlockTipFn fn) override
     {
-        return MakeSignalHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex& block, double verification_progress) {
+        return MakeSignalHandler(::uiInterface.NotifyBlockTip.connect([fn](SynchronizationState sync_state, const CBlockIndex& block, double verification_progress) {
             fn(sync_state, BlockTip{block.nHeight, block.GetBlockTime(), block.GetBlockHash()}, verification_progress);
         }));
     }
     std::unique_ptr<Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) override
     {
         return MakeSignalHandler(
-            ::uiInterface.NotifyHeaderTip_connect([fn](SynchronizationState sync_state, int64_t height, int64_t timestamp, bool presync) {
+            ::uiInterface.NotifyHeaderTip.connect([fn](SynchronizationState sync_state, int64_t height, int64_t timestamp, bool presync) {
                 fn(sync_state, BlockTip{(int)height, timestamp, uint256{}}, presync);
             }));
     }
@@ -867,11 +878,11 @@ class ChainImpl : public Chain
 class BlockTemplateImpl : public BlockTemplate
 {
 public:
-    explicit BlockTemplateImpl(BlockAssembler::Options assemble_options,
+    explicit BlockTemplateImpl(BlockCreateOptions create_options,
                                std::unique_ptr<CBlockTemplate> block_template,
-                               NodeContext& node) : m_assemble_options(std::move(assemble_options)),
-                                                    m_block_template(std::move(block_template)),
-                                                    m_node(node)
+                               const NodeContext& node) : m_create_options(std::move(create_options)),
+                                                          m_block_template(std::move(block_template)),
+                                                          m_node(node)
     {
         assert(m_block_template);
     }
@@ -906,16 +917,23 @@ class BlockTemplateImpl : public BlockTemplate
         return TransactionMerklePath(m_block_template->block, 0);
     }
 
-    bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CTransactionRef coinbase) override
+    bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CTransactionRef coinbase, std::string& reason, std::string& debug) override
     {
+        if (!coinbase) return false;
         AddMerkleRootAndCoinbase(m_block_template->block, std::move(coinbase), version, timestamp, nonce);
-        return chainman().ProcessNewBlock(std::make_shared<const CBlock>(m_block_template->block), /*force_processing=*/true, /*min_pow_checked=*/true, /*new_block=*/nullptr);
+        return SubmitBlock(chainman(), std::make_shared<const CBlock>(m_block_template->block), reason, debug);
     }
 
     std::unique_ptr<BlockTemplate> waitNext(BlockWaitOptions options) override
     {
-        auto new_template = WaitAndCreateNewBlock(chainman(), notifications(), m_node.mempool.get(), m_block_template, options, m_assemble_options, m_interrupt_wait);
-        if (new_template) return std::make_unique<BlockTemplateImpl>(m_assemble_options, std::move(new_template), m_node);
+        auto new_template = WaitAndCreateNewBlock(chainman(),
+                                                  notifications(),
+                                                  m_node.mempool.get(),
+                                                  m_block_template,
+                                                  /*wait_options=*/options,
+                                                  /*create_options=*/m_create_options,
+                                                  /*interrupt_wait=*/m_interrupt_wait);
+        if (new_template) return std::make_unique<BlockTemplateImpl>(m_create_options, std::move(new_template), m_node);
         return nullptr;
     }
 
@@ -924,20 +942,20 @@ class BlockTemplateImpl : public BlockTemplate
         InterruptWait(notifications(), m_interrupt_wait);
     }
 
-    const BlockAssembler::Options m_assemble_options;
+    const BlockCreateOptions m_create_options;
 
     const std::unique_ptr<CBlockTemplate> m_block_template;
 
     bool m_interrupt_wait{false};
     ChainstateManager& chainman() { return *Assert(m_node.chainman); }
     KernelNotifications& notifications() { return *Assert(m_node.notifications); }
-    NodeContext& m_node;
+    const NodeContext& m_node;
 };
 
 class MinerImpl : public Mining
 {
 public:
-    explicit MinerImpl(NodeContext& node) : m_node(node) {}
+    explicit MinerImpl(const NodeContext& node) : m_node(node) {}
 
     bool isTestChain() override
     {
@@ -961,16 +979,6 @@ class MinerImpl : public Mining
 
     std::unique_ptr<BlockTemplate> createNewBlock(const BlockCreateOptions& options, bool cooldown) override
     {
-        // Reject too-small values instead of clamping so callers don't silently
-        // end up mining with different options than requested. This matches the
-        // behavior of the `-blockreservedweight` startup option, which rejects
-        // values below MINIMUM_BLOCK_RESERVED_WEIGHT.
-        if (options.block_reserved_weight && options.block_reserved_weight < MINIMUM_BLOCK_RESERVED_WEIGHT) {
-            throw std::runtime_error(strprintf("block_reserved_weight (%zu) must be at least %u weight units",
-                                               *options.block_reserved_weight,
-                                               MINIMUM_BLOCK_RESERVED_WEIGHT));
-        }
-
         // Ensure m_tip_block is set so consumers of BlockTemplate can rely on that.
         std::optional<BlockRef> maybe_tip{waitTipChanged(uint256::ZERO, MillisecondsDouble::max())};
 
@@ -990,10 +998,14 @@ class MinerImpl : public Mining
             // Also wait during the final catch-up moments after IBD.
             if (!CooldownIfHeadersAhead(chainman(), notifications(), *maybe_tip, m_interrupt_mining)) return {};
         }
-
-        BlockAssembler::Options assemble_options{options};
-        ApplyArgsManOptions(*Assert(m_node.args), assemble_options);
-        return std::make_unique<BlockTemplateImpl>(assemble_options, BlockAssembler{chainman().ActiveChainstate(), context()->mempool.get(), assemble_options}.CreateNewBlock(), m_node);
+        const BlockCreateOptions create_options{MergeMiningOptions(options, m_node.mining_args)};
+        return std::make_unique<BlockTemplateImpl>(create_options,
+                                                   BlockAssembler{
+                                                       chainman().ActiveChainstate(),
+                                                       m_node.mempool.get(),
+                                                       create_options,
+                                                   }.CreateNewBlock(),
+                                                   m_node);
     }
 
     void interrupt() override
@@ -1010,12 +1022,43 @@ class MinerImpl : public Mining
         return state.IsValid();
     }
 
-    NodeContext* context() override { return &m_node; }
+    bool submitBlock(const CBlock& block_in, std::string& reason, std::string& debug) override
+    {
+        return SubmitBlock(chainman(), std::make_shared<const CBlock>(block_in), reason, debug);
+    }
+
+    std::vector<CTransactionRef> getTransactionsByTxID(const std::vector<Txid>& txids) override
+    {
+        if (!m_node.mempool) return {};
+
+        std::vector<CTransactionRef> results;
+        results.reserve(txids.size());
+        LOCK(m_node.mempool->cs);
+        for (const auto& txid : txids) {
+            results.emplace_back(m_node.mempool->get(txid));
+        }
+        return results;
+    }
+
+    std::vector<CTransactionRef> getTransactionsByWitnessID(const std::vector<Wtxid>& wtxids) override
+    {
+        if (!m_node.mempool) return {};
+
+        std::vector<CTransactionRef> results;
+        results.reserve(wtxids.size());
+        LOCK(m_node.mempool->cs);
+        for (const auto& wtxid : wtxids) {
+            results.emplace_back(m_node.mempool->get(wtxid));
+        }
+        return results;
+    }
+
+    const NodeContext* context() override { return &m_node; }
     ChainstateManager& chainman() { return *Assert(m_node.chainman); }
     KernelNotifications& notifications() { return *Assert(m_node.notifications); }
     // Treat as if guarded by notifications().m_tip_block_mutex
     bool m_interrupt_mining{false};
-    NodeContext& m_node;
+    const NodeContext& m_node;
 };
 
 class RpcImpl : public Rpc
@@ -1041,7 +1084,7 @@ class RpcImpl : public Rpc
 namespace interfaces {
 std::unique_ptr<Node> MakeNode(node::NodeContext& context) { return std::make_unique<node::NodeImpl>(context); }
 std::unique_ptr<Chain> MakeChain(node::NodeContext& context) { return std::make_unique<node::ChainImpl>(context); }
-std::unique_ptr<Mining> MakeMining(node::NodeContext& context, bool wait_loaded)
+std::unique_ptr<Mining> MakeMining(const node::NodeContext& context, bool wait_loaded)
 {
     if (wait_loaded) {
         node::KernelNotifications& kernel_notifications(*Assert(context.notifications));
diff --git a/depend/bitcoin/src/node/kernel_notifications.cpp b/depend/bitcoin/src/node/kernel_notifications.cpp
index ab0e5ccb..66b77da5 100644
--- a/depend/bitcoin/src/node/kernel_notifications.cpp
+++ b/depend/bitcoin/src/node/kernel_notifications.cpp
@@ -11,11 +11,11 @@
 #include <common/system.h>
 #include <kernel/context.h>
 #include <kernel/warning.h>
-#include <logging.h>
 #include <node/abort.h>
 #include <node/interface_ui.h>
 #include <node/warnings.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/signalinterrupt.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/depend/bitcoin/src/node/kernel_notifications.h b/depend/bitcoin/src/node/kernel_notifications.h
index b152e7a4..2f108940 100644
--- a/depend/bitcoin/src/node/kernel_notifications.h
+++ b/depend/bitcoin/src/node/kernel_notifications.h
@@ -26,7 +26,7 @@ enum class Warning;
 namespace node {
 
 class Warnings;
-static constexpr int DEFAULT_STOPATHEIGHT{0};
+inline constexpr int DEFAULT_STOPATHEIGHT{0};
 
 //! State tracked by the KernelNotifications interface meant to be used by
 //! mining code, index code, RPCs, and other code sitting above the validation
diff --git a/depend/bitcoin/src/node/mempool_args.cpp b/depend/bitcoin/src/node/mempool_args.cpp
index d5ff50be..f0f7308b 100644
--- a/depend/bitcoin/src/node/mempool_args.cpp
+++ b/depend/bitcoin/src/node/mempool_args.cpp
@@ -11,11 +11,11 @@
 #include <common/messages.h>
 #include <consensus/amount.h>
 #include <kernel/chainparams.h>
-#include <logging.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <tinyformat.h>
 #include <txgraph.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 #include <util/translation.h>
 
diff --git a/depend/bitcoin/src/node/mempool_persist.cpp b/depend/bitcoin/src/node/mempool_persist.cpp
index dcb05267..00f5306e 100644
--- a/depend/bitcoin/src/node/mempool_persist.cpp
+++ b/depend/bitcoin/src/node/mempool_persist.cpp
@@ -6,7 +6,6 @@
 
 #include <clientversion.h>
 #include <consensus/amount.h>
-#include <logging.h>
 #include <primitives/transaction.h>
 #include <random.h>
 #include <serialize.h>
@@ -16,6 +15,7 @@
 #include <uint256.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/obfuscation.h>
 #include <util/signalinterrupt.h>
 #include <util/syserror.h>
diff --git a/depend/bitcoin/src/node/mempool_persist_args.h b/depend/bitcoin/src/node/mempool_persist_args.h
index 7973ec58..28ff2979 100644
--- a/depend/bitcoin/src/node/mempool_persist_args.h
+++ b/depend/bitcoin/src/node/mempool_persist_args.h
@@ -15,7 +15,7 @@ namespace node {
  * Default for -persistmempool, indicating whether the node should attempt to
  * automatically load the mempool on start and save to disk on shutdown
  */
-static constexpr bool DEFAULT_PERSIST_MEMPOOL{true};
+inline constexpr bool DEFAULT_PERSIST_MEMPOOL{true};
 
 bool ShouldPersistMempool(const ArgsManager& argsman);
 fs::path MempoolPath(const ArgsManager& argsman);
diff --git a/depend/bitcoin/src/node/miner.cpp b/depend/bitcoin/src/node/miner.cpp
index 7ea8d10b..06611a4a 100644
--- a/depend/bitcoin/src/node/miner.cpp
+++ b/depend/bitcoin/src/node/miner.cpp
@@ -7,29 +7,50 @@
 
 #include <chain.h>
 #include <chainparams.h>
-#include <coins.h>
 #include <common/args.h>
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
+#include <consensus/params.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <deploymentstatus.h>
-#include <logging.h>
-#include <node/context.h>
+#include <interfaces/types.h>
+#include <node/blockstorage.h>
 #include <node/kernel_notifications.h>
+#include <node/mining_args.h>
+#include <node/mining_types.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <pow.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
-#include <util/moneystr.h>
+#include <script/script.h>
+#include <sync.h>
+#include <tinyformat.h>
+#include <txgraph.h>
+#include <txmempool.h>
+#include <uint256.h>
+#include <util/check.h>
+#include <util/feefrac.h>
+#include <util/log.h>
+#include <util/result.h>
 #include <util/signalinterrupt.h>
 #include <util/time.h>
+#include <util/translation.h>
 #include <validation.h>
+#include <validationinterface.h>
+#include <versionbits.h>
 
 #include <algorithm>
-#include <utility>
+#include <compare>
+#include <condition_variable>
+#include <cstddef>
+#include <functional>
 #include <numeric>
+#include <span>
+#include <stdexcept>
+#include <string>
+#include <utility>
 
 namespace node {
 
@@ -76,38 +97,21 @@ void RegenerateCommitments(CBlock& block, ChainstateManager& chainman)
     block.hashMerkleRoot = BlockMerkleRoot(block);
 }
 
-static BlockAssembler::Options ClampOptions(BlockAssembler::Options options)
-{
-    // Apply DEFAULT_BLOCK_RESERVED_WEIGHT when the caller left it unset.
-    options.block_reserved_weight = std::clamp<size_t>(options.block_reserved_weight.value_or(DEFAULT_BLOCK_RESERVED_WEIGHT), MINIMUM_BLOCK_RESERVED_WEIGHT, MAX_BLOCK_WEIGHT);
-    options.coinbase_output_max_additional_sigops = std::clamp<size_t>(options.coinbase_output_max_additional_sigops, 0, MAX_BLOCK_SIGOPS_COST);
-    // Limit weight to between block_reserved_weight and MAX_BLOCK_WEIGHT for sanity:
-    // block_reserved_weight can safely exceed -blockmaxweight, but the rest of the block template will be empty.
-    options.nBlockMaxWeight = std::clamp<size_t>(options.nBlockMaxWeight, *options.block_reserved_weight, MAX_BLOCK_WEIGHT);
-    return options;
-}
-
-BlockAssembler::BlockAssembler(Chainstate& chainstate, const CTxMemPool* mempool, const Options& options)
+BlockAssembler::BlockAssembler(Chainstate& chainstate,
+                               const CTxMemPool* mempool,
+                               BlockCreateOptions options)
     : chainparams{chainstate.m_chainman.GetParams()},
       m_mempool{options.use_mempool ? mempool : nullptr},
       m_chainstate{chainstate},
-      m_options{ClampOptions(options)}
+      m_options{[&] {
+          if (auto result{CheckMiningOptions(options, /*use_argnames=*/false)}; !result) {
+              throw std::runtime_error(util::ErrorString(result).original);
+          }
+          return FlattenMiningOptions(std::move(options));
+      }()}
 {
 }
 
-void ApplyArgsManOptions(const ArgsManager& args, BlockAssembler::Options& options)
-{
-    // Block resource limits
-    options.nBlockMaxWeight = args.GetIntArg("-blockmaxweight", options.nBlockMaxWeight);
-    if (const auto blockmintxfee{args.GetArg("-blockmintxfee")}) {
-        if (const auto parsed{ParseMoney(*blockmintxfee)}) options.blockMinFeeRate = CFeeRate{*parsed};
-    }
-    options.print_modified_fee = args.GetBoolArg("-printpriority", options.print_modified_fee);
-    if (!options.block_reserved_weight) {
-        options.block_reserved_weight = args.GetIntArg("-blockreservedweight");
-    }
-}
-
 void BlockAssembler::resetBlock()
 {
     // Reserve space for fixed-size block header, txs count, and coinbase tx.
@@ -184,14 +188,18 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock()
     // increasing its length would reduce the space they can use and may break
     // existing clients.
     coinbaseTx.vin[0].scriptSig = CScript() << nHeight;
-    if (m_options.include_dummy_extranonce) {
+    // Set script_sig_prefix here, so IPC mining clients are not affected by
+    // the optional scriptSig padding below. They provide their own extraNonce,
+    // and in a typical setup a pool name or realistic extraNonce already makes
+    // the scriptSig long enough.
+    coinbase_tx.script_sig_prefix = coinbaseTx.vin[0].scriptSig;
+    if (nHeight <= 16) {
         // For blocks at heights <= 16, the BIP34-encoded height alone is only
         // one byte. Consensus requires coinbase scriptSigs to be at least two
-        // bytes long (bad-cb-length), so tests and regtest include a dummy
-        // extraNonce (OP_0)
+        // bytes long (bad-cb-length), so an OP_0 is always appended at those
+        // heights.
         coinbaseTx.vin[0].scriptSig << OP_0;
     }
-    coinbase_tx.script_sig_prefix = coinbaseTx.vin[0].scriptSig;
     Assert(nHeight > 0);
     coinbaseTx.nLockTime = static_cast<uint32_t>(nHeight - 1);
     coinbase_tx.lock_time = coinbaseTx.nLockTime;
@@ -221,7 +229,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock()
     pblock->nNonce         = 0;
 
     if (m_options.test_block_validity) {
-        // if nHeight <= 16, and include_dummy_extranonce=false this will fail due to bad-cb-length.
         if (BlockValidationState state{TestBlockValidity(m_chainstate, *pblock, /*check_pow=*/false, /*check_merkle_root=*/false)}; !state.IsValid()) {
             throw std::runtime_error(strprintf("TestBlockValidity failed: %s", state.ToString()));
         }
@@ -238,7 +245,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock()
 
 bool BlockAssembler::TestChunkBlockLimits(FeePerWeight chunk_feerate, int64_t chunk_sigops_cost) const
 {
-    if (nBlockWeight + chunk_feerate.size >= m_options.nBlockMaxWeight) {
+    // block_max_weight has been flattened before block assembly limit checks.
+    Assert(m_options.block_max_weight);
+    if (nBlockWeight + chunk_feerate.size >= *m_options.block_max_weight) {
         return false;
     }
     if (nBlockSigOpsCost + chunk_sigops_cost >= MAX_BLOCK_SIGOPS_COST) {
@@ -269,7 +278,7 @@ void BlockAssembler::AddToBlock(const CTxMemPoolEntry& entry)
     nBlockSigOpsCost += entry.GetSigOpCost();
     nFees += entry.GetFee();
 
-    if (m_options.print_modified_fee) {
+    if (*m_options.print_modified_fee) {
         LogInfo("fee rate %s txid %s\n",
                   CFeeRate(entry.GetModifiedFee(), entry.GetTxSize()).ToString(),
                   entry.GetTx().GetHash().ToString());
@@ -295,7 +304,7 @@ void BlockAssembler::addChunks()
 
     while (selected_transactions.size() > 0) {
         // Check to see if min fee rate is still respected.
-        if (chunk_feerate_vsize << m_options.blockMinFeeRate.GetFeePerVSize()) {
+        if (ByRatio{chunk_feerate_vsize} < ByRatio{m_options.block_min_fee_rate->GetFeePerVSize()}) {
             // Everything else we might consider has a lower feerate
             return;
         }
@@ -311,8 +320,10 @@ void BlockAssembler::addChunks()
             m_mempool->SkipBuilderChunk();
             ++nConsecutiveFailed;
 
+            // block_max_weight has been flattened before block assembly limit checks.
+            Assert(m_options.block_max_weight);
             if (nConsecutiveFailed > MAX_CONSECUTIVE_FAILURES && nBlockWeight +
-                    BLOCK_FULL_ENOUGH_WEIGHT_DELTA > m_options.nBlockMaxWeight) {
+                    BLOCK_FULL_ENOUGH_WEIGHT_DELTA > *m_options.block_max_weight) {
                 // Give up if we're close to full and haven't succeeded in a while
                 return;
             }
@@ -351,6 +362,69 @@ void AddMerkleRootAndCoinbase(CBlock& block, CTransactionRef coinbase, uint32_t
     block.fChecked = false;
 }
 
+namespace {
+class SubmitBlockStateCatcher final : public CValidationInterface
+{
+public:
+    uint256 m_hash;
+    bool m_found{false};
+    BlockValidationState m_state;
+
+    explicit SubmitBlockStateCatcher(const uint256& hash) : m_hash{hash} {}
+
+protected:
+    void BlockChecked(const std::shared_ptr<const CBlock>& block, const BlockValidationState& state) override
+    {
+        if (block->GetHash() != m_hash) return;
+        // ProcessNewBlock emits BlockChecked synchronously while holding cs_main,
+        // so SubmitBlock can read these fields after ProcessNewBlock returns
+        // without extra synchronization.
+        m_found = true;
+        m_state = state;
+    }
+};
+} // namespace
+
+bool SubmitBlock(ChainstateManager& chainman, const std::shared_ptr<const CBlock>& block, std::string& reason, std::string& debug)
+{
+    reason.clear();
+    debug.clear();
+
+    // This follows the submitblock RPC's validation-state capture pattern, but
+    // is intentionally kept separate from the RPC implementation. The RPC entry
+    // point decodes hex, formats BIP22/JSONRPC results, and calls
+    // UpdateUncommittedBlockStructures() for legacy witness handling. IPC
+    // callers submit already-formed blocks and need bool + reason/debug
+    // results.
+    auto sc = std::make_shared<SubmitBlockStateCatcher>(block->GetHash());
+    CHECK_NONFATAL(chainman.m_options.signals)->RegisterSharedValidationInterface(sc);
+    bool new_block;
+    bool accepted = chainman.ProcessNewBlock(block, /*force_processing=*/true, /*min_pow_checked=*/true, /*new_block=*/&new_block);
+    // No queue drain is needed. The BlockChecked notification used above is
+    // emitted synchronously by ProcessNewBlock, unlike most validation signals.
+    CHECK_NONFATAL(chainman.m_options.signals)->UnregisterSharedValidationInterface(sc);
+
+    if (!new_block && accepted) {
+        reason = "duplicate";
+    } else if (!accepted && (!sc->m_found || sc->m_state.IsValid())) {
+        // ProcessNewBlock can fail without a validation result, for example
+        // from an activation or system error. It can also fail after a valid
+        // BlockChecked result. In these cases the validation result is
+        // inconclusive.
+        reason = "inconclusive";
+    } else if (!sc->m_found) {
+        // The block was accepted but not connected, for example if it does not
+        // have more work than the current tip.
+        reason = "inconclusive";
+    } else if (!sc->m_state.IsValid()) {
+        reason = sc->m_state.GetRejectReason();
+        debug = sc->m_state.GetDebugMessage();
+    }
+    const bool result{accepted && new_block && reason.empty()};
+    CHECK_NONFATAL(result == reason.empty());
+    return result;
+}
+
 void InterruptWait(KernelNotifications& kernel_notifications, bool& interrupt_wait)
 {
     LOCK(kernel_notifications.m_tip_block_mutex);
@@ -362,8 +436,8 @@ std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainma
                                                       KernelNotifications& kernel_notifications,
                                                       CTxMemPool* mempool,
                                                       const std::unique_ptr<CBlockTemplate>& block_template,
-                                                      const BlockWaitOptions& options,
-                                                      const BlockAssembler::Options& assemble_options,
+                                                      const BlockWaitOptions& wait_options,
+                                                      const BlockCreateOptions& create_options,
                                                       bool& interrupt_wait)
 {
     // Delay calculating the current template fees, just in case a new block
@@ -373,7 +447,7 @@ std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainma
     // Alternate waiting for a new tip and checking if fees have risen.
     // The latter check is expensive so we only run it once per second.
     auto now{NodeClock::now()};
-    const auto deadline = now + options.timeout;
+    const auto deadline = now + wait_options.timeout;
     const MillisecondsDouble tick{1000};
     const bool allow_min_difficulty{chainman.GetParams().GetConsensus().fPowAllowMinDifficultyBlocks};
 
@@ -420,12 +494,12 @@ std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainma
          *
          * We'll also create a new template if the tip changed during this iteration.
          */
-        if (options.fee_threshold < MAX_MONEY || tip_changed) {
+        if (wait_options.fee_threshold < MAX_MONEY || tip_changed) {
             auto new_tmpl{BlockAssembler{
                 chainman.ActiveChainstate(),
                 mempool,
-                assemble_options}
-                              .CreateNewBlock()};
+                create_options
+                }.CreateNewBlock()};
 
             // If the tip changed, return the new template regardless of its fees.
             if (tip_changed) return new_tmpl;
@@ -437,8 +511,8 @@ std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainma
 
             // Check if fees increased enough to return the new template
             const CAmount new_fees = std::accumulate(new_tmpl->vTxFees.begin(), new_tmpl->vTxFees.end(), CAmount{0});
-            Assume(options.fee_threshold != MAX_MONEY);
-            if (new_fees >= current_fees + options.fee_threshold) return new_tmpl;
+            Assume(wait_options.fee_threshold != MAX_MONEY);
+            if (new_fees >= current_fees + wait_options.fee_threshold) return new_tmpl;
         }
 
         now = NodeClock::now();
diff --git a/depend/bitcoin/src/node/miner.h b/depend/bitcoin/src/node/miner.h
index 5c866877..7b5702ac 100644
--- a/depend/bitcoin/src/node/miner.h
+++ b/depend/bitcoin/src/node/miner.h
@@ -6,39 +6,39 @@
 #ifndef BITCOIN_NODE_MINER_H
 #define BITCOIN_NODE_MINER_H
 
-#include <interfaces/types.h>
-#include <node/types.h>
-#include <policy/policy.h>
+#include <consensus/amount.h>
+#include <node/mining_types.h>
 #include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <threadsafety.h>
 #include <txmempool.h>
 #include <util/feefrac.h>
+#include <util/time.h>
 
 #include <cstdint>
 #include <memory>
 #include <optional>
+#include <string>
+#include <vector>
 
-#include <boost/multi_index/identity.hpp>
-#include <boost/multi_index/indexed_by.hpp>
-#include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index/tag.hpp>
-#include <boost/multi_index_container.hpp>
-
-class ArgsManager;
 class CBlockIndex;
 class CChainParams;
-class CScript;
 class Chainstate;
 class ChainstateManager;
 
-namespace Consensus { struct Params; };
+namespace Consensus {
+struct Params;
+} // namespace Consensus
+class uint256;
+namespace interfaces {
+struct BlockRef;
+} // namespace interfaces
 
 using interfaces::BlockRef;
 
 namespace node {
 class KernelNotifications;
 
-static const bool DEFAULT_PRINT_MODIFIED_FEE = false;
-
 struct CBlockTemplate
 {
     CBlock block;
@@ -78,16 +78,9 @@ class BlockAssembler
     Chainstate& m_chainstate;
 
 public:
-    struct Options : BlockCreateOptions {
-        // Configuration parameters for the block size
-        size_t nBlockMaxWeight{DEFAULT_BLOCK_MAX_WEIGHT};
-        CFeeRate blockMinFeeRate{DEFAULT_BLOCK_MIN_TX_FEE};
-        // Whether to call TestBlockValidity() at the end of CreateNewBlock().
-        bool test_block_validity{true};
-        bool print_modified_fee{DEFAULT_PRINT_MODIFIED_FEE};
-    };
-
-    explicit BlockAssembler(Chainstate& chainstate, const CTxMemPool* mempool, const Options& options);
+    explicit BlockAssembler(Chainstate& chainstate,
+                            const CTxMemPool* mempool,
+                            BlockCreateOptions create_options);
 
     /** Construct a new block template */
     std::unique_ptr<CBlockTemplate> CreateNewBlock();
@@ -98,7 +91,7 @@ class BlockAssembler
     inline static std::optional<int64_t> m_last_block_weight{};
 
 private:
-    const Options m_options;
+    const BlockCreateOptions m_options;
 
     // utility functions
     /** Clear the block's state and prepare for assembling a new block */
@@ -134,12 +127,12 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
 /** Update an old GenerateCoinbaseCommitment from CreateNewBlock after the block txs have changed */
 void RegenerateCommitments(CBlock& block, ChainstateManager& chainman);
 
-/** Apply -blockmintxfee and -blockmaxweight options from ArgsManager to BlockAssembler options. */
-void ApplyArgsManOptions(const ArgsManager& gArgs, BlockAssembler::Options& options);
-
 /* Compute the block's merkle root, insert or replace the coinbase transaction and the merkle root into the block */
 void AddMerkleRootAndCoinbase(CBlock& block, CTransactionRef coinbase, uint32_t version, uint32_t timestamp, uint32_t nonce);
 
+//! Submit a block and capture the validation state via the BlockChecked callback.
+//! Returns whether the block was accepted as a new valid block.
+bool SubmitBlock(ChainstateManager& chainman, const std::shared_ptr<const CBlock>& block, std::string& reason, std::string& debug);
 
 /* Interrupt a blocking call. */
 void InterruptWait(KernelNotifications& kernel_notifications, bool& interrupt_wait);
@@ -151,8 +144,8 @@ std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainma
                                                       KernelNotifications& kernel_notifications,
                                                       CTxMemPool* mempool,
                                                       const std::unique_ptr<CBlockTemplate>& block_template,
-                                                      const BlockWaitOptions& options,
-                                                      const BlockAssembler::Options& assemble_options,
+                                                      const BlockWaitOptions& wait_options,
+                                                      const BlockCreateOptions& create_options,
                                                       bool& interrupt_wait);
 
 /* Locks cs_main and returns the block hash and block height of the active chain if it exists; otherwise, returns nullopt.*/
diff --git a/depend/bitcoin/src/node/mini_miner.cpp b/depend/bitcoin/src/node/mini_miner.cpp
index 9d85db7d..59ca1b55 100644
--- a/depend/bitcoin/src/node/mini_miner.cpp
+++ b/depend/bitcoin/src/node/mini_miner.cpp
@@ -184,12 +184,12 @@ struct AncestorFeerateComparator
         auto min_feerate = [](const MiniMinerMempoolEntry& e) -> FeeFrac {
             FeeFrac self_feerate(e.GetModifiedFee(), e.GetTxSize());
             FeeFrac ancestor_feerate(e.GetModFeesWithAncestors(), e.GetSizeWithAncestors());
-            return std::min(ancestor_feerate, self_feerate);
+            return std::min<ByRatioNegSize<FeeFrac>>(ancestor_feerate, self_feerate);
         };
         FeeFrac a_feerate{min_feerate(a->second)};
         FeeFrac b_feerate{min_feerate(b->second)};
         if (a_feerate != b_feerate) {
-            return a_feerate > b_feerate;
+            return ByRatioNegSize{a_feerate} > ByRatioNegSize{b_feerate};
         }
         // Use txid as tiebreaker for stable sorting
         return a->first < b->first;
diff --git a/depend/bitcoin/src/node/mini_miner.h b/depend/bitcoin/src/node/mini_miner.h
index d07108cb..0634c53e 100644
--- a/depend/bitcoin/src/node/mini_miner.h
+++ b/depend/bitcoin/src/node/mini_miner.h
@@ -5,13 +5,12 @@
 #ifndef BITCOIN_NODE_MINI_MINER_H
 #define BITCOIN_NODE_MINI_MINER_H
 
+#include <attributes.h>
 #include <consensus/amount.h>
 #include <primitives/transaction.h>
-#include <uint256.h>
 
 #include <cstdint>
 #include <map>
-#include <memory>
 #include <optional>
 #include <set>
 #include <vector>
diff --git a/depend/bitcoin/src/node/mining_args.cpp b/depend/bitcoin/src/node/mining_args.cpp
new file mode 100644
index 00000000..ec173464
--- /dev/null
+++ b/depend/bitcoin/src/node/mining_args.cpp
@@ -0,0 +1,99 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <node/mining_args.h>
+
+#include <common/args.h>
+#include <common/messages.h>
+#include <consensus/amount.h>
+#include <consensus/consensus.h>
+#include <node/mining_types.h>
+#include <policy/feerate.h>
+#include <policy/policy.h>
+#include <tinyformat.h>
+#include <util/moneystr.h>
+#include <util/result.h>
+#include <util/translation.h>
+
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <utility>
+
+using common::AmountErrMsg;
+using util::Error;
+using util::Result;
+
+namespace node {
+
+Result<void> CheckMiningOptions(BlockCreateOptions options, bool use_argnames)
+{
+    options = FlattenMiningOptions(std::move(options));
+    if (*options.block_reserved_weight < MINIMUM_BLOCK_RESERVED_WEIGHT) {
+        return Error{Untranslated(strprintf("%s (%d) is lower than minimum safety value of (%d)",
+                                            use_argnames ? "-blockreservedweight" : "block_reserved_weight",
+                                            *options.block_reserved_weight, MINIMUM_BLOCK_RESERVED_WEIGHT))};
+    }
+    if (*options.block_reserved_weight > MAX_BLOCK_WEIGHT) {
+        return Error{Untranslated(strprintf("%s (%d) exceeds consensus maximum block weight (%d)",
+                                            use_argnames ? "-blockreservedweight" : "block_reserved_weight",
+                                            *options.block_reserved_weight, MAX_BLOCK_WEIGHT))};
+    }
+    if (*options.block_max_weight > MAX_BLOCK_WEIGHT) {
+        return Error{Untranslated(strprintf("%s (%d) exceeds consensus maximum block weight (%d)",
+                                            use_argnames ? "-blockmaxweight" : "block_max_weight",
+                                            *options.block_max_weight, MAX_BLOCK_WEIGHT))};
+    }
+    if (*options.block_reserved_weight > *options.block_max_weight) {
+        return Error{Untranslated(strprintf("%s (%d) exceeds %s (%d)",
+                                            use_argnames ? "-blockreservedweight" : "block_reserved_weight",
+                                            *options.block_reserved_weight,
+                                            use_argnames ? "-blockmaxweight" : "block_max_weight",
+                                            *options.block_max_weight))};
+    }
+    if (options.coinbase_output_max_additional_sigops > MAX_BLOCK_SIGOPS_COST) {
+        return Error{Untranslated(strprintf("%s (%zu) exceeds consensus maximum block sigops cost (%d)",
+                                            "coinbase_output_max_additional_sigops",
+                                            options.coinbase_output_max_additional_sigops, MAX_BLOCK_SIGOPS_COST))};
+    }
+    return {};
+}
+
+Result<BlockCreateOptions> ReadMiningArgs(const ArgsManager& args)
+{
+    BlockCreateOptions options;
+    if (const auto arg{args.GetArg("-blockmintxfee")}) {
+        std::optional<CAmount> block_min_tx_fee{ParseMoney(*arg)};
+        if (!block_min_tx_fee) return Error{AmountErrMsg("blockmintxfee", *arg)};
+        options.block_min_fee_rate = CFeeRate{*block_min_tx_fee};
+    }
+
+    if (const auto arg{args.GetBoolArg("-printpriority")}) options.print_modified_fee = *arg;
+
+    options.block_reserved_weight = args.GetArg<uint64_t>("-blockreservedweight");
+    options.block_max_weight = args.GetArg<uint64_t>("-blockmaxweight");
+
+    if (auto result{CheckMiningOptions(options, /*use_argnames=*/true)}; !result) return Error{util::ErrorString(result)};
+    return options;
+}
+
+BlockCreateOptions FlattenMiningOptions(BlockCreateOptions options)
+{
+    if (!options.block_min_fee_rate) options.block_min_fee_rate = CFeeRate{DEFAULT_BLOCK_MIN_TX_FEE};
+    if (!options.print_modified_fee) options.print_modified_fee = DEFAULT_PRINT_MODIFIED_FEE;
+    if (!options.block_reserved_weight) options.block_reserved_weight = DEFAULT_BLOCK_RESERVED_WEIGHT;
+    if (!options.block_max_weight) options.block_max_weight = DEFAULT_BLOCK_MAX_WEIGHT;
+    return options;
+}
+
+BlockCreateOptions MergeMiningOptions(BlockCreateOptions x, const BlockCreateOptions& y)
+{
+    if (!x.block_min_fee_rate) x.block_min_fee_rate = y.block_min_fee_rate;
+    if (!x.print_modified_fee) x.print_modified_fee = y.print_modified_fee;
+    if (!x.block_reserved_weight) x.block_reserved_weight = y.block_reserved_weight;
+    if (!x.block_max_weight) x.block_max_weight = y.block_max_weight;
+    return x;
+}
+
+} // namespace node
diff --git a/depend/bitcoin/src/node/mining_args.h b/depend/bitcoin/src/node/mining_args.h
new file mode 100644
index 00000000..05391316
--- /dev/null
+++ b/depend/bitcoin/src/node/mining_args.h
@@ -0,0 +1,37 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_NODE_MINING_ARGS_H
+#define BITCOIN_NODE_MINING_ARGS_H
+
+#include <node/mining_types.h>
+#include <util/result.h>
+
+class ArgsManager;
+
+namespace node {
+
+inline constexpr bool DEFAULT_PRINT_MODIFIED_FEE = false;
+
+/**
+ * Read the mining options set in \p args. Returns an error if one was
+ * encountered.
+ */
+[[nodiscard]] util::Result<BlockCreateOptions> ReadMiningArgs(const ArgsManager& args);
+
+/** Check option values for validity. Returns an error for invalid values. */
+[[nodiscard]] util::Result<void> CheckMiningOptions(BlockCreateOptions options, bool use_argnames);
+
+/** Replace null optional values with their hardcoded defaults. */
+[[nodiscard]] BlockCreateOptions FlattenMiningOptions(BlockCreateOptions options);
+
+/**
+ * Merge two BlockCreateOptions structs, replacing null values in \p x with
+ * non-null values from \p y.
+ */
+[[nodiscard]] BlockCreateOptions MergeMiningOptions(BlockCreateOptions x, const BlockCreateOptions& y);
+
+} // namespace node
+
+#endif // BITCOIN_NODE_MINING_ARGS_H
diff --git a/depend/bitcoin/src/node/mining_types.h b/depend/bitcoin/src/node/mining_types.h
new file mode 100644
index 00000000..6e4eb82a
--- /dev/null
+++ b/depend/bitcoin/src/node/mining_types.h
@@ -0,0 +1,178 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+//! @file node/mining_types.h is used externally by mining IPC clients, so it should
+//! only declare simple data definitions.
+//!
+//! Avoid declaring functions or classes with methods here unless they are
+//! header-only or provided by the util library.
+
+#ifndef BITCOIN_NODE_MINING_TYPES_H
+#define BITCOIN_NODE_MINING_TYPES_H
+
+#include <consensus/amount.h>
+#include <policy/feerate.h>
+#include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <uint256.h>
+#include <util/time.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <vector>
+
+namespace node {
+
+/**
+ * Block template creation options. These override node defaults, but can't
+ * exceed node limits (e.g. block_reserved_weight can't exceed max block weight).
+ */
+struct BlockCreateOptions {
+    /**
+     * Set false to omit mempool transactions
+     */
+    bool use_mempool{true};
+    /**
+     * Minimum fee rate for transactions to be included. Providing a value
+     * overrides the -blockmintxfee startup setting.
+     */
+    std::optional<CFeeRate> block_min_fee_rate{};
+    /**
+     * Whether to log the fee rate of each transaction when it is added to the
+     * block template. Providing a value overrides the -printpriority startup
+     * setting.
+     */
+    std::optional<bool> print_modified_fee{};
+    /**
+     * The default reserved weight for the fixed-size block header,
+     * transaction count and coinbase transaction. Minimum: 2000 weight units
+     * (MINIMUM_BLOCK_RESERVED_WEIGHT).
+     *
+     * Providing a value overrides the `-blockreservedweight` startup setting.
+     * Cap'n Proto IPC clients currently cannot leave this field unset, so they
+     * always provide a value.
+     */
+    std::optional<uint64_t> block_reserved_weight{};
+    /**
+     * Maximum block weight, defaults to -maxblockweight
+     *
+     * Must not be lower than block_reserved_weight. Setting this equal to
+     * block_reserved_weight leaves no room for non-coinbase transactions.
+     */
+    std::optional<uint64_t> block_max_weight{};
+    /**
+     * The maximum additional sigops which the pool will add in coinbase
+     * transaction outputs.
+     */
+    size_t coinbase_output_max_additional_sigops{DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS};
+    /**
+     * Script to put in the coinbase transaction. The default is an
+     * anyone-can-spend dummy.
+     *
+     * Should only be used for tests, when the default doesn't suffice.
+     *
+     * Note that higher level code like the getblocktemplate RPC may omit the
+     * coinbase transaction entirely. It's instead constructed by pool software
+     * using fields like coinbasevalue, coinbaseaux and default_witness_commitment.
+     * This software typically also controls the payout outputs, even for solo
+     * mining.
+     *
+     * The size and sigops are not checked against
+     * coinbase_max_additional_weight and coinbase_output_max_additional_sigops.
+     */
+    CScript coinbase_output_script{CScript() << OP_TRUE};
+    /**
+     * Whether to call TestBlockValidity() at the end of CreateNewBlock().
+     * Should only be disabled for tests / benchmarks.
+     */
+    bool test_block_validity{true};
+};
+
+struct BlockWaitOptions {
+    /**
+     * How long to wait before returning nullptr instead of a new template.
+     * Default is to wait forever.
+     */
+    MillisecondsDouble timeout{MillisecondsDouble::max()};
+
+    /**
+     * The wait method will not return a new template unless it has fees at
+     * least fee_threshold sats higher than the current template, or unless
+     * the chain tip changes and the previous template is no longer valid.
+     *
+     * A caller may not be interested in templates with higher fees, and
+     * determining whether fee_threshold is reached is also expensive. So as
+     * an optimization, when fee_threshold is set to MAX_MONEY (default), the
+     * implementation is able to be much more efficient, skipping expensive
+     * checks and only returning new templates when the chain tip changes.
+     */
+    CAmount fee_threshold{MAX_MONEY};
+};
+
+struct BlockCheckOptions {
+    /**
+     * Set false to omit the merkle root check
+     */
+    bool check_merkle_root{true};
+
+    /**
+     * Set false to omit the proof-of-work check
+     */
+    bool check_pow{true};
+};
+
+/**
+ * Template containing all coinbase transaction fields that are set by our
+ * miner code. Clients are expected to add their own outputs and typically
+ * also expand the scriptSig.
+ */
+struct CoinbaseTx {
+    /* nVersion */
+    uint32_t version;
+    /* nSequence for the only coinbase transaction input */
+    uint32_t sequence;
+    /**
+     * Prefix which needs to be placed at the beginning of the scriptSig.
+     * Clients may append extra data to this as long as the overall scriptSig
+     * size is 100 bytes or less, to avoid the block being rejected with
+     * "bad-cb-length" error. At heights <= 16 the BIP 34 height push is only
+     * one byte long, so clients must append at least one additional byte to
+     * meet the consensus minimum scriptSig length of two bytes.
+     *
+     * Currently with BIP 34, the prefix is guaranteed to be less than 8 bytes,
+     * but future soft forks could require longer prefixes.
+     */
+    CScript script_sig_prefix;
+    /**
+     * The first (and only) witness stack element of the coinbase input.
+     *
+     * Omitted for block templates without witness data.
+     *
+     * This is currently the BIP 141 witness reserved value, and can be chosen
+     * arbitrarily by the node, but future soft forks may constrain it.
+     */
+    std::optional<uint256> witness;
+    /**
+     * Block subsidy plus fees, minus any non-zero required_outputs.
+     *
+     * Currently there are no non-zero required_outputs, so block_reward_remaining
+     * is the entire block reward. See also required_outputs.
+     */
+    CAmount block_reward_remaining;
+    /*
+     * To be included as the last outputs in the coinbase transaction.
+     * Currently this is only the witness commitment OP_RETURN, but future
+     * softforks or a custom mining patch could add more.
+     *
+     * The dummy output that spends the full reward is excluded.
+     */
+    std::vector<CTxOut> required_outputs;
+    uint32_t lock_time;
+};
+
+} // namespace node
+
+#endif // BITCOIN_NODE_MINING_TYPES_H
diff --git a/depend/bitcoin/src/node/minisketchwrapper.cpp b/depend/bitcoin/src/node/minisketchwrapper.cpp
index 37089d56..079990b4 100644
--- a/depend/bitcoin/src/node/minisketchwrapper.cpp
+++ b/depend/bitcoin/src/node/minisketchwrapper.cpp
@@ -4,7 +4,7 @@
 
 #include <node/minisketchwrapper.h>
 
-#include <logging.h>
+#include <util/log.h>
 #include <util/time.h>
 
 #include <minisketch.h>
diff --git a/depend/bitcoin/src/node/peerman_args.cpp b/depend/bitcoin/src/node/peerman_args.cpp
index 9745d69d..47413af0 100644
--- a/depend/bitcoin/src/node/peerman_args.cpp
+++ b/depend/bitcoin/src/node/peerman_args.cpp
@@ -24,6 +24,10 @@ void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& optio
 
     if (auto value{argsman.GetBoolArg("-blocksonly")}) options.ignore_incoming_txs = *value;
 
+    if (auto value{argsman.GetIntArg("-txsendrate")}) {
+        options.tx_send_rate = uint32_t(std::clamp<int64_t>(*value, 1, 1000));
+    }
+
     if (auto value{argsman.GetBoolArg("-privatebroadcast")}) options.private_broadcast = *value;
 }
 
diff --git a/depend/bitcoin/src/node/protocol_version.h b/depend/bitcoin/src/node/protocol_version.h
index 7904086f..db58f3a7 100644
--- a/depend/bitcoin/src/node/protocol_version.h
+++ b/depend/bitcoin/src/node/protocol_version.h
@@ -9,30 +9,33 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70016;
+inline constexpr int PROTOCOL_VERSION = 70017;
 
 //! initial proto version, to be increased after version/verack negotiation
-static const int INIT_PROTO_VERSION = 209;
+inline constexpr int INIT_PROTO_VERSION = 209;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 31800;
+inline constexpr int MIN_PEER_PROTO_VERSION = 31800;
 
 //! BIP 0031, pong message, is enabled for all versions AFTER this one
-static const int BIP0031_VERSION = 60000;
+inline constexpr int BIP0031_VERSION = 60000;
 
 //! "sendheaders" message type and announcing blocks with headers starts with this version
-static const int SENDHEADERS_VERSION = 70012;
+inline constexpr int SENDHEADERS_VERSION = 70012;
 
 //! "feefilter" tells peers to filter invs to you by fee starts with this version
-static const int FEEFILTER_VERSION = 70013;
+inline constexpr int FEEFILTER_VERSION = 70013;
 
 //! short-id-based block download starts with this version
-static const int SHORT_IDS_BLOCKS_VERSION = 70014;
+inline constexpr int SHORT_IDS_BLOCKS_VERSION = 70014;
 
 //! not banning for invalid compact blocks starts with this version
-static const int INVALID_CB_NO_BAN_VERSION = 70015;
+inline constexpr int INVALID_CB_NO_BAN_VERSION = 70015;
 
 //! "wtxidrelay" message type for wtxid-based relay starts with this version
-static const int WTXID_RELAY_VERSION = 70016;
+inline constexpr int WTXID_RELAY_VERSION = 70016;
+
+//! "feature" message type for feature negotiation starts with this version
+inline constexpr int FEATURE_VERSION = 70017;
 
 #endif // BITCOIN_NODE_PROTOCOL_VERSION_H
diff --git a/depend/bitcoin/src/node/psbt.cpp b/depend/bitcoin/src/node/psbt.cpp
index 62382e56..699d1d5f 100644
--- a/depend/bitcoin/src/node/psbt.cpp
+++ b/depend/bitcoin/src/node/psbt.cpp
@@ -18,15 +18,23 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
     // Go through each input and build status
     PSBTAnalysis result;
 
+    std::optional<CMutableTransaction> unsigned_tx = psbtx.GetUnsignedTx();
+    if (!unsigned_tx) {
+        result.SetInvalid("PSBT cannot be made into a valid transaction");
+        return result;
+    }
+    CMutableTransaction& mtx = *unsigned_tx;
+
     bool calc_fee = true;
 
     CAmount in_amt = 0;
 
-    result.inputs.resize(psbtx.tx->vin.size());
+    result.inputs.resize(psbtx.inputs.size());
 
-    const PrecomputedTransactionData txdata = PrecomputePSBTData(psbtx);
+    // PrecomputePSBTData calls GetUnsignedTx() which we checked already works
+    const PrecomputedTransactionData txdata = *PrecomputePSBTData(psbtx);
 
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
         PSBTInput& input = psbtx.inputs[i];
         PSBTInputAnalysis& input_analysis = result.inputs[i];
 
@@ -35,7 +43,7 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
 
         // Check for a UTXO
         CTxOut utxo;
-        if (psbtx.GetInputUTXO(utxo, i)) {
+        if (input.GetUTXO(utxo)) {
             if (!MoneyRange(utxo.nValue) || !MoneyRange(in_amt + utxo.nValue)) {
                 result.SetInvalid(strprintf("PSBT is not valid. Input %u has invalid value", i));
                 return result;
@@ -43,7 +51,7 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
             in_amt += utxo.nValue;
             input_analysis.has_utxo = true;
         } else {
-            if (input.non_witness_utxo && psbtx.tx->vin[i].prevout.n >= input.non_witness_utxo->vout.size()) {
+            if (input.non_witness_utxo && input.prev_out >= input.non_witness_utxo->vout.size()) {
                 result.SetInvalid(strprintf("PSBT is not valid. Input %u specifies invalid prevout", i));
                 return result;
             }
@@ -89,7 +97,7 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
 
     // Calculate next role for PSBT by grabbing "minimum" PSBTInput next role
     result.next = PSBTRole::EXTRACTOR;
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
         PSBTInputAnalysis& input_analysis = result.inputs[i];
         result.next = std::min(result.next, input_analysis.next);
     }
@@ -97,12 +105,12 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
 
     if (calc_fee) {
         // Get the output amount
-        CAmount out_amt = std::accumulate(psbtx.tx->vout.begin(), psbtx.tx->vout.end(), CAmount(0),
-            [](CAmount a, const CTxOut& b) {
-                if (!MoneyRange(a) || !MoneyRange(b.nValue) || !MoneyRange(a + b.nValue)) {
+        CAmount out_amt = std::accumulate(psbtx.outputs.begin(), psbtx.outputs.end(), CAmount(0),
+            [](CAmount a, const PSBTOutput& b) {
+                if (!MoneyRange(a) || !MoneyRange(b.amount) || !MoneyRange(a + b.amount)) {
                     return CAmount(-1);
                 }
-                return a += b.nValue;
+                return a += b.amount;
             }
         );
         if (!MoneyRange(out_amt)) {
@@ -115,22 +123,21 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
         result.fee = fee;
 
         // Estimate the size
-        CMutableTransaction mtx(*psbtx.tx);
         CCoinsViewCache view{&CoinsViewEmpty::Get()};
         bool success = true;
 
-        for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
+        for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
             PSBTInput& input = psbtx.inputs[i];
             Coin newcoin;
 
-            if (SignPSBTInput(DUMMY_SIGNING_PROVIDER, psbtx, i, nullptr, /*options=*/{}) != PSBTError::OK || !psbtx.GetInputUTXO(newcoin.out, i)) {
+            if (SignPSBTInput(DUMMY_SIGNING_PROVIDER, psbtx, i, nullptr, /*options=*/{}) != PSBTError::OK || !input.GetUTXO(newcoin.out)) {
                 success = false;
                 break;
             } else {
                 mtx.vin[i].scriptSig = input.final_script_sig;
                 mtx.vin[i].scriptWitness = input.final_script_witness;
                 newcoin.nHeight = 1;
-                view.AddCoin(psbtx.tx->vin[i].prevout, std::move(newcoin), true);
+                view.AddCoin(input.GetOutPoint(), std::move(newcoin), true);
             }
         }
 
diff --git a/depend/bitcoin/src/node/timeoffsets.cpp b/depend/bitcoin/src/node/timeoffsets.cpp
index 002c00d2..e1a6bf71 100644
--- a/depend/bitcoin/src/node/timeoffsets.cpp
+++ b/depend/bitcoin/src/node/timeoffsets.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <logging.h>
 #include <node/timeoffsets.h>
 #include <node/warnings.h>
 #include <sync.h>
 #include <tinyformat.h>
+#include <util/log.h>
 #include <util/time.h>
 #include <util/translation.h>
 
diff --git a/depend/bitcoin/src/node/transaction.cpp b/depend/bitcoin/src/node/transaction.cpp
index bff82f21..0df9718b 100644
--- a/depend/bitcoin/src/node/transaction.cpp
+++ b/depend/bitcoin/src/node/transaction.cpp
@@ -130,11 +130,10 @@ TransactionError BroadcastTransaction(NodeContext& node,
     case TxBroadcast::MEMPOOL_NO_BROADCAST:
         break;
     case TxBroadcast::MEMPOOL_AND_BROADCAST_TO_ALL:
-        node.peerman->InitiateTxBroadcastToAll(txid, wtxid);
+        node.peerman->InitiateTxBroadcastToAll(wtxid);
         break;
     case TxBroadcast::NO_MEMPOOL_PRIVATE_BROADCAST:
-        node.peerman->InitiateTxBroadcastPrivate(tx);
-        break;
+        return node.peerman->InitiateTxBroadcastPrivate(tx);
     }
 
     return TransactionError::OK;
@@ -147,15 +146,13 @@ CTransactionRef GetTransaction(const CBlockIndex* const block_index, const CTxMe
         if (ptx) return ptx;
     }
     if (g_txindex) {
-        CTransactionRef tx;
-        uint256 block_hash;
-        if (g_txindex->FindTx(hash, block_hash, tx)) {
-            if (!block_index || block_index->GetBlockHash() == block_hash) {
+        if (auto result{g_txindex->FindTx(hash)}) {
+            if (!block_index || block_index->GetBlockHash() == result->block_hash) {
                 // Don't return the transaction if the provided block hash doesn't match.
                 // The case where a transaction appears in multiple blocks (e.g. reorgs or
                 // BIP30) is handled by the block lookup below.
-                hashBlock = block_hash;
-                return tx;
+                hashBlock = result->block_hash;
+                return result->tx;
             }
         }
     }
diff --git a/depend/bitcoin/src/node/transaction.h b/depend/bitcoin/src/node/transaction.h
index d27057a4..c83a28ed 100644
--- a/depend/bitcoin/src/node/transaction.h
+++ b/depend/bitcoin/src/node/transaction.h
@@ -25,13 +25,13 @@ struct NodeContext;
  * By default, a transaction with a fee rate higher than this will be rejected
  * by these RPCs and the GUI. This can be overridden with the maxfeerate argument.
  */
-static const CFeeRate DEFAULT_MAX_RAW_TX_FEE_RATE{COIN / 10};
+inline constexpr CFeeRate DEFAULT_MAX_RAW_TX_FEE_RATE{COIN / 10};
 
 /** Maximum burn value for sendrawtransaction, submitpackage, and testmempoolaccept RPC calls.
  * By default, a transaction with a burn value higher than this will be rejected
  * by these RPCs and the GUI. This can be overridden with the maxburnamount argument.
  */
-static const CAmount DEFAULT_MAX_BURN_AMOUNT{0};
+inline constexpr CAmount DEFAULT_MAX_BURN_AMOUNT{0};
 
 /**
  * Submit a transaction to the mempool and (optionally) relay it to all P2P peers.
diff --git a/depend/bitcoin/src/node/txdownloadman.h b/depend/bitcoin/src/node/txdownloadman.h
index 2cc1ec2c..e3621102 100644
--- a/depend/bitcoin/src/node/txdownloadman.h
+++ b/depend/bitcoin/src/node/txdownloadman.h
@@ -22,20 +22,20 @@ class TxDownloadManagerImpl;
 
 /** Maximum number of in-flight transaction requests from a peer. It is not a hard limit, but the threshold at which
  *  point the OVERLOADED_PEER_TX_DELAY kicks in. */
-static constexpr int32_t MAX_PEER_TX_REQUEST_IN_FLIGHT = 100;
+inline constexpr int32_t MAX_PEER_TX_REQUEST_IN_FLIGHT = 100;
 /** Maximum number of transactions to consider for requesting, per peer. It provides a reasonable DoS limit to
  *  per-peer memory usage spent on announcements, while covering peers continuously sending INVs at the maximum
- *  rate (by our own policy, see INVENTORY_BROADCAST_PER_SECOND) for several minutes, while not receiving
+ *  rate (by our own policy, see DEFAULT_TX_SEND_RATE) for several minutes, while not receiving
  *  the actual transaction (from any peer) in response to requests for them. */
-static constexpr int32_t MAX_PEER_TX_ANNOUNCEMENTS = 5000;
+inline constexpr int32_t MAX_PEER_TX_ANNOUNCEMENTS = 5000;
 /** How long to delay requesting transactions via txids, if we have wtxid-relaying peers */
-static constexpr auto TXID_RELAY_DELAY{2s};
+inline constexpr auto TXID_RELAY_DELAY{2s};
 /** How long to delay requesting transactions from non-preferred peers */
-static constexpr auto NONPREF_PEER_TX_DELAY{2s};
+inline constexpr auto NONPREF_PEER_TX_DELAY{2s};
 /** How long to delay requesting transactions from overloaded peers (see MAX_PEER_TX_REQUEST_IN_FLIGHT). */
-static constexpr auto OVERLOADED_PEER_TX_DELAY{2s};
+inline constexpr auto OVERLOADED_PEER_TX_DELAY{2s};
 /** How long to wait before downloading a transaction from an additional peer */
-static constexpr auto GETDATA_TX_INTERVAL{60s};
+inline constexpr auto GETDATA_TX_INTERVAL{60s};
 struct TxDownloadOptions {
     /** Read-only reference to mempool. */
     const CTxMemPool& m_mempool;
diff --git a/depend/bitcoin/src/node/txdownloadman_impl.cpp b/depend/bitcoin/src/node/txdownloadman_impl.cpp
index 91bc7f3b..00d69fb1 100644
--- a/depend/bitcoin/src/node/txdownloadman_impl.cpp
+++ b/depend/bitcoin/src/node/txdownloadman_impl.cpp
@@ -7,8 +7,8 @@
 
 #include <chain.h>
 #include <consensus/validation.h>
-#include <logging.h>
 #include <txmempool.h>
+#include <util/log.h>
 #include <validation.h>
 #include <validationinterface.h>
 
@@ -100,6 +100,9 @@ void TxDownloadManagerImpl::BlockConnected(const std::shared_ptr<const CBlock>&
     m_orphanage->EraseForBlock(*pblock);
 
     for (const auto& ptx : pblock->vtx) {
+        // Reconsider potential child transactions.
+        m_orphanage->AddChildrenToWorkSet(*ptx, m_opts.m_rng);
+
         RecentConfirmedTransactionsFilter().insert(ptx->GetHash().ToUint256());
         if (ptx->HasWitness()) {
             RecentConfirmedTransactionsFilter().insert(ptx->GetWitnessHash().ToUint256());
diff --git a/depend/bitcoin/src/node/txorphanage.cpp b/depend/bitcoin/src/node/txorphanage.cpp
index 4b25ab4d..9843f81f 100644
--- a/depend/bitcoin/src/node/txorphanage.cpp
+++ b/depend/bitcoin/src/node/txorphanage.cpp
@@ -5,12 +5,12 @@
 #include <node/txorphanage.h>
 
 #include <consensus/validation.h>
-#include <logging.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <util/feefrac.h>
-#include <util/time.h>
 #include <util/hasher.h>
+#include <util/log.h>
+#include <util/time.h>
 
 #include <boost/multi_index/indexed_by.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -165,7 +165,7 @@ class TxOrphanageImpl final : public TxOrphanage {
             assert(max_peer_memory > 0);
             const FeeFrac latency_score(m_total_latency_score, max_peer_latency_score);
             const FeeFrac mem_score(m_total_usage, max_peer_memory);
-            return std::max<FeeFrac>(latency_score, mem_score);
+            return std::max<ByRatioNegSize<FeeFrac>>(latency_score, mem_score);
         }
     };
     /** Store per-peer statistics. Used to determine each peer's DoS score. The size of this map is used to determine the
@@ -458,12 +458,18 @@ void TxOrphanageImpl::LimitOrphans()
     for (const auto& [nodeid, entry] : m_peer_orphanage_info) {
         // Performance optimization: only consider peers with a DoS score > 1.
         const auto dos_score = entry.GetDosScore(max_lat, max_mem);
-        if (dos_score >> FeeFrac{1, 1}) {
+        if (ByRatio{dos_score} > ByRatio{FeeFrac{1, 1}}) {
             heap_peer_dos.emplace_back(nodeid, dos_score);
         }
     }
     static constexpr auto compare_score = [](const auto& left, const auto& right) {
-        if (left.second != right.second) return left.second < right.second;
+        if (left.second != right.second) {
+            // Note: if ratios are the same, this tiebreaks by denominator. In practice, since the
+            // latency denominator (number of announcements and inputs) is always lower, this means
+            // that a peer with only high latency scores will be targeted before a peer using a lot
+            // of memory, even if they have the same ratios.
+            return ByRatioNegSize{left.second} < ByRatioNegSize{right.second};
+        }
         // Tiebreak by considering the more recent peer (higher NodeId) to be worse.
         return left.first < right.first;
     };
@@ -473,9 +479,6 @@ void TxOrphanageImpl::LimitOrphans()
     // This outer loop finds the peer with the highest DoS score, which is a fraction of memory and latency scores
     // over the respective allowances. We continue until the orphanage is within global limits. That means some peers
     // might still have a DoS score > 1 at the end.
-    // Note: if ratios are the same, FeeFrac tiebreaks by denominator. In practice, since the latency denominator (number of
-    // announcements and inputs) is always lower, this means that a peer with only high latency scores will be targeted
-    // before a peer using a lot of memory, even if they have the same ratios.
     do {
         Assume(!heap_peer_dos.empty());
         // This is a max-heap, so the worst peer is at the front. pop_heap()
@@ -485,7 +488,7 @@ void TxOrphanageImpl::LimitOrphans()
         heap_peer_dos.pop_back();
 
         // If needs trim, then at least one peer has a DoS score higher than 1.
-        Assume(dos_score >> (FeeFrac{1, 1}));
+        Assume(ByRatio{dos_score} > ByRatio{FeeFrac(1, 1)});
 
         auto it_worst_peer = m_peer_orphanage_info.find(worst_peer);
 
@@ -507,7 +510,8 @@ void TxOrphanageImpl::LimitOrphans()
 
             // If we erased the last orphan from this peer, it_worst_peer will be invalidated.
             it_worst_peer = m_peer_orphanage_info.find(worst_peer);
-            if (it_worst_peer == m_peer_orphanage_info.end() || it_worst_peer->second.GetDosScore(max_lat, max_mem) <= dos_threshold) break;
+            if (it_worst_peer == m_peer_orphanage_info.end() ||
+                ByRatioNegSize{it_worst_peer->second.GetDosScore(max_lat, max_mem)} <= ByRatioNegSize{dos_threshold}) break;
         }
         LogDebug(BCLog::TXPACKAGES, "peer=%d orphanage overflow, removed %u of %u announcements\n", worst_peer, num_erased_this_round, starting_num_ann);
 
@@ -527,6 +531,8 @@ void TxOrphanageImpl::LimitOrphans()
 
 std::vector<std::pair<Wtxid, NodeId>> TxOrphanageImpl::AddChildrenToWorkSet(const CTransaction& tx, FastRandomContext& rng)
 {
+    if (m_orphans.empty()) return {};
+
     std::vector<std::pair<Wtxid, NodeId>> ret;
     auto& index_by_wtxid = m_orphans.get<ByWtxid>();
     for (unsigned int i = 0; i < tx.vout.size(); i++) {
diff --git a/depend/bitcoin/src/node/txorphanage.h b/depend/bitcoin/src/node/txorphanage.h
index 81c57da3..4411f15d 100644
--- a/depend/bitcoin/src/node/txorphanage.h
+++ b/depend/bitcoin/src/node/txorphanage.h
@@ -17,10 +17,10 @@
 
 namespace node {
 /** Default value for TxOrphanage::m_reserved_usage_per_peer. Helps limit the total amount of memory used by the orphanage. */
-static constexpr int64_t DEFAULT_RESERVED_ORPHAN_WEIGHT_PER_PEER{404'000};
+inline constexpr int64_t DEFAULT_RESERVED_ORPHAN_WEIGHT_PER_PEER{404'000};
 /** Default value for TxOrphanage::m_max_global_latency_score. Helps limit the maximum latency for operations like
  * EraseForBlock and LimitOrphans. */
-static constexpr unsigned int DEFAULT_MAX_ORPHANAGE_LATENCY_SCORE{3000};
+inline constexpr unsigned int DEFAULT_MAX_ORPHANAGE_LATENCY_SCORE{3000};
 
 /** A class to track orphan transactions (failed on TX_MISSING_INPUTS)
  * Since we cannot distinguish orphans from bad transactions with non-existent inputs, we heavily limit the amount of
diff --git a/depend/bitcoin/src/node/txreconciliation.cpp b/depend/bitcoin/src/node/txreconciliation.cpp
index 2333181c..9a1f640f 100644
--- a/depend/bitcoin/src/node/txreconciliation.cpp
+++ b/depend/bitcoin/src/node/txreconciliation.cpp
@@ -5,8 +5,8 @@
 #include <node/txreconciliation.h>
 
 #include <common/system.h>
-#include <logging.h>
 #include <util/check.h>
+#include <util/log.h>
 
 #include <unordered_map>
 #include <variant>
diff --git a/depend/bitcoin/src/node/txreconciliation.h b/depend/bitcoin/src/node/txreconciliation.h
index 68deeaba..c9db2480 100644
--- a/depend/bitcoin/src/node/txreconciliation.h
+++ b/depend/bitcoin/src/node/txreconciliation.h
@@ -12,7 +12,7 @@
 #include <tuple>
 
 /** Supported transaction reconciliation protocol version */
-static constexpr uint32_t TXRECONCILIATION_VERSION{1};
+inline constexpr uint32_t TXRECONCILIATION_VERSION{1};
 
 enum class ReconciliationRegisterResult {
     NOT_FOUND,
diff --git a/depend/bitcoin/src/node/types.h b/depend/bitcoin/src/node/types.h
index 01e74528..0a022bec 100644
--- a/depend/bitcoin/src/node/types.h
+++ b/depend/bitcoin/src/node/types.h
@@ -13,16 +13,7 @@
 #ifndef BITCOIN_NODE_TYPES_H
 #define BITCOIN_NODE_TYPES_H
 
-#include <consensus/amount.h>
-#include <cstddef>
 #include <cstdint>
-#include <optional>
-#include <policy/policy.h>
-#include <primitives/transaction.h>
-#include <script/script.h>
-#include <uint256.h>
-#include <util/time.h>
-#include <vector>
 
 namespace node {
 enum class TransactionError {
@@ -34,128 +25,7 @@ enum class TransactionError {
     MAX_FEE_EXCEEDED,
     MAX_BURN_EXCEEDED,
     INVALID_PACKAGE,
-};
-
-struct BlockCreateOptions {
-    /**
-     * Set false to omit mempool transactions
-     */
-    bool use_mempool{true};
-    /**
-     * The default reserved weight for the fixed-size block header,
-     * transaction count and coinbase transaction. Minimum: 2000 weight units
-     * (MINIMUM_BLOCK_RESERVED_WEIGHT).
-     *
-     * Providing a value overrides the `-blockreservedweight` startup setting.
-     * Cap'n Proto IPC clients currently cannot leave this field unset, so they
-     * always provide a value.
-     */
-    std::optional<size_t> block_reserved_weight{};
-    /**
-     * The maximum additional sigops which the pool will add in coinbase
-     * transaction outputs.
-     */
-    size_t coinbase_output_max_additional_sigops{DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS};
-    /**
-     * Script to put in the coinbase transaction. The default is an
-     * anyone-can-spend dummy.
-     *
-     * Should only be used for tests, when the default doesn't suffice.
-     *
-     * Note that higher level code like the getblocktemplate RPC may omit the
-     * coinbase transaction entirely. It's instead constructed by pool software
-     * using fields like coinbasevalue, coinbaseaux and default_witness_commitment.
-     * This software typically also controls the payout outputs, even for solo
-     * mining.
-     *
-     * The size and sigops are not checked against
-     * coinbase_max_additional_weight and coinbase_output_max_additional_sigops.
-     */
-    CScript coinbase_output_script{CScript() << OP_TRUE};
-    /**
-     * Whether to include an OP_0 as a dummy extraNonce in the template's coinbase
-     */
-    bool include_dummy_extranonce{false};
-};
-
-struct BlockWaitOptions {
-    /**
-     * How long to wait before returning nullptr instead of a new template.
-     * Default is to wait forever.
-     */
-    MillisecondsDouble timeout{MillisecondsDouble::max()};
-
-    /**
-     * The wait method will not return a new template unless it has fees at
-     * least fee_threshold sats higher than the current template, or unless
-     * the chain tip changes and the previous template is no longer valid.
-     *
-     * A caller may not be interested in templates with higher fees, and
-     * determining whether fee_threshold is reached is also expensive. So as
-     * an optimization, when fee_threshold is set to MAX_MONEY (default), the
-     * implementation is able to be much more efficient, skipping expensive
-     * checks and only returning new templates when the chain tip changes.
-     */
-    CAmount fee_threshold{MAX_MONEY};
-};
-
-struct BlockCheckOptions {
-    /**
-     * Set false to omit the merkle root check
-     */
-    bool check_merkle_root{true};
-
-    /**
-     * Set false to omit the proof-of-work check
-     */
-    bool check_pow{true};
-};
-
-/**
- * Template containing all coinbase transaction fields that are set by our
- * miner code. Clients are expected to add their own outputs and typically
- * also expand the scriptSig.
- */
-struct CoinbaseTx {
-    /* nVersion */
-    uint32_t version;
-    /* nSequence for the only coinbase transaction input */
-    uint32_t sequence;
-    /**
-     * Prefix which needs to be placed at the beginning of the scriptSig.
-     * Clients may append extra data to this as long as the overall scriptSig
-     * size is 100 bytes or less, to avoid the block being rejected with
-     * "bad-cb-length" error.
-     *
-     * Currently with BIP 34, the prefix is guaranteed to be less than 8 bytes,
-     * but future soft forks could require longer prefixes.
-     */
-    CScript script_sig_prefix;
-    /**
-     * The first (and only) witness stack element of the coinbase input.
-     *
-     * Omitted for block templates without witness data.
-     *
-     * This is currently the BIP 141 witness reserved value, and can be chosen
-     * arbitrarily by the node, but future soft forks may constrain it.
-     */
-    std::optional<uint256> witness;
-    /**
-     * Block subsidy plus fees, minus any non-zero required_outputs.
-     *
-     * Currently there are no non-zero required_outputs, so block_reward_remaining
-     * is the entire block reward. See also required_outputs.
-     */
-    CAmount block_reward_remaining;
-    /*
-     * To be included as the last outputs in the coinbase transaction.
-     * Currently this is only the witness commitment OP_RETURN, but future
-     * softforks or a custom mining patch could add more.
-     *
-     * The dummy output that spends the full reward is excluded.
-     */
-    std::vector<CTxOut> required_outputs;
-    uint32_t lock_time;
+    PRIVATE_BROADCAST_FULL,
 };
 
 /**
diff --git a/depend/bitcoin/src/node/utxo_snapshot.h b/depend/bitcoin/src/node/utxo_snapshot.h
index d8b3ca61..f3a3b8d9 100644
--- a/depend/bitcoin/src/node/utxo_snapshot.h
+++ b/depend/bitcoin/src/node/utxo_snapshot.h
@@ -25,7 +25,7 @@
 #include <string_view>
 
 // UTXO set snapshot magic bytes
-static constexpr std::array<uint8_t, 5> SNAPSHOT_MAGIC_BYTES = {'u', 't', 'x', 'o', 0xff};
+inline constexpr std::array<uint8_t, 5> SNAPSHOT_MAGIC_BYTES = {'u', 't', 'x', 'o', 0xff};
 
 class Chainstate;
 
@@ -36,7 +36,7 @@ namespace node {
 //! before being used. Thus, new fields should be added only if needed.
 class SnapshotMetadata
 {
-    inline static const uint16_t VERSION{2};
+    static constexpr uint16_t VERSION{2};
     const std::set<uint16_t> m_supported_versions{VERSION};
     const MessageStartChars m_network_magic;
 public:
@@ -110,7 +110,7 @@ class SnapshotMetadata
 //!
 //! Because we only allow loading a single snapshot at a time, there will only be one
 //! chainstate directory with this filename present within it.
-const fs::path SNAPSHOT_BLOCKHASH_FILENAME{"base_blockhash"};
+inline const fs::path SNAPSHOT_BLOCKHASH_FILENAME{"base_blockhash"};
 
 //! Write out the blockhash of the snapshot base block that was used to construct
 //! this chainstate. This value is read in during subsequent initializations and
@@ -125,7 +125,7 @@ std::optional<uint256> ReadSnapshotBaseBlockhash(fs::path chaindir)
 
 //! Suffix appended to the chainstate (leveldb) dir when created based upon
 //! a snapshot.
-constexpr std::string_view SNAPSHOT_CHAINSTATE_SUFFIX = "_snapshot";
+inline constexpr std::string_view SNAPSHOT_CHAINSTATE_SUFFIX = "_snapshot";
 
 
 //! Return a path to the snapshot-based chainstate dir, if one exists.
diff --git a/depend/bitcoin/src/noui.cpp b/depend/bitcoin/src/noui.cpp
index 6f33b227..2450fdda 100644
--- a/depend/bitcoin/src/noui.cpp
+++ b/depend/bitcoin/src/noui.cpp
@@ -5,9 +5,9 @@
 
 #include <noui.h>
 
-#include <btcsignals.h>
-#include <logging.h>
 #include <node/interface_ui.h>
+#include <util/btcsignals.h>
+#include <util/log.h>
 #include <util/translation.h>
 
 #include <string>
@@ -17,7 +17,7 @@ btcsignals::connection noui_ThreadSafeMessageBoxConn;
 btcsignals::connection noui_ThreadSafeQuestionConn;
 btcsignals::connection noui_InitMessageConn;
 
-bool noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style)
+void noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style)
 {
     bool fSecure = style & CClientUIInterface::SECURE;
     style &= ~CClientUIInterface::SECURE;
@@ -41,12 +41,12 @@ bool noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style)
     }
 
     tfm::format(std::cerr, "%s%s\n", strCaption, message.original);
-    return false;
 }
 
 bool noui_ThreadSafeQuestion(const bilingual_str& /* ignored interactive message */, const std::string& message, unsigned int style)
 {
-    return noui_ThreadSafeMessageBox(Untranslated(message), style);
+    noui_ThreadSafeMessageBox(Untranslated(message), style);
+    return false; // Answer the question with false in the noui context
 }
 
 void noui_InitMessage(const std::string& message)
@@ -56,15 +56,14 @@ void noui_InitMessage(const std::string& message)
 
 void noui_connect()
 {
-    noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
-    noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
-    noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessage);
+    noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox);
+    noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion.connect(noui_ThreadSafeQuestion);
+    noui_InitMessageConn = uiInterface.InitMessage.connect(noui_InitMessage);
 }
 
-bool noui_ThreadSafeMessageBoxRedirect(const bilingual_str& message, unsigned int style)
+void noui_ThreadSafeMessageBoxRedirect(const bilingual_str& message, unsigned int style)
 {
     LogInfo("%s", message.original);
-    return false;
 }
 
 bool noui_ThreadSafeQuestionRedirect(const bilingual_str& /* ignored interactive message */, const std::string& message, unsigned int style)
@@ -83,9 +82,9 @@ void noui_test_redirect()
     noui_ThreadSafeMessageBoxConn.disconnect();
     noui_ThreadSafeQuestionConn.disconnect();
     noui_InitMessageConn.disconnect();
-    noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBoxRedirect);
-    noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestionRedirect);
-    noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessageRedirect);
+    noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBoxRedirect);
+    noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion.connect(noui_ThreadSafeQuestionRedirect);
+    noui_InitMessageConn = uiInterface.InitMessage.connect(noui_InitMessageRedirect);
 }
 
 void noui_reconnect()
diff --git a/depend/bitcoin/src/noui.h b/depend/bitcoin/src/noui.h
index 332346f5..71f284bd 100644
--- a/depend/bitcoin/src/noui.h
+++ b/depend/bitcoin/src/noui.h
@@ -10,7 +10,7 @@
 struct bilingual_str;
 
 /** Non-GUI handler, which logs and prints messages. */
-bool noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style);
+void noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style);
 /** Non-GUI handler, which logs and prints questions. */
 bool noui_ThreadSafeQuestion(const bilingual_str& /* ignored interactive message */, const std::string& message, unsigned int style);
 /** Non-GUI handler, which only logs a message. */
diff --git a/depend/bitcoin/src/outputtype.h b/depend/bitcoin/src/outputtype.h
index 4dde381b..2b4c4d9b 100644
--- a/depend/bitcoin/src/outputtype.h
+++ b/depend/bitcoin/src/outputtype.h
@@ -23,7 +23,7 @@ enum class OutputType {
     UNKNOWN,
 };
 
-static constexpr auto OUTPUT_TYPES = std::array{
+inline constexpr auto OUTPUT_TYPES = std::array{
     OutputType::LEGACY,
     OutputType::P2SH_SEGWIT,
     OutputType::BECH32,
diff --git a/depend/bitcoin/src/policy/feerate.h b/depend/bitcoin/src/policy/feerate.h
index f6b49a14..965edf25 100644
--- a/depend/bitcoin/src/policy/feerate.h
+++ b/depend/bitcoin/src/policy/feerate.h
@@ -16,8 +16,8 @@
 #include <string>
 #include <type_traits>
 
-const std::string CURRENCY_UNIT = "BTC"; // One formatted unit
-const std::string CURRENCY_ATOM = "sat"; // One indivisible minimum value unit
+inline const std::string CURRENCY_UNIT = "BTC"; // One formatted unit
+inline const std::string CURRENCY_ATOM = "sat"; // One indivisible minimum value unit
 
 enum class FeeRateFormat {
     BTC_KVB, //!< Use BTC/kvB fee rate unit
@@ -38,7 +38,7 @@ class CFeeRate
     /** Fee rate of 0 satoshis per 0 vB */
     CFeeRate() = default;
     template<std::integral I> // Disallow silent float -> int conversion
-    explicit CFeeRate(const I m_feerate_kvb) : m_feerate(FeePerVSize(m_feerate_kvb, 1000)) {}
+    explicit constexpr CFeeRate(const I m_feerate_kvb) : m_feerate(FeePerVSize(m_feerate_kvb, 1000)) {}
 
     /**
      * Construct a fee rate from a fee in satoshis and a vsize in vB.
@@ -60,13 +60,13 @@ class CFeeRate
      * Return the fee in satoshis for a vsize of 1000 vbytes
      */
     CAmount GetFeePerK() const { return CAmount(m_feerate.EvaluateFeeDown(1000)); }
-    friend std::weak_ordering operator<=>(const CFeeRate& a, const CFeeRate& b) noexcept
+    friend std::strong_ordering operator<=>(const CFeeRate& a, const CFeeRate& b) noexcept
     {
-        return FeeRateCompare(a.m_feerate, b.m_feerate);
+        return ByRatio{a.m_feerate} <=> ByRatio{b.m_feerate};
     }
     friend bool operator==(const CFeeRate& a, const CFeeRate& b) noexcept
     {
-        return FeeRateCompare(a.m_feerate, b.m_feerate) == std::weak_ordering::equivalent;
+        return ByRatio{a.m_feerate} == ByRatio{b.m_feerate};
     }
     CFeeRate& operator+=(const CFeeRate& a) {
         m_feerate = FeePerVSize(GetFeePerK() + a.GetFeePerK(), 1000);
diff --git a/depend/bitcoin/src/policy/fees/block_policy_estimator.cpp b/depend/bitcoin/src/policy/fees/block_policy_estimator.cpp
index 84941b6e..1434c5de 100644
--- a/depend/bitcoin/src/policy/fees/block_policy_estimator.cpp
+++ b/depend/bitcoin/src/policy/fees/block_policy_estimator.cpp
@@ -8,7 +8,6 @@
 #include <common/system.h>
 #include <consensus/amount.h>
 #include <kernel/mempool_entry.h>
-#include <logging.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <random.h>
@@ -18,6 +17,7 @@
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/serfloat.h>
 #include <util/syserror.h>
 #include <util/time.h>
@@ -1008,51 +1008,51 @@ bool CBlockPolicyEstimator::Read(AutoFile& filein)
         if (nVersionRequired > CURRENT_FEES_FILE_VERSION) {
             throw std::runtime_error{strprintf("File version (%d) too high to be read.", nVersionRequired)};
         }
+        if (nVersionRequired < CURRENT_FEES_FILE_VERSION) {
+            throw std::runtime_error{strprintf("File version (%d) incompatible: Too old to be read", nVersionRequired)};
+        }
 
         // Read fee estimates file into temporary variables so existing data
         // structures aren't corrupted if there is an exception.
         unsigned int nFileBestSeenHeight;
         filein >> nFileBestSeenHeight;
 
-        if (nVersionRequired < CURRENT_FEES_FILE_VERSION) {
-            LogWarning("Incompatible old fee estimation data (non-fatal). Version: %d", nVersionRequired);
-        } else { // nVersionRequired == CURRENT_FEES_FILE_VERSION
-            unsigned int nFileHistoricalFirst, nFileHistoricalBest;
-            filein >> nFileHistoricalFirst >> nFileHistoricalBest;
-            if (nFileHistoricalFirst > nFileHistoricalBest || nFileHistoricalBest > nFileBestSeenHeight) {
-                throw std::runtime_error("Corrupt estimates file. Historical block range for estimates is invalid");
-            }
-            std::vector<double> fileBuckets;
-            filein >> Using<VectorFormatter<EncodedDoubleFormatter>>(fileBuckets);
-            size_t numBuckets = fileBuckets.size();
-            if (numBuckets <= 1 || numBuckets > 1000) {
-                throw std::runtime_error("Corrupt estimates file. Must have between 2 and 1000 feerate buckets");
-            }
+        // nVersionRequired == CURRENT_FEES_FILE_VERSION
+        unsigned int nFileHistoricalFirst, nFileHistoricalBest;
+        filein >> nFileHistoricalFirst >> nFileHistoricalBest;
+        if (nFileHistoricalFirst > nFileHistoricalBest || nFileHistoricalBest > nFileBestSeenHeight) {
+            throw std::runtime_error("Corrupt estimates file. Historical block range for estimates is invalid");
+        }
+        std::vector<double> fileBuckets;
+        filein >> Using<VectorFormatter<EncodedDoubleFormatter>>(fileBuckets);
+        size_t numBuckets = fileBuckets.size();
+        if (numBuckets <= 1 || numBuckets > 1000) {
+            throw std::runtime_error("Corrupt estimates file. Must have between 2 and 1000 feerate buckets");
+        }
 
-            std::unique_ptr<TxConfirmStats> fileFeeStats(new TxConfirmStats(buckets, bucketMap, MED_BLOCK_PERIODS, MED_DECAY, MED_SCALE));
-            std::unique_ptr<TxConfirmStats> fileShortStats(new TxConfirmStats(buckets, bucketMap, SHORT_BLOCK_PERIODS, SHORT_DECAY, SHORT_SCALE));
-            std::unique_ptr<TxConfirmStats> fileLongStats(new TxConfirmStats(buckets, bucketMap, LONG_BLOCK_PERIODS, LONG_DECAY, LONG_SCALE));
-            fileFeeStats->Read(filein, numBuckets);
-            fileShortStats->Read(filein, numBuckets);
-            fileLongStats->Read(filein, numBuckets);
-
-            // Fee estimates file parsed correctly
-            // Copy buckets from file and refresh our bucketmap
-            buckets = fileBuckets;
-            bucketMap.clear();
-            for (unsigned int i = 0; i < buckets.size(); i++) {
-                bucketMap[buckets[i]] = i;
-            }
+        std::unique_ptr<TxConfirmStats> fileFeeStats(new TxConfirmStats(buckets, bucketMap, MED_BLOCK_PERIODS, MED_DECAY, MED_SCALE));
+        std::unique_ptr<TxConfirmStats> fileShortStats(new TxConfirmStats(buckets, bucketMap, SHORT_BLOCK_PERIODS, SHORT_DECAY, SHORT_SCALE));
+        std::unique_ptr<TxConfirmStats> fileLongStats(new TxConfirmStats(buckets, bucketMap, LONG_BLOCK_PERIODS, LONG_DECAY, LONG_SCALE));
+        fileFeeStats->Read(filein, numBuckets);
+        fileShortStats->Read(filein, numBuckets);
+        fileLongStats->Read(filein, numBuckets);
+
+        // Fee estimates file parsed correctly
+        // Copy buckets from file and refresh our bucketmap
+        buckets = fileBuckets;
+        bucketMap.clear();
+        for (unsigned int i = 0; i < buckets.size(); i++) {
+            bucketMap[buckets[i]] = i;
+        }
 
-            // Destroy old TxConfirmStats and point to new ones that already reference buckets and bucketMap
-            feeStats = std::move(fileFeeStats);
-            shortStats = std::move(fileShortStats);
-            longStats = std::move(fileLongStats);
+        // Destroy old TxConfirmStats and point to new ones that already reference buckets and bucketMap
+        feeStats = std::move(fileFeeStats);
+        shortStats = std::move(fileShortStats);
+        longStats = std::move(fileLongStats);
 
-            nBestSeenHeight = nFileBestSeenHeight;
-            historicalFirst = nFileHistoricalFirst;
-            historicalBest = nFileHistoricalBest;
-        }
+        nBestSeenHeight = nFileBestSeenHeight;
+        historicalFirst = nFileHistoricalFirst;
+        historicalBest = nFileHistoricalBest;
     }
     catch (const std::exception& e) {
         LogWarning("Unable to read policy estimator data (non-fatal): %s", e.what());
diff --git a/depend/bitcoin/src/policy/fees/block_policy_estimator.h b/depend/bitcoin/src/policy/fees/block_policy_estimator.h
index f015bd5b..a87970cd 100644
--- a/depend/bitcoin/src/policy/fees/block_policy_estimator.h
+++ b/depend/bitcoin/src/policy/fees/block_policy_estimator.h
@@ -23,16 +23,16 @@
 
 
 // How often to flush fee estimates to fee_estimates.dat.
-static constexpr std::chrono::hours FEE_FLUSH_INTERVAL{1};
+inline constexpr std::chrono::hours FEE_FLUSH_INTERVAL{1};
 
 /** fee_estimates.dat that are more than 60 hours (2.5 days) old will not be read,
  * as fee estimates are based on historical data and may be inaccurate if
  * network activity has changed.
  */
-static constexpr std::chrono::hours MAX_FILE_AGE{60};
+inline constexpr std::chrono::hours MAX_FILE_AGE{60};
 
 // Whether we allow importing a fee_estimates file older than MAX_FILE_AGE.
-static constexpr bool DEFAULT_ACCEPT_STALE_FEE_ESTIMATES{false};
+inline constexpr bool DEFAULT_ACCEPT_STALE_FEE_ESTIMATES{false};
 
 class AutoFile;
 class TxConfirmStats;
@@ -47,7 +47,7 @@ enum class FeeEstimateHorizon {
     LONG_HALFLIFE,
 };
 
-static constexpr auto ALL_FEE_ESTIMATE_HORIZONS = std::array{
+inline constexpr auto ALL_FEE_ESTIMATE_HORIZONS = std::array{
     FeeEstimateHorizon::SHORT_HALFLIFE,
     FeeEstimateHorizon::MED_HALFLIFE,
     FeeEstimateHorizon::LONG_HALFLIFE,
@@ -157,7 +157,7 @@ class CBlockPolicyEstimator : public CValidationInterface
     static constexpr unsigned int LONG_BLOCK_PERIODS = 42;
     static constexpr unsigned int LONG_SCALE = 24;
     /** Historical estimates that are older than this aren't valid */
-    static const unsigned int OLDEST_ESTIMATE_HISTORY = 6 * 1008;
+    static constexpr unsigned int OLDEST_ESTIMATE_HISTORY{6 * 1008};
 
     /** Decay of .962 is a half-life of 18 blocks or about 3 hours */
     static constexpr double SHORT_DECAY = .962;
diff --git a/depend/bitcoin/src/policy/packages.h b/depend/bitcoin/src/policy/packages.h
index 1a7e101e..e5704fb3 100644
--- a/depend/bitcoin/src/policy/packages.h
+++ b/depend/bitcoin/src/policy/packages.h
@@ -16,12 +16,12 @@
 #include <vector>
 
 /** Default maximum number of transactions in a package. */
-static constexpr uint32_t MAX_PACKAGE_COUNT{25};
+inline constexpr uint32_t MAX_PACKAGE_COUNT{25};
 /** Default maximum total weight of transactions in a package in weight
     to allow for context-less checks. This must allow a superset of sigops
     weighted vsize limited transactions to not disallow transactions we would
     have otherwise accepted individually. */
-static constexpr uint32_t MAX_PACKAGE_WEIGHT = 404'000;
+inline constexpr uint32_t MAX_PACKAGE_WEIGHT = 404'000;
 static_assert(MAX_PACKAGE_WEIGHT >= MAX_STANDARD_TX_WEIGHT);
 
 // Packages are part of a single cluster, so ensure that the package limits are
diff --git a/depend/bitcoin/src/policy/policy.h b/depend/bitcoin/src/policy/policy.h
index 13bcf4ce..ea66fa4b 100644
--- a/depend/bitcoin/src/policy/policy.h
+++ b/depend/bitcoin/src/policy/policy.h
@@ -22,77 +22,77 @@ class CFeeRate;
 class CScript;
 
 /** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/
-static constexpr unsigned int DEFAULT_BLOCK_MAX_WEIGHT{MAX_BLOCK_WEIGHT};
+inline constexpr unsigned int DEFAULT_BLOCK_MAX_WEIGHT{MAX_BLOCK_WEIGHT};
 /** Default for -blockreservedweight **/
-static constexpr unsigned int DEFAULT_BLOCK_RESERVED_WEIGHT{8000};
+inline constexpr unsigned int DEFAULT_BLOCK_RESERVED_WEIGHT{8000};
 /** Default sigops cost to reserve for coinbase transaction outputs when creating block templates. */
-static constexpr unsigned int DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS{400};
+inline constexpr unsigned int DEFAULT_COINBASE_OUTPUT_MAX_ADDITIONAL_SIGOPS{400};
 /** This accounts for the block header, var_int encoding of the transaction count and a minimally viable
  * coinbase transaction. It adds an additional safety margin, because even with a thorough understanding
  * of block serialization, it's easy to make a costly mistake when trying to squeeze every last byte.
  * Setting a lower value is prevented at startup. */
-static constexpr unsigned int MINIMUM_BLOCK_RESERVED_WEIGHT{2000};
+inline constexpr unsigned int MINIMUM_BLOCK_RESERVED_WEIGHT{2000};
 /** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/
-static constexpr unsigned int DEFAULT_BLOCK_MIN_TX_FEE{1};
+inline constexpr unsigned int DEFAULT_BLOCK_MIN_TX_FEE{1};
 /** The maximum weight for transactions we're willing to relay/mine */
-static constexpr int32_t MAX_STANDARD_TX_WEIGHT{400000};
+inline constexpr int32_t MAX_STANDARD_TX_WEIGHT{400'000};
 /** The minimum non-witness size for transactions we're willing to relay/mine: one larger than 64  */
-static constexpr unsigned int MIN_STANDARD_TX_NONWITNESS_SIZE{65};
+inline constexpr unsigned int MIN_STANDARD_TX_NONWITNESS_SIZE{65};
 /** Maximum number of signature check operations in an IsStandard() P2SH script */
-static constexpr unsigned int MAX_P2SH_SIGOPS{15};
+inline constexpr unsigned int MAX_P2SH_SIGOPS{15};
 /** The maximum number of sigops we're willing to relay/mine in a single tx */
-static constexpr unsigned int MAX_STANDARD_TX_SIGOPS_COST{MAX_BLOCK_SIGOPS_COST/5};
+inline constexpr unsigned int MAX_STANDARD_TX_SIGOPS_COST{MAX_BLOCK_SIGOPS_COST/5};
 /** The maximum number of potentially executed legacy signature operations in a single standard tx */
-static constexpr unsigned int MAX_TX_LEGACY_SIGOPS{2'500};
+inline constexpr unsigned int MAX_TX_LEGACY_SIGOPS{2'500};
 /** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or replacement **/
-static constexpr unsigned int DEFAULT_INCREMENTAL_RELAY_FEE{100};
+inline constexpr unsigned int DEFAULT_INCREMENTAL_RELAY_FEE{100};
 /** Default for -bytespersigop */
-static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP{20};
+inline constexpr unsigned int DEFAULT_BYTES_PER_SIGOP{20};
 /** Default for -permitbaremultisig */
-static constexpr bool DEFAULT_PERMIT_BAREMULTISIG{true};
+inline constexpr bool DEFAULT_PERMIT_BAREMULTISIG{true};
 /** The maximum number of witness stack items in a standard P2WSH script */
-static constexpr unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS{100};
+inline constexpr unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS{100};
 /** The maximum size in bytes of each witness stack item in a standard P2WSH script */
-static constexpr unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE{80};
+inline constexpr unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE{80};
 /** The maximum size in bytes of each witness stack item in a standard BIP 342 script (Taproot, leaf version 0xc0) */
-static constexpr unsigned int MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE{80};
+inline constexpr unsigned int MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE{80};
 /** The maximum size in bytes of a standard witnessScript */
-static constexpr unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE{3600};
+inline constexpr unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE{3600};
 /** The maximum size of a standard ScriptSig */
-static constexpr unsigned int MAX_STANDARD_SCRIPTSIG_SIZE{1650};
+inline constexpr unsigned int MAX_STANDARD_SCRIPTSIG_SIZE{1650};
 /** Min feerate for defining dust.
  * Changing the dust limit changes which transactions are
  * standard and should be done with care and ideally rarely. It makes sense to
  * only increase the dust limit after prior releases were already not creating
  * outputs below the new threshold */
-static constexpr unsigned int DUST_RELAY_TX_FEE{3000};
+inline constexpr unsigned int DUST_RELAY_TX_FEE{3000};
 /** Default for -minrelaytxfee, minimum relay fee for transactions */
-static constexpr unsigned int DEFAULT_MIN_RELAY_TX_FEE{100};
+inline constexpr unsigned int DEFAULT_MIN_RELAY_TX_FEE{100};
 /** Maximum number of transactions per cluster (default) */
-static constexpr unsigned int DEFAULT_CLUSTER_LIMIT{64};
+inline constexpr unsigned int DEFAULT_CLUSTER_LIMIT{64};
 /** Maximum size of cluster in virtual kilobytes */
-static constexpr unsigned int DEFAULT_CLUSTER_SIZE_LIMIT_KVB{101};
+inline constexpr unsigned int DEFAULT_CLUSTER_SIZE_LIMIT_KVB{101};
 /** Default for -limitancestorcount, max number of in-mempool ancestors */
-static constexpr unsigned int DEFAULT_ANCESTOR_LIMIT{25};
+inline constexpr unsigned int DEFAULT_ANCESTOR_LIMIT{25};
 /** Default for -limitdescendantcount, max number of in-mempool descendants */
-static constexpr unsigned int DEFAULT_DESCENDANT_LIMIT{25};
+inline constexpr unsigned int DEFAULT_DESCENDANT_LIMIT{25};
 /** Default for -datacarrier */
-static const bool DEFAULT_ACCEPT_DATACARRIER = true;
+inline constexpr bool DEFAULT_ACCEPT_DATACARRIER = true;
 /**
  * Default setting for -datacarriersize in vbytes.
  */
-static const unsigned int MAX_OP_RETURN_RELAY = MAX_STANDARD_TX_WEIGHT / WITNESS_SCALE_FACTOR;
+inline constexpr unsigned int MAX_OP_RETURN_RELAY = MAX_STANDARD_TX_WEIGHT / WITNESS_SCALE_FACTOR;
 /**
  * An extra transaction can be added to a package, as long as it only has one
  * ancestor and is no larger than this. Not really any reason to make this
  * configurable as it doesn't materially change DoS parameters.
  */
-static constexpr unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT{10000};
+inline constexpr unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT{10'000};
 
 /**
  * Maximum number of ephemeral dust outputs allowed.
  */
-static constexpr unsigned int MAX_DUST_OUTPUTS_PER_TX{1};
+inline constexpr unsigned int MAX_DUST_OUTPUTS_PER_TX{1};
 
 /**
  * Mandatory script verification flags that all new transactions must comply with for
@@ -101,7 +101,7 @@ static constexpr unsigned int MAX_DUST_OUTPUTS_PER_TX{1};
  * Note that this does not affect consensus validity; see GetBlockScriptFlags()
  * for that.
  */
-static constexpr script_verify_flags MANDATORY_SCRIPT_VERIFY_FLAGS{SCRIPT_VERIFY_P2SH |
+inline constexpr script_verify_flags MANDATORY_SCRIPT_VERIFY_FLAGS{SCRIPT_VERIFY_P2SH |
                                                              SCRIPT_VERIFY_DERSIG |
                                                              SCRIPT_VERIFY_NULLDUMMY |
                                                              SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |
@@ -115,7 +115,7 @@ static constexpr script_verify_flags MANDATORY_SCRIPT_VERIFY_FLAGS{SCRIPT_VERIFY
  * the additional (non-mandatory) rules here, to improve forwards and
  * backwards compatibility.
  */
-static constexpr script_verify_flags STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRIPT_VERIFY_FLAGS |
+inline constexpr script_verify_flags STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRIPT_VERIFY_FLAGS |
                                                              SCRIPT_VERIFY_STRICTENC |
                                                              SCRIPT_VERIFY_MINIMALDATA |
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS |
@@ -131,10 +131,10 @@ static constexpr script_verify_flags STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRI
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE};
 
 /** For convenience, standard but not mandatory verify flags. */
-static constexpr script_verify_flags STANDARD_NOT_MANDATORY_VERIFY_FLAGS{STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS};
+inline constexpr script_verify_flags STANDARD_NOT_MANDATORY_VERIFY_FLAGS{STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS};
 
 /** Used as the flags parameter to sequence and nLocktime checks in non-consensus code. */
-static constexpr unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS{LOCKTIME_VERIFY_SEQUENCE};
+inline constexpr unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS{LOCKTIME_VERIFY_SEQUENCE};
 
 CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee);
 
@@ -148,8 +148,8 @@ std::vector<uint32_t> GetDust(const CTransaction& tx, CFeeRate dust_relay_rate);
 // Changing the default transaction version requires a two step process: first
 // adapting relay policy by bumping TX_MAX_STANDARD_VERSION, and then later
 // allowing the new transaction version in the wallet/RPC.
-static constexpr decltype(CTransaction::version) TX_MIN_STANDARD_VERSION{1};
-static constexpr decltype(CTransaction::version) TX_MAX_STANDARD_VERSION{3};
+inline constexpr decltype(CTransaction::version) TX_MIN_STANDARD_VERSION{1};
+inline constexpr decltype(CTransaction::version) TX_MAX_STANDARD_VERSION{3};
 
 /**
 * Check for standard transaction types
diff --git a/depend/bitcoin/src/policy/rbf.h b/depend/bitcoin/src/policy/rbf.h
index 0ba646ca..81769602 100644
--- a/depend/bitcoin/src/policy/rbf.h
+++ b/depend/bitcoin/src/policy/rbf.h
@@ -23,7 +23,7 @@ class uint256;
 
 /** Maximum number of unique clusters that can be affected by an RBF (Rule #5);
  * see GetEntriesForConflicts() */
-static constexpr uint32_t MAX_REPLACEMENT_CANDIDATES{100};
+inline constexpr uint32_t MAX_REPLACEMENT_CANDIDATES{100};
 
 /** The rbf state of unconfirmed transactions */
 enum class RBFTransactionState {
diff --git a/depend/bitcoin/src/policy/truc_policy.h b/depend/bitcoin/src/policy/truc_policy.h
index b6fe6e12..fb1d718b 100644
--- a/depend/bitcoin/src/policy/truc_policy.h
+++ b/depend/bitcoin/src/policy/truc_policy.h
@@ -17,21 +17,21 @@
 
 // This module enforces rules for BIP 431 TRUC transactions which help make
 // RBF abilities more robust. A transaction with version=3 is treated as TRUC.
-static constexpr decltype(CTransaction::version) TRUC_VERSION{3};
+inline constexpr decltype(CTransaction::version) TRUC_VERSION{3};
 
 // TRUC only allows 1 parent and 1 child when unconfirmed. This translates to a descendant set size
 // of 2 and ancestor set size of 2.
 /** Maximum number of transactions including an unconfirmed tx and its descendants. */
-static constexpr unsigned int TRUC_DESCENDANT_LIMIT{2};
+inline constexpr unsigned int TRUC_DESCENDANT_LIMIT{2};
 /** Maximum number of transactions including a TRUC tx and all its mempool ancestors. */
-static constexpr unsigned int TRUC_ANCESTOR_LIMIT{2};
+inline constexpr unsigned int TRUC_ANCESTOR_LIMIT{2};
 
 /** Maximum sigop-adjusted virtual size of all v3 transactions. */
-static constexpr int64_t TRUC_MAX_VSIZE{10000};
-static constexpr int64_t TRUC_MAX_WEIGHT{TRUC_MAX_VSIZE * WITNESS_SCALE_FACTOR};
+inline constexpr int64_t TRUC_MAX_VSIZE{10'000};
+inline constexpr int64_t TRUC_MAX_WEIGHT{TRUC_MAX_VSIZE * WITNESS_SCALE_FACTOR};
 /** Maximum sigop-adjusted virtual size of a tx which spends from an unconfirmed TRUC transaction. */
-static constexpr int64_t TRUC_CHILD_MAX_VSIZE{1000};
-static constexpr int64_t TRUC_CHILD_MAX_WEIGHT{TRUC_CHILD_MAX_VSIZE * WITNESS_SCALE_FACTOR};
+inline constexpr int64_t TRUC_CHILD_MAX_VSIZE{1000};
+inline constexpr int64_t TRUC_CHILD_MAX_WEIGHT{TRUC_CHILD_MAX_VSIZE * WITNESS_SCALE_FACTOR};
 // These limits are within the default cluster limits.
 static_assert(TRUC_MAX_VSIZE + TRUC_CHILD_MAX_VSIZE <= DEFAULT_CLUSTER_SIZE_LIMIT_KVB * 1000);
 
diff --git a/depend/bitcoin/src/prevector.h b/depend/bitcoin/src/prevector.h
index 91be4880..e8a71bc9 100644
--- a/depend/bitcoin/src/prevector.h
+++ b/depend/bitcoin/src/prevector.h
@@ -7,11 +7,11 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstddef>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <iterator>
+#include <new>
 #include <type_traits>
 #include <utility>
 
diff --git a/depend/bitcoin/src/primitives/transaction.h b/depend/bitcoin/src/primitives/transaction.h
index 34bb9571..9fc8923f 100644
--- a/depend/bitcoin/src/primitives/transaction.h
+++ b/depend/bitcoin/src/primitives/transaction.h
@@ -73,13 +73,13 @@ class CTxIn
      * it set (BIP 65).
      * It has SEQUENCE_LOCKTIME_DISABLE_FLAG set (BIP 68/112).
      */
-    static const uint32_t SEQUENCE_FINAL = 0xffffffff;
+    static constexpr uint32_t SEQUENCE_FINAL{0xffffffff};
     /**
      * This is the maximum sequence number that enables both nLockTime and
      * OP_CHECKLOCKTIMEVERIFY (BIP 65).
      * It has SEQUENCE_LOCKTIME_DISABLE_FLAG set (BIP 68/112).
      */
-    static const uint32_t MAX_SEQUENCE_NONFINAL{SEQUENCE_FINAL - 1};
+    static constexpr uint32_t MAX_SEQUENCE_NONFINAL{SEQUENCE_FINAL - 1};
 
     // Below flags apply in the context of BIP 68. BIP 68 requires the tx
     // version to be set to 2, or higher.
@@ -90,18 +90,18 @@ class CTxIn
      * It fails OP_CHECKSEQUENCEVERIFY/CheckSequence() for any input that has
      * it set (BIP 112).
      */
-    static const uint32_t SEQUENCE_LOCKTIME_DISABLE_FLAG = (1U << 31);
+    static constexpr uint32_t SEQUENCE_LOCKTIME_DISABLE_FLAG{1U << 31};
 
     /**
      * If CTxIn::nSequence encodes a relative lock-time and this flag
      * is set, the relative lock-time has units of 512 seconds,
      * otherwise it specifies blocks with a granularity of 1. */
-    static const uint32_t SEQUENCE_LOCKTIME_TYPE_FLAG = (1 << 22);
+    static constexpr uint32_t SEQUENCE_LOCKTIME_TYPE_FLAG{1 << 22};
 
     /**
      * If CTxIn::nSequence encodes a relative lock-time, this mask is
      * applied to extract that lock-time from the sequence field. */
-    static const uint32_t SEQUENCE_LOCKTIME_MASK = 0x0000ffff;
+    static constexpr uint32_t SEQUENCE_LOCKTIME_MASK{0x0000ffff};
 
     /**
      * In order to use the same number of bits to encode roughly the
@@ -111,7 +111,7 @@ class CTxIn
      * Converting from CTxIn::nSequence to seconds is performed by
      * multiplying by 512 = 2^9, or equivalently shifting up by
      * 9 bits. */
-    static const int SEQUENCE_LOCKTIME_GRANULARITY = 9;
+    static constexpr int SEQUENCE_LOCKTIME_GRANULARITY{9};
 
     CTxIn()
     {
@@ -177,8 +177,8 @@ struct TransactionSerParams {
     const bool allow_witness;
     SER_PARAMS_OPFUNC
 };
-static constexpr TransactionSerParams TX_WITH_WITNESS{.allow_witness = true};
-static constexpr TransactionSerParams TX_NO_WITNESS{.allow_witness = false};
+inline constexpr TransactionSerParams TX_WITH_WITNESS{.allow_witness = true};
+inline constexpr TransactionSerParams TX_NO_WITNESS{.allow_witness = false};
 
 /**
  * Basic transaction serialization format:
@@ -281,7 +281,7 @@ class CTransaction
 {
 public:
     // Default transaction version.
-    static const uint32_t CURRENT_VERSION{2};
+    static constexpr uint32_t CURRENT_VERSION{2};
 
     // The local variables are made const to prevent unintended modification
     // without updating the cached hash value. However, CTransaction is not
@@ -403,4 +403,16 @@ struct CMutableTransaction
 typedef std::shared_ptr<const CTransaction> CTransactionRef;
 template <typename Tx> static inline CTransactionRef MakeTransactionRef(Tx&& txIn) { return std::make_shared<const CTransaction>(std::forward<Tx>(txIn)); }
 
+namespace std {
+/** Disable default std::hash for CTransactionRef to prevent accidentally
+ *  comparing by pointer. Use CTransactionRefHash or provide a custom
+ *  hasher. */
+template <>
+struct hash<CTransactionRef> {
+    hash() = delete;
+    // Belt-and-suspenders, already implied by the above.
+    size_t operator()(const CTransactionRef&) const = delete;
+};
+} // namespace std
+
 #endif // BITCOIN_PRIMITIVES_TRANSACTION_H
diff --git a/depend/bitcoin/src/primitives/transaction_identifier.h b/depend/bitcoin/src/primitives/transaction_identifier.h
index a1109591..9479d2be 100644
--- a/depend/bitcoin/src/primitives/transaction_identifier.h
+++ b/depend/bitcoin/src/primitives/transaction_identifier.h
@@ -7,7 +7,6 @@
 
 #include <attributes.h>
 #include <uint256.h>
-#include <util/types.h>
 
 #include <compare>
 #include <cstddef>
@@ -28,22 +27,12 @@ class transaction_identifier
     // Note: Use FromUint256 externally instead.
     transaction_identifier(const uint256& wrapped) : m_wrapped{wrapped} {}
 
-    constexpr int Compare(const transaction_identifier<has_witness>& other) const { return m_wrapped.Compare(other.m_wrapped); }
-    template <typename Other>
-    constexpr int Compare(const Other& other) const
-    {
-        static_assert(ALWAYS_FALSE<Other>, "Forbidden comparison type");
-        return 0;
-    }
-
 public:
     transaction_identifier() : m_wrapped{} {}
     consteval explicit transaction_identifier(std::string_view hex_str) : m_wrapped{uint256{hex_str}} {}
 
-    template <typename Other>
-    bool operator==(const Other& other) const { return Compare(other) == 0; }
-    template <typename Other>
-    std::strong_ordering operator<=>(const Other& other) const { return Compare(other) <=> 0; }
+    constexpr bool operator==(const transaction_identifier&) const = default;
+    constexpr auto operator<=>(const transaction_identifier&) const = default;
 
     const uint256& ToUint256() const LIFETIMEBOUND { return m_wrapped; }
     static transaction_identifier FromUint256(const uint256& id) { return {id}; }
diff --git a/depend/bitcoin/src/private_broadcast.cpp b/depend/bitcoin/src/private_broadcast.cpp
index 9c107da6..04a89e15 100644
--- a/depend/bitcoin/src/private_broadcast.cpp
+++ b/depend/bitcoin/src/private_broadcast.cpp
@@ -3,17 +3,30 @@
 // file COPYING or https://opensource.org/license/mit/.
 
 #include <private_broadcast.h>
+
 #include <util/check.h>
 
 #include <algorithm>
+#include <ranges>
 
 
-bool PrivateBroadcast::Add(const CTransactionRef& tx)
+PrivateBroadcast::AddResult PrivateBroadcast::Add(const CTransactionRef& tx)
     EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
 {
     LOCK(m_mutex);
-    const bool inserted{m_transactions.try_emplace(tx).second};
-    return inserted;
+    if (const auto it{m_transactions.find(tx)}; it != m_transactions.end()) {
+        if (IsPending(it->second)) return AddResult::AlreadyPresent;
+
+        // An exhausted transaction can be explicitly retried by adding it again.
+        it->second.time_added = NodeClock::now();
+        it->second.send_statuses.clear();
+        return AddResult::Added;
+    }
+
+    if (m_transactions.size() >= m_max_transactions) return AddResult::QueueFull;
+
+    m_transactions.try_emplace(tx);
+    return AddResult::Added;
 }
 
 std::optional<size_t> PrivateBroadcast::Remove(const CTransactionRef& tx)
@@ -33,12 +46,18 @@ std::optional<CTransactionRef> PrivateBroadcast::PickTxForSend(const NodeId& wil
 {
     LOCK(m_mutex);
 
+    if (GetSendStatusByNode(will_send_to_nodeid).has_value()) { // nodeid reuse, shouldn't send >1 tx to a given node
+        Assume(false);
+        return std::nullopt;
+    }
+
+    auto pending_transactions{m_transactions | std::views::filter([this](const auto& entry) { return IsPending(entry.second); })};
     const auto it{std::ranges::max_element(
-            m_transactions,
+            pending_transactions,
             [](const auto& a, const auto& b) { return a < b; },
             [](const auto& el) { return DerivePriority(el.second.send_statuses); })};
 
-    if (it != m_transactions.end()) {
+    if (it != pending_transactions.end()) {
         auto& [tx, state]{*it};
         state.send_statuses.emplace_back(will_send_to_nodeid, will_send_to_address, NodeClock::now());
         return tx;
@@ -83,7 +102,7 @@ bool PrivateBroadcast::HavePendingTransactions()
     EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
 {
     LOCK(m_mutex);
-    return !m_transactions.empty();
+    return std::ranges::any_of(m_transactions, [this](const auto& entry) { return IsPending(entry.second); });
 }
 
 std::vector<CTransactionRef> PrivateBroadcast::GetStale() const
@@ -93,6 +112,7 @@ std::vector<CTransactionRef> PrivateBroadcast::GetStale() const
     const auto now{NodeClock::now()};
     std::vector<CTransactionRef> stale;
     for (const auto& [tx, state] : m_transactions) {
+        if (!IsPending(state)) continue;
         const Priority p{DerivePriority(state.send_statuses)};
         if (p.num_confirmed == 0) {
             if (state.time_added < now - INITIAL_STALE_DURATION) stale.push_back(tx);
@@ -116,12 +136,18 @@ std::vector<PrivateBroadcast::TxBroadcastInfo> PrivateBroadcast::GetBroadcastInf
         for (const auto& status : state.send_statuses) {
             peers.emplace_back(PeerSendInfo{.address = status.address, .sent = status.picked, .received = status.confirmed});
         }
-        entries.emplace_back(TxBroadcastInfo{.tx = tx, .time_added = state.time_added, .peers = std::move(peers)});
+        const size_t attempts_remaining{m_max_send_attempts - std::min(state.send_statuses.size(), m_max_send_attempts)};
+        entries.emplace_back(TxBroadcastInfo{.tx = tx, .time_added = state.time_added, .attempts_remaining = attempts_remaining, .peers = std::move(peers)});
     }
 
     return entries;
 }
 
+bool PrivateBroadcast::IsPending(const TxSendStatus& status) const
+{
+    return status.send_statuses.size() < m_max_send_attempts;
+}
+
 PrivateBroadcast::Priority PrivateBroadcast::DerivePriority(const std::vector<SendStatus>& sent_to)
 {
     Priority p;
diff --git a/depend/bitcoin/src/private_broadcast.h b/depend/bitcoin/src/private_broadcast.h
index b53a2cfb..f3ba6ef4 100644
--- a/depend/bitcoin/src/private_broadcast.h
+++ b/depend/bitcoin/src/private_broadcast.h
@@ -38,6 +38,23 @@ class PrivateBroadcast
     /// after it is broadcast, then we consider it stale / for rebroadcasting.
     static constexpr auto STALE_DURATION{1min};
 
+    /// Maximum number of transactions tracked simultaneously.
+    /// Additions that would exceed this are rejected (see Add()).
+    static constexpr size_t MAX_TRANSACTIONS{10'000};
+
+    /// Maximum number of send attempts for a transaction. Once this limit is
+    /// reached, the transaction remains tracked but is not sent again unless
+    /// explicitly re-added.
+    static constexpr size_t MAX_SEND_ATTEMPTS{1'000};
+
+    /// @param[in] max_transactions Cap on the number of simultaneously tracked
+    /// transactions. Defaults to MAX_TRANSACTIONS.
+    /// @param[in] max_send_attempts Cap on the number of send attempts per
+    /// transaction. Defaults to MAX_SEND_ATTEMPTS.
+    explicit PrivateBroadcast(size_t max_transactions = MAX_TRANSACTIONS,
+                              size_t max_send_attempts = MAX_SEND_ATTEMPTS)
+        : m_max_transactions{max_transactions}, m_max_send_attempts{max_send_attempts} {}
+
     struct PeerSendInfo {
         CService address;
         NodeClock::time_point sent;
@@ -47,16 +64,30 @@ class PrivateBroadcast
     struct TxBroadcastInfo {
         CTransactionRef tx;
         NodeClock::time_point time_added;
+        /// Number of additional send attempts allowed for this transaction (0 if exhausted).
+        size_t attempts_remaining;
         std::vector<PeerSendInfo> peers;
     };
 
+    /// Outcome of Add().
+    enum class AddResult {
+        //! The transaction was newly added or reset after exhausting its send attempts.
+        Added,
+        //! The transaction was already present with send attempts remaining; no change.
+        AlreadyPresent,
+        //! Rejected: the queue is already at MAX_TRANSACTIONS.
+        QueueFull,
+    };
+
     /**
-     * Add a transaction to the storage.
+     * Add a transaction to the storage, or reset an exhausted transaction so it
+     * can be broadcast again.
      * @param[in] tx The transaction to add.
-     * @retval true The transaction was added.
-     * @retval false The transaction was already present.
+     * @return Whether the transaction was newly added or reset, was already
+     * present with send attempts remaining, or was rejected because the queue is
+     * full (see AddResult).
      */
-    bool Add(const CTransactionRef& tx)
+    [[nodiscard]] AddResult Add(const CTransactionRef& tx)
         EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
 
     /**
@@ -73,10 +104,13 @@ class PrivateBroadcast
      * Pick the transaction with the fewest send attempts, and confirmations,
      * and oldest send/confirm times.
      * @param[in] will_send_to_nodeid Will remember that the returned transaction
-     * was picked for sending to this node.
+     * was picked for sending to this node. Calling this method more than once with
+     * the same `will_send_to_nodeid` is not allowed because sending more than one
+     * transaction to one node would be a privacy leak.
      * @param[in] will_send_to_address Address of the peer to which this transaction
      * will be sent.
-     * @return Most urgent transaction or nullopt if there are no transactions.
+     * @return Most urgent transaction or nullopt if there are no transactions
+     * with send attempts remaining.
      */
     std::optional<CTransactionRef> PickTxForSend(const NodeId& will_send_to_nodeid, const CService& will_send_to_address)
         EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
@@ -106,13 +140,14 @@ class PrivateBroadcast
         EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
 
     /**
-     * Check if there are transactions that need to be broadcast.
+     * Check if there are transactions with send attempts remaining.
      */
     bool HavePendingTransactions()
         EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
 
     /**
-     * Get the transactions that have not been broadcast recently.
+     * Get the transactions that have not been broadcast recently and have send
+     * attempts remaining.
      */
     std::vector<CTransactionRef> GetStale() const
         EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
@@ -191,9 +226,14 @@ class PrivateBroadcast
     std::optional<TxAndSendStatusForNode> GetSendStatusByNode(const NodeId& nodeid)
         EXCLUSIVE_LOCKS_REQUIRED(m_mutex);
     struct TxSendStatus {
-        const NodeClock::time_point time_added{NodeClock::now()};
+        NodeClock::time_point time_added{NodeClock::now()};
         std::vector<SendStatus> send_statuses;
     };
+    bool IsPending(const TxSendStatus& status) const;
+    /// Cap on the number of simultaneously tracked transactions (see Add()).
+    const size_t m_max_transactions;
+    /// Cap on the number of send attempts per transaction (see PickTxForSend()).
+    const size_t m_max_send_attempts;
     mutable Mutex m_mutex;
     std::unordered_map<CTransactionRef, TxSendStatus, CTransactionRefHash, CTransactionRefComp>
         m_transactions GUARDED_BY(m_mutex);
diff --git a/depend/bitcoin/src/protocol.h b/depend/bitcoin/src/protocol.h
index 8ed90dd3..0fd3c592 100644
--- a/depend/bitcoin/src/protocol.h
+++ b/depend/bitcoin/src/protocol.h
@@ -264,6 +264,10 @@ inline constexpr const char* WTXIDRELAY{"wtxidrelay"};
  * txreconciliation, as described by BIP 330.
  */
 inline constexpr const char* SENDTXRCNCL{"sendtxrcncl"};
+/**
+ * BIP 434 Peer feature negotiation
+ */
+inline constexpr const char* FEATURE{"feature"};
 }; // namespace NetMsgType
 
 /** All known message types (see above). Keep this in the same order as the list of messages above. */
@@ -303,8 +307,16 @@ inline const std::array ALL_NET_MESSAGE_TYPES{std::to_array<std::string>({
     NetMsgType::CFCHECKPT,
     NetMsgType::WTXIDRELAY,
     NetMsgType::SENDTXRCNCL,
+    NetMsgType::FEATURE,
 })};
 
+inline constexpr size_t MAX_FEATUREID_LENGTH{80};
+inline constexpr size_t MAX_FEATUREDATA_LENGTH{512};
+
+namespace NetMsgFeature {
+//inline constexpr std::string_view FOO{"BIP-FOO"};
+}
+
 /** nServices flags */
 enum ServiceFlags : uint64_t {
     // NOTE: When adding here, be sure to update serviceFlagToStr too
@@ -353,6 +365,14 @@ std::vector<std::string> serviceFlagsToStr(uint64_t flags);
  */
 constexpr ServiceFlags SeedsServiceFlags() { return ServiceFlags(NODE_NETWORK | NODE_WITNESS); }
 
+/**
+ * Service flags we assume for addresses obtained from the DNS seeds and the
+ * fixed seeds, which don't come with service flags attached.
+ * BIP324 support can be safely assumed because the vast majority of listening nodes signals NODE_P2P_V2, and if the
+ * assumption is wrong for a given peer we simply reconnect using v1 transport.
+ */
+constexpr ServiceFlags SeedsAssumedServiceFlags() { return ServiceFlags(SeedsServiceFlags() | NODE_P2P_V2); }
+
 /**
  * Checks if a peer with the given service flags may be capable of having a
  * robust address-storage DB.
@@ -467,8 +487,8 @@ class CAddress : public CService
 };
 
 /** getdata message type flags */
-const uint32_t MSG_WITNESS_FLAG = 1 << 30;
-const uint32_t MSG_TYPE_MASK = 0xffffffff >> 2;
+inline constexpr uint32_t MSG_WITNESS_FLAG = 1 << 30;
+inline constexpr uint32_t MSG_TYPE_MASK = 0xffffffff >> 2;
 
 /** getdata / inv message types.
  * These numbers are defined by the protocol. When adding a new value, be sure
diff --git a/depend/bitcoin/src/psbt.cpp b/depend/bitcoin/src/psbt.cpp
index cfc720b0..141d0d51 100644
--- a/depend/bitcoin/src/psbt.cpp
+++ b/depend/bitcoin/src/psbt.cpp
@@ -7,35 +7,56 @@
 #include <common/types.h>
 #include <node/types.h>
 #include <policy/policy.h>
+#include <primitives/transaction.h>
 #include <script/signingprovider.h>
 #include <util/check.h>
+#include <util/result.h>
 #include <util/strencodings.h>
 
 using common::PSBTError;
 
-PartiallySignedTransaction::PartiallySignedTransaction(const CMutableTransaction& tx) : tx(tx)
+PartiallySignedTransaction::PartiallySignedTransaction(const CMutableTransaction& tx, uint32_t version) : m_version(version)
 {
-    inputs.resize(tx.vin.size());
-    outputs.resize(tx.vout.size());
+    assert(m_version == 0 || m_version == 2);
+
+    tx_version = tx.version;
+    fallback_locktime = tx.nLockTime;
+    inputs.reserve(tx.vin.size());
+    for (const CTxIn& input : tx.vin) {
+        inputs.emplace_back(GetVersion(), input.prevout.hash, input.prevout.n, input.nSequence);
+    }
+    outputs.reserve(tx.vout.size());
+    for (const CTxOut& output : tx.vout) {
+        outputs.emplace_back(GetVersion(), output.nValue, output.scriptPubKey);
+    }
 }
 
 bool PartiallySignedTransaction::IsNull() const
 {
-    return !tx && inputs.empty() && outputs.empty() && unknown.empty();
+    return inputs.empty() && outputs.empty() && unknown.empty();
 }
 
 bool PartiallySignedTransaction::Merge(const PartiallySignedTransaction& psbt)
 {
     // Prohibited to merge two PSBTs over different transactions
-    if (tx->GetHash() != psbt.tx->GetHash()) {
+    std::optional<Txid> this_id = GetUniqueID();
+    std::optional<Txid> psbt_id = psbt.GetUniqueID();
+    if (!this_id || !psbt_id || this_id != psbt_id) {
+        return false;
+    }
+    if (GetVersion() != psbt.GetVersion()) {
         return false;
     }
 
     for (unsigned int i = 0; i < inputs.size(); ++i) {
-        inputs[i].Merge(psbt.inputs[i]);
+        if (!inputs[i].Merge(psbt.inputs[i])) {
+            return false;
+        }
     }
     for (unsigned int i = 0; i < outputs.size(); ++i) {
-        outputs[i].Merge(psbt.outputs[i]);
+        if (!outputs[i].Merge(psbt.outputs[i])) {
+            return false;
+        }
     }
     for (auto& xpub_pair : psbt.m_xpubs) {
         if (!m_xpubs.contains(xpub_pair.first)) {
@@ -44,51 +65,230 @@ bool PartiallySignedTransaction::Merge(const PartiallySignedTransaction& psbt)
             m_xpubs[xpub_pair.first].insert(xpub_pair.second.begin(), xpub_pair.second.end());
         }
     }
+    if (fallback_locktime == std::nullopt && psbt.fallback_locktime != std::nullopt) fallback_locktime = psbt.fallback_locktime;
+
+    // Set m_tx_modifiable only if either PSBT had it set
+    if (m_tx_modifiable.has_value() || psbt.m_tx_modifiable.has_value()) {
+        // In general, we AND the modifiable flags
+        std::bitset<8> this_modifiable = m_tx_modifiable.value_or(0);
+        std::bitset<8> psbt_modifiable = psbt.m_tx_modifiable.value_or(0);
+        std::bitset<8> final_modifiable = this_modifiable & psbt_modifiable;
+        // SIGHASH_SINGLE Modifiable (bit 2) needs to be bitwise OR'd
+        final_modifiable.set(2, this_modifiable[2] || psbt_modifiable[2]);
+
+        m_tx_modifiable = final_modifiable;
+    }
+
+    m_proprietary.insert(psbt.m_proprietary.begin(), psbt.m_proprietary.end());
     unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
 
     return true;
 }
 
-bool PartiallySignedTransaction::AddInput(const CTxIn& txin, PSBTInput& psbtin)
+std::optional<uint32_t> PartiallySignedTransaction::ComputeTimeLock() const
+{
+    if (GetVersion() >= 2) {
+        std::optional<uint32_t> time_lock{0};
+        std::optional<uint32_t> height_lock{0};
+        for (const PSBTInput& input : inputs) {
+            if (input.time_locktime.has_value() && !input.height_locktime.has_value()) {
+                height_lock.reset(); // Transaction can no longer have a height locktime
+                if (!time_lock.has_value()) {
+                    return std::nullopt;
+                }
+            } else if (!input.time_locktime.has_value() && input.height_locktime.has_value()) {
+                time_lock.reset(); // Transaction can no longer have a time locktime
+                if (!height_lock.has_value()) {
+                    return std::nullopt;
+                }
+            }
+            if (input.time_locktime && time_lock.has_value()) {
+                time_lock = std::max(time_lock, input.time_locktime);
+            }
+            if (input.height_locktime && height_lock.has_value()) {
+                height_lock = std::max(height_lock, input.height_locktime);
+            }
+        }
+        if (height_lock.has_value() && *height_lock > 0) {
+            return *height_lock;
+        }
+        if (time_lock.has_value() && *time_lock > 0) {
+            return *time_lock;
+        }
+    }
+    return fallback_locktime.value_or(0);
+}
+
+std::optional<CMutableTransaction> PartiallySignedTransaction::GetUnsignedTx() const
+{
+    CMutableTransaction mtx;
+    mtx.version = tx_version;
+    std::optional<uint32_t> locktime = ComputeTimeLock();
+    if (!locktime) {
+        return std::nullopt;
+    }
+    mtx.nLockTime = *locktime;
+    uint32_t max_sequence = CTxIn::SEQUENCE_FINAL;
+    for (const PSBTInput& input : inputs) {
+        CTxIn txin;
+        txin.prevout.hash = input.prev_txid;
+        txin.prevout.n = input.prev_out;
+        txin.nSequence = input.sequence.value_or(max_sequence);
+        mtx.vin.push_back(txin);
+    }
+    for (const PSBTOutput& output : outputs) {
+        CTxOut txout;
+        txout.nValue = output.amount;
+        txout.scriptPubKey = output.script;
+        mtx.vout.push_back(txout);
+    }
+    return mtx;
+}
+
+std::optional<Txid> PartiallySignedTransaction::GetUniqueID() const
 {
-    if (std::find(tx->vin.begin(), tx->vin.end(), txin) != tx->vin.end()) {
+    // Get the unsigned transaction
+    std::optional<CMutableTransaction> mtx = GetUnsignedTx();
+    if (!mtx) {
+        return std::nullopt;
+    }
+    if (GetVersion() >= 2) {
+        for (CTxIn& txin : mtx->vin) {
+            txin.nSequence = 0;
+        }
+    }
+    return mtx->GetHash();
+}
+
+bool PartiallySignedTransaction::AddInput(const PSBTInput& psbtin)
+{
+    // The input being added must be for this PSBT's version
+    if (psbtin.GetVersion() != GetVersion()) {
+        return false;
+    }
+
+    // Prevent duplicate inputs
+    if (std::find_if(inputs.begin(), inputs.end(),
+        [psbtin](const PSBTInput& psbt) {
+            return psbt.prev_txid == psbtin.prev_txid && psbt.prev_out == psbtin.prev_out;
+        }
+    ) != inputs.end()) {
+        return false;
+    }
+
+    if (GetVersion() < 2) {
+        // This is a v0 psbt, so do the v0 AddInput
+        inputs.push_back(psbtin);
+        inputs.back().partial_sigs.clear();
+        inputs.back().final_script_sig.clear();
+        inputs.back().final_script_witness.SetNull();
+        return true;
+    }
+
+    // Check inputs modifiable flag
+    if (!m_tx_modifiable.has_value() || !m_tx_modifiable->test(0)) {
         return false;
     }
-    tx->vin.push_back(txin);
-    psbtin.partial_sigs.clear();
-    psbtin.final_script_sig.clear();
-    psbtin.final_script_witness.SetNull();
+
+    // Determine if we need to iterate the inputs.
+    // For now, we only do this if the new input has a required time lock.
+    // BIP 370 states that we should also do this if m_tx_modifiable's bit 2 is set
+    // (Has SIGHASH_SINGLE flag) but since we are only adding inputs at the end of the vector,
+    // we don't care about that.
+    bool iterate_inputs = psbtin.time_locktime != std::nullopt || psbtin.height_locktime != std::nullopt;
+    if (iterate_inputs) {
+        std::optional<uint32_t> old_timelock = ComputeTimeLock();
+        if (!old_timelock) {
+            return false;
+        }
+
+        std::optional<uint32_t> time_lock = psbtin.time_locktime;
+        std::optional<uint32_t> height_lock = psbtin.height_locktime;
+        bool has_sigs = false;
+        for (const PSBTInput& input : inputs) {
+            if (input.time_locktime.has_value() && !input.height_locktime.has_value()) {
+                height_lock.reset(); // Transaction can no longer have a height locktime
+                if (time_lock == std::nullopt) {
+                    return false;
+                }
+            } else if (!input.time_locktime.has_value() && input.height_locktime.has_value()) {
+                time_lock.reset(); // Transaction can no longer have a time locktime
+                if (height_lock == std::nullopt) {
+                    return false;
+                }
+            }
+            if (input.time_locktime && time_lock.has_value()) {
+                time_lock = std::max(time_lock, input.time_locktime);
+            }
+            if (input.height_locktime && height_lock.has_value()) {
+                height_lock = std::max(height_lock, input.height_locktime);
+            }
+            if (input.HasSignatures()) {
+                has_sigs = true;
+            }
+        }
+        uint32_t new_timelock = fallback_locktime.value_or(0);
+        if (height_lock.has_value() && *height_lock > 0) {
+            new_timelock = *height_lock;
+        } else if (time_lock.has_value() && *time_lock > 0) {
+            new_timelock = *time_lock;
+        }
+        if (has_sigs && *old_timelock != new_timelock) {
+            return false;
+        }
+    }
+
+    // Add the input to the end
     inputs.push_back(psbtin);
     return true;
 }
 
-bool PartiallySignedTransaction::AddOutput(const CTxOut& txout, const PSBTOutput& psbtout)
+bool PartiallySignedTransaction::AddOutput(const PSBTOutput& psbtout)
 {
-    tx->vout.push_back(txout);
+    // The output being added must be for this PSBT's version
+    if (psbtout.GetVersion() != GetVersion()) {
+        return false;
+    }
+
+    if (GetVersion() < 2) {
+        // This is a v0 psbt, do the v0 AddOutput
+        outputs.push_back(psbtout);
+        return true;
+    }
+
+    // No global tx, must be PSBTv2
+    // Check outputs are modifiable
+    if (!m_tx_modifiable.has_value() || !m_tx_modifiable->test(1)) {
+        return false;
+    }
     outputs.push_back(psbtout);
+
     return true;
 }
 
-bool PartiallySignedTransaction::GetInputUTXO(CTxOut& utxo, int input_index) const
+bool PSBTInput::GetUTXO(CTxOut& utxo) const
 {
-    const PSBTInput& input = inputs[input_index];
-    uint32_t prevout_index = tx->vin[input_index].prevout.n;
-    if (input.non_witness_utxo) {
-        if (prevout_index >= input.non_witness_utxo->vout.size()) {
+    if (non_witness_utxo) {
+        if (prev_out >= non_witness_utxo->vout.size()) {
             return false;
         }
-        if (input.non_witness_utxo->GetHash() != tx->vin[input_index].prevout.hash) {
+        if (non_witness_utxo->GetHash() != prev_txid) {
             return false;
         }
-        utxo = input.non_witness_utxo->vout[prevout_index];
-    } else if (!input.witness_utxo.IsNull()) {
-        utxo = input.witness_utxo;
+        utxo = non_witness_utxo->vout[prev_out];
+    } else if (!witness_utxo.IsNull()) {
+        utxo = witness_utxo;
     } else {
         return false;
     }
     return true;
 }
 
+COutPoint PSBTInput::GetOutPoint() const
+{
+    return COutPoint(prev_txid, prev_out);
+}
+
 bool PSBTInput::IsNull() const
 {
     return !non_witness_utxo && witness_utxo.IsNull() && partial_sigs.empty() && unknown.empty() && hd_keypaths.empty() && redeem_script.empty() && witness_script.empty();
@@ -210,9 +410,21 @@ void PSBTInput::FromSignatureData(const SignatureData& sigdata)
     for (const auto& [agg_key_lh, psigs] : sigdata.musig2_partial_sigs) {
         m_musig2_partial_sigs[agg_key_lh].insert(psigs.begin(), psigs.end());
     }
+    for (const auto& [hash, preimage] : sigdata.ripemd160_preimages) {
+        ripemd160_preimages.emplace(std::vector<unsigned char>(hash.begin(), hash.end()), preimage);
+    }
+    for (const auto& [hash, preimage] : sigdata.sha256_preimages) {
+        sha256_preimages.emplace(std::vector<unsigned char>(hash.begin(), hash.end()), preimage);
+    }
+    for (const auto& [hash, preimage] : sigdata.hash160_preimages) {
+        hash160_preimages.emplace(std::vector<unsigned char>(hash.begin(), hash.end()), preimage);
+    }
+    for (const auto& [hash, preimage] : sigdata.hash256_preimages) {
+        hash256_preimages.emplace(std::vector<unsigned char>(hash.begin(), hash.end()), preimage);
+    }
 }
 
-void PSBTInput::Merge(const PSBTInput& input)
+bool PSBTInput::Merge(const PSBTInput& input)
 {
     if (!non_witness_utxo && input.non_witness_utxo) non_witness_utxo = input.non_witness_utxo;
     if (witness_utxo.IsNull() && !input.witness_utxo.IsNull()) {
@@ -225,6 +437,7 @@ void PSBTInput::Merge(const PSBTInput& input)
     hash160_preimages.insert(input.hash160_preimages.begin(), input.hash160_preimages.end());
     hash256_preimages.insert(input.hash256_preimages.begin(), input.hash256_preimages.end());
     hd_keypaths.insert(input.hd_keypaths.begin(), input.hd_keypaths.end());
+    m_proprietary.insert(input.m_proprietary.begin(), input.m_proprietary.end());
     unknown.insert(input.unknown.begin(), input.unknown.end());
     m_tap_script_sigs.insert(input.m_tap_script_sigs.begin(), input.m_tap_script_sigs.end());
     m_tap_scripts.insert(input.m_tap_scripts.begin(), input.m_tap_scripts.end());
@@ -244,6 +457,21 @@ void PSBTInput::Merge(const PSBTInput& input)
     for (const auto& [agg_key_lh, psigs] : input.m_musig2_partial_sigs) {
         m_musig2_partial_sigs[agg_key_lh].insert(psigs.begin(), psigs.end());
     }
+    if (sequence == std::nullopt && input.sequence != std::nullopt) sequence = input.sequence;
+    if (time_locktime == std::nullopt && input.time_locktime != std::nullopt) time_locktime = input.time_locktime;
+    if (height_locktime == std::nullopt && input.height_locktime != std::nullopt) height_locktime = input.height_locktime;
+
+    return true;
+}
+
+bool PSBTInput::HasSignatures() const
+{
+    return !final_script_sig.empty()
+           || !final_script_witness.IsNull()
+           || !partial_sigs.empty()
+           || !m_tap_key_sig.empty()
+           || !m_tap_script_sigs.empty()
+           || !m_musig2_partial_sigs.empty();
 }
 
 void PSBTOutput::FillSignatureData(SignatureData& sigdata) const
@@ -268,6 +496,7 @@ void PSBTOutput::FillSignatureData(SignatureData& sigdata) const
 
         sigdata.tr_spenddata.internal_key = m_tap_internal_key;
         sigdata.tr_spenddata.Merge(spenddata);
+        sigdata.tr_builder = builder;
     }
     for (const auto& [pubkey, leaf_origin] : m_tap_bip32_paths) {
         sigdata.taproot_misc_pubkeys.emplace(pubkey, leaf_origin);
@@ -304,9 +533,10 @@ bool PSBTOutput::IsNull() const
     return redeem_script.empty() && witness_script.empty() && hd_keypaths.empty() && unknown.empty();
 }
 
-void PSBTOutput::Merge(const PSBTOutput& output)
+bool PSBTOutput::Merge(const PSBTOutput& output)
 {
     hd_keypaths.insert(output.hd_keypaths.begin(), output.hd_keypaths.end());
+    m_proprietary.insert(output.m_proprietary.begin(), output.m_proprietary.end());
     unknown.insert(output.unknown.begin(), output.unknown.end());
     m_tap_bip32_paths.insert(output.m_tap_bip32_paths.begin(), output.m_tap_bip32_paths.end());
 
@@ -315,6 +545,8 @@ void PSBTOutput::Merge(const PSBTOutput& output)
     if (m_tap_internal_key.IsNull() && !output.m_tap_internal_key.IsNull()) m_tap_internal_key = output.m_tap_internal_key;
     if (m_tap_tree.empty() && !output.m_tap_tree.empty()) m_tap_tree = output.m_tap_tree;
     m_musig2_participants.insert(output.m_musig2_participants.begin(), output.m_musig2_participants.end());
+
+    return true;
 }
 
 bool PSBTInputSigned(const PSBTInput& input)
@@ -330,7 +562,7 @@ bool PSBTInputSignedAndVerified(const PartiallySignedTransaction& psbt, unsigned
 
     if (input.non_witness_utxo) {
         // If we're taking our information from a non-witness UTXO, verify that it matches the prevout.
-        COutPoint prevout = psbt.tx->vin[input_index].prevout;
+        COutPoint prevout = input.GetOutPoint();
         if (prevout.n >= input.non_witness_utxo->vout.size()) {
             return false;
         }
@@ -344,10 +576,15 @@ bool PSBTInputSignedAndVerified(const PartiallySignedTransaction& psbt, unsigned
         return false;
     }
 
+    std::optional<CMutableTransaction> unsigned_tx = psbt.GetUnsignedTx();
+    if (!unsigned_tx) {
+        return false;
+    }
+    const CMutableTransaction& tx = *unsigned_tx;
     if (txdata) {
-        return VerifyScript(input.final_script_sig, utxo.scriptPubKey, &input.final_script_witness, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker{&(*psbt.tx), input_index, utxo.nValue, *txdata, MissingDataBehavior::FAIL});
+        return VerifyScript(input.final_script_sig, utxo.scriptPubKey, &input.final_script_witness, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker{&tx, input_index, utxo.nValue, *txdata, MissingDataBehavior::FAIL});
     } else {
-        return VerifyScript(input.final_script_sig, utxo.scriptPubKey, &input.final_script_witness, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker{&(*psbt.tx), input_index, utxo.nValue, MissingDataBehavior::FAIL});
+        return VerifyScript(input.final_script_sig, utxo.scriptPubKey, &input.final_script_witness, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker{&tx, input_index, utxo.nValue, MissingDataBehavior::FAIL});
     }
 }
 
@@ -364,8 +601,11 @@ size_t CountPSBTUnsignedInputs(const PartiallySignedTransaction& psbt) {
 
 void UpdatePSBTOutput(const SigningProvider& provider, PartiallySignedTransaction& psbt, int index)
 {
-    CMutableTransaction& tx = *Assert(psbt.tx);
-    const CTxOut& out = tx.vout.at(index);
+    std::optional<CMutableTransaction> unsigned_tx = psbt.GetUnsignedTx();
+    if (!unsigned_tx) {
+        return;
+    }
+    const CTxOut& out = unsigned_tx->vout.at(index);
     PSBTOutput& psbt_out = psbt.outputs.at(index);
 
     // Fill a SignatureData with output info
@@ -375,6 +615,8 @@ void UpdatePSBTOutput(const SigningProvider& provider, PartiallySignedTransactio
     // Construct a would-be spend of this output, to update sigdata with.
     // Note that ProduceSignature is used to fill in metadata (not actual signatures),
     // so provider does not need to provide any private keys (it can be a HidingSigningProvider).
+    CMutableTransaction tx{};
+    tx.vin.emplace_back();
     MutableTransactionSignatureCreator creator(tx, /*input_idx=*/0, out.nValue, {.sighash_type = SIGHASH_ALL});
     ProduceSignature(provider, creator, out.scriptPubKey, sigdata);
 
@@ -382,13 +624,17 @@ void UpdatePSBTOutput(const SigningProvider& provider, PartiallySignedTransactio
     psbt_out.FromSignatureData(sigdata);
 }
 
-PrecomputedTransactionData PrecomputePSBTData(const PartiallySignedTransaction& psbt)
+std::optional<PrecomputedTransactionData> PrecomputePSBTData(const PartiallySignedTransaction& psbt)
 {
-    const CMutableTransaction& tx = *psbt.tx;
+    std::optional<CMutableTransaction> unsigned_tx = psbt.GetUnsignedTx();
+    if (!unsigned_tx) {
+        return std::nullopt;
+    }
+    const CMutableTransaction& tx = *unsigned_tx;
     bool have_all_spent_outputs = true;
-    std::vector<CTxOut> utxos(tx.vin.size());
-    for (size_t idx = 0; idx < tx.vin.size(); ++idx) {
-        if (!psbt.GetInputUTXO(utxos[idx], idx)) have_all_spent_outputs = false;
+    std::vector<CTxOut> utxos;
+    for (const PSBTInput& input : psbt.inputs) {
+        if (!input.GetUTXO(utxos.emplace_back())) have_all_spent_outputs = false;
     }
     PrecomputedTransactionData txdata;
     if (have_all_spent_outputs) {
@@ -402,7 +648,11 @@ PrecomputedTransactionData PrecomputePSBTData(const PartiallySignedTransaction&
 PSBTError SignPSBTInput(const SigningProvider& provider, PartiallySignedTransaction& psbt, int index, const PrecomputedTransactionData* txdata, const common::PSBTFillOptions& options,  SignatureData* out_sigdata)
 {
     PSBTInput& input = psbt.inputs.at(index);
-    const CMutableTransaction& tx = *psbt.tx;
+    std::optional<CMutableTransaction> unsigned_tx = psbt.GetUnsignedTx();
+    if (!unsigned_tx) {
+        return PSBTError::INVALID_TX;
+    }
+    const CMutableTransaction& tx = *unsigned_tx;
 
     if (PSBTInputSignedAndVerified(psbt, index, txdata)) {
         return PSBTError::OK;
@@ -418,7 +668,7 @@ PSBTError SignPSBTInput(const SigningProvider& provider, PartiallySignedTransact
 
     if (input.non_witness_utxo) {
         // If we're taking our information from a non-witness UTXO, verify that it matches the prevout.
-        COutPoint prevout = tx.vin[index].prevout;
+        COutPoint prevout = input.GetOutPoint();
         if (prevout.n >= input.non_witness_utxo->vout.size()) {
             return PSBTError::MISSING_INPUTS;
         }
@@ -555,8 +805,12 @@ bool FinalizePSBT(PartiallySignedTransaction& psbtx)
     //   PartiallySignedTransaction did not understand them), this will combine them into a final
     //   script.
     bool complete = true;
-    const PrecomputedTransactionData txdata = PrecomputePSBTData(psbtx);
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
+    std::optional<PrecomputedTransactionData> txdata_res = PrecomputePSBTData(psbtx);
+    if (!txdata_res) {
+        return false;
+    }
+    const PrecomputedTransactionData& txdata = *txdata_res;
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
         PSBTInput& input = psbtx.inputs.at(i);
         complete &= (SignPSBTInput(DUMMY_SIGNING_PROVIDER, psbtx, i, &txdata, {.sighash_type = input.sighash_type, .finalize = true}, /*out_sigdata=*/nullptr) == PSBTError::OK);
     }
@@ -572,7 +826,11 @@ bool FinalizeAndExtractPSBT(PartiallySignedTransaction& psbtx, CMutableTransacti
         return false;
     }
 
-    result = *psbtx.tx;
+    std::optional<CMutableTransaction> unsigned_tx = psbtx.GetUnsignedTx();
+    if (!unsigned_tx) {
+        return false;
+    }
+    result = *unsigned_tx;
     for (unsigned int i = 0; i < result.vin.size(); ++i) {
         result.vin[i].scriptSig = psbtx.inputs[i].final_script_sig;
         result.vin[i].scriptWitness = psbtx.inputs[i].final_script_witness;
@@ -580,17 +838,17 @@ bool FinalizeAndExtractPSBT(PartiallySignedTransaction& psbtx, CMutableTransacti
     return true;
 }
 
-bool CombinePSBTs(PartiallySignedTransaction& out, const std::vector<PartiallySignedTransaction>& psbtxs)
+std::optional<PartiallySignedTransaction> CombinePSBTs(const std::vector<PartiallySignedTransaction>& psbtxs)
 {
-    out = psbtxs[0]; // Copy the first one
+    PartiallySignedTransaction out = psbtxs[0]; // Copy the first one
 
     // Merge
     for (auto it = std::next(psbtxs.begin()); it != psbtxs.end(); ++it) {
         if (!out.Merge(*it)) {
-            return false;
+            return std::nullopt;
         }
     }
-    return true;
+    return out;
 }
 
 std::string PSBTRoleName(PSBTRole role) {
@@ -604,30 +862,27 @@ std::string PSBTRoleName(PSBTRole role) {
     assert(false);
 }
 
-bool DecodeBase64PSBT(PartiallySignedTransaction& psbt, const std::string& base64_tx, std::string& error)
+util::Result<PartiallySignedTransaction> DecodeBase64PSBT(const std::string& base64_tx)
 {
     auto tx_data = DecodeBase64(base64_tx);
     if (!tx_data) {
-        error = "invalid base64";
-        return false;
+        return util::Error{Untranslated("invalid base64")};
     }
-    return DecodeRawPSBT(psbt, MakeByteSpan(*tx_data), error);
+    return DecodeRawPSBT(MakeByteSpan(*tx_data));
 }
 
-bool DecodeRawPSBT(PartiallySignedTransaction& psbt, std::span<const std::byte> tx_data, std::string& error)
+util::Result<PartiallySignedTransaction> DecodeRawPSBT(std::span<const std::byte> tx_data)
 {
     SpanReader ss_data{tx_data};
     try {
-        ss_data >> psbt;
+        PartiallySignedTransaction psbt(deserialize, ss_data);
         if (!ss_data.empty()) {
-            error = "extra data after PSBT";
-            return false;
+            return util::Error{Untranslated("extra data after PSBT")};
         }
+        return psbt;
     } catch (const std::exception& e) {
-        error = e.what();
-        return false;
+        return util::Error{Untranslated(e.what())};
     }
-    return true;
 }
 
 uint32_t PartiallySignedTransaction::GetVersion() const
diff --git a/depend/bitcoin/src/psbt.h b/depend/bitcoin/src/psbt.h
index 6348bd15..bd9678a1 100644
--- a/depend/bitcoin/src/psbt.h
+++ b/depend/bitcoin/src/psbt.h
@@ -6,6 +6,7 @@
 #define BITCOIN_PSBT_H
 
 #include <common/types.h>
+#include <musig.h>
 #include <node/transaction.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
@@ -15,8 +16,11 @@
 #include <script/signingprovider.h>
 #include <span.h>
 #include <streams.h>
+#include <uint256.h>
+#include <util/result.h>
 
 #include <optional>
+#include <bitset>
 
 namespace node {
 enum class TransactionError;
@@ -25,59 +29,71 @@ enum class TransactionError;
 using common::PSBTError;
 
 // Magic bytes
-static constexpr uint8_t PSBT_MAGIC_BYTES[5] = {'p', 's', 'b', 't', 0xff};
+inline constexpr uint8_t PSBT_MAGIC_BYTES[5] = {'p', 's', 'b', 't', 0xff};
 
 // Global types
-static constexpr uint8_t PSBT_GLOBAL_UNSIGNED_TX = 0x00;
-static constexpr uint8_t PSBT_GLOBAL_XPUB = 0x01;
-static constexpr uint8_t PSBT_GLOBAL_VERSION = 0xFB;
-static constexpr uint8_t PSBT_GLOBAL_PROPRIETARY = 0xFC;
+inline constexpr uint8_t PSBT_GLOBAL_UNSIGNED_TX = 0x00;
+inline constexpr uint8_t PSBT_GLOBAL_XPUB = 0x01;
+inline constexpr uint8_t PSBT_GLOBAL_TX_VERSION = 0x02;
+inline constexpr uint8_t PSBT_GLOBAL_FALLBACK_LOCKTIME = 0x03;
+inline constexpr uint8_t PSBT_GLOBAL_INPUT_COUNT = 0x04;
+inline constexpr uint8_t PSBT_GLOBAL_OUTPUT_COUNT = 0x05;
+inline constexpr uint8_t PSBT_GLOBAL_TX_MODIFIABLE = 0x06;
+inline constexpr uint8_t PSBT_GLOBAL_VERSION = 0xFB;
+inline constexpr uint8_t PSBT_GLOBAL_PROPRIETARY = 0xFC;
 
 // Input types
-static constexpr uint8_t PSBT_IN_NON_WITNESS_UTXO = 0x00;
-static constexpr uint8_t PSBT_IN_WITNESS_UTXO = 0x01;
-static constexpr uint8_t PSBT_IN_PARTIAL_SIG = 0x02;
-static constexpr uint8_t PSBT_IN_SIGHASH = 0x03;
-static constexpr uint8_t PSBT_IN_REDEEMSCRIPT = 0x04;
-static constexpr uint8_t PSBT_IN_WITNESSSCRIPT = 0x05;
-static constexpr uint8_t PSBT_IN_BIP32_DERIVATION = 0x06;
-static constexpr uint8_t PSBT_IN_SCRIPTSIG = 0x07;
-static constexpr uint8_t PSBT_IN_SCRIPTWITNESS = 0x08;
-static constexpr uint8_t PSBT_IN_RIPEMD160 = 0x0A;
-static constexpr uint8_t PSBT_IN_SHA256 = 0x0B;
-static constexpr uint8_t PSBT_IN_HASH160 = 0x0C;
-static constexpr uint8_t PSBT_IN_HASH256 = 0x0D;
-static constexpr uint8_t PSBT_IN_TAP_KEY_SIG = 0x13;
-static constexpr uint8_t PSBT_IN_TAP_SCRIPT_SIG = 0x14;
-static constexpr uint8_t PSBT_IN_TAP_LEAF_SCRIPT = 0x15;
-static constexpr uint8_t PSBT_IN_TAP_BIP32_DERIVATION = 0x16;
-static constexpr uint8_t PSBT_IN_TAP_INTERNAL_KEY = 0x17;
-static constexpr uint8_t PSBT_IN_TAP_MERKLE_ROOT = 0x18;
-static constexpr uint8_t PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS = 0x1a;
-static constexpr uint8_t PSBT_IN_MUSIG2_PUB_NONCE = 0x1b;
-static constexpr uint8_t PSBT_IN_MUSIG2_PARTIAL_SIG = 0x1c;
-static constexpr uint8_t PSBT_IN_PROPRIETARY = 0xFC;
+inline constexpr uint8_t PSBT_IN_NON_WITNESS_UTXO = 0x00;
+inline constexpr uint8_t PSBT_IN_WITNESS_UTXO = 0x01;
+inline constexpr uint8_t PSBT_IN_PARTIAL_SIG = 0x02;
+inline constexpr uint8_t PSBT_IN_SIGHASH = 0x03;
+inline constexpr uint8_t PSBT_IN_REDEEMSCRIPT = 0x04;
+inline constexpr uint8_t PSBT_IN_WITNESSSCRIPT = 0x05;
+inline constexpr uint8_t PSBT_IN_BIP32_DERIVATION = 0x06;
+inline constexpr uint8_t PSBT_IN_SCRIPTSIG = 0x07;
+inline constexpr uint8_t PSBT_IN_SCRIPTWITNESS = 0x08;
+inline constexpr uint8_t PSBT_IN_RIPEMD160 = 0x0A;
+inline constexpr uint8_t PSBT_IN_SHA256 = 0x0B;
+inline constexpr uint8_t PSBT_IN_HASH160 = 0x0C;
+inline constexpr uint8_t PSBT_IN_HASH256 = 0x0D;
+inline constexpr uint8_t PSBT_IN_PREVIOUS_TXID = 0x0e;
+inline constexpr uint8_t PSBT_IN_OUTPUT_INDEX = 0x0f;
+inline constexpr uint8_t PSBT_IN_SEQUENCE = 0x10;
+inline constexpr uint8_t PSBT_IN_REQUIRED_TIME_LOCKTIME = 0x11;
+inline constexpr uint8_t PSBT_IN_REQUIRED_HEIGHT_LOCKTIME = 0x12;
+inline constexpr uint8_t PSBT_IN_TAP_KEY_SIG = 0x13;
+inline constexpr uint8_t PSBT_IN_TAP_SCRIPT_SIG = 0x14;
+inline constexpr uint8_t PSBT_IN_TAP_LEAF_SCRIPT = 0x15;
+inline constexpr uint8_t PSBT_IN_TAP_BIP32_DERIVATION = 0x16;
+inline constexpr uint8_t PSBT_IN_TAP_INTERNAL_KEY = 0x17;
+inline constexpr uint8_t PSBT_IN_TAP_MERKLE_ROOT = 0x18;
+inline constexpr uint8_t PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS = 0x1a;
+inline constexpr uint8_t PSBT_IN_MUSIG2_PUB_NONCE = 0x1b;
+inline constexpr uint8_t PSBT_IN_MUSIG2_PARTIAL_SIG = 0x1c;
+inline constexpr uint8_t PSBT_IN_PROPRIETARY = 0xFC;
 
 // Output types
-static constexpr uint8_t PSBT_OUT_REDEEMSCRIPT = 0x00;
-static constexpr uint8_t PSBT_OUT_WITNESSSCRIPT = 0x01;
-static constexpr uint8_t PSBT_OUT_BIP32_DERIVATION = 0x02;
-static constexpr uint8_t PSBT_OUT_TAP_INTERNAL_KEY = 0x05;
-static constexpr uint8_t PSBT_OUT_TAP_TREE = 0x06;
-static constexpr uint8_t PSBT_OUT_TAP_BIP32_DERIVATION = 0x07;
-static constexpr uint8_t PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS = 0x08;
-static constexpr uint8_t PSBT_OUT_PROPRIETARY = 0xFC;
+inline constexpr uint8_t PSBT_OUT_REDEEMSCRIPT = 0x00;
+inline constexpr uint8_t PSBT_OUT_WITNESSSCRIPT = 0x01;
+inline constexpr uint8_t PSBT_OUT_BIP32_DERIVATION = 0x02;
+inline constexpr uint8_t PSBT_OUT_AMOUNT = 0x03;
+inline constexpr uint8_t PSBT_OUT_SCRIPT = 0x04;
+inline constexpr uint8_t PSBT_OUT_TAP_INTERNAL_KEY = 0x05;
+inline constexpr uint8_t PSBT_OUT_TAP_TREE = 0x06;
+inline constexpr uint8_t PSBT_OUT_TAP_BIP32_DERIVATION = 0x07;
+inline constexpr uint8_t PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS = 0x08;
+inline constexpr uint8_t PSBT_OUT_PROPRIETARY = 0xFC;
 
 // The separator is 0x00. Reading this in means that the unserializer can interpret it
 // as a 0 length key which indicates that this is the separator. The separator has no value.
-static constexpr uint8_t PSBT_SEPARATOR = 0x00;
+inline constexpr uint8_t PSBT_SEPARATOR = 0x00;
 
 // BIP 174 does not specify a maximum file size, but we set a limit anyway
 // to prevent reading a stream indefinitely and running out of memory.
-const std::streamsize MAX_FILE_SIZE_PSBT = 100000000; // 100 MB
+inline constexpr std::streamsize MAX_FILE_SIZE_PSBT{100'000'000}; // 100 MB
 
 // PSBT version number
-static constexpr uint32_t PSBT_HIGHEST_VERSION = 0;
+inline constexpr uint32_t PSBT_HIGHEST_VERSION = 2;
 
 /** A structure for PSBT proprietary types */
 struct PSBTProprietary
@@ -158,9 +174,6 @@ void DeserializeHDKeypaths(Stream& s, const std::vector<unsigned char>& key, std
     if (!pubkey.IsFullyValid()) {
        throw std::ios_base::failure("Invalid pubkey");
     }
-    if (hd_keypaths.contains(pubkey)) {
-        throw std::ios_base::failure("Duplicate Key, pubkey derivation path already provided");
-    }
 
     KeyOriginInfo keypath;
     DeserializeHDKeypath(s, keypath);
@@ -257,9 +270,19 @@ void DeserializeMuSig2ParticipantDataIdentifier(Stream& skey, CPubKey& agg_pub,
     }
 }
 
+static inline void ExpectedKeySize(const std::string& key_name, const std::vector<unsigned char>& key, uint64_t expected_size) {
+    if (key.size() != expected_size) {
+        throw std::ios_base::failure(tfm::format("Size of key was not %d for the type %s", expected_size, key_name));
+    }
+}
+
 /** A structure for PSBTs which contain per-input information */
-struct PSBTInput
+class PSBTInput
 {
+private:
+    uint32_t m_psbt_version;
+
+public:
     CTransactionRef non_witness_utxo;
     CTxOut witness_utxo;
     CScript redeem_script;
@@ -273,6 +296,12 @@ struct PSBTInput
     std::map<uint160, std::vector<unsigned char>> hash160_preimages;
     std::map<uint256, std::vector<unsigned char>> hash256_preimages;
 
+    Txid prev_txid;
+    uint32_t prev_out;
+    std::optional<uint32_t> sequence;
+    std::optional<uint32_t> time_locktime;
+    std::optional<uint32_t> height_locktime;
+
     // Taproot fields
     std::vector<unsigned char> m_tap_key_sig;
     std::map<std::pair<XOnlyPubKey, uint256>, std::vector<unsigned char>> m_tap_script_sigs;
@@ -295,8 +324,37 @@ struct PSBTInput
     bool IsNull() const;
     void FillSignatureData(SignatureData& sigdata) const;
     void FromSignatureData(const SignatureData& sigdata);
-    void Merge(const PSBTInput& input);
-    PSBTInput() = default;
+    [[nodiscard]] bool Merge(const PSBTInput& input);
+    uint32_t GetVersion() const { return m_psbt_version; }
+    COutPoint GetOutPoint() const;
+    /**
+     * Retrieves the UTXO for this input
+     *
+     * @param[out] utxo The UTXO of this input
+     * @return Whether the UTXO could be retrieved
+     */
+    bool GetUTXO(CTxOut& utxo) const;
+    bool HasSignatures() const;
+
+    explicit PSBTInput(uint32_t psbt_version, const Txid& prev_txid, uint32_t prev_out, std::optional<uint32_t> sequence = std::nullopt)
+        : m_psbt_version(psbt_version),
+        prev_txid(prev_txid),
+        prev_out(prev_out),
+        sequence(sequence)
+    {
+        assert(m_psbt_version == 0 || m_psbt_version == 2);
+    }
+
+    // Construct a PSBTInput when the previous txid and output index are expected to be serialized
+    template <typename Stream>
+    explicit PSBTInput(deserialize_type, Stream& s, uint32_t psbt_version)
+        : m_psbt_version(psbt_version)
+    {
+        assert(m_psbt_version == 2);
+        Unserialize(s);
+    }
+
+    bool operator==(const PSBTInput&) const = default;
 
     template <typename Stream>
     inline void Serialize(Stream& s) const {
@@ -458,6 +516,29 @@ struct PSBTInput
             SerializeToVector(s, final_script_witness.stack);
         }
 
+        // Write PSBTv2 fields
+        if (m_psbt_version >= 2) {
+            // Write prev txid, vout, sequence, and lock times
+            SerializeToVector(s, CompactSizeWriter(PSBT_IN_PREVIOUS_TXID));
+            SerializeToVector(s, prev_txid);
+
+            SerializeToVector(s, CompactSizeWriter(PSBT_IN_OUTPUT_INDEX));
+            SerializeToVector(s, prev_out);
+
+            if (sequence != std::nullopt) {
+                SerializeToVector(s, CompactSizeWriter(PSBT_IN_SEQUENCE));
+                SerializeToVector(s, *sequence);
+            }
+            if (time_locktime != std::nullopt) {
+                SerializeToVector(s, CompactSizeWriter(PSBT_IN_REQUIRED_TIME_LOCKTIME));
+                SerializeToVector(s, *time_locktime);
+            }
+            if (height_locktime != std::nullopt) {
+                SerializeToVector(s, CompactSizeWriter(PSBT_IN_REQUIRED_HEIGHT_LOCKTIME));
+                SerializeToVector(s, *height_locktime);
+            }
+        }
+
         // Write proprietary things
         for (const auto& entry : m_proprietary) {
             s << entry.key;
@@ -478,6 +559,9 @@ struct PSBTInput
     inline void Unserialize(Stream& s) {
         // Used for duplicate key detection
         std::set<std::vector<unsigned char>> key_lookup;
+        // Cache whether PSBTv2 required fields were seen
+        bool found_prev_txid = false;
+        bool found_prev_out = false;
 
         // Read loop
         bool found_sep = false;
@@ -494,6 +578,11 @@ struct PSBTInput
                 break;
             }
 
+            // Duplicate keys are not permitted
+            if (!key_lookup.emplace(key).second) {
+                throw std::ios_base::failure(tfm::format("Duplicate Key, input key \"%s\" already provided", HexStr(key)));
+            }
+
             // "skey" is used so that "key" is unchanged after reading keytype below
             SpanReader skey{key};
             // keytype is of the format compact size uint at the beginning of "key"
@@ -504,21 +593,13 @@ struct PSBTInput
             switch(type) {
                 case PSBT_IN_NON_WITNESS_UTXO:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input non-witness utxo already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Non-witness utxo key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Non-witness UTXO", key, 1);
                     // Set the stream to unserialize with witness since this is always a valid network transaction
                     UnserializeFromVector(s, TX_WITH_WITNESS(non_witness_utxo));
                     break;
                 }
                 case PSBT_IN_WITNESS_UTXO:
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input witness utxo already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Witness utxo key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Witness UTXO", key, 1);
                     UnserializeFromVector(s, witness_utxo);
                     break;
                 case PSBT_IN_PARTIAL_SIG:
@@ -532,9 +613,6 @@ struct PSBTInput
                     if (!pubkey.IsFullyValid()) {
                        throw std::ios_base::failure("Invalid pubkey");
                     }
-                    if (partial_sigs.contains(pubkey.GetID())) {
-                        throw std::ios_base::failure("Duplicate Key, input partial signature for pubkey already provided");
-                    }
 
                     // Read in the signature from value
                     std::vector<unsigned char> sig;
@@ -550,32 +628,20 @@ struct PSBTInput
                     break;
                 }
                 case PSBT_IN_SIGHASH:
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input sighash type already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Sighash type key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Sighash Type", key, 1);
                     int sighash;
                     UnserializeFromVector(s, sighash);
                     sighash_type = sighash;
                     break;
                 case PSBT_IN_REDEEMSCRIPT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input redeemScript already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Input redeemScript key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input redeemScript", key, 1);
                     s >> redeem_script;
                     break;
                 }
                 case PSBT_IN_WITNESSSCRIPT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input witnessScript already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Input witnessScript key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input witnessScript", key, 1);
                     s >> witness_script;
                     break;
                 }
@@ -586,36 +652,22 @@ struct PSBTInput
                 }
                 case PSBT_IN_SCRIPTSIG:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input final scriptSig already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Final scriptSig key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Final scriptSig", key, 1);
                     s >> final_script_sig;
                     break;
                 }
                 case PSBT_IN_SCRIPTWITNESS:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input final scriptWitness already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Final scriptWitness key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Final scriptWitness", key, 1);
                     UnserializeFromVector(s, final_script_witness.stack);
                     break;
                 }
                 case PSBT_IN_RIPEMD160:
                 {
-                    // Make sure that the key is the size of a ripemd160 hash + 1
-                    if (key.size() != CRIPEMD160::OUTPUT_SIZE + 1) {
-                        throw std::ios_base::failure("Size of key was not the expected size for the type ripemd160 preimage");
-                    }
+                    ExpectedKeySize("Input RIPEMD160 Preimage", key, CRIPEMD160::OUTPUT_SIZE + 1);
                     // Read in the hash from key
                     std::vector<unsigned char> hash_vec(key.begin() + 1, key.end());
                     uint160 hash(hash_vec);
-                    if (ripemd160_preimages.contains(hash)) {
-                        throw std::ios_base::failure("Duplicate Key, input ripemd160 preimage already provided");
-                    }
 
                     // Read in the preimage from value
                     std::vector<unsigned char> preimage;
@@ -627,16 +679,10 @@ struct PSBTInput
                 }
                 case PSBT_IN_SHA256:
                 {
-                    // Make sure that the key is the size of a sha256 hash + 1
-                    if (key.size() != CSHA256::OUTPUT_SIZE + 1) {
-                        throw std::ios_base::failure("Size of key was not the expected size for the type sha256 preimage");
-                    }
+                    ExpectedKeySize("Input SHA256 Preimage", key, CSHA256::OUTPUT_SIZE + 1);
                     // Read in the hash from key
                     std::vector<unsigned char> hash_vec(key.begin() + 1, key.end());
                     uint256 hash(hash_vec);
-                    if (sha256_preimages.contains(hash)) {
-                        throw std::ios_base::failure("Duplicate Key, input sha256 preimage already provided");
-                    }
 
                     // Read in the preimage from value
                     std::vector<unsigned char> preimage;
@@ -648,16 +694,10 @@ struct PSBTInput
                 }
                 case PSBT_IN_HASH160:
                 {
-                    // Make sure that the key is the size of a hash160 hash + 1
-                    if (key.size() != CHash160::OUTPUT_SIZE + 1) {
-                        throw std::ios_base::failure("Size of key was not the expected size for the type hash160 preimage");
-                    }
+                    ExpectedKeySize("Input Hash160 Preimage", key, CHash160::OUTPUT_SIZE + 1);
                     // Read in the hash from key
                     std::vector<unsigned char> hash_vec(key.begin() + 1, key.end());
                     uint160 hash(hash_vec);
-                    if (hash160_preimages.contains(hash)) {
-                        throw std::ios_base::failure("Duplicate Key, input hash160 preimage already provided");
-                    }
 
                     // Read in the preimage from value
                     std::vector<unsigned char> preimage;
@@ -669,16 +709,10 @@ struct PSBTInput
                 }
                 case PSBT_IN_HASH256:
                 {
-                    // Make sure that the key is the size of a hash256 hash + 1
-                    if (key.size() != CHash256::OUTPUT_SIZE + 1) {
-                        throw std::ios_base::failure("Size of key was not the expected size for the type hash256 preimage");
-                    }
+                    ExpectedKeySize("Input Hash256 Preimage", key, CHash256::OUTPUT_SIZE + 1);
                     // Read in the hash from key
                     std::vector<unsigned char> hash_vec(key.begin() + 1, key.end());
                     uint256 hash(hash_vec);
-                    if (hash256_preimages.contains(hash)) {
-                        throw std::ios_base::failure("Duplicate Key, input hash256 preimage already provided");
-                    }
 
                     // Read in the preimage from value
                     std::vector<unsigned char> preimage;
@@ -688,13 +722,67 @@ struct PSBTInput
                     hash256_preimages.emplace(hash, std::move(preimage));
                     break;
                 }
-                case PSBT_IN_TAP_KEY_SIG:
+                case PSBT_IN_PREVIOUS_TXID:
+                {
+                    ExpectedKeySize("Input Previous TXID", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Previous txid is not allowed in PSBTv0");
+                    }
+                    UnserializeFromVector(s, prev_txid);
+                    found_prev_txid = true;
+                    break;
+                }
+                case PSBT_IN_OUTPUT_INDEX:
+                {
+                    ExpectedKeySize("Input Previous Output's Index", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Previous output's index is not allowed in PSBTv0");
+                    }
+                    UnserializeFromVector(s, prev_out);
+                    found_prev_out = true;
+                    break;
+                }
+                case PSBT_IN_SEQUENCE:
+                {
+                    ExpectedKeySize("Input Sequence", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Sequence is not allowed in PSBTv0");
+                    }
+                    sequence.emplace();
+                    UnserializeFromVector(s, *sequence);
+                    break;
+                }
+                case PSBT_IN_REQUIRED_TIME_LOCKTIME:
+                {
+                    ExpectedKeySize("Input Required Time Based Locktime", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Required time based locktime is not allowed in PSBTv0");
+                    }
+                    time_locktime.emplace();
+                    UnserializeFromVector(s, *time_locktime);
+                    if (*time_locktime < LOCKTIME_THRESHOLD) {
+                        throw std::ios_base::failure("Required time based locktime is invalid (less than 500000000)");
+                    }
+                    break;
+                }
+                case PSBT_IN_REQUIRED_HEIGHT_LOCKTIME:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input Taproot key signature already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Input Taproot key signature key is more than one byte type");
+                    ExpectedKeySize("Input Required Height Based Locktime", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Required height based locktime is not allowed in PSBTv0");
+                    }
+                    height_locktime.emplace();
+                    UnserializeFromVector(s, *height_locktime);
+                    if (*height_locktime >= LOCKTIME_THRESHOLD) {
+                        throw std::ios_base::failure("Required height based locktime is invalid (greater than or equal to 500000000)");
+                    } else if (*height_locktime == 0) {
+                        throw std::ios_base::failure("Required height based locktime is invalid (0)");
                     }
+                    break;
+                }
+                case PSBT_IN_TAP_KEY_SIG:
+                {
+                    ExpectedKeySize("Input Taproot Key Path Signature", key, 1);
                     s >> m_tap_key_sig;
                     if (m_tap_key_sig.size() < 64) {
                         throw std::ios_base::failure("Input Taproot key path signature is shorter than 64 bytes");
@@ -705,11 +793,7 @@ struct PSBTInput
                 }
                 case PSBT_IN_TAP_SCRIPT_SIG:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input Taproot script signature already provided");
-                    } else if (key.size() != 65) {
-                        throw std::ios_base::failure("Input Taproot script signature key is not 65 bytes");
-                    }
+                    ExpectedKeySize("Input Taproot Script Path Signature", key, 65);
                     SpanReader s_key{std::span{key}.subspan(1)};
                     XOnlyPubKey xonly;
                     uint256 hash;
@@ -727,10 +811,8 @@ struct PSBTInput
                 }
                 case PSBT_IN_TAP_LEAF_SCRIPT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input Taproot leaf script already provided");
-                    } else if (key.size() < 34) {
-                        throw std::ios_base::failure("Taproot leaf script key is not at least 34 bytes");
+                    if (key.size() < 34) {
+                        throw std::ios_base::failure("Input Taproot leaf script key is not at least 34 bytes");
                     } else if ((key.size() - 2) % 32 != 0) {
                         throw std::ios_base::failure("Input Taproot leaf script key's control block size is not valid");
                     }
@@ -747,11 +829,7 @@ struct PSBTInput
                 }
                 case PSBT_IN_TAP_BIP32_DERIVATION:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input Taproot BIP32 keypath already provided");
-                    } else if (key.size() != 33) {
-                        throw std::ios_base::failure("Input Taproot BIP32 keypath key is not at 33 bytes");
-                    }
+                    ExpectedKeySize("Input Taproot BIP32 Keypath", key, 33);
                     SpanReader s_key{std::span{key}.subspan(1)};
                     XOnlyPubKey xonly;
                     s_key >> xonly;
@@ -770,39 +848,25 @@ struct PSBTInput
                 }
                 case PSBT_IN_TAP_INTERNAL_KEY:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input Taproot internal key already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Input Taproot internal key key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Taproot Internal Key", key, 1);
                     UnserializeFromVector(s, m_tap_internal_key);
                     break;
                 }
                 case PSBT_IN_TAP_MERKLE_ROOT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input Taproot merkle root already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Input Taproot merkle root key is more than one byte type");
-                    }
+                    ExpectedKeySize("Input Taproot Merkle Root", key, 1);
                     UnserializeFromVector(s, m_tap_merkle_root);
                     break;
                 }
                 case PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input participant pubkeys for an aggregate key already provided");
-                    } else if (key.size() != CPubKey::COMPRESSED_SIZE + 1) {
-                        throw std::ios_base::failure("Input musig2 participants pubkeys aggregate key is not 34 bytes");
-                    }
+                    ExpectedKeySize("Input MuSig2 Participants Pubkeys", key, CPubKey::COMPRESSED_SIZE + 1);
                     DeserializeMuSig2ParticipantPubkeys(s, skey, m_musig2_participants, std::string{"Input"});
                     break;
                 }
                 case PSBT_IN_MUSIG2_PUB_NONCE:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input musig2 pubnonce already provided");
-                    } else if (key.size() != 2 * CPubKey::COMPRESSED_SIZE + 1 && key.size() != 2 * CPubKey::COMPRESSED_SIZE + CSHA256::OUTPUT_SIZE + 1) {
+                    if (key.size() != 2 * CPubKey::COMPRESSED_SIZE + 1 && key.size() != 2 * CPubKey::COMPRESSED_SIZE + CSHA256::OUTPUT_SIZE + 1) {
                         throw std::ios_base::failure("Input musig2 pubnonce key is not expected size of 67 or 99 bytes");
                     }
                     CPubKey agg_pub, part_pub;
@@ -820,9 +884,7 @@ struct PSBTInput
                 }
                 case PSBT_IN_MUSIG2_PARTIAL_SIG:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, input musig2 partial sig already provided");
-                    } else if (key.size() != 2 * CPubKey::COMPRESSED_SIZE + 1 && key.size() != 2 * CPubKey::COMPRESSED_SIZE + CSHA256::OUTPUT_SIZE + 1) {
+                    if (key.size() != 2 * CPubKey::COMPRESSED_SIZE + 1 && key.size() != 2 * CPubKey::COMPRESSED_SIZE + CSHA256::OUTPUT_SIZE + 1) {
                         throw std::ios_base::failure("Input musig2 partial sig key is not expected size of 67 or 99 bytes");
                     }
                     CPubKey agg_pub, part_pub;
@@ -842,18 +904,12 @@ struct PSBTInput
                     this_prop.subtype = ReadCompactSize(skey);
                     this_prop.key = key;
 
-                    if (m_proprietary.contains(this_prop)) {
-                        throw std::ios_base::failure("Duplicate Key, proprietary key already found");
-                    }
                     s >> this_prop.value;
                     m_proprietary.insert(this_prop);
                     break;
                 }
                 // Unknown stuff
                 default:
-                    if (unknown.contains(key)) {
-                        throw std::ios_base::failure("Duplicate Key, key for unknown value already provided");
-                    }
                     // Read in the value
                     std::vector<unsigned char> val_bytes;
                     s >> val_bytes;
@@ -865,32 +921,65 @@ struct PSBTInput
         if (!found_sep) {
             throw std::ios_base::failure("Separator is missing at the end of an input map");
         }
-    }
 
-    template <typename Stream>
-    PSBTInput(deserialize_type, Stream& s) {
-        Unserialize(s);
+        // Make sure required PSBTv2 fields are present
+        if (m_psbt_version >= 2) {
+            if (!found_prev_txid) {
+                throw std::ios_base::failure("Previous TXID is required in PSBTv2");
+            }
+            if (!found_prev_out) {
+                throw std::ios_base::failure("Previous output's index is required in PSBTv2");
+            }
+        }
     }
 };
 
 /** A structure for PSBTs which contains per output information */
-struct PSBTOutput
+class PSBTOutput
 {
+private:
+    uint32_t m_psbt_version;
+
+public:
     CScript redeem_script;
     CScript witness_script;
     std::map<CPubKey, KeyOriginInfo> hd_keypaths;
+
     XOnlyPubKey m_tap_internal_key;
     std::vector<std::tuple<uint8_t, uint8_t, std::vector<unsigned char>>> m_tap_tree;
     std::map<XOnlyPubKey, std::pair<std::set<uint256>, KeyOriginInfo>> m_tap_bip32_paths;
     std::map<CPubKey, std::vector<CPubKey>> m_musig2_participants;
+
     std::map<std::vector<unsigned char>, std::vector<unsigned char>> unknown;
     std::set<PSBTProprietary> m_proprietary;
 
+    CAmount amount;
+    CScript script;
+
     bool IsNull() const;
     void FillSignatureData(SignatureData& sigdata) const;
     void FromSignatureData(const SignatureData& sigdata);
-    void Merge(const PSBTOutput& output);
-    PSBTOutput() = default;
+    [[nodiscard]] bool Merge(const PSBTOutput& output);
+    uint32_t GetVersion() const { return m_psbt_version; }
+
+    explicit PSBTOutput(uint32_t psbt_version, CAmount amount, const CScript& script)
+        : m_psbt_version(psbt_version),
+        amount(amount),
+        script(script)
+    {
+        assert(m_psbt_version == 0 || m_psbt_version == 2);
+    }
+
+    // Construct a PSBTOutput when the amount and script are expected to be serialized
+    template <typename Stream>
+    explicit PSBTOutput(deserialize_type, Stream& s, uint32_t psbt_version)
+        : m_psbt_version(psbt_version)
+    {
+        assert(m_psbt_version == 2);
+        Unserialize(s);
+    }
+
+    bool operator==(const PSBTOutput&) const = default;
 
     template <typename Stream>
     inline void Serialize(Stream& s) const {
@@ -909,6 +998,15 @@ struct PSBTOutput
         // Write any hd keypaths
         SerializeHDKeypaths(s, hd_keypaths, CompactSizeWriter(PSBT_OUT_BIP32_DERIVATION));
 
+        if (m_psbt_version >= 2) {
+            // Write amount and spk
+            SerializeToVector(s, CompactSizeWriter(PSBT_OUT_AMOUNT));
+            SerializeToVector(s, amount);
+
+            SerializeToVector(s, CompactSizeWriter(PSBT_OUT_SCRIPT));
+            s << script;
+        }
+
         // Write proprietary things
         for (const auto& entry : m_proprietary) {
             s << entry.key;
@@ -970,6 +1068,9 @@ struct PSBTOutput
     inline void Unserialize(Stream& s) {
         // Used for duplicate key detection
         std::set<std::vector<unsigned char>> key_lookup;
+        // Cache whether PSBTv2 required fields are found
+        bool found_amount = false;
+        bool found_script = false;
 
         // Read loop
         bool found_sep = false;
@@ -986,6 +1087,11 @@ struct PSBTOutput
                 break;
             }
 
+            // Duplicate keys are not permitted
+            if (!key_lookup.emplace(key).second) {
+                throw std::ios_base::failure(tfm::format("Duplicate Key, output key \"%s\" already provided", HexStr(key)));
+            }
+
             // "skey" is used so that "key" is unchanged after reading keytype below
             SpanReader skey{key};
             // keytype is of the format compact size uint at the beginning of "key"
@@ -996,21 +1102,13 @@ struct PSBTOutput
             switch(type) {
                 case PSBT_OUT_REDEEMSCRIPT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, output redeemScript already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Output redeemScript key is more than one byte type");
-                    }
+                    ExpectedKeySize("Output redeemScript", key, 1);
                     s >> redeem_script;
                     break;
                 }
                 case PSBT_OUT_WITNESSSCRIPT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, output witnessScript already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Output witnessScript key is more than one byte type");
-                    }
+                    ExpectedKeySize("Output witnessScript", key, 1);
                     s >> witness_script;
                     break;
                 }
@@ -1019,23 +1117,35 @@ struct PSBTOutput
                     DeserializeHDKeypaths(s, key, hd_keypaths);
                     break;
                 }
-                case PSBT_OUT_TAP_INTERNAL_KEY:
+                case PSBT_OUT_AMOUNT:
+                {
+                    ExpectedKeySize("Output Amount", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Output amount is not allowed in PSBTv0");
+                    }
+                    UnserializeFromVector(s, amount);
+                    found_amount = true;
+                    break;
+                }
+                case PSBT_OUT_SCRIPT:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, output Taproot internal key already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Output Taproot internal key key is more than one byte type");
+                    ExpectedKeySize("Output Script", key, 1);
+                    if (m_psbt_version < 2) {
+                        throw std::ios_base::failure("Output script is not allowed in PSBTv0");
                     }
+                    s >> script;
+                    found_script = true;
+                    break;
+                }
+                case PSBT_OUT_TAP_INTERNAL_KEY:
+                {
+                    ExpectedKeySize("Output Taproot Internal Key", key, 1);
                     UnserializeFromVector(s, m_tap_internal_key);
                     break;
                 }
                 case PSBT_OUT_TAP_TREE:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, output Taproot tree already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Output Taproot tree key is more than one byte type");
-                    }
+                    ExpectedKeySize("Output Taproot Tree Key", key, 1);
                     std::vector<unsigned char> tree_v;
                     s >> tree_v;
                     SpanReader s_tree{tree_v};
@@ -1066,11 +1176,7 @@ struct PSBTOutput
                 }
                 case PSBT_OUT_TAP_BIP32_DERIVATION:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, output Taproot BIP32 keypath already provided");
-                    } else if (key.size() != 33) {
-                        throw std::ios_base::failure("Output Taproot BIP32 keypath key is not at 33 bytes");
-                    }
+                    ExpectedKeySize("Output Taproot BIP32 Keypath", key, 33);
                     XOnlyPubKey xonly(uint256(std::span<uint8_t>(key).last(32)));
                     std::set<uint256> leaf_hashes;
                     uint64_t value_len = ReadCompactSize(s);
@@ -1087,11 +1193,7 @@ struct PSBTOutput
                 }
                 case PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, output participant pubkeys for an aggregate key already provided");
-                    } else if (key.size() != CPubKey::COMPRESSED_SIZE + 1) {
-                        throw std::ios_base::failure("Output musig2 participants pubkeys aggregate key is not 34 bytes");
-                    }
+                    ExpectedKeySize("Output MuSig2 Participants Pubkeys", key, CPubKey::COMPRESSED_SIZE + 1);
                     DeserializeMuSig2ParticipantPubkeys(s, skey, m_musig2_participants, std::string{"Output"});
                     break;
                 }
@@ -1102,18 +1204,12 @@ struct PSBTOutput
                     this_prop.subtype = ReadCompactSize(skey);
                     this_prop.key = key;
 
-                    if (m_proprietary.contains(this_prop)) {
-                        throw std::ios_base::failure("Duplicate Key, proprietary key already found");
-                    }
                     s >> this_prop.value;
                     m_proprietary.insert(this_prop);
                     break;
                 }
                 // Unknown stuff
                 default: {
-                    if (unknown.contains(key)) {
-                        throw std::ios_base::failure("Duplicate Key, key for unknown value already provided");
-                    }
                     // Read in the value
                     std::vector<unsigned char> val_bytes;
                     s >> val_bytes;
@@ -1126,45 +1222,50 @@ struct PSBTOutput
         if (!found_sep) {
             throw std::ios_base::failure("Separator is missing at the end of an output map");
         }
-    }
 
-    template <typename Stream>
-    PSBTOutput(deserialize_type, Stream& s) {
-        Unserialize(s);
+        // Make sure required PSBTv2 fields are present
+        if (m_psbt_version >= 2) {
+            if (!found_amount) {
+                throw std::ios_base::failure("Output amount is required in PSBTv2");
+            }
+            if (!found_script) {
+                throw std::ios_base::failure("Output script is required in PSBTv2");
+            }
+        }
     }
 };
 
 /** A version of CTransaction with the PSBT format*/
-struct PartiallySignedTransaction
+class PartiallySignedTransaction
 {
-    std::optional<CMutableTransaction> tx;
+private:
+    std::optional<uint32_t> m_version;
+
+public:
     // We use a vector of CExtPubKey in the event that there happens to be the same KeyOriginInfos for different CExtPubKeys
     // Note that this map swaps the key and values from the serialization
     std::map<KeyOriginInfo, std::set<CExtPubKey>> m_xpubs;
+    std::optional<std::bitset<8>> m_tx_modifiable;
     std::vector<PSBTInput> inputs;
     std::vector<PSBTOutput> outputs;
     std::map<std::vector<unsigned char>, std::vector<unsigned char>> unknown;
-    std::optional<uint32_t> m_version;
     std::set<PSBTProprietary> m_proprietary;
 
+    uint32_t tx_version;
+    std::optional<uint32_t> fallback_locktime;
+
     bool IsNull() const;
     uint32_t GetVersion() const;
 
     /** Merge psbt into this. The two psbts must have the same underlying CTransaction (i.e. the
       * same actual Bitcoin transaction.) Returns true if the merge succeeded, false otherwise. */
     [[nodiscard]] bool Merge(const PartiallySignedTransaction& psbt);
-    bool AddInput(const CTxIn& txin, PSBTInput& psbtin);
-    bool AddOutput(const CTxOut& txout, const PSBTOutput& psbtout);
-    PartiallySignedTransaction() = default;
-    explicit PartiallySignedTransaction(const CMutableTransaction& tx);
-    /**
-     * Finds the UTXO for a given input index
-     *
-     * @param[out] utxo The UTXO of the input if found
-     * @param[in] input_index Index of the input to retrieve the UTXO of
-     * @return Whether the UTXO for the specified input was found
-     */
-    bool GetInputUTXO(CTxOut& utxo, int input_index) const;
+    bool AddInput(const PSBTInput& psbtin);
+    bool AddOutput(const PSBTOutput& psbtout);
+    std::optional<uint32_t> ComputeTimeLock() const;
+    std::optional<CMutableTransaction> GetUnsignedTx() const;
+    std::optional<Txid> GetUniqueID() const;
+    explicit PartiallySignedTransaction(const CMutableTransaction& tx, uint32_t version = 2);
 
     template <typename Stream>
     inline void Serialize(Stream& s) const {
@@ -1172,11 +1273,13 @@ struct PartiallySignedTransaction
         // magic bytes
         s << PSBT_MAGIC_BYTES;
 
-        // unsigned tx flag
-        SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_UNSIGNED_TX));
+        if (GetVersion() < 2) {
+            // unsigned tx flag
+            SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_UNSIGNED_TX));
 
-        // Write serialized tx to a stream
-        SerializeToVector(s, TX_NO_WITNESS(*tx));
+            // Write serialized tx to a stream
+            SerializeToVector(s, TX_NO_WITNESS(*GetUnsignedTx()));
+        }
 
         // Write xpubs
         for (const auto& xpub_pair : m_xpubs) {
@@ -1190,6 +1293,26 @@ struct PartiallySignedTransaction
             }
         }
 
+        if (GetVersion() >= 2) {
+            // Write PSBTv2 tx version, locktime, counts, etc.
+            SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_TX_VERSION));
+            SerializeToVector(s, tx_version);
+            if (fallback_locktime != std::nullopt) {
+                SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_FALLBACK_LOCKTIME));
+                SerializeToVector(s, *fallback_locktime);
+            }
+
+            SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_INPUT_COUNT));
+            SerializeToVector(s, CompactSizeWriter(inputs.size()));
+            SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_OUTPUT_COUNT));
+            SerializeToVector(s, CompactSizeWriter(outputs.size()));
+
+            if (m_tx_modifiable != std::nullopt) {
+                SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_TX_MODIFIABLE));
+                SerializeToVector(s, static_cast<uint8_t>(m_tx_modifiable->to_ulong()));
+            }
+        }
+
         // PSBT version
         if (GetVersion() > 0) {
             SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_VERSION));
@@ -1239,6 +1362,13 @@ struct PartiallySignedTransaction
 
         // Read global data
         bool found_sep = false;
+        std::optional<CMutableTransaction> tx;
+        uint64_t input_count = 0;
+        uint64_t output_count = 0;
+        bool found_input_count = false;
+        bool found_output_count = false;
+        bool found_tx_version = false;
+        bool found_fallback_locktime = false;
         while(!s.empty()) {
             // Read the key of format "<keylen><keytype><keydata>" after which
             // "key" will contain "<keytype><keydata>"
@@ -1252,6 +1382,11 @@ struct PartiallySignedTransaction
                 break;
             }
 
+            // Duplicate keys are not permitted
+            if (!key_lookup.emplace(key).second) {
+                throw std::ios_base::failure(tfm::format("Duplicate Key, global key \"%s\" already provided", HexStr(key)));
+            }
+
             // "skey" is used so that "key" is unchanged after reading keytype below
             SpanReader skey{key};
             // keytype is of the format compact size uint at the beginning of "key"
@@ -1262,37 +1397,71 @@ struct PartiallySignedTransaction
             switch(type) {
                 case PSBT_GLOBAL_UNSIGNED_TX:
                 {
-                    if (!key_lookup.emplace(key).second) {
-                        throw std::ios_base::failure("Duplicate Key, unsigned tx already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Global unsigned tx key is more than one byte type");
-                    }
-                    CMutableTransaction mtx;
+                    ExpectedKeySize("Global Unsigned TX", key, 1);
                     // Set the stream to serialize with non-witness since this should always be non-witness
-                    UnserializeFromVector(s, TX_NO_WITNESS(mtx));
-                    tx = std::move(mtx);
+                    tx.emplace();
+                    UnserializeFromVector(s, TX_NO_WITNESS(*tx));
                     // Make sure that all scriptSigs and scriptWitnesses are empty
                     for (const CTxIn& txin : tx->vin) {
                         if (!txin.scriptSig.empty() || !txin.scriptWitness.IsNull()) {
                             throw std::ios_base::failure("Unsigned tx does not have empty scriptSigs and scriptWitnesses.");
                         }
                     }
+                    tx_version = tx->version;
+                    fallback_locktime = tx->nLockTime;
+                    // Set the input and output counts
+                    input_count = tx->vin.size();
+                    output_count = tx->vout.size();
+                    break;
+                }
+                case PSBT_GLOBAL_TX_VERSION:
+                {
+                    ExpectedKeySize("Global Transaction Version", key, 1);
+                    UnserializeFromVector(s, tx_version);
+                    found_tx_version = true;
+                    break;
+                }
+                case PSBT_GLOBAL_FALLBACK_LOCKTIME:
+                {
+                    ExpectedKeySize("Global Fallback Locktime", key, 1);
+                    fallback_locktime.emplace();
+                    UnserializeFromVector(s, *fallback_locktime);
+                    found_fallback_locktime = true;
+                    break;
+                }
+                case PSBT_GLOBAL_INPUT_COUNT:
+                {
+                    ExpectedKeySize("Global Input Count", key, 1);
+                    CompactSizeReader reader(input_count);
+                    UnserializeFromVector(s, reader);
+                    found_input_count = true;
+                    break;
+                }
+                case PSBT_GLOBAL_OUTPUT_COUNT:
+                {
+                    ExpectedKeySize("Global Output Count", key, 1);
+                    CompactSizeReader reader(output_count);
+                    UnserializeFromVector(s, reader);
+                    found_output_count = true;
+                    break;
+                }
+                case PSBT_GLOBAL_TX_MODIFIABLE:
+                {
+                    ExpectedKeySize("Global TX Modifiable Flags", key, 1);
+                    uint8_t tx_mod;
+                    UnserializeFromVector(s, tx_mod);
+                    m_tx_modifiable.emplace(tx_mod);
                     break;
                 }
                 case PSBT_GLOBAL_XPUB:
                 {
-                    if (key.size() != BIP32_EXTKEY_WITH_VERSION_SIZE + 1) {
-                        throw std::ios_base::failure("Size of key was not the expected size for the type global xpub");
-                    }
+                    ExpectedKeySize("Global XPUB", key, BIP32_EXTKEY_WITH_VERSION_SIZE + 1);
                     // Read in the xpub from key
                     CExtPubKey xpub;
                     xpub.DecodeWithVersion(&key.data()[1]);
                     if (!xpub.pubkey.IsFullyValid()) {
                        throw std::ios_base::failure("Invalid pubkey");
                     }
-                    if (global_xpubs.contains(xpub)) {
-                       throw std::ios_base::failure("Duplicate key, global xpub already provided");
-                    }
                     global_xpubs.insert(xpub);
                     // Read in the keypath from stream
                     KeyOriginInfo keypath;
@@ -1311,11 +1480,7 @@ struct PartiallySignedTransaction
                 }
                 case PSBT_GLOBAL_VERSION:
                 {
-                    if (m_version) {
-                        throw std::ios_base::failure("Duplicate Key, version already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure("Global version key is more than one byte type");
-                    }
+                    ExpectedKeySize("Global PSBT Version", key, 1);
                     uint32_t v;
                     UnserializeFromVector(s, v);
                     m_version = v;
@@ -1331,18 +1496,12 @@ struct PartiallySignedTransaction
                     this_prop.subtype = ReadCompactSize(skey);
                     this_prop.key = key;
 
-                    if (m_proprietary.contains(this_prop)) {
-                        throw std::ios_base::failure("Duplicate Key, proprietary key already found");
-                    }
                     s >> this_prop.value;
                     m_proprietary.insert(this_prop);
                     break;
                 }
                 // Unknown stuff
                 default: {
-                    if (unknown.contains(key)) {
-                        throw std::ios_base::failure("Duplicate Key, key for unknown value already provided");
-                    }
                     // Read in the value
                     std::vector<unsigned char> val_bytes;
                     s >> val_bytes;
@@ -1355,44 +1514,104 @@ struct PartiallySignedTransaction
             throw std::ios_base::failure("Separator is missing at the end of the global map");
         }
 
-        // Make sure that we got an unsigned tx
-        if (!tx) {
-            throw std::ios_base::failure("No unsigned transaction was provided");
+        const uint32_t psbt_ver = GetVersion();
+
+        // Check PSBT version constraints
+        if (psbt_ver == 0) {
+            // Make sure that we got an unsigned tx for PSBTv0
+            if (!tx) {
+                throw std::ios_base::failure("No unsigned transaction was provided");
+            }
+            // Make sure no PSBTv2 fields are present
+            if (found_tx_version) {
+                throw std::ios_base::failure("PSBT_GLOBAL_TX_VERSION is not allowed in PSBTv0");
+            }
+            if (found_fallback_locktime) {
+                throw std::ios_base::failure("PSBT_GLOBAL_FALLBACK_LOCKTIME is not allowed in PSBTv0");
+            }
+            if (found_input_count) {
+                throw std::ios_base::failure("PSBT_GLOBAL_INPUT_COUNT is not allowed in PSBTv0");
+            }
+            if (found_output_count) {
+                throw std::ios_base::failure("PSBT_GLOBAL_OUTPUT_COUNT is not allowed in PSBTv0");
+            }
+            if (m_tx_modifiable != std::nullopt) {
+                throw std::ios_base::failure("PSBT_GLOBAL_TX_MODIFIABLE is not allowed in PSBTv0");
+            }
+        }
+        // Disallow v1
+        if (psbt_ver == 1) {
+            throw std::ios_base::failure("There is no PSBT version 1");
+        }
+        if (psbt_ver == 2) {
+            // Tx version, input, and output counts are required
+            if (!found_tx_version) {
+                throw std::ios_base::failure("PSBT_GLOBAL_TX_VERSION is required in PSBTv2");
+            }
+            if (!found_input_count) {
+                throw std::ios_base::failure("PSBT_GLOBAL_INPUT_COUNT is required in PSBTv2");
+            }
+            if (!found_output_count) {
+                throw std::ios_base::failure("PSBT_GLOBAL_OUTPUT_COUNT is required in PSBTv2");
+            }
+            // Unsigned tx is disallowed
+            if (tx) {
+                throw std::ios_base::failure("PSBT_GLOBAL_UNSIGNED_TX is not allowed in PSBTv2");
+            }
+        }
+        if (psbt_ver > 2) {
+            throw std::ios_base::failure("Unknown PSBT version");
         }
 
         // Read input data
         unsigned int i = 0;
-        while (!s.empty() && i < tx->vin.size()) {
-            PSBTInput input;
-            s >> input;
-            inputs.push_back(input);
+        while (!s.empty() && i < input_count) {
+            if (psbt_ver < 2) {
+                inputs.emplace_back(psbt_ver, tx->vin[i].prevout.hash, tx->vin[i].prevout.n, tx->vin[i].nSequence);
+                s >> inputs.back();
+            } else {
+                inputs.emplace_back(deserialize, s, psbt_ver);
+            }
 
             // Make sure the non-witness utxo matches the outpoint
+            const PSBTInput& input = inputs.back();
             if (input.non_witness_utxo) {
-                if (input.non_witness_utxo->GetHash() != tx->vin[i].prevout.hash) {
-                    throw std::ios_base::failure("Non-witness UTXO does not match outpoint hash");
-                }
-                if (tx->vin[i].prevout.n >= input.non_witness_utxo->vout.size()) {
-                    throw std::ios_base::failure("Input specifies output index that does not exist");
+                if (psbt_ver < 2) {
+                    if (input.non_witness_utxo->GetHash() != tx->vin[i].prevout.hash) {
+                        throw std::ios_base::failure("Non-witness UTXO does not match outpoint hash");
+                    }
+                    if (tx->vin[i].prevout.n >= input.non_witness_utxo->vout.size()) {
+                        throw std::ios_base::failure("Input specifies output index that does not exist");
+                    }
+                } else {
+                    if (input.non_witness_utxo->GetHash() != input.prev_txid) {
+                        throw std::ios_base::failure("Non-witness UTXO does not match outpoint hash");
+                    }
+                    if (input.prev_out >= input.non_witness_utxo->vout.size()) {
+                        throw std::ios_base::failure("Input specifies output index that does not exist");
+                    }
                 }
             }
             ++i;
         }
         // Make sure that the number of inputs matches the number of inputs in the transaction
-        if (inputs.size() != tx->vin.size()) {
+        if (inputs.size() != input_count) {
             throw std::ios_base::failure("Inputs provided does not match the number of inputs in transaction.");
         }
 
         // Read output data
         i = 0;
-        while (!s.empty() && i < tx->vout.size()) {
-            PSBTOutput output;
-            s >> output;
-            outputs.push_back(output);
+        while (!s.empty() && i < output_count) {
+            if (psbt_ver < 2) {
+                outputs.emplace_back(psbt_ver, tx->vout[i].nValue, tx->vout[i].scriptPubKey);
+                s >> outputs.back();
+            } else {
+                outputs.emplace_back(deserialize, s, psbt_ver);
+            }
             ++i;
         }
         // Make sure that the number of outputs matches the number of outputs in the transaction
-        if (outputs.size() != tx->vout.size()) {
+        if (outputs.size() != output_count) {
             throw std::ios_base::failure("Outputs provided does not match the number of outputs in transaction.");
         }
     }
@@ -1414,7 +1633,7 @@ enum class PSBTRole {
 std::string PSBTRoleName(PSBTRole role);
 
 /** Compute a PrecomputedTransactionData object from a psbt. */
-PrecomputedTransactionData PrecomputePSBTData(const PartiallySignedTransaction& psbt);
+std::optional<PrecomputedTransactionData> PrecomputePSBTData(const PartiallySignedTransaction& psbt);
 
 /** Checks whether a PSBTInput is already signed by checking for non-null finalized fields. */
 bool PSBTInputSigned(const PSBTInput& input);
@@ -1461,15 +1680,14 @@ bool FinalizeAndExtractPSBT(PartiallySignedTransaction& psbtx, CMutableTransacti
 /**
  * Combines PSBTs with the same underlying transaction, resulting in a single PSBT with all partial signatures from each input.
  *
- * @param[out] out   the combined PSBT, if successful
  * @param[in]  psbtxs the PSBTs to combine
- * @return True if we successfully combined the transactions, false if they were not compatible
+ * @return     The combined PSBT or std::nullopt if the PSBTs cannot be combined
  */
-[[nodiscard]] bool CombinePSBTs(PartiallySignedTransaction& out, const std::vector<PartiallySignedTransaction>& psbtxs);
+[[nodiscard]] std::optional<PartiallySignedTransaction> CombinePSBTs(const std::vector<PartiallySignedTransaction>& psbtxs);
 
 //! Decode a base64ed PSBT into a PartiallySignedTransaction
-[[nodiscard]] bool DecodeBase64PSBT(PartiallySignedTransaction& decoded_psbt, const std::string& base64_psbt, std::string& error);
+[[nodiscard]] util::Result<PartiallySignedTransaction> DecodeBase64PSBT(const std::string& base64_tx);
 //! Decode a raw (binary blob) PSBT into a PartiallySignedTransaction
-[[nodiscard]] bool DecodeRawPSBT(PartiallySignedTransaction& decoded_psbt, std::span<const std::byte> raw_psbt, std::string& error);
+[[nodiscard]] util::Result<PartiallySignedTransaction> DecodeRawPSBT(std::span<const std::byte> tx_data);
 
 #endif // BITCOIN_PSBT_H
diff --git a/depend/bitcoin/src/pubkey.cpp b/depend/bitcoin/src/pubkey.cpp
index 264f861b..93883496 100644
--- a/depend/bitcoin/src/pubkey.cpp
+++ b/depend/bitcoin/src/pubkey.cpp
@@ -384,7 +384,7 @@ CPubKey EllSwiftPubKey::Decode() const
 
 void CExtPubKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
     code[0] = nDepth;
-    memcpy(code+1, vchFingerprint, 4);
+    std::ranges::copy(fingerprint, code+1);
     WriteBE32(code+5, nChild);
     memcpy(code+9, chaincode.begin(), 32);
     assert(pubkey.size() == CPubKey::COMPRESSED_SIZE);
@@ -393,11 +393,11 @@ void CExtPubKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
 
 void CExtPubKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) {
     nDepth = code[0];
-    memcpy(vchFingerprint, code+1, 4);
+    std::copy_n(code + 1, fingerprint.size(), fingerprint.begin());
     nChild = ReadBE32(code+5);
     memcpy(chaincode.begin(), code+9, 32);
     pubkey.Set(code+41, code+BIP32_EXTKEY_SIZE);
-    if ((nDepth == 0 && (nChild != 0 || ReadLE32(vchFingerprint) != 0)) || !pubkey.IsFullyValid()) pubkey = CPubKey();
+    if ((nDepth == 0 && (nChild != 0 || ReadLE32(fingerprint.data()) != 0)) || !pubkey.IsFullyValid()) pubkey = CPubKey();
 }
 
 void CExtPubKey::EncodeWithVersion(unsigned char code[BIP32_EXTKEY_WITH_VERSION_SIZE]) const
@@ -415,8 +415,7 @@ void CExtPubKey::DecodeWithVersion(const unsigned char code[BIP32_EXTKEY_WITH_VE
 bool CExtPubKey::Derive(CExtPubKey &out, unsigned int _nChild, uint256* bip32_tweak_out) const {
     if (nDepth == std::numeric_limits<unsigned char>::max()) return false;
     out.nDepth = nDepth + 1;
-    CKeyID id = pubkey.GetID();
-    memcpy(out.vchFingerprint, &id, 4);
+    out.fingerprint = id_key_fingerprint();
     out.nChild = _nChild;
     return pubkey.Derive(out.pubkey, out.chaincode, _nChild, chaincode, bip32_tweak_out);
 }
diff --git a/depend/bitcoin/src/pubkey.h b/depend/bitcoin/src/pubkey.h
index 02ad7371..8acfd724 100644
--- a/depend/bitcoin/src/pubkey.h
+++ b/depend/bitcoin/src/pubkey.h
@@ -16,8 +16,10 @@
 #include <optional>
 #include <vector>
 
-const unsigned int BIP32_EXTKEY_SIZE = 74;
-const unsigned int BIP32_EXTKEY_WITH_VERSION_SIZE = 78;
+inline constexpr unsigned int BIP32_EXTKEY_SIZE = 74;
+inline constexpr unsigned int BIP32_EXTKEY_WITH_VERSION_SIZE = 78;
+
+using KeyFingerprint = std::array<unsigned char, 4>;
 
 /** A reference to a CKey: the Hash160 of its serialized public key */
 class CKeyID : public uint160
@@ -25,10 +27,14 @@ class CKeyID : public uint160
 public:
     CKeyID() : uint160() {}
     explicit CKeyID(const uint160& in) : uint160(in) {}
+    KeyFingerprint fingerprint() const
+    {
+        KeyFingerprint ret;
+        std::copy_n(begin(), ret.size(), ret.begin());
+        return ret;
+    }
 };
 
-typedef uint256 ChainCode;
-
 /** An encapsulated public key. */
 class CPubKey
 {
@@ -336,7 +342,7 @@ struct EllSwiftPubKey
 struct CExtPubKey {
     unsigned char version[4];
     unsigned char nDepth;
-    unsigned char vchFingerprint[4];
+    KeyFingerprint fingerprint;
     unsigned int nChild;
     ChainCode chaincode;
     CPubKey pubkey;
@@ -344,7 +350,7 @@ struct CExtPubKey {
     friend bool operator==(const CExtPubKey &a, const CExtPubKey &b)
     {
         return a.nDepth == b.nDepth &&
-            memcmp(a.vchFingerprint, b.vchFingerprint, sizeof(vchFingerprint)) == 0 &&
+            a.fingerprint == b.fingerprint &&
             a.nChild == b.nChild &&
             a.chaincode == b.chaincode &&
             a.pubkey == b.pubkey;
@@ -360,6 +366,11 @@ struct CExtPubKey {
         return a.chaincode < b.chaincode;
     }
 
+    KeyFingerprint id_key_fingerprint() const
+    {
+        return pubkey.GetID().fingerprint();
+    }
+
     void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     void EncodeWithVersion(unsigned char code[BIP32_EXTKEY_WITH_VERSION_SIZE]) const;
diff --git a/depend/bitcoin/src/qt/CMakeLists.txt b/depend/bitcoin/src/qt/CMakeLists.txt
index 58fa08b5..5ed3ddbc 100644
--- a/depend/bitcoin/src/qt/CMakeLists.txt
+++ b/depend/bitcoin/src/qt/CMakeLists.txt
@@ -16,7 +16,7 @@ get_target_property(qt_lib_type Qt6::Core TYPE)
 function(import_plugins target)
   if(qt_lib_type STREQUAL "STATIC_LIBRARY")
     set(plugins Qt6::QMinimalIntegrationPlugin)
-    if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD)$")
+    if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD|OpenBSD)$")
       list(APPEND plugins Qt6::QXcbIntegrationPlugin)
     elseif(WIN32)
       list(APPEND plugins Qt6::QWindowsIntegrationPlugin Qt6::QModernWindowsStylePlugin)
@@ -255,12 +255,12 @@ endif()
 
 add_subdirectory(locale)
 
-add_executable(bitcoin-qt
+add_executable(bitcoin-qt WIN32
   main.cpp
+  res/bitcoin-qt-res.rc
   ../init/bitcoin-qt.cpp
 )
 
-add_windows_resources(bitcoin-qt res/bitcoin-qt-res.rc)
 add_windows_application_manifest(bitcoin-qt)
 
 target_link_libraries(bitcoin-qt
@@ -271,12 +271,9 @@ target_link_libraries(bitcoin-qt
 
 import_plugins(bitcoin-qt)
 install_binary_component(bitcoin-qt HAS_MANPAGE)
-if(WIN32)
-  set_target_properties(bitcoin-qt PROPERTIES WIN32_EXECUTABLE TRUE)
-endif()
 
 if(ENABLE_IPC)
-  add_executable(bitcoin-gui
+  add_executable(bitcoin-gui WIN32
     main.cpp
     ../init/bitcoin-gui.cpp
   )
@@ -288,9 +285,6 @@ if(ENABLE_IPC)
   )
   import_plugins(bitcoin-gui)
   install_binary_component(bitcoin-gui INTERNAL)
-  if(WIN32)
-    set_target_properties(bitcoin-gui PROPERTIES WIN32_EXECUTABLE TRUE)
-  endif()
 endif()
 
 if(BUILD_GUI_TESTS)
@@ -306,7 +300,6 @@ else()
   add_custom_target(translate COMMAND ${CMAKE_COMMAND}
     -D "PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}"
     -D "COPYRIGHT_HOLDERS=${COPYRIGHT_HOLDERS}"
-    -D "LCONVERT_EXECUTABLE=$<TARGET_FILE:Qt6::lconvert>"
     -D "LUPDATE_EXECUTABLE=$<TARGET_FILE:Qt6::lupdate>"
     -D "XGETTEXT_EXECUTABLE=${XGETTEXT_EXECUTABLE}"
     -P ${PROJECT_SOURCE_DIR}/share/qt/translate.cmake
diff --git a/depend/bitcoin/src/qt/bitcoin.cpp b/depend/bitcoin/src/qt/bitcoin.cpp
index 0b89c605..97eb957c 100644
--- a/depend/bitcoin/src/qt/bitcoin.cpp
+++ b/depend/bitcoin/src/qt/bitcoin.cpp
@@ -6,7 +6,6 @@
 
 #include <qt/bitcoin.h>
 
-#include <btcsignals.h>
 #include <chainparams.h>
 #include <common/args.h>
 #include <common/init.h>
@@ -15,7 +14,6 @@
 #include <interfaces/handler.h>
 #include <interfaces/init.h>
 #include <interfaces/node.h>
-#include <logging.h>
 #include <node/context.h>
 #include <node/interface_ui.h>
 #include <noui.h>
@@ -32,7 +30,9 @@
 #include <qt/utilitydialog.h>
 #include <qt/winshutdownmonitor.h>
 #include <uint256.h>
+#include <util/btcsignals.h>
 #include <util/exception.h>
+#include <util/log.h>
 #include <util/string.h>
 #include <util/threadnames.h>
 #include <util/translation.h>
@@ -485,9 +485,9 @@ int GuiMain(int argc, char* argv[])
     util::ThreadSetInternalName("main");
 
     // Subscribe to global signals from core
-    btcsignals::scoped_connection handler_message_box = ::uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
-    btcsignals::scoped_connection handler_question = ::uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
-    btcsignals::scoped_connection handler_init_message = ::uiInterface.InitMessage_connect(noui_InitMessage);
+    btcsignals::scoped_connection handler_message_box{::uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox)};
+    btcsignals::scoped_connection handler_question{::uiInterface.ThreadSafeQuestion.connect(noui_ThreadSafeQuestion)};
+    btcsignals::scoped_connection handler_init_message{::uiInterface.InitMessage.connect(noui_InitMessage)};
 
     // Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory
 
diff --git a/depend/bitcoin/src/qt/bitcoingui.cpp b/depend/bitcoin/src/qt/bitcoingui.cpp
index 96ea3f4a..f5ed2ed0 100644
--- a/depend/bitcoin/src/qt/bitcoingui.cpp
+++ b/depend/bitcoin/src/qt/bitcoingui.cpp
@@ -377,6 +377,10 @@ void BitcoinGUI::createActions()
     m_mask_values_action->setStatusTip(tr("Mask the values in the Overview tab"));
     m_mask_values_action->setCheckable(true);
 
+    m_export_watchonly_action = new QAction(tr("Export watch-only wallet"), this);
+    m_export_watchonly_action->setEnabled(false);
+    m_export_watchonly_action->setStatusTip(tr("Export a watch-only version of the current wallet that can be restored onto another node."));
+
     connect(quitAction, &QAction::triggered, this, &BitcoinGUI::quitRequested);
     connect(aboutAction, &QAction::triggered, this, &BitcoinGUI::aboutClicked);
     connect(aboutQtAction, &QAction::triggered, qApp, QApplication::aboutQt);
@@ -440,7 +444,7 @@ void BitcoinGUI::createActions()
             //: The title for Restore Wallet File Windows
             QString title_windows = tr("Load Wallet Backup");
 
-            QString backup_file = GUIUtil::getOpenFileName(this, title_windows, QString(), name_data_file + QLatin1String(" (*.dat)"), nullptr);
+            QString backup_file = GUIUtil::getOpenFileName(this, title_windows, QString(), name_data_file +  QLatin1String(" (*.dat *.wallet);;") + tr("All Files") + QLatin1String(" (*)"), nullptr);
             if (backup_file.isEmpty()) return;
 
             bool wallet_name_ok;
@@ -524,6 +528,22 @@ void BitcoinGUI::createActions()
         });
         connect(m_mask_values_action, &QAction::toggled, this, &BitcoinGUI::setPrivacy);
         connect(m_mask_values_action, &QAction::toggled, this, &BitcoinGUI::enableHistoryAction);
+        GUIUtil::ExceptionSafeConnect(m_export_watchonly_action, &QAction::triggered, [this](bool) {
+            QString destination = GUIUtil::getSaveFileName(this,
+                tr("Save Watch-only Wallet Export"), QString(),
+                //: Name of the wallet data file format.
+                tr("Wallet Data") + QLatin1String(" (*.dat)"), nullptr);
+
+            if (destination.isEmpty()) return;
+            WalletModel* model = walletFrame->currentWalletModel();
+            if (!Assume(model)) return;
+            util::Result<std::string> export_res = model->wallet().exportWatchOnlyWallet(GUIUtil::QStringToPath(destination));
+            if (export_res) {
+                QMessageBox::information(nullptr, tr("Export Successful"), tr("The wallet has been exported to ") + QString::fromStdString(*export_res));
+            } else {
+                QMessageBox::critical(nullptr, tr("Export Error"), QString::fromStdString(util::ErrorString(export_res).translated));
+            }
+        });
     }
 #endif // ENABLE_WALLET
 
@@ -547,6 +567,7 @@ void BitcoinGUI::createMenuBar()
         file->addSeparator();
         file->addAction(backupWalletAction);
         file->addAction(m_restore_wallet_action);
+        file->addAction(m_export_watchonly_action);
         file->addSeparator();
         file->addAction(openAction);
         file->addAction(signMessageAction);
@@ -832,6 +853,7 @@ void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model)
             break;
         }
     }
+    m_export_watchonly_action->setEnabled(!wallet_model->wallet().privateKeysDisabled());
     updateWindowTitle();
 }
 
@@ -866,6 +888,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
     openAction->setEnabled(enabled);
     m_close_wallet_action->setEnabled(enabled);
     m_close_all_wallets_action->setEnabled(enabled);
+    m_export_watchonly_action->setEnabled(enabled);
 }
 
 void BitcoinGUI::createTrayIcon()
@@ -1589,7 +1612,7 @@ void BitcoinGUI::showModalOverlay()
         modalOverlay->toggleVisibility();
 }
 
-static bool ThreadSafeMessageBox(BitcoinGUI* gui, const bilingual_str& message, unsigned int style)
+[[nodiscard]] static bool ThreadSafeMessageBox(BitcoinGUI* gui, const bilingual_str& message, unsigned int style)
 {
     bool modal = (style & CClientUIInterface::MODAL);
     // The SECURE flag has no effect in the Qt GUI.
@@ -1621,7 +1644,7 @@ void BitcoinGUI::subscribeToCoreSignals()
 {
     // Connect signals to client
     m_handler_message_box = m_node.handleMessageBox([this](const bilingual_str& message, unsigned int style) {
-        return ThreadSafeMessageBox(this, message, style);
+        (void)ThreadSafeMessageBox(this, message, style);
     });
     m_handler_question = m_node.handleQuestion([this](const bilingual_str& message, const std::string& /*non_interactive_message*/, unsigned int style) {
         return ThreadSafeMessageBox(this, message, style);
@@ -1721,3 +1744,5 @@ void UnitDisplayStatusBarControl::onMenuSelection(QAction* action)
         optionsModel->setDisplayUnit(action->data());
     }
 }
+
+#include <moc_bitcoingui.cpp>
diff --git a/depend/bitcoin/src/qt/bitcoingui.h b/depend/bitcoin/src/qt/bitcoingui.h
index 2322860a..538e1d19 100644
--- a/depend/bitcoin/src/qt/bitcoingui.h
+++ b/depend/bitcoin/src/qt/bitcoingui.h
@@ -114,7 +114,9 @@ class BitcoinGUI : public QMainWindow
 
 private:
     interfaces::Node& m_node;
+#ifdef ENABLE_WALLET
     WalletController* m_wallet_controller{nullptr};
+#endif // ENABLE_WALLET
     std::unique_ptr<interfaces::Handler> m_handler_message_box;
     std::unique_ptr<interfaces::Handler> m_handler_question;
     ClientModel* clientModel = nullptr;
@@ -158,15 +160,18 @@ class BitcoinGUI : public QMainWindow
     QAction* m_restore_wallet_action{nullptr};
     QAction* m_close_wallet_action{nullptr};
     QAction* m_close_all_wallets_action{nullptr};
+#ifdef ENABLE_WALLET
     QAction* m_wallet_selector_label_action = nullptr;
     QAction* m_wallet_selector_action = nullptr;
+#endif // ENABLE_WALLET
     QAction* m_mask_values_action{nullptr};
     QAction* m_migrate_wallet_action{nullptr};
     QMenu* m_migrate_wallet_menu{nullptr};
-
+    QAction* m_export_watchonly_action{nullptr};
+#ifdef ENABLE_WALLET
     QLabel *m_wallet_selector_label = nullptr;
     QComboBox* m_wallet_selector = nullptr;
-
+#endif // ENABLE_WALLET
     QSystemTrayIcon* trayIcon = nullptr;
     const std::unique_ptr<QMenu> trayIconMenu;
     Notificator* notificator = nullptr;
diff --git a/depend/bitcoin/src/qt/bitcoinstrings.cpp b/depend/bitcoin/src/qt/bitcoinstrings.cpp
index 6a7af280..26337b31 100644
--- a/depend/bitcoin/src/qt/bitcoinstrings.cpp
+++ b/depend/bitcoin/src/qt/bitcoinstrings.cpp
@@ -14,8 +14,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"),
 QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high! Fees this large could be paid on a single transaction."),
 QT_TRANSLATE_NOOP("bitcoin-core", "%s request to listen on port %u. This port is considered \"bad\" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list."),
 QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
+QT_TRANSLATE_NOOP("bitcoin-core", "-walletrbf is deprecated and will be fully removed in the next release."),
 QT_TRANSLATE_NOOP("bitcoin-core", "A %zu MiB dbcache may be too large for a system memory of only %zu MiB."),
-QT_TRANSLATE_NOOP("bitcoin-core", "A fatal internal error occurred, see debug.log for details: "),
+QT_TRANSLATE_NOOP("bitcoin-core", "A fatal internal error occurred, see %s for details: %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Assumeutxo data not found for the given blockhash '%s'."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Block verification was interrupted"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Can't spend unconfirmed version %d pre-selected input with a version 3 tx"),
@@ -34,7 +35,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Could not find asmap file %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Could not generate scriptPubKeys (cache is empty)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Could not parse asmap file %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Could not read embedded asmap data"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Could not top up scriptPubKeys"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Creating wallet…"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Disk space is too low!"),
@@ -65,7 +65,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error reading next record from wallet databas
 QT_TRANSLATE_NOOP("bitcoin-core", "Error starting/committing db txn for wallet transactions removal process"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Address book data in wallet cannot be identified to belong to migrated wallets"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Cannot extract destination from the generated scriptpubkey"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not add tx %s to watchonly wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not add watchonly tx %s to watchonly wallet"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not create file '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not delete watchonly transactions. "),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Couldn't create cursor into database"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
@@ -75,7 +77,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Dumpfile identifier record is incorrec
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Duplicate descriptors created during migration. Your wallet may be corrupted."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Export destination '%s' already exists"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Export destination cannot be empty"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Failed to create new watchonly wallet"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Failed to create new watchonly wallet. %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Got key that was not hex: %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Got value that was not hex: %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Keypool ran out, please call keypoolrefill first"),
@@ -96,9 +101,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to remove watchonly address boo
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write data to disk for wallet %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write record to new wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write solvable wallet best block locator record"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write the exported wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write watchonly wallet best block locator record"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet does not exist"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet has no descriptors to export"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: cannot commit db transaction for watchonly wallet export"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: cannot remove legacy wallet records"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error: database transaction cannot be executed for new watchonly wallet %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: database transaction cannot be executed for wallet %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failed to acquire rescan reserver during wallet initialization"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions."),
@@ -116,7 +125,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failure removing transaction: %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)."),
 QT_TRANSLATE_NOOP("bitcoin-core", "File %s already exists. If you are sure this is what you want, move it out of the way first."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Flushing block file to disk failed. This is likely the result of an I/O error."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Flushing undo file to disk failed. This is likely the result of an I/O error."),
@@ -193,9 +202,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Signer did not echo address"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Signer echoed unexpected address %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Signer returned error: %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"),
@@ -207,6 +213,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "System error while loading external block fil
 QT_TRANSLATE_NOOP("bitcoin-core", "System error while saving block to disk: %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "The %s developers"),
 QT_TRANSLATE_NOOP("bitcoin-core", "The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss."),
+QT_TRANSLATE_NOOP("bitcoin-core", "The -testactivationheight option may not be used on mainnet."),
+QT_TRANSLATE_NOOP("bitcoin-core", "The -vbparams option may not be used on mainnet."),
 QT_TRANSLATE_NOOP("bitcoin-core", "The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct"),
 QT_TRANSLATE_NOOP("bitcoin-core", "The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs"),
 QT_TRANSLATE_NOOP("bitcoin-core", "The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs"),
@@ -243,6 +251,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unable to open %s for writing"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unable to parse -maxuploadtarget: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Unable to write descriptor cache"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unexpected legacy entry in descriptor wallet found. Loading wallet %s\n\nThe wallet might have been tampered with or created with malicious intent.\n"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -blockfilterindex value %s."),
@@ -261,12 +270,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe chara
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks…"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)…"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Wallet file creation failed: %s"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Private keys detected in wallet {%s} with disabled private keys"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Witness data for blocks after height %d requires validation. Please restart with -reindex."),
 QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info."),
+QT_TRANSLATE_NOOP("bitcoin-core", "\nConsider modifying %s (%s) or %s (%s)."),
 QT_TRANSLATE_NOOP("bitcoin-core", "\nUnable to cleanup failed migration"),
 QT_TRANSLATE_NOOP("bitcoin-core", "\nUnable to restore backup of wallet."),
 QT_TRANSLATE_NOOP("bitcoin-core", "acceptstalefeeestimates is not supported on %s chain."),
diff --git a/depend/bitcoin/src/qt/forms/optionsdialog.ui b/depend/bitcoin/src/qt/forms/optionsdialog.ui
index 9ab6b124..ce410bbf 100644
--- a/depend/bitcoin/src/qt/forms/optionsdialog.ui
+++ b/depend/bitcoin/src/qt/forms/optionsdialog.ui
@@ -55,7 +55,7 @@
          <item>
           <widget class="QCheckBox" name="prune">
            <property name="toolTip">
-            <string>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</string>
+            <string>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Wallets should be loaded at startup and kept active while pruning is enabled so they stay synchronized before old block data is deleted; wallets that fall behind pruned data may require a reindex. Reverting this setting requires re-downloading the entire blockchain.</string>
            </property>
            <property name="text">
             <string>Prune &amp;block storage to</string>
diff --git a/depend/bitcoin/src/qt/forms/sendcoinsdialog.ui b/depend/bitcoin/src/qt/forms/sendcoinsdialog.ui
index 1ca92440..db59fccb 100644
--- a/depend/bitcoin/src/qt/forms/sendcoinsdialog.ui
+++ b/depend/bitcoin/src/qt/forms/sendcoinsdialog.ui
@@ -1049,16 +1049,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
              </item>
             </layout>
            </item>
-           <item>
-            <widget class="QCheckBox" name="optInRBF">
-             <property name="text">
-              <string>Enable Replace-By-Fee</string>
-             </property>
-             <property name="toolTip">
-              <string>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</string>
-             </property>
-            </widget>
-           </item>
           </layout>
          </widget>
         </item>
diff --git a/depend/bitcoin/src/qt/guiconstants.h b/depend/bitcoin/src/qt/guiconstants.h
index a3b8cb9d..0e8f1909 100644
--- a/depend/bitcoin/src/qt/guiconstants.h
+++ b/depend/bitcoin/src/qt/guiconstants.h
@@ -11,18 +11,18 @@
 using namespace std::chrono_literals;
 
 /* A delay between model updates */
-static constexpr auto MODEL_UPDATE_DELAY{250ms};
+inline constexpr auto MODEL_UPDATE_DELAY{250ms};
 
 /* A delay between shutdown pollings */
-static constexpr auto SHUTDOWN_POLLING_DELAY{200ms};
+inline constexpr auto SHUTDOWN_POLLING_DELAY{200ms};
 
 /* AskPassphraseDialog -- Maximum passphrase length */
-static const int MAX_PASSPHRASE_SIZE = 1024;
+inline constexpr int MAX_PASSPHRASE_SIZE = 1024;
 
 /* BitcoinGUI -- Size of icons in status bar */
-static const int STATUSBAR_ICONSIZE = 16;
+inline constexpr int STATUSBAR_ICONSIZE = 16;
 
-static const bool DEFAULT_SPLASHSCREEN = true;
+inline constexpr bool DEFAULT_SPLASHSCREEN = true;
 
 /* Invalid field background style */
 #define STYLE_INVALID "border: 3px solid #FF8080"
@@ -41,7 +41,7 @@ static const bool DEFAULT_SPLASHSCREEN = true;
 /* Tooltips longer than this (in characters) are converted into rich text,
    so that they can be word-wrapped.
  */
-static const int TOOLTIP_WRAP_THRESHOLD = 80;
+inline constexpr int TOOLTIP_WRAP_THRESHOLD = 80;
 
 /* Number of frames in spinner animation */
 #define SPINNER_FRAMES 36
@@ -55,9 +55,9 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80;
 #define QAPP_APP_NAME_REGTEST "Bitcoin-Qt-regtest"
 
 /* One gigabyte (GB) in bytes */
-static constexpr uint64_t GB_BYTES{1000000000};
+inline constexpr uint64_t GB_BYTES{1'000'000'000};
 
 // Default prune target displayed in GUI.
-static constexpr int DEFAULT_PRUNE_TARGET_GB{2};
+inline constexpr int DEFAULT_PRUNE_TARGET_GB{2};
 
 #endif // BITCOIN_QT_GUICONSTANTS_H
diff --git a/depend/bitcoin/src/qt/guiutil.cpp b/depend/bitcoin/src/qt/guiutil.cpp
index e0966b9c..bd9f4bbf 100644
--- a/depend/bitcoin/src/qt/guiutil.cpp
+++ b/depend/bitcoin/src/qt/guiutil.cpp
@@ -290,6 +290,8 @@ bool hasEntryData(const QAbstractItemView *view, int column, int role)
 
 void LoadFont(const QString& file_name)
 {
+    // The qminimal plugin does not provide font loading support.
+    if (QApplication::platformName() == "minimal") return;
     const int id = QFontDatabase::addApplicationFont(file_name);
     assert(id != -1);
 }
@@ -970,7 +972,11 @@ void PrintSlotException(
 {
     std::string description = sender->metaObject()->className();
     description += "->";
-    description += receiver->metaObject()->className();
+    if (receiver) {
+        description += receiver->metaObject()->className();
+    } else {
+        description += "anonymous function";
+    }
     PrintExceptionContinue(exception, description);
 }
 
diff --git a/depend/bitcoin/src/qt/guiutil.h b/depend/bitcoin/src/qt/guiutil.h
index 57d042f6..2b1522ee 100644
--- a/depend/bitcoin/src/qt/guiutil.h
+++ b/depend/bitcoin/src/qt/guiutil.h
@@ -399,6 +399,38 @@ namespace GUIUtil
             },
             type);
     }
+    template <typename Sender, typename Signal, typename Slot>
+    auto ExceptionSafeConnect(
+        Sender sender, Signal signal, Slot method)
+    {
+        return QObject::connect(
+            sender, signal,
+            [sender, method](auto&&... args) {
+                bool ok{true};
+                try {
+                    method(std::forward<decltype(args)>(args)...);
+                } catch (const NonFatalCheckError& e) {
+                    PrintSlotException(&e, sender, nullptr);
+                    ok = QMetaObject::invokeMethod(
+                        qApp, "handleNonFatalException",
+                        blockingGUIThreadConnection(),
+                        Q_ARG(QString, QString::fromStdString(e.what())));
+                } catch (const std::exception& e) {
+                    PrintSlotException(&e, sender, nullptr);
+                    ok = QMetaObject::invokeMethod(
+                        qApp, "handleRunawayException",
+                        blockingGUIThreadConnection(),
+                        Q_ARG(QString, QString::fromStdString(e.what())));
+                } catch (...) {
+                    PrintSlotException(nullptr, sender, nullptr);
+                    ok = QMetaObject::invokeMethod(
+                        qApp, "handleRunawayException",
+                        blockingGUIThreadConnection(),
+                        Q_ARG(QString, "Unknown failure occurred."));
+                }
+                assert(ok);
+            });
+    }
 
     /**
      * Shows a QDialog instance asynchronously, and deletes it on close.
diff --git a/depend/bitcoin/src/qt/intro.cpp b/depend/bitcoin/src/qt/intro.cpp
index 91078b7c..8b181326 100644
--- a/depend/bitcoin/src/qt/intro.cpp
+++ b/depend/bitcoin/src/qt/intro.cpp
@@ -17,7 +17,9 @@
 
 #include <common/args.h>
 #include <interfaces/node.h>
+#include <node/interface_ui.h>
 #include <util/fs_helpers.h>
+#include <util/translation.h>
 #include <validation.h>
 
 #include <QFileDialog>
@@ -25,6 +27,7 @@
 #include <QMessageBox>
 
 #include <cmath>
+#include <cstdlib>
 
 namespace {
 //! Return pruning size that will be used if automatic pruning is enabled.
@@ -138,8 +141,10 @@ bool Intro::showIfNeeded(bool& did_show_intro, int64_t& prune_MiB)
         /* Use selectParams here to guarantee Params() can be used by node interface */
         try {
             SelectParams(gArgs.GetChainType());
-        } catch (const std::exception&) {
-            return false;
+        } catch (const std::exception& e) {
+            InitError(Untranslated(e.what()));
+            QMessageBox::critical(nullptr, CLIENT_NAME, QObject::tr("Error: %1").arg(QString(e.what())));
+            std::exit(EXIT_FAILURE);
         }
 
         /* If current default data directory does not exist, let the user choose one */
diff --git a/depend/bitcoin/src/qt/intro.h b/depend/bitcoin/src/qt/intro.h
index db6c1d50..c8e015ba 100644
--- a/depend/bitcoin/src/qt/intro.h
+++ b/depend/bitcoin/src/qt/intro.h
@@ -11,7 +11,7 @@
 #include <QMutex>
 #include <QThread>
 
-static const bool DEFAULT_CHOOSE_DATADIR = false;
+inline constexpr bool DEFAULT_CHOOSE_DATADIR = false;
 
 namespace interfaces {
     class Node;
diff --git a/depend/bitcoin/src/qt/locale/bitcoin_en.ts b/depend/bitcoin/src/qt/locale/bitcoin_en.ts
index ba3d54bf..d7d2ae89 100644
--- a/depend/bitcoin/src/qt/locale/bitcoin_en.ts
+++ b/depend/bitcoin/src/qt/locale/bitcoin_en.ts
@@ -4,1178 +4,965 @@
 <context>
     <name>AddressBookPage</name>
     <message>
-        <location filename="../forms/addressbookpage.ui" line="+37"/>
-        <source>Right-click to edit address or label</source>
+        <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Create a new address</source>
-        <translation>Create a new address</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;New</source>
+        <source>&amp;Copy Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Delete</source>
+        <translation>&amp;Delete</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>C&amp;lose</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-53"/>
-        <source>Delete the currently selected address from the list</source>
-        <translation>Delete the currently selected address from the list</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Export</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <source>Enter address or label to search</source>
+        <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>Copy the currently selected address to the clipboard</source>
+        <source>C&amp;hoose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Export the data in the current tab to a file</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;Export</source>
-        <translation>&amp;Export</translation>
+        <source>C&amp;lose</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location filename="../addressbookpage.cpp" line="+105"/>
-        <source>&amp;Delete</source>
-        <translation>&amp;Delete</translation>
+        <source>Choose the address to receive coins with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../addressbookpage.cpp" line="-30"/>
         <source>Choose the address to send coins to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Choose the address to receive coins with</source>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>C&amp;hoose</source>
+        <source>Copy &amp;Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <source>Copy the currently selected address to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>These are your Bitcoin addresses for receiving payments. Use the &apos;Create new receiving address&apos; button in the receive tab to create new addresses.
-Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new address</source>
+        <translation>Create a new address</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>&amp;Copy Address</source>
-        <translation type="unfinished"></translation>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Delete the currently selected address from the list</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;Label</source>
+        <source>Enter address or label to search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Edit</source>
+        <source>Export Address List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
-        <source>Export Address List</source>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Export the data in the current tab to a file</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Comma separated file</source>
-        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <source>Receiving addresses - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <source>Right-click to edit address or label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Sending addresses - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Receiving addresses - %1</source>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <source>Exporting Failed</source>
+        <source>These are your Bitcoin addresses for receiving payments. Use the &apos;Create new receiving address&apos; button in the receive tab to create new addresses.
+Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressTableModel</name>
     <message>
-        <location filename="../addresstablemodel.cpp" line="+167"/>
-        <source>Label</source>
+        <source>(no label)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>(no label)</source>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
-        <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
-        <source>Passphrase Dialog</source>
-        <translation>Passphrase Dialog</translation>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Enter passphrase</source>
-        <translation>Enter passphrase</translation>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>New passphrase</source>
-        <translation>New passphrase</translation>
+        <source>Change passphrase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Repeat new passphrase</source>
-        <translation>Repeat new passphrase</translation>
+        <source>Confirm wallet encryption</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Show passphrase</source>
+        <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../askpassphrasedialog.cpp" line="+45"/>
         <source>Encrypt wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation type="unfinished"></translation>
+        <source>Enter passphrase</source>
+        <translation>Enter passphrase</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Unlock wallet</source>
+        <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Change passphrase</source>
+        <source>Enter the old passphrase and new passphrase for the wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>Confirm wallet encryption</source>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation type="unfinished"></translation>
+        <source>New passphrase</source>
+        <translation>New passphrase</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location line="+18"/>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation type="unfinished"></translation>
+        <source>Passphrase Dialog</source>
+        <translation>Passphrase Dialog</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+58"/>
-        <source>Wallet encrypted</source>
+        <source>Passphrase change failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Enter the old passphrase and new passphrase for the wallet.</source>
-        <translation type="unfinished"></translation>
+        <source>Repeat new passphrase</source>
+        <translation>Repeat new passphrase</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Continue</source>
+        <source>Show passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Back</source>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Wallet to be encrypted</source>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Your wallet is about to be encrypted. </source>
+        <source>The supplied passphrases do not match.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Your wallet is now encrypted. </source>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <source>Unlock wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+8"/>
-        <location line="+62"/>
-        <source>Wallet encryption failed</source>
+        <source>Wallet encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <source>Wallet encryption failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+62"/>
-        <source>The supplied passphrases do not match.</source>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-53"/>
-        <location line="+3"/>
-        <location line="+15"/>
-        <source>Wallet unlock failed</source>
+        <source>Wallet passphrase was successfully changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
-        <location line="+38"/>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <source>Wallet to be encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <source>Wallet unlock failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Wallet passphrase was successfully changed.</source>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+3"/>
-        <source>Passphrase change failed</source>
+        <source>Warning: The Caps Lock key is on!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <source>Your wallet is about to be encrypted. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+33"/>
-        <source>Warning: The Caps Lock key is on!</source>
+        <source>Your wallet is now encrypted. </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BanTableModel</name>
     <message>
-        <location filename="../bantablemodel.cpp" line="+85"/>
-        <source>IP/Netmask</source>
+        <source>Banned Until</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Banned Until</source>
+        <source>IP/Netmask</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BitcoinApplication</name>
     <message>
-        <location filename="../bitcoin.cpp" line="+251"/>
-        <source>Settings file %1 might be corrupt or invalid.</source>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
-        <source>Runaway exception</source>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <source>Internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Internal error</source>
+        <source>Runaway exception</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <source>Settings file %1 might be corrupt or invalid.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BitcoinGUI</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+258"/>
-        <source>&amp;Overview</source>
-        <translation>&amp;Overview</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Show general overview of wallet</source>
-        <translation>Show general overview of wallet</translation>
+        <source>%1 behind</source>
+        <translation>%1 behind</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>&amp;Transactions</source>
-        <translation>&amp;Transactions</translation>
+        <source>%1 client</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Browse transaction history</source>
-        <translation>Browse transaction history</translation>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
+        <translation type="unfinished">
+            <numerusform>%n active connection to Bitcoin network.</numerusform>
+            <numerusform>%n active connections to Bitcoin network.</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>E&amp;xit</source>
-        <translation>E&amp;xit</translation>
+        <source>&amp;About %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Quit application</source>
-        <translation>Quit application</translation>
+        <source>&amp;Backup Wallet…</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;About %1</source>
+        <source>&amp;Change Passphrase…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Show information about %1</source>
+        <source>&amp;Command-line options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>About &amp;Qt</source>
-        <translation>About &amp;Qt</translation>
+        <source>&amp;Encrypt Wallet…</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Show information about Qt</source>
-        <translation>Show information about Qt</translation>
+        <source>&amp;File</source>
+        <translation>&amp;File</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Modify configuration options for %1</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Help</source>
+        <translation>&amp;Help</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <source>Create a new wallet</source>
+        <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
-        <source>&amp;Minimize</source>
+        <source>&amp;Load PSBT from file…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
-        <source>Wallet:</source>
+        <source>&amp;Mask values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+418"/>
-        <source>Network activity disabled.</source>
-        <extracomment>A substring of the tooltip.</extracomment>
+        <source>&amp;Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
-        <source>Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
+        <source>&amp;Options…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1250"/>
-        <source>Send coins to a Bitcoin address</source>
-        <translation>Send coins to a Bitcoin address</translation>
+        <source>&amp;Overview</source>
+        <translation>&amp;Overview</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Backup wallet to another location</source>
-        <translation>Backup wallet to another location</translation>
+        <source>&amp;Receive</source>
+        <translation>&amp;Receive</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Change the passphrase used for wallet encryption</source>
-        <translation>Change the passphrase used for wallet encryption</translation>
+        <source>&amp;Receiving addresses</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-56"/>
         <source>&amp;Send</source>
         <translation>&amp;Send</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>&amp;Receive</source>
-        <translation>&amp;Receive</translation>
-    </message>
-    <message>
-        <location line="+38"/>
-        <source>&amp;Options…</source>
+        <source>&amp;Sending addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>&amp;Encrypt Wallet…</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Settings</source>
+        <translation>&amp;Settings</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Encrypt the private keys that belong to your wallet</translation>
+        <source>&amp;Transactions</source>
+        <translation>&amp;Transactions</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Backup Wallet…</source>
+        <source>&amp;Verify message…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Change Passphrase…</source>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Window</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>About &amp;Qt</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Sign &amp;message…</source>
+        <source>Amount: %1
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>Sign messages with your Bitcoin addresses to prove you own them</translation>
+        <source>Backup wallet to another location</source>
+        <translation>Backup wallet to another location</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Verify message…</source>
+        <source>Browse transaction history</source>
+        <translation>Browse transaction history</translation>
+    </message>
+    <message>
+        <source>Catching up…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>Change the passphrase used for wallet encryption</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Load PSBT from file…</source>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. &quot;More actions&quot; are available via the context menu.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Open &amp;URI…</source>
+        <source>Close All Wallets…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Close Wallet…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Create Wallet…</source>
+        <source>Close all wallets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Close All Wallets…</source>
+        <source>Close wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
-        <source>Restore and Migrate Wallet File…</source>
+        <source>Connecting to peers…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <source>&amp;File</source>
-        <translation>&amp;File</translation>
+        <source>Create Wallet…</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>&amp;Settings</source>
-        <translation>&amp;Settings</translation>
+        <source>Create a new wallet</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
-        <source>&amp;Help</source>
-        <translation>&amp;Help</translation>
+        <source>Ctrl+M</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Tabs toolbar</source>
-        <translation>Tabs toolbar</translation>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+482"/>
-        <source>Syncing Headers (%1%)…</source>
+        <source>Date: %1
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
-        <source>Synchronizing with network…</source>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Indexing blocks on disk…</source>
-        <translation type="unfinished"></translation>
+        <source>E&amp;xit</source>
+        <translation>E&amp;xit</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Processing blocks on disk…</source>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished"></translation>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>Encrypt the private keys that belong to your wallet</translation>
     </message>
     <message>
-        <location line="-913"/>
-        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished"></translation>
+        <source>Error</source>
+        <translation>Error</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>Show the list of used sending addresses and labels</source>
+        <source>Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Show the list of used receiving addresses and labels</source>
+        <source>Export Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>&amp;Command-line options</source>
+        <source>Export Successful</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="+824"/>
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation>
-            <numerusform>Processed %n block of transaction history.</numerusform>
-            <numerusform>Processed %n blocks of transaction history.</numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+23"/>
-        <source>%1 behind</source>
-        <translation>%1 behind</translation>
+        <source>Export a watch-only version of the current wallet that can be restored onto another node.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Catching up…</source>
+        <source>Export watch-only wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Last received block was generated %1 ago.</source>
-        <translation>Last received block was generated %1 ago.</translation>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transactions after this will not yet be visible.</source>
-        <translation>Transactions after this will not yet be visible.</translation>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Incoming transaction</source>
+        <translation>Incoming transaction</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Warning</source>
-        <translation>Warning</translation>
+        <source>Indexing blocks on disk…</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location line="-88"/>
-        <source>Up to date</source>
-        <translation>Up to date</translation>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-898"/>
-        <source>Ctrl+Q</source>
+        <source>Label: %1
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished"></translation>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>Last received block was generated %1 ago.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Load PSBT from &amp;clipboard…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
+        <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Node window</source>
+        <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Open node debugging and diagnostic console</source>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>&amp;Sending addresses</source>
+        <source>Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Receiving addresses</source>
+        <source>Mask the values in the Overview tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Open a bitcoin: URI</source>
+        <source>Migrate Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Open Wallet</source>
+        <source>Migrate a wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Open a wallet</source>
+        <source>Modify configuration options for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Close wallet</source>
+        <source>Network activity disabled.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Restore Wallet…</source>
-        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <source>No wallets available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Restore a wallet from a backup file</source>
-        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <source>Node window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Close all wallets</source>
+        <source>Open &amp;URI…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Migrate Wallet</source>
+        <source>Open Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Migrate a wallet</source>
+        <source>Open a bitcoin: URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <source>Open a wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Mask values</source>
+        <source>Open node debugging and diagnostic console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mask the values in the Overview tab</source>
+        <source>Original message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <location line="+63"/>
-        <source>No wallets available</source>
+        <source>Pre-syncing Headers (%1%)…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+65"/>
-        <source>Wallet Data</source>
-        <extracomment>Name of the wallet data file format.</extracomment>
+        <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation>
+            <numerusform>Processed %n block of transaction history.</numerusform>
+            <numerusform>Processed %n blocks of transaction history.</numerusform>
+        </translation>
+    </message>
     <message>
-        <location line="-62"/>
-        <source>Load Wallet Backup</source>
-        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <source>Processing blocks on disk…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Restore Wallet</source>
-        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <source>Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+63"/>
-        <source>Wallet Name</source>
-        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <source>Quit application</source>
+        <translation>Quit application</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
-        <source>Invalid Wallet Name</source>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Wallet name cannot be empty</source>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>Restore and Migrate Wallet Backup</source>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Restore and Migrate Wallet</source>
         <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
-        <source>&amp;Window</source>
-        <translation type="unfinished">&amp;Window</translation>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+M</source>
+        <source>Restore and Migrate Wallet File…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Zoom</source>
+        <source>S&amp;how</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Main Window</source>
+        <source>Save Watch-only Wallet Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
-        <source>%1 client</source>
-        <translation type="unfinished"></translation>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Send coins to a Bitcoin address</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <source>Sent transaction</source>
+        <translation>Sent transaction</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>S&amp;how</source>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The &quot;Peers tab&quot; is an element of the &quot;Node window&quot;.</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="+118"/>
-        <source>%n active connection(s) to Bitcoin network.</source>
-        <extracomment>A substring of the tooltip.</extracomment>
-        <translation type="unfinished">
-            <numerusform>%n active connection to Bitcoin network.</numerusform>
-            <numerusform>%n active connections to Bitcoin network.</numerusform>
-        </translation>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>Show general overview of wallet</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Click for more actions.</source>
-        <extracomment>A substring of the tooltip. &quot;More actions&quot; are available via the context menu.</extracomment>
+        <source>Show information about %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Show Peers tab</source>
-        <extracomment>A context menu item. The &quot;Peers tab&quot; is an element of the &quot;Node window&quot;.</extracomment>
-        <translation type="unfinished"></translation>
+        <source>Show information about Qt</source>
+        <translation>Show information about Qt</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Disable network activity</source>
-        <extracomment>A context menu item.</extracomment>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Enable network activity</source>
-        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <source>Show the list of used receiving addresses and labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Pre-syncing Headers (%1%)…</source>
+        <source>Show the list of used sending addresses and labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
-        <source>Error: %1</source>
+        <source>Sign &amp;message…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Warning: %1</source>
-        <translation type="unfinished"></translation>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>Sign messages with your Bitcoin addresses to prove you own them</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <source>Date: %1
-</source>
+        <source>Synchronizing with network…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Amount: %1
-</source>
+        <source>Syncing Headers (%1%)…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Wallet: %1
-</source>
-        <translation type="unfinished"></translation>
+        <source>Tabs toolbar</source>
+        <translation>Tabs toolbar</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Type: %1
-</source>
+        <source>The wallet has been exported to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Label: %1
-</source>
-        <translation type="unfinished"></translation>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>Transactions after this will not yet be visible.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Address: %1
+        <source>Type: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Sent transaction</source>
-        <translation>Sent transaction</translation>
+        <source>Up to date</source>
+        <translation>Up to date</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Incoming transaction</source>
-        <translation>Incoming transaction</translation>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <source>Original message:</source>
+        <source>Wallet:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CoinControlDialog</name>
     <message>
-        <location filename="../forms/coincontroldialog.ui" line="+14"/>
-        <source>Coin Selection</source>
+        <source>Wallet: %1
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>Quantity:</source>
+        <source>Warning</source>
+        <translation>Warning</translation>
+    </message>
+    <message>
+        <source>Warning: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Bytes:</source>
+        <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CoinControlDialog</name>
     <message>
-        <location line="+45"/>
-        <source>Amount:</source>
+        <source>&amp;Copy address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Fee:</source>
+        <source>&amp;Unlock unspent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>After Fee:</source>
+        <source>(%1 locked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Change:</source>
+        <source>(change)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
-        <source>(un)select all</source>
+        <source>(no label)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Tree mode</source>
+        <source>(un)select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>List mode</source>
+        <source>After Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>Amount</source>
         <translation type="unfinished">Amount</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Received with label</source>
+        <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Received with address</source>
+        <source>Bytes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Date</source>
-        <translation type="unfinished">Date</translation>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coin Selection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Confirmations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Confirmed</source>
         <translation type="unfinished">Confirmed</translation>
     </message>
     <message>
-        <location filename="../coincontroldialog.cpp" line="+65"/>
-        <source>Copy amount</source>
+        <source>Copy &amp;amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-11"/>
-        <source>&amp;Copy address</source>
+        <source>Copy &amp;label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;label</source>
+        <source>Copy after fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;amount</source>
+        <source>Copy amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy transaction &amp;ID and output index</source>
+        <source>Copy bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>L&amp;ock unspent</source>
+        <source>Copy change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Unlock unspent</source>
+        <source>Copy fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy quantity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Copy fee</source>
+        <source>Copy transaction &amp;ID and output index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy after fee</source>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy bytes</source>
+        <source>L&amp;ock unspent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy change</source>
+        <source>List mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
-        <source>(%1 locked)</source>
+        <source>Quantity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <source>Received with address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <location line="+54"/>
-        <source>(no label)</source>
+        <source>Received with label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
-        <source>change from %1 (%2)</source>
+        <source>Tree mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>(change)</source>
+        <source>change from %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CreateWalletActivity</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="+250"/>
-        <source>Create Wallet</source>
-        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <source>Can&apos;t list signers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Create wallet failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Create wallet warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Can&apos;t list signers</source>
+        <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Too many external signers found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1183,265 +970,175 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
 <context>
     <name>CreateWalletDialog</name>
     <message>
-        <location filename="../forms/createwalletdialog.ui" line="+14"/>
-        <source>Create Wallet</source>
+        <source>Advanced Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>You are one step away from creating your new wallet!</source>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>&quot;External signing&quot; means using devices such as hardware wallets.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Please provide a name and, if desired, enable any advanced options</source>
+        <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Wallet Name</source>
+        <source>Create Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Wallet</source>
+        <source>Disable Private Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Encrypt Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Advanced Options</source>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <source>External signer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Disable Private Keys</source>
+        <source>Make Blank Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Make Blank Wallet</source>
+        <source>Please provide a name and, if desired, enable any advanced options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>External signer</source>
+        <source>Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createwalletdialog.cpp" line="+20"/>
-        <source>Create</source>
+        <source>Wallet Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>Compiled without external signing support (required for external signing)</source>
-        <extracomment>&quot;External signing&quot; means using devices such as hardware wallets.</extracomment>
+        <source>You are one step away from creating your new wallet!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
-        <location filename="../forms/editaddressdialog.ui" line="+14"/>
-        <source>Edit Address</source>
-        <translation>Edit Address</translation>
+        <source>&amp;Address</source>
+        <translation>&amp;Address</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Label</source>
         <translation>&amp;Label</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>The label associated with this address list entry</source>
+        <source>Address &quot;%1&quot; already exists as a receiving address with label &quot;%2&quot; and so cannot be added as a sending address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <source>Could not unlock wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>&amp;Address</source>
-        <translation>&amp;Address</translation>
+        <source>Edit Address</source>
+        <translation>Edit Address</translation>
     </message>
     <message>
-        <location filename="../editaddressdialog.cpp" line="+29"/>
-        <source>New sending address</source>
+        <source>Edit receiving address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Edit receiving address</source>
+        <source>Edit sending address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Edit sending address</source>
+        <source>New key generation failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
-        <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+        <source>New sending address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Address &quot;%1&quot; already exists as a receiving address with label &quot;%2&quot; and so cannot be added as a sending address.</source>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The entered address &quot;%1&quot; is already in the address book with label &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <source>Could not unlock wallet.</source>
+        <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>New key generation failed.</source>
+        <source>The label associated with this address list entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
-        <location filename="../freespacechecker.cpp" line="+21"/>
         <source>A new data directory will be created.</source>
         <translation>A new data directory will be created.</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>name</source>
-        <translation>name</translation>
+        <source>Cannot create data directory here.</source>
+        <translation>Cannot create data directory here.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
         <translation>Directory already exists. Add %1 if you intend to create a new directory here.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Path already exists, and is not a directory.</source>
         <translation>Path already exists, and is not a directory.</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Cannot create data directory here.</source>
-        <translation>Cannot create data directory here.</translation>
+        <source>name</source>
+        <translation>name</translation>
     </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
     <message>
-        <location filename="../utilitydialog.cpp" line="+36"/>
-        <source>version</source>
-        <translation type="unfinished">version</translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Command-line options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>version</source>
+        <translation type="unfinished">version</translation>
+    </message>
 </context>
 <context>
     <name>Intro</name>
     <message>
-        <location filename="../forms/intro.ui" line="+14"/>
-        <source>Welcome</source>
-        <translation>Welcome</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Welcome to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+189"/>
-        <source>Limit block chain storage to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source> GB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
+        <source>%1 will download and store a copy of the Bitcoin block chain.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-160"/>
-        <source>Use the default data directory</source>
-        <translation>Use the default data directory</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Use a custom data directory:</source>
-        <translation>Use a custom data directory:</translation>
-    </message>
-    <message>
-        <location filename="../intro.cpp" line="+54"/>
-        <source>Bitcoin</source>
-        <translation type="unfinished">Bitcoin</translation>
-    </message>
     <message numerus="yes">
-        <location line="+164"/>
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform>%n GB of space available</numerusform>
@@ -1449,7 +1146,13 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+2"/>
+        <source>(%n GB needed for full chain)</source>
+        <translation type="unfinished">
+            <numerusform>(%n GB needed for full chain)</numerusform>
+            <numerusform>(%n GB needed for full chain)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform>(of %n GB needed)</numerusform>
@@ -1457,68 +1160,90 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
-        <source>(%n GB needed for full chain)</source>
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
-            <numerusform>(%n GB needed for full chain)</numerusform>
-            <numerusform>(%n GB needed for full chain)</numerusform>
+            <numerusform>(sufficient to restore backups %n day old)</numerusform>
+            <numerusform>(sufficient to restore backups %n days old)</numerusform>
         </translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Choose data directory</source>
+        <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Approximately %1 GB of data will be stored in this directory.</source>
+        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="+9"/>
-        <source>(sufficient to restore backups %n day(s) old)</source>
-        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
-        <translation type="unfinished">
-            <numerusform>(sufficient to restore backups %n day old)</numerusform>
-            <numerusform>(sufficient to restore backups %n days old)</numerusform>
-        </translation>
+    <message>
+        <source>Bitcoin</source>
+        <translation type="unfinished">Bitcoin</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>%1 will download and store a copy of the Bitcoin block chain.</source>
+        <source>Choose data directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>The wallet will also be stored in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
-        <source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
+        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Use a custom data directory:</source>
+        <translation>Use a custom data directory:</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>Use the default data directory</translation>
+    </message>
+    <message>
+        <source>Welcome</source>
+        <translation>Welcome</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadWalletsActivity</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="+74"/>
         <source>Load Wallets</source>
         <extracomment>Title of progress window which is displayed when wallets are being loaded.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Loading wallets…</source>
         <extracomment>Descriptive text of the load wallets progress window which indicates to the user that wallets are currently being loaded.</extracomment>
         <translation type="unfinished"></translation>
@@ -1527,61 +1252,64 @@ Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
 <context>
     <name>MigrateWalletActivity</name>
     <message>
-        <location line="+94"/>
-        <source>Migrate wallet</source>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
-If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
-If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
-
-The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the &quot;Restore Wallet&quot; functionality.</source>
+        <source>If the node is pruned and the wallet was created before the pruned height, the migration process may fail trying to load the migrated wallet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load wallet after migration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Migrate Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <source>Migrate wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>The wallet &apos;%1&apos; was migrated successfully.</source>
+        <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the &quot;Restore Wallet&quot; functionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Watchonly scripts have been migrated to a new wallet named &apos;%1&apos;.</source>
+        <source>Migration Successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Solvable but not watched scripts have been migrated to a new wallet named &apos;%1&apos;.</source>
+        <source>Migration failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Restore and Migrate wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
 
 Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
@@ -1592,148 +1320,117 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Restore Wallet</source>
-        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <source>Solvable but not watched scripts have been migrated to a new wallet named &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <source>The wallet &apos;%1&apos; was migrated successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Migration failed</source>
+        <source>The wallet was not loaded after migration. You can open it from the &quot;File &gt; Open wallet&quot; menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Migration Successful</source>
+        <source>Watchonly scripts have been migrated to a new wallet named &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModalOverlay</name>
     <message>
-        <location filename="../forms/modaloverlay.ui" line="+14"/>
-        <source>Form</source>
-        <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-        <location line="+119"/>
-        <source>Recent transactions may not yet be visible, and therefore your wallet&apos;s balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source>Number of blocks left</source>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+26"/>
-        <location filename="../modaloverlay.cpp" line="+160"/>
-        <source>Unknown…</source>
+        <source>Estimated time left until synced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+20"/>
-        <source>calculating…</source>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-77"/>
         <source>Last block time</source>
         <translation type="unfinished">Last block time</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Progress</source>
+        <source>Number of blocks left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>Progress increase per hour</source>
+        <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Estimated time left until synced</source>
+        <source>Progress increase per hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>Hide</source>
+        <source>Recent transactions may not yet be visible, and therefore your wallet&apos;s balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Esc</source>
+        <source>Unknown. Pre-syncing Headers (%1, %2%)…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modaloverlay.cpp" line="-126"/>
-        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
-        <source>Unknown. Syncing Headers (%1, %2%)…</source>
+        <source>Unknown…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Unknown. Pre-syncing Headers (%1, %2%)…</source>
+        <source>calculating…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
-        <location filename="../forms/openuridialog.ui" line="+14"/>
         <source>Open bitcoin URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>URI:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
         <source>Paste address from clipboard</source>
         <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
         <translation type="unfinished">Paste address from clipboard</translation>
     </message>
+    <message>
+        <source>URI:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="-199"/>
-        <source>Open wallet failed</source>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Open wallet warning</source>
+        <source>Open wallet failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Open Wallet</source>
-        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <source>Open wallet warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation type="unfinished"></translation>
@@ -1742,453 +1439,360 @@ The migration process will create a backup of the wallet before migrating. This
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../forms/optionsdialog.ui" line="+14"/>
-        <source>Options</source>
-        <translation>Options</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancel</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>&amp;Display</translation>
+    </message>
+    <message>
+        <source>&amp;External signer script path</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Main</source>
         <translation>&amp;Main</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Automatically start %1 after logging in to the system.</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>&amp;Minimize to the tray instead of the taskbar</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Start %1 on system login</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Network</source>
+        <translation>&amp;Network</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
-        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
-        <translation type="unfinished"></translation>
+        <source>&amp;Port:</source>
+        <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Size of &amp;database cache</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;Reset Options</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Number of script &amp;verification threads</source>
+        <source>&amp;Show tray icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
-        <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
+        <source>&amp;Spend unconfirmed change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <source>&amp;Start %1 on system login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <source>&amp;Third-party transaction URLs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <location line="+187"/>
-        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>&amp;Unit to show amounts in:</translation>
     </message>
     <message>
-        <location line="-118"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <source>&amp;Window</source>
+        <translation>&amp;Window</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+169"/>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <source>Accept connections from outside.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <source>Font in the Overview tab: </source>
+        <source>Allow incomin&amp;g connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Options set in this dialog are overridden by the command line:</source>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Open the %1 configuration file from the working directory.</source>
+        <source>Automatically start %1 after logging in to the system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open Configuration File</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Reset all client options to default.</source>
-        <translation>Reset all client options to default.</translation>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>Choose the default subdivision unit to show in the interface and when sending coins.</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Reset Options</source>
-        <translation>&amp;Reset Options</translation>
+        <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-560"/>
-        <source>&amp;Network</source>
-        <translation>&amp;Network</translation>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
-        <source>Prune &amp;block storage to</source>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>&quot;External signing&quot; means using devices such as hardware wallets.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>GB</source>
+        <source>Configuration options</source>
+        <extracomment>Window title text of pop-up box that allows opening up of configuration file.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
+        <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
+        <translation>Confirm options reset</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>MiB</source>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor onion services.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
-        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <source>Current settings will be backed up at &quot;%1&quot;.</source>
+        <extracomment>Text explaining to the user that the client&apos;s current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location&apos;s path.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
-        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Enable R&amp;PC server</source>
         <extracomment>An Options window setting to enable the RPC server.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>W&amp;allet</source>
+        <source>Enable coin &amp;control features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Whether to set subtract fee from amount as default or not.</source>
-        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Wallets should be loaded at startup and kept active while pruning is enabled so they stay synchronized before old block data is deleted; wallets that fall behind pruned data may require a reindex. Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Subtract &amp;fee from amount by default</source>
-        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
     <message>
-        <location line="+7"/>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Enable coin &amp;control features</source>
+        <source>External Signer (e.g. hardware wallet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <source>Font in the Overview tab: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Spend unconfirmed change</source>
+        <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Enable &amp;PSBT controls</source>
-        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Whether to show PSBT controls.</source>
-        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>External Signer (e.g. hardware wallet)</source>
+        <source>IPv4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>&amp;External signer script path</source>
+        <source>IPv6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Accept connections from outside.</source>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Allow incomin&amp;g connections</source>
-        <translation type="unfinished"></translation>
+        <source>M&amp;inimize on close</source>
+        <translation>M&amp;inimize on close</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location line="+187"/>
-        <source>Proxy &amp;IP:</source>
-        <translation>Proxy &amp;IP:</translation>
-    </message>
-    <message>
-        <location line="-155"/>
-        <location line="+187"/>
-        <source>&amp;Port:</source>
-        <translation>&amp;Port:</translation>
-    </message>
-    <message>
-        <location line="-162"/>
-        <location line="+187"/>
-        <source>Port of the proxy (e.g. 9050)</source>
-        <translation>Port of the proxy (e.g. 9050)</translation>
-    </message>
-    <message>
-        <location line="-163"/>
-        <source>Used for reaching peers via:</source>
+        <source>MiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>IPv4</source>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>IPv6</source>
+        <source>Number of script &amp;verification threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Tor</source>
+        <source>Open Configuration File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
-        <source>&amp;Window</source>
-        <translation>&amp;Window</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show the icon in the system tray.</source>
+        <source>Open the %1 configuration file from the working directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Show tray icon</source>
-        <translation type="unfinished"></translation>
+        <source>Options</source>
+        <translation>Options</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Show only a tray icon after minimizing the window.</source>
-        <translation>Show only a tray icon after minimizing the window.</translation>
+        <source>Options set in this dialog are overridden by the command line:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>&amp;Minimize to the tray instead of the taskbar</translation>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>Port of the proxy (e.g. 9050)</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>M&amp;inimize on close</source>
-        <translation>M&amp;inimize on close</translation>
+        <source>Proxy &amp;IP:</source>
+        <translation>Proxy &amp;IP:</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>&amp;Display</source>
-        <translation>&amp;Display</translation>
+        <source>Prune &amp;block storage to</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>User Interface &amp;language:</source>
-        <translation>User Interface &amp;language:</translation>
+        <source>Reset all client options to default.</source>
+        <translation>Reset all client options to default.</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&amp;Unit to show amounts in:</source>
-        <translation>&amp;Unit to show amounts in:</translation>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Choose the default subdivision unit to show in the interface and when sending coins.</translation>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>Show only a tray icon after minimizing the window.</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+13"/>
-        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <source>Show the icon in the system tray.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>&amp;Third-party transaction URLs</source>
+        <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-507"/>
-        <source>Whether to show coin control features or not.</source>
+        <source>Size of &amp;database cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
-        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <source>The configuration file could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+424"/>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source>
+        <extracomment>Explanatory text about the priority order of instructions considered by client. The order from high to low being: command-line, configuration file, GUI settings.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancel</translation>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>The supplied proxy address is invalid.</translation>
     </message>
     <message>
-        <location filename="../optionsdialog.cpp" line="+145"/>
-        <source>Compiled without external signing support (required for external signing)</source>
-        <extracomment>&quot;External signing&quot; means using devices such as hardware wallets.</extracomment>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>default</source>
-        <translation>default</translation>
-    </message>
-    <message>
-        <location line="+77"/>
-        <source>none</source>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
-        <source>Confirm options reset</source>
-        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
-        <translation>Confirm options reset</translation>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
-        <location line="+81"/>
-        <source>Client restart required to activate changes.</source>
-        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
+        <source>This change would require a client restart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-77"/>
-        <source>Current settings will be backed up at &quot;%1&quot;.</source>
-        <extracomment>Text explaining to the user that the client&apos;s current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location&apos;s path.</extracomment>
+        <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Client will be shut down. Do you want to proceed?</source>
-        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Configuration options</source>
-        <extracomment>Window title text of pop-up box that allows opening up of configuration file.</extracomment>
+        <source>Used for reaching peers via:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source>
-        <extracomment>Explanatory text about the priority order of instructions considered by client. The order from high to low being: command-line, configuration file, GUI settings.</extracomment>
-        <translation type="unfinished"></translation>
+        <source>User Interface &amp;language:</source>
+        <translation>User Interface &amp;language:</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Continue</source>
+        <source>W&amp;allet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Cancel</source>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>The configuration file could not be opened.</source>
+        <source>Whether to show coin control features or not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>This change would require a client restart.</source>
-        <translation type="unfinished"></translation>
+        <source>default</source>
+        <translation>default</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>The supplied proxy address is invalid.</source>
-        <translation>The supplied proxy address is invalid.</translation>
+        <source>none</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OptionsModel</name>
     <message>
-        <location filename="../optionsmodel.cpp" line="+226"/>
         <source>Could not read setting &quot;%1&quot;, %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2196,205 +1800,161 @@ The migration process will create a backup of the wallet before migrating. This
 <context>
     <name>OverviewPage</name>
     <message>
-        <location filename="../forms/overviewpage.ui" line="+14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <location line="+220"/>
-        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation>
-    </message>
-    <message>
-        <location line="-88"/>
         <source>Available:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Your current spendable balance</source>
-        <translation>Your current spendable balance</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Pending:</source>
+        <source>Balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</translation>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Immature:</source>
         <translation>Immature:</translation>
     </message>
     <message>
-        <location line="-29"/>
         <source>Mined balance that has not yet matured</source>
         <translation>Mined balance that has not yet matured</translation>
     </message>
     <message>
-        <location line="-93"/>
-        <source>Balances</source>
+        <source>Pending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
-        <source>Total:</source>
-        <translation>Total:</translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Your current total balance</source>
-        <translation>Your current total balance</translation>
+        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Recent transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../overviewpage.cpp" line="+176"/>
-        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished"></translation>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+        <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation>
     </message>
-</context>
-<context>
-    <name>PSBTOperationsDialog</name>
     <message>
-        <location filename="../forms/psbtoperationsdialog.ui" line="+14"/>
-        <source>PSBT Operations</source>
-        <translation type="unfinished"></translation>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</translation>
     </message>
     <message>
-        <location line="+72"/>
-        <source>Sign Tx</source>
-        <translation type="unfinished"></translation>
+        <source>Total:</source>
+        <translation>Total:</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Broadcast Tx</source>
-        <translation type="unfinished"></translation>
+        <source>Your current spendable balance</source>
+        <translation>Your current spendable balance</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished"></translation>
+        <source>Your current total balance</source>
+        <translation>Your current total balance</translation>
     </message>
+</context>
+<context>
+    <name>PSBTOperationsDialog</name>
     <message>
-        <location line="+7"/>
-        <source>Save…</source>
+        <source>(But no wallet is loaded.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Close</source>
+        <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../psbtoperationsdialog.cpp" line="+64"/>
-        <source>Failed to load transaction: %1</source>
+        <source>(But this wallet does not have the right keys.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Failed to sign transaction: %1</source>
+        <source>Broadcast Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Cannot sign inputs while wallet is locked.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Could not sign any more inputs.</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="+2"/>
-        <source>Signed %n input(s), but more signatures are still required.</source>
-        <translation type="unfinished">
-            <numerusform>Signed %n input, but more signatures are still required.</numerusform>
-            <numerusform>Signed %n inputs, but more signatures are still required.</numerusform>
-        </translation>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <source>Could not sign any more inputs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Unknown error processing transaction.</source>
+        <source>Failed to load transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <source>Failed to sign transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Transaction broadcast failed: %1</source>
+        <source>PSBT Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Save Transaction Data</source>
+        <source>PSBT saved to disk.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>PSBT saved to disk.</source>
+        <source>Pays transaction fee: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Sends %1 to %2</source>
+        <source>Save Transaction Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>own address</source>
+        <source>Save…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <source>Sends %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Pays transaction fee: </source>
+        <source>Sign Tx</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Signed %n input, but more signatures are still required.</numerusform>
+            <numerusform>Signed %n inputs, but more signatures are still required.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Total Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>or</source>
+        <source>Transaction broadcast failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+6"/>
         <source>Transaction has %n unsigned input(s).</source>
         <translation type="unfinished">
             <numerusform>Transaction has %n unsigned input.</numerusform>
@@ -2402,315 +1962,195 @@ The migration process will create a backup of the wallet before migrating. This
         </translation>
     </message>
     <message>
-        <location line="+46"/>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Transaction still needs signature(s).</source>
+        <source>Transaction status is unknown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>(But no wallet is loaded.)</source>
+        <source>Transaction still needs signature(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>(But this wallet cannot sign transactions.)</source>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>(But this wallet does not have the right keys.)</source>
+        <source>Unknown error processing transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Transaction is fully signed and ready for broadcast.</source>
+        <source>or</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Transaction status is unknown.</source>
+        <source>own address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PaymentServer</name>
     <message>
-        <location filename="../paymentserver.cpp" line="+145"/>
-        <source>Payment request error</source>
+        <source>&apos;bitcoin://&apos; is not a valid URI. Use &apos;bitcoin:&apos; instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <source>Cannot process payment request because BIP70 is not supported.
+Due to widespread security flaws in BIP70 it&apos;s strongly recommended that any merchant instructions to switch wallets be ignored.
+If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location line="+16"/>
-        <location line="+6"/>
-        <location line="+7"/>
-        <source>URI handling</source>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <source>&apos;bitcoin://&apos; is not a valid URI. Use &apos;bitcoin:&apos; instead.</source>
+        <source>Payment request error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+23"/>
-        <source>Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it&apos;s strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
+        <source>Payment request file handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Payment request file handling</source>
+        <source>URI handling</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PeerTableModel</name>
     <message>
-        <location filename="../peertablemodel.h" line="+112"/>
-        <source>User Agent</source>
-        <extracomment>Title of Peers Table column which contains the peer&apos;s User Agent string.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-9"/>
-        <source>Ping</source>
-        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>Peer</source>
-        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Age</source>
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Direction</source>
         <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Sent</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Type</source>
-        <extracomment>Title of Peers Table column which describes the type of peer connection. The &quot;type&quot; describes why the connection exists.</extracomment>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network</source>
         <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
         <translation type="unfinished">Network</translation>
     </message>
     <message>
-        <location filename="../peertablemodel.cpp" line="+77"/>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Outbound</source>
         <extracomment>An Outbound Connection to a Peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../bitcoinunits.cpp" line="+197"/>
-        <source>Amount</source>
-        <translation type="unfinished">Amount</translation>
-    </message>
-    <message>
-        <location filename="../guiutil.cpp" line="+138"/>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+288"/>
-        <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+257"/>
-        <source>Unroutable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>IPv4</source>
-        <comment>network name</comment>
-        <extracomment>Name of IPv4 network in peer info</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location line="+2"/>
-        <source>IPv6</source>
-        <comment>network name</comment>
-        <extracomment>Name of IPv6 network in peer info</extracomment>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Onion</source>
-        <comment>network name</comment>
-        <extracomment>Name of Tor network in peer info</extracomment>
+        <source>Ping</source>
+        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>I2P</source>
-        <comment>network name</comment>
-        <extracomment>Name of I2P network in peer info</extracomment>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>CJDNS</source>
-        <comment>network name</comment>
-        <extracomment>Name of CJDNS network in peer info</extracomment>
+        <source>Sent</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Inbound</source>
-        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The &quot;type&quot; describes why the connection exists.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Outbound</source>
-        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <source>User Agent</source>
+        <extracomment>Title of Peers Table column which contains the peer&apos;s User Agent string.</extracomment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <location line="+5"/>
-        <source>Full Relay</source>
-        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <source>%1 B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Block Relay</source>
-        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <source>%1 GB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Manual</source>
-        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Feeler</source>
-        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <source>%1 and %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Address Fetch</source>
-        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <source>%1 d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Private Broadcast</source>
-        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <source>%1 didn&apos;t yet exit safely…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+12"/>
-        <source>%1 d</source>
+        <source>%1 h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-11"/>
-        <location line="+12"/>
-        <source>%1 h</source>
+        <source>%1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-11"/>
-        <location line="+12"/>
         <source>%1 m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
-        <location line="+26"/>
-        <source>%1 s</source>
+        <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>None</source>
+        <source>%1 s</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+6"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n day</numerusform>
+            <numerusform>%n days</numerusform>
+        </translation>
     </message>
     <message numerus="yes">
-        <location line="+18"/>
-        <source>%n second(s)</source>
-        <translation>
-            <numerusform>%n second</numerusform>
-            <numerusform>%n seconds</numerusform>
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n hour</numerusform>
+            <numerusform>%n hours</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+4"/>
         <source>%n minute(s)</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -2718,37 +2158,20 @@ If you are receiving this error you should request the merchant provide a BIP21
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+4"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform>%n hour</numerusform>
-            <numerusform>%n hours</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location line="+4"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished">
-            <numerusform>%n day</numerusform>
-            <numerusform>%n days</numerusform>
+        <source>%n second(s)</source>
+        <translation>
+            <numerusform>%n second</numerusform>
+            <numerusform>%n seconds</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+4"/>
-        <location line="+6"/>
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform>%n week</numerusform>
             <numerusform>%n weeks</numerusform>
         </translation>
     </message>
-    <message>
-        <location line="+0"/>
-        <source>%1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location line="+0"/>
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform>%n year</numerusform>
@@ -2756,780 +2179,641 @@ If you are receiving this error you should request the merchant provide a BIP21
         </translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>%1 B</source>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../rpcconsole.cpp" line="+985"/>
-        <source>%1 kB</source>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../rpcconsole.cpp" line="+1"/>
-        <location line="+1"/>
-        <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <source>Amount</source>
+        <translation type="unfinished">Amount</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>%1 GB</source>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
-        <source>default wallet</source>
+        <source>CJDNS</source>
+        <comment>network name</comment>
+        <extracomment>Name of CJDNS network in peer info</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitcoin.cpp" line="-288"/>
-        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
-        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
-        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <source>Custom…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+418"/>
-        <source>Error: %1</source>
+        <source>Default system font &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
-        <source>%1 didn&apos;t yet exit safely…</source>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modaloverlay.cpp" line="-40"/>
-        <source>unknown</source>
+        <source>Embedded &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../optionsdialog.cpp" line="-385"/>
-        <source>Embedded &quot;%1&quot;</source>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Default system font &quot;%1&quot;</source>
+        <source>Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Custom…</source>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
     <message>
-        <location filename="../qrimagewidget.cpp" line="+28"/>
-        <source>&amp;Save Image…</source>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Copy Image</source>
+        <source>I2P</source>
+        <comment>network name</comment>
+        <extracomment>Name of I2P network in peer info</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <source>IPv4</source>
+        <comment>network name</comment>
+        <extracomment>Name of IPv4 network in peer info</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Error encoding URI into QR Code.</source>
+        <source>IPv6</source>
+        <comment>network name</comment>
+        <extracomment>Name of IPv6 network in peer info</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>QR code support not available.</source>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
-        <source>Save QR Code</source>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>PNG Image</source>
-        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
-        <translation type="unfinished"></translation>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <location filename="../forms/debugwindow.ui" line="+75"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+26"/>
-        <location line="+36"/>
-        <location line="+23"/>
-        <location line="+71"/>
-        <location line="+23"/>
-        <location line="+36"/>
-        <location line="+23"/>
-        <location line="+767"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+29"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location filename="../rpcconsole.h" line="+147"/>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>None</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1736"/>
-        <source>Client version</source>
-        <translation>Client version</translation>
+        <source>Onion</source>
+        <comment>network name</comment>
+        <extracomment>Name of Tor network in peer info</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
-        <source>&amp;Information</source>
-        <translation>&amp;Information</translation>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>General</source>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
-        <source>Datadir</source>
+        <source>Unroutable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>To specify a non-default location of the data directory use the &apos;%1&apos; option.</source>
+        <source>default wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Blocksdir</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
     <message>
-        <location line="+10"/>
-        <source>To specify a non-default location of the blocks directory use the &apos;%1&apos; option.</source>
+        <source>&amp;Copy Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Startup time</source>
-        <translation>Startup time</translation>
+        <source>&amp;Save Image…</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location line="+1054"/>
-        <source>Network</source>
-        <translation>Network</translation>
+        <source>Error encoding URI into QR Code.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1047"/>
-        <source>Name</source>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Number of connections</source>
-        <translation>Number of connections</translation>
+        <source>QR code support not available.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Local Addresses</source>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
+        <source>Save QR Code</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <location line="+13"/>
-        <source>Block chain</source>
-        <translation>Block chain</translation>
+        <source>&amp;Console</source>
+        <translation>&amp;Console</translation>
     </message>
     <message>
-        <location line="+59"/>
-        <source>Memory Pool</source>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer&apos;s IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Current number of transactions</source>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Memory usage</source>
+        <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
-        <source>Wallet: </source>
+        <source>&amp;Information</source>
+        <translation>&amp;Information</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>(none)</source>
+        <source>&amp;Open</source>
+        <translation>&amp;Open</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
         <source>&amp;Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
-        <location line="+812"/>
-        <source>Received</source>
+        <source>&amp;Unban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-732"/>
-        <location line="+709"/>
-        <source>Sent</source>
+        <source>(none)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-668"/>
-        <source>&amp;Peers</source>
+        <source>(peer: %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Banned peers</source>
+        <source>1 &amp;hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location filename="../rpcconsole.cpp" line="+166"/>
-        <source>Select a peer to view detailed information.</source>
+        <source>1 &amp;week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Hide Peers Detail</source>
+        <source>1 &amp;year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Ctrl+X</source>
+        <source>1 d&amp;ay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>The transport layer version: %1</source>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Transport</source>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Session ID</source>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>Version</source>
+        <source>Ban for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
-        <source>Whether we relay transactions to this peer.</source>
+        <source>Banned peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Transaction Relay</source>
-        <translation type="unfinished"></translation>
+        <source>Block chain</source>
+        <translation>Block chain</translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>Synced Headers</source>
+        <source>Blocksdir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Synced Blocks</source>
-        <translation type="unfinished"></translation>
+        <source>Clear console</source>
+        <translation>Clear console</translation>
     </message>
     <message>
-        <location line="+75"/>
-        <source>Last Transaction</source>
-        <translation type="unfinished"></translation>
+        <source>Client version</source>
+        <translation>Client version</translation>
     </message>
     <message>
-        <location line="+210"/>
-        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <source>Connection Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Mapped AS</source>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Whether we relay addresses to this peer.</source>
-        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Address Relay</source>
-        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
-        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
-        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
-        <source>Addresses Processed</source>
-        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Addresses Rate-Limited</source>
-        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1703"/>
-        <location line="+1213"/>
-        <source>User Agent</source>
+        <source>Ctrl+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1287"/>
-        <source>Node window</source>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
         <source>Current block height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
-        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <source>Current number of transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
-        <source>Decrease font size</source>
+        <source>Datadir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Increase font size</source>
-        <translation type="unfinished"></translation>
+        <source>Debug log file</source>
+        <translation>Debug log file</translation>
     </message>
     <message>
-        <location line="+621"/>
-        <source>Permissions</source>
+        <source>Decrease font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>The direction and type of peer connection: %1</source>
+        <source>Direction/Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Direction/Type</source>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>The BIP324 session ID string in hex.</source>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <source>Executing command using &quot;%1&quot; wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
-        <source>Services</source>
+        <source>Executing command without any wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>High Bandwidth</source>
+        <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
-        <source>Connection Time</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <source>Hide Peers Detail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Last Block</source>
+        <source>High Bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Last Send</source>
+        <source>In:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Last Receive</source>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
-        <source>Ping Time</source>
+        <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>The duration of a currently outstanding ping.</source>
+        <source>Last Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ping Wait</source>
+        <source>Last Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Min Ping</source>
+        <source>Last Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Time Offset</source>
+        <source>Last Transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1362"/>
         <source>Last block time</source>
         <translation>Last block time</translation>
     </message>
     <message>
-        <location line="+110"/>
-        <source>&amp;Open</source>
-        <translation>&amp;Open</translation>
+        <source>Local Addresses</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>&amp;Console</source>
-        <translation>&amp;Console</translation>
+        <source>Mapped AS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
-        <source>&amp;Network Traffic</source>
+        <source>Memory Pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>Totals</source>
+        <source>Memory usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-216"/>
-        <source>In:</source>
+        <source>Min Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Out:</source>
-        <translation type="unfinished"></translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <location filename="../forms/debugwindow.ui" line="-291"/>
-        <source>Debug log file</source>
-        <translation>Debug log file</translation>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
-        <source>Clear console</source>
-        <translation>Clear console</translation>
+        <source>Network</source>
+        <translation>Network</translation>
     </message>
     <message>
-        <location filename="../rpcconsole.h" line="-1"/>
-        <source>Yes</source>
+        <source>Network activity disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>No</source>
+        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>To</source>
+        <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>From</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Ban for</source>
+        <source>Node window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Never</source>
+        <source>Node window - [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-472"/>
-        <source>Inbound: initiated by peer</source>
-        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Outbound Full Relay: default</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <source>Number of connections</source>
+        <translation>Number of connections</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Outbound Block Relay: does not relay transactions or addresses</source>
         <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
         <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Outbound Feeler: short-lived, for testing addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <source>Ping Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>detecting: peer could be v1 or v2</source>
-        <extracomment>Explanatory text for &quot;detecting&quot; transport type.</extracomment>
+        <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>v1: unencrypted, plaintext transport protocol</source>
-        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <source>Select a peer to view detailed information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>v2: BIP324 encrypted transport protocol</source>
-        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>we selected the peer for high bandwidth relay</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>the peer selected us for high bandwidth relay</source>
+        <source>Session ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>no high bandwidth relay selected</source>
-        <translation type="unfinished"></translation>
+        <source>Startup time</source>
+        <translation>Startup time</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Ctrl++</source>
-        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <source>Synced Blocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Ctrl+=</source>
-        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <source>Synced Headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Ctrl+-</source>
-        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <source>The BIP324 session ID string in hex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Ctrl+_</source>
-        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <source>The direction and type of peer connection: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
-        <source>&amp;Copy address</source>
-        <extracomment>Context menu action to copy the address of a peer.</extracomment>
+        <source>The duration of a currently outstanding ping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Disconnect</source>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>1 &amp;hour</source>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>1 d&amp;ay</source>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>1 &amp;week</source>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>1 &amp;year</source>
+        <source>The transport layer version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>&amp;Copy IP/Netmask</source>
-        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer&apos;s IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
+        <source>Time Offset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Unban</source>
+        <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
-        <source>Network activity disabled</source>
+        <source>To specify a non-default location of the blocks directory use the &apos;%1&apos; option.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>None</source>
+        <source>To specify a non-default location of the data directory use the &apos;%1&apos; option.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
-        <source>Executing command without any wallet</source>
+        <source>Totals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+321"/>
-        <source>Ctrl+I</source>
+        <source>Transaction Relay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Ctrl+T</source>
+        <source>Transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Ctrl+N</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Ctrl+P</source>
+        <source>User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Node window - [%1]</source>
+        <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
-        <source>Executing command using &quot;%1&quot; wallet</source>
+        <source>Wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-161"/>
         <source>Welcome to the %1 RPC console.
 Use up and down arrows to navigate history, and %2 to clear screen.
 Use %3 and %4 to increase or decrease the font size.
@@ -3541,293 +2825,263 @@ For more information on using this console, type %6.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
-        <source>Executing…</source>
-        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <source>(peer: %1)</source>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for &quot;detecting&quot; transport type.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>via %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rpcconsole.h" line="-41"/>
-        <source>Unknown</source>
+        <source>we selected the peer for high bandwidth relay</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
-        <location filename="../forms/receivecoinsdialog.ui" line="+37"/>
         <source>&amp;Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Label:</translation>
-    </message>
-    <message>
-        <location line="-30"/>
-        <source>&amp;Message:</source>
+        <source>&amp;Copy address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+        <source>&amp;Create new receiving address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>An optional label to associate with the new receiving address.</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Label:</source>
+        <translation type="unfinished">&amp;Label:</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <source>&amp;Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
-        <location line="+159"/>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-127"/>
         <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>An optional message that is attached to the payment request and may be displayed to the sender.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>&amp;Create new receiving address</source>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Clear all fields of the form.</source>
+        <source>Base58 (Legacy)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Clear</source>
+        <source>Base58 (P2SH-SegWit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
-        <source>Requested payments history</source>
+        <source>Bech32 (SegWit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <source>Bech32m (BIP-350) is an upgrade to Bech32, wallet support is still limited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show</source>
+        <source>Bech32m (Taproot)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Remove the selected entries from the list</source>
+        <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Remove</source>
+        <source>Clear all fields of the form.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../receivecoinsdialog.cpp" line="+46"/>
         <source>Copy &amp;URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Copy address</source>
+        <source>Copy &amp;amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy &amp;label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy &amp;message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;amount</source>
+        <source>Could not generate new %1 address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Base58 (Legacy)</source>
+        <source>Could not unlock wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Not recommended due to higher fees and less protection against typos.</source>
+        <source>Generates a native segwit address (BIP-173). Some old wallets don&apos;t support it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Base58 (P2SH-SegWit)</source>
+        <source>Generates an address compatible with older wallets.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Generates an address compatible with older wallets.</source>
+        <source>Not recommended due to higher fees and less protection against typos.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Bech32 (SegWit)</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Generates a native segwit address (BIP-173). Some old wallets don&apos;t support it.</source>
+        <source>Remove the selected entries from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Bech32m (Taproot)</source>
+        <source>Requested payments history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Bech32m (BIP-350) is an upgrade to Bech32, wallet support is still limited.</source>
+        <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
-        <source>Could not unlock wallet.</source>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Could not generate new %1 address</source>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
-        <location filename="../forms/receiverequestdialog.ui" line="+14"/>
-        <source>Request payment to …</source>
+        <source>&amp;Save Image…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Address:</source>
+        <source>&amp;Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Amount:</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Label:</source>
+        <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Message:</source>
+        <source>Copy &amp;Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Wallet:</source>
+        <source>Copy &amp;URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Copy &amp;URI</source>
+        <source>Label:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Copy &amp;Address</source>
+        <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>&amp;Verify</source>
+        <source>Payment information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Verify this address on e.g. a hardware wallet screen</source>
+        <source>Request payment to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>&amp;Save Image…</source>
+        <source>Request payment to …</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../receiverequestdialog.cpp" line="+46"/>
-        <source>Request payment to %1</source>
+        <source>Verify this address on e.g. a hardware wallet screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/receiverequestdialog.ui" line="-234"/>
-        <source>Payment information</source>
+        <source>Wallet:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
     <message>
-        <location filename="../recentrequeststablemodel.cpp" line="+34"/>
-        <source>Date</source>
-        <translation type="unfinished">Date</translation>
+        <source>(no amount requested)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Label</source>
+        <source>(no label)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Message</source>
+        <source>(no message)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>(no label)</source>
-        <translation type="unfinished"></translation>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>(no message)</source>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>(no amount requested)</source>
+        <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Requested</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3835,596 +3089,470 @@ For more information on using this console, type %6.
 <context>
     <name>RestoreWalletActivity</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="+50"/>
         <source>Restore Wallet</source>
         <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Restore wallet failed</source>
-        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore wallet warning</source>
         <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Restore wallet message</source>
-        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
-        <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
-        <location filename="../sendcoinsdialog.cpp" line="+758"/>
-        <source>Send Coins</source>
-        <translation>Send Coins</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>Coin Control Features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>automatically selected</source>
+        <source>%1 (%2 blocks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Insufficient funds!</source>
+        <source>%1 from wallet &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
-        <source>Quantity:</source>
+        <source>%1 kvB</source>
+        <comment>PSBT transaction creation</comment>
+        <extracomment>When reviewing a newly created PSBT (via Send flow), the transaction fee is shown, with &quot;virtual size&quot; of the transaction displayed for context</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <source>Bytes:</source>
+        <source>%1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>Amount:</source>
+        <source>%1 to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Fee:</source>
+        <source>%1/kvB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>After Fee:</source>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Change:</source>
+        <source>(no label)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Custom change address</source>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
-        <source>Transaction Fee:</source>
-        <translation type="unfinished"></translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Add &amp;Recipient</translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
+        <source>After Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Warning: Fee estimation is currently not possible.</source>
+        <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
-        <source>per kilobyte</source>
-        <translation type="unfinished"></translation>
+        <source>Balance:</source>
+        <translation>Balance:</translation>
     </message>
     <message>
-        <location line="-53"/>
-        <source>Hide</source>
+        <source>Bytes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Recommended:</source>
+        <source>Change:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Custom:</source>
+        <source>Choose…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+215"/>
-        <source>Send to multiple recipients at once</source>
-        <translation>Send to multiple recipients at once</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Add &amp;Recipient</source>
-        <translation>Add &amp;Recipient</translation>
+        <source>Clear &amp;All</source>
+        <translation>Clear &amp;All</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>Clear all fields of the form.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1010"/>
-        <source>Inputs…</source>
+        <source>Coin Control Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+608"/>
-        <source>Choose…</source>
+        <source>Confirm custom change address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
-        <source>Hide transaction fee settings</source>
+        <source>Confirm send coins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Specify a custom fee per kB (1,000 bytes) of the transaction&apos;s virtual size.
-
-Note:  Since the fee is calculated on a per-byte basis, a fee rate of &quot;100 satoshis per kvB&quot; for a transaction size of 500 virtual bytes (half of 1 kvB) would ultimately yield a fee of only 50 satoshis.</source>
-        <translation type="unfinished"></translation>
+        <source>Confirm the send action</source>
+        <translation>Confirm the send action</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <source>Confirmation time target:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <source>Connect your hardware wallet first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
+        <source>Copy after fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Confirmation time target:</source>
+        <source>Copy amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
-        <source>Enable Replace-By-Fee</source>
+        <source>Copy bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>With Replace-By-Fee (BIP-125) you can increase a transaction&apos;s fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source>
+        <source>Copy change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>Clear &amp;All</source>
-        <translation>Clear &amp;All</translation>
-    </message>
-    <message>
-        <location line="+55"/>
-        <source>Balance:</source>
-        <translation>Balance:</translation>
-    </message>
-    <message>
-        <location line="-84"/>
-        <source>Confirm the send action</source>
-        <translation>Confirm the send action</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>S&amp;end</source>
-        <translation>S&amp;end</translation>
+        <source>Copy fee</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sendcoinsdialog.cpp" line="-660"/>
         <source>Copy quantity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy amount</source>
+        <source>Cr&amp;eate Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy fee</source>
+        <source>Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy after fee</source>
+        <source>Custom change address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy bytes</source>
+        <source>Custom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy change</source>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
-        <source>%1 (%2 blocks)</source>
+        <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+30"/>
-        <source>Sign on device</source>
-        <extracomment>&quot;device&quot; usually means a hardware wallet.</extracomment>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation>
+            <numerusform>Estimated to begin confirmation within %n block.</numerusform>
+            <numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Connect your hardware wallet first.</source>
+        <source>External balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Set external signer script path in Options -&gt; Wallet</source>
+        <source>External signer failure</source>
         <extracomment>&quot;External signer&quot; means using devices such as hardware wallets.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Cr&amp;eate Unsigned</source>
+        <source>External signer not found</source>
+        <extracomment>&quot;External signer&quot; means using devices such as hardware wallets.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
-        <source>%1 to &apos;%2&apos;</source>
+        <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>%1 to %2</source>
+        <source>Hide transaction fee settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>To review recipient list click &quot;Show Details…&quot;</source>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source>Sign failed</source>
+        <source>Inputs…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>External signer not found</source>
-        <extracomment>&quot;External signer&quot; means using devices such as hardware wallets.</extracomment>
+        <source>Insufficient funds!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>External signer failure</source>
-        <extracomment>&quot;External signer&quot; means using devices such as hardware wallets.</extracomment>
+        <source>PSBT saved</source>
+        <extracomment>Popup message when a PSBT has been saved to a file</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <source>Save Transaction Data</source>
+        <source>PSBT saved to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>PSBT saved</source>
-        <extracomment>Popup message when a PSBT has been saved to a file</extracomment>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+273"/>
-        <source>External balance:</source>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-325"/>
-        <source>or</source>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
-        <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source>
+        <source>Quantity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-31"/>
-        <source>Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <source>Recommended:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
-        <source>%1 from wallet &apos;%2&apos;</source>
-        <translation type="unfinished"></translation>
+        <source>S&amp;end</source>
+        <translation>S&amp;end</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>Do you want to create this transaction?</source>
-        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <source>Save Transaction Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
-        <translation type="unfinished"></translation>
+        <source>Send Coins</source>
+        <translation>Send Coins</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Please, review your transaction.</source>
-        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
-        <translation type="unfinished"></translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Send to multiple recipients at once</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Transaction fee</source>
+        <source>Set external signer script path in Options -&gt; Wallet</source>
+        <extracomment>&quot;External signer&quot; means using devices such as hardware wallets.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>%1 kvB</source>
-        <comment>PSBT transaction creation</comment>
-        <extracomment>When reviewing a newly created PSBT (via Send flow), the transaction fee is shown, with &quot;virtual size&quot; of the transaction displayed for context</extracomment>
+        <source>Sign failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Not signalling Replace-By-Fee, BIP-125.</source>
+        <source>Sign on device</source>
+        <extracomment>&quot;device&quot; usually means a hardware wallet.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Total Amount</source>
+        <source>Specify a custom fee per kB (1,000 bytes) of the transaction&apos;s virtual size.
+
+Note:  Since the fee is calculated on a per-byte basis, a fee rate of &quot;100 satoshis per kvB&quot; for a transaction size of 500 virtual bytes (half of 1 kvB) would ultimately yield a fee of only 50 satoshis.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>Unsigned Transaction</source>
-        <comment>PSBT copied</comment>
-        <extracomment>Caption of &quot;PSBT has been copied&quot; messagebox</extracomment>
+        <source>The PSBT has been copied to the clipboard. You can also save it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The PSBT has been copied to the clipboard. You can also save it.</source>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>PSBT saved to disk</source>
+        <source>The amount exceeds your balance.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>Confirm send coins</source>
+        <source>The amount to pay must be larger than 0.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+248"/>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>The amount to pay must be larger than 0.</source>
+        <source>To review recipient list click &quot;Show Details…&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>The amount exceeds your balance.</source>
+        <source>Total Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Duplicate address found: addresses should only be used once each.</source>
+        <source>Transaction Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Transaction creation failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <source>Transaction fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+37"/>
-        <source>%1/kvB</source>
+        <source>Unsigned Transaction</source>
+        <comment>PSBT copied</comment>
+        <extracomment>Caption of &quot;PSBT has been copied&quot; messagebox</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="+14"/>
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation>
-            <numerusform>Estimated to begin confirmation within %n block.</numerusform>
-            <numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
-        </translation>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>Warning: Invalid Bitcoin address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Warning: Unknown change address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Confirm custom change address</source>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <source>You can increase the fee later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>(no label)</source>
+        <source>automatically selected</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <location filename="../forms/sendcoinsentry.ui" line="+151"/>
-        <source>A&amp;mount:</source>
-        <translation>A&amp;mount:</translation>
+        <source>or</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
-        <source>Pay &amp;To:</source>
-        <translation>Pay &amp;To:</translation>
+        <source>per kilobyte</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <location line="+93"/>
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
     </message>
     <message>
-        <location line="-68"/>
-        <source>Choose previously used address</source>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation type="unfinished"></translation>
+        <source>A&amp;mount:</source>
+        <translation>A&amp;mount:</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Paste address from clipboard</source>
-        <translation>Paste address from clipboard</translation>
-    </message>
-    <message>
-        <location line="+16"/>
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Remove this entry</source>
+        <source>Choose previously used address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
-        <source>The amount to send in the selected unit</source>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished"></translation>
+        <source>Paste address from clipboard</source>
+        <translation>Paste address from clipboard</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use available balance</source>
+        <source>Pay &amp;To:</source>
+        <translation>Pay &amp;To:</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Message:</source>
+        <source>S&amp;ubtract fee from amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-51"/>
-        <location line="+3"/>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <source>The Bitcoin address to send the payment to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <source>The amount to send in the selected unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use available balance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SendConfirmationDialog</name>
     <message>
-        <location filename="../sendcoinsdialog.h" line="+151"/>
-        <source>Send</source>
+        <source>Create Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Create Unsigned</source>
+        <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
-        <location filename="../utilitydialog.cpp" line="+89"/>
         <source>%1 is shutting down…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4432,210 +3560,161 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of &quot;100
 <context>
     <name>SignVerifyMessageDialog</name>
     <message>
-        <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signatures - Sign / Verify a Message</translation>
-    </message>
-    <message>
-        <location line="+13"/>
         <source>&amp;Sign Message</source>
         <translation>&amp;Sign Message</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>You can sign messages/agreements with your legacy (P2PKH) addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verify Message</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished"></translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+216"/>
         <source>Choose previously used address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-206"/>
-        <location line="+216"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Clear &amp;All</source>
+        <translation>Clear &amp;All</translation>
     </message>
     <message>
-        <location line="-206"/>
-        <source>Paste address from clipboard</source>
-        <translation>Paste address from clipboard</translation>
+        <source>Click &quot;Sign Message&quot; to generate signature</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+3"/>
         <source>Enter the message you want to sign here</source>
         <translation>Enter the message you want to sign here</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Signature</source>
-        <translation>Signature</translation>
+        <source>Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Copy the current signature to the clipboard</source>
+        <source>Message signed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Sign the message to prove you own this Bitcoin address</translation>
+        <source>Message signing failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Sign &amp;Message</source>
-        <translation>Sign &amp;Message</translation>
+        <source>Message verification failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Reset all sign message fields</source>
-        <translation>Reset all sign message fields</translation>
+        <source>Message verified.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+157"/>
-        <source>Clear &amp;All</source>
-        <translation>Clear &amp;All</translation>
+        <source>No error</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verify Message</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Paste address from clipboard</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <source>Please check the address and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>The Bitcoin address the message was signed with</source>
+        <source>Please check the signature and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location line="+3"/>
-        <source>The signed message to verify</source>
+        <source>Private key for the entered address is not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+3"/>
-        <source>The signature given when the message was signed</source>
-        <translation type="unfinished"></translation>
+        <source>Reset all sign message fields</source>
+        <translation>Reset all sign message fields</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Reset all verify message fields</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Verify &amp;Message</source>
-        <translation>Verify &amp;Message</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Sign &amp;Message</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Reset all verify message fields</source>
-        <translation>Reset all verify message fields</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Sign the message to prove you own this Bitcoin address</translation>
     </message>
     <message>
-        <location line="-210"/>
-        <source>Click &quot;Sign Message&quot; to generate signature</source>
-        <translation type="unfinished"></translation>
+        <source>Signature</source>
+        <translation>Signature</translation>
     </message>
     <message>
-        <location filename="../signverifymessagedialog.cpp" line="+122"/>
-        <location line="+99"/>
-        <source>The entered address is invalid.</source>
-        <translation type="unfinished"></translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signatures - Sign / Verify a Message</translation>
     </message>
     <message>
-        <location line="-99"/>
-        <location line="+100"/>
-        <source>Please check the address and try again.</source>
+        <source>The Bitcoin address the message was signed with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-93"/>
-        <location line="+98"/>
-        <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
+        <source>The Bitcoin address to sign the message with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
-        <source>Wallet unlock was cancelled.</source>
+        <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>No error</source>
+        <source>The entered address is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Private key for the entered address is not available.</source>
+        <source>The signature could not be decoded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Message signing failed.</source>
+        <source>The signature did not match the message digest.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Message signed.</source>
+        <source>The signature given when the message was signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
-        <source>The signature could not be decoded.</source>
+        <source>The signed message to verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+7"/>
-        <source>Please check the signature and try again.</source>
-        <translation type="unfinished"></translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verify &amp;Message</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>The signature did not match the message digest.</source>
-        <translation type="unfinished"></translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Message verification failed.</source>
+        <source>Wallet unlock was cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <source>Message verified.</source>
+        <source>You can sign messages/agreements with your legacy (P2PKH) addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../splashscreen.cpp" line="+175"/>
         <source>(press q to shutdown and continue later)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>press q to shutdown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4643,7 +3722,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of &quot;100
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <location filename="../trafficgraphwidget.cpp" line="+74"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4651,1998 +3729,1623 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of &quot;100
 <context>
     <name>TransactionDesc</name>
     <message>
-        <location filename="../transactiondesc.cpp" line="+34"/>
-        <source>conflicted with a transaction with %1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>0/unconfirmed, in memory pool</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>0/unconfirmed, not in memory pool</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>abandoned</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>%1/unconfirmed</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
+        <source>%1 (Certificate was not verified)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 confirmations</source>
         <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Date</source>
-        <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Generated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+13"/>
-        <source>From</source>
+        <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>unknown</source>
+        <source>0/unconfirmed, in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+20"/>
-        <location line="+57"/>
-        <source>To</source>
+        <source>0/unconfirmed, not in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-75"/>
-        <location line="+82"/>
-        <source>own address</source>
-        <translation type="unfinished"></translation>
+        <source>Amount</source>
+        <translation type="unfinished">Amount</translation>
     </message>
     <message>
-        <location line="-80"/>
-        <source>label</source>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <location line="+12"/>
-        <location line="+39"/>
-        <location line="+30"/>
-        <location line="+60"/>
         <source>Credit</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="-139"/>
-        <source>matures in %n more block(s)</source>
-        <translation>
-            <numerusform>matures in %n more block</numerusform>
-            <numerusform>matures in %n more blocks</numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+2"/>
-        <source>not accepted</source>
-        <translation type="unfinished"></translation>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <location line="+26"/>
-        <location line="+63"/>
         <source>Debit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-79"/>
-        <source>Total debit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Total credit</source>
+        <source>Debug information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Transaction fee</source>
+        <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Net amount</source>
+        <source>Generated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+12"/>
-        <source>Message</source>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Comment</source>
+        <source>Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transaction ID</source>
+        <source>Merchant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction total size</source>
+        <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction virtual size</source>
+        <source>Net amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Output index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>%1 (Certificate was not verified)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Merchant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Debug information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Transaction</source>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Inputs</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Amount</source>
-        <translation type="unfinished">Amount</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>true</source>
+        <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>false</source>
+        <source>Total credit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <location filename="../forms/transactiondescdialog.ui" line="+20"/>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>This pane shows a detailed description of the transaction</translation>
-    </message>
     <message>
-        <location filename="../transactiondescdialog.cpp" line="+18"/>
-        <source>Details for %1</source>
+        <source>Total debit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <location filename="../transactiontablemodel.cpp" line="+257"/>
-        <source>Date</source>
-        <translation type="unfinished">Date</translation>
-    </message>
     <message>
-        <location line="+0"/>
-        <source>Type</source>
+        <source>Transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Label</source>
+        <source>Transaction ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
-        <source>Unconfirmed</source>
+        <source>Transaction fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Abandoned</source>
+        <source>Transaction total size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <source>Transaction virtual size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Confirmed (%1 confirmations)</source>
+        <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Conflicted</source>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <source>false</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Generated but not accepted</source>
+        <source>label</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>Received with</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation>
+            <numerusform>matures in %n more block</numerusform>
+            <numerusform>matures in %n more blocks</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Received from</source>
+        <source>not accepted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Sent to</source>
+        <source>own address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mined</source>
+        <source>true</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>(n/a)</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <location line="+188"/>
-        <source>(no label)</source>
+        <source>Details for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation type="unfinished"></translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>This pane shows a detailed description of the transaction</translation>
     </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
     <message>
-        <location line="+2"/>
-        <source>Date and time that the transaction was received.</source>
+        <source>(n/a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Type of transaction.</source>
+        <source>(no label)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>User-defined intent/purpose of the transaction.</source>
+        <source>Abandoned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Amount removed from or added to balance.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <location filename="../transactionview.cpp" line="+66"/>
-        <location line="+16"/>
-        <source>All</source>
+        <source>Confirmed (%1 confirmations)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
-        <source>Today</source>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>This week</source>
+        <source>Conflicted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>This month</source>
-        <translation type="unfinished"></translation>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Last month</source>
+        <source>Date and time that the transaction was received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>This year</source>
+        <source>Generated but not accepted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Received with</source>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Sent to</source>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Other</source>
+        <source>Received from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Enter address, transaction id, or label to search</source>
+        <source>Received with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Min amount</source>
+        <source>Sent to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <source>Range…</source>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&amp;Copy address</source>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;label</source>
+        <source>Type of transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;amount</source>
+        <source>Unconfirmed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy transaction &amp;ID</source>
+        <source>User-defined intent/purpose of the transaction.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <location line="+1"/>
-        <source>Copy &amp;raw transaction</source>
+        <source>&amp;Copy address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy full transaction &amp;details</source>
+        <source>&amp;Edit address label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Show transaction details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Increase transaction &amp;fee</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>A&amp;bandon transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Edit address label</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+59"/>
-        <source>Show in %1</source>
-        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
-        <source>Export Transaction History</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Comma separated file</source>
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Confirmed</source>
         <translation type="unfinished">Confirmed</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Date</source>
-        <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Type</source>
+        <source>Copy &amp;amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Label</source>
+        <source>Copy &amp;label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Address</source>
+        <source>Copy &amp;raw transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ID</source>
+        <source>Copy full transaction &amp;details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Exporting Failed</source>
+        <source>Copy transaction &amp;ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation type="unfinished"></translation>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Exporting Successful</source>
+        <source>Enter address, transaction id, or label to search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>The transaction history was successfully saved to %1.</source>
+        <source>Export Transaction History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+175"/>
-        <source>Range:</source>
+        <source>Exporting Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>to</source>
+        <source>Exporting Successful</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+46"/>
-        <source>Unit to show amounts in. Click to select another unit.</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WalletController</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="-341"/>
-        <source>Close wallet</source>
+        <source>Increase transaction &amp;fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <source>Last month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Close all wallets</source>
+        <source>Min amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Are you sure you wish to close all wallets?</source>
+        <source>Mined</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WalletFrame</name>
     <message>
-        <location filename="../walletframe.cpp" line="+45"/>
-        <source>No wallet has been loaded.
-Go to File &gt; Open Wallet to load a wallet.
-- OR -</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Create a new wallet</source>
+        <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location line="+10"/>
-        <location line="+18"/>
-        <source>Error</source>
-        <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <source>Range…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Load Transaction Data</source>
+        <source>Received with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Partially Signed Transaction (*.psbt)</source>
+        <source>Sent to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>PSBT file must be smaller than 100 MiB</source>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Unable to decode PSBT</source>
+        <source>The transaction history was successfully saved to %1.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <location filename="../walletmodel.cpp" line="+208"/>
-        <location line="+20"/>
-        <source>Send Coins</source>
-        <translation type="unfinished">Send Coins</translation>
-    </message>
     <message>
-        <location line="+245"/>
-        <location line="+49"/>
-        <location line="+20"/>
-        <location line="+5"/>
-        <source>Fee bump error</source>
+        <source>There was an error trying to save the transaction history to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <source>Increasing transaction fee failed</source>
+        <source>This month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Do you want to increase the fee?</source>
-        <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
+        <source>This week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Current fee:</source>
+        <source>This year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Increase:</source>
+        <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>New fee:</source>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
+        <source>to</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <location line="+5"/>
-        <source>Confirm fee bump</source>
+        <source>Unit to show amounts in. Click to select another unit.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WalletController</name>
     <message>
-        <location line="+17"/>
-        <source>Can&apos;t draft transaction.</source>
+        <source>Are you sure you wish to close all wallets?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>PSBT copied</source>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Fee-bump PSBT copied to clipboard</source>
+        <source>Close all wallets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Can&apos;t sign transaction.</source>
+        <source>Close wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Could not commit transaction</source>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WalletFrame</name>
     <message>
-        <location line="+13"/>
-        <source>Signer error</source>
+        <source>Create a new wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Can&apos;t display address</source>
-        <translation type="unfinished"></translation>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
     </message>
-</context>
-<context>
-    <name>WalletView</name>
     <message>
-        <location filename="../walletview.cpp" line="+50"/>
-        <source>&amp;Export</source>
-        <translation type="unfinished">&amp;Export</translation>
+        <source>Load Transaction Data</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Export the data in the current tab to a file</translation>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>Backup Wallet</source>
+        <source>PSBT file must be smaller than 100 MiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Wallet Data</source>
-        <extracomment>Name of the wallet data file format.</extracomment>
+        <source>Partially Signed Transaction (*.psbt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Backup Failed</source>
+        <source>Unable to decode PSBT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>There was an error trying to save the wallet data to %1.</source>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WalletModel</name>
     <message>
-        <location line="+4"/>
-        <source>Backup Successful</source>
+        <source>Can&apos;t display address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>The wallet data was successfully saved to %1.</source>
+        <source>Can&apos;t draft transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>Cancel</source>
+        <source>Can&apos;t sign transaction.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+208"/>
-        <source>The %s developers</source>
+        <source>Confirm fee bump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
-        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
+        <source>Could not commit transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <source>Current fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
+        <source>Do you want to increase the fee?</source>
+        <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <source>Fee bump error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <source>Fee-bump PSBT copied to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
+        <source>Increase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Error starting/committing db txn for wallet transactions removal process</source>
+        <source>Increasing transaction fee failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Error: Dumpfile format record is incorrect. Got &quot;%s&quot;, expected &quot;format&quot;.</source>
+        <source>New fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Dumpfile identifier record is incorrect. Got &quot;%s&quot;, expected &quot;%s&quot;.</source>
+        <source>PSBT copied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <translation type="unfinished"></translation>
+        <source>Send Coins</source>
+        <translation type="unfinished">Send Coins</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet&apos;s passphrase if it is encrypted.</source>
+        <source>Signer error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WalletView</name>
     <message>
-        <location line="+19"/>
-        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Export</source>
+        <translation type="unfinished">&amp;Export</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Invalid value detected for &apos;-wallet&apos; or &apos;-nowallet&apos;. &apos;-wallet&apos; requires a string value, while &apos;-nowallet&apos; accepts only &apos;1&apos; to disable all wallets</source>
+        <source>Backup Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <source>Backup Successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <source>Backup Wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <translation type="unfinished"></translation>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Export the data in the current tab to a file</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <source>The wallet data was successfully saved to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <source>There was an error trying to save the wallet data to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Rename of &apos;%s&apos; -&gt; &apos;%s&apos; failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <location line="+7"/>
-        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <source>
+Consider modifying %s (%s) or %s (%s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
+        <source>
+Unable to cleanup failed migration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <source>
+Unable to restore backup of wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <source>%s is set very high!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <source>%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <source>-maxmempool must be at least %d MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
+        <source>-walletrbf is deprecated and will be fully removed in the next release.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <source>A fatal internal error occurred, see %s for details: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
+        <source>Assumeutxo data not found for the given blockhash &apos;%s&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
+        <source>Block verification was interrupted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <source>Can&apos;t spend unconfirmed version %d pre-selected input with a version 3 tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
-        <source>%s is set very high!</source>
+        <source>Can&apos;t spend unconfirmed version 3 pre-selected input with a version %d tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>-maxmempool must be at least %d MB</source>
+        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cannot resolve -%s address: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cannot set -forcednsseed to true when setting -dnsseed to false.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <source>Cannot write to directory &apos;%s&apos;; check permissions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
+        <source>Copyright (C) %i-%i</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
+        <source>Corrupt block found indicating potential hardware failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
+        <source>Corrupted block database detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
+        <source>Could not find asmap file %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
-</source>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <source>Could not parse asmap file %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <source>Could not read embedded asmap data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Flushing block file to disk failed. This is likely the result of an I/O error.</source>
+        <source>Creating wallet…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
+        <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <source>Disk space is too low!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Maximum transaction weight is less than transaction weight without inputs</source>
+        <source>Do you want to rebuild the databases now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Maximum transaction weight is too low, can not accommodate change output</source>
+        <source>Done loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Option &apos;-checkpoints&apos; is set but checkpoints were removed. This option has no effect.</source>
+        <source>Dump file %s does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <source>Embedded asmap data not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <source>Error creating %s: Could not write version metadata.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <source>Error initializing block database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Rename of &apos;%s&apos; -&gt; &apos;%s&apos; failed. Cannot clean up the background chainstate leveldb directory.</source>
+        <source>Error loading %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
+        <source>Error loading block database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
+        <source>Error loading databases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
+        <source>Error opening block database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
-
-The wallet might have been tampered with or created with malicious intent.
-</source>
+        <source>Error opening coins database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Your computer&apos;s date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you&apos;ve confirmed your computer&apos;s clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you&apos;ve connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
+        <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>
-Unable to cleanup failed migration</source>
+        <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>
-Unable to restore backup of wallet.</source>
+        <source>Error reading configuration file: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>default wallet</source>
+        <source>Error reading from database, shutting down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>whitebind may only be used for incoming connections (&quot;out&quot; was passed)</source>
+        <source>Error reading next record from wallet database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-256"/>
-        <source>A fatal internal error occurred, see debug.log for details: </source>
+        <source>Error starting/committing db txn for wallet transactions removal process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Assumeutxo data not found for the given blockhash &apos;%s&apos;.</source>
+        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Block verification was interrupted</source>
+        <source>Error: Cannot extract destination from the generated scriptpubkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Can&apos;t spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <source>Error: Could not add tx %s to watchonly wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Can&apos;t spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Cannot write to directory &apos;%s&apos;; check permissions.</source>
+        <source>Error: Could not create file &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <source>Error: Could not delete watchonly transactions. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copyright (C) %i-%i</source>
+        <source>Error: Couldn&apos;t create cursor into database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Corrupt block found indicating potential hardware failure.</source>
+        <source>Error: Disk space is low for %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Corrupted block database detected</source>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Could not find asmap file %s</source>
+        <source>Error: Dumpfile format record is incorrect. Got &quot;%s&quot;, expected &quot;format&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <source>Error: Dumpfile identifier record is incorrect. Got &quot;%s&quot;, expected &quot;%s&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Could not parse asmap file %s</source>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Could not read embedded asmap data</source>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Could not top up scriptPubKeys</source>
+        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Disk space is too low!</source>
+        <source>Error: Export destination &apos;%s&apos; already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Done loading</source>
+        <source>Error: Export destination cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Dump file %s does not exist.</source>
+        <source>Error: Failed to create new watchonly wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
+        <source>Error: Failed to create new watchonly wallet. %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Embedded asmap data not available</source>
+        <source>Error: Got key that was not hex: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error initializing block database</source>
+        <source>Error: Got value that was not hex: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error loading %s</source>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error loading %s: Wallet corrupted</source>
+        <source>Error: Missing checksum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <source>Error: No %s addresses available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error loading block database</source>
+        <source>Error: Not all address book records were migrated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error loading databases</source>
+        <source>Error: Not all transaction records were migrated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error opening block database</source>
+        <source>Error: This wallet already uses SQLite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error opening coins database</source>
+        <source>Error: This wallet is already a descriptor wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Error reading configuration file: %s</source>
+        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error reading from database, shutting down.</source>
+        <source>Error: Unable to begin reading all records in the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error reading next record from wallet database</source>
+        <source>Error: Unable to make a backup of your wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Error: Cannot extract destination from the generated scriptpubkey</source>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Error: Couldn&apos;t create cursor into database</source>
+        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet&apos;s passphrase if it is encrypted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Disk space is low for %s</source>
+        <source>Error: Unable to read all records in the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <source>Error: Unable to read wallet&apos;s best block locator record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Error: Failed to create new watchonly wallet</source>
+        <source>Error: Unable to remove watchonly address book data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Got key that was not hex: %s</source>
+        <source>Error: Unable to write data to disk for wallet %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Got value that was not hex: %s</source>
+        <source>Error: Unable to write record to new wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <source>Error: Unable to write solvable wallet best block locator record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Missing checksum</source>
+        <source>Error: Unable to write the exported wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: No %s addresses available.</source>
+        <source>Error: Unable to write watchonly wallet best block locator record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Not all address book records were migrated</source>
+        <source>Error: Wallet does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Not all transaction records were migrated</source>
+        <source>Error: Wallet has no descriptors to export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: This wallet already uses SQLite</source>
+        <source>Error: cannot commit db transaction for watchonly wallet export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: This wallet is already a descriptor wallet</source>
+        <source>Error: cannot remove legacy wallet records</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error: Unable to begin reading all records in the database</source>
+        <source>Error: database transaction cannot be executed for new watchonly wallet %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to make a backup of your wallet</source>
+        <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error: Unable to read all records in the database</source>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to read wallet&apos;s best block locator record</source>
+        <source>Failed to close block undo file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to remove watchonly address book data</source>
+        <source>Failed to close file when writing block.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to write data to disk for wallet %s</source>
+        <source>Failed to disconnect block.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to write record to new wallet</source>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to write solvable wallet best block locator record</source>
+        <source>Failed to read block.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Unable to write watchonly wallet best block locator record</source>
+        <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Error: database transaction cannot be executed for wallet %s</source>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <source>Failed to rescan the wallet during initialization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Failed to close block undo file.</source>
+        <source>Failed to start indexes, shutting down…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to close file when writing block.</source>
+        <source>Failed to verify database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to disconnect block.</source>
+        <source>Failed to write block.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <source>Failed to write undo data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to read block.</source>
+        <source>Failure removing transaction: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Failed to rescan the wallet during initialization</source>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Failed to verify database</source>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to write block.</source>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failed to write undo data.</source>
+        <source>Flushing block file to disk failed. This is likely the result of an I/O error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Failure removing transaction: %s</source>
+        <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <source>Ignoring duplicate -wallet %s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Ignoring duplicate -wallet %s.</source>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Initialization sanity check failed. %s is shutting down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Input not found or already spent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insufficient dbcache for block verification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insufficient funds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invalid -i2psam address or hostname: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invalid -onion address or hostname: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Invalid -proxy address or hostname: &apos;%s&apos;</source>
+        <source>Invalid -proxy address or hostname, ends with &apos;=&apos;: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Invalid P2P permission: &apos;%s&apos;</source>
+        <source>Invalid -proxy address or hostname: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos;</source>
+        <source>Invalid P2P permission: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-118"/>
-        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Creating wallet…</source>
+        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <source>Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Error creating %s: Could not write version metadata.</source>
+        <source>Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
-        <source>Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</source>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
+        <source>Invalid port specified in %s: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Invalid port specified in %s: &apos;%s&apos;</source>
+        <source>Invalid value detected for &apos;-wallet&apos; or &apos;-nowallet&apos;. &apos;-wallet&apos; requires a string value, while &apos;-nowallet&apos; accepts only &apos;1&apos; to disable all wallets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Listening for incoming connections failed (listen returned error %s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Loading P2P addresses…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Loading banlist…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Loading block index…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Loading wallet…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <source>Maximum transaction weight is less than transaction weight without inputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximum transaction weight is too low, can not accommodate change output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Maximum transaction weight must be between %d and %d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Missing amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Missing solving data for estimating transaction size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Need to specify a port with -whitebind: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>No addresses available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Not found pre-selected input %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Not solvable pre-selected input %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Only direction was set, no permissions: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>Option &apos;-checkpoints&apos; is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Option &apos;-limitancestorsize&apos; is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Option &apos;-limitdescendantsize&apos; is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Prune mode is incompatible with -txospenderindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <source>Rename of &apos;%s&apos; -&gt; &apos;%s&apos; failed. Cannot clean up the background chainstate leveldb directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename of &apos;%s&apos; -&gt; &apos;%s&apos; failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Replaying blocks…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rescanning…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SQLiteDatabase: Failed to read database verification error: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Section [%s] is not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <source>Settings file could not be read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Signer did not echo address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Signer echoed unexpected address %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Signer returned error: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Signing transaction failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Specified -walletdir &quot;%s&quot; does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Specified -walletdir &quot;%s&quot; is a relative path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Specified -walletdir &quot;%s&quot; is not a directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Specified blocks directory &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Specified data directory &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Starting network threads…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>System error while flushing: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>System error while loading external block file: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>System error while saving block to disk: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>The %s developers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <source>The -testactivationheight option may not be used on mainnet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The -vbparams option may not be used on mainnet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The total exceeds your balance when the %s transaction fee is included.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>The transactions removal process can only be executed within a db txn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There is no ScriptPubKeyManager for this address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is experimental software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Transaction %s does not belong to this wallet</source>
+        <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction amount too small</source>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction amounts must not be negative</source>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction change output index out of range</source>
+        <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction must have at least one recipient</source>
+        <source>Transaction amount too small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction needs a change address, but we can&apos;t generate it.</source>
+        <source>Transaction amounts must not be negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transaction too large</source>
+        <source>Transaction change output index out of range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <source>Transaction must have at least one recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <source>Transaction needs a change address, but we can&apos;t generate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unable to create the PID file &apos;%s&apos;: %s</source>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unable to find UTXO for external input</source>
+        <source>Transaction too large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unable to open %s for writing</source>
+        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unable to parse -maxuploadtarget: &apos;%s&apos;</source>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Unable to start HTTP server. See debug log for details.</source>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Unknown -blockfilterindex value %s.</source>
+        <source>Unable to create the PID file &apos;%s&apos;: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unknown address type &apos;%s&apos;</source>
+        <source>Unable to find UTXO for external input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unknown change type &apos;%s&apos;</source>
+        <source>Unable to open %s for writing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+        <source>Unable to parse -maxuploadtarget: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unknown new rules activated (versionbit %i)</source>
+        <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unrecognised option &quot;%s&quot; provided in -test=&lt;option&gt;.</source>
+        <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Unsupported global logging level %s=%s. Valid values: %s.</source>
+        <source>Unable to write descriptor cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Wallet file creation failed: %s</source>
+        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
+
+The wallet might have been tampered with or created with malicious intent.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>acceptstalefeeestimates is not supported on %s chain.</source>
+        <source>Unknown -blockfilterindex value %s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>Unsupported logging category %s=%s.</source>
+        <source>Unknown address type &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-206"/>
-        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <source>Unknown change type &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <source>Unknown new rules activated (versionbit %i)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <source>Unrecognised option &quot;%s&quot; provided in -test=&lt;option&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unrecognized descriptor found. Loading wallet %s
 
 The wallet might have been created on a newer version.
@@ -6651,78 +5354,71 @@ Please try running the latest software version.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
-        <source>Do you want to rebuild the databases now?</source>
+        <source>Unrecognized network in -proxy=&apos;%s&apos;: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
+        <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: Could not delete watchonly transactions. </source>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Error: Wallet does not exist</source>
+        <source>Unsupported global logging level %s=%s. Valid values: %s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Error: cannot remove legacy wallet records</source>
+        <source>Unsupported logging category %s=%s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Failed to start indexes, shutting down…</source>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Invalid -proxy address or hostname, ends with &apos;=&apos;: &apos;%s&apos;</source>
+        <source>Verifying blocks…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <source>Verifying wallet(s)…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
-        <source>Unrecognized network in -proxy=&apos;%s&apos;: &apos;%s&apos;</source>
+        <source>Wallet file creation failed: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Verifying blocks…</source>
+        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Verifying wallet(s)…</source>
+        <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <source>Settings file could not be read</source>
+        <source>Your computer&apos;s date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you&apos;ve confirmed your computer&apos;s clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you&apos;ve connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Settings file could not be written</source>
+        <source>acceptstalefeeestimates is not supported on %s chain.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>whitebind may only be used for incoming connections (&quot;out&quot; was passed)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/depend/bitcoin/src/qt/locale/bitcoin_en.xlf b/depend/bitcoin/src/qt/locale/bitcoin_en.xlf
deleted file mode 100644
index 4a67456f..00000000
--- a/depend/bitcoin/src/qt/locale/bitcoin_en.xlf
+++ /dev/null
@@ -1,5626 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:trolltech="urn:trolltech:names:ts:document:1.0">
-  <file original="../forms/addressbookpage.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="AddressBookPage">
-      <trans-unit id="_msg1">
-        <source xml:space="preserve">Right-click to edit address or label</source>
-        <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg2">
-        <source xml:space="preserve">Create a new address</source>
-        <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg3">
-        <source xml:space="preserve">&amp;New</source>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg4">
-        <source xml:space="preserve">&amp;Copy</source>
-        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg5">
-        <source xml:space="preserve">C&amp;lose</source>
-        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg6">
-        <source xml:space="preserve">Delete the currently selected address from the list</source>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg7">
-        <source xml:space="preserve">Enter address or label to search</source>
-        <context-group purpose="location"><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg8">
-        <source xml:space="preserve">Copy the currently selected address to the clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg9">
-        <source xml:space="preserve">Export the data in the current tab to a file</source>
-        <context-group purpose="location"><context context-type="linenumber">128</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg10">
-        <source xml:space="preserve">&amp;Export</source>
-        <context-group purpose="location"><context context-type="linenumber">131</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg11">
-        <source xml:space="preserve">&amp;Delete</source>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../addressbookpage.cpp</context><context context-type="linenumber">105</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../addressbookpage.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="AddressBookPage">
-      <trans-unit id="_msg12">
-        <source xml:space="preserve">Choose the address to send coins to</source>
-        <context-group purpose="location"><context context-type="linenumber">75</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg13">
-        <source xml:space="preserve">Choose the address to receive coins with</source>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg14">
-        <source xml:space="preserve">C&amp;hoose</source>
-        <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg15">
-        <source xml:space="preserve">These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg16">
-        <source xml:space="preserve">These are your Bitcoin addresses for receiving payments. Use the &apos;Create new receiving address&apos; button in the receive tab to create new addresses.
-Signing is only possible with addresses of the type &apos;legacy&apos;.</source>
-        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg17">
-        <source xml:space="preserve">&amp;Copy Address</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg18">
-        <source xml:space="preserve">Copy &amp;Label</source>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg19">
-        <source xml:space="preserve">&amp;Edit</source>
-        <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg20">
-        <source xml:space="preserve">Export Address List</source>
-        <context-group purpose="location"><context context-type="linenumber">267</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg21">
-        <source xml:space="preserve">Comma separated file</source>
-        <context-group purpose="location"><context context-type="linenumber">270</context></context-group>
-        <note annotates="source" from="developer">Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</note>
-      </trans-unit>
-      <trans-unit id="_msg22">
-        <source xml:space="preserve">There was an error trying to save the address list to %1. Please try again.</source>
-        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
-        <note annotates="source" from="developer">An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</note>
-      </trans-unit>
-      <trans-unit id="_msg23">
-        <source xml:space="preserve">Sending addresses - %1</source>
-        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg24">
-        <source xml:space="preserve">Receiving addresses - %1</source>
-        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg25">
-        <source xml:space="preserve">Exporting Failed</source>
-        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../addresstablemodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="AddressTableModel">
-      <trans-unit id="_msg26">
-        <source xml:space="preserve">Label</source>
-        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg27">
-        <source xml:space="preserve">Address</source>
-        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg28">
-        <source xml:space="preserve">(no label)</source>
-        <context-group purpose="location"><context context-type="linenumber">205</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/askpassphrasedialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="AskPassphraseDialog">
-      <trans-unit id="_msg29">
-        <source xml:space="preserve">Passphrase Dialog</source>
-        <context-group purpose="location"><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg30">
-        <source xml:space="preserve">Enter passphrase</source>
-        <context-group purpose="location"><context context-type="linenumber">56</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg31">
-        <source xml:space="preserve">New passphrase</source>
-        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg32">
-        <source xml:space="preserve">Repeat new passphrase</source>
-        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg33">
-        <source xml:space="preserve">Show passphrase</source>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../askpassphrasedialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="AskPassphraseDialog">
-      <trans-unit id="_msg34">
-        <source xml:space="preserve">Encrypt wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg35">
-        <source xml:space="preserve">This operation needs your wallet passphrase to unlock the wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg36">
-        <source xml:space="preserve">Unlock wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg37">
-        <source xml:space="preserve">Change passphrase</source>
-        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg38">
-        <source xml:space="preserve">Confirm wallet encryption</source>
-        <context-group purpose="location"><context context-type="linenumber">105</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg39">
-        <source xml:space="preserve">Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg40">
-        <source xml:space="preserve">Are you sure you wish to encrypt your wallet?</source>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">124</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg41">
-        <source xml:space="preserve">Wallet encrypted</source>
-        <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg42">
-        <source xml:space="preserve">Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg43">
-        <source xml:space="preserve">Enter the old passphrase and new passphrase for the wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg44">
-        <source xml:space="preserve">Continue</source>
-        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg45">
-        <source xml:space="preserve">Back</source>
-        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg46">
-        <source xml:space="preserve">Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg47">
-        <source xml:space="preserve">Wallet to be encrypted</source>
-        <context-group purpose="location"><context context-type="linenumber">121</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg48">
-        <source xml:space="preserve">Your wallet is about to be encrypted. </source>
-        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg49">
-        <source xml:space="preserve">Your wallet is now encrypted. </source>
-        <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg50">
-        <source xml:space="preserve">IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">140</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg51">
-        <source xml:space="preserve">Wallet encryption failed</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg52">
-        <source xml:space="preserve">Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg53">
-        <source xml:space="preserve">The supplied passphrases do not match.</source>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">217</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg54">
-        <source xml:space="preserve">Wallet unlock failed</source>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg55">
-        <source xml:space="preserve">The passphrase entered for the wallet decryption was incorrect.</source>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg56">
-        <source xml:space="preserve">The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
-        <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg57">
-        <source xml:space="preserve">Wallet passphrase was successfully changed.</source>
-        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg58">
-        <source xml:space="preserve">Passphrase change failed</source>
-        <context-group purpose="location"><context context-type="linenumber">202</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">205</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg59">
-        <source xml:space="preserve">The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
-        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg60">
-        <source xml:space="preserve">Warning: The Caps Lock key is on!</source>
-        <context-group purpose="location"><context context-type="linenumber">252</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../bantablemodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="BanTableModel">
-      <trans-unit id="_msg61">
-        <source xml:space="preserve">IP/Netmask</source>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg62">
-        <source xml:space="preserve">Banned Until</source>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../bitcoin.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="BitcoinApplication">
-      <trans-unit id="_msg63">
-        <source xml:space="preserve">Settings file %1 might be corrupt or invalid.</source>
-        <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg64">
-        <source xml:space="preserve">Runaway exception</source>
-        <context-group purpose="location"><context context-type="linenumber">436</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg65">
-        <source xml:space="preserve">A fatal error occurred. %1 can no longer continue safely and will quit.</source>
-        <context-group purpose="location"><context context-type="linenumber">437</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg66">
-        <source xml:space="preserve">Internal error</source>
-        <context-group purpose="location"><context context-type="linenumber">446</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg67">
-        <source xml:space="preserve">An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
-        <context-group purpose="location"><context context-type="linenumber">447</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg68">
-        <source xml:space="preserve">Do you want to reset settings to default values, or to abort without making changes?</source>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
-        <note annotates="source" from="developer">Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</note>
-      </trans-unit>
-      <trans-unit id="_msg69">
-        <source xml:space="preserve">A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
-        <context-group purpose="location"><context context-type="linenumber">179</context></context-group>
-        <note annotates="source" from="developer">Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</note>
-      </trans-unit>
-      <trans-unit id="_msg70">
-        <source xml:space="preserve">Error: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">597</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg71">
-        <source xml:space="preserve">%1 didn&apos;t yet exit safely…</source>
-        <context-group purpose="location"><context context-type="linenumber">670</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../bitcoingui.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="BitcoinGUI">
-      <trans-unit id="_msg72">
-        <source xml:space="preserve">&amp;Overview</source>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg73">
-        <source xml:space="preserve">Show general overview of wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg74">
-        <source xml:space="preserve">&amp;Transactions</source>
-        <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg75">
-        <source xml:space="preserve">Browse transaction history</source>
-        <context-group purpose="location"><context context-type="linenumber">280</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg76">
-        <source xml:space="preserve">E&amp;xit</source>
-        <context-group purpose="location"><context context-type="linenumber">299</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg77">
-        <source xml:space="preserve">Quit application</source>
-        <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg78">
-        <source xml:space="preserve">&amp;About %1</source>
-        <context-group purpose="location"><context context-type="linenumber">303</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg79">
-        <source xml:space="preserve">Show information about %1</source>
-        <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg80">
-        <source xml:space="preserve">About &amp;Qt</source>
-        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg81">
-        <source xml:space="preserve">Show information about Qt</source>
-        <context-group purpose="location"><context context-type="linenumber">308</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg82">
-        <source xml:space="preserve">Modify configuration options for %1</source>
-        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg83">
-        <source xml:space="preserve">Create a new wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">355</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg84">
-        <source xml:space="preserve">&amp;Minimize</source>
-        <context-group purpose="location"><context context-type="linenumber">573</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg85">
-        <source xml:space="preserve">Wallet:</source>
-        <context-group purpose="location"><context context-type="linenumber">652</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg86">
-        <source xml:space="preserve">Network activity disabled.</source>
-        <context-group purpose="location"><context context-type="linenumber">1070</context></context-group>
-        <note annotates="source" from="developer">A substring of the tooltip.</note>
-      </trans-unit>
-      <trans-unit id="_msg87">
-        <source xml:space="preserve">Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1516</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg88">
-        <source xml:space="preserve">Send coins to a Bitcoin address</source>
-        <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg89">
-        <source xml:space="preserve">Backup wallet to another location</source>
-        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg90">
-        <source xml:space="preserve">Change the passphrase used for wallet encryption</source>
-        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg91">
-        <source xml:space="preserve">&amp;Send</source>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg92">
-        <source xml:space="preserve">&amp;Receive</source>
-        <context-group purpose="location"><context context-type="linenumber">272</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg93">
-        <source xml:space="preserve">&amp;Options…</source>
-        <context-group purpose="location"><context context-type="linenumber">310</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg94">
-        <source xml:space="preserve">&amp;Encrypt Wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">315</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg95">
-        <source xml:space="preserve">Encrypt the private keys that belong to your wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg96">
-        <source xml:space="preserve">&amp;Backup Wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg97">
-        <source xml:space="preserve">&amp;Change Passphrase…</source>
-        <context-group purpose="location"><context context-type="linenumber">320</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg98">
-        <source xml:space="preserve">Sign &amp;message…</source>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg99">
-        <source xml:space="preserve">Sign messages with your Bitcoin addresses to prove you own them</source>
-        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg100">
-        <source xml:space="preserve">&amp;Verify message…</source>
-        <context-group purpose="location"><context context-type="linenumber">324</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg101">
-        <source xml:space="preserve">Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg102">
-        <source xml:space="preserve">&amp;Load PSBT from file…</source>
-        <context-group purpose="location"><context context-type="linenumber">326</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg103">
-        <source xml:space="preserve">Open &amp;URI…</source>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg104">
-        <source xml:space="preserve">Close Wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">350</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg105">
-        <source xml:space="preserve">Create Wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg106">
-        <source xml:space="preserve">Close All Wallets…</source>
-        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg107">
-        <source xml:space="preserve">Restore and Migrate Wallet File…</source>
-        <context-group purpose="location"><context context-type="linenumber">499</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg108">
-        <source xml:space="preserve">&amp;File</source>
-        <context-group purpose="location"><context context-type="linenumber">539</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg109">
-        <source xml:space="preserve">&amp;Settings</source>
-        <context-group purpose="location"><context context-type="linenumber">560</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg110">
-        <source xml:space="preserve">&amp;Help</source>
-        <context-group purpose="location"><context context-type="linenumber">621</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg111">
-        <source xml:space="preserve">Tabs toolbar</source>
-        <context-group purpose="location"><context context-type="linenumber">632</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg112">
-        <source xml:space="preserve">Syncing Headers (%1%)…</source>
-        <context-group purpose="location"><context context-type="linenumber">1114</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg113">
-        <source xml:space="preserve">Synchronizing with network…</source>
-        <context-group purpose="location"><context context-type="linenumber">1172</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg114">
-        <source xml:space="preserve">Indexing blocks on disk…</source>
-        <context-group purpose="location"><context context-type="linenumber">1177</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg115">
-        <source xml:space="preserve">Processing blocks on disk…</source>
-        <context-group purpose="location"><context context-type="linenumber">1179</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg116">
-        <source xml:space="preserve">Connecting to peers…</source>
-        <context-group purpose="location"><context context-type="linenumber">1186</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg117">
-        <source xml:space="preserve">Request payments (generates QR codes and bitcoin: URIs)</source>
-        <context-group purpose="location"><context context-type="linenumber">273</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg118">
-        <source xml:space="preserve">Show the list of used sending addresses and labels</source>
-        <context-group purpose="location"><context context-type="linenumber">338</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg119">
-        <source xml:space="preserve">Show the list of used receiving addresses and labels</source>
-        <context-group purpose="location"><context context-type="linenumber">340</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg120">
-        <source xml:space="preserve">&amp;Command-line options</source>
-        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">1195</context></context-group>
-        <trans-unit id="_msg121[0]">
-          <source xml:space="preserve">Processed %n block(s) of transaction history.</source>
-        </trans-unit>
-        <trans-unit id="_msg121[1]">
-          <source xml:space="preserve">Processed %n block(s) of transaction history.</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg122">
-        <source xml:space="preserve">%1 behind</source>
-        <context-group purpose="location"><context context-type="linenumber">1218</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg123">
-        <source xml:space="preserve">Catching up…</source>
-        <context-group purpose="location"><context context-type="linenumber">1223</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg124">
-        <source xml:space="preserve">Last received block was generated %1 ago.</source>
-        <context-group purpose="location"><context context-type="linenumber">1242</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg125">
-        <source xml:space="preserve">Transactions after this will not yet be visible.</source>
-        <context-group purpose="location"><context context-type="linenumber">1244</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg126">
-        <source xml:space="preserve">Error</source>
-        <context-group purpose="location"><context context-type="linenumber">1279</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg127">
-        <source xml:space="preserve">Warning</source>
-        <context-group purpose="location"><context context-type="linenumber">1283</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg128">
-        <source xml:space="preserve">Information</source>
-        <context-group purpose="location"><context context-type="linenumber">1287</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg129">
-        <source xml:space="preserve">Up to date</source>
-        <context-group purpose="location"><context context-type="linenumber">1199</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg130">
-        <source xml:space="preserve">Ctrl+Q</source>
-        <context-group purpose="location"><context context-type="linenumber">301</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg131">
-        <source xml:space="preserve">Load Partially Signed Bitcoin Transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg132">
-        <source xml:space="preserve">Load PSBT from &amp;clipboard…</source>
-        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg133">
-        <source xml:space="preserve">Load Partially Signed Bitcoin Transaction from clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">329</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg134">
-        <source xml:space="preserve">Node window</source>
-        <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg135">
-        <source xml:space="preserve">Open node debugging and diagnostic console</source>
-        <context-group purpose="location"><context context-type="linenumber">332</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg136">
-        <source xml:space="preserve">&amp;Sending addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg137">
-        <source xml:space="preserve">&amp;Receiving addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">339</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg138">
-        <source xml:space="preserve">Open a bitcoin: URI</source>
-        <context-group purpose="location"><context context-type="linenumber">343</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg139">
-        <source xml:space="preserve">Open Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">345</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg140">
-        <source xml:space="preserve">Open a wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">347</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg141">
-        <source xml:space="preserve">Close wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">351</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg142">
-        <source xml:space="preserve">Restore Wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">358</context></context-group>
-        <note annotates="source" from="developer">Name of the menu item that restores wallet from a backup file.</note>
-      </trans-unit>
-      <trans-unit id="_msg143">
-        <source xml:space="preserve">Restore a wallet from a backup file</source>
-        <context-group purpose="location"><context context-type="linenumber">361</context></context-group>
-        <note annotates="source" from="developer">Status tip for Restore Wallet menu item</note>
-      </trans-unit>
-      <trans-unit id="_msg144">
-        <source xml:space="preserve">Close all wallets</source>
-        <context-group purpose="location"><context context-type="linenumber">364</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg145">
-        <source xml:space="preserve">Migrate Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg146">
-        <source xml:space="preserve">Migrate a wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">368</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg147">
-        <source xml:space="preserve">Show the %1 help message to get a list with possible Bitcoin command-line options</source>
-        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg148">
-        <source xml:space="preserve">&amp;Mask values</source>
-        <context-group purpose="location"><context context-type="linenumber">375</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg149">
-        <source xml:space="preserve">Mask the values in the Overview tab</source>
-        <context-group purpose="location"><context context-type="linenumber">377</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg150">
-        <source xml:space="preserve">No wallets available</source>
-        <context-group purpose="location"><context context-type="linenumber">432</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">495</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg151">
-        <source xml:space="preserve">Wallet Data</source>
-        <context-group purpose="location"><context context-type="linenumber">438</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">503</context></context-group>
-        <note annotates="source" from="developer">Name of the wallet data file format.</note>
-      </trans-unit>
-      <trans-unit id="_msg152">
-        <source xml:space="preserve">Load Wallet Backup</source>
-        <context-group purpose="location"><context context-type="linenumber">441</context></context-group>
-        <note annotates="source" from="developer">The title for Restore Wallet File Windows</note>
-      </trans-unit>
-      <trans-unit id="_msg153">
-        <source xml:space="preserve">Restore Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">449</context></context-group>
-        <note annotates="source" from="developer">Title of pop-up window shown when the user is attempting to restore a wallet.</note>
-      </trans-unit>
-      <trans-unit id="_msg154">
-        <source xml:space="preserve">Wallet Name</source>
-        <context-group purpose="location"><context context-type="linenumber">451</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">514</context></context-group>
-        <note annotates="source" from="developer">Label of the input field where the name of the wallet is entered.</note>
-      </trans-unit>
-      <trans-unit id="_msg155">
-        <source xml:space="preserve">Invalid Wallet Name</source>
-        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg156">
-        <source xml:space="preserve">Wallet name cannot be empty</source>
-        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg157">
-        <source xml:space="preserve">Restore and Migrate Wallet Backup</source>
-        <context-group purpose="location"><context context-type="linenumber">504</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg158">
-        <source xml:space="preserve">Restore and Migrate Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">512</context></context-group>
-        <note annotates="source" from="developer">Title of pop-up window shown when the user is attempting to restore a wallet.</note>
-      </trans-unit>
-      <trans-unit id="_msg159">
-        <source xml:space="preserve">&amp;Window</source>
-        <context-group purpose="location"><context context-type="linenumber">571</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg160">
-        <source xml:space="preserve">Ctrl+M</source>
-        <context-group purpose="location"><context context-type="linenumber">574</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg161">
-        <source xml:space="preserve">Zoom</source>
-        <context-group purpose="location"><context context-type="linenumber">583</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg162">
-        <source xml:space="preserve">Main Window</source>
-        <context-group purpose="location"><context context-type="linenumber">601</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg163">
-        <source xml:space="preserve">%1 client</source>
-        <context-group purpose="location"><context context-type="linenumber">880</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg164">
-        <source xml:space="preserve">&amp;Hide</source>
-        <context-group purpose="location"><context context-type="linenumber">948</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg165">
-        <source xml:space="preserve">S&amp;how</source>
-        <context-group purpose="location"><context context-type="linenumber">949</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">1067</context></context-group>
-        <note annotates="source" from="developer">A substring of the tooltip.</note>
-        <trans-unit id="_msg166[0]">
-          <source xml:space="preserve">%n active connection(s) to Bitcoin network.</source>
-        </trans-unit>
-        <trans-unit id="_msg166[1]">
-          <source xml:space="preserve">%n active connection(s) to Bitcoin network.</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg167">
-        <source xml:space="preserve">Click for more actions.</source>
-        <context-group purpose="location"><context context-type="linenumber">1077</context></context-group>
-        <note annotates="source" from="developer">A substring of the tooltip. &quot;More actions&quot; are available via the context menu.</note>
-      </trans-unit>
-      <trans-unit id="_msg168">
-        <source xml:space="preserve">Show Peers tab</source>
-        <context-group purpose="location"><context context-type="linenumber">1094</context></context-group>
-        <note annotates="source" from="developer">A context menu item. The &quot;Peers tab&quot; is an element of the &quot;Node window&quot;.</note>
-      </trans-unit>
-      <trans-unit id="_msg169">
-        <source xml:space="preserve">Disable network activity</source>
-        <context-group purpose="location"><context context-type="linenumber">1102</context></context-group>
-        <note annotates="source" from="developer">A context menu item.</note>
-      </trans-unit>
-      <trans-unit id="_msg170">
-        <source xml:space="preserve">Enable network activity</source>
-        <context-group purpose="location"><context context-type="linenumber">1104</context></context-group>
-        <note annotates="source" from="developer">A context menu item. The network activity was disabled previously.</note>
-      </trans-unit>
-      <trans-unit id="_msg171">
-        <source xml:space="preserve">Pre-syncing Headers (%1%)…</source>
-        <context-group purpose="location"><context context-type="linenumber">1121</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg172">
-        <source xml:space="preserve">Error: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1280</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg173">
-        <source xml:space="preserve">Warning: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1284</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg174">
-        <source xml:space="preserve">Date: %1
-</source>
-        <context-group purpose="location"><context context-type="linenumber">1392</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg175">
-        <source xml:space="preserve">Amount: %1
-</source>
-        <context-group purpose="location"><context context-type="linenumber">1393</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg176">
-        <source xml:space="preserve">Wallet: %1
-</source>
-        <context-group purpose="location"><context context-type="linenumber">1395</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg177">
-        <source xml:space="preserve">Type: %1
-</source>
-        <context-group purpose="location"><context context-type="linenumber">1397</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg178">
-        <source xml:space="preserve">Label: %1
-</source>
-        <context-group purpose="location"><context context-type="linenumber">1399</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg179">
-        <source xml:space="preserve">Address: %1
-</source>
-        <context-group purpose="location"><context context-type="linenumber">1401</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg180">
-        <source xml:space="preserve">Sent transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">1402</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg181">
-        <source xml:space="preserve">Incoming transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">1402</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg182">
-        <source xml:space="preserve">HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
-        <context-group purpose="location"><context context-type="linenumber">1454</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg183">
-        <source xml:space="preserve">HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
-        <context-group purpose="location"><context context-type="linenumber">1454</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg184">
-        <source xml:space="preserve">Private key &lt;b&gt;disabled&lt;/b&gt;</source>
-        <context-group purpose="location"><context context-type="linenumber">1454</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg185">
-        <source xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <context-group purpose="location"><context context-type="linenumber">1477</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg186">
-        <source xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <context-group purpose="location"><context context-type="linenumber">1485</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg187">
-        <source xml:space="preserve">Original message:</source>
-        <context-group purpose="location"><context context-type="linenumber">1604</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="UnitDisplayStatusBarControl">
-      <trans-unit id="_msg188">
-        <source xml:space="preserve">Unit to show amounts in. Click to select another unit.</source>
-        <context-group purpose="location"><context context-type="linenumber">1650</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/coincontroldialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="CoinControlDialog">
-      <trans-unit id="_msg189">
-        <source xml:space="preserve">Coin Selection</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg190">
-        <source xml:space="preserve">Quantity:</source>
-        <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg191">
-        <source xml:space="preserve">Bytes:</source>
-        <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg192">
-        <source xml:space="preserve">Amount:</source>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg193">
-        <source xml:space="preserve">Fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">170</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg194">
-        <source xml:space="preserve">After Fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg195">
-        <source xml:space="preserve">Change:</source>
-        <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg196">
-        <source xml:space="preserve">(un)select all</source>
-        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg197">
-        <source xml:space="preserve">Tree mode</source>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg198">
-        <source xml:space="preserve">List mode</source>
-        <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg199">
-        <source xml:space="preserve">Amount</source>
-        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg200">
-        <source xml:space="preserve">Received with label</source>
-        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg201">
-        <source xml:space="preserve">Received with address</source>
-        <context-group purpose="location"><context context-type="linenumber">401</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg202">
-        <source xml:space="preserve">Date</source>
-        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg203">
-        <source xml:space="preserve">Confirmations</source>
-        <context-group purpose="location"><context context-type="linenumber">411</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg204">
-        <source xml:space="preserve">Confirmed</source>
-        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../coincontroldialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="CoinControlDialog">
-      <trans-unit id="_msg205">
-        <source xml:space="preserve">Copy amount</source>
-        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg206">
-        <source xml:space="preserve">&amp;Copy address</source>
-        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg207">
-        <source xml:space="preserve">Copy &amp;label</source>
-        <context-group purpose="location"><context context-type="linenumber">55</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg208">
-        <source xml:space="preserve">Copy &amp;amount</source>
-        <context-group purpose="location"><context context-type="linenumber">56</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg209">
-        <source xml:space="preserve">Copy transaction &amp;ID and output index</source>
-        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg210">
-        <source xml:space="preserve">L&amp;ock unspent</source>
-        <context-group purpose="location"><context context-type="linenumber">59</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg211">
-        <source xml:space="preserve">&amp;Unlock unspent</source>
-        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg212">
-        <source xml:space="preserve">Copy quantity</source>
-        <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg213">
-        <source xml:space="preserve">Copy fee</source>
-        <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg214">
-        <source xml:space="preserve">Copy after fee</source>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg215">
-        <source xml:space="preserve">Copy bytes</source>
-        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg216">
-        <source xml:space="preserve">Copy change</source>
-        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg217">
-        <source xml:space="preserve">(%1 locked)</source>
-        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg218">
-        <source xml:space="preserve">Can vary +/- %1 satoshi(s) per input.</source>
-        <context-group purpose="location"><context context-type="linenumber">528</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg219">
-        <source xml:space="preserve">(no label)</source>
-        <context-group purpose="location"><context context-type="linenumber">573</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">627</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg220">
-        <source xml:space="preserve">change from %1 (%2)</source>
-        <context-group purpose="location"><context context-type="linenumber">620</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg221">
-        <source xml:space="preserve">(change)</source>
-        <context-group purpose="location"><context context-type="linenumber">621</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../walletcontroller.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="CreateWalletActivity">
-      <trans-unit id="_msg222">
-        <source xml:space="preserve">Create Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
-        <note annotates="source" from="developer">Title of window indicating the progress of creation of a new wallet.</note>
-      </trans-unit>
-      <trans-unit id="_msg223">
-        <source xml:space="preserve">Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <context-group purpose="location"><context context-type="linenumber">253</context></context-group>
-        <note annotates="source" from="developer">Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</note>
-      </trans-unit>
-      <trans-unit id="_msg224">
-        <source xml:space="preserve">Create wallet failed</source>
-        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg225">
-        <source xml:space="preserve">Create wallet warning</source>
-        <context-group purpose="location"><context context-type="linenumber">287</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg226">
-        <source xml:space="preserve">Can&apos;t list signers</source>
-        <context-group purpose="location"><context context-type="linenumber">303</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg227">
-        <source xml:space="preserve">Too many external signers found</source>
-        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="LoadWalletsActivity">
-      <trans-unit id="_msg228">
-        <source xml:space="preserve">Load Wallets</source>
-        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
-        <note annotates="source" from="developer">Title of progress window which is displayed when wallets are being loaded.</note>
-      </trans-unit>
-      <trans-unit id="_msg229">
-        <source xml:space="preserve">Loading wallets…</source>
-        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
-        <note annotates="source" from="developer">Descriptive text of the load wallets progress window which indicates to the user that wallets are currently being loaded.</note>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="MigrateWalletActivity">
-      <trans-unit id="_msg230">
-        <source xml:space="preserve">Migrate wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">477</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg231">
-        <source xml:space="preserve">Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
-        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg232">
-        <source xml:space="preserve">Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
-If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
-If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
-
-The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the &quot;Restore Wallet&quot; functionality.</source>
-        <context-group purpose="location"><context context-type="linenumber">479</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg233">
-        <source xml:space="preserve">Migrate Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">451</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg234">
-        <source xml:space="preserve">Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <context-group purpose="location"><context context-type="linenumber">451</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg235">
-        <source xml:space="preserve">The wallet &apos;%1&apos; was migrated successfully.</source>
-        <context-group purpose="location"><context context-type="linenumber">457</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg236">
-        <source xml:space="preserve">Watchonly scripts have been migrated to a new wallet named &apos;%1&apos;.</source>
-        <context-group purpose="location"><context context-type="linenumber">459</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg237">
-        <source xml:space="preserve">Solvable but not watched scripts have been migrated to a new wallet named &apos;%1&apos;.</source>
-        <context-group purpose="location"><context context-type="linenumber">462</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg238">
-        <source xml:space="preserve">Restore and Migrate wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">496</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg239">
-        <source xml:space="preserve">Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
-        <context-group purpose="location"><context context-type="linenumber">497</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg240">
-        <source xml:space="preserve">Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
-
-Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
-If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
-If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
-
-The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the &quot;Restore Wallet&quot; functionality.</source>
-        <context-group purpose="location"><context context-type="linenumber">498</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg241">
-        <source xml:space="preserve">Restore Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">512</context></context-group>
-        <note annotates="source" from="developer">Title of progress window which is displayed when wallets are being restored.</note>
-      </trans-unit>
-      <trans-unit id="_msg242">
-        <source xml:space="preserve">Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <context-group purpose="location"><context context-type="linenumber">515</context></context-group>
-        <note annotates="source" from="developer">Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</note>
-      </trans-unit>
-      <trans-unit id="_msg243">
-        <source xml:space="preserve">Migration failed</source>
-        <context-group purpose="location"><context context-type="linenumber">534</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg244">
-        <source xml:space="preserve">Migration Successful</source>
-        <context-group purpose="location"><context context-type="linenumber">536</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="OpenWalletActivity">
-      <trans-unit id="_msg245">
-        <source xml:space="preserve">Open wallet failed</source>
-        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg246">
-        <source xml:space="preserve">Open wallet warning</source>
-        <context-group purpose="location"><context context-type="linenumber">339</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg247">
-        <source xml:space="preserve">Open Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
-        <note annotates="source" from="developer">Title of window indicating the progress of opening of a wallet.</note>
-      </trans-unit>
-      <trans-unit id="_msg248">
-        <source xml:space="preserve">Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <context-group purpose="location"><context context-type="linenumber">356</context></context-group>
-        <note annotates="source" from="developer">Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</note>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="RestoreWalletActivity">
-      <trans-unit id="_msg249">
-        <source xml:space="preserve">Restore Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
-        <note annotates="source" from="developer">Title of progress window which is displayed when wallets are being restored.</note>
-      </trans-unit>
-      <trans-unit id="_msg250">
-        <source xml:space="preserve">Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
-        <note annotates="source" from="developer">Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</note>
-      </trans-unit>
-      <trans-unit id="_msg251">
-        <source xml:space="preserve">Restore wallet failed</source>
-        <context-group purpose="location"><context context-type="linenumber">428</context></context-group>
-        <note annotates="source" from="developer">Title of message box which is displayed when the wallet could not be restored.</note>
-      </trans-unit>
-      <trans-unit id="_msg252">
-        <source xml:space="preserve">Restore wallet warning</source>
-        <context-group purpose="location"><context context-type="linenumber">431</context></context-group>
-        <note annotates="source" from="developer">Title of message box which is displayed when the wallet is restored with some warning.</note>
-      </trans-unit>
-      <trans-unit id="_msg253">
-        <source xml:space="preserve">Restore wallet message</source>
-        <context-group purpose="location"><context context-type="linenumber">434</context></context-group>
-        <note annotates="source" from="developer">Title of message box which is displayed when the wallet is successfully restored.</note>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="WalletController">
-      <trans-unit id="_msg254">
-        <source xml:space="preserve">Close wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg255">
-        <source xml:space="preserve">Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
-        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg256">
-        <source xml:space="preserve">Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
-        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg257">
-        <source xml:space="preserve">Close all wallets</source>
-        <context-group purpose="location"><context context-type="linenumber">105</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg258">
-        <source xml:space="preserve">Are you sure you wish to close all wallets?</source>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/createwalletdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="CreateWalletDialog">
-      <trans-unit id="_msg259">
-        <source xml:space="preserve">Create Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg260">
-        <source xml:space="preserve">You are one step away from creating your new wallet!</source>
-        <context-group purpose="location"><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg261">
-        <source xml:space="preserve">Please provide a name and, if desired, enable any advanced options</source>
-        <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg262">
-        <source xml:space="preserve">Wallet Name</source>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg263">
-        <source xml:space="preserve">Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg264">
-        <source xml:space="preserve">Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
-        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg265">
-        <source xml:space="preserve">Encrypt Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg266">
-        <source xml:space="preserve">Advanced Options</source>
-        <context-group purpose="location"><context context-type="linenumber">118</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg267">
-        <source xml:space="preserve">Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
-        <context-group purpose="location"><context context-type="linenumber">139</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg268">
-        <source xml:space="preserve">Disable Private Keys</source>
-        <context-group purpose="location"><context context-type="linenumber">142</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg269">
-        <source xml:space="preserve">Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
-        <context-group purpose="location"><context context-type="linenumber">149</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg270">
-        <source xml:space="preserve">Make Blank Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg271">
-        <source xml:space="preserve">Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg272">
-        <source xml:space="preserve">External signer</source>
-        <context-group purpose="location"><context context-type="linenumber">162</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../createwalletdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="CreateWalletDialog">
-      <trans-unit id="_msg273">
-        <source xml:space="preserve">Create</source>
-        <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg274">
-        <source xml:space="preserve">Compiled without external signing support (required for external signing)</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-        <note annotates="source" from="developer">&quot;External signing&quot; means using devices such as hardware wallets.</note>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/editaddressdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="EditAddressDialog">
-      <trans-unit id="_msg275">
-        <source xml:space="preserve">Edit Address</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg276">
-        <source xml:space="preserve">&amp;Label</source>
-        <context-group purpose="location"><context context-type="linenumber">25</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg277">
-        <source xml:space="preserve">The label associated with this address list entry</source>
-        <context-group purpose="location"><context context-type="linenumber">35</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg278">
-        <source xml:space="preserve">The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg279">
-        <source xml:space="preserve">&amp;Address</source>
-        <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../editaddressdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="EditAddressDialog">
-      <trans-unit id="_msg280">
-        <source xml:space="preserve">New sending address</source>
-        <context-group purpose="location"><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg281">
-        <source xml:space="preserve">Edit receiving address</source>
-        <context-group purpose="location"><context context-type="linenumber">32</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg282">
-        <source xml:space="preserve">Edit sending address</source>
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg283">
-        <source xml:space="preserve">The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
-        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg284">
-        <source xml:space="preserve">Address &quot;%1&quot; already exists as a receiving address with label &quot;%2&quot; and so cannot be added as a sending address.</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg285">
-        <source xml:space="preserve">The entered address &quot;%1&quot; is already in the address book with label &quot;%2&quot;.</source>
-        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg286">
-        <source xml:space="preserve">Could not unlock wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg287">
-        <source xml:space="preserve">New key generation failed.</source>
-        <context-group purpose="location"><context context-type="linenumber">128</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../freespacechecker.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="FreespaceChecker">
-      <trans-unit id="_msg288">
-        <source xml:space="preserve">A new data directory will be created.</source>
-        <context-group purpose="location"><context context-type="linenumber">21</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg289">
-        <source xml:space="preserve">name</source>
-        <context-group purpose="location"><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg290">
-        <source xml:space="preserve">Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg291">
-        <source xml:space="preserve">Path already exists, and is not a directory.</source>
-        <context-group purpose="location"><context context-type="linenumber">48</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg292">
-        <source xml:space="preserve">Cannot create data directory here.</source>
-        <context-group purpose="location"><context context-type="linenumber">55</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../utilitydialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="HelpMessageDialog">
-      <trans-unit id="_msg293">
-        <source xml:space="preserve">version</source>
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg294">
-        <source xml:space="preserve">About %1</source>
-        <context-group purpose="location"><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg295">
-        <source xml:space="preserve">Command-line options</source>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="ShutdownWindow">
-      <trans-unit id="_msg296">
-        <source xml:space="preserve">%1 is shutting down…</source>
-        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg297">
-        <source xml:space="preserve">Do not shut down the computer until this window disappears.</source>
-        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/intro.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="Intro">
-      <trans-unit id="_msg298">
-        <source xml:space="preserve">Welcome</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg299">
-        <source xml:space="preserve">Welcome to %1.</source>
-        <context-group purpose="location"><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg300">
-        <source xml:space="preserve">As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg301">
-        <source xml:space="preserve">Limit block chain storage to</source>
-        <context-group purpose="location"><context context-type="linenumber">238</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg302">
-        <source xml:space="preserve">Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
-        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg303">
-        <source xml:space="preserve"> GB</source>
-        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg304">
-        <source xml:space="preserve">This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg305">
-        <source xml:space="preserve">When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
-        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg306">
-        <source xml:space="preserve">If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
-        <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg307">
-        <source xml:space="preserve">Use the default data directory</source>
-        <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg308">
-        <source xml:space="preserve">Use a custom data directory:</source>
-        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../intro.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="Intro">
-      <trans-unit id="_msg309">
-        <source xml:space="preserve">Bitcoin</source>
-        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
-        <trans-unit id="_msg310[0]">
-          <source xml:space="preserve">%n GB of space available</source>
-        </trans-unit>
-        <trans-unit id="_msg310[1]">
-          <source xml:space="preserve">%n GB of space available</source>
-        </trans-unit>
-      </group>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">220</context></context-group>
-        <trans-unit id="_msg311[0]">
-          <source xml:space="preserve">(of %n GB needed)</source>
-        </trans-unit>
-        <trans-unit id="_msg311[1]">
-          <source xml:space="preserve">(of %n GB needed)</source>
-        </trans-unit>
-      </group>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
-        <trans-unit id="_msg312[0]">
-          <source xml:space="preserve">(%n GB needed for full chain)</source>
-        </trans-unit>
-        <trans-unit id="_msg312[1]">
-          <source xml:space="preserve">(%n GB needed for full chain)</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg313">
-        <source xml:space="preserve">Choose data directory</source>
-        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg314">
-        <source xml:space="preserve">At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
-        <context-group purpose="location"><context context-type="linenumber">295</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg315">
-        <source xml:space="preserve">Approximately %1 GB of data will be stored in this directory.</source>
-        <context-group purpose="location"><context context-type="linenumber">298</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
-        <note annotates="source" from="developer">Explanatory text on the capability of the current prune target.</note>
-        <trans-unit id="_msg316[0]">
-          <source xml:space="preserve">(sufficient to restore backups %n day(s) old)</source>
-        </trans-unit>
-        <trans-unit id="_msg316[1]">
-          <source xml:space="preserve">(sufficient to restore backups %n day(s) old)</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg317">
-        <source xml:space="preserve">%1 will download and store a copy of the Bitcoin block chain.</source>
-        <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg318">
-        <source xml:space="preserve">The wallet will also be stored in this directory.</source>
-        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg319">
-        <source xml:space="preserve">Error: Specified data directory &quot;%1&quot; cannot be created.</source>
-        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg320">
-        <source xml:space="preserve">Error</source>
-        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/modaloverlay.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="ModalOverlay">
-      <trans-unit id="_msg321">
-        <source xml:space="preserve">Form</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg322">
-        <source xml:space="preserve">Recent transactions may not yet be visible, and therefore your wallet&apos;s balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
-        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg323">
-        <source xml:space="preserve">Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
-        <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg324">
-        <source xml:space="preserve">Number of blocks left</source>
-        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg325">
-        <source xml:space="preserve">Unknown…</source>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../modaloverlay.cpp</context><context context-type="linenumber">160</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg326">
-        <source xml:space="preserve">calculating…</source>
-        <context-group purpose="location"><context context-type="linenumber">292</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg327">
-        <source xml:space="preserve">Last block time</source>
-        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg328">
-        <source xml:space="preserve">Progress</source>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg329">
-        <source xml:space="preserve">Progress increase per hour</source>
-        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg330">
-        <source xml:space="preserve">Estimated time left until synced</source>
-        <context-group purpose="location"><context context-type="linenumber">305</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg331">
-        <source xml:space="preserve">Hide</source>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg332">
-        <source xml:space="preserve">Esc</source>
-        <context-group purpose="location"><context context-type="linenumber">345</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../modaloverlay.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="ModalOverlay">
-      <trans-unit id="_msg333">
-        <source xml:space="preserve">%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg334">
-        <source xml:space="preserve">Unknown. Syncing Headers (%1, %2%)…</source>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg335">
-        <source xml:space="preserve">Unknown. Pre-syncing Headers (%1, %2%)…</source>
-        <context-group purpose="location"><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg336">
-        <source xml:space="preserve">unknown</source>
-        <context-group purpose="location"><context context-type="linenumber">131</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/openuridialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="OpenURIDialog">
-      <trans-unit id="_msg337">
-        <source xml:space="preserve">Open bitcoin URI</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg338">
-        <source xml:space="preserve">URI:</source>
-        <context-group purpose="location"><context context-type="linenumber">22</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg339">
-        <source xml:space="preserve">Paste address from clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for button that allows you to paste an address that is in your clipboard.</note>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/optionsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="OptionsDialog">
-      <trans-unit id="_msg340">
-        <source xml:space="preserve">Options</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg341">
-        <source xml:space="preserve">&amp;Main</source>
-        <context-group purpose="location"><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg342">
-        <source xml:space="preserve">Automatically start %1 after logging in to the system.</source>
-        <context-group purpose="location"><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg343">
-        <source xml:space="preserve">&amp;Start %1 on system login</source>
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg344">
-        <source xml:space="preserve">Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg345">
-        <source xml:space="preserve">Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
-        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</note>
-      </trans-unit>
-      <trans-unit id="_msg346">
-        <source xml:space="preserve">Size of &amp;database cache</source>
-        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg347">
-        <source xml:space="preserve">Number of script &amp;verification threads</source>
-        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg348">
-        <source xml:space="preserve">Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
-        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg349">
-        <source xml:space="preserve">Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
-        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg350">
-        <source xml:space="preserve">Map port using PCP or NA&amp;T-PMP</source>
-        <context-group purpose="location"><context context-type="linenumber">324</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg351">
-        <source xml:space="preserve">IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">565</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg352">
-        <source xml:space="preserve">Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
-        <context-group purpose="location"><context context-type="linenumber">447</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">470</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">493</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg353">
-        <source xml:space="preserve">Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <context-group purpose="location"><context context-type="linenumber">662</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg354">
-        <source xml:space="preserve">Font in the Overview tab: </source>
-        <context-group purpose="location"><context context-type="linenumber">769</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg355">
-        <source xml:space="preserve">Options set in this dialog are overridden by the command line:</source>
-        <context-group purpose="location"><context context-type="linenumber">814</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg356">
-        <source xml:space="preserve">Open the %1 configuration file from the working directory.</source>
-        <context-group purpose="location"><context context-type="linenumber">859</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg357">
-        <source xml:space="preserve">Open Configuration File</source>
-        <context-group purpose="location"><context context-type="linenumber">862</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg358">
-        <source xml:space="preserve">Reset all client options to default.</source>
-        <context-group purpose="location"><context context-type="linenumber">872</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg359">
-        <source xml:space="preserve">&amp;Reset Options</source>
-        <context-group purpose="location"><context context-type="linenumber">875</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg360">
-        <source xml:space="preserve">&amp;Network</source>
-        <context-group purpose="location"><context context-type="linenumber">315</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg361">
-        <source xml:space="preserve">Prune &amp;block storage to</source>
-        <context-group purpose="location"><context context-type="linenumber">61</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg362">
-        <source xml:space="preserve">GB</source>
-        <context-group purpose="location"><context context-type="linenumber">71</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg363">
-        <source xml:space="preserve">Reverting this setting requires re-downloading the entire blockchain.</source>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg364">
-        <source xml:space="preserve">MiB</source>
-        <context-group purpose="location"><context context-type="linenumber">127</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg365">
-        <source xml:space="preserve">Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
-        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</note>
-      </trans-unit>
-      <trans-unit id="_msg366">
-        <source xml:space="preserve">(0 = auto, &lt;0 = leave that many cores free)</source>
-        <context-group purpose="location"><context context-type="linenumber">170</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg367">
-        <source xml:space="preserve">This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for Options window setting that enables the RPC server.</note>
-      </trans-unit>
-      <trans-unit id="_msg368">
-        <source xml:space="preserve">Enable R&amp;PC server</source>
-        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
-        <note annotates="source" from="developer">An Options window setting to enable the RPC server.</note>
-      </trans-unit>
-      <trans-unit id="_msg369">
-        <source xml:space="preserve">W&amp;allet</source>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg370">
-        <source xml:space="preserve">Whether to set subtract fee from amount as default or not.</source>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</note>
-      </trans-unit>
-      <trans-unit id="_msg371">
-        <source xml:space="preserve">Subtract &amp;fee from amount by default</source>
-        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
-        <note annotates="source" from="developer">An Options window setting to set subtracting the fee from a sending amount as default.</note>
-      </trans-unit>
-      <trans-unit id="_msg372">
-        <source xml:space="preserve">Expert</source>
-        <context-group purpose="location"><context context-type="linenumber">232</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg373">
-        <source xml:space="preserve">Enable coin &amp;control features</source>
-        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg374">
-        <source xml:space="preserve">If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
-        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg375">
-        <source xml:space="preserve">&amp;Spend unconfirmed change</source>
-        <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg376">
-        <source xml:space="preserve">Enable &amp;PSBT controls</source>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
-        <note annotates="source" from="developer">An options window setting to enable PSBT controls.</note>
-      </trans-unit>
-      <trans-unit id="_msg377">
-        <source xml:space="preserve">Whether to show PSBT controls.</source>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for options window setting that enables PSBT controls.</note>
-      </trans-unit>
-      <trans-unit id="_msg378">
-        <source xml:space="preserve">External Signer (e.g. hardware wallet)</source>
-        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg379">
-        <source xml:space="preserve">&amp;External signer script path</source>
-        <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg380">
-        <source xml:space="preserve">Accept connections from outside.</source>
-        <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg381">
-        <source xml:space="preserve">Allow incomin&amp;g connections</source>
-        <context-group purpose="location"><context context-type="linenumber">334</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg382">
-        <source xml:space="preserve">Connect to the Bitcoin network through a SOCKS5 proxy.</source>
-        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg383">
-        <source xml:space="preserve">&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <context-group purpose="location"><context context-type="linenumber">344</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg384">
-        <source xml:space="preserve">Proxy &amp;IP:</source>
-        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">540</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg385">
-        <source xml:space="preserve">&amp;Port:</source>
-        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">572</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg386">
-        <source xml:space="preserve">Port of the proxy (e.g. 9050)</source>
-        <context-group purpose="location"><context context-type="linenumber">410</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">597</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg387">
-        <source xml:space="preserve">Used for reaching peers via:</source>
-        <context-group purpose="location"><context context-type="linenumber">434</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg388">
-        <source xml:space="preserve">IPv4</source>
-        <context-group purpose="location"><context context-type="linenumber">457</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg389">
-        <source xml:space="preserve">IPv6</source>
-        <context-group purpose="location"><context context-type="linenumber">480</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg390">
-        <source xml:space="preserve">Tor</source>
-        <context-group purpose="location"><context context-type="linenumber">503</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg391">
-        <source xml:space="preserve">&amp;Window</source>
-        <context-group purpose="location"><context context-type="linenumber">633</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg392">
-        <source xml:space="preserve">Show the icon in the system tray.</source>
-        <context-group purpose="location"><context context-type="linenumber">639</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg393">
-        <source xml:space="preserve">&amp;Show tray icon</source>
-        <context-group purpose="location"><context context-type="linenumber">642</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg394">
-        <source xml:space="preserve">Show only a tray icon after minimizing the window.</source>
-        <context-group purpose="location"><context context-type="linenumber">652</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg395">
-        <source xml:space="preserve">&amp;Minimize to the tray instead of the taskbar</source>
-        <context-group purpose="location"><context context-type="linenumber">655</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg396">
-        <source xml:space="preserve">M&amp;inimize on close</source>
-        <context-group purpose="location"><context context-type="linenumber">665</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg397">
-        <source xml:space="preserve">&amp;Display</source>
-        <context-group purpose="location"><context context-type="linenumber">686</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg398">
-        <source xml:space="preserve">User Interface &amp;language:</source>
-        <context-group purpose="location"><context context-type="linenumber">694</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg399">
-        <source xml:space="preserve">The user interface language can be set here. This setting will take effect after restarting %1.</source>
-        <context-group purpose="location"><context context-type="linenumber">707</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg400">
-        <source xml:space="preserve">&amp;Unit to show amounts in:</source>
-        <context-group purpose="location"><context context-type="linenumber">718</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg401">
-        <source xml:space="preserve">Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <context-group purpose="location"><context context-type="linenumber">731</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg402">
-        <source xml:space="preserve">Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">755</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg403">
-        <source xml:space="preserve">&amp;Third-party transaction URLs</source>
-        <context-group purpose="location"><context context-type="linenumber">745</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg404">
-        <source xml:space="preserve">Whether to show coin control features or not.</source>
-        <context-group purpose="location"><context context-type="linenumber">238</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg405">
-        <source xml:space="preserve">Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor onion services.</source>
-        <context-group purpose="location"><context context-type="linenumber">528</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg406">
-        <source xml:space="preserve">Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
-        <context-group purpose="location"><context context-type="linenumber">531</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg407">
-        <source xml:space="preserve">&amp;OK</source>
-        <context-group purpose="location"><context context-type="linenumber">955</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg408">
-        <source xml:space="preserve">&amp;Cancel</source>
-        <context-group purpose="location"><context context-type="linenumber">968</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../optionsdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="OptionsDialog">
-      <trans-unit id="_msg409">
-        <source xml:space="preserve">Compiled without external signing support (required for external signing)</source>
-        <context-group purpose="location"><context context-type="linenumber">145</context></context-group>
-        <note annotates="source" from="developer">&quot;External signing&quot; means using devices such as hardware wallets.</note>
-      </trans-unit>
-      <trans-unit id="_msg410">
-        <source xml:space="preserve">default</source>
-        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg411">
-        <source xml:space="preserve">none</source>
-        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg412">
-        <source xml:space="preserve">Confirm options reset</source>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
-        <note annotates="source" from="developer">Window title text of pop-up window shown when the user has chosen to reset options.</note>
-      </trans-unit>
-      <trans-unit id="_msg413">
-        <source xml:space="preserve">Client restart required to activate changes.</source>
-        <context-group purpose="location"><context context-type="linenumber">333</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
-        <note annotates="source" from="developer">Text explaining that the settings changed will not come into effect until the client is restarted.</note>
-      </trans-unit>
-      <trans-unit id="_msg414">
-        <source xml:space="preserve">Current settings will be backed up at &quot;%1&quot;.</source>
-        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
-        <note annotates="source" from="developer">Text explaining to the user that the client&apos;s current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location&apos;s path.</note>
-      </trans-unit>
-      <trans-unit id="_msg415">
-        <source xml:space="preserve">Client will be shut down. Do you want to proceed?</source>
-        <context-group purpose="location"><context context-type="linenumber">340</context></context-group>
-        <note annotates="source" from="developer">Text asking the user to confirm if they would like to proceed with a client shutdown.</note>
-      </trans-unit>
-      <trans-unit id="_msg416">
-        <source xml:space="preserve">Configuration options</source>
-        <context-group purpose="location"><context context-type="linenumber">360</context></context-group>
-        <note annotates="source" from="developer">Window title text of pop-up box that allows opening up of configuration file.</note>
-      </trans-unit>
-      <trans-unit id="_msg417">
-        <source xml:space="preserve">The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source>
-        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
-        <note annotates="source" from="developer">Explanatory text about the priority order of instructions considered by client. The order from high to low being: command-line, configuration file, GUI settings.</note>
-      </trans-unit>
-      <trans-unit id="_msg418">
-        <source xml:space="preserve">Continue</source>
-        <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg419">
-        <source xml:space="preserve">Cancel</source>
-        <context-group purpose="location"><context context-type="linenumber">367</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg420">
-        <source xml:space="preserve">Error</source>
-        <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg421">
-        <source xml:space="preserve">The configuration file could not be opened.</source>
-        <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg422">
-        <source xml:space="preserve">This change would require a client restart.</source>
-        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg423">
-        <source xml:space="preserve">The supplied proxy address is invalid.</source>
-        <context-group purpose="location"><context context-type="linenumber">446</context></context-group>
-      </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg424">
-        <source xml:space="preserve">Embedded &quot;%1&quot;</source>
-        <context-group purpose="location"><context context-type="linenumber">61</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg425">
-        <source xml:space="preserve">Default system font &quot;%1&quot;</source>
-        <context-group purpose="location"><context context-type="linenumber">62</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg426">
-        <source xml:space="preserve">Custom…</source>
-        <context-group purpose="location"><context context-type="linenumber">63</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../optionsmodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="OptionsModel">
-      <trans-unit id="_msg427">
-        <source xml:space="preserve">Could not read setting &quot;%1&quot;, %2.</source>
-        <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/overviewpage.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="OverviewPage">
-      <trans-unit id="_msg428">
-        <source xml:space="preserve">Form</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg429">
-        <source xml:space="preserve">The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">296</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg430">
-        <source xml:space="preserve">Available:</source>
-        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg431">
-        <source xml:space="preserve">Your current spendable balance</source>
-        <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg432">
-        <source xml:space="preserve">Pending:</source>
-        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg433">
-        <source xml:space="preserve">Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg434">
-        <source xml:space="preserve">Immature:</source>
-        <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg435">
-        <source xml:space="preserve">Mined balance that has not yet matured</source>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg436">
-        <source xml:space="preserve">Balances</source>
-        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg437">
-        <source xml:space="preserve">Total:</source>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg438">
-        <source xml:space="preserve">Your current total balance</source>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg439">
-        <source xml:space="preserve">Recent transactions</source>
-        <context-group purpose="location"><context context-type="linenumber">280</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../overviewpage.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="OverviewPage">
-      <trans-unit id="_msg440">
-        <source xml:space="preserve">Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <context-group purpose="location"><context context-type="linenumber">176</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/psbtoperationsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="PSBTOperationsDialog">
-      <trans-unit id="_msg441">
-        <source xml:space="preserve">PSBT Operations</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg442">
-        <source xml:space="preserve">Sign Tx</source>
-        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg443">
-        <source xml:space="preserve">Broadcast Tx</source>
-        <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg444">
-        <source xml:space="preserve">Copy to Clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg445">
-        <source xml:space="preserve">Save…</source>
-        <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg446">
-        <source xml:space="preserve">Close</source>
-        <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../psbtoperationsdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="PSBTOperationsDialog">
-      <trans-unit id="_msg447">
-        <source xml:space="preserve">Failed to load transaction: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg448">
-        <source xml:space="preserve">Failed to sign transaction: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg449">
-        <source xml:space="preserve">Cannot sign inputs while wallet is locked.</source>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg450">
-        <source xml:space="preserve">Could not sign any more inputs.</source>
-        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
-        <trans-unit id="_msg451[0]">
-          <source xml:space="preserve">Signed %n input(s), but more signatures are still required.</source>
-        </trans-unit>
-        <trans-unit id="_msg451[1]">
-          <source xml:space="preserve">Signed %n input(s), but more signatures are still required.</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg452">
-        <source xml:space="preserve">Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg453">
-        <source xml:space="preserve">Unknown error processing transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg454">
-        <source xml:space="preserve">Transaction broadcast successfully! Transaction ID: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg455">
-        <source xml:space="preserve">Transaction broadcast failed: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg456">
-        <source xml:space="preserve">PSBT copied to clipboard.</source>
-        <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg457">
-        <source xml:space="preserve">Save Transaction Data</source>
-        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg458">
-        <source xml:space="preserve">Partially Signed Transaction (Binary)</source>
-        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
-        <note annotates="source" from="developer">Expanded name of the binary PSBT file format. See: BIP 174.</note>
-      </trans-unit>
-      <trans-unit id="_msg459">
-        <source xml:space="preserve">PSBT saved to disk.</source>
-        <context-group purpose="location"><context context-type="linenumber">170</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg460">
-        <source xml:space="preserve">Sends %1 to %2</source>
-        <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg461">
-        <source xml:space="preserve">own address</source>
-        <context-group purpose="location"><context context-type="linenumber">191</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg462">
-        <source xml:space="preserve">Unable to calculate transaction fee or total transaction amount.</source>
-        <context-group purpose="location"><context context-type="linenumber">199</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg463">
-        <source xml:space="preserve">Pays transaction fee: </source>
-        <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg464">
-        <source xml:space="preserve">Total Amount</source>
-        <context-group purpose="location"><context context-type="linenumber">213</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg465">
-        <source xml:space="preserve">or</source>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-        <trans-unit id="_msg466[0]">
-          <source xml:space="preserve">Transaction has %n unsigned input(s).</source>
-        </trans-unit>
-        <trans-unit id="_msg466[1]">
-          <source xml:space="preserve">Transaction has %n unsigned input(s).</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg467">
-        <source xml:space="preserve">Transaction is missing some information about inputs.</source>
-        <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg468">
-        <source xml:space="preserve">Transaction still needs signature(s).</source>
-        <context-group purpose="location"><context context-type="linenumber">272</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg469">
-        <source xml:space="preserve">(But no wallet is loaded.)</source>
-        <context-group purpose="location"><context context-type="linenumber">275</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg470">
-        <source xml:space="preserve">(But this wallet cannot sign transactions.)</source>
-        <context-group purpose="location"><context context-type="linenumber">278</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg471">
-        <source xml:space="preserve">(But this wallet does not have the right keys.)</source>
-        <context-group purpose="location"><context context-type="linenumber">281</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg472">
-        <source xml:space="preserve">Transaction is fully signed and ready for broadcast.</source>
-        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg473">
-        <source xml:space="preserve">Transaction status is unknown.</source>
-        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../paymentserver.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="PaymentServer">
-      <trans-unit id="_msg474">
-        <source xml:space="preserve">Payment request error</source>
-        <context-group purpose="location"><context context-type="linenumber">145</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg475">
-        <source xml:space="preserve">Cannot start bitcoin: click-to-pay handler</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg476">
-        <source xml:space="preserve">URI handling</source>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">210</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg477">
-        <source xml:space="preserve">&apos;bitcoin://&apos; is not a valid URI. Use &apos;bitcoin:&apos; instead.</source>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg478">
-        <source xml:space="preserve">Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it&apos;s strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg479">
-        <source xml:space="preserve">URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <context-group purpose="location"><context context-type="linenumber">224</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg480">
-        <source xml:space="preserve">Payment request file handling</source>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../peertablemodel.h" datatype="c" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="PeerTableModel">
-      <trans-unit id="_msg481">
-        <source xml:space="preserve">User Agent</source>
-        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which contains the peer&apos;s User Agent string.</note>
-      </trans-unit>
-      <trans-unit id="_msg482">
-        <source xml:space="preserve">Ping</source>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which indicates the current latency of the connection with the peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg483">
-        <source xml:space="preserve">Peer</source>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which contains a unique number used to identify a connection.</note>
-      </trans-unit>
-      <trans-unit id="_msg484">
-        <source xml:space="preserve">Age</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</note>
-      </trans-unit>
-      <trans-unit id="_msg485">
-        <source xml:space="preserve">Direction</source>
-        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which indicates the direction the peer connection was initiated from.</note>
-      </trans-unit>
-      <trans-unit id="_msg486">
-        <source xml:space="preserve">Sent</source>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg487">
-        <source xml:space="preserve">Received</source>
-        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which indicates the total amount of network information we have received from the peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg488">
-        <source xml:space="preserve">Address</source>
-        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg489">
-        <source xml:space="preserve">Type</source>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which describes the type of peer connection. The &quot;type&quot; describes why the connection exists.</note>
-      </trans-unit>
-      <trans-unit id="_msg490">
-        <source xml:space="preserve">Network</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-        <note annotates="source" from="developer">Title of Peers Table column which states the network the peer connected through.</note>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../peertablemodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="PeerTableModel">
-      <trans-unit id="_msg491">
-        <source xml:space="preserve">Inbound</source>
-        <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
-        <note annotates="source" from="developer">An Inbound Connection from a Peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg492">
-        <source xml:space="preserve">Outbound</source>
-        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
-        <note annotates="source" from="developer">An Outbound Connection to a Peer.</note>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../bitcoinunits.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg493">
-        <source xml:space="preserve">Amount</source>
-        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../guiutil.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg494">
-        <source xml:space="preserve">Enter a Bitcoin address (e.g. %1)</source>
-        <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg495">
-        <source xml:space="preserve">Ctrl+W</source>
-        <context-group purpose="location"><context context-type="linenumber">426</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg496">
-        <source xml:space="preserve">Unroutable</source>
-        <context-group purpose="location"><context context-type="linenumber">683</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg497">
-        <source xml:space="preserve">IPv4</source>
-        <context-group purpose="location"><context context-type="linenumber">685</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">network name</context></context-group>
-        <note annotates="source" from="developer">Name of IPv4 network in peer info</note>
-      </trans-unit>
-      <trans-unit id="_msg498">
-        <source xml:space="preserve">IPv6</source>
-        <context-group purpose="location"><context context-type="linenumber">687</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">network name</context></context-group>
-        <note annotates="source" from="developer">Name of IPv6 network in peer info</note>
-      </trans-unit>
-      <trans-unit id="_msg499">
-        <source xml:space="preserve">Onion</source>
-        <context-group purpose="location"><context context-type="linenumber">689</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">network name</context></context-group>
-        <note annotates="source" from="developer">Name of Tor network in peer info</note>
-      </trans-unit>
-      <trans-unit id="_msg500">
-        <source xml:space="preserve">I2P</source>
-        <context-group purpose="location"><context context-type="linenumber">691</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">network name</context></context-group>
-        <note annotates="source" from="developer">Name of I2P network in peer info</note>
-      </trans-unit>
-      <trans-unit id="_msg501">
-        <source xml:space="preserve">CJDNS</source>
-        <context-group purpose="location"><context context-type="linenumber">693</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">network name</context></context-group>
-        <note annotates="source" from="developer">Name of CJDNS network in peer info</note>
-      </trans-unit>
-      <trans-unit id="_msg502">
-        <source xml:space="preserve">Inbound</source>
-        <context-group purpose="location"><context context-type="linenumber">707</context></context-group>
-        <note annotates="source" from="developer">An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg503">
-        <source xml:space="preserve">Outbound</source>
-        <context-group purpose="location"><context context-type="linenumber">710</context></context-group>
-        <note annotates="source" from="developer">An outbound connection to a peer. An outbound connection is a connection initiated by us.</note>
-      </trans-unit>
-      <trans-unit id="_msg504">
-        <source xml:space="preserve">Full Relay</source>
-        <context-group purpose="location"><context context-type="linenumber">715</context></context-group>
-        <note annotates="source" from="developer">Peer connection type that relays all network information.</note>
-      </trans-unit>
-      <trans-unit id="_msg505">
-        <source xml:space="preserve">Block Relay</source>
-        <context-group purpose="location"><context context-type="linenumber">718</context></context-group>
-        <note annotates="source" from="developer">Peer connection type that relays network information about blocks and not transactions or addresses.</note>
-      </trans-unit>
-      <trans-unit id="_msg506">
-        <source xml:space="preserve">Manual</source>
-        <context-group purpose="location"><context context-type="linenumber">720</context></context-group>
-        <note annotates="source" from="developer">Peer connection type established manually through one of several methods.</note>
-      </trans-unit>
-      <trans-unit id="_msg507">
-        <source xml:space="preserve">Feeler</source>
-        <context-group purpose="location"><context context-type="linenumber">722</context></context-group>
-        <note annotates="source" from="developer">Short-lived peer connection type that tests the aliveness of known addresses.</note>
-      </trans-unit>
-      <trans-unit id="_msg508">
-        <source xml:space="preserve">Address Fetch</source>
-        <context-group purpose="location"><context context-type="linenumber">724</context></context-group>
-        <note annotates="source" from="developer">Short-lived peer connection type that solicits known addresses from a peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg509">
-        <source xml:space="preserve">Private Broadcast</source>
-        <context-group purpose="location"><context context-type="linenumber">726</context></context-group>
-        <note annotates="source" from="developer">Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</note>
-      </trans-unit>
-      <trans-unit id="_msg510">
-        <source xml:space="preserve">%1 d</source>
-        <context-group purpose="location"><context context-type="linenumber">738</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">750</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg511">
-        <source xml:space="preserve">%1 h</source>
-        <context-group purpose="location"><context context-type="linenumber">739</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">751</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg512">
-        <source xml:space="preserve">%1 m</source>
-        <context-group purpose="location"><context context-type="linenumber">740</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">752</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg513">
-        <source xml:space="preserve">%1 s</source>
-        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">753</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">779</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg514">
-        <source xml:space="preserve">None</source>
-        <context-group purpose="location"><context context-type="linenumber">767</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg515">
-        <source xml:space="preserve">N/A</source>
-        <context-group purpose="location"><context context-type="linenumber">773</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg516">
-        <source xml:space="preserve">%1 ms</source>
-        <context-group purpose="location"><context context-type="linenumber">774</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">792</context></context-group>
-        <trans-unit id="_msg517[0]">
-          <source xml:space="preserve">%n second(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg517[1]">
-          <source xml:space="preserve">%n second(s)</source>
-        </trans-unit>
-      </group>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">796</context></context-group>
-        <trans-unit id="_msg518[0]">
-          <source xml:space="preserve">%n minute(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg518[1]">
-          <source xml:space="preserve">%n minute(s)</source>
-        </trans-unit>
-      </group>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">800</context></context-group>
-        <trans-unit id="_msg519[0]">
-          <source xml:space="preserve">%n hour(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg519[1]">
-          <source xml:space="preserve">%n hour(s)</source>
-        </trans-unit>
-      </group>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">804</context></context-group>
-        <trans-unit id="_msg520[0]">
-          <source xml:space="preserve">%n day(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg520[1]">
-          <source xml:space="preserve">%n day(s)</source>
-        </trans-unit>
-      </group>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">808</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">814</context></context-group>
-        <trans-unit id="_msg521[0]">
-          <source xml:space="preserve">%n week(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg521[1]">
-          <source xml:space="preserve">%n week(s)</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg522">
-        <source xml:space="preserve">%1 and %2</source>
-        <context-group purpose="location"><context context-type="linenumber">814</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">814</context></context-group>
-        <trans-unit id="_msg523[0]">
-          <source xml:space="preserve">%n year(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg523[1]">
-          <source xml:space="preserve">%n year(s)</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg524">
-        <source xml:space="preserve">%1 B</source>
-        <context-group purpose="location"><context context-type="linenumber">822</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg525">
-        <source xml:space="preserve">%1 kB</source>
-        <context-group purpose="location"><context context-type="linenumber">824</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">985</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg526">
-        <source xml:space="preserve">%1 MB</source>
-        <context-group purpose="location"><context context-type="linenumber">826</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">986</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">987</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg527">
-        <source xml:space="preserve">%1 GB</source>
-        <context-group purpose="location"><context context-type="linenumber">828</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg528">
-        <source xml:space="preserve">default wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">987</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../qrimagewidget.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="QRImageWidget">
-      <trans-unit id="_msg529">
-        <source xml:space="preserve">&amp;Save Image…</source>
-        <context-group purpose="location"><context context-type="linenumber">28</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg530">
-        <source xml:space="preserve">&amp;Copy Image</source>
-        <context-group purpose="location"><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg531">
-        <source xml:space="preserve">Resulting URI too long, try to reduce the text for label / message.</source>
-        <context-group purpose="location"><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg532">
-        <source xml:space="preserve">Error encoding URI into QR Code.</source>
-        <context-group purpose="location"><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg533">
-        <source xml:space="preserve">QR code support not available.</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg534">
-        <source xml:space="preserve">Save QR Code</source>
-        <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg535">
-        <source xml:space="preserve">PNG Image</source>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
-        <note annotates="source" from="developer">Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</note>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/debugwindow.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="RPCConsole">
-      <trans-unit id="_msg536">
-        <source xml:space="preserve">N/A</source>
-        <context-group purpose="location"><context context-type="linenumber">75</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">127</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">394</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1161</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1187</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1213</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1239</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1265</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1288</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1311</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1334</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1363</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1389</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1412</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1435</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1458</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1484</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1510</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1533</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1556</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1579</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1602</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1625</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1651</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1674</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1697</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1723</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1749</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1775</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1801</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.h</context><context context-type="linenumber">147</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg537">
-        <source xml:space="preserve">Client version</source>
-        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg538">
-        <source xml:space="preserve">&amp;Information</source>
-        <context-group purpose="location"><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg539">
-        <source xml:space="preserve">General</source>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg540">
-        <source xml:space="preserve">Datadir</source>
-        <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg541">
-        <source xml:space="preserve">To specify a non-default location of the data directory use the &apos;%1&apos; option.</source>
-        <context-group purpose="location"><context context-type="linenumber">124</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg542">
-        <source xml:space="preserve">Blocksdir</source>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg543">
-        <source xml:space="preserve">To specify a non-default location of the blocks directory use the &apos;%1&apos; option.</source>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg544">
-        <source xml:space="preserve">Startup time</source>
-        <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg545">
-        <source xml:space="preserve">Network</source>
-        <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1255</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg546">
-        <source xml:space="preserve">Name</source>
-        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg547">
-        <source xml:space="preserve">Number of connections</source>
-        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg548">
-        <source xml:space="preserve">Local Addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">254</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg549">
-        <source xml:space="preserve">Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
-        <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg550">
-        <source xml:space="preserve">Block chain</source>
-        <context-group purpose="location"><context context-type="linenumber">295</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg551">
-        <source xml:space="preserve">Memory Pool</source>
-        <context-group purpose="location"><context context-type="linenumber">354</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg552">
-        <source xml:space="preserve">Current number of transactions</source>
-        <context-group purpose="location"><context context-type="linenumber">361</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg553">
-        <source xml:space="preserve">Memory usage</source>
-        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg554">
-        <source xml:space="preserve">Wallet: </source>
-        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg555">
-        <source xml:space="preserve">(none)</source>
-        <context-group purpose="location"><context context-type="linenumber">489</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg556">
-        <source xml:space="preserve">&amp;Reset</source>
-        <context-group purpose="location"><context context-type="linenumber">700</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg557">
-        <source xml:space="preserve">Received</source>
-        <context-group purpose="location"><context context-type="linenumber">780</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1592</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg558">
-        <source xml:space="preserve">Sent</source>
-        <context-group purpose="location"><context context-type="linenumber">860</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1569</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg559">
-        <source xml:space="preserve">&amp;Peers</source>
-        <context-group purpose="location"><context context-type="linenumber">901</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg560">
-        <source xml:space="preserve">Banned peers</source>
-        <context-group purpose="location"><context context-type="linenumber">977</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg561">
-        <source xml:space="preserve">Select a peer to view detailed information.</source>
-        <context-group purpose="location"><context context-type="linenumber">1053</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">1153</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg562">
-        <source xml:space="preserve">Hide Peers Detail</source>
-        <context-group purpose="location"><context context-type="linenumber">1105</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg563">
-        <source xml:space="preserve">Ctrl+X</source>
-        <context-group purpose="location"><context context-type="linenumber">1126</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg564">
-        <source xml:space="preserve">The transport layer version: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1200</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg565">
-        <source xml:space="preserve">Transport</source>
-        <context-group purpose="location"><context context-type="linenumber">1203</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg566">
-        <source xml:space="preserve">Session ID</source>
-        <context-group purpose="location"><context context-type="linenumber">1229</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg567">
-        <source xml:space="preserve">Version</source>
-        <context-group purpose="location"><context context-type="linenumber">1278</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg568">
-        <source xml:space="preserve">Whether we relay transactions to this peer.</source>
-        <context-group purpose="location"><context context-type="linenumber">1350</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg569">
-        <source xml:space="preserve">Transaction Relay</source>
-        <context-group purpose="location"><context context-type="linenumber">1353</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg570">
-        <source xml:space="preserve">Synced Headers</source>
-        <context-group purpose="location"><context context-type="linenumber">1402</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg571">
-        <source xml:space="preserve">Synced Blocks</source>
-        <context-group purpose="location"><context context-type="linenumber">1425</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg572">
-        <source xml:space="preserve">Last Transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">1500</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg573">
-        <source xml:space="preserve">The mapped Autonomous System used for diversifying peer selection.</source>
-        <context-group purpose="location"><context context-type="linenumber">1710</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg574">
-        <source xml:space="preserve">Mapped AS</source>
-        <context-group purpose="location"><context context-type="linenumber">1713</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg575">
-        <source xml:space="preserve">Whether we relay addresses to this peer.</source>
-        <context-group purpose="location"><context context-type="linenumber">1736</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</note>
-      </trans-unit>
-      <trans-unit id="_msg576">
-        <source xml:space="preserve">Address Relay</source>
-        <context-group purpose="location"><context context-type="linenumber">1739</context></context-group>
-        <note annotates="source" from="developer">Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</note>
-      </trans-unit>
-      <trans-unit id="_msg577">
-        <source xml:space="preserve">The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
-        <context-group purpose="location"><context context-type="linenumber">1762</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</note>
-      </trans-unit>
-      <trans-unit id="_msg578">
-        <source xml:space="preserve">The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
-        <context-group purpose="location"><context context-type="linenumber">1788</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</note>
-      </trans-unit>
-      <trans-unit id="_msg579">
-        <source xml:space="preserve">Addresses Processed</source>
-        <context-group purpose="location"><context context-type="linenumber">1765</context></context-group>
-        <note annotates="source" from="developer">Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</note>
-      </trans-unit>
-      <trans-unit id="_msg580">
-        <source xml:space="preserve">Addresses Rate-Limited</source>
-        <context-group purpose="location"><context context-type="linenumber">1791</context></context-group>
-        <note annotates="source" from="developer">Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</note>
-      </trans-unit>
-      <trans-unit id="_msg581">
-        <source xml:space="preserve">User Agent</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1301</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg582">
-        <source xml:space="preserve">Node window</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg583">
-        <source xml:space="preserve">Current block height</source>
-        <context-group purpose="location"><context context-type="linenumber">302</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg584">
-        <source xml:space="preserve">Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <context-group purpose="location"><context context-type="linenumber">432</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg585">
-        <source xml:space="preserve">Decrease font size</source>
-        <context-group purpose="location"><context context-type="linenumber">510</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg586">
-        <source xml:space="preserve">Increase font size</source>
-        <context-group purpose="location"><context context-type="linenumber">530</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg587">
-        <source xml:space="preserve">Permissions</source>
-        <context-group purpose="location"><context context-type="linenumber">1151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg588">
-        <source xml:space="preserve">The direction and type of peer connection: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1174</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg589">
-        <source xml:space="preserve">Direction/Type</source>
-        <context-group purpose="location"><context context-type="linenumber">1177</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg590">
-        <source xml:space="preserve">The BIP324 session ID string in hex.</source>
-        <context-group purpose="location"><context context-type="linenumber">1226</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg591">
-        <source xml:space="preserve">The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
-        <context-group purpose="location"><context context-type="linenumber">1252</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg592">
-        <source xml:space="preserve">Services</source>
-        <context-group purpose="location"><context context-type="linenumber">1324</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg593">
-        <source xml:space="preserve">High bandwidth BIP152 compact block relay: %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1376</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg594">
-        <source xml:space="preserve">High Bandwidth</source>
-        <context-group purpose="location"><context context-type="linenumber">1379</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg595">
-        <source xml:space="preserve">Connection Time</source>
-        <context-group purpose="location"><context context-type="linenumber">1448</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg596">
-        <source xml:space="preserve">Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
-        <context-group purpose="location"><context context-type="linenumber">1471</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg597">
-        <source xml:space="preserve">Last Block</source>
-        <context-group purpose="location"><context context-type="linenumber">1474</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg598">
-        <source xml:space="preserve">Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <context-group purpose="location"><context context-type="linenumber">1497</context></context-group>
-        <note annotates="source" from="developer">Tooltip text for the Last Transaction field in the peer details area.</note>
-      </trans-unit>
-      <trans-unit id="_msg599">
-        <source xml:space="preserve">Last Send</source>
-        <context-group purpose="location"><context context-type="linenumber">1523</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg600">
-        <source xml:space="preserve">Last Receive</source>
-        <context-group purpose="location"><context context-type="linenumber">1546</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg601">
-        <source xml:space="preserve">Ping Time</source>
-        <context-group purpose="location"><context context-type="linenumber">1615</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg602">
-        <source xml:space="preserve">The duration of a currently outstanding ping.</source>
-        <context-group purpose="location"><context context-type="linenumber">1638</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg603">
-        <source xml:space="preserve">Ping Wait</source>
-        <context-group purpose="location"><context context-type="linenumber">1641</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg604">
-        <source xml:space="preserve">Min Ping</source>
-        <context-group purpose="location"><context context-type="linenumber">1664</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg605">
-        <source xml:space="preserve">Time Offset</source>
-        <context-group purpose="location"><context context-type="linenumber">1687</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg606">
-        <source xml:space="preserve">Last block time</source>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg607">
-        <source xml:space="preserve">&amp;Open</source>
-        <context-group purpose="location"><context context-type="linenumber">435</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg608">
-        <source xml:space="preserve">&amp;Console</source>
-        <context-group purpose="location"><context context-type="linenumber">461</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg609">
-        <source xml:space="preserve">&amp;Network Traffic</source>
-        <context-group purpose="location"><context context-type="linenumber">648</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg610">
-        <source xml:space="preserve">Totals</source>
-        <context-group purpose="location"><context context-type="linenumber">716</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg611">
-        <source xml:space="preserve">Debug log file</source>
-        <context-group purpose="location"><context context-type="linenumber">425</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg612">
-        <source xml:space="preserve">Clear console</source>
-        <context-group purpose="location"><context context-type="linenumber">550</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../rpcconsole.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="RPCConsole">
-      <trans-unit id="_msg613">
-        <source xml:space="preserve">In:</source>
-        <context-group purpose="location"><context context-type="linenumber">937</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg614">
-        <source xml:space="preserve">Out:</source>
-        <context-group purpose="location"><context context-type="linenumber">938</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg615">
-        <source xml:space="preserve">Inbound: initiated by peer</source>
-        <context-group purpose="location"><context context-type="linenumber">466</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for an inbound peer connection.</note>
-      </trans-unit>
-      <trans-unit id="_msg616">
-        <source xml:space="preserve">Outbound Full Relay: default</source>
-        <context-group purpose="location"><context context-type="linenumber">470</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</note>
-      </trans-unit>
-      <trans-unit id="_msg617">
-        <source xml:space="preserve">Outbound Block Relay: does not relay transactions or addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">473</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</note>
-      </trans-unit>
-      <trans-unit id="_msg618">
-        <source xml:space="preserve">Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
-        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</note>
-      </trans-unit>
-      <trans-unit id="_msg619">
-        <source xml:space="preserve">Outbound Feeler: short-lived, for testing addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">484</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</note>
-      </trans-unit>
-      <trans-unit id="_msg620">
-        <source xml:space="preserve">Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">487</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg621">
-        <source xml:space="preserve">Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
-        <context-group purpose="location"><context context-type="linenumber">490</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</note>
-      </trans-unit>
-      <trans-unit id="_msg622">
-        <source xml:space="preserve">detecting: peer could be v1 or v2</source>
-        <context-group purpose="location"><context context-type="linenumber">495</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for &quot;detecting&quot; transport type.</note>
-      </trans-unit>
-      <trans-unit id="_msg623">
-        <source xml:space="preserve">v1: unencrypted, plaintext transport protocol</source>
-        <context-group purpose="location"><context context-type="linenumber">497</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for v1 transport type.</note>
-      </trans-unit>
-      <trans-unit id="_msg624">
-        <source xml:space="preserve">v2: BIP324 encrypted transport protocol</source>
-        <context-group purpose="location"><context context-type="linenumber">499</context></context-group>
-        <note annotates="source" from="developer">Explanatory text for v2 transport type.</note>
-      </trans-unit>
-      <trans-unit id="_msg625">
-        <source xml:space="preserve">we selected the peer for high bandwidth relay</source>
-        <context-group purpose="location"><context context-type="linenumber">503</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg626">
-        <source xml:space="preserve">the peer selected us for high bandwidth relay</source>
-        <context-group purpose="location"><context context-type="linenumber">504</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg627">
-        <source xml:space="preserve">no high bandwidth relay selected</source>
-        <context-group purpose="location"><context context-type="linenumber">505</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg628">
-        <source xml:space="preserve">Ctrl++</source>
-        <context-group purpose="location"><context context-type="linenumber">518</context></context-group>
-        <note annotates="source" from="developer">Main shortcut to increase the RPC console font size.</note>
-      </trans-unit>
-      <trans-unit id="_msg629">
-        <source xml:space="preserve">Ctrl+=</source>
-        <context-group purpose="location"><context context-type="linenumber">520</context></context-group>
-        <note annotates="source" from="developer">Secondary shortcut to increase the RPC console font size.</note>
-      </trans-unit>
-      <trans-unit id="_msg630">
-        <source xml:space="preserve">Ctrl+-</source>
-        <context-group purpose="location"><context context-type="linenumber">524</context></context-group>
-        <note annotates="source" from="developer">Main shortcut to decrease the RPC console font size.</note>
-      </trans-unit>
-      <trans-unit id="_msg631">
-        <source xml:space="preserve">Ctrl+_</source>
-        <context-group purpose="location"><context context-type="linenumber">526</context></context-group>
-        <note annotates="source" from="developer">Secondary shortcut to decrease the RPC console font size.</note>
-      </trans-unit>
-      <trans-unit id="_msg632">
-        <source xml:space="preserve">&amp;Copy address</source>
-        <context-group purpose="location"><context context-type="linenumber">672</context></context-group>
-        <note annotates="source" from="developer">Context menu action to copy the address of a peer.</note>
-      </trans-unit>
-      <trans-unit id="_msg633">
-        <source xml:space="preserve">&amp;Disconnect</source>
-        <context-group purpose="location"><context context-type="linenumber">676</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg634">
-        <source xml:space="preserve">1 &amp;hour</source>
-        <context-group purpose="location"><context context-type="linenumber">677</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg635">
-        <source xml:space="preserve">1 d&amp;ay</source>
-        <context-group purpose="location"><context context-type="linenumber">678</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg636">
-        <source xml:space="preserve">1 &amp;week</source>
-        <context-group purpose="location"><context context-type="linenumber">679</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg637">
-        <source xml:space="preserve">1 &amp;year</source>
-        <context-group purpose="location"><context context-type="linenumber">680</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg638">
-        <source xml:space="preserve">&amp;Copy IP/Netmask</source>
-        <context-group purpose="location"><context context-type="linenumber">706</context></context-group>
-        <note annotates="source" from="developer">Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer&apos;s IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</note>
-      </trans-unit>
-      <trans-unit id="_msg639">
-        <source xml:space="preserve">&amp;Unban</source>
-        <context-group purpose="location"><context context-type="linenumber">710</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg640">
-        <source xml:space="preserve">Network activity disabled</source>
-        <context-group purpose="location"><context context-type="linenumber">941</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg641">
-        <source xml:space="preserve">None</source>
-        <context-group purpose="location"><context context-type="linenumber">954</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg642">
-        <source xml:space="preserve">Executing command without any wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">1033</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg643">
-        <source xml:space="preserve">Ctrl+I</source>
-        <context-group purpose="location"><context context-type="linenumber">1354</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg644">
-        <source xml:space="preserve">Ctrl+T</source>
-        <context-group purpose="location"><context context-type="linenumber">1355</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg645">
-        <source xml:space="preserve">Ctrl+N</source>
-        <context-group purpose="location"><context context-type="linenumber">1356</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg646">
-        <source xml:space="preserve">Ctrl+P</source>
-        <context-group purpose="location"><context context-type="linenumber">1357</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg647">
-        <source xml:space="preserve">Node window - [%1]</source>
-        <context-group purpose="location"><context context-type="linenumber">1375</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg648">
-        <source xml:space="preserve">Executing command using &quot;%1&quot; wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">1031</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg649">
-        <source xml:space="preserve">Welcome to the %1 RPC console.
-Use up and down arrows to navigate history, and %2 to clear screen.
-Use %3 and %4 to increase or decrease the font size.
-Type %5 for an overview of available commands.
-For more information on using this console, type %6.
-
-%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
-        <context-group purpose="location"><context context-type="linenumber">870</context></context-group>
-        <note annotates="source" from="developer">RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</note>
-      </trans-unit>
-      <trans-unit id="_msg650">
-        <source xml:space="preserve">Executing…</source>
-        <context-group purpose="location"><context context-type="linenumber">1041</context></context-group>
-        <note annotates="source" from="developer">A console message indicating an entered command is currently being executed.</note>
-      </trans-unit>
-      <trans-unit id="_msg651">
-        <source xml:space="preserve">(peer: %1)</source>
-        <context-group purpose="location"><context context-type="linenumber">1159</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg652">
-        <source xml:space="preserve">via %1</source>
-        <context-group purpose="location"><context context-type="linenumber">1161</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../rpcconsole.h" datatype="c" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="RPCConsole">
-      <trans-unit id="_msg653">
-        <source xml:space="preserve">Yes</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg654">
-        <source xml:space="preserve">No</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg655">
-        <source xml:space="preserve">To</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg656">
-        <source xml:space="preserve">From</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg657">
-        <source xml:space="preserve">Ban for</source>
-        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg658">
-        <source xml:space="preserve">Never</source>
-        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg659">
-        <source xml:space="preserve">Unknown</source>
-        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/receivecoinsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="ReceiveCoinsDialog">
-      <trans-unit id="_msg660">
-        <source xml:space="preserve">&amp;Amount:</source>
-        <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg661">
-        <source xml:space="preserve">&amp;Label:</source>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg662">
-        <source xml:space="preserve">&amp;Message:</source>
-        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg663">
-        <source xml:space="preserve">An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg664">
-        <source xml:space="preserve">An optional label to associate with the new receiving address.</source>
-        <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg665">
-        <source xml:space="preserve">Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg666">
-        <source xml:space="preserve">An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg667">
-        <source xml:space="preserve">An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
-        <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg668">
-        <source xml:space="preserve">An optional message that is attached to the payment request and may be displayed to the sender.</source>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg669">
-        <source xml:space="preserve">&amp;Create new receiving address</source>
-        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg670">
-        <source xml:space="preserve">Clear all fields of the form.</source>
-        <context-group purpose="location"><context context-type="linenumber">134</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg671">
-        <source xml:space="preserve">Clear</source>
-        <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg672">
-        <source xml:space="preserve">Requested payments history</source>
-        <context-group purpose="location"><context context-type="linenumber">273</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg673">
-        <source xml:space="preserve">Show the selected request (does the same as double clicking an entry)</source>
-        <context-group purpose="location"><context context-type="linenumber">298</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg674">
-        <source xml:space="preserve">Show</source>
-        <context-group purpose="location"><context context-type="linenumber">301</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg675">
-        <source xml:space="preserve">Remove the selected entries from the list</source>
-        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg676">
-        <source xml:space="preserve">Remove</source>
-        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../receivecoinsdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="ReceiveCoinsDialog">
-      <trans-unit id="_msg677">
-        <source xml:space="preserve">Copy &amp;URI</source>
-        <context-group purpose="location"><context context-type="linenumber">46</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg678">
-        <source xml:space="preserve">&amp;Copy address</source>
-        <context-group purpose="location"><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg679">
-        <source xml:space="preserve">Copy &amp;label</source>
-        <context-group purpose="location"><context context-type="linenumber">48</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg680">
-        <source xml:space="preserve">Copy &amp;message</source>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg681">
-        <source xml:space="preserve">Copy &amp;amount</source>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg682">
-        <source xml:space="preserve">Base58 (Legacy)</source>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg683">
-        <source xml:space="preserve">Not recommended due to higher fees and less protection against typos.</source>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg684">
-        <source xml:space="preserve">Base58 (P2SH-SegWit)</source>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg685">
-        <source xml:space="preserve">Generates an address compatible with older wallets.</source>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg686">
-        <source xml:space="preserve">Bech32 (SegWit)</source>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg687">
-        <source xml:space="preserve">Generates a native segwit address (BIP-173). Some old wallets don&apos;t support it.</source>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg688">
-        <source xml:space="preserve">Bech32m (Taproot)</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg689">
-        <source xml:space="preserve">Bech32m (BIP-350) is an upgrade to Bech32, wallet support is still limited.</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg690">
-        <source xml:space="preserve">Could not unlock wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">175</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg691">
-        <source xml:space="preserve">Could not generate new %1 address</source>
-        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/receiverequestdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="ReceiveRequestDialog">
-      <trans-unit id="_msg692">
-        <source xml:space="preserve">Request payment to …</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg693">
-        <source xml:space="preserve">Address:</source>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg694">
-        <source xml:space="preserve">Amount:</source>
-        <context-group purpose="location"><context context-type="linenumber">119</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg695">
-        <source xml:space="preserve">Label:</source>
-        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg696">
-        <source xml:space="preserve">Message:</source>
-        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg697">
-        <source xml:space="preserve">Wallet:</source>
-        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg698">
-        <source xml:space="preserve">Copy &amp;URI</source>
-        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg699">
-        <source xml:space="preserve">Copy &amp;Address</source>
-        <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg700">
-        <source xml:space="preserve">&amp;Verify</source>
-        <context-group purpose="location"><context context-type="linenumber">260</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg701">
-        <source xml:space="preserve">Verify this address on e.g. a hardware wallet screen</source>
-        <context-group purpose="location"><context context-type="linenumber">263</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg702">
-        <source xml:space="preserve">&amp;Save Image…</source>
-        <context-group purpose="location"><context context-type="linenumber">273</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg703">
-        <source xml:space="preserve">Payment information</source>
-        <context-group purpose="location"><context context-type="linenumber">39</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../receiverequestdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="ReceiveRequestDialog">
-      <trans-unit id="_msg704">
-        <source xml:space="preserve">Request payment to %1</source>
-        <context-group purpose="location"><context context-type="linenumber">46</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../recentrequeststablemodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="RecentRequestsTableModel">
-      <trans-unit id="_msg705">
-        <source xml:space="preserve">Date</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg706">
-        <source xml:space="preserve">Label</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg707">
-        <source xml:space="preserve">Message</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg708">
-        <source xml:space="preserve">(no label)</source>
-        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg709">
-        <source xml:space="preserve">(no message)</source>
-        <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg710">
-        <source xml:space="preserve">(no amount requested)</source>
-        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg711">
-        <source xml:space="preserve">Requested</source>
-        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/sendcoinsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SendCoinsDialog">
-      <trans-unit id="_msg712">
-        <source xml:space="preserve">Send Coins</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">758</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg713">
-        <source xml:space="preserve">Coin Control Features</source>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg714">
-        <source xml:space="preserve">automatically selected</source>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg715">
-        <source xml:space="preserve">Insufficient funds!</source>
-        <context-group purpose="location"><context context-type="linenumber">139</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg716">
-        <source xml:space="preserve">Quantity:</source>
-        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg717">
-        <source xml:space="preserve">Bytes:</source>
-        <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg718">
-        <source xml:space="preserve">Amount:</source>
-        <context-group purpose="location"><context context-type="linenumber">314</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg719">
-        <source xml:space="preserve">Fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">365</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg720">
-        <source xml:space="preserve">After Fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">419</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg721">
-        <source xml:space="preserve">Change:</source>
-        <context-group purpose="location"><context context-type="linenumber">451</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg722">
-        <source xml:space="preserve">If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <context-group purpose="location"><context context-type="linenumber">495</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg723">
-        <source xml:space="preserve">Custom change address</source>
-        <context-group purpose="location"><context context-type="linenumber">498</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg724">
-        <source xml:space="preserve">Transaction Fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">704</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg725">
-        <source xml:space="preserve">Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
-        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg726">
-        <source xml:space="preserve">Warning: Fee estimation is currently not possible.</source>
-        <context-group purpose="location"><context context-type="linenumber">751</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg727">
-        <source xml:space="preserve">per kilobyte</source>
-        <context-group purpose="location"><context context-type="linenumber">833</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg728">
-        <source xml:space="preserve">Hide</source>
-        <context-group purpose="location"><context context-type="linenumber">780</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg729">
-        <source xml:space="preserve">Recommended:</source>
-        <context-group purpose="location"><context context-type="linenumber">892</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg730">
-        <source xml:space="preserve">Custom:</source>
-        <context-group purpose="location"><context context-type="linenumber">922</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg731">
-        <source xml:space="preserve">Send to multiple recipients at once</source>
-        <context-group purpose="location"><context context-type="linenumber">1137</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg732">
-        <source xml:space="preserve">Add &amp;Recipient</source>
-        <context-group purpose="location"><context context-type="linenumber">1140</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg733">
-        <source xml:space="preserve">Clear all fields of the form.</source>
-        <context-group purpose="location"><context context-type="linenumber">1120</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg734">
-        <source xml:space="preserve">Inputs…</source>
-        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg735">
-        <source xml:space="preserve">Choose…</source>
-        <context-group purpose="location"><context context-type="linenumber">718</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg736">
-        <source xml:space="preserve">Hide transaction fee settings</source>
-        <context-group purpose="location"><context context-type="linenumber">777</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg737">
-        <source xml:space="preserve">Specify a custom fee per kB (1,000 bytes) of the transaction&apos;s virtual size.
-
-Note:  Since the fee is calculated on a per-byte basis, a fee rate of &quot;100 satoshis per kvB&quot; for a transaction size of 500 virtual bytes (half of 1 kvB) would ultimately yield a fee of only 50 satoshis.</source>
-        <context-group purpose="location"><context context-type="linenumber">828</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg738">
-        <source xml:space="preserve">When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <context-group purpose="location"><context context-type="linenumber">863</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg739">
-        <source xml:space="preserve">A too low fee might result in a never confirming transaction (read the tooltip)</source>
-        <context-group purpose="location"><context context-type="linenumber">866</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg740">
-        <source xml:space="preserve">(Smart fee not initialized yet. This usually takes a few blocks…)</source>
-        <context-group purpose="location"><context context-type="linenumber">971</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg741">
-        <source xml:space="preserve">Confirmation time target:</source>
-        <context-group purpose="location"><context context-type="linenumber">997</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg742">
-        <source xml:space="preserve">Enable Replace-By-Fee</source>
-        <context-group purpose="location"><context context-type="linenumber">1055</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg743">
-        <source xml:space="preserve">With Replace-By-Fee (BIP-125) you can increase a transaction&apos;s fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source>
-        <context-group purpose="location"><context context-type="linenumber">1058</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg744">
-        <source xml:space="preserve">Clear &amp;All</source>
-        <context-group purpose="location"><context context-type="linenumber">1123</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg745">
-        <source xml:space="preserve">Balance:</source>
-        <context-group purpose="location"><context context-type="linenumber">1178</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg746">
-        <source xml:space="preserve">Confirm the send action</source>
-        <context-group purpose="location"><context context-type="linenumber">1094</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg747">
-        <source xml:space="preserve">S&amp;end</source>
-        <context-group purpose="location"><context context-type="linenumber">1097</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../sendcoinsdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SendCoinsDialog">
-      <trans-unit id="_msg748">
-        <source xml:space="preserve">Copy quantity</source>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg749">
-        <source xml:space="preserve">Copy amount</source>
-        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg750">
-        <source xml:space="preserve">Copy fee</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg751">
-        <source xml:space="preserve">Copy after fee</source>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg752">
-        <source xml:space="preserve">Copy bytes</source>
-        <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg753">
-        <source xml:space="preserve">Copy change</source>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg754">
-        <source xml:space="preserve">%1 (%2 blocks)</source>
-        <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg755">
-        <source xml:space="preserve">Sign on device</source>
-        <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
-        <note annotates="source" from="developer">&quot;device&quot; usually means a hardware wallet.</note>
-      </trans-unit>
-      <trans-unit id="_msg756">
-        <source xml:space="preserve">Connect your hardware wallet first.</source>
-        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg757">
-        <source xml:space="preserve">Set external signer script path in Options -&gt; Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">210</context></context-group>
-        <note annotates="source" from="developer">&quot;External signer&quot; means using devices such as hardware wallets.</note>
-      </trans-unit>
-      <trans-unit id="_msg758">
-        <source xml:space="preserve">Cr&amp;eate Unsigned</source>
-        <context-group purpose="location"><context context-type="linenumber">213</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg759">
-        <source xml:space="preserve">Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg760">
-        <source xml:space="preserve">%1 to &apos;%2&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">317</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg761">
-        <source xml:space="preserve">%1 to %2</source>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg762">
-        <source xml:space="preserve">To review recipient list click &quot;Show Details…&quot;</source>
-        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg763">
-        <source xml:space="preserve">Sign failed</source>
-        <context-group purpose="location"><context context-type="linenumber">452</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg764">
-        <source xml:space="preserve">External signer not found</source>
-        <context-group purpose="location"><context context-type="linenumber">457</context></context-group>
-        <note annotates="source" from="developer">&quot;External signer&quot; means using devices such as hardware wallets.</note>
-      </trans-unit>
-      <trans-unit id="_msg765">
-        <source xml:space="preserve">External signer failure</source>
-        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
-        <note annotates="source" from="developer">&quot;External signer&quot; means using devices such as hardware wallets.</note>
-      </trans-unit>
-      <trans-unit id="_msg766">
-        <source xml:space="preserve">Save Transaction Data</source>
-        <context-group purpose="location"><context context-type="linenumber">427</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg767">
-        <source xml:space="preserve">Partially Signed Transaction (Binary)</source>
-        <context-group purpose="location"><context context-type="linenumber">429</context></context-group>
-        <note annotates="source" from="developer">Expanded name of the binary PSBT file format. See: BIP 174.</note>
-      </trans-unit>
-      <trans-unit id="_msg768">
-        <source xml:space="preserve">PSBT saved</source>
-        <context-group purpose="location"><context context-type="linenumber">437</context></context-group>
-        <note annotates="source" from="developer">Popup message when a PSBT has been saved to a file</note>
-      </trans-unit>
-      <trans-unit id="_msg769">
-        <source xml:space="preserve">External balance:</source>
-        <context-group purpose="location"><context context-type="linenumber">710</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg770">
-        <source xml:space="preserve">or</source>
-        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg771">
-        <source xml:space="preserve">You can increase the fee later (signals Replace-By-Fee, BIP-125).</source>
-        <context-group purpose="location"><context context-type="linenumber">367</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg772">
-        <source xml:space="preserve">Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">336</context></context-group>
-        <note annotates="source" from="developer">Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</note>
-      </trans-unit>
-      <trans-unit id="_msg773">
-        <source xml:space="preserve">%1 from wallet &apos;%2&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg774">
-        <source xml:space="preserve">Do you want to create this transaction?</source>
-        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
-        <note annotates="source" from="developer">Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</note>
-      </trans-unit>
-      <trans-unit id="_msg775">
-        <source xml:space="preserve">Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
-        <note annotates="source" from="developer">Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</note>
-      </trans-unit>
-      <trans-unit id="_msg776">
-        <source xml:space="preserve">Please, review your transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">344</context></context-group>
-        <note annotates="source" from="developer">Text to prompt a user to review the details of the transaction they are attempting to send.</note>
-      </trans-unit>
-      <trans-unit id="_msg777">
-        <source xml:space="preserve">Transaction fee</source>
-        <context-group purpose="location"><context context-type="linenumber">352</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg778">
-        <source xml:space="preserve">%1 kvB</source>
-        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">PSBT transaction creation</context></context-group>
-        <note annotates="source" from="developer">When reviewing a newly created PSBT (via Send flow), the transaction fee is shown, with &quot;virtual size&quot; of the transaction displayed for context</note>
-      </trans-unit>
-      <trans-unit id="_msg779">
-        <source xml:space="preserve">Not signalling Replace-By-Fee, BIP-125.</source>
-        <context-group purpose="location"><context context-type="linenumber">369</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg780">
-        <source xml:space="preserve">Total Amount</source>
-        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg781">
-        <source xml:space="preserve">Unsigned Transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
-        <context-group><context context-type="x-gettext-msgctxt">PSBT copied</context></context-group>
-        <note annotates="source" from="developer">Caption of &quot;PSBT has been copied&quot; messagebox</note>
-      </trans-unit>
-      <trans-unit id="_msg782">
-        <source xml:space="preserve">The PSBT has been copied to the clipboard. You can also save it.</source>
-        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg783">
-        <source xml:space="preserve">PSBT saved to disk</source>
-        <context-group purpose="location"><context context-type="linenumber">437</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg784">
-        <source xml:space="preserve">Confirm send coins</source>
-        <context-group purpose="location"><context context-type="linenumber">486</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg785">
-        <source xml:space="preserve">The recipient address is not valid. Please recheck.</source>
-        <context-group purpose="location"><context context-type="linenumber">734</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg786">
-        <source xml:space="preserve">The amount to pay must be larger than 0.</source>
-        <context-group purpose="location"><context context-type="linenumber">737</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg787">
-        <source xml:space="preserve">The amount exceeds your balance.</source>
-        <context-group purpose="location"><context context-type="linenumber">740</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg788">
-        <source xml:space="preserve">Duplicate address found: addresses should only be used once each.</source>
-        <context-group purpose="location"><context context-type="linenumber">743</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg789">
-        <source xml:space="preserve">Transaction creation failed!</source>
-        <context-group purpose="location"><context context-type="linenumber">746</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg790">
-        <source xml:space="preserve">A fee higher than %1 is considered an absurdly high fee.</source>
-        <context-group purpose="location"><context context-type="linenumber">750</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg791">
-        <source xml:space="preserve">%1/kvB</source>
-        <context-group purpose="location"><context context-type="linenumber">826</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">863</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">877</context></context-group>
-        <trans-unit id="_msg792[0]">
-          <source xml:space="preserve">Estimated to begin confirmation within %n block(s).</source>
-        </trans-unit>
-        <trans-unit id="_msg792[1]">
-          <source xml:space="preserve">Estimated to begin confirmation within %n block(s).</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg793">
-        <source xml:space="preserve">Warning: Invalid Bitcoin address</source>
-        <context-group purpose="location"><context context-type="linenumber">976</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg794">
-        <source xml:space="preserve">Warning: Unknown change address</source>
-        <context-group purpose="location"><context context-type="linenumber">981</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg795">
-        <source xml:space="preserve">Confirm custom change address</source>
-        <context-group purpose="location"><context context-type="linenumber">984</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg796">
-        <source xml:space="preserve">The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
-        <context-group purpose="location"><context context-type="linenumber">984</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg797">
-        <source xml:space="preserve">(no label)</source>
-        <context-group purpose="location"><context context-type="linenumber">1005</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/sendcoinsentry.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SendCoinsEntry">
-      <trans-unit id="_msg798">
-        <source xml:space="preserve">A&amp;mount:</source>
-        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg799">
-        <source xml:space="preserve">Pay &amp;To:</source>
-        <context-group purpose="location"><context context-type="linenumber">35</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg800">
-        <source xml:space="preserve">&amp;Label:</source>
-        <context-group purpose="location"><context context-type="linenumber">128</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg801">
-        <source xml:space="preserve">Choose previously used address</source>
-        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg802">
-        <source xml:space="preserve">The Bitcoin address to send the payment to</source>
-        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg803">
-        <source xml:space="preserve">Alt+A</source>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg804">
-        <source xml:space="preserve">Paste address from clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg805">
-        <source xml:space="preserve">Alt+P</source>
-        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg806">
-        <source xml:space="preserve">Remove this entry</source>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg807">
-        <source xml:space="preserve">The amount to send in the selected unit</source>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg808">
-        <source xml:space="preserve">The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg809">
-        <source xml:space="preserve">S&amp;ubtract fee from amount</source>
-        <context-group purpose="location"><context context-type="linenumber">176</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg810">
-        <source xml:space="preserve">Use available balance</source>
-        <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg811">
-        <source xml:space="preserve">Message:</source>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg812">
-        <source xml:space="preserve">Enter a label for this address to add it to the list of used addresses</source>
-        <context-group purpose="location"><context context-type="linenumber">141</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg813">
-        <source xml:space="preserve">A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <context-group purpose="location"><context context-type="linenumber">202</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../sendcoinsdialog.h" datatype="c" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SendConfirmationDialog">
-      <trans-unit id="_msg814">
-        <source xml:space="preserve">Send</source>
-        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg815">
-        <source xml:space="preserve">Create Unsigned</source>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/signverifymessagedialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SignVerifyMessageDialog">
-      <trans-unit id="_msg816">
-        <source xml:space="preserve">Signatures - Sign / Verify a Message</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg817">
-        <source xml:space="preserve">&amp;Sign Message</source>
-        <context-group purpose="location"><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg818">
-        <source xml:space="preserve">You can sign messages/agreements with your legacy (P2PKH) addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <context-group purpose="location"><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg819">
-        <source xml:space="preserve">The Bitcoin address to sign the message with</source>
-        <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg820">
-        <source xml:space="preserve">Choose previously used address</source>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">274</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg821">
-        <source xml:space="preserve">Alt+A</source>
-        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">284</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg822">
-        <source xml:space="preserve">Paste address from clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">78</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg823">
-        <source xml:space="preserve">Alt+P</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg824">
-        <source xml:space="preserve">Enter the message you want to sign here</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg825">
-        <source xml:space="preserve">Signature</source>
-        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg826">
-        <source xml:space="preserve">Copy the current signature to the clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">140</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg827">
-        <source xml:space="preserve">Sign the message to prove you own this Bitcoin address</source>
-        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg828">
-        <source xml:space="preserve">Sign &amp;Message</source>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg829">
-        <source xml:space="preserve">Reset all sign message fields</source>
-        <context-group purpose="location"><context context-type="linenumber">178</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg830">
-        <source xml:space="preserve">Clear &amp;All</source>
-        <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">338</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg831">
-        <source xml:space="preserve">&amp;Verify Message</source>
-        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg832">
-        <source xml:space="preserve">Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <context-group purpose="location"><context context-type="linenumber">246</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg833">
-        <source xml:space="preserve">The Bitcoin address the message was signed with</source>
-        <context-group purpose="location"><context context-type="linenumber">267</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg834">
-        <source xml:space="preserve">The signed message to verify</source>
-        <context-group purpose="location"><context context-type="linenumber">296</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">299</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg835">
-        <source xml:space="preserve">The signature given when the message was signed</source>
-        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg836">
-        <source xml:space="preserve">Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg837">
-        <source xml:space="preserve">Verify &amp;Message</source>
-        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg838">
-        <source xml:space="preserve">Reset all verify message fields</source>
-        <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg839">
-        <source xml:space="preserve">Click &quot;Sign Message&quot; to generate signature</source>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../signverifymessagedialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SignVerifyMessageDialog">
-      <trans-unit id="_msg840">
-        <source xml:space="preserve">The entered address is invalid.</source>
-        <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg841">
-        <source xml:space="preserve">Please check the address and try again.</source>
-        <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg842">
-        <source xml:space="preserve">The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
-        <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg843">
-        <source xml:space="preserve">Wallet unlock was cancelled.</source>
-        <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg844">
-        <source xml:space="preserve">No error</source>
-        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg845">
-        <source xml:space="preserve">Private key for the entered address is not available.</source>
-        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg846">
-        <source xml:space="preserve">Message signing failed.</source>
-        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg847">
-        <source xml:space="preserve">Message signed.</source>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg848">
-        <source xml:space="preserve">The signature could not be decoded.</source>
-        <context-group purpose="location"><context context-type="linenumber">232</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg849">
-        <source xml:space="preserve">Please check the signature and try again.</source>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg850">
-        <source xml:space="preserve">The signature did not match the message digest.</source>
-        <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg851">
-        <source xml:space="preserve">Message verification failed.</source>
-        <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg852">
-        <source xml:space="preserve">Message verified.</source>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../splashscreen.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="SplashScreen">
-      <trans-unit id="_msg853">
-        <source xml:space="preserve">(press q to shutdown and continue later)</source>
-        <context-group purpose="location"><context context-type="linenumber">175</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg854">
-        <source xml:space="preserve">press q to shutdown</source>
-        <context-group purpose="location"><context context-type="linenumber">176</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../trafficgraphwidget.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="TrafficGraphWidget">
-      <trans-unit id="_msg855">
-        <source xml:space="preserve">kB/s</source>
-        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../transactiondesc.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="TransactionDesc">
-      <trans-unit id="_msg856">
-        <source xml:space="preserve">conflicted with a transaction with %1 confirmations</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</note>
-      </trans-unit>
-      <trans-unit id="_msg857">
-        <source xml:space="preserve">0/unconfirmed, in memory pool</source>
-        <context-group purpose="location"><context context-type="linenumber">41</context></context-group>
-        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</note>
-      </trans-unit>
-      <trans-unit id="_msg858">
-        <source xml:space="preserve">0/unconfirmed, not in memory pool</source>
-        <context-group purpose="location"><context context-type="linenumber">46</context></context-group>
-        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</note>
-      </trans-unit>
-      <trans-unit id="_msg859">
-        <source xml:space="preserve">abandoned</source>
-        <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
-        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</note>
-      </trans-unit>
-      <trans-unit id="_msg860">
-        <source xml:space="preserve">%1/unconfirmed</source>
-        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
-        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</note>
-      </trans-unit>
-      <trans-unit id="_msg861">
-        <source xml:space="preserve">%1 confirmations</source>
-        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
-        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</note>
-      </trans-unit>
-      <trans-unit id="_msg862">
-        <source xml:space="preserve">Status</source>
-        <context-group purpose="location"><context context-type="linenumber">115</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg863">
-        <source xml:space="preserve">Date</source>
-        <context-group purpose="location"><context context-type="linenumber">118</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg864">
-        <source xml:space="preserve">Source</source>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg865">
-        <source xml:space="preserve">Generated</source>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg866">
-        <source xml:space="preserve">From</source>
-        <context-group purpose="location"><context context-type="linenumber">130</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg867">
-        <source xml:space="preserve">unknown</source>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg868">
-        <source xml:space="preserve">To</source>
-        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg869">
-        <source xml:space="preserve">own address</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">228</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg870">
-        <source xml:space="preserve">label</source>
-        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg871">
-        <source xml:space="preserve">Credit</source>
-        <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">196</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">186</context></context-group>
-        <trans-unit id="_msg872[0]">
-          <source xml:space="preserve">matures in %n more block(s)</source>
-        </trans-unit>
-        <trans-unit id="_msg872[1]">
-          <source xml:space="preserve">matures in %n more block(s)</source>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg873">
-        <source xml:space="preserve">not accepted</source>
-        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg874">
-        <source xml:space="preserve">Debit</source>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg875">
-        <source xml:space="preserve">Total debit</source>
-        <context-group purpose="location"><context context-type="linenumber">243</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg876">
-        <source xml:space="preserve">Total credit</source>
-        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg877">
-        <source xml:space="preserve">Transaction fee</source>
-        <context-group purpose="location"><context context-type="linenumber">249</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg878">
-        <source xml:space="preserve">Net amount</source>
-        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg879">
-        <source xml:space="preserve">Message</source>
-        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg880">
-        <source xml:space="preserve">Comment</source>
-        <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg881">
-        <source xml:space="preserve">Transaction ID</source>
-        <context-group purpose="location"><context context-type="linenumber">281</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg882">
-        <source xml:space="preserve">Transaction total size</source>
-        <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg883">
-        <source xml:space="preserve">Transaction virtual size</source>
-        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg884">
-        <source xml:space="preserve">Output index</source>
-        <context-group purpose="location"><context context-type="linenumber">284</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg885">
-        <source xml:space="preserve">%1 (Certificate was not verified)</source>
-        <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg886">
-        <source xml:space="preserve">Merchant</source>
-        <context-group purpose="location"><context context-type="linenumber">303</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg887">
-        <source xml:space="preserve">Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg888">
-        <source xml:space="preserve">Debug information</source>
-        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg889">
-        <source xml:space="preserve">Transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg890">
-        <source xml:space="preserve">Inputs</source>
-        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg891">
-        <source xml:space="preserve">Amount</source>
-        <context-group purpose="location"><context context-type="linenumber">349</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg892">
-        <source xml:space="preserve">true</source>
-        <context-group purpose="location"><context context-type="linenumber">350</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg893">
-        <source xml:space="preserve">false</source>
-        <context-group purpose="location"><context context-type="linenumber">350</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../forms/transactiondescdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="TransactionDescDialog">
-      <trans-unit id="_msg894">
-        <source xml:space="preserve">This pane shows a detailed description of the transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../transactiondescdialog.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="TransactionDescDialog">
-      <trans-unit id="_msg895">
-        <source xml:space="preserve">Details for %1</source>
-        <context-group purpose="location"><context context-type="linenumber">18</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../transactiontablemodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="TransactionTableModel">
-      <trans-unit id="_msg896">
-        <source xml:space="preserve">Date</source>
-        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg897">
-        <source xml:space="preserve">Type</source>
-        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg898">
-        <source xml:space="preserve">Label</source>
-        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg899">
-        <source xml:space="preserve">Unconfirmed</source>
-        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg900">
-        <source xml:space="preserve">Abandoned</source>
-        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg901">
-        <source xml:space="preserve">Confirming (%1 of %2 recommended confirmations)</source>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg902">
-        <source xml:space="preserve">Confirmed (%1 confirmations)</source>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg903">
-        <source xml:space="preserve">Conflicted</source>
-        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg904">
-        <source xml:space="preserve">Immature (%1 confirmations, will be available after %2)</source>
-        <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg905">
-        <source xml:space="preserve">Generated but not accepted</source>
-        <context-group purpose="location"><context context-type="linenumber">334</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg906">
-        <source xml:space="preserve">Received with</source>
-        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg907">
-        <source xml:space="preserve">Received from</source>
-        <context-group purpose="location"><context context-type="linenumber">375</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg908">
-        <source xml:space="preserve">Sent to</source>
-        <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg909">
-        <source xml:space="preserve">Mined</source>
-        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg910">
-        <source xml:space="preserve">(n/a)</source>
-        <context-group purpose="location"><context context-type="linenumber">416</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg911">
-        <source xml:space="preserve">(no label)</source>
-        <context-group purpose="location"><context context-type="linenumber">604</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg912">
-        <source xml:space="preserve">Transaction status. Hover over this field to show number of confirmations.</source>
-        <context-group purpose="location"><context context-type="linenumber">643</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg913">
-        <source xml:space="preserve">Date and time that the transaction was received.</source>
-        <context-group purpose="location"><context context-type="linenumber">645</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg914">
-        <source xml:space="preserve">Type of transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">647</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg915">
-        <source xml:space="preserve">User-defined intent/purpose of the transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">649</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg916">
-        <source xml:space="preserve">Amount removed from or added to balance.</source>
-        <context-group purpose="location"><context context-type="linenumber">651</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../transactionview.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="TransactionView">
-      <trans-unit id="_msg917">
-        <source xml:space="preserve">All</source>
-        <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">82</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg918">
-        <source xml:space="preserve">Today</source>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg919">
-        <source xml:space="preserve">This week</source>
-        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg920">
-        <source xml:space="preserve">This month</source>
-        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg921">
-        <source xml:space="preserve">Last month</source>
-        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg922">
-        <source xml:space="preserve">This year</source>
-        <context-group purpose="location"><context context-type="linenumber">71</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg923">
-        <source xml:space="preserve">Received with</source>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg924">
-        <source xml:space="preserve">Sent to</source>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg925">
-        <source xml:space="preserve">Mined</source>
-        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg926">
-        <source xml:space="preserve">Other</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg927">
-        <source xml:space="preserve">Enter address, transaction id, or label to search</source>
-        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg928">
-        <source xml:space="preserve">Min amount</source>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg929">
-        <source xml:space="preserve">Range…</source>
-        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg930">
-        <source xml:space="preserve">&amp;Copy address</source>
-        <context-group purpose="location"><context context-type="linenumber">160</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg931">
-        <source xml:space="preserve">Copy &amp;label</source>
-        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg932">
-        <source xml:space="preserve">Copy &amp;amount</source>
-        <context-group purpose="location"><context context-type="linenumber">162</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg933">
-        <source xml:space="preserve">Copy transaction &amp;ID</source>
-        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg934">
-        <source xml:space="preserve">Copy &amp;raw transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg935">
-        <source xml:space="preserve">Copy full transaction &amp;details</source>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg936">
-        <source xml:space="preserve">&amp;Show transaction details</source>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg937">
-        <source xml:space="preserve">Increase transaction &amp;fee</source>
-        <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg938">
-        <source xml:space="preserve">A&amp;bandon transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg939">
-        <source xml:space="preserve">&amp;Edit address label</source>
-        <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg940">
-        <source xml:space="preserve">Show in %1</source>
-        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
-        <note annotates="source" from="developer">Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</note>
-      </trans-unit>
-      <trans-unit id="_msg941">
-        <source xml:space="preserve">Export Transaction History</source>
-        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg942">
-        <source xml:space="preserve">Comma separated file</source>
-        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
-        <note annotates="source" from="developer">Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</note>
-      </trans-unit>
-      <trans-unit id="_msg943">
-        <source xml:space="preserve">Confirmed</source>
-        <context-group purpose="location"><context context-type="linenumber">339</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg944">
-        <source xml:space="preserve">Date</source>
-        <context-group purpose="location"><context context-type="linenumber">340</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg945">
-        <source xml:space="preserve">Type</source>
-        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg946">
-        <source xml:space="preserve">Label</source>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg947">
-        <source xml:space="preserve">Address</source>
-        <context-group purpose="location"><context context-type="linenumber">343</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg948">
-        <source xml:space="preserve">ID</source>
-        <context-group purpose="location"><context context-type="linenumber">345</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg949">
-        <source xml:space="preserve">Exporting Failed</source>
-        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg950">
-        <source xml:space="preserve">There was an error trying to save the transaction history to %1.</source>
-        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg951">
-        <source xml:space="preserve">Exporting Successful</source>
-        <context-group purpose="location"><context context-type="linenumber">352</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg952">
-        <source xml:space="preserve">The transaction history was successfully saved to %1.</source>
-        <context-group purpose="location"><context context-type="linenumber">352</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg953">
-        <source xml:space="preserve">Range:</source>
-        <context-group purpose="location"><context context-type="linenumber">527</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg954">
-        <source xml:space="preserve">to</source>
-        <context-group purpose="location"><context context-type="linenumber">535</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../walletframe.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="WalletFrame">
-      <trans-unit id="_msg955">
-        <source xml:space="preserve">No wallet has been loaded.
-Go to File &gt; Open Wallet to load a wallet.
-- OR -</source>
-        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg956">
-        <source xml:space="preserve">Create a new wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg957">
-        <source xml:space="preserve">Error</source>
-        <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg958">
-        <source xml:space="preserve">Unable to decode PSBT from clipboard (invalid base64)</source>
-        <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg959">
-        <source xml:space="preserve">Load Transaction Data</source>
-        <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg960">
-        <source xml:space="preserve">Partially Signed Transaction (*.psbt)</source>
-        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg961">
-        <source xml:space="preserve">PSBT file must be smaller than 100 MiB</source>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg962">
-        <source xml:space="preserve">Unable to decode PSBT</source>
-        <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../walletmodel.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="WalletModel">
-      <trans-unit id="_msg963">
-        <source xml:space="preserve">Send Coins</source>
-        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">228</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg964">
-        <source xml:space="preserve">Fee bump error</source>
-        <context-group purpose="location"><context context-type="linenumber">473</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">522</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">542</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">547</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg965">
-        <source xml:space="preserve">Increasing transaction fee failed</source>
-        <context-group purpose="location"><context context-type="linenumber">473</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg966">
-        <source xml:space="preserve">Do you want to increase the fee?</source>
-        <context-group purpose="location"><context context-type="linenumber">480</context></context-group>
-        <note annotates="source" from="developer">Asks a user if they would like to manually increase the fee of a transaction that has already been created.</note>
-      </trans-unit>
-      <trans-unit id="_msg967">
-        <source xml:space="preserve">Current fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">484</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg968">
-        <source xml:space="preserve">Increase:</source>
-        <context-group purpose="location"><context context-type="linenumber">488</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg969">
-        <source xml:space="preserve">New fee:</source>
-        <context-group purpose="location"><context context-type="linenumber">492</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg970">
-        <source xml:space="preserve">Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
-        <context-group purpose="location"><context context-type="linenumber">500</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg971">
-        <source xml:space="preserve">Confirm fee bump</source>
-        <context-group purpose="location"><context context-type="linenumber">505</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg972">
-        <source xml:space="preserve">Can&apos;t draft transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">522</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg973">
-        <source xml:space="preserve">PSBT copied</source>
-        <context-group purpose="location"><context context-type="linenumber">529</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg974">
-        <source xml:space="preserve">Fee-bump PSBT copied to clipboard</source>
-        <context-group purpose="location"><context context-type="linenumber">529</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg975">
-        <source xml:space="preserve">Can&apos;t sign transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">542</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg976">
-        <source xml:space="preserve">Could not commit transaction</source>
-        <context-group purpose="location"><context context-type="linenumber">547</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg977">
-        <source xml:space="preserve">Signer error</source>
-        <context-group purpose="location"><context context-type="linenumber">560</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg978">
-        <source xml:space="preserve">Can&apos;t display address</source>
-        <context-group purpose="location"><context context-type="linenumber">563</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../walletview.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="WalletView">
-      <trans-unit id="_msg979">
-        <source xml:space="preserve">&amp;Export</source>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg980">
-        <source xml:space="preserve">Export the data in the current tab to a file</source>
-        <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg981">
-        <source xml:space="preserve">Backup Wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg982">
-        <source xml:space="preserve">Wallet Data</source>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-        <note annotates="source" from="developer">Name of the wallet data file format.</note>
-      </trans-unit>
-      <trans-unit id="_msg983">
-        <source xml:space="preserve">Backup Failed</source>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg984">
-        <source xml:space="preserve">There was an error trying to save the wallet data to %1.</source>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg985">
-        <source xml:space="preserve">Backup Successful</source>
-        <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg986">
-        <source xml:space="preserve">The wallet data was successfully saved to %1.</source>
-        <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg987">
-        <source xml:space="preserve">Cancel</source>
-        <context-group purpose="location"><context context-type="linenumber">263</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-  <file original="../bitcoinstrings.cpp" datatype="cpp" source-language="en"><body>
-    <group restype="x-trolltech-linguist-context" resname="bitcoin-core">
-      <trans-unit id="_msg988">
-        <source xml:space="preserve">The %s developers</source>
-        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg989">
-        <source xml:space="preserve">%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
-        <context-group purpose="location"><context context-type="linenumber">12</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg990">
-        <source xml:space="preserve">%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <context-group purpose="location"><context context-type="linenumber">15</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg991">
-        <source xml:space="preserve">Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
-        <context-group purpose="location"><context context-type="linenumber">39</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg992">
-        <source xml:space="preserve">Distributed under the MIT software license, see the accompanying file %s or %s</source>
-        <context-group purpose="location"><context context-type="linenumber">41</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg993">
-        <source xml:space="preserve">Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
-        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg994">
-        <source xml:space="preserve">Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">61</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg995">
-        <source xml:space="preserve">Error starting/committing db txn for wallet transactions removal process</source>
-        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg996">
-        <source xml:space="preserve">Error: Dumpfile format record is incorrect. Got &quot;%s&quot;, expected &quot;format&quot;.</source>
-        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg997">
-        <source xml:space="preserve">Error: Dumpfile identifier record is incorrect. Got &quot;%s&quot;, expected &quot;%s&quot;.</source>
-        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg998">
-        <source xml:space="preserve">Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg999">
-        <source xml:space="preserve">Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet&apos;s passphrase if it is encrypted.</source>
-        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1000">
-        <source xml:space="preserve">File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1001">
-        <source xml:space="preserve">Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
-        <context-group purpose="location"><context context-type="linenumber">139</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1002">
-        <source xml:space="preserve">Invalid value detected for &apos;-wallet&apos; or &apos;-nowallet&apos;. &apos;-wallet&apos; requires a string value, while &apos;-nowallet&apos; accepts only &apos;1&apos; to disable all wallets</source>
-        <context-group purpose="location"><context context-type="linenumber">141</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1003">
-        <source xml:space="preserve">More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
-        <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1004">
-        <source xml:space="preserve">No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1005">
-        <source xml:space="preserve">No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1006">
-        <source xml:space="preserve">Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1007">
-        <source xml:space="preserve">Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1008">
-        <source xml:space="preserve">Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
-        <context-group purpose="location"><context context-type="linenumber">174</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1009">
-        <source xml:space="preserve">Rename of &apos;%s&apos; -&gt; &apos;%s&apos; failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
-        <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1010">
-        <source xml:space="preserve">SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
-        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1011">
-        <source xml:space="preserve">The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
-        <context-group purpose="location"><context context-type="linenumber">210</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1012">
-        <source xml:space="preserve">The transaction amount is too small to send after the fee has been deducted</source>
-        <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1013">
-        <source xml:space="preserve">This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1014">
-        <source xml:space="preserve">This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
-        <context-group purpose="location"><context context-type="linenumber">224</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1015">
-        <source xml:space="preserve">This is the transaction fee you may discard if change is smaller than dust at this level</source>
-        <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1016">
-        <source xml:space="preserve">This is the transaction fee you may pay when fee estimates are not available.</source>
-        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1017">
-        <source xml:space="preserve">Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
-        <context-group purpose="location"><context context-type="linenumber">228</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1018">
-        <source xml:space="preserve">Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
-        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1019">
-        <source xml:space="preserve">Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
-        <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1020">
-        <source xml:space="preserve">Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
-        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1021">
-        <source xml:space="preserve">Warning: Private keys detected in wallet {%s} with disabled private keys</source>
-        <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1022">
-        <source xml:space="preserve">Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
-        <context-group purpose="location"><context context-type="linenumber">267</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1023">
-        <source xml:space="preserve">You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1024">
-        <source xml:space="preserve">%s is set very high!</source>
-        <context-group purpose="location"><context context-type="linenumber">13</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1025">
-        <source xml:space="preserve">-maxmempool must be at least %d MB</source>
-        <context-group purpose="location"><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1026">
-        <source xml:space="preserve">Cannot obtain a lock on directory %s. %s is probably already running.</source>
-        <context-group purpose="location"><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1027">
-        <source xml:space="preserve">Cannot resolve -%s address: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">25</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1028">
-        <source xml:space="preserve">Cannot set -forcednsseed to true when setting -dnsseed to false.</source>
-        <context-group purpose="location"><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1029">
-        <source xml:space="preserve">Cannot set -peerblockfilters without -blockfilterindex.</source>
-        <context-group purpose="location"><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1030">
-        <source xml:space="preserve">%s is set very high! Fees this large could be paid on a single transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1031">
-        <source xml:space="preserve">Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
-        <context-group purpose="location"><context context-type="linenumber">24</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1032">
-        <source xml:space="preserve">Error loading %s: External signer wallet being loaded without external signer support compiled</source>
-        <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1033">
-        <source xml:space="preserve">Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
-        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1034">
-        <source xml:space="preserve">Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
-        <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1035">
-        <source xml:space="preserve">Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
-        <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1036">
-        <source xml:space="preserve">Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1037">
-        <source xml:space="preserve">Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
-</source>
-        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1038">
-        <source xml:space="preserve">Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
-        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1039">
-        <source xml:space="preserve">Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
-        <context-group purpose="location"><context context-type="linenumber">118</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1040">
-        <source xml:space="preserve">Flushing block file to disk failed. This is likely the result of an I/O error.</source>
-        <context-group purpose="location"><context context-type="linenumber">121</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1041">
-        <source xml:space="preserve">Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
-        <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1042">
-        <source xml:space="preserve">Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
-        <context-group purpose="location"><context context-type="linenumber">124</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1043">
-        <source xml:space="preserve">Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1044">
-        <source xml:space="preserve">Maximum transaction weight is less than transaction weight without inputs</source>
-        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1045">
-        <source xml:space="preserve">Maximum transaction weight is too low, can not accommodate change output</source>
-        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1046">
-        <source xml:space="preserve">Option &apos;-checkpoints&apos; is set but checkpoints were removed. This option has no effect.</source>
-        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1047">
-        <source xml:space="preserve">Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1048">
-        <source xml:space="preserve">Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1049">
-        <source xml:space="preserve">Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1050">
-        <source xml:space="preserve">Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
-        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1051">
-        <source xml:space="preserve">Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
-        <context-group purpose="location"><context context-type="linenumber">177</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1052">
-        <source xml:space="preserve">Rename of &apos;%s&apos; -&gt; &apos;%s&apos; failed. Cannot clean up the background chainstate leveldb directory.</source>
-        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1053">
-        <source xml:space="preserve">Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
-        <context-group purpose="location"><context context-type="linenumber">196</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1054">
-        <source xml:space="preserve">Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
-        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1055">
-        <source xml:space="preserve">Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
-        <context-group purpose="location"><context context-type="linenumber">198</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1056">
-        <source xml:space="preserve">The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1057">
-        <source xml:space="preserve">The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet&apos;s UTXOs</source>
-        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1058">
-        <source xml:space="preserve">The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
-        <context-group purpose="location"><context context-type="linenumber">213</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1059">
-        <source xml:space="preserve">UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
-        <context-group purpose="location"><context context-type="linenumber">237</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1060">
-        <source xml:space="preserve">Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
-        <context-group purpose="location"><context context-type="linenumber">246</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1061">
-        <source xml:space="preserve">Unexpected legacy entry in descriptor wallet found. Loading wallet %s
-
-The wallet might have been tampered with or created with malicious intent.
-</source>
-        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1062">
-        <source xml:space="preserve">Your computer&apos;s date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you&apos;ve confirmed your computer&apos;s clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you&apos;ve connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
-        <context-group purpose="location"><context context-type="linenumber">269</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1063">
-        <source xml:space="preserve">
-Unable to cleanup failed migration</source>
-        <context-group purpose="location"><context context-type="linenumber">270</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1064">
-        <source xml:space="preserve">
-Unable to restore backup of wallet.</source>
-        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1065">
-        <source xml:space="preserve">default wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">273</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1066">
-        <source xml:space="preserve">whitebind may only be used for incoming connections (&quot;out&quot; was passed)</source>
-        <context-group purpose="location"><context context-type="linenumber">274</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1067">
-        <source xml:space="preserve">A fatal internal error occurred, see debug.log for details: </source>
-        <context-group purpose="location"><context context-type="linenumber">18</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1068">
-        <source xml:space="preserve">Assumeutxo data not found for the given blockhash &apos;%s&apos;.</source>
-        <context-group purpose="location"><context context-type="linenumber">19</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1069">
-        <source xml:space="preserve">Block verification was interrupted</source>
-        <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1070">
-        <source xml:space="preserve">Can&apos;t spend unconfirmed version %d pre-selected input with a version 3 tx</source>
-        <context-group purpose="location"><context context-type="linenumber">21</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1071">
-        <source xml:space="preserve">Can&apos;t spend unconfirmed version 3 pre-selected input with a version %d tx</source>
-        <context-group purpose="location"><context context-type="linenumber">22</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1072">
-        <source xml:space="preserve">Cannot write to directory &apos;%s&apos;; check permissions.</source>
-        <context-group purpose="location"><context context-type="linenumber">28</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1073">
-        <source xml:space="preserve">Config setting for %s only applied on %s network when in [%s] section.</source>
-        <context-group purpose="location"><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1074">
-        <source xml:space="preserve">Copyright (C) %i-%i</source>
-        <context-group purpose="location"><context context-type="linenumber">30</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1075">
-        <source xml:space="preserve">Corrupt block found indicating potential hardware failure.</source>
-        <context-group purpose="location"><context context-type="linenumber">31</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1076">
-        <source xml:space="preserve">Corrupted block database detected</source>
-        <context-group purpose="location"><context context-type="linenumber">32</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1077">
-        <source xml:space="preserve">Could not find asmap file %s</source>
-        <context-group purpose="location"><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1078">
-        <source xml:space="preserve">Could not generate scriptPubKeys (cache is empty)</source>
-        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1079">
-        <source xml:space="preserve">Could not parse asmap file %s</source>
-        <context-group purpose="location"><context context-type="linenumber">35</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1080">
-        <source xml:space="preserve">Could not read embedded asmap data</source>
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1081">
-        <source xml:space="preserve">Could not top up scriptPubKeys</source>
-        <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1082">
-        <source xml:space="preserve">Disk space is too low!</source>
-        <context-group purpose="location"><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1083">
-        <source xml:space="preserve">Done loading</source>
-        <context-group purpose="location"><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1084">
-        <source xml:space="preserve">Dump file %s does not exist.</source>
-        <context-group purpose="location"><context context-type="linenumber">44</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1085">
-        <source xml:space="preserve">Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
-        <context-group purpose="location"><context context-type="linenumber">46</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1086">
-        <source xml:space="preserve">Embedded asmap data not available</source>
-        <context-group purpose="location"><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1087">
-        <source xml:space="preserve">Error initializing block database</source>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1088">
-        <source xml:space="preserve">Error loading %s</source>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1089">
-        <source xml:space="preserve">Error loading %s: Wallet corrupted</source>
-        <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1090">
-        <source xml:space="preserve">Error loading %s: Wallet requires newer version of %s</source>
-        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1091">
-        <source xml:space="preserve">Error loading block database</source>
-        <context-group purpose="location"><context context-type="linenumber">55</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1092">
-        <source xml:space="preserve">Error loading databases</source>
-        <context-group purpose="location"><context context-type="linenumber">56</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1093">
-        <source xml:space="preserve">Error opening block database</source>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1094">
-        <source xml:space="preserve">Error opening coins database</source>
-        <context-group purpose="location"><context context-type="linenumber">59</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1095">
-        <source xml:space="preserve">Error reading configuration file: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">62</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1096">
-        <source xml:space="preserve">Error reading from database, shutting down.</source>
-        <context-group purpose="location"><context context-type="linenumber">63</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1097">
-        <source xml:space="preserve">Error reading next record from wallet database</source>
-        <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1098">
-        <source xml:space="preserve">Error: Cannot extract destination from the generated scriptpubkey</source>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1099">
-        <source xml:space="preserve">Error: Couldn&apos;t create cursor into database</source>
-        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1100">
-        <source xml:space="preserve">Error: Disk space is low for %s</source>
-        <context-group purpose="location"><context context-type="linenumber">71</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1101">
-        <source xml:space="preserve">Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
-        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1102">
-        <source xml:space="preserve">Error: Failed to create new watchonly wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">78</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1103">
-        <source xml:space="preserve">Error: Got key that was not hex: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1104">
-        <source xml:space="preserve">Error: Got value that was not hex: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1105">
-        <source xml:space="preserve">Error: Keypool ran out, please call keypoolrefill first</source>
-        <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1106">
-        <source xml:space="preserve">Error: Missing checksum</source>
-        <context-group purpose="location"><context context-type="linenumber">82</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1107">
-        <source xml:space="preserve">Error: No %s addresses available.</source>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1108">
-        <source xml:space="preserve">Error: Not all address book records were migrated</source>
-        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1109">
-        <source xml:space="preserve">Error: Not all transaction records were migrated</source>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1110">
-        <source xml:space="preserve">Error: This wallet already uses SQLite</source>
-        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1111">
-        <source xml:space="preserve">Error: This wallet is already a descriptor wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1112">
-        <source xml:space="preserve">Error: Unable to begin reading all records in the database</source>
-        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1113">
-        <source xml:space="preserve">Error: Unable to make a backup of your wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1114">
-        <source xml:space="preserve">Error: Unable to parse version %u as a uint32_t</source>
-        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1115">
-        <source xml:space="preserve">Error: Unable to read all records in the database</source>
-        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1116">
-        <source xml:space="preserve">Error: Unable to read wallet&apos;s best block locator record</source>
-        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1117">
-        <source xml:space="preserve">Error: Unable to remove watchonly address book data</source>
-        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1118">
-        <source xml:space="preserve">Error: Unable to write data to disk for wallet %s</source>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1119">
-        <source xml:space="preserve">Error: Unable to write record to new wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1120">
-        <source xml:space="preserve">Error: Unable to write solvable wallet best block locator record</source>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1121">
-        <source xml:space="preserve">Error: Unable to write watchonly wallet best block locator record</source>
-        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1122">
-        <source xml:space="preserve">Error: database transaction cannot be executed for wallet %s</source>
-        <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1123">
-        <source xml:space="preserve">Failed to acquire rescan reserver during wallet initialization</source>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1124">
-        <source xml:space="preserve">Failed to close block undo file.</source>
-        <context-group purpose="location"><context context-type="linenumber">105</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1125">
-        <source xml:space="preserve">Failed to close file when writing block.</source>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1126">
-        <source xml:space="preserve">Failed to disconnect block.</source>
-        <context-group purpose="location"><context context-type="linenumber">107</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1127">
-        <source xml:space="preserve">Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1128">
-        <source xml:space="preserve">Failed to read block.</source>
-        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1129">
-        <source xml:space="preserve">Failed to rescan the wallet during initialization</source>
-        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1130">
-        <source xml:space="preserve">Failed to verify database</source>
-        <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1131">
-        <source xml:space="preserve">Failed to write block.</source>
-        <context-group purpose="location"><context context-type="linenumber">115</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1132">
-        <source xml:space="preserve">Failed to write undo data.</source>
-        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1133">
-        <source xml:space="preserve">Failure removing transaction: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">117</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1134">
-        <source xml:space="preserve">Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
-        <context-group purpose="location"><context context-type="linenumber">119</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1135">
-        <source xml:space="preserve">Ignoring duplicate -wallet %s.</source>
-        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1136">
-        <source xml:space="preserve">Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1137">
-        <source xml:space="preserve">Initialization sanity check failed. %s is shutting down.</source>
-        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1138">
-        <source xml:space="preserve">Input not found or already spent</source>
-        <context-group purpose="location"><context context-type="linenumber">127</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1139">
-        <source xml:space="preserve">Insufficient dbcache for block verification</source>
-        <context-group purpose="location"><context context-type="linenumber">128</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1140">
-        <source xml:space="preserve">Insufficient funds</source>
-        <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1141">
-        <source xml:space="preserve">Invalid -i2psam address or hostname: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">130</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1142">
-        <source xml:space="preserve">Invalid -onion address or hostname: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">131</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1143">
-        <source xml:space="preserve">Invalid -proxy address or hostname: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1144">
-        <source xml:space="preserve">Invalid P2P permission: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">134</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1145">
-        <source xml:space="preserve">Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">135</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1146">
-        <source xml:space="preserve">A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
-        <context-group purpose="location"><context context-type="linenumber">17</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1147">
-        <source xml:space="preserve">Creating wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">38</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1148">
-        <source xml:space="preserve">Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
-        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1149">
-        <source xml:space="preserve">Error creating %s: Could not write version metadata.</source>
-        <context-group purpose="location"><context context-type="linenumber">48</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1150">
-        <source xml:space="preserve">Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1151">
-        <source xml:space="preserve">Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1152">
-        <source xml:space="preserve">Invalid port specified in %s: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">140</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1153">
-        <source xml:space="preserve">Listening for incoming connections failed (listen returned error %s)</source>
-        <context-group purpose="location"><context context-type="linenumber">142</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1154">
-        <source xml:space="preserve">Loading P2P addresses…</source>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1155">
-        <source xml:space="preserve">Loading banlist…</source>
-        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1156">
-        <source xml:space="preserve">Loading block index…</source>
-        <context-group purpose="location"><context context-type="linenumber">145</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1157">
-        <source xml:space="preserve">Loading wallet…</source>
-        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1158">
-        <source xml:space="preserve">Maximum transaction weight must be between %d and %d</source>
-        <context-group purpose="location"><context context-type="linenumber">149</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1159">
-        <source xml:space="preserve">Missing amount</source>
-        <context-group purpose="location"><context context-type="linenumber">150</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1160">
-        <source xml:space="preserve">Missing solving data for estimating transaction size</source>
-        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1161">
-        <source xml:space="preserve">Need to specify a port with -whitebind: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1162">
-        <source xml:space="preserve">No addresses available</source>
-        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1163">
-        <source xml:space="preserve">Not found pre-selected input %s</source>
-        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1164">
-        <source xml:space="preserve">Not solvable pre-selected input %s</source>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1165">
-        <source xml:space="preserve">Only direction was set, no permissions: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">160</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1166">
-        <source xml:space="preserve">Option &apos;-limitancestorsize&apos; is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
-        <context-group purpose="location"><context context-type="linenumber">162</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1167">
-        <source xml:space="preserve">Option &apos;-limitdescendantsize&apos; is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
-        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1168">
-        <source xml:space="preserve">Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
-        <context-group purpose="location"><context context-type="linenumber">169</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1169">
-        <source xml:space="preserve">Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
-        <context-group purpose="location"><context context-type="linenumber">170</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1170">
-        <source xml:space="preserve">Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
-        <context-group purpose="location"><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1171">
-        <source xml:space="preserve">Prune cannot be configured with a negative value.</source>
-        <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1172">
-        <source xml:space="preserve">Prune mode is incompatible with -txindex.</source>
-        <context-group purpose="location"><context context-type="linenumber">175</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1173">
-        <source xml:space="preserve">Prune mode is incompatible with -txospenderindex.</source>
-        <context-group purpose="location"><context context-type="linenumber">176</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1174">
-        <source xml:space="preserve">Pruning blockstore…</source>
-        <context-group purpose="location"><context context-type="linenumber">178</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1175">
-        <source xml:space="preserve">Reducing -maxconnections from %d to %d, because of system limitations.</source>
-        <context-group purpose="location"><context context-type="linenumber">179</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1176">
-        <source xml:space="preserve">Replaying blocks…</source>
-        <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1177">
-        <source xml:space="preserve">Rescanning…</source>
-        <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1178">
-        <source xml:space="preserve">SQLiteDatabase: Failed to execute statement to verify database: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1179">
-        <source xml:space="preserve">SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">185</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1180">
-        <source xml:space="preserve">SQLiteDatabase: Failed to read database verification error: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">186</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1181">
-        <source xml:space="preserve">SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
-        <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1182">
-        <source xml:space="preserve">Section [%s] is not recognized.</source>
-        <context-group purpose="location"><context context-type="linenumber">189</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1183">
-        <source xml:space="preserve">Signer did not echo address</source>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1184">
-        <source xml:space="preserve">Signer echoed unexpected address %s</source>
-        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1185">
-        <source xml:space="preserve">Signer returned error: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1186">
-        <source xml:space="preserve">Signing transaction failed</source>
-        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1187">
-        <source xml:space="preserve">Specified -walletdir &quot;%s&quot; does not exist</source>
-        <context-group purpose="location"><context context-type="linenumber">199</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1188">
-        <source xml:space="preserve">Specified -walletdir &quot;%s&quot; is a relative path</source>
-        <context-group purpose="location"><context context-type="linenumber">200</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1189">
-        <source xml:space="preserve">Specified -walletdir &quot;%s&quot; is not a directory</source>
-        <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1190">
-        <source xml:space="preserve">Specified blocks directory &quot;%s&quot; does not exist.</source>
-        <context-group purpose="location"><context context-type="linenumber">202</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1191">
-        <source xml:space="preserve">Specified data directory &quot;%s&quot; does not exist.</source>
-        <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1192">
-        <source xml:space="preserve">Starting network threads…</source>
-        <context-group purpose="location"><context context-type="linenumber">204</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1193">
-        <source xml:space="preserve">System error while flushing: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">205</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1194">
-        <source xml:space="preserve">System error while loading external block file: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1195">
-        <source xml:space="preserve">System error while saving block to disk: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1196">
-        <source xml:space="preserve">The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
-        <context-group purpose="location"><context context-type="linenumber">209</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1197">
-        <source xml:space="preserve">The source code is available from %s.</source>
-        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1198">
-        <source xml:space="preserve">The specified config file %s does not exist</source>
-        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1199">
-        <source xml:space="preserve">The total exceeds your balance when the %s transaction fee is included.</source>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1200">
-        <source xml:space="preserve">The transaction amount is too small to pay the fee</source>
-        <context-group purpose="location"><context context-type="linenumber">217</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1201">
-        <source xml:space="preserve">The transactions removal process can only be executed within a db txn</source>
-        <context-group purpose="location"><context context-type="linenumber">219</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1202">
-        <source xml:space="preserve">The wallet will avoid paying less than the minimum relay fee.</source>
-        <context-group purpose="location"><context context-type="linenumber">220</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1203">
-        <source xml:space="preserve">There is no ScriptPubKeyManager for this address</source>
-        <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1204">
-        <source xml:space="preserve">This is experimental software.</source>
-        <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1205">
-        <source xml:space="preserve">This is the minimum transaction fee you pay on every transaction.</source>
-        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1206">
-        <source xml:space="preserve">Transaction %s does not belong to this wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1207">
-        <source xml:space="preserve">Transaction amount too small</source>
-        <context-group purpose="location"><context context-type="linenumber">230</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1208">
-        <source xml:space="preserve">Transaction amounts must not be negative</source>
-        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1209">
-        <source xml:space="preserve">Transaction change output index out of range</source>
-        <context-group purpose="location"><context context-type="linenumber">232</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1210">
-        <source xml:space="preserve">Transaction must have at least one recipient</source>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1211">
-        <source xml:space="preserve">Transaction needs a change address, but we can&apos;t generate it.</source>
-        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1212">
-        <source xml:space="preserve">Transaction too large</source>
-        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1213">
-        <source xml:space="preserve">Unable to bind to %s on this computer (bind returned error %s)</source>
-        <context-group purpose="location"><context context-type="linenumber">238</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1214">
-        <source xml:space="preserve">Unable to bind to %s on this computer. %s is probably already running.</source>
-        <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1215">
-        <source xml:space="preserve">Unable to create the PID file &apos;%s&apos;: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1216">
-        <source xml:space="preserve">Unable to find UTXO for external input</source>
-        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1217">
-        <source xml:space="preserve">Unable to open %s for writing</source>
-        <context-group purpose="location"><context context-type="linenumber">242</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1218">
-        <source xml:space="preserve">Unable to parse -maxuploadtarget: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">243</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1219">
-        <source xml:space="preserve">Unable to start HTTP server. See debug log for details.</source>
-        <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1220">
-        <source xml:space="preserve">Unknown -blockfilterindex value %s.</source>
-        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1221">
-        <source xml:space="preserve">Unknown address type &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">249</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1222">
-        <source xml:space="preserve">Unknown change type &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1223">
-        <source xml:space="preserve">Unknown network specified in -onlynet: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1224">
-        <source xml:space="preserve">Unknown new rules activated (versionbit %i)</source>
-        <context-group purpose="location"><context context-type="linenumber">252</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1225">
-        <source xml:space="preserve">Unrecognised option &quot;%s&quot; provided in -test=&lt;option&gt;.</source>
-        <context-group purpose="location"><context context-type="linenumber">253</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1226">
-        <source xml:space="preserve">Unsupported global logging level %s=%s. Valid values: %s.</source>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1227">
-        <source xml:space="preserve">Wallet file creation failed: %s</source>
-        <context-group purpose="location"><context context-type="linenumber">263</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1228">
-        <source xml:space="preserve">Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1229">
-        <source xml:space="preserve">acceptstalefeeestimates is not supported on %s chain.</source>
-        <context-group purpose="location"><context context-type="linenumber">272</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1230">
-        <source xml:space="preserve">Unsupported logging category %s=%s.</source>
-        <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1231">
-        <source xml:space="preserve">Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
-        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1232">
-        <source xml:space="preserve">Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
-        <context-group purpose="location"><context context-type="linenumber">75</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1233">
-        <source xml:space="preserve">Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
-        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1234">
-        <source xml:space="preserve">Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
-        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1235">
-        <source xml:space="preserve">Unrecognized descriptor found. Loading wallet %s
-
-The wallet might have been created on a newer version.
-Please try running the latest software version.
-</source>
-        <context-group purpose="location"><context context-type="linenumber">254</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1236">
-        <source xml:space="preserve">Do you want to rebuild the databases now?</source>
-        <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1237">
-        <source xml:space="preserve">Error: Could not add watchonly tx %s to watchonly wallet</source>
-        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1238">
-        <source xml:space="preserve">Error: Could not delete watchonly transactions. </source>
-        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1239">
-        <source xml:space="preserve">Error: Wallet does not exist</source>
-        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1240">
-        <source xml:space="preserve">Error: cannot remove legacy wallet records</source>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1241">
-        <source xml:space="preserve">Failed to start indexes, shutting down…</source>
-        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1242">
-        <source xml:space="preserve">Invalid -proxy address or hostname, ends with &apos;=&apos;: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1243">
-        <source xml:space="preserve">Not enough file descriptors available. %d available, %d required.</source>
-        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1244">
-        <source xml:space="preserve">Unrecognized network in -proxy=&apos;%s&apos;: &apos;%s&apos;</source>
-        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1245">
-        <source xml:space="preserve">User Agent comment (%s) contains unsafe characters.</source>
-        <context-group purpose="location"><context context-type="linenumber">260</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1246">
-        <source xml:space="preserve">Verifying blocks…</source>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1247">
-        <source xml:space="preserve">Verifying wallet(s)…</source>
-        <context-group purpose="location"><context context-type="linenumber">262</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1248">
-        <source xml:space="preserve">Wallet needed to be rewritten: restart %s to complete</source>
-        <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1249">
-        <source xml:space="preserve">Settings file could not be read</source>
-        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1250">
-        <source xml:space="preserve">Settings file could not be written</source>
-        <context-group purpose="location"><context context-type="linenumber">191</context></context-group>
-      </trans-unit>
-    </group>
-  </body></file>
-</xliff>
diff --git a/depend/bitcoin/src/qt/macdockiconhandler.mm b/depend/bitcoin/src/qt/macdockiconhandler.mm
index b7b1b98e..1b62032c 100644
--- a/depend/bitcoin/src/qt/macdockiconhandler.mm
+++ b/depend/bitcoin/src/qt/macdockiconhandler.mm
@@ -20,7 +20,8 @@ bool dockClickHandler(id self, SEL _cmd, ...) {
 }
 
 void setupDockClickHandler() {
-    Class delClass = (Class)[[[NSApplication sharedApplication] delegate] class];
+    if (NSApp == nil) return;
+    Class delClass = (Class)[[NSApp delegate] class];
     SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
     class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");
 }
@@ -49,5 +50,6 @@ void setupDockClickHandler() {
  */
 void ForceActivation()
 {
-    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
+    if (NSApp == nil) return;
+    [NSApp activateIgnoringOtherApps:YES];
 }
diff --git a/depend/bitcoin/src/qt/modaloverlay.h b/depend/bitcoin/src/qt/modaloverlay.h
index 7c4b7a4b..f434aaad 100644
--- a/depend/bitcoin/src/qt/modaloverlay.h
+++ b/depend/bitcoin/src/qt/modaloverlay.h
@@ -10,7 +10,7 @@
 #include <QWidget>
 
 //! The required delta of headers to the estimated number of available headers until we show the IBD progress
-static constexpr int HEADER_HEIGHT_DELTA_SYNC = 24;
+inline constexpr int HEADER_HEIGHT_DELTA_SYNC = 24;
 
 namespace Ui {
     class ModalOverlay;
diff --git a/depend/bitcoin/src/qt/optionsdialog.cpp b/depend/bitcoin/src/qt/optionsdialog.cpp
index f68e5825..e7b769c4 100644
--- a/depend/bitcoin/src/qt/optionsdialog.cpp
+++ b/depend/bitcoin/src/qt/optionsdialog.cpp
@@ -95,7 +95,7 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
     ui->verticalLayout->setStretchFactor(ui->tabWidget, 1);
 
     /* Main elements init */
-    ui->databaseCache->setRange(MIN_DB_CACHE >> 20, std::numeric_limits<int>::max());
+    ui->databaseCache->setRange(MIN_DBCACHE_BYTES / 1_MiB, std::numeric_limits<int>::max());
     ui->threadsScriptVerif->setMinimum(-GetNumCores());
     ui->threadsScriptVerif->setMaximum(MAX_SCRIPTCHECK_THREADS);
     ui->pruneWarning->setVisible(false);
diff --git a/depend/bitcoin/src/qt/optionsmodel.cpp b/depend/bitcoin/src/qt/optionsmodel.cpp
index d52c65d6..9f540c87 100644
--- a/depend/bitcoin/src/qt/optionsmodel.cpp
+++ b/depend/bitcoin/src/qt/optionsmodel.cpp
@@ -469,7 +469,7 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
                suffix.empty()          ? getOption(option, "-prev") :
                                          DEFAULT_PRUNE_TARGET_GB;
     case DatabaseCache:
-        return qlonglong(SettingTo<int64_t>(setting(), node::GetDefaultDBCache() >> 20));
+        return qlonglong(SettingTo<int64_t>(setting(), node::GetDefaultDBCache() / 1_MiB));
     case ThreadsScriptVerif:
         return qlonglong(SettingTo<int64_t>(setting(), DEFAULT_SCRIPTCHECK_THREADS));
     case Listen:
@@ -732,7 +732,7 @@ void OptionsModel::checkAndMigrate()
         // see https://github.com/bitcoin/bitcoin/pull/8273
         // force people to upgrade to the new value if they are using 100MB
         if (settingsVersion < 130000 && settings.contains("nDatabaseCache") && settings.value("nDatabaseCache").toLongLong() == 100)
-            settings.setValue("nDatabaseCache", (qint64)(DEFAULT_DB_CACHE >> 20));
+            settings.setValue("nDatabaseCache", qint64(DEFAULT_KERNEL_CACHE / 1_MiB));
 
         settings.setValue(strSettingsVersionKey, CLIENT_VERSION);
     }
diff --git a/depend/bitcoin/src/qt/optionsmodel.h b/depend/bitcoin/src/qt/optionsmodel.h
index feef00a3..9d106947 100644
--- a/depend/bitcoin/src/qt/optionsmodel.h
+++ b/depend/bitcoin/src/qt/optionsmodel.h
@@ -22,7 +22,7 @@ class Node;
 }
 
 extern const char *DEFAULT_GUI_PROXY_HOST;
-static constexpr uint16_t DEFAULT_GUI_PROXY_PORT = 9050;
+inline constexpr uint16_t DEFAULT_GUI_PROXY_PORT = 9050;
 
 /**
  * Convert configured prune target MiB to displayed GB. Round up to avoid underestimating max disk usage.
diff --git a/depend/bitcoin/src/qt/psbtoperationsdialog.cpp b/depend/bitcoin/src/qt/psbtoperationsdialog.cpp
index 64ce6d28..9da2f755 100644
--- a/depend/bitcoin/src/qt/psbtoperationsdialog.cpp
+++ b/depend/bitcoin/src/qt/psbtoperationsdialog.cpp
@@ -59,11 +59,11 @@ void PSBTOperationsDialog::openWithPSBT(PartiallySignedTransaction psbtx)
     bool complete = FinalizePSBT(psbtx); // Make sure all existing signatures are fully combined before checking for completeness.
     if (m_wallet_model) {
         size_t n_could_sign;
-        const auto err{m_wallet_model->wallet().fillPSBT({.sign = false, .bip32_derivs= true}, &n_could_sign, m_transaction_data, complete)};
+        const auto err{m_wallet_model->wallet().fillPSBT({.sign = false, .bip32_derivs= true}, &n_could_sign, *m_transaction_data, complete)};
         if (err) {
             showStatus(tr("Failed to load transaction: %1")
                            .arg(QString::fromStdString(PSBTErrorString(*err).translated)),
-                       StatusLevel::ERR);
+                       StatusLevel::Error);
             return;
         }
         m_ui->signTransactionButton->setEnabled(!complete && !m_wallet_model->wallet().privateKeysDisabled() && n_could_sign > 0);
@@ -83,26 +83,26 @@ void PSBTOperationsDialog::signTransaction()
 
     WalletModel::UnlockContext ctx(m_wallet_model->requestUnlock());
 
-    const auto err{m_wallet_model->wallet().fillPSBT({.sign = true, .bip32_derivs = true}, &n_signed, m_transaction_data, complete)};
+    const auto err{m_wallet_model->wallet().fillPSBT({.sign = true, .bip32_derivs = true}, &n_signed, *m_transaction_data, complete)};
 
     if (err) {
         showStatus(tr("Failed to sign transaction: %1")
-            .arg(QString::fromStdString(PSBTErrorString(*err).translated)), StatusLevel::ERR);
+            .arg(QString::fromStdString(PSBTErrorString(*err).translated)), StatusLevel::Error);
         return;
     }
 
     updateTransactionDisplay();
 
     if (!complete && !ctx.isValid()) {
-        showStatus(tr("Cannot sign inputs while wallet is locked."), StatusLevel::WARN);
+        showStatus(tr("Cannot sign inputs while wallet is locked."), StatusLevel::Warn);
     } else if (!complete && n_signed < 1) {
-        showStatus(tr("Could not sign any more inputs."), StatusLevel::WARN);
+        showStatus(tr("Could not sign any more inputs."), StatusLevel::Warn);
     } else if (!complete) {
         showStatus(tr("Signed %n input(s), but more signatures are still required.", "", n_signed),
-            StatusLevel::INFO);
+            StatusLevel::Info);
     } else {
         showStatus(tr("Signed transaction successfully. Transaction is ready to broadcast."),
-            StatusLevel::INFO);
+            StatusLevel::Info);
         m_ui->broadcastTransactionButton->setEnabled(true);
     }
 }
@@ -110,10 +110,10 @@ void PSBTOperationsDialog::signTransaction()
 void PSBTOperationsDialog::broadcastTransaction()
 {
     CMutableTransaction mtx;
-    if (!FinalizeAndExtractPSBT(m_transaction_data, mtx)) {
+    if (!FinalizeAndExtractPSBT(*m_transaction_data, mtx)) {
         // This is never expected to fail unless we were given a malformed PSBT
         // (e.g. with an invalid signature.)
-        showStatus(tr("Unknown error processing transaction."), StatusLevel::ERR);
+        showStatus(tr("Unknown error processing transaction."), StatusLevel::Error);
         return;
     }
 
@@ -124,34 +124,34 @@ void PSBTOperationsDialog::broadcastTransaction()
 
     if (error == TransactionError::OK) {
         showStatus(tr("Transaction broadcast successfully! Transaction ID: %1")
-            .arg(QString::fromStdString(tx->GetHash().GetHex())), StatusLevel::INFO);
+            .arg(QString::fromStdString(tx->GetHash().GetHex())), StatusLevel::Info);
     } else {
         showStatus(tr("Transaction broadcast failed: %1")
-            .arg(QString::fromStdString(TransactionErrorString(error).translated)), StatusLevel::ERR);
+            .arg(QString::fromStdString(TransactionErrorString(error).translated)), StatusLevel::Error);
     }
 }
 
 void PSBTOperationsDialog::copyToClipboard() {
     DataStream ssTx{};
-    ssTx << m_transaction_data;
+    ssTx << *m_transaction_data;
     GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str());
-    showStatus(tr("PSBT copied to clipboard."), StatusLevel::INFO);
+    showStatus(tr("PSBT copied to clipboard."), StatusLevel::Info);
 }
 
 void PSBTOperationsDialog::saveTransaction() {
     DataStream ssTx{};
-    ssTx << m_transaction_data;
+    ssTx << *m_transaction_data;
 
     QString selected_filter;
     QString filename_suggestion = "";
     bool first = true;
-    for (const CTxOut& out : m_transaction_data.tx->vout) {
+    for (const PSBTOutput& out : m_transaction_data->outputs) {
         if (!first) {
             filename_suggestion.append("-");
         }
         CTxDestination address;
-        ExtractDestination(out.scriptPubKey, address);
-        QString amount = BitcoinUnits::format(m_client_model->getOptionsModel()->getDisplayUnit(), out.nValue);
+        ExtractDestination(out.script, address);
+        QString amount = BitcoinUnits::format(m_client_model->getOptionsModel()->getDisplayUnit(), out.amount);
         QString address_str = QString::fromStdString(EncodeDestination(address));
         filename_suggestion.append(address_str + "-" + amount);
         first = false;
@@ -167,12 +167,12 @@ void PSBTOperationsDialog::saveTransaction() {
     std::ofstream out{filename.toLocal8Bit().data(), std::ofstream::out | std::ofstream::binary};
     out << ssTx.str();
     out.close();
-    showStatus(tr("PSBT saved to disk."), StatusLevel::INFO);
+    showStatus(tr("PSBT saved to disk."), StatusLevel::Info);
 }
 
 void PSBTOperationsDialog::updateTransactionDisplay() {
-    m_ui->transactionDescription->setText(renderTransaction(m_transaction_data));
-    showTransactionStatus(m_transaction_data);
+    m_ui->transactionDescription->setText(renderTransaction(*m_transaction_data));
+    showTransactionStatus(*m_transaction_data);
 }
 
 QString PSBTOperationsDialog::renderTransaction(const PartiallySignedTransaction &psbtx)
@@ -180,15 +180,15 @@ QString PSBTOperationsDialog::renderTransaction(const PartiallySignedTransaction
     QString tx_description;
     QLatin1String bullet_point(" * ");
     CAmount totalAmount = 0;
-    for (const CTxOut& out : psbtx.tx->vout) {
+    for (const PSBTOutput& out : psbtx.outputs) {
         CTxDestination address;
-        ExtractDestination(out.scriptPubKey, address);
-        totalAmount += out.nValue;
+        ExtractDestination(out.script, address);
+        totalAmount += out.amount;
         tx_description.append(bullet_point).append(tr("Sends %1 to %2")
-            .arg(BitcoinUnits::formatWithUnit(BitcoinUnit::BTC, out.nValue))
+            .arg(BitcoinUnits::formatWithUnit(BitcoinUnit::BTC, out.amount))
             .arg(QString::fromStdString(EncodeDestination(address))));
         // Check if the address is one of ours
-        if (m_wallet_model != nullptr && m_wallet_model->wallet().txoutIsMine(out)) tx_description.append(" (" + tr("own address") + ")");
+        if (m_wallet_model != nullptr && m_wallet_model->wallet().txoutIsMine(CTxOut(out.amount, out.script))) tx_description.append(" (" + tr("own address") + ")");
         tx_description.append("<br>");
     }
 
@@ -228,15 +228,15 @@ QString PSBTOperationsDialog::renderTransaction(const PartiallySignedTransaction
 void PSBTOperationsDialog::showStatus(const QString &msg, StatusLevel level) {
     m_ui->statusBar->setText(msg);
     switch (level) {
-        case StatusLevel::INFO: {
+        case StatusLevel::Info: {
             m_ui->statusBar->setStyleSheet("QLabel { background-color : lightgreen }");
             break;
         }
-        case StatusLevel::WARN: {
+        case StatusLevel::Warn: {
             m_ui->statusBar->setStyleSheet("QLabel { background-color : orange }");
             break;
         }
-        case StatusLevel::ERR: {
+        case StatusLevel::Error: {
             m_ui->statusBar->setStyleSheet("QLabel { background-color : red }");
             break;
         }
@@ -251,7 +251,7 @@ size_t PSBTOperationsDialog::couldSignInputs(const PartiallySignedTransaction &p
 
     size_t n_signed;
     bool complete;
-    const auto err{m_wallet_model->wallet().fillPSBT({.sign = false, .bip32_derivs = false}, &n_signed, m_transaction_data, complete)};
+    const auto err{m_wallet_model->wallet().fillPSBT({.sign = false, .bip32_derivs = false}, &n_signed, *m_transaction_data, complete)};
 
     if (err) {
         return 0;
@@ -265,32 +265,32 @@ void PSBTOperationsDialog::showTransactionStatus(const PartiallySignedTransactio
 
     switch (analysis.next) {
         case PSBTRole::UPDATER: {
-            showStatus(tr("Transaction is missing some information about inputs."), StatusLevel::WARN);
+            showStatus(tr("Transaction is missing some information about inputs."), StatusLevel::Warn);
             break;
         }
         case PSBTRole::SIGNER: {
             QString need_sig_text = tr("Transaction still needs signature(s).");
-            StatusLevel level = StatusLevel::INFO;
+            StatusLevel level = StatusLevel::Info;
             if (!m_wallet_model) {
                 need_sig_text += " " + tr("(But no wallet is loaded.)");
-                level = StatusLevel::WARN;
+                level = StatusLevel::Warn;
             } else if (m_wallet_model->wallet().privateKeysDisabled()) {
                 need_sig_text += " " + tr("(But this wallet cannot sign transactions.)");
-                level = StatusLevel::WARN;
+                level = StatusLevel::Warn;
             } else if (n_could_sign < 1) {
                 need_sig_text += " " + tr("(But this wallet does not have the right keys.)"); // XXX wording
-                level = StatusLevel::WARN;
+                level = StatusLevel::Warn;
             }
             showStatus(need_sig_text, level);
             break;
         }
         case PSBTRole::FINALIZER:
         case PSBTRole::EXTRACTOR: {
-            showStatus(tr("Transaction is fully signed and ready for broadcast."), StatusLevel::INFO);
+            showStatus(tr("Transaction is fully signed and ready for broadcast."), StatusLevel::Info);
             break;
         }
         default: {
-            showStatus(tr("Transaction status is unknown."), StatusLevel::ERR);
+            showStatus(tr("Transaction status is unknown."), StatusLevel::Error);
             break;
         }
     }
diff --git a/depend/bitcoin/src/qt/psbtoperationsdialog.h b/depend/bitcoin/src/qt/psbtoperationsdialog.h
index 55c6ec50..fb6ed685 100644
--- a/depend/bitcoin/src/qt/psbtoperationsdialog.h
+++ b/depend/bitcoin/src/qt/psbtoperationsdialog.h
@@ -35,14 +35,14 @@ public Q_SLOTS:
 
 private:
     Ui::PSBTOperationsDialog* m_ui;
-    PartiallySignedTransaction m_transaction_data;
+    std::optional<PartiallySignedTransaction> m_transaction_data;
     WalletModel* m_wallet_model;
     ClientModel* m_client_model;
 
     enum class StatusLevel {
-        INFO,
-        WARN,
-        ERR
+        Info,
+        Warn,
+        Error
     };
 
     size_t couldSignInputs(const PartiallySignedTransaction &psbtx);
diff --git a/depend/bitcoin/src/qt/qrimagewidget.h b/depend/bitcoin/src/qt/qrimagewidget.h
index 844a6e03..6eb9bed2 100644
--- a/depend/bitcoin/src/qt/qrimagewidget.h
+++ b/depend/bitcoin/src/qt/qrimagewidget.h
@@ -9,12 +9,12 @@
 #include <QLabel>
 
 /* Maximum allowed URI length */
-static const int MAX_URI_LENGTH = 255;
+inline constexpr int MAX_URI_LENGTH = 255;
 
 /* Size of exported QR Code image */
-static constexpr int QR_IMAGE_SIZE = 300;
-static constexpr int QR_IMAGE_TEXT_MARGIN = 10;
-static constexpr int QR_IMAGE_MARGIN = 2 * QR_IMAGE_TEXT_MARGIN;
+inline constexpr int QR_IMAGE_SIZE = 300;
+inline constexpr int QR_IMAGE_TEXT_MARGIN = 10;
+inline constexpr int QR_IMAGE_MARGIN = 2 * QR_IMAGE_TEXT_MARGIN;
 
 QT_BEGIN_NAMESPACE
 class QMenu;
diff --git a/depend/bitcoin/src/qt/qvalidatedlineedit.cpp b/depend/bitcoin/src/qt/qvalidatedlineedit.cpp
index 026ff8d0..665d453b 100644
--- a/depend/bitcoin/src/qt/qvalidatedlineedit.cpp
+++ b/depend/bitcoin/src/qt/qvalidatedlineedit.cpp
@@ -126,3 +126,5 @@ bool QValidatedLineEdit::isValid()
 
     return valid;
 }
+
+#include <moc_qvalidatedlineedit.cpp>
diff --git a/depend/bitcoin/src/qt/recentrequeststablemodel.h b/depend/bitcoin/src/qt/recentrequeststablemodel.h
index 31602b81..c52423be 100644
--- a/depend/bitcoin/src/qt/recentrequeststablemodel.h
+++ b/depend/bitcoin/src/qt/recentrequeststablemodel.h
@@ -20,7 +20,7 @@ class RecentRequestEntry
 public:
     RecentRequestEntry() = default;
 
-    static const int CURRENT_VERSION = 1;
+    static constexpr int CURRENT_VERSION{1};
     int nVersion{RecentRequestEntry::CURRENT_VERSION};
     int64_t id{0};
     QDateTime date;
diff --git a/depend/bitcoin/src/qt/sendcoinsdialog.cpp b/depend/bitcoin/src/qt/sendcoinsdialog.cpp
index 74b93417..7c8c0436 100644
--- a/depend/bitcoin/src/qt/sendcoinsdialog.cpp
+++ b/depend/bitcoin/src/qt/sendcoinsdialog.cpp
@@ -179,13 +179,6 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         connect(ui->groupFee, &QButtonGroup::idClicked, this, &SendCoinsDialog::coinControlUpdateLabels);
 
         connect(ui->customFee, &BitcoinAmountField::valueChanged, this, &SendCoinsDialog::coinControlUpdateLabels);
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
-        connect(ui->optInRBF, &QCheckBox::checkStateChanged, this, &SendCoinsDialog::updateSmartFeeLabel);
-        connect(ui->optInRBF, &QCheckBox::checkStateChanged, this, &SendCoinsDialog::coinControlUpdateLabels);
-#else
-        connect(ui->optInRBF, &QCheckBox::stateChanged, this, &SendCoinsDialog::updateSmartFeeLabel);
-        connect(ui->optInRBF, &QCheckBox::stateChanged, this, &SendCoinsDialog::coinControlUpdateLabels);
-#endif
         CAmount requiredFee = model->wallet().getRequiredFee(1000);
         ui->customFee->SetMinValue(requiredFee);
         if (ui->customFee->value() < requiredFee) {
@@ -195,9 +188,6 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         updateFeeSectionControls();
         updateSmartFeeLabel();
 
-        // set default rbf checkbox state
-        ui->optInRBF->setCheckState(Qt::Checked);
-
         if (model->wallet().hasExternalSigner()) {
             //: "device" usually means a hardware wallet.
             ui->sendButton->setText(tr("Sign on device"));
@@ -360,17 +350,12 @@ bool SendCoinsDialog::PrepareSendText(QString& question_string, QString& informa
         question_string.append("<span style='color:#aa0000; font-weight:bold;'>");
         question_string.append(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee));
         question_string.append("</span><br />");
-
-        // append RBF message according to transaction's signalling
-        question_string.append("<span style='font-size:10pt; font-weight:normal;'>");
-        if (ui->optInRBF->isChecked()) {
-            question_string.append(tr("You can increase the fee later (signals Replace-By-Fee, BIP-125)."));
-        } else {
-            question_string.append(tr("Not signalling Replace-By-Fee, BIP-125."));
-        }
-        question_string.append("</span>");
     }
 
+    // append RBF message
+    question_string.append("<span style='font-size:10pt; font-weight:normal;'>");
+    question_string.append(tr("You can increase the fee later."));
+
     // add total amount in all subdivision units
     question_string.append("<hr />");
     CAmount totalAmount = m_current_transaction->getTotalTransactionAmount() + txFee;
@@ -834,7 +819,6 @@ void SendCoinsDialog::updateCoinControlState()
     // Avoid using global defaults when sending money from the GUI
     // Either custom fee will be used or if not selected, the confirmation target from dropdown box
     m_coin_control->m_confirm_target = getConfTargetForIndex(ui->confTargetSelector->currentIndex());
-    m_coin_control->m_signal_bip125_rbf = ui->optInRBF->isChecked();
 }
 
 void SendCoinsDialog::updateNumberOfBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, SyncType synctype, SynchronizationState sync_state) {
diff --git a/depend/bitcoin/src/qt/sendcoinsentry.cpp b/depend/bitcoin/src/qt/sendcoinsentry.cpp
index 67945726..aa4c07dc 100644
--- a/depend/bitcoin/src/qt/sendcoinsentry.cpp
+++ b/depend/bitcoin/src/qt/sendcoinsentry.cpp
@@ -238,3 +238,5 @@ bool SendCoinsEntry::updateLabel(const QString &address)
 
     return false;
 }
+
+#include <moc_sendcoinsentry.cpp>
diff --git a/depend/bitcoin/src/qt/sendcoinsrecipient.h b/depend/bitcoin/src/qt/sendcoinsrecipient.h
index 496bf689..9cc8fab8 100644
--- a/depend/bitcoin/src/qt/sendcoinsrecipient.h
+++ b/depend/bitcoin/src/qt/sendcoinsrecipient.h
@@ -37,7 +37,7 @@ class SendCoinsRecipient
 
     bool fSubtractFeeFromAmount; // memory only
 
-    static const int CURRENT_VERSION = 1;
+    static constexpr int CURRENT_VERSION{1};
     int nVersion;
 
     SERIALIZE_METHODS(SendCoinsRecipient, obj)
diff --git a/depend/bitcoin/src/qt/test/addressbooktests.cpp b/depend/bitcoin/src/qt/test/addressbooktests.cpp
index 58b8a6d2..fae94ef0 100644
--- a/depend/bitcoin/src/qt/test/addressbooktests.cpp
+++ b/depend/bitcoin/src/qt/test/addressbooktests.cpp
@@ -212,16 +212,5 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
 
 void AddressBookTests::addressBookTests()
 {
-#ifdef Q_OS_MACOS
-    if (QApplication::platformName() == "minimal") {
-        // Disable for mac on "minimal" platform to avoid crashes inside the Qt
-        // framework when it tries to look up unimplemented cocoa functions,
-        // and fails to handle returned nulls
-        // (https://bugreports.qt.io/browse/QTBUG-49686).
-        qWarning() << "Skipping AddressBookTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
-                      "with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.";
-        return;
-    }
-#endif
     TestAddAddressesToSendBook(m_node);
 }
diff --git a/depend/bitcoin/src/qt/test/apptests.cpp b/depend/bitcoin/src/qt/test/apptests.cpp
index 752c8773..7802696d 100644
--- a/depend/bitcoin/src/qt/test/apptests.cpp
+++ b/depend/bitcoin/src/qt/test/apptests.cpp
@@ -54,18 +54,6 @@ void TestRpcCommand(RPCConsole* console)
 //! Entry point for BitcoinApplication tests.
 void AppTests::appTests()
 {
-#ifdef Q_OS_MACOS
-    if (QApplication::platformName() == "minimal") {
-        // Disable for mac on "minimal" platform to avoid crashes inside the Qt
-        // framework when it tries to look up unimplemented cocoa functions,
-        // and fails to handle returned nulls
-        // (https://bugreports.qt.io/browse/QTBUG-49686).
-        qWarning() << "Skipping AppTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
-                      "with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.";
-        return;
-    }
-#endif
-
     qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
     m_app.parameterSetup();
     QVERIFY(m_app.createOptionsModel(/*resetSettings=*/true));
diff --git a/depend/bitcoin/src/qt/test/test_main.cpp b/depend/bitcoin/src/qt/test/test_main.cpp
index 5e91b072..62e132e8 100644
--- a/depend/bitcoin/src/qt/test/test_main.cpp
+++ b/depend/bitcoin/src/qt/test/test_main.cpp
@@ -60,12 +60,18 @@ int main(int argc, char* argv[])
     // Prefer the "minimal" platform for the test instead of the normal default
     // platform ("xcb", "windows", or "cocoa") so tests can't unintentionally
     // interfere with any background GUIs and don't require extra resources.
-    #if defined(WIN32)
-        if (getenv("QT_QPA_PLATFORM") == nullptr) _putenv_s("QT_QPA_PLATFORM", "minimal");
-    #else
-        setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */);
-    #endif
+#if defined(WIN32)
+    if (getenv("QT_QPA_PLATFORM") == nullptr) _putenv_s("QT_QPA_PLATFORM", "minimal");
+#else
+    setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */);
+#endif
 
+#ifdef Q_OS_MACOS
+    // QMacStyle assumes a Cocoa platform window, which the minimal platform
+    // does not provide. In particular, painting a QGroupBox can make Qt call
+    // addSubview: on an invalid native object (QTBUG-49686).
+    setenv("QT_STYLE_OVERRIDE", "fusion", 0 /* overwrite */);
+#endif
 
     QCoreApplication::setOrganizationName(QAPP_ORG_NAME);
     QCoreApplication::setApplicationName(QAPP_APP_NAME_DEFAULT "-test");
diff --git a/depend/bitcoin/src/qt/test/wallettests.cpp b/depend/bitcoin/src/qt/test/wallettests.cpp
index bb9e0618..af620b67 100644
--- a/depend/bitcoin/src/qt/test/wallettests.cpp
+++ b/depend/bitcoin/src/qt/test/wallettests.cpp
@@ -75,17 +75,13 @@ void ConfirmSend(QString* text = nullptr, QMessageBox::StandardButton confirm_ty
 }
 
 //! Send coins to address and return txid.
-Txid SendCoins(CWallet& wallet, SendCoinsDialog& sendCoinsDialog, const CTxDestination& address, CAmount amount, bool rbf,
+Txid SendCoins(CWallet& wallet, SendCoinsDialog& sendCoinsDialog, const CTxDestination& address, CAmount amount,
                   QMessageBox::StandardButton confirm_type = QMessageBox::Yes)
 {
     QVBoxLayout* entries = sendCoinsDialog.findChild<QVBoxLayout*>("entries");
     SendCoinsEntry* entry = qobject_cast<SendCoinsEntry*>(entries->itemAt(0)->widget());
     entry->findChild<QValidatedLineEdit*>("payTo")->setText(QString::fromStdString(EncodeDestination(address)));
     entry->findChild<BitcoinAmountField*>("payAmount")->setValue(amount);
-    sendCoinsDialog.findChild<QFrame*>("frameFee")
-        ->findChild<QFrame*>("frameFeeSelection")
-        ->findChild<QCheckBox*>("optInRBF")
-        ->setCheckState(rbf ? Qt::Checked : Qt::Unchecked);
     Txid txid;
     btcsignals::scoped_connection c(wallet.NotifyTransactionChanged.connect([&txid](const Txid& hash, ChangeType status) {
         if (status == CT_NEW) txid = hash;
@@ -183,7 +179,7 @@ void SyncUpWallet(const std::shared_ptr<CWallet>& wallet, interfaces::Node& node
 {
     WalletRescanReserver reserver(*wallet);
     reserver.reserve();
-    CWallet::ScanResult result = wallet->ScanForWalletTransactions(Params().GetConsensus().hashGenesisBlock, /*start_height=*/0, /*max_height=*/{}, reserver, /*fUpdate=*/true, /*save_progress=*/false);
+    CWallet::ScanResult result = wallet->ScanForWalletTransactions(Params().GetConsensus().hashGenesisBlock, /*start_height=*/0, /*max_height=*/{}, reserver, /*save_progress=*/false);
     QCOMPARE(result.status, CWallet::ScanResult::SUCCESS);
     QCOMPARE(result.last_scanned_block, WITH_LOCK(node.context()->chainman->GetMutex(), return node.context()->chainman->ActiveChain().Tip()->GetBlockHash()));
     QVERIFY(result.last_failed_block.IsNull());
@@ -283,8 +279,8 @@ void TestGUI(interfaces::Node& node, const std::shared_ptr<CWallet>& wallet)
     // Send two transactions, and verify they are added to transaction list.
     TransactionTableModel* transactionTableModel = walletModel.getTransactionTableModel();
     QCOMPARE(transactionTableModel->rowCount({}), 105);
-    Txid txid1 = SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN, /*rbf=*/false);
-    Txid txid2 = SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 10 * COIN, /*rbf=*/true);
+    Txid txid1 = SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN);
+    Txid txid2 = SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 10 * COIN);
     // Transaction table model updates on a QueuedConnection, so process events to ensure it's updated.
     qApp->processEvents();
     QCOMPARE(transactionTableModel->rowCount({}), 107);
@@ -424,16 +420,15 @@ void TestGUIWatchOnly(interfaces::Node& node, TestChain100Setup& test)
     timer.start(500);
 
     // Send tx and verify PSBT copied to the clipboard.
-    SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN, /*rbf=*/false, QMessageBox::Save);
+    SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN, QMessageBox::Save);
     const std::string& psbt_string = QApplication::clipboard()->text().toStdString();
     QVERIFY(!psbt_string.empty());
 
     // Decode psbt
     std::optional<std::vector<unsigned char>> decoded_psbt = DecodeBase64(psbt_string);
     QVERIFY(decoded_psbt);
-    PartiallySignedTransaction psbt;
-    std::string err;
-    QVERIFY(DecodeRawPSBT(psbt, MakeByteSpan(*decoded_psbt), err));
+    util::Result<PartiallySignedTransaction> psbt = DecodeRawPSBT(MakeByteSpan(*decoded_psbt));
+    QVERIFY(psbt);
 }
 
 void TestGUI(interfaces::Node& node)
@@ -460,16 +455,5 @@ void TestGUI(interfaces::Node& node)
 
 void WalletTests::walletTests()
 {
-#ifdef Q_OS_MACOS
-    if (QApplication::platformName() == "minimal") {
-        // Disable for mac on "minimal" platform to avoid crashes inside the Qt
-        // framework when it tries to look up unimplemented cocoa functions,
-        // and fails to handle returned nulls
-        // (https://bugreports.qt.io/browse/QTBUG-49686).
-        qWarning() << "Skipping WalletTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
-                      "with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.";
-        return;
-    }
-#endif
     TestGUI(m_node);
 }
diff --git a/depend/bitcoin/src/qt/transactiondesc.cpp b/depend/bitcoin/src/qt/transactiondesc.cpp
index d9c97d85..6ea0dbbf 100644
--- a/depend/bitcoin/src/qt/transactiondesc.cpp
+++ b/depend/bitcoin/src/qt/transactiondesc.cpp
@@ -14,8 +14,8 @@
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
-#include <logging.h>
 #include <policy/policy.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <cstdint>
@@ -98,9 +98,10 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
 {
     int numBlocks;
     interfaces::WalletTxStatus status;
-    interfaces::WalletOrderForm orderForm;
     bool inMempool;
-    interfaces::WalletTx wtx = wallet.getWalletTxDetails(rec->hash, status, orderForm, inMempool, numBlocks);
+    std::vector<std::string> messages;
+    std::vector<std::string> payment_requests;
+    interfaces::WalletTx wtx = wallet.getWalletTxDetails(rec->hash, status, messages, payment_requests, inMempool, numBlocks);
 
     QString strHTML;
 
@@ -123,11 +124,9 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
     if (wtx.is_coinbase)
     {
         strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>";
-    }
-    else if (wtx.value_map.contains("from") && !wtx.value_map["from"].empty())
-    {
+    } else if (wtx.from) {
         // Online transaction
-        strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.value_map["from"]) + "<br>";
+        strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(*wtx.from) + "<br>";
     }
     else
     {
@@ -157,10 +156,9 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
     //
     // To
     //
-    if (wtx.value_map.contains("to") && !wtx.value_map["to"].empty())
-    {
+    if (wtx.comment_to) {
         // Online transaction
-        std::string strAddress = wtx.value_map["to"];
+        std::string strAddress = *wtx.comment_to;
         strHTML += "<b>" + tr("To") + ":</b> ";
         CTxDestination dest = DecodeDestination(strAddress);
         std::string name;
@@ -212,8 +210,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
                 if (toSelf && all_from_me)
                     continue;
 
-                if (!wtx.value_map.contains("to") || wtx.value_map["to"].empty())
-                {
+                if (!wtx.comment_to) {
                     // Offline transaction
                     CTxDestination address;
                     if (ExtractDestination(txout.scriptPubKey, address))
@@ -273,10 +270,12 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
     //
     // Message
     //
-    if (wtx.value_map.contains("message") && !wtx.value_map["message"].empty())
-        strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.value_map["message"], true) + "<br>";
-    if (wtx.value_map.contains("comment") && !wtx.value_map["comment"].empty())
-        strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.value_map["comment"], true) + "<br>";
+    if (wtx.message) {
+        strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(*wtx.message, true) + "<br>";
+    }
+    if (wtx.comment) {
+        strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(*wtx.comment, true) + "<br>";
+    }
 
     strHTML += "<b>" + tr("Transaction ID") + ":</b> " + rec->getTxHash() + "<br>";
     strHTML += "<b>" + tr("Transaction total size") + ":</b> " + QString::number(wtx.tx->ComputeTotalSize()) + " bytes<br>";
@@ -284,24 +283,19 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
     strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
 
     // Message from normal bitcoin:URI (bitcoin:123...?message=example)
-    for (const std::pair<std::string, std::string>& r : orderForm) {
-        if (r.first == "Message")
-            strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
-
-        //
-        // PaymentRequest info:
-        //
-        if (r.first == "PaymentRequest")
-        {
-            QString merchant;
-            if (!GetPaymentRequestMerchant(r.second, merchant)) {
-                merchant.clear();
-            } else {
-                merchant = tr("%1 (Certificate was not verified)").arg(merchant);
-            }
-            if (!merchant.isNull()) {
-                strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>";
-            }
+    for (const std::string& msg : messages) {
+        strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(msg, true) + "<br>";
+    }
+    // BIP 70 Payment Requests
+    for (const std::string& req : payment_requests) {
+        QString merchant;
+        if (!GetPaymentRequestMerchant(req, merchant)) {
+            merchant.clear();
+        } else {
+            merchant = tr("%1 (Certificate was not verified)").arg(merchant);
+        }
+        if (!merchant.isNull()) {
+            strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>";
         }
     }
 
diff --git a/depend/bitcoin/src/qt/transactionfilterproxy.h b/depend/bitcoin/src/qt/transactionfilterproxy.h
index f8724a9c..ee0dcf98 100644
--- a/depend/bitcoin/src/qt/transactionfilterproxy.h
+++ b/depend/bitcoin/src/qt/transactionfilterproxy.h
@@ -21,7 +21,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel
     explicit TransactionFilterProxy(QObject *parent = nullptr);
 
     /** Type filter bit field (all types) */
-    static const quint32 ALL_TYPES = 0xFFFFFFFF;
+    static constexpr quint32 ALL_TYPES{0xFFFFFFFF};
 
     static quint32 TYPE(int type) { return 1<<type; }
 
diff --git a/depend/bitcoin/src/qt/transactionrecord.cpp b/depend/bitcoin/src/qt/transactionrecord.cpp
index 1143bc35..fdabcf63 100644
--- a/depend/bitcoin/src/qt/transactionrecord.cpp
+++ b/depend/bitcoin/src/qt/transactionrecord.cpp
@@ -32,7 +32,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
     CAmount nDebit = wtx.debit;
     CAmount nNet = nCredit - nDebit;
     Txid hash = wtx.tx->GetHash();
-    std::map<std::string, std::string> mapValue = wtx.value_map;
 
     bool all_from_me = true;
     bool any_from_me = false;
@@ -77,7 +76,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
                 {
                     // Sent to IP, or other non-address transaction like OP_EVAL
                     sub.type = TransactionRecord::SendToOther;
-                    sub.address = mapValue["to"];
+                    sub.address = wtx.comment_to.value_or("");
                 }
 
                 CAmount nValue = txout.nValue;
@@ -112,7 +111,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
                 {
                     // Received by IP connection (deprecated features), or a multisignature or other non-simple transaction
                     sub.type = TransactionRecord::RecvFromOther;
-                    sub.address = mapValue["from"];
+                    sub.address = wtx.from.value_or("");
                 }
                 if (wtx.is_coinbase)
                 {
diff --git a/depend/bitcoin/src/qt/transactionrecord.h b/depend/bitcoin/src/qt/transactionrecord.h
index 7b72ff9b..714c4454 100644
--- a/depend/bitcoin/src/qt/transactionrecord.h
+++ b/depend/bitcoin/src/qt/transactionrecord.h
@@ -73,7 +73,7 @@ class TransactionRecord
     };
 
     /** Number of confirmation recommended for accepting a transaction */
-    static const int RecommendedNumConfirmations = 6;
+    static constexpr int RecommendedNumConfirmations{6};
 
     TransactionRecord():
             hash(), time(0), type(Other), debit(0), credit(0), idx(0)
diff --git a/depend/bitcoin/src/qt/walletcontroller.cpp b/depend/bitcoin/src/qt/walletcontroller.cpp
index 1d6153d4..e3cb713c 100644
--- a/depend/bitcoin/src/qt/walletcontroller.cpp
+++ b/depend/bitcoin/src/qt/walletcontroller.cpp
@@ -23,6 +23,7 @@
 #include <chrono>
 
 #include <QApplication>
+#include <QCheckBox>
 #include <QMessageBox>
 #include <QMetaObject>
 #include <QMutexLocker>
@@ -439,7 +440,7 @@ void RestoreWalletActivity::finish()
     Q_EMIT finished();
 }
 
-void MigrateWalletActivity::do_migrate(const std::string& name)
+void MigrateWalletActivity::do_migrate(const std::string& name, bool load_wallet)
 {
     SecureString passphrase;
     if (node().walletLoader().isEncrypted(name)) {
@@ -450,8 +451,8 @@ void MigrateWalletActivity::do_migrate(const std::string& name)
 
     showProgressDialog(tr("Migrate Wallet"), tr("Migrating Wallet <b>%1</b>…").arg(GUIUtil::HtmlEscape(name)));
 
-    QTimer::singleShot(0, worker(), [this, name, passphrase] {
-        auto res{node().walletLoader().migrateWallet(name, passphrase)};
+    QTimer::singleShot(0, worker(), [this, name, passphrase, load_wallet] {
+        auto res{node().walletLoader().migrateWallet(name, passphrase, load_wallet)};
 
         if (res) {
             m_success_message = tr("The wallet '%1' was migrated successfully.").arg(GUIUtil::HtmlEscape(GUIUtil::WalletDisplayName(name)));
@@ -461,7 +462,12 @@ void MigrateWalletActivity::do_migrate(const std::string& name)
             if (res->solvables_wallet_name) {
                 m_success_message += QChar(' ') + tr("Solvable but not watched scripts have been migrated to a new wallet named '%1'.").arg(GUIUtil::HtmlEscape(GUIUtil::WalletDisplayName(res->solvables_wallet_name.value())));
             }
-            m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(res->wallet));
+            if (load_wallet) {
+                assert(res->wallet);
+                m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(res->wallet));
+            } else {
+                m_success_message += QChar(' ') + tr("The wallet was not loaded after migration. You can open it from the \"File > Open wallet\" menu.");
+            }
         } else {
             m_error_message = util::ErrorString(res);
         }
@@ -482,11 +488,15 @@ void MigrateWalletActivity::migrate(const std::string& name)
                 "The migration process will create a backup of the wallet before migrating. This backup file will be named "
                 "<wallet name>-<timestamp>.legacy.bak and can be found in the directory for this wallet. In the event of "
                 "an incorrect migration, the backup can be restored with the \"Restore Wallet\" functionality."));
+    auto* load_wallet_checkbox = new QCheckBox(tr("Load wallet after migration"), &box);
+    load_wallet_checkbox->setToolTip(tr("If the node is pruned and the wallet was created before the pruned height, the migration process may fail trying to load the migrated wallet."));
+    load_wallet_checkbox->setChecked(true);
+    box.setCheckBox(load_wallet_checkbox);
     box.setStandardButtons(QMessageBox::Yes|QMessageBox::Cancel);
     box.setDefaultButton(QMessageBox::Yes);
     if (box.exec() != QMessageBox::Yes) return;
 
-    do_migrate(name);
+    do_migrate(name, load_wallet_checkbox->isChecked());
 }
 
 void MigrateWalletActivity::restore_and_migrate(const fs::path& path, const std::string& wallet_name)
@@ -523,7 +533,7 @@ void MigrateWalletActivity::restore_and_migrate(const fs::path& path, const std:
             return;
         }
         QTimer::singleShot(0, this, [this, wallet_name] {
-            do_migrate(wallet_name);
+            do_migrate(wallet_name, /*load_wallet=*/true);
         });
     });
 }
diff --git a/depend/bitcoin/src/qt/walletcontroller.h b/depend/bitcoin/src/qt/walletcontroller.h
index 2fb9ccf1..6f807333 100644
--- a/depend/bitcoin/src/qt/walletcontroller.h
+++ b/depend/bitcoin/src/qt/walletcontroller.h
@@ -196,7 +196,7 @@ class MigrateWalletActivity : public WalletControllerActivity
 private:
     QString m_success_message;
 
-    void do_migrate(const std::string& name);
+    void do_migrate(const std::string& name, bool load_wallet);
     void finish();
 };
 
diff --git a/depend/bitcoin/src/qt/walletframe.cpp b/depend/bitcoin/src/qt/walletframe.cpp
index 579c033d..ec5b5123 100644
--- a/depend/bitcoin/src/qt/walletframe.cpp
+++ b/depend/bitcoin/src/qt/walletframe.cpp
@@ -223,15 +223,14 @@ void WalletFrame::gotoLoadPSBT(bool from_clipboard)
         }
     }
 
-    std::string error;
-    PartiallySignedTransaction psbtx;
-    if (!DecodeRawPSBT(psbtx, MakeByteSpan(data), error)) {
-        Q_EMIT message(tr("Error"), tr("Unable to decode PSBT") + "\n" + QString::fromStdString(error), CClientUIInterface::MSG_ERROR);
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeRawPSBT(MakeByteSpan(data));
+    if (!psbt_res) {
+        Q_EMIT message(tr("Error"), tr("Unable to decode PSBT") + "\n" + QString::fromStdString(util::ErrorString(psbt_res).original), CClientUIInterface::MSG_ERROR);
         return;
     }
 
     auto dlg = new PSBTOperationsDialog(this, currentWalletModel(), clientModel);
-    dlg->openWithPSBT(psbtx);
+    dlg->openWithPSBT(*psbt_res);
     GUIUtil::ShowModalDialogAsynchronously(dlg);
 }
 
diff --git a/depend/bitcoin/src/qt/walletmodel.cpp b/depend/bitcoin/src/qt/walletmodel.cpp
index 67a420f5..97f2f426 100644
--- a/depend/bitcoin/src/qt/walletmodel.cpp
+++ b/depend/bitcoin/src/qt/walletmodel.cpp
@@ -238,15 +238,16 @@ void WalletModel::sendCoins(WalletModelTransaction& transaction)
     QByteArray transaction_array; /* store serialized transaction */
 
     {
-        std::vector<std::pair<std::string, std::string>> vOrderForm;
+        std::vector<std::string> messages;
         for (const SendCoinsRecipient &rcp : transaction.getRecipients())
         {
-            if (!rcp.message.isEmpty()) // Message from normal bitcoin:URI (bitcoin:123...?message=example)
-                vOrderForm.emplace_back("Message", rcp.message.toStdString());
+            if (!rcp.message.isEmpty()) { // Message from normal bitcoin:URI (bitcoin:123...?message=example)
+                messages.emplace_back(rcp.message.toStdString());
+            }
         }
 
         auto& newTx = transaction.getWtx();
-        wallet().commitTransaction(newTx, /*value_map=*/{}, std::move(vOrderForm));
+        wallet().commitTransaction(newTx, messages);
 
         DataStream ssTx;
         ssTx << TX_WITH_WITNESS(*newTx);
@@ -464,7 +465,6 @@ WalletModel::UnlockContext::~UnlockContext()
 bool WalletModel::bumpFee(Txid hash, Txid& new_hash)
 {
     CCoinControl coin_control;
-    coin_control.m_signal_bip125_rbf = true;
     std::vector<bilingual_str> errors;
     CAmount old_fee;
     CAmount new_fee;
diff --git a/depend/bitcoin/src/rest.cpp b/depend/bitcoin/src/rest.cpp
index d2c5a9b4..fd40d25b 100644
--- a/depend/bitcoin/src/rest.cpp
+++ b/depend/bitcoin/src/rest.cpp
@@ -37,6 +37,7 @@
 
 #include <univalue.h>
 
+using http_bitcoin::HTTPRequest;
 using node::GetTransaction;
 using node::NodeContext;
 using util::SplitString;
@@ -44,6 +45,12 @@ using util::SplitString;
 static const size_t MAX_GETUTXOS_OUTPOINTS = 15; //allow a max of 15 outpoints to be queried at once
 static constexpr unsigned int MAX_REST_HEADERS_RESULTS = 2000;
 
+// Cache-Control values for REST responses.
+/** Response bytes never change. One-day TTL limits staleness across software upgrades. */
+static constexpr const char* REST_CACHE_IMMUTABLE = "public, immutable, max-age=86400";
+/** Mutable, node-local, or error response; must not be cached. */
+static constexpr const char* REST_CACHE_NO_STORE = "no-store";
+
 static const struct {
     RESTResponseFormat rf;
     const char* name;
@@ -70,6 +77,7 @@ struct CCoin {
 
 static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, std::string message)
 {
+    req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
     req->WriteHeader("Content-Type", "text/plain");
     req->WriteReply(status, message + "\r\n");
     return false;
@@ -241,6 +249,8 @@ static bool rest_headers(const std::any& context,
             ssHeader << pindex->GetBlockHeader();
         }
 
+        // Do not cache because chain extensions and reorgs can affect the response.
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssHeader);
         return true;
@@ -253,6 +263,7 @@ static bool rest_headers(const std::any& context,
         }
 
         std::string strHex = HexStr(ssHeader) + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -263,6 +274,7 @@ static bool rest_headers(const std::any& context,
             jsonHeaders.push_back(blockheaderToJSON(*tip, *pindex, chainman.GetConsensus().powLimit));
         }
         std::string strJSON = jsonHeaders.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -351,6 +363,7 @@ static bool rest_spent_txouts(const std::any& context, HTTPRequest* req, const s
     case RESTResponseFormat::BINARY: {
         DataStream ssSpentResponse{};
         SerializeBlockUndo(ssSpentResponse, block_undo);
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssSpentResponse);
         return true;
@@ -360,6 +373,7 @@ static bool rest_spent_txouts(const std::any& context, HTTPRequest* req, const s
         DataStream ssSpentResponse{};
         SerializeBlockUndo(ssSpentResponse, block_undo);
         const std::string strHex{HexStr(ssSpentResponse) + "\n"};
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -369,6 +383,7 @@ static bool rest_spent_txouts(const std::any& context, HTTPRequest* req, const s
         UniValue result(UniValue::VARR);
         BlockUndoToJSON(block_undo, result);
         std::string strJSON = result.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -437,6 +452,7 @@ static bool rest_block(const std::any& context,
 
     switch (rf) {
     case RESTResponseFormat::BINARY: {
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, *block_data);
         return true;
@@ -444,6 +460,7 @@ static bool rest_block(const std::any& context,
 
     case RESTResponseFormat::HEX: {
         const std::string strHex{HexStr(*block_data) + "\n"};
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -455,6 +472,7 @@ static bool rest_block(const std::any& context,
             SpanReader{*block_data} >> TX_WITH_WITNESS(block);
             UniValue objBlock = blockToJSON(chainman.m_blockman, block, *tip, *pblockindex, *tx_verbosity, chainman.GetConsensus().powLimit);
             std::string strJSON = objBlock.write() + "\n";
+            req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
             req->WriteHeader("Content-Type", "application/json");
             req->WriteReply(HTTP_OK, strJSON);
             return true;
@@ -587,6 +605,8 @@ static bool rest_filter_header(const std::any& context, HTTPRequest* req, const
             ssHeader << header;
         }
 
+        // Do not cache because chain extensions and reorgs can affect the response.
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssHeader);
         return true;
@@ -598,6 +618,7 @@ static bool rest_filter_header(const std::any& context, HTTPRequest* req, const
         }
 
         std::string strHex = HexStr(ssHeader) + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -609,6 +630,7 @@ static bool rest_filter_header(const std::any& context, HTTPRequest* req, const
         }
 
         std::string strJSON = jsonHeaders.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -683,6 +705,7 @@ static bool rest_block_filter(const std::any& context, HTTPRequest* req, const s
         DataStream ssResp{};
         ssResp << filter;
 
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssResp);
         return true;
@@ -692,6 +715,7 @@ static bool rest_block_filter(const std::any& context, HTTPRequest* req, const s
         ssResp << filter;
 
         std::string strHex = HexStr(ssResp) + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -700,6 +724,7 @@ static bool rest_block_filter(const std::any& context, HTTPRequest* req, const s
         UniValue ret(UniValue::VOBJ);
         ret.pushKV("filter", HexStr(filter.GetEncodedFilter()));
         std::string strJSON = ret.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -727,6 +752,7 @@ static bool rest_chaininfo(const std::any& context, HTTPRequest* req, const std:
         jsonRequest.params = UniValue(UniValue::VARR);
         UniValue chainInfoObject = getblockchaininfo().HandleRequest(jsonRequest);
         std::string strJSON = chainInfoObject.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -746,6 +772,7 @@ static bool rest_deploymentinfo(const std::any& context, HTTPRequest* req, const
 
     std::string hash_str;
     const RESTResponseFormat rf = ParseDataFormat(hash_str, str_uri_part);
+    const bool current_tip{hash_str.empty()};
 
     switch (rf) {
     case RESTResponseFormat::JSON: {
@@ -753,7 +780,7 @@ static bool rest_deploymentinfo(const std::any& context, HTTPRequest* req, const
         jsonRequest.context = context;
         jsonRequest.params = UniValue(UniValue::VARR);
 
-        if (!hash_str.empty()) {
+        if (!current_tip) {
             auto hash{uint256::FromHex(hash_str)};
             if (!hash) {
                 return RESTERR(req, HTTP_BAD_REQUEST, "Invalid hash: " + hash_str);
@@ -768,6 +795,7 @@ static bool rest_deploymentinfo(const std::any& context, HTTPRequest* req, const
             jsonRequest.params.push_back(hash_str);
         }
 
+        req->WriteHeader("Cache-Control", current_tip ? REST_CACHE_NO_STORE : REST_CACHE_IMMUTABLE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, getdeploymentinfo().HandleRequest(jsonRequest).write() + "\n");
         return true;
@@ -825,6 +853,7 @@ static bool rest_mempool(const std::any& context, HTTPRequest* req, const std::s
             str_json = MempoolInfoToJSON(*mempool).write() + "\n";
         }
 
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, str_json);
         return true;
@@ -858,12 +887,12 @@ static bool rest_tx(const std::any& context, HTTPRequest* req, const std::string
     if (!tx) {
         return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
     }
-
     switch (rf) {
     case RESTResponseFormat::BINARY: {
         DataStream ssTx;
         ssTx << TX_WITH_WITNESS(tx);
 
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssTx);
         return true;
@@ -874,6 +903,7 @@ static bool rest_tx(const std::any& context, HTTPRequest* req, const std::string
         ssTx << TX_WITH_WITNESS(tx);
 
         std::string strHex = HexStr(ssTx) + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -883,6 +913,7 @@ static bool rest_tx(const std::any& context, HTTPRequest* req, const std::string
         UniValue objTx(UniValue::VOBJ);
         TxToUniv(*tx, /*block_hash=*/hashBlock, /*entry=*/ objTx);
         std::string strJSON = objTx.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -1038,6 +1069,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
         DataStream ssGetUTXOResponse{};
         ssGetUTXOResponse << active_height << active_hash << bitmap << outs;
 
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssGetUTXOResponse);
         return true;
@@ -1048,6 +1080,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
         ssGetUTXOResponse << active_height << active_hash << bitmap << outs;
         std::string strHex = HexStr(ssGetUTXOResponse) + "\n";
 
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -1078,6 +1111,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
 
         // return json string
         std::string strJSON = objGetUTXOResponse.write() + "\n";
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -1116,16 +1150,20 @@ static bool rest_blockhash_by_height(const std::any& context, HTTPRequest* req,
     case RESTResponseFormat::BINARY: {
         DataStream ss_blockhash{};
         ss_blockhash << pblockindex->GetBlockHash();
+        // Do not cache because reorgs can change the response.
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ss_blockhash);
         return true;
     }
     case RESTResponseFormat::HEX: {
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, pblockindex->GetBlockHash().GetHex() + "\n");
         return true;
     }
     case RESTResponseFormat::JSON: {
+        req->WriteHeader("Cache-Control", REST_CACHE_NO_STORE);
         req->WriteHeader("Content-Type", "application/json");
         UniValue resp = UniValue(UniValue::VOBJ);
         resp.pushKV("blockhash", pblockindex->GetBlockHash().GetHex());
diff --git a/depend/bitcoin/src/rpc/blockchain.cpp b/depend/bitcoin/src/rpc/blockchain.cpp
index 14412c90..fc4b4ecc 100644
--- a/depend/bitcoin/src/rpc/blockchain.cpp
+++ b/depend/bitcoin/src/rpc/blockchain.cpp
@@ -33,6 +33,7 @@
 #include <node/utxo_snapshot.h>
 #include <node/warnings.h>
 #include <primitives/transaction.h>
+#include <rpc/rawtransaction_util.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
@@ -743,32 +744,62 @@ static CBlockUndo GetUndoChecked(BlockManager& blockman, const CBlockIndex& bloc
     return blockUndo;
 }
 
-const RPCResult& GetBlockVin()
+static std::vector<RPCResult> GetBlockFields(RPCResult tx_result, std::optional<std::string> elision_msg = std::nullopt)
 {
-    static const RPCResult getblock_vin{
-        RPCResult::Type::ARR, "vin", "",
+    auto fields = std::vector<RPCResult>{
+        {RPCResult::Type::STR_HEX, "hash", "the block hash (same as provided)"},
+        {RPCResult::Type::NUM, "confirmations", "The number of confirmations, or -1 if the block is not on the main chain"},
+        {RPCResult::Type::NUM, "size", "The block size"},
+        {RPCResult::Type::NUM, "strippedsize", "The block size excluding witness data"},
+        {RPCResult::Type::NUM, "weight", "The block weight as defined in BIP 141"},
+        {RPCResult::Type::OBJ, "coinbase_tx", "Coinbase transaction metadata",
         {
-            {RPCResult::Type::OBJ, "", "",
-            {
-                {RPCResult::Type::ELISION, "", "The same output as verbosity = 2"},
-                {RPCResult::Type::OBJ, "prevout", "(Only if undo information is available)",
-                {
-                    {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
-                    {RPCResult::Type::NUM, "height", "The height of the prevout"},
-                    {RPCResult::Type::STR_AMOUNT, "value", "The value in " + CURRENCY_UNIT},
-                    {RPCResult::Type::OBJ, "scriptPubKey", "",
-                    {
-                        {RPCResult::Type::STR, "asm", "Disassembly of the output script"},
-                        {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
-                        {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"},
-                        {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
-                        {RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"},
-                    }},
-                }},
-            }},
-        }
+            {RPCResult::Type::NUM, "version", "The coinbase transaction version"},
+            {RPCResult::Type::NUM, "locktime", "The coinbase transaction's locktime (nLockTime)"},
+            {RPCResult::Type::NUM, "sequence", "The coinbase input's sequence number (nSequence)"},
+            {RPCResult::Type::STR_HEX, "coinbase", "The coinbase input's script"},
+            {RPCResult::Type::STR_HEX, "witness", /*optional=*/true, "The coinbase input's first (and only) witness stack element, if present"},
+        }},
+        {RPCResult::Type::NUM, "height", "The block height or index"},
+        {RPCResult::Type::NUM, "version", "The block version"},
+        {RPCResult::Type::STR_HEX, "versionHex", "The block version formatted in hexadecimal"},
+        {RPCResult::Type::STR_HEX, "merkleroot", "The merkle root"},
     };
-    return getblock_vin;
+    fields.push_back(std::move(tx_result));
+    fields.emplace_back(RPCResult::Type::NUM_TIME, "time", "The block time expressed in " + UNIX_EPOCH_TIME);
+    fields.emplace_back(RPCResult::Type::NUM_TIME, "mediantime", "The median block time expressed in " + UNIX_EPOCH_TIME);
+    fields.emplace_back(RPCResult::Type::NUM, "nonce", "The nonce");
+    fields.emplace_back(RPCResult::Type::STR_HEX, "bits", "nBits: compact representation of the block difficulty target");
+    fields.emplace_back(RPCResult::Type::STR_HEX, "target", "The difficulty target");
+    fields.emplace_back(RPCResult::Type::NUM, "difficulty", "The difficulty");
+    fields.emplace_back(RPCResult::Type::STR_HEX, "chainwork", "Expected number of hashes required to produce the chain up to this block (in hex)");
+    fields.emplace_back(RPCResult::Type::NUM, "nTx", "The number of transactions in the block");
+    fields.emplace_back(RPCResult::Type::STR_HEX, "previousblockhash", /*optional=*/true, "The hash of the previous block (if available)");
+    fields.emplace_back(RPCResult::Type::STR_HEX, "nextblockhash", /*optional=*/true, "The hash of the next block (if available)");
+    if (elision_msg) {
+        // Elide all block-level fields except the tx array (which differs per verbosity)
+        std::vector<RPCResult> new_fields;
+        new_fields.reserve(fields.size());
+        bool first = true;
+        for (const auto& f : fields) {
+            if (f.m_key_name == "tx") {
+                new_fields.push_back(f);
+                continue;
+            }
+            if (first) {
+                RPCResultOptions eopts = f.m_opts;
+                eopts.print_elision = *elision_msg;
+                new_fields.emplace_back(f, std::move(eopts));
+                first = false;
+            } else {
+                RPCResultOptions eopts = f.m_opts;
+                eopts.print_elision = HelpElisionSkip{};
+                new_fields.emplace_back(f, std::move(eopts));
+            }
+        }
+        fields = std::move(new_fields);
+    }
+    return fields;
 }
 
 static RPCMethod getblock()
@@ -785,67 +816,33 @@ static RPCMethod getblock()
                      RPCArgOptions{.skip_type_check = true}},
                 },
                 {
-                    RPCResult{"for verbosity = 0",
-                RPCResult::Type::STR_HEX, "", "A string that is serialized, hex-encoded data for block 'hash'"},
-                    RPCResult{"for verbosity = 1",
-                RPCResult::Type::OBJ, "", "",
-                {
-                    {RPCResult::Type::STR_HEX, "hash", "the block hash (same as provided)"},
-                    {RPCResult::Type::NUM, "confirmations", "The number of confirmations, or -1 if the block is not on the main chain"},
-                    {RPCResult::Type::NUM, "size", "The block size"},
-                    {RPCResult::Type::NUM, "strippedsize", "The block size excluding witness data"},
-                    {RPCResult::Type::NUM, "weight", "The block weight as defined in BIP 141"},
-                    {RPCResult::Type::OBJ, "coinbase_tx", "Coinbase transaction metadata",
-                    {
-                        {RPCResult::Type::NUM, "version", "The coinbase transaction version"},
-                        {RPCResult::Type::NUM, "locktime", "The coinbase transaction's locktime (nLockTime)"},
-                        {RPCResult::Type::NUM, "sequence", "The coinbase input's sequence number (nSequence)"},
-                        {RPCResult::Type::STR_HEX, "coinbase", "The coinbase input's script"},
-                        {RPCResult::Type::STR_HEX, "witness", /*optional=*/true, "The coinbase input's first (and only) witness stack element, if present"},
-                    }},
-                    {RPCResult::Type::NUM, "height", "The block height or index"},
-                    {RPCResult::Type::NUM, "version", "The block version"},
-                    {RPCResult::Type::STR_HEX, "versionHex", "The block version formatted in hexadecimal"},
-                    {RPCResult::Type::STR_HEX, "merkleroot", "The merkle root"},
-                    {RPCResult::Type::ARR, "tx", "The transaction ids",
-                        {{RPCResult::Type::STR_HEX, "", "The transaction id"}}},
-                    {RPCResult::Type::NUM_TIME, "time",       "The block time expressed in " + UNIX_EPOCH_TIME},
-                    {RPCResult::Type::NUM_TIME, "mediantime", "The median block time expressed in " + UNIX_EPOCH_TIME},
-                    {RPCResult::Type::NUM, "nonce", "The nonce"},
-                    {RPCResult::Type::STR_HEX, "bits", "nBits: compact representation of the block difficulty target"},
-                    {RPCResult::Type::STR_HEX, "target", "The difficulty target"},
-                    {RPCResult::Type::NUM, "difficulty", "The difficulty"},
-                    {RPCResult::Type::STR_HEX, "chainwork", "Expected number of hashes required to produce the chain up to this block (in hex)"},
-                    {RPCResult::Type::NUM, "nTx", "The number of transactions in the block"},
-                    {RPCResult::Type::STR_HEX, "previousblockhash", /*optional=*/true, "The hash of the previous block (if available)"},
-                    {RPCResult::Type::STR_HEX, "nextblockhash", /*optional=*/true, "The hash of the next block (if available)"},
-                }},
-                    RPCResult{"for verbosity = 2",
-                RPCResult::Type::OBJ, "", "",
-                {
-                    {RPCResult::Type::ELISION, "", "Same output as verbosity = 1"},
-                    {RPCResult::Type::ARR, "tx", "",
-                    {
-                        {RPCResult::Type::OBJ, "", "",
+                    RPCResult{"for verbosity = 0", RPCResult::Type::STR_HEX, "", "A string that is serialized, hex-encoded data for block 'hash'"},
+                    RPCResult{"for verbosity = 1", RPCResult::Type::OBJ, "", "",
+                        GetBlockFields({RPCResult::Type::ARR, "tx", "The transaction ids",
+                            {{RPCResult::Type::STR_HEX, "", "The transaction id"}}})},
+                    RPCResult{"for verbosity = 2", RPCResult::Type::OBJ, "", "",
+                        GetBlockFields({RPCResult::Type::ARR, "tx", "",
                         {
-                            {RPCResult::Type::ELISION, "", "The transactions in the format of the getrawtransaction RPC. Different from verbosity = 1 \"tx\" result"},
-                            {RPCResult::Type::NUM, "fee", /*optional=*/true, "The transaction fee in " + CURRENCY_UNIT + ", omitted if block undo data is not available"},
-                        }},
-                    }},
-                }},
-                    RPCResult{"for verbosity = 3",
-                RPCResult::Type::OBJ, "", "",
-                {
-                    {RPCResult::Type::ELISION, "", "Same output as verbosity = 2"},
-                    {RPCResult::Type::ARR, "tx", "",
-                    {
-                        {RPCResult::Type::OBJ, "", "",
+                            {RPCResult::Type::OBJ, "", "",
+                                TxDoc({.elision_mode = ElisionMode::WithSummary,
+                                       .elision_summary = "The transactions in the format of the getrawtransaction RPC. Different from verbosity = 1 \"tx\" result",
+                                       .fee = true, .hex = true,
+                                       .fee_doc = "The transaction fee in " + CURRENCY_UNIT + ", omitted if block undo data is not available"})},
+                        }}, /*elision_msg=*/"Same output as verbosity = 1")},
+                    RPCResult{"for verbosity = 3", RPCResult::Type::OBJ, "", "",
+                        GetBlockFields({RPCResult::Type::ARR, "tx", "",
                         {
-                            GetBlockVin(),
-                        }},
-                    }},
-                }},
-        },
+                            {RPCResult::Type::OBJ, "", "",
+                                TxDoc({.elision_mode = ElisionMode::Silent,
+                                       .prevout = true,
+                                       .prevout_optional = true,
+                                       .fee = true,
+                                       .hex = true,
+                                       .vin_item_doc = "",
+                                       .prevout_doc = "(Only if undo information is available)",
+                                       .vin_inner_elision = "The same output as verbosity = 2"})},
+                        }}, /*elision_msg=*/"Same output as verbosity = 2")},
+                },
                 RPCExamples{
                     HelpExampleCli("getblock", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
             + HelpExampleRpc("getblock", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
@@ -995,7 +992,7 @@ CoinStatsHashType ParseHashType(std::string_view hash_type_input)
  *
  * @param[in] index_requested Signals if the coinstatsindex should be used (when available).
  */
-static std::optional<kernel::CCoinsStats> GetUTXOStats(CCoinsView* view, node::BlockManager& blockman,
+static std::optional<kernel::CCoinsStats> GetUTXOStats(const CCoinsViewDB& view, node::BlockManager& blockman,
                                                        kernel::CoinStatsHashType hash_type,
                                                        const std::function<void()>& interruption_point = {},
                                                        const CBlockIndex* pindex = nullptr,
@@ -1006,7 +1003,7 @@ static std::optional<kernel::CCoinsStats> GetUTXOStats(CCoinsView* view, node::B
         if (pindex) {
             return g_coin_stats_index->LookUpStats(*pindex);
         } else {
-            CBlockIndex& block_index = *CHECK_NONFATAL(WITH_LOCK(::cs_main, return blockman.LookupBlockIndex(view->GetBestBlock())));
+            CBlockIndex& block_index = *CHECK_NONFATAL(WITH_LOCK(::cs_main, return blockman.LookupBlockIndex(view.GetBestBlock())));
             return g_coin_stats_index->LookUpStats(block_index);
         }
     }
@@ -1015,7 +1012,7 @@ static std::optional<kernel::CCoinsStats> GetUTXOStats(CCoinsView* view, node::B
     // pindex should either be null or equal to the view's best block. This is
     // because without the coinstats index we can only get coinstats about the
     // best block.
-    CHECK_NONFATAL(!pindex || pindex->GetBlockHash() == view->GetBestBlock());
+    CHECK_NONFATAL(!pindex || pindex->GetBlockHash() == view.GetBestBlock());
 
     return kernel::ComputeUTXOStats(hash_type, view, blockman, interruption_point);
 }
@@ -1086,13 +1083,8 @@ static RPCMethod gettxoutsetinfo()
     Chainstate& active_chainstate = chainman.ActiveChainstate();
     active_chainstate.ForceFlushStateToDisk(/*wipe_cache=*/false);
 
-    CCoinsView* coins_view;
-    BlockManager* blockman;
-    {
-        LOCK(::cs_main);
-        coins_view = &active_chainstate.CoinsDB();
-        blockman = &active_chainstate.m_blockman;
-    }
+    const CCoinsViewDB& coins_view{WITH_LOCK(::cs_main, return active_chainstate.CoinsDB())};
+    BlockManager& blockman{active_chainstate.m_blockman};
 
     const CBlockIndex* pindex{nullptr};
     if (!request.params[1].isNull()) {
@@ -1122,7 +1114,7 @@ static RPCMethod gettxoutsetinfo()
         }
     }
 
-    const std::optional<CCoinsStats> maybe_stats = GetUTXOStats(coins_view, *blockman, hash_type, node.rpc_interruption_point, pindex, index_requested);
+    const std::optional<CCoinsStats> maybe_stats = GetUTXOStats(coins_view, blockman, hash_type, node.rpc_interruption_point, pindex, index_requested);
     if (maybe_stats.has_value()) {
         const CCoinsStats& stats = maybe_stats.value();
         ret.pushKV("height", stats.nHeight);
@@ -1143,8 +1135,8 @@ static RPCMethod gettxoutsetinfo()
         } else {
             CCoinsStats prev_stats{};
             if (stats.nHeight > 0) {
-                const CBlockIndex& block_index = *CHECK_NONFATAL(WITH_LOCK(::cs_main, return blockman->LookupBlockIndex(stats.hashBlock)));
-                const std::optional<CCoinsStats> maybe_prev_stats = GetUTXOStats(coins_view, *blockman, hash_type, node.rpc_interruption_point, block_index.pprev, index_requested);
+                const CBlockIndex& block_index = *CHECK_NONFATAL(WITH_LOCK(::cs_main, return blockman.LookupBlockIndex(stats.hashBlock)));
+                const std::optional<CCoinsStats> maybe_prev_stats = GetUTXOStats(coins_view, blockman, hash_type, node.rpc_interruption_point, block_index.pprev, index_requested);
                 if (!maybe_prev_stats) {
                     throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
                 }
@@ -2416,7 +2408,8 @@ static RPCMethod scantxoutset()
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Scan already in progress, use action \"abort\" or \"status\"");
         }
 
-        if (request.params.size() < 2) {
+        const UniValue* scanobjects = self.MaybeArg<UniValue>("scanobjects");
+        if (!scanobjects) {
             throw JSONRPCError(RPC_MISC_ERROR, "scanobjects argument is required for the start action");
         }
 
@@ -2425,7 +2418,7 @@ static RPCMethod scantxoutset()
         CAmount total_in = 0;
 
         // loop through the scan objects
-        for (const UniValue& scanobject : request.params[1].get_array().getValues()) {
+        for (const UniValue& scanobject : scanobjects->get_array().getValues()) {
             FlatSigningProvider provider;
             auto scripts = EvalDescriptorStringOrObject(scanobject, provider);
             for (CScript& script : scripts) {
@@ -2449,7 +2442,7 @@ static RPCMethod scantxoutset()
             LOCK(cs_main);
             Chainstate& active_chainstate = chainman.ActiveChainstate();
             active_chainstate.ForceFlushStateToDisk(/*wipe_cache=*/false);
-            pcursor = CHECK_NONFATAL(active_chainstate.CoinsDB().Cursor());
+            pcursor = active_chainstate.CoinsDB().Cursor();
             tip = CHECK_NONFATAL(active_chainstate.m_chain.Tip());
         }
         bool res = FindScriptPubKey(g_scan_progress, g_should_abort_scan, count, pcursor.get(), needles, coins, node.rpc_interruption_point);
@@ -2612,6 +2605,10 @@ static RPCMethod scanblocks()
         if (!reserver.reserve()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Scan already in progress, use action \"abort\" or \"status\"");
         }
+        const UniValue* scanobjects = self.MaybeArg<UniValue>("scanobjects");
+        if (!scanobjects) {
+            throw JSONRPCError(RPC_MISC_ERROR, "scanobjects argument is required for the start action");
+        }
         auto filtertype_name{self.Arg<std::string_view>("filtertype")};
 
         BlockFilterType filtertype;
@@ -2656,7 +2653,7 @@ static RPCMethod scanblocks()
 
         // loop through the scan objects, add scripts to the needle_set
         GCSFilter::ElementSet needle_set;
-        for (const UniValue& scanobject : request.params[1].get_array().getValues()) {
+        for (const UniValue& scanobject : scanobjects->get_array().getValues()) {
             FlatSigningProvider provider;
             std::vector<CScript> scripts = EvalDescriptorStringOrObject(scanobject, provider);
             for (const CScript& script : scripts) {
@@ -3326,7 +3323,7 @@ UniValue CreateRolledBackUTXOSnapshot(
     rollback_cache.Flush();
 
     LogInfo("Rollback complete. Computing UTXO statistics for created txoutset dump.");
-    std::optional<CCoinsStats> maybe_stats = GetUTXOStats(temp_db.get(),
+    std::optional<CCoinsStats> maybe_stats = GetUTXOStats(*temp_db,
                                                           chainstate.m_blockman,
                                                           CoinStatsHashType::HASH_SERIALIZED,
                                                           node.rpc_interruption_point);
@@ -3336,9 +3333,6 @@ UniValue CreateRolledBackUTXOSnapshot(
     }
 
     std::unique_ptr<CCoinsViewCursor> pcursor{temp_db->Cursor()};
-    if (!pcursor) {
-        throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to create UTXO cursor");
-    }
 
     LogInfo("Writing snapshot to disk.");
     return WriteUTXOSnapshot(chainstate,
@@ -3377,7 +3371,7 @@ PrepareUTXOSnapshot(
 
         chainstate.ForceFlushStateToDisk(/*wipe_cache=*/false);
 
-        maybe_stats = GetUTXOStats(&chainstate.CoinsDB(), chainstate.m_blockman, CoinStatsHashType::HASH_SERIALIZED, interruption_point);
+        maybe_stats = GetUTXOStats(chainstate.CoinsDB(), chainstate.m_blockman, CoinStatsHashType::HASH_SERIALIZED, interruption_point);
         if (!maybe_stats) {
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
         }
diff --git a/depend/bitcoin/src/rpc/blockchain.h b/depend/bitcoin/src/rpc/blockchain.h
index 45f62c62..1b7c34d9 100644
--- a/depend/bitcoin/src/rpc/blockchain.h
+++ b/depend/bitcoin/src/rpc/blockchain.h
@@ -27,7 +27,7 @@ class BlockManager;
 struct NodeContext;
 } // namespace node
 
-static constexpr int NUM_GETBLOCKSTATS_PERCENTILES = 5;
+inline constexpr int NUM_GETBLOCKSTATS_PERCENTILES = 5;
 
 /**
  * Get the difficulty of the net wrt to the given block index.
diff --git a/depend/bitcoin/src/rpc/client.cpp b/depend/bitcoin/src/rpc/client.cpp
index 8d3e551d..6add22db 100644
--- a/depend/bitcoin/src/rpc/client.cpp
+++ b/depend/bitcoin/src/rpc/client.cpp
@@ -208,6 +208,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "walletcreatefundedpsbt", 3, "max_tx_weight"},
     { "walletcreatefundedpsbt", 4, "bip32derivs" },
     { "walletcreatefundedpsbt", 5, "version" },
+    { "walletcreatefundedpsbt", 6, "psbt_version" },
     { "walletprocesspsbt", 0, "psbt", ParamFormat::STRING },
     { "walletprocesspsbt", 1, "sign" },
     { "walletprocesspsbt", 2, "sighashtype", ParamFormat::STRING },
@@ -223,12 +224,14 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "createpsbt", 2, "locktime" },
     { "createpsbt", 3, "replaceable" },
     { "createpsbt", 4, "version" },
+    { "createpsbt", 5, "psbt_version" },
     { "combinepsbt", 0, "txs"},
     { "joinpsbts", 0, "txs"},
     { "finalizepsbt", 0, "psbt", ParamFormat::STRING },
     { "finalizepsbt", 1, "extract"},
     { "converttopsbt", 1, "permitsigdata"},
     { "converttopsbt", 2, "iswitness"},
+    { "converttopsbt", 3, "psbt_version"},
     { "gettxout", 1, "n" },
     { "gettxout", 2, "include_mempool" },
     { "gettxoutproof", 0, "txids" },
@@ -328,12 +331,16 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "psbtbumpfee", 1, "replaceable"},
     { "psbtbumpfee", 1, "outputs"},
     { "psbtbumpfee", 1, "original_change_index"},
+    { "psbtbumpfee", 1, "psbt_version"},
     { "logging", 0, "include" },
     { "logging", 1, "exclude" },
     { "disconnectnode", 1, "nodeid" },
+    { "getopenrpcinfo", 0, "show_hidden" },
     { "gethdkeys", 0, "active_only" },
     { "gethdkeys", 0, "options" },
     { "gethdkeys", 0, "private" },
+    { "derivehdkey", 1, "options" },
+    { "derivehdkey", 1, "private" },
     { "createwalletdescriptor", 1, "options" },
     { "createwalletdescriptor", 1, "internal" },
     // Echo with conversion (For testing only)
@@ -384,6 +391,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "loadtxoutset", 0, "path", ParamFormat::STRING },
     { "migratewallet", 0, "wallet_name", ParamFormat::STRING },
     { "migratewallet", 1, "passphrase", ParamFormat::STRING },
+    { "migratewallet", 2, "load_wallet"},
     { "setlabel", 1, "label", ParamFormat::STRING },
     { "signmessage", 1, "message", ParamFormat::STRING },
     { "signmessagewithprivkey", 1, "message", ParamFormat::STRING },
diff --git a/depend/bitcoin/src/rpc/external_signer.cpp b/depend/bitcoin/src/rpc/external_signer.cpp
index 08226ffb..bc10a9c2 100644
--- a/depend/bitcoin/src/rpc/external_signer.cpp
+++ b/depend/bitcoin/src/rpc/external_signer.cpp
@@ -20,7 +20,7 @@
 static RPCMethod enumeratesigners()
 {
     return RPCMethod{"enumeratesigners",
-        "Returns a list of external signers from -signer.",
+        "Returns a list of external signers from -signer. Signers with duplicate master key fingerprints are skipped.",
         {},
         RPCResult{
             RPCResult::Type::OBJ, "", "",
@@ -30,7 +30,7 @@ static RPCMethod enumeratesigners()
                     {RPCResult::Type::OBJ, "", "",
                     {
                         {RPCResult::Type::STR_HEX, "fingerprint", "Master key fingerprint"},
-                        {RPCResult::Type::STR, "name", "Device name"},
+                        {RPCResult::Type::STR, "name", "Device name, the model returned by the signer"},
                     }},
                 },
                 }
diff --git a/depend/bitcoin/src/rpc/fees.cpp b/depend/bitcoin/src/rpc/fees.cpp
index b1982669..450af530 100644
--- a/depend/bitcoin/src/rpc/fees.cpp
+++ b/depend/bitcoin/src/rpc/fees.cpp
@@ -94,6 +94,35 @@ static RPCMethod estimatesmartfee()
     };
 }
 
+static std::vector<RPCResult> FeeRateBucketDoc(bool elide = false)
+{
+    auto fields = std::vector<RPCResult>{
+        {RPCResult::Type::NUM, "startrange", "start of feerate range"},
+        {RPCResult::Type::NUM, "endrange", "end of feerate range"},
+        {RPCResult::Type::NUM, "withintarget", "number of txs over history horizon in the feerate range that were confirmed within target"},
+        {RPCResult::Type::NUM, "totalconfirmed", "number of txs over history horizon in the feerate range that were confirmed at any point"},
+        {RPCResult::Type::NUM, "inmempool", "current number of txs in mempool in the feerate range unconfirmed for at least target blocks"},
+        {RPCResult::Type::NUM, "leftmempool", "number of txs over history horizon in the feerate range that left mempool unconfirmed after target"},
+    };
+    return elide ? ElideGroup(std::move(fields)) : fields;
+}
+
+static std::vector<RPCResult> FeeEstimateHorizonDoc(bool elide = false)
+{
+    auto fields = std::vector<RPCResult>{
+        {RPCResult::Type::NUM, "feerate", /*optional=*/true, "estimate fee rate in " + CURRENCY_UNIT + "/kvB"},
+        {RPCResult::Type::NUM, "decay", "exponential decay (per block) for historical moving average of confirmation data"},
+        {RPCResult::Type::NUM, "scale", "The resolution of confirmation targets at this time horizon"},
+        {RPCResult::Type::OBJ, "pass", /*optional=*/true, "information about the lowest range of feerates to succeed in meeting the threshold", FeeRateBucketDoc()},
+        {RPCResult::Type::OBJ, "fail", /*optional=*/true, "information about the highest range of feerates to fail to meet the threshold", FeeRateBucketDoc(/*elide=*/true)},
+        {RPCResult::Type::ARR, "errors", /*optional=*/true, "Errors encountered during processing (if there are any)",
+        {
+            {RPCResult::Type::STR, "error", ""},
+        }},
+    };
+    return elide ? ElideGroup(std::move(fields)) : fields;
+}
+
 static RPCMethod estimaterawfee()
 {
     return RPCMethod{
@@ -115,36 +144,11 @@ static RPCMethod estimaterawfee()
             RPCResult::Type::OBJ, "", "Results are returned for any horizon which tracks blocks up to the confirmation target",
             {
                 {RPCResult::Type::OBJ, "short", /*optional=*/true, "estimate for short time horizon",
-                    {
-                        {RPCResult::Type::NUM, "feerate", /*optional=*/true, "estimate fee rate in " + CURRENCY_UNIT + "/kvB"},
-                        {RPCResult::Type::NUM, "decay", "exponential decay (per block) for historical moving average of confirmation data"},
-                        {RPCResult::Type::NUM, "scale", "The resolution of confirmation targets at this time horizon"},
-                        {RPCResult::Type::OBJ, "pass", /*optional=*/true, "information about the lowest range of feerates to succeed in meeting the threshold",
-                        {
-                                {RPCResult::Type::NUM, "startrange", "start of feerate range"},
-                                {RPCResult::Type::NUM, "endrange", "end of feerate range"},
-                                {RPCResult::Type::NUM, "withintarget", "number of txs over history horizon in the feerate range that were confirmed within target"},
-                                {RPCResult::Type::NUM, "totalconfirmed", "number of txs over history horizon in the feerate range that were confirmed at any point"},
-                                {RPCResult::Type::NUM, "inmempool", "current number of txs in mempool in the feerate range unconfirmed for at least target blocks"},
-                                {RPCResult::Type::NUM, "leftmempool", "number of txs over history horizon in the feerate range that left mempool unconfirmed after target"},
-                        }},
-                        {RPCResult::Type::OBJ, "fail", /*optional=*/true, "information about the highest range of feerates to fail to meet the threshold",
-                        {
-                            {RPCResult::Type::ELISION, "", ""},
-                        }},
-                        {RPCResult::Type::ARR, "errors", /*optional=*/true, "Errors encountered during processing (if there are any)",
-                        {
-                            {RPCResult::Type::STR, "error", ""},
-                        }},
-                }},
+                    FeeEstimateHorizonDoc()},
                 {RPCResult::Type::OBJ, "medium", /*optional=*/true, "estimate for medium time horizon",
-                {
-                    {RPCResult::Type::ELISION, "", ""},
-                }},
+                    FeeEstimateHorizonDoc(/*elide=*/true)},
                 {RPCResult::Type::OBJ, "long", /*optional=*/true, "estimate for long time horizon",
-                {
-                    {RPCResult::Type::ELISION, "", ""},
-                }},
+                    FeeEstimateHorizonDoc(/*elide=*/true)},
             }},
         RPCExamples{
             HelpExampleCli("estimaterawfee", "6 0.9")
diff --git a/depend/bitcoin/src/rpc/mempool.cpp b/depend/bitcoin/src/rpc/mempool.cpp
index 98450b90..0dd35561 100644
--- a/depend/bitcoin/src/rpc/mempool.cpp
+++ b/depend/bitcoin/src/rpc/mempool.cpp
@@ -32,6 +32,7 @@
 #include <util/vector.h>
 
 #include <map>
+#include <ranges>
 #include <string_view>
 #include <utility>
 
@@ -60,6 +61,9 @@ static RPCMethod sendrawtransaction()
         "dedicated, short-lived connections to Tor or I2P peers or IPv4/IPv6 peers\n"
         "via the Tor network. This conceals the transaction's origin. The transaction\n"
         "will only enter the local mempool when it is received back from the network.\n"
+        "The private broadcast queue is bounded: when it is full, this RPC fails and\n"
+        "the transaction is not scheduled, until an existing one completes or is\n"
+        "aborted. Use getprivatebroadcastinfo to inspect the queue and abortprivatebroadcast to abort.\n"
 
         "\nA specific exception, RPC_TRANSACTION_ALREADY_IN_UTXO_SET, may throw if the transaction cannot be added to the mempool.\n"
 
@@ -143,7 +147,9 @@ static RPCMethod getprivatebroadcastinfo()
 {
     return RPCMethod{
         "getprivatebroadcastinfo",
-        "Returns information about transactions that are currently being privately broadcast.\n",
+        "Returns information about transactions tracked for private broadcast.\n"
+        "Transactions that have reached the send-attempt limit remain in the result with attempts_remaining=0.\n"
+        "This method is only available when running with -privatebroadcast enabled.\n",
         {},
         RPCResult{
             RPCResult::Type::OBJ, "", "",
@@ -156,6 +162,7 @@ static RPCMethod getprivatebroadcastinfo()
                                 {RPCResult::Type::STR_HEX, "wtxid", "The transaction witness hash in hex"},
                                 {RPCResult::Type::STR_HEX, "hex", "The serialized, hex-encoded transaction data"},
                                 {RPCResult::Type::NUM_TIME, "time_added", "The time this transaction was added to the private broadcast queue (seconds since epoch)"},
+                                {RPCResult::Type::NUM, "attempts_remaining", "The number of additional private broadcast send attempts allowed for this transaction"},
                                 {RPCResult::Type::ARR, "peers", "Per-peer send and acknowledgment information for this transaction",
                                     {
                                         {RPCResult::Type::OBJ, "", "",
@@ -176,6 +183,10 @@ static RPCMethod getprivatebroadcastinfo()
         {
             const NodeContext& node{EnsureAnyNodeContext(request.context)};
             const PeerManager& peerman{EnsurePeerman(node)};
+            if (!peerman.GetInfo().private_broadcast) {
+                throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Private broadcast is not enabled. Ensure you're running Bitcoin Core with -privatebroadcast=1.");
+            }
+
             const auto txs{peerman.GetPrivateBroadcastInfo()};
 
             UniValue transactions(UniValue::VARR);
@@ -185,6 +196,7 @@ static RPCMethod getprivatebroadcastinfo()
                 o.pushKV("wtxid", tx_info.tx->GetWitnessHash().ToString());
                 o.pushKV("hex", EncodeHexTx(*tx_info.tx));
                 o.pushKV("time_added", TicksSinceEpoch<std::chrono::seconds>(tx_info.time_added));
+                o.pushKV("attempts_remaining", tx_info.attempts_remaining);
                 UniValue peers(UniValue::VARR);
                 for (const auto& peer : tx_info.peers) {
                     UniValue p(UniValue::VOBJ);
@@ -211,7 +223,8 @@ static RPCMethod abortprivatebroadcast()
     return RPCMethod{
         "abortprivatebroadcast",
         "Abort private broadcast attempts for a transaction currently being privately broadcast.\n"
-        "The transaction will be removed from the private broadcast queue.\n",
+        "The transaction will be removed from the private broadcast queue.\n"
+        "This method is only available when running with -privatebroadcast enabled.\n",
         {
             {"id", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "A transaction identifier to abort. It will be matched against both txid and wtxid for all transactions in the private broadcast queue.\n"
                                                                 "If the provided id matches a txid that corresponds to multiple transactions with different wtxids, multiple transactions will be removed and returned."},
@@ -236,10 +249,14 @@ static RPCMethod abortprivatebroadcast()
         },
         [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
-            const uint256 id{ParseHashV(self.Arg<UniValue>("id"), "id")};
 
             const NodeContext& node{EnsureAnyNodeContext(request.context)};
             PeerManager& peerman{EnsurePeerman(node)};
+            if (!peerman.GetInfo().private_broadcast) {
+                throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Private broadcast is not enabled. Ensure you're running Bitcoin Core with -privatebroadcast=1.");
+            }
+
+            const uint256 id{ParseHashV(self.Arg<UniValue>("id"), "id")};
 
             const auto removed_txs{peerman.AbortPrivateBroadcast(id)};
             if (removed_txs.empty()) {
@@ -293,7 +310,11 @@ static RPCMethod testmempoolaccept()
                     {RPCResult::Type::STR, "package-error", /*optional=*/true, "Package validation error, if any (only possible if rawtxs had more than 1 transaction)."},
                     {RPCResult::Type::BOOL, "allowed", /*optional=*/true, "Whether this tx would be accepted to the mempool and pass client-specified maxfeerate. "
                                                        "If not present, the tx was not fully validated due to a failure in another tx in the list."},
-                    {RPCResult::Type::NUM, "vsize", /*optional=*/true, "Virtual transaction size as defined in BIP 141. This is different from actual serialized size for witness transactions as witness data is discounted (only present when 'allowed' is true)"},
+                    {RPCResult::Type::NUM, "vsize_adjusted", /*optional=*/true, "Maximum of sigop-adjusted size (-bytespersigop) and virtual transaction size as defined in BIP 141 (only present when 'allowed' is true)."},
+                    {RPCResult::Type::NUM, "vsize", /*optional=*/true, "(DEPRECATED) Was previously erroneously described as the BIP 141 vsize, but is actually sigops-adjusted vsize.\n"
+                                                                "Use vsize_bip141 to actually get that behavior or switch to the explicit vsize_adjusted for retained behavior."},
+                    {RPCResult::Type::NUM, "vsize_bip141", /*optional=*/true, "Virtual transaction size as defined in BIP 141.\n"
+                                                                       "This is different from actual serialized size for witness transactions as witness data is discounted (only present when 'allowed' is true)."},
                     {RPCResult::Type::OBJ, "fees", /*optional=*/true, "Transaction fees (only present if 'allowed' is true)",
                     {
                         {RPCResult::Type::STR_AMOUNT, "base", "transaction fee in " + CURRENCY_UNIT},
@@ -384,7 +405,9 @@ static RPCMethod testmempoolaccept()
                         // Only return the fee and vsize if the transaction would pass ATMP.
                         // These can be used to calculate the feerate.
                         result_inner.pushKV("allowed", true);
+                        result_inner.pushKV("vsize_adjusted", virtual_size);
                         result_inner.pushKV("vsize", virtual_size);
+                        result_inner.pushKV("vsize_bip141", GetVirtualTransactionSize(*tx));
                         UniValue fees(UniValue::VOBJ);
                         fees.pushKV("base", ValueFromAmount(fee));
                         fees.pushKV("effective-feerate", ValueFromAmount(tx_result.m_effective_feerate.value().GetFeePerK()));
@@ -433,7 +456,11 @@ static std::vector<RPCResult> ClusterDescription()
 static std::vector<RPCResult> MempoolEntryDescription()
 {
     std::vector<RPCResult> list = {
-        RPCResult{RPCResult::Type::NUM, "vsize", "virtual transaction size as defined in BIP 141. This is different from actual serialized size for witness transactions as witness data is discounted."},
+        {RPCResult::Type::NUM, "vsize", "(DEPRECATED) Was previously erroneously described as the BIP 141 vsize, but is actually sigops-adjusted vsize.\n"
+        "Use vsize_bip141 to actually get that behavior or switch to the explicit vsize_adjusted for retained behavior."},
+        {RPCResult::Type::NUM, "vsize_bip141", "Virtual transaction size as defined in BIP 141.\n"
+        "This is different from actual serialized size for witness transactions as witness data is discounted."},
+        {RPCResult::Type::NUM, "vsize_adjusted", "Maximum of sigop-adjusted size (-bytespersigop) and virtual transaction size as defined in BIP 141."},
         RPCResult{RPCResult::Type::NUM, "weight", "transaction weight as defined in BIP 141."},
         RPCResult{RPCResult::Type::NUM_TIME, "time", "local time transaction entered pool in seconds since 1 Jan 1970 GMT"},
         RPCResult{RPCResult::Type::NUM, "height", "block height when transaction entered pool"},
@@ -517,7 +544,9 @@ static void entryToJSON(const CTxMemPool& pool, UniValue& info, const CTxMemPool
     auto [ancestor_count, ancestor_size, ancestor_fees] = pool.CalculateAncestorData(e);
     auto [descendant_count, descendant_size, descendant_fees] = pool.CalculateDescendantData(e);
 
+    info.pushKV("vsize_adjusted", e.GetTxSize());
     info.pushKV("vsize", e.GetTxSize());
+    info.pushKV("vsize_bip141", GetVirtualTransactionSize(e.GetTx()));
     info.pushKV("weight", e.GetTxWeight());
     info.pushKV("time", count_seconds(e.GetTime()));
     info.pushKV("height", e.GetHeight());
@@ -959,11 +988,11 @@ static RPCMethod gettxspendingprevout()
             // Worklist of outpoints to resolve
             struct Entry {
                 COutPoint outpoint;
-                const UniValue* raw;
+                size_t request_index;
             };
             std::vector<Entry> prevouts_to_process;
             prevouts_to_process.reserve(output_params.size());
-            for (unsigned int idx = 0; idx < output_params.size(); idx++) {
+            for (const size_t idx : std::views::iota(size_t{0}, output_params.size())) {
                 const UniValue& o = output_params[idx].get_obj();
 
                 RPCTypeCheckObj(o,
@@ -977,11 +1006,11 @@ static RPCMethod gettxspendingprevout()
                 if (nOutput < 0) {
                     throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
                 }
-                prevouts_to_process.emplace_back(COutPoint{txid, static_cast<uint32_t>(nOutput)}, &o);
+                prevouts_to_process.emplace_back(COutPoint{txid, static_cast<uint32_t>(nOutput)}, idx);
             }
 
-            auto make_output = [return_spending_tx](const Entry& prevout, const CTransaction* spending_tx = nullptr) {
-                UniValue o{*prevout.raw};
+            auto make_output = [&output_params, return_spending_tx](const Entry& prevout, const CTransaction* spending_tx = nullptr) {
+                UniValue o{output_params[prevout.request_index]};
                 if (spending_tx) {
                     o.pushKV("spendingtxid", spending_tx->GetHash().ToString());
                     if (return_spending_tx) {
@@ -991,41 +1020,35 @@ static RPCMethod gettxspendingprevout()
                 return o;
             };
 
-            UniValue result{UniValue::VARR};
+            std::vector<UniValue> results(output_params.size());
 
             // Search the mempool first
+            std::vector<Entry> unresolved;
+            unresolved.reserve(prevouts_to_process.size());
             {
                 const CTxMemPool& mempool = EnsureAnyMemPool(request.context);
                 LOCK(mempool.cs);
 
                 // Make the result if the spending tx appears in the mempool or this is a mempool_only request
-                for (auto it = prevouts_to_process.begin(); it != prevouts_to_process.end(); ) {
-                    const CTransaction* spending_tx{mempool.GetConflictTx(it->outpoint)};
+                for (const auto& prevout : prevouts_to_process) {
+                    const auto* spending_tx{mempool.GetConflictTx(prevout.outpoint)};
 
                     // If the outpoint is not spent in the mempool and this is not a mempool-only
                     // request, we cannot answer it yet.
                     if (!spending_tx && !mempool_only) {
-                        ++it;
-                        continue;
+                        unresolved.push_back(prevout);
+                    } else {
+                        results[prevout.request_index] = make_output(prevout, spending_tx);
                     }
-
-                    result.push_back(make_output(*it, spending_tx));
-                    it = prevouts_to_process.erase(it);
                 }
             }
 
-            // Return early if all requests have been handled by the mempool search
-            if (prevouts_to_process.empty()) {
-                return result;
-            }
-
-            // At this point the request was not limited to the mempool and some outpoints remain
-            // unresolved. We now rely on the index to determine whether they were spent or not.
-            if (!g_txospenderindex || !g_txospenderindex->BlockUntilSyncedToCurrentChain()) {
+            // mempool_only requests resolve every outpoint above, so only other requests reach the index.
+            if (!unresolved.empty() && (!g_txospenderindex || !g_txospenderindex->BlockUntilSyncedToCurrentChain())) {
                 throw JSONRPCError(RPC_MISC_ERROR, "Mempool lacks a relevant spend, and txospenderindex is unavailable.");
             }
 
-            for (const auto& prevout : prevouts_to_process) {
+            for (const auto& prevout : unresolved) {
                 const auto spender{g_txospenderindex->FindSpender(prevout.outpoint)};
                 if (!spender) {
                     throw JSONRPCError(RPC_MISC_ERROR, spender.error());
@@ -1034,13 +1057,16 @@ static RPCMethod gettxspendingprevout()
                 if (const auto& spender_opt{spender.value()}) {
                     UniValue o{make_output(prevout, spender_opt->tx.get())};
                     o.pushKV("blockhash", spender_opt->block_hash.GetHex());
-                    result.push_back(std::move(o));
+                    results[prevout.request_index] = std::move(o);
                 } else {
                     // Only return the input outpoint itself, which indicates it is unspent.
-                    result.push_back(make_output(prevout));
+                    results[prevout.request_index] = make_output(prevout);
                 }
             }
 
+            UniValue result{UniValue::VARR};
+            result.reserve(results.size());
+            for (auto& output : results) result.push_back(std::move(output));
             return result;
         },
     };
@@ -1219,7 +1245,8 @@ static std::vector<RPCResult> OrphanDescription()
         RPCResult{RPCResult::Type::STR_HEX, "txid", "The transaction hash in hex"},
         RPCResult{RPCResult::Type::STR_HEX, "wtxid", "The transaction witness hash in hex"},
         RPCResult{RPCResult::Type::NUM, "bytes", "The serialized transaction size in bytes"},
-        RPCResult{RPCResult::Type::NUM, "vsize", "The virtual transaction size as defined in BIP 141. This is different from actual serialized size for witness transactions as witness data is discounted."},
+        RPCResult{RPCResult::Type::NUM, "vsize", "(DEPRECATED) use vsize_bip141 instead. The virtual transaction size as defined in BIP 141. This is different from actual serialized size for witness transactions as witness data is discounted."},
+        RPCResult{RPCResult::Type::NUM, "vsize_bip141", "The virtual transaction size as defined in BIP 141. This is different from actual serialized size for witness transactions as witness data is discounted."},
         RPCResult{RPCResult::Type::NUM, "weight", "The transaction weight as defined in BIP 141."},
         RPCResult{RPCResult::Type::ARR, "from", "",
         {
@@ -1235,6 +1262,7 @@ static UniValue OrphanToJSON(const node::TxOrphanage::OrphanInfo& orphan)
     o.pushKV("wtxid", orphan.tx->GetWitnessHash().ToString());
     o.pushKV("bytes", orphan.tx->ComputeTotalSize());
     o.pushKV("vsize", GetVirtualTransactionSize(*orphan.tx));
+    o.pushKV("vsize_bip141", GetVirtualTransactionSize(*orphan.tx));
     o.pushKV("weight", GetTransactionWeight(*orphan.tx));
     UniValue from(UniValue::VARR);
     for (const auto fromPeer: orphan.announcers) {
@@ -1348,7 +1376,10 @@ static RPCMethod submitpackage()
                     {RPCResult::Type::OBJ, "wtxid", "transaction wtxid", {
                         {RPCResult::Type::STR_HEX, "txid", "The transaction hash in hex"},
                         {RPCResult::Type::STR_HEX, "other-wtxid", /*optional=*/true, "The wtxid of a different transaction with the same txid but different witness found in the mempool. This means the submitted transaction was ignored."},
-                        {RPCResult::Type::NUM, "vsize", /*optional=*/true, "Sigops-adjusted virtual transaction size."},
+                        {RPCResult::Type::NUM, "vsize_adjusted", /*optional=*/true, "Maximum of sigop-adjusted size (-bytespersigop) and virtual transaction size as defined in BIP 141."},
+                        {RPCResult::Type::NUM, "vsize", /*optional=*/true, "(DEPRECATED) Was previously erroneously described as the BIP 141 vsize, but is actually sigops-adjusted vsize.\n"
+                                                                    "Use vsize_bip141 to actually get that behavior or switch to the explicit vsize_adjusted for retained behavior."},
+                        {RPCResult::Type::NUM, "vsize_bip141", /*optional=*/true, "Virtual transaction size as defined in BIP 141."},
                         {RPCResult::Type::OBJ, "fees", /*optional=*/true, "Transaction fees", {
                             {RPCResult::Type::STR_AMOUNT, "base", "transaction fee in " + CURRENCY_UNIT},
                             {RPCResult::Type::STR_AMOUNT, "effective-feerate", /*optional=*/true, "if the transaction was not already in the mempool, the effective feerate in " + CURRENCY_UNIT + " per KvB. For example, the package feerate and/or feerate with modified fees from prioritisetransaction."},
@@ -1496,7 +1527,9 @@ static RPCMethod submitpackage()
                     break;
                 case MempoolAcceptResult::ResultType::VALID:
                 case MempoolAcceptResult::ResultType::MEMPOOL_ENTRY:
+                    result_inner.pushKV("vsize_adjusted", it->second.m_vsize.value());
                     result_inner.pushKV("vsize", it->second.m_vsize.value());
+                    result_inner.pushKV("vsize_bip141", GetVirtualTransactionSize(*tx));
                     UniValue fees(UniValue::VOBJ);
                     fees.pushKV("base", ValueFromAmount(it->second.m_base_fees.value()));
                     if (tx_result.m_result_type == MempoolAcceptResult::ResultType::VALID) {
diff --git a/depend/bitcoin/src/rpc/mining.cpp b/depend/bitcoin/src/rpc/mining.cpp
index dcf5ee26..4465f3a1 100644
--- a/depend/bitcoin/src/rpc/mining.cpp
+++ b/depend/bitcoin/src/rpc/mining.cpp
@@ -5,46 +5,77 @@
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
+#include <interfaces/mining.h>
+
+#include <addresstype.h>
+#include <arith_uint256.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <common/system.h>
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/params.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <deploymentinfo.h>
-#include <deploymentstatus.h>
-#include <interfaces/mining.h>
+#include <crypto/hex_base.h>
+#include <interfaces/types.h>
 #include <key_io.h>
 #include <net.h>
+#include <netbase.h>
+#include <node/blockstorage.h>
 #include <node/context.h>
 #include <node/miner.h>
+#include <node/mining_args.h>
+#include <node/mining_types.h>
 #include <node/warnings.h>
-#include <policy/ephemeral_policy.h>
+#include <policy/feerate.h>
+#include <policy/policy.h>
 #include <pow.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <rpc/blockchain.h>
 #include <rpc/mining.h>
+#include <rpc/protocol.h>
+#include <rpc/request.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <serialize.h>
+#include <streams.h>
+#include <sync.h>
+#include <tinyformat.h>
 #include <txmempool.h>
+#include <uint256.h>
 #include <univalue.h>
+#include <util/chaintype.h>
+#include <util/check.h>
 #include <util/signalinterrupt.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/time.h>
-#include <util/translation.h>
 #include <validation.h>
 #include <validationinterface.h>
+#include <versionbits.h>
 
+#include <algorithm>
+#include <cstddef>
 #include <cstdint>
+#include <functional>
+#include <initializer_list>
+#include <limits>
+#include <map>
 #include <memory>
+#include <optional>
+#include <set>
+#include <span>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 using interfaces::BlockRef;
 using interfaces::BlockTemplate;
@@ -165,7 +196,7 @@ static UniValue generateBlocks(ChainstateManager& chainman, Mining& miner, const
 {
     UniValue blockHashes(UniValue::VARR);
     while (nGenerate > 0 && !chainman.m_interrupt) {
-        std::unique_ptr<BlockTemplate> block_template(miner.createNewBlock({ .coinbase_output_script = coinbase_output_script, .include_dummy_extranonce = true }, /*cooldown=*/false));
+        std::unique_ptr<BlockTemplate> block_template(miner.createNewBlock({ .coinbase_output_script = coinbase_output_script }, /*cooldown=*/false));
         CHECK_NONFATAL(block_template);
 
         std::shared_ptr<const CBlock> block_out;
@@ -377,7 +408,7 @@ static RPCMethod generateblock()
     {
         LOCK(chainman.GetMutex());
         {
-            std::unique_ptr<BlockTemplate> block_template{miner.createNewBlock({.use_mempool = false, .coinbase_output_script = coinbase_output_script, .include_dummy_extranonce = true}, /*cooldown=*/false)};
+            std::unique_ptr<BlockTemplate> block_template{miner.createNewBlock({.use_mempool = false, .coinbase_output_script = coinbase_output_script}, /*cooldown=*/false)};
             CHECK_NONFATAL(block_template);
 
             block = block_template->getBlock();
@@ -463,7 +494,7 @@ static RPCMethod getmininginfo()
     CBlockIndex& tip{*CHECK_NONFATAL(active_chain.Tip())};
 
     UniValue obj(UniValue::VOBJ);
-    obj.pushKV("blocks",           active_chain.Height());
+    obj.pushKV("blocks", active_chain.Height());
     if (BlockAssembler::m_last_block_weight) obj.pushKV("currentblockweight", *BlockAssembler::m_last_block_weight);
     if (BlockAssembler::m_last_block_num_txs) obj.pushKV("currentblocktx", *BlockAssembler::m_last_block_num_txs);
     obj.pushKV("bits", strprintf("%08x", tip.nBits));
@@ -471,9 +502,8 @@ static RPCMethod getmininginfo()
     obj.pushKV("target", GetTarget(tip, chainman.GetConsensus().powLimit).GetHex());
     obj.pushKV("networkhashps",    getnetworkhashps().HandleRequest(request));
     obj.pushKV("pooledtx", mempool.size());
-    BlockAssembler::Options assembler_options;
-    ApplyArgsManOptions(*node.args, assembler_options);
-    obj.pushKV("blockmintxfee", ValueFromAmount(assembler_options.blockMinFeeRate.GetFeePerK()));
+    const auto mining_options{node::FlattenMiningOptions(node.mining_args)};
+    obj.pushKV("blockmintxfee", ValueFromAmount(CHECK_NONFATAL(mining_options.block_min_fee_rate)->GetFeePerK()));
     obj.pushKV("chain", chainman.GetParams().GetChainTypeString());
 
     UniValue next(UniValue::VOBJ);
@@ -506,7 +536,8 @@ static RPCMethod prioritisetransaction()
                 {
                     {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id."},
                     {"dummy", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "API-Compatibility for previous API. Must be zero or null.\n"
-            "                  DEPRECATED. For forward compatibility use named arguments and omit this parameter."},
+            "                  DEPRECATED. For forward compatibility use named arguments and omit this parameter.",
+                        RPCArgOptions{.placeholder = true}},
                     {"fee_delta", RPCArg::Type::NUM, RPCArg::Optional::NO, "The fee value (in satoshis) to add (or subtract, if negative).\n"
             "                  Note, that this value is not a fee rate. It is a value to modify absolute fee of the TX.\n"
             "                  The fee is not actually paid, only the algorithm for selecting transactions into a block\n"
@@ -875,7 +906,7 @@ static RPCMethod getblocktemplate()
         // a delay to each getblocktemplate call. This differs from typical
         // long-lived IPC usage, where the overhead is paid only when creating
         // the initial template.
-        block_template = miner.createNewBlock({.include_dummy_extranonce = true}, /*cooldown=*/false);
+        block_template = miner.createNewBlock({}, /*cooldown=*/false);
         CHECK_NONFATAL(block_template);
 
 
@@ -897,7 +928,7 @@ static RPCMethod getblocktemplate()
     UniValue transactions(UniValue::VARR);
     std::map<Txid, int64_t> setTxIndex;
     std::vector<CAmount> tx_fees{block_template->getTxFees()};
-    std::vector<CAmount> tx_sigops{block_template->getTxSigops()};
+    std::vector<int64_t> tx_sigops{block_template->getTxSigops()};
 
     int i = 0;
     for (const auto& it : block.vtx) {
@@ -1062,7 +1093,8 @@ static RPCMethod submitblock()
         "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n",
         {
             {"hexdata", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "the hex-encoded block data to submit"},
-            {"dummy", RPCArg::Type::STR, RPCArg::DefaultHint{"ignored"}, "dummy value, for compatibility with BIP22. This value is ignored."},
+            {"dummy", RPCArg::Type::STR, RPCArg::DefaultHint{"ignored"}, "dummy value, for compatibility with BIP22. This value is ignored.",
+                RPCArgOptions{.placeholder = true}},
         },
         {
             RPCResult{"If the block was accepted", RPCResult::Type::NONE, "", ""},
diff --git a/depend/bitcoin/src/rpc/mining.h b/depend/bitcoin/src/rpc/mining.h
index 13627227..26a4ab15 100644
--- a/depend/bitcoin/src/rpc/mining.h
+++ b/depend/bitcoin/src/rpc/mining.h
@@ -5,7 +5,9 @@
 #ifndef BITCOIN_RPC_MINING_H
 #define BITCOIN_RPC_MINING_H
 
+#include <cstdint>
+
 /** Default max iterations to try in RPC generatetodescriptor, generatetoaddress, and generateblock. */
-static const uint64_t DEFAULT_MAX_TRIES{1000000};
+inline constexpr uint64_t DEFAULT_MAX_TRIES{1'000'000};
 
 #endif // BITCOIN_RPC_MINING_H
diff --git a/depend/bitcoin/src/rpc/net.cpp b/depend/bitcoin/src/rpc/net.cpp
index 49c8a10c..da57ed14 100644
--- a/depend/bitcoin/src/rpc/net.cpp
+++ b/depend/bitcoin/src/rpc/net.cpp
@@ -47,6 +47,7 @@
 
 using node::NodeContext;
 using util::Join;
+using util::TrimStringView;
 
 const std::vector<std::string> CONNECTION_TYPE_DOC{
         "outbound-full-relay (default automatic connections)",
@@ -348,6 +349,11 @@ static RPCMethod addnode()
     CConnman& connman = EnsureConnman(node);
 
     const auto node_arg{self.Arg<std::string_view>("node")};
+    if (TrimStringView(node_arg).empty()) {
+        // Such a node would never resolve, but would be retried indefinitely.
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Error: Node address cannot be empty");
+    }
+
     bool node_v2transport = connman.GetLocalServices() & NODE_P2P_V2;
     bool use_v2transport = self.MaybeArg<bool>("v2transport").value_or(node_v2transport);
 
@@ -358,7 +364,13 @@ static RPCMethod 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;
     }
 
@@ -653,6 +665,16 @@ static RPCMethod getnetworkinfo()
                         }},
                         {RPCResult::Type::BOOL, "localrelay", "true if transaction relay is requested from peers"},
                         {RPCResult::Type::NUM, "timeoffset", "the time offset"},
+                        {RPCResult::Type::NUM, "tx_send_rate", "configured target for maximum number of transactions per second to send to inbound peers"},
+                        {RPCResult::Type::OBJ_DYN, "inv_buckets", "", {
+                          {RPCResult::Type::OBJ, "inbound/outbound", "connection direction",
+                            {
+                                {RPCResult::Type::NUM, "backlog", "number of queued txs to announce"},
+                                {RPCResult::Type::NUM, "count_tok", "tokens available to be consumed per-transaction"},
+                                {RPCResult::Type::NUM, "size_tok", "tokens available to be consumed per-byte"},
+                            }
+                          }
+                        }},
                         {RPCResult::Type::NUM, "connections", "the total number of connections"},
                         {RPCResult::Type::NUM, "connections_in", "the number of inbound connections"},
                         {RPCResult::Type::NUM, "connections_out", "the number of outbound connections"},
@@ -710,6 +732,18 @@ static RPCMethod getnetworkinfo()
         auto peerman_info{node.peerman->GetInfo()};
         obj.pushKV("localrelay", !peerman_info.ignores_incoming_txs);
         obj.pushKV("timeoffset", Ticks<std::chrono::seconds>(peerman_info.median_outbound_time_offset));
+        obj.pushKV("tx_send_rate", peerman_info.tx_send_rate);
+        auto buckjson = [&](const auto& buckinfo) {
+            UniValue b{UniValue::VOBJ};
+            b.pushKV("backlog", buckinfo.backlog_count);
+            b.pushKV("count_tok", buckinfo.count_bucket);
+            b.pushKV("size_tok", buckinfo.size_bucket);
+            return b;
+        };
+        UniValue invbuckets{UniValue::VOBJ};
+        invbuckets.pushKV("inbound", buckjson(peerman_info.inbound_bucket));
+        invbuckets.pushKV("outbound", buckjson(peerman_info.outbound_bucket));
+        obj.pushKV("inv_buckets", invbuckets);
     }
     if (node.connman) {
         obj.pushKV("networkactive", node.connman->GetNetworkActive());
@@ -1167,7 +1201,7 @@ static RPCMethod exportasmap()
 
             UniValue result(UniValue::VOBJ);
             result.pushKV("path", export_path.utf8string());
-            result.pushKV("bytes_written", (uint64_t)node::data::ip_asn.size());
+            result.pushKV("bytes_written", node::data::ip_asn.size());
             result.pushKV("file_hash", HexStr(hasher.GetSHA256()));
             return result;
 #endif
diff --git a/depend/bitcoin/src/rpc/node.cpp b/depend/bitcoin/src/rpc/node.cpp
index aad24b0f..6d0d5511 100644
--- a/depend/bitcoin/src/rpc/node.cpp
+++ b/depend/bitcoin/src/rpc/node.cpp
@@ -29,6 +29,7 @@
 #include <util/time.h>
 
 #include <cstdint>
+#include <limits>
 #ifdef HAVE_MALLOC_INFO
 #include <malloc.h>
 #endif
@@ -61,7 +62,9 @@ static RPCMethod setmocktime()
     LOCK(cs_main);
 
     const int64_t time{request.params[0].getInt<int64_t>()};
-    constexpr int64_t max_time{Ticks<std::chrono::seconds>(std::chrono::nanoseconds::max())};
+    // block timestamps are uint32_t, so mocking time beyond that is meaningless for anything
+    // consensus-related and can cause integer overflow/truncation issues in time arithmetic.
+    constexpr int64_t max_time{std::numeric_limits<uint32_t>::max()};
     if (time < 0 || time > max_time) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime must be in the range [0, %s], not %s.", max_time, time));
     }
@@ -245,24 +248,16 @@ static RPCMethod logging()
                 },
                 RPCExamples{
                     HelpExampleCli("logging", "\"[\\\"all\\\"]\" \"[\\\"http\\\"]\"")
-            + HelpExampleRpc("logging", "[\"all\"], [\"libevent\"]")
+            + HelpExampleRpc("logging", "[\"all\"], [\"leveldb\"]")
                 },
         [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
-    BCLog::CategoryMask original_log_categories = LogInstance().GetCategoryMask();
     if (request.params[0].isArray()) {
         EnableOrDisableLogCategories(request.params[0], true);
     }
     if (request.params[1].isArray()) {
         EnableOrDisableLogCategories(request.params[1], false);
     }
-    BCLog::CategoryMask updated_log_categories = LogInstance().GetCategoryMask();
-    BCLog::CategoryMask changed_log_categories = original_log_categories ^ updated_log_categories;
-
-    // Update libevent logging if BCLog::LIBEVENT has changed.
-    if (changed_log_categories & BCLog::LIBEVENT) {
-        UpdateHTTPServerLogging(LogInstance().WillLogCategory(BCLog::LIBEVENT));
-    }
 
     UniValue result(UniValue::VOBJ);
     for (const auto& logCatActive : LogInstance().LogCategoriesList()) {
diff --git a/depend/bitcoin/src/rpc/output_script.cpp b/depend/bitcoin/src/rpc/output_script.cpp
index cb73fe54..3110b70d 100644
--- a/depend/bitcoin/src/rpc/output_script.cpp
+++ b/depend/bitcoin/src/rpc/output_script.cpp
@@ -306,8 +306,9 @@ static RPCMethod deriveaddresses()
             int64_t range_begin = 0;
             int64_t range_end = 0;
 
-            if (request.params.size() >= 2 && !request.params[1].isNull()) {
-                std::tie(range_begin, range_end) = ParseDescriptorRange(request.params[1]);
+            const UniValue* range = self.MaybeArg<UniValue>("range");
+            if (range) {
+                std::tie(range_begin, range_end) = ParseDescriptorRange(*range);
             }
 
             FlatSigningProvider key_provider;
@@ -317,11 +318,11 @@ static RPCMethod deriveaddresses()
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, error);
             }
             auto& desc = descs.at(0);
-            if (!desc->IsRange() && request.params.size() > 1) {
+            if (!desc->IsRange() && range) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "Range should not be specified for an un-ranged descriptor");
             }
 
-            if (desc->IsRange() && request.params.size() == 1) {
+            if (desc->IsRange() && !range) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "Range must be specified for a ranged descriptor");
             }
 
diff --git a/depend/bitcoin/src/rpc/protocol.h b/depend/bitcoin/src/rpc/protocol.h
index 40e685d5..7e282376 100644
--- a/depend/bitcoin/src/rpc/protocol.h
+++ b/depend/bitcoin/src/rpc/protocol.h
@@ -16,10 +16,33 @@ enum HTTPStatusCode : int
     HTTP_FORBIDDEN             = 403,
     HTTP_NOT_FOUND             = 404,
     HTTP_BAD_METHOD            = 405,
+    HTTP_CONTENT_TOO_LARGE     = 413,
     HTTP_INTERNAL_SERVER_ERROR = 500,
     HTTP_SERVICE_UNAVAILABLE   = 503,
 };
 
+//! Mapping of HTTP status codes to short string explanation.
+//! Copied from libevent http.c success_phrases[] and client_error_phrases[]
+inline std::string_view HTTPStatusReasonString(HTTPStatusCode code)
+{
+    switch (code) {
+    case HTTP_OK: return "OK";
+    case HTTP_NO_CONTENT: return "No Content";
+    case HTTP_BAD_REQUEST: return "Bad Request";
+    case HTTP_UNAUTHORIZED: return "Unauthorized";
+    case HTTP_FORBIDDEN: return "Forbidden";
+    case HTTP_NOT_FOUND: return "Not Found";
+    case HTTP_BAD_METHOD: return "Method Not Allowed";
+    case HTTP_CONTENT_TOO_LARGE: return "Content too large";
+    case HTTP_INTERNAL_SERVER_ERROR: return "Internal Server Error";
+    case HTTP_SERVICE_UNAVAILABLE: return "Service Unavailable";
+    }
+
+    // Reason phrases are optional and may be replaced by local variants.
+    // https://httpwg.org/specs/rfc9110.html#rfc.section.15.1
+    return "";
+}
+
 //! Bitcoin RPC error codes
 enum RPCErrorCode
 {
@@ -49,6 +72,7 @@ enum RPCErrorCode
     RPC_VERIFY_ALREADY_IN_UTXO_SET  = -27, //!< Transaction already in utxo set
     RPC_IN_WARMUP                   = -28, //!< Client still warming up
     RPC_METHOD_DEPRECATED           = -32, //!< RPC method is deprecated
+    RPC_LIMIT_EXCEEDED              = -37, //!< A bounded resource is currently at capacity
 
     //! Aliases for backward compatibility
     RPC_TRANSACTION_ERROR           = RPC_VERIFY_ERROR,
diff --git a/depend/bitcoin/src/rpc/rawtransaction.cpp b/depend/bitcoin/src/rpc/rawtransaction.cpp
index 0f3cebb5..701916c6 100644
--- a/depend/bitcoin/src/rpc/rawtransaction.cpp
+++ b/depend/bitcoin/src/rpc/rawtransaction.cpp
@@ -128,11 +128,11 @@ static std::vector<RPCArg> CreateTxDoc()
 PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std::any& context, const HidingSigningProvider& provider, std::optional<int> sighash_type, bool finalize)
 {
     // Unserialize the transactions
-    PartiallySignedTransaction psbtx;
-    std::string error;
-    if (!DecodeBase64PSBT(psbtx, psbt_string, error)) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(psbt_string);
+    if (!psbt_res) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
     }
+    PartiallySignedTransaction psbtx = *psbt_res;
 
     if (g_txindex) g_txindex->BlockUntilSyncedToCurrentChain();
     const NodeContext& node = EnsureAnyNodeContext(context);
@@ -144,10 +144,7 @@ PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std
 
     // Fetch previous transactions:
     // First, look in the txindex and the mempool
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
-        PSBTInput& psbt_input = psbtx.inputs.at(i);
-        const CTxIn& tx_in = psbtx.tx->vin.at(i);
-
+    for (PSBTInput& psbt_input : psbtx.inputs) {
         // The `non_witness_utxo` is the whole previous transaction
         if (psbt_input.non_witness_utxo) continue;
 
@@ -155,30 +152,26 @@ PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std
 
         // Look in the txindex
         if (g_txindex) {
-            uint256 block_hash;
-            g_txindex->FindTx(tx_in.prevout.hash, block_hash, tx);
+            if (auto result{g_txindex->FindTx(psbt_input.prev_txid)}) tx = result->tx;
         }
         // If we still don't have it look in the mempool
         if (!tx) {
-            tx = node.mempool->get(tx_in.prevout.hash);
+            tx = node.mempool->get(psbt_input.prev_txid);
         }
         if (tx) {
             psbt_input.non_witness_utxo = tx;
         } else {
-            coins[tx_in.prevout]; // Create empty map entry keyed by prevout
+            coins[psbt_input.GetOutPoint()]; // Create empty map entry keyed by prevout
         }
     }
 
     // If we still haven't found all of the inputs, look for the missing ones in the utxo set
     if (!coins.empty()) {
         FindCoins(node, coins);
-        for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
-            PSBTInput& input = psbtx.inputs.at(i);
-
+        for (PSBTInput& input : psbtx.inputs) {
             // If there are still missing utxos, add them if they were found in the utxo set
             if (!input.non_witness_utxo) {
-                const CTxIn& tx_in = psbtx.tx->vin.at(i);
-                const Coin& coin = coins.at(tx_in.prevout);
+                const Coin& coin = coins.at(input.GetOutPoint());
                 if (!coin.out.IsNull() && IsSegWitOutput(provider, coin.out.scriptPubKey)) {
                     input.witness_utxo = coin.out;
                 }
@@ -186,9 +179,13 @@ PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std
         }
     }
 
-    const PrecomputedTransactionData& txdata = PrecomputePSBTData(psbtx);
+    std::optional<PrecomputedTransactionData> txdata_res = PrecomputePSBTData(psbtx);
+    if (!txdata_res) {
+        throw JSONRPCPSBTError(common::PSBTError::INVALID_TX);
+    }
+    const PrecomputedTransactionData& txdata = *txdata_res;
 
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
         if (PSBTInputSigned(psbtx.inputs.at(i))) {
             continue;
         }
@@ -204,7 +201,7 @@ PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std
     }
 
     // Update script/keypath information using descriptor data.
-    for (unsigned int i = 0; i < psbtx.tx->vout.size(); ++i) {
+    for (unsigned int i = 0; i < psbtx.outputs.size(); ++i) {
         UpdatePSBTOutput(provider, psbtx, i);
     }
 
@@ -215,6 +212,24 @@ PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std
 
 static RPCMethod getrawtransaction()
 {
+    const std::vector<RPCResult> verbosity_1_block{
+        {RPCResult::Type::BOOL, "in_active_chain", /*optional=*/true, "Whether specified block is in the active chain or not (only present with explicit \"blockhash\" argument)"},
+        {RPCResult::Type::STR_HEX, "blockhash", /*optional=*/true, "the block hash"},
+        {RPCResult::Type::NUM, "vsize_adjusted", /*optional=*/true, "Sigop-adjusted virtual size in bytes, present for mempool transactions."},
+        {RPCResult::Type::NUM, "confirmations", /*optional=*/true, "The confirmations"},
+        {RPCResult::Type::NUM_TIME, "blocktime", /*optional=*/true, "The block time expressed in " + UNIX_EPOCH_TIME},
+        {RPCResult::Type::NUM, "time", /*optional=*/true, "Same as \"blocktime\""},
+        {RPCResult::Type::STR_HEX, "hex", "The serialized, hex-encoded data for 'txid'"},
+    };
+    const auto v2_extras = Cat<std::vector<RPCResult>>(
+        std::vector<RPCResult>{{
+            RPCResult::Type::NUM, "fee", /*optional=*/true,
+            "transaction fee in " + CURRENCY_UNIT + ", omitted if block undo data is not available"
+        }},
+        TxDoc({.elision_mode = ElisionMode::Silent,
+               .prevout = true,
+               .prevout_optional = true,
+               .vin_inner_elision = "Same vin fields as verbosity = 1"}));
     return RPCMethod{
                 "getrawtransaction",
 
@@ -240,36 +255,11 @@ static RPCMethod getrawtransaction()
                      RPCResult{"if verbosity is set to 1",
                          RPCResult::Type::OBJ, "", "",
                          Cat<std::vector<RPCResult>>(
-                         {
-                             {RPCResult::Type::BOOL, "in_active_chain", /*optional=*/true, "Whether specified block is in the active chain or not (only present with explicit \"blockhash\" argument)"},
-                             {RPCResult::Type::STR_HEX, "blockhash", /*optional=*/true, "the block hash"},
-                             {RPCResult::Type::NUM, "confirmations", /*optional=*/true, "The confirmations"},
-                             {RPCResult::Type::NUM_TIME, "blocktime", /*optional=*/true, "The block time expressed in " + UNIX_EPOCH_TIME},
-                             {RPCResult::Type::NUM, "time", /*optional=*/true, "Same as \"blocktime\""},
-                             {RPCResult::Type::STR_HEX, "hex", "The serialized, hex-encoded data for 'txid'"},
-                         },
+                         verbosity_1_block,
                          TxDoc({.txid_field_doc="The transaction id (same as provided)"})),
                     },
-                    RPCResult{"for verbosity = 2",
-                        RPCResult::Type::OBJ, "", "",
-                        {
-                            {RPCResult::Type::ELISION, "", "Same output as verbosity = 1"},
-                            {RPCResult::Type::NUM, "fee", /*optional=*/true, "transaction fee in " + CURRENCY_UNIT + ", omitted if block undo data is not available"},
-                            {RPCResult::Type::ARR, "vin", "",
-                            {
-                                {RPCResult::Type::OBJ, "", "utxo being spent",
-                                {
-                                    {RPCResult::Type::ELISION, "", "Same output as verbosity = 1"},
-                                    {RPCResult::Type::OBJ, "prevout", /*optional=*/true, "The previous output, omitted if block undo data is not available",
-                                    {
-                                        {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
-                                        {RPCResult::Type::NUM, "height", "The height of the prevout"},
-                                        {RPCResult::Type::STR_AMOUNT, "value", "The value in " + CURRENCY_UNIT},
-                                        {RPCResult::Type::OBJ, "scriptPubKey", "", ScriptPubKeyDoc()},
-                                    }},
-                                }},
-                            }},
-                        }},
+                    RPCResult{"for verbosity = 2", RPCResult::Type::OBJ, "", "",
+                    Cat(ElideGroup(verbosity_1_block, "Same output as verbosity = 1"), v2_extras)},
                 },
                 RPCExamples{
                     HelpExampleCli("getrawtransaction", "\"mytxid\"")
@@ -343,6 +333,15 @@ static RPCMethod getrawtransaction()
         LOCK(cs_main);
         blockindex = chainman.m_blockman.LookupBlockIndex(hash_block); // May be nullptr for mempool transactions
     }
+
+    // Add sigop-adjusted virtual size if the transaction exists in the mempool.
+    if (blockindex == nullptr && hash_block.IsNull() && node.mempool) {
+        auto info = node.mempool->info(tx->GetHash());
+        if (info.tx) {
+            result.pushKV("vsize_adjusted", info.vsize);
+        }
+    }
+
     if (verbosity == 1) {
         TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate());
         return result;
@@ -606,6 +605,12 @@ static RPCMethod combinerawtransaction()
 {
 
     UniValue txs = request.params[0].get_array();
+
+    // Can't merge < 2 items
+    if (txs.size() < 2) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Missing transactions. At least two transactions required.");
+    }
+
     std::vector<CMutableTransaction> txVariants(txs.size());
 
     for (unsigned int idx = 0; idx < txs.size(); idx++) {
@@ -614,8 +619,21 @@ static RPCMethod combinerawtransaction()
         }
     }
 
-    if (txVariants.empty()) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Missing transactions");
+    { // Test Tx relation for mergeability. Strip scriptSigs and scriptWitnesses to facilitate txId comparison
+        std::vector<CMutableTransaction> tx_variants_copy(txVariants);
+        Txid first_txid{};
+        for (unsigned int k{0}; k < tx_variants_copy.size(); ++k) {
+            // Remove all scriptSigs and scriptWitnesses from inputs
+            for (CTxIn& input : tx_variants_copy[k].vin) {
+                input.scriptSig.clear();
+                input.scriptWitness.SetNull();
+            }
+            if (k == 0) {
+                first_txid = tx_variants_copy[k].GetHash();
+            } else if (first_txid != tx_variants_copy[k].GetHash()) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Transaction number %d not compatible with first transaction", k+1));
+            }
+        }
     }
 
     // mergedTx will end up with all the signatures; it
@@ -782,7 +800,7 @@ const RPCResult& DecodePSBTInputs()
             {RPCResult::Type::OBJ, "", "",
             {
                 {RPCResult::Type::OBJ, "non_witness_utxo", /*optional=*/true, "Decoded network transaction for non-witness UTXOs",
-                    TxDoc({.elision_description="The layout is the same as the output of decoderawtransaction."})
+                    TxDoc({.elision_mode = ElisionMode::WithSummary, .elision_summary = "The layout is the same as the output of decoderawtransaction."})
                 },
                 {RPCResult::Type::OBJ, "witness_utxo", /*optional=*/true, "Transaction output for witness UTXOs",
                 {
@@ -847,6 +865,11 @@ const RPCResult& DecodePSBTInputs()
                 {
                     {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
                 }},
+                {RPCResult::Type::STR_HEX, "previous_txid", /*optional=*/true, "TXID of the transaction containing the output being spent by this input"},
+                {RPCResult::Type::NUM, "previous_vout", /*optional=*/true, "Index of the output being spent"},
+                {RPCResult::Type::NUM, "sequence", /*optional=*/true, "Sequence number for this input"},
+                {RPCResult::Type::NUM, "time_locktime", /*optional=*/true, "Time-based locktime required for this input"},
+                {RPCResult::Type::NUM, "height_locktime", /*optional=*/true, "Height-based locktime required for this input"},
                 {RPCResult::Type::STR_HEX, "taproot_key_path_sig", /*optional=*/ true, "hex-encoded signature for the Taproot key path spend"},
                 {RPCResult::Type::ARR, "taproot_script_path_sigs", /*optional=*/ true, "",
                 {
@@ -963,6 +986,10 @@ const RPCResult& DecodePSBTOutputs()
                         {RPCResult::Type::STR, "path", "The path"},
                     }},
                 }},
+                {RPCResult::Type::NUM, "amount", /* optional=*/ true, "The amount (nValue) for this output"},
+                {RPCResult::Type::OBJ, "script", /* optional=*/ true, "The output script (scriptPubKey) for this output",
+                    ElideGroup(ScriptPubKeyDoc(), "The layout is the same as the output of scriptPubKeys in decoderawtransaction."),
+                },
                 {RPCResult::Type::STR_HEX, "taproot_internal_key", /*optional=*/ true, "The hex-encoded Taproot x-only internal key"},
                 {RPCResult::Type::ARR, "taproot_tree", /*optional=*/ true, "The tuples that make up the Taproot tree, in depth first search order",
                 {
@@ -1028,8 +1055,8 @@ static RPCMethod decodepsbt()
                 RPCResult{
                     RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::OBJ, "tx", "The decoded network-serialized unsigned transaction.",
-                            TxDoc({.elision_description="The layout is the same as the output of decoderawtransaction."})
+                        {RPCResult::Type::OBJ, "tx", /*optional=*/true, "The decoded network-serialized unsigned transaction.",
+                            TxDoc({.elision_mode = ElisionMode::WithSummary, .elision_summary = "The layout is the same as the output of decoderawtransaction."})
                         },
                         {RPCResult::Type::ARR, "global_xpubs", "",
                         {
@@ -1040,7 +1067,14 @@ static RPCMethod decodepsbt()
                                 {RPCResult::Type::STR, "path", "The path"},
                             }},
                         }},
-                        {RPCResult::Type::NUM, "psbt_version", "The PSBT version number. Not to be confused with the unsigned transaction version"},
+                        {RPCResult::Type::NUM, "tx_version", /* optional */ true, "The version number of the unsigned transaction. Not to be confused with PSBT version"},
+                        {RPCResult::Type::NUM, "fallback_locktime", /* optional */ true, "The locktime to fallback to if no inputs specify a required locktime."},
+                        {RPCResult::Type::NUM, "input_count", /* optional */ true, "The number of inputs in this psbt"},
+                        {RPCResult::Type::NUM, "output_count", /* optional */ true, "The number of outputs in this psbt."},
+                        {RPCResult::Type::BOOL, "inputs_modifiable", /* optional */ true, "Whether inputs can be modified"},
+                        {RPCResult::Type::BOOL, "outputs_modifiable", /* optional */ true, "Whether outputs can be modified"},
+                        {RPCResult::Type::BOOL, "has_sighash_single", /* optional */ true, "Whether this PSBT has SIGHASH_SINGLE inputs"},
+                        {RPCResult::Type::NUM, "psbt_version", /* optional */ true, "The PSBT version number. Not to be confused with the unsigned transaction version"},
                         {RPCResult::Type::ARR, "proprietary", "The global proprietary map",
                         {
                             {RPCResult::Type::OBJ, "", "",
@@ -1066,18 +1100,20 @@ static RPCMethod decodepsbt()
         [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transactions
-    PartiallySignedTransaction psbtx;
-    std::string error;
-    if (!DecodeBase64PSBT(psbtx, request.params[0].get_str(), error)) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(request.params[0].get_str());
+    if (!psbt_res) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
     }
+    PartiallySignedTransaction psbtx = *psbt_res;
 
     UniValue result(UniValue::VOBJ);
 
-    // Add the decoded tx
-    UniValue tx_univ(UniValue::VOBJ);
-    TxToUniv(CTransaction(*psbtx.tx), /*block_hash=*/uint256(), /*entry=*/tx_univ, /*include_hex=*/false);
-    result.pushKV("tx", std::move(tx_univ));
+    if (psbtx.GetVersion() < 2) {
+        // Add the decoded tx
+        UniValue tx_univ(UniValue::VOBJ);
+        TxToUniv(CTransaction(*CHECK_NONFATAL(psbtx.GetUnsignedTx())), /*block_hash=*/uint256(), /*entry=*/tx_univ, /*include_hex=*/false);
+        result.pushKV("tx", std::move(tx_univ));
+    }
 
     // Add the global xpubs
     UniValue global_xpubs(UniValue::VARR);
@@ -1089,13 +1125,28 @@ static RPCMethod decodepsbt()
 
             UniValue keypath(UniValue::VOBJ);
             keypath.pushKV("xpub", EncodeBase58Check(ser_xpub));
-            keypath.pushKV("master_fingerprint", HexStr(std::span<unsigned char>(xpub_pair.first.fingerprint, xpub_pair.first.fingerprint + 4)));
+            keypath.pushKV("master_fingerprint", HexStr(xpub_pair.first.fingerprint));
             keypath.pushKV("path", WriteHDKeypath(xpub_pair.first.path));
             global_xpubs.push_back(std::move(keypath));
         }
     }
     result.pushKV("global_xpubs", std::move(global_xpubs));
 
+    // Add PSBTv2 stuff
+    if (psbtx.GetVersion() >= 2) {
+        result.pushKV("tx_version", psbtx.tx_version);
+        if (psbtx.fallback_locktime.has_value()) {
+            result.pushKV("fallback_locktime", static_cast<uint64_t>(*psbtx.fallback_locktime));
+        }
+        result.pushKV("input_count", (uint64_t)psbtx.inputs.size());
+        result.pushKV("output_count", (uint64_t)psbtx.outputs.size());
+        if (psbtx.m_tx_modifiable.has_value()) {
+            result.pushKV("inputs_modifiable", psbtx.m_tx_modifiable->test(0));
+            result.pushKV("outputs_modifiable", psbtx.m_tx_modifiable->test(1));
+            result.pushKV("has_sighash_single", psbtx.m_tx_modifiable->test(2));
+        }
+    }
+
     // PSBT version
     result.pushKV("psbt_version", psbtx.GetVersion());
 
@@ -1143,7 +1194,7 @@ static RPCMethod decodepsbt()
             have_a_utxo = true;
         }
         if (input.non_witness_utxo) {
-            txout = input.non_witness_utxo->vout[psbtx.tx->vin[i].prevout.n];
+            txout = input.non_witness_utxo->vout[input.prev_out];
 
             UniValue non_wit(UniValue::VOBJ);
             TxToUniv(*input.non_witness_utxo, /*block_hash=*/uint256(), /*entry=*/non_wit, /*include_hex=*/false);
@@ -1195,7 +1246,7 @@ static RPCMethod decodepsbt()
                 UniValue keypath(UniValue::VOBJ);
                 keypath.pushKV("pubkey", HexStr(entry.first));
 
-                keypath.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(entry.second.fingerprint)));
+                keypath.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(entry.second.fingerprint.data())));
                 keypath.pushKV("path", WriteHDKeypath(entry.second.path));
                 keypaths.push_back(std::move(keypath));
             }
@@ -1253,6 +1304,21 @@ static RPCMethod decodepsbt()
             in.pushKV("hash256_preimages", std::move(hash256_preimages));
         }
 
+        // PSBTv2
+        if (psbtx.GetVersion() >= 2) {
+            in.pushKV("previous_txid", input.prev_txid.GetHex());
+            in.pushKV("previous_vout", static_cast<uint64_t>(input.prev_out));
+            if (input.sequence.has_value()) {
+                in.pushKV("sequence", static_cast<uint64_t>(*input.sequence));
+            }
+            if (input.time_locktime.has_value()) {
+                in.pushKV("time_locktime", static_cast<uint64_t>(*input.time_locktime));
+            }
+            if (input.height_locktime.has_value()) {
+                in.pushKV("height_locktime", static_cast<uint64_t>(*input.height_locktime));
+            }
+        }
+
         // Taproot key path signature
         if (!input.m_tap_key_sig.empty()) {
             in.pushKV("taproot_key_path_sig", HexStr(input.m_tap_key_sig));
@@ -1297,7 +1363,7 @@ static RPCMethod decodepsbt()
                 const auto& [leaf_hashes, origin] = leaf_origin;
                 UniValue path_obj(UniValue::VOBJ);
                 path_obj.pushKV("pubkey", HexStr(xonly));
-                path_obj.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(origin.fingerprint)));
+                path_obj.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(origin.fingerprint.data())));
                 path_obj.pushKV("path", WriteHDKeypath(origin.path));
                 UniValue leaf_hashes_arr(UniValue::VARR);
                 for (const auto& leaf_hash : leaf_hashes) {
@@ -1416,13 +1482,21 @@ static RPCMethod decodepsbt()
             for (auto entry : output.hd_keypaths) {
                 UniValue keypath(UniValue::VOBJ);
                 keypath.pushKV("pubkey", HexStr(entry.first));
-                keypath.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(entry.second.fingerprint)));
+                keypath.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(entry.second.fingerprint.data())));
                 keypath.pushKV("path", WriteHDKeypath(entry.second.path));
                 keypaths.push_back(std::move(keypath));
             }
             out.pushKV("bip32_derivs", std::move(keypaths));
         }
 
+        // PSBTv2 stuff
+        if (psbtx.GetVersion() >= 2) {
+            out.pushKV("amount", ValueFromAmount(output.amount));
+            UniValue spk(UniValue::VOBJ);
+            ScriptToUniv(output.script, spk, /*include_hex=*/true, /*include_address=*/true);
+            out.pushKV("script", spk);
+        }
+
         // Taproot internal key
         if (!output.m_tap_internal_key.IsNull()) {
             out.pushKV("taproot_internal_key", HexStr(output.m_tap_internal_key));
@@ -1448,7 +1522,7 @@ static RPCMethod decodepsbt()
                 const auto& [leaf_hashes, origin] = leaf_origin;
                 UniValue path_obj(UniValue::VOBJ);
                 path_obj.pushKV("pubkey", HexStr(xonly));
-                path_obj.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(origin.fingerprint)));
+                path_obj.pushKV("master_fingerprint", strprintf("%08x", ReadBE32(origin.fingerprint.data())));
                 path_obj.pushKV("path", WriteHDKeypath(origin.path));
                 UniValue leaf_hashes_arr(UniValue::VARR);
                 for (const auto& leaf_hash : leaf_hashes) {
@@ -1502,8 +1576,8 @@ static RPCMethod decodepsbt()
         outputs.push_back(std::move(out));
 
         // Fee calculation
-        if (MoneyRange(psbtx.tx->vout[i].nValue) && MoneyRange(output_value + psbtx.tx->vout[i].nValue)) {
-            output_value += psbtx.tx->vout[i].nValue;
+        if (MoneyRange(output.amount) && MoneyRange(output_value + output.amount)) {
+            output_value += output.amount;
         } else {
             // Hack to just not show fee later
             have_all_utxos = false;
@@ -1547,21 +1621,20 @@ static RPCMethod combinepsbt()
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Parameter 'txs' cannot be empty");
     }
     for (unsigned int i = 0; i < txs.size(); ++i) {
-        PartiallySignedTransaction psbtx;
-        std::string error;
-        if (!DecodeBase64PSBT(psbtx, txs[i].get_str(), error)) {
-            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+        util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(txs[i].get_str());
+        if (!psbt_res) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
         }
-        psbtxs.push_back(psbtx);
+        psbtxs.push_back(*psbt_res);
     }
 
-    PartiallySignedTransaction merged_psbt;
-    if (!CombinePSBTs(merged_psbt, psbtxs)) {
+    std::optional<PartiallySignedTransaction> merged_psbt = CombinePSBTs(psbtxs);
+    if (!merged_psbt) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "PSBTs not compatible (different transactions)");
     }
 
     DataStream ssTx{};
-    ssTx << merged_psbt;
+    ssTx << *merged_psbt;
     return EncodeBase64(ssTx);
 },
     };
@@ -1593,11 +1666,11 @@ static RPCMethod finalizepsbt()
         [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transactions
-    PartiallySignedTransaction psbtx;
-    std::string error;
-    if (!DecodeBase64PSBT(psbtx, request.params[0].get_str(), error)) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(request.params[0].get_str());
+    if (!psbt_res) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
     }
+    PartiallySignedTransaction psbtx = *psbt_res;
 
     bool extract = request.params[1].isNull() || (!request.params[1].isNull() && request.params[1].get_bool());
 
@@ -1632,7 +1705,12 @@ static RPCMethod createpsbt()
                 "Implements the Creator role.\n"
                 "Note that the transaction's inputs are not signed, and\n"
                 "it is not stored in the wallet or transmitted to the network.\n",
-                CreateTxDoc(),
+                Cat<std::vector<RPCArg>>(
+                    CreateTxDoc(),
+                    {
+                        {"psbt_version", RPCArg::Type::NUM, RPCArg::Default{2}, "The PSBT version number to use."},
+                    }
+                ),
                 RPCResult{
                     RPCResult::Type::STR, "", "The resulting raw transaction (base64-encoded string)"
                 },
@@ -1641,7 +1719,6 @@ static RPCMethod createpsbt()
                 },
         [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
-
     std::optional<bool> rbf;
     if (!request.params[3].isNull()) {
         rbf = request.params[3].get_bool();
@@ -1649,14 +1726,14 @@ static RPCMethod createpsbt()
     CMutableTransaction rawTx = ConstructTransaction(request.params[0], request.params[1], request.params[2], rbf, self.Arg<uint32_t>("version"));
 
     // Make a blank psbt
-    PartiallySignedTransaction psbtx;
-    psbtx.tx = rawTx;
-    for (unsigned int i = 0; i < rawTx.vin.size(); ++i) {
-        psbtx.inputs.emplace_back();
+    uint32_t psbt_version = 2;
+    if (!request.params[5].isNull()) {
+        psbt_version = request.params[5].getInt<uint32_t>();
     }
-    for (unsigned int i = 0; i < rawTx.vout.size(); ++i) {
-        psbtx.outputs.emplace_back();
+    if (psbt_version != 2 && psbt_version != 0) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "The PSBT version can only be 2 or 0");
     }
+    PartiallySignedTransaction psbtx(rawTx, psbt_version);
 
     // Serialize the PSBT
     DataStream ssTx{};
@@ -1684,6 +1761,7 @@ static RPCMethod converttopsbt()
                         "This boolean should reflect whether the transaction has inputs\n"
                         "(e.g. fully valid, or on-chain transactions), if known by the caller."
                     },
+                    {"psbt_version", RPCArg::Type::NUM, RPCArg::Default{2}, "The PSBT version number to use."},
                 },
                 RPCResult{
                     RPCResult::Type::STR, "", "The resulting raw transaction (base64-encoded string)"
@@ -1717,14 +1795,14 @@ static RPCMethod converttopsbt()
     }
 
     // Make a blank psbt
-    PartiallySignedTransaction psbtx;
-    psbtx.tx = tx;
-    for (unsigned int i = 0; i < tx.vin.size(); ++i) {
-        psbtx.inputs.emplace_back();
+    uint32_t psbt_version = 2;
+    if (!request.params[3].isNull()) {
+        psbt_version = request.params[3].getInt<uint32_t>();
     }
-    for (unsigned int i = 0; i < tx.vout.size(); ++i) {
-        psbtx.outputs.emplace_back();
+    if (psbt_version != 2 && psbt_version != 0) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "The PSBT version can only be 2 or 0");
     }
+    PartiallySignedTransaction psbtx(tx, psbt_version);
 
     // Serialize the PSBT
     DataStream ssTx{};
@@ -1786,7 +1864,7 @@ static RPCMethod joinpsbts()
 {
     return RPCMethod{
         "joinpsbts",
-        "Joins multiple distinct PSBTs with different inputs and outputs into one PSBT with inputs and outputs from all of the PSBTs\n"
+        "Joins multiple distinct version 0 PSBTs with different inputs and outputs into one version 0 PSBT with inputs and outputs from all of the PSBTs\n"
             "No input in any of the PSBTs can be in more than one of the PSBTs.\n",
             {
                 {"txs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The base64 strings of partially signed transactions",
@@ -1813,37 +1891,41 @@ static RPCMethod joinpsbts()
     uint32_t best_version = 1;
     uint32_t best_locktime = 0xffffffff;
     for (unsigned int i = 0; i < txs.size(); ++i) {
-        PartiallySignedTransaction psbtx;
-        std::string error;
-        if (!DecodeBase64PSBT(psbtx, txs[i].get_str(), error)) {
-            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+        util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(txs[i].get_str());
+        if (!psbt_res) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
+        }
+        psbtxs.push_back(*psbt_res);
+        const PartiallySignedTransaction& psbtx = psbtxs.back();
+        if (psbtx.GetVersion() != 0) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "joinpsbts only operates on version 0 PSBTs");
         }
-        psbtxs.push_back(psbtx);
         // Choose the highest version number
-        if (psbtx.tx->version > best_version) {
-            best_version = psbtx.tx->version;
+        if (psbtx.tx_version > best_version) {
+            best_version = psbtx.tx_version;
         }
         // Choose the lowest lock time
-        if (psbtx.tx->nLockTime < best_locktime) {
-            best_locktime = psbtx.tx->nLockTime;
+        uint32_t psbt_locktime = psbtx.fallback_locktime.value_or(0);
+        if (psbt_locktime < best_locktime) {
+            best_locktime = psbt_locktime;
         }
     }
 
     // Create a blank psbt where everything will be added
-    PartiallySignedTransaction merged_psbt;
-    merged_psbt.tx = CMutableTransaction();
-    merged_psbt.tx->version = best_version;
-    merged_psbt.tx->nLockTime = best_locktime;
+    CMutableTransaction tx;
+    tx.version = best_version;
+    tx.nLockTime = best_locktime;
+    PartiallySignedTransaction merged_psbt(tx, psbtxs.at(0).GetVersion());
 
     // Merge
     for (auto& psbt : psbtxs) {
-        for (unsigned int i = 0; i < psbt.tx->vin.size(); ++i) {
-            if (!merged_psbt.AddInput(psbt.tx->vin[i], psbt.inputs[i])) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input %s:%d exists in multiple PSBTs", psbt.tx->vin[i].prevout.hash.ToString(), psbt.tx->vin[i].prevout.n));
+        for (const PSBTInput& input : psbt.inputs) {
+            if (!merged_psbt.AddInput(input)) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input %s:%d exists in multiple PSBTs", input.prev_txid.ToString(), input.prev_out));
             }
         }
-        for (unsigned int i = 0; i < psbt.tx->vout.size(); ++i) {
-            merged_psbt.AddOutput(psbt.tx->vout[i], psbt.outputs[i]);
+        for (const PSBTOutput& output : psbt.outputs) {
+            merged_psbt.AddOutput(output);
         }
         for (auto& xpub_pair : psbt.m_xpubs) {
             if (!merged_psbt.m_xpubs.contains(xpub_pair.first)) {
@@ -1865,15 +1947,12 @@ static RPCMethod joinpsbts()
     std::shuffle(input_indices.begin(), input_indices.end(), FastRandomContext());
     std::shuffle(output_indices.begin(), output_indices.end(), FastRandomContext());
 
-    PartiallySignedTransaction shuffled_psbt;
-    shuffled_psbt.tx = CMutableTransaction();
-    shuffled_psbt.tx->version = merged_psbt.tx->version;
-    shuffled_psbt.tx->nLockTime = merged_psbt.tx->nLockTime;
+    PartiallySignedTransaction shuffled_psbt(tx, merged_psbt.GetVersion());
     for (int i : input_indices) {
-        shuffled_psbt.AddInput(merged_psbt.tx->vin[i], merged_psbt.inputs[i]);
+        shuffled_psbt.AddInput(merged_psbt.inputs[i]);
     }
     for (int i : output_indices) {
-        shuffled_psbt.AddOutput(merged_psbt.tx->vout[i], merged_psbt.outputs[i]);
+        shuffled_psbt.AddOutput(merged_psbt.outputs[i]);
     }
     shuffled_psbt.unknown.insert(merged_psbt.unknown.begin(), merged_psbt.unknown.end());
 
@@ -1930,11 +2009,11 @@ static RPCMethod analyzepsbt()
         [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transaction
-    PartiallySignedTransaction psbtx;
-    std::string error;
-    if (!DecodeBase64PSBT(psbtx, request.params[0].get_str(), error)) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(request.params[0].get_str());
+    if (!psbt_res) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
     }
+    const PartiallySignedTransaction& psbtx = *psbt_res;
 
     PSBTAnalysis psbta = AnalyzePSBT(psbtx);
 
@@ -2053,10 +2132,12 @@ RPCMethod descriptorprocesspsbt()
         sighash_type,
         finalize);
 
-    // Check whether or not all of the inputs are now signed
+    // Check whether or not all of the inputs are now correctly signed
     bool complete = true;
-    for (const auto& input : psbtx.inputs) {
-        complete &= PSBTInputSigned(input);
+    const std::optional<PrecomputedTransactionData> txdata_opt{PrecomputePSBTData(psbtx)};
+    const PrecomputedTransactionData txdata{*CHECK_NONFATAL(txdata_opt)};
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
+        complete = complete && PSBTInputSignedAndVerified(psbtx, i, &txdata);
     }
 
     DataStream ssTx{};
diff --git a/depend/bitcoin/src/rpc/rawtransaction_util.cpp b/depend/bitcoin/src/rpc/rawtransaction_util.cpp
index f8b6e208..c90ead5a 100644
--- a/depend/bitcoin/src/rpc/rawtransaction_util.cpp
+++ b/depend/bitcoin/src/rpc/rawtransaction_util.cpp
@@ -17,6 +17,7 @@
 #include <script/signingprovider.h>
 #include <tinyformat.h>
 #include <univalue.h>
+#include <util/check.h>
 #include <util/rbf.h>
 #include <util/string.h>
 #include <util/strencodings.h>
@@ -346,35 +347,75 @@ void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const
 
 std::vector<RPCResult> TxDoc(const TxDocOptions& opts)
 {
-    std::optional<std::string> maybe_skip{};
-    if (opts.elision_description) maybe_skip.emplace();
-    return {
-        {RPCResult::Type::STR_HEX, "txid", opts.txid_field_doc, {}, {.print_elision=opts.elision_description}},
-        {RPCResult::Type::STR_HEX, "hash", "The transaction hash (differs from txid for witness transactions)", {}, {.print_elision=maybe_skip}},
-        {RPCResult::Type::NUM, "size", "The serialized transaction size", {}, {.print_elision=maybe_skip}},
-        {RPCResult::Type::NUM, "vsize", "The virtual transaction size (differs from size for witness transactions)", {}, {.print_elision=maybe_skip}},
-        {RPCResult::Type::NUM, "weight", "The transaction's weight (between vsize*4-3 and vsize*4)", {}, {.print_elision=maybe_skip}},
-        {RPCResult::Type::NUM, "version", "The version", {}, {.print_elision=maybe_skip}},
-        {RPCResult::Type::NUM_TIME, "locktime", "The lock time", {}, {.print_elision=maybe_skip}},
+    CHECK_NONFATAL(!opts.fee_doc || opts.fee);
+    CHECK_NONFATAL(!opts.prevout_doc || opts.prevout);
+    CHECK_NONFATAL(!opts.vin_item_doc || opts.vin_inner_elision);
+    CHECK_NONFATAL(opts.elision_mode != ElisionMode::WithSummary || opts.elision_summary.has_value());
+
+    const std::string fee_doc{opts.fee_doc.value_or(
+        "transaction fee in " + CURRENCY_UNIT + ", omitted if block undo data is not available")};
+    const std::string prevout_doc{opts.prevout_doc.value_or(
+        "The previous output, omitted if block undo data is not available")};
+    const std::string vin_item_doc{opts.vin_item_doc.value_or("utxo being spent")};
+
+    auto vin_inner = std::vector<RPCResult>{
+        {RPCResult::Type::STR_HEX, "coinbase", /*optional=*/true, "The coinbase value (only if coinbase transaction)"},
+        {RPCResult::Type::STR_HEX, "txid", /*optional=*/true, "The transaction id (if not coinbase transaction)"},
+        {RPCResult::Type::NUM, "vout", /*optional=*/true, "The output number (if not coinbase transaction)"},
+        {RPCResult::Type::OBJ, "scriptSig", /*optional=*/true, "The script (if not coinbase transaction)",
+        {
+            {RPCResult::Type::STR, "asm", "Disassembly of the signature script"},
+            {RPCResult::Type::STR_HEX, "hex", "The raw signature script bytes, hex-encoded"},
+        }},
+        {RPCResult::Type::ARR, "txinwitness", /*optional=*/true, "",
+        {
+            {RPCResult::Type::STR_HEX, "hex", "hex-encoded witness data (if any)"},
+        }},
+    };
+    if (opts.prevout) {
+        vin_inner.emplace_back(
+            RPCResult::Type::OBJ, "prevout", opts.prevout_optional, prevout_doc,
+            std::vector<RPCResult>{
+                {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
+                {RPCResult::Type::NUM, "height", "The height of the prevout"},
+                {RPCResult::Type::STR_AMOUNT, "value", "The value in " + CURRENCY_UNIT},
+                {RPCResult::Type::OBJ, "scriptPubKey", "", ScriptPubKeyDoc()},
+            }
+        );
+    }
+    vin_inner.emplace_back(RPCResult::Type::NUM, "sequence", "The script sequence number");
+
+    if (opts.vin_inner_elision) {
+        vin_inner = ElideGroup(std::move(vin_inner), *opts.vin_inner_elision);
+        if (opts.prevout) {
+            // prevout remains visible even when other fields are elided
+            std::vector<RPCResult> new_vin;
+            new_vin.reserve(vin_inner.size());
+            for (const auto& r : vin_inner) {
+                if (r.m_key_name == "prevout") {
+                    RPCResultOptions unopts = r.m_opts;
+                    unopts.print_elision = HelpElisionNone{};
+                    new_vin.emplace_back(r, std::move(unopts));
+                } else {
+                    new_vin.push_back(r);
+                }
+            }
+            vin_inner = std::move(new_vin);
+        }
+    }
+
+    auto fields = std::vector<RPCResult>{
+        {RPCResult::Type::STR_HEX, "txid", opts.txid_field_doc},
+        {RPCResult::Type::STR_HEX, "hash", "The transaction hash (differs from txid for witness transactions)"},
+        {RPCResult::Type::NUM, "size", "The serialized transaction size"},
+        {RPCResult::Type::NUM, "vsize", "The virtual transaction size (differs from size for witness transactions)"},
+        {RPCResult::Type::NUM, "weight", "The transaction's weight (between vsize*4-3 and vsize*4)"},
+        {RPCResult::Type::NUM, "version", "The version"},
+        {RPCResult::Type::NUM_TIME, "locktime", "The lock time"},
         {RPCResult::Type::ARR, "vin", "",
         {
-            {RPCResult::Type::OBJ, "", "",
-            {
-                {RPCResult::Type::STR_HEX, "coinbase", /*optional=*/true, "The coinbase value (only if coinbase transaction)"},
-                {RPCResult::Type::STR_HEX, "txid", /*optional=*/true, "The transaction id (if not coinbase transaction)"},
-                {RPCResult::Type::NUM, "vout", /*optional=*/true, "The output number (if not coinbase transaction)"},
-                {RPCResult::Type::OBJ, "scriptSig", /*optional=*/true, "The script (if not coinbase transaction)",
-                {
-                    {RPCResult::Type::STR, "asm", "Disassembly of the signature script"},
-                    {RPCResult::Type::STR_HEX, "hex", "The raw signature script bytes, hex-encoded"},
-                }},
-                {RPCResult::Type::ARR, "txinwitness", /*optional=*/true, "",
-                {
-                    {RPCResult::Type::STR_HEX, "hex", "hex-encoded witness data (if any)"},
-                }},
-                {RPCResult::Type::NUM, "sequence", "The script sequence number"},
-            }},
-        }, {.print_elision=maybe_skip}},
+            {RPCResult::Type::OBJ, "", opts.vin_inner_elision ? vin_item_doc : "", std::move(vin_inner)},
+        }},
         {RPCResult::Type::ARR, "vout", "",
         {
             {RPCResult::Type::OBJ, "", "", Cat(
@@ -383,11 +424,43 @@ std::vector<RPCResult> TxDoc(const TxDocOptions& opts)
                     {RPCResult::Type::NUM, "n", "index"},
                     {RPCResult::Type::OBJ, "scriptPubKey", "", ScriptPubKeyDoc()},
                 },
-                    opts.wallet ?
+                opts.wallet ?
                     std::vector<RPCResult>{{RPCResult::Type::BOOL, "ischange", /*optional=*/true, "Output script is change (only present if true)"}} :
                     std::vector<RPCResult>{}
-                )
-            },
-        }, {.print_elision=maybe_skip}},
+            )},
+        }},
     };
+
+    if (opts.fee) fields.emplace_back(RPCResult::Type::NUM, "fee", /*optional=*/true, fee_doc);
+    if (opts.hex) fields.emplace_back(RPCResult::Type::STR_HEX, "hex", "The hex-encoded transaction data");
+
+    if (opts.elision_mode != ElisionMode::None) {
+        const bool silent = opts.elision_mode == ElisionMode::Silent;
+        std::vector<RPCResult> new_fields;
+        new_fields.reserve(fields.size());
+        bool first = true;
+        for (const auto& f : fields) {
+            if (!silent && f.m_key_name == "fee") {
+                new_fields.push_back(f);
+                continue;
+            }
+            if (f.m_key_name == "vin" && opts.vin_inner_elision) {
+                new_fields.push_back(f);
+                continue;
+            }
+            if (!silent && first) {
+                RPCResultOptions eopts = f.m_opts;
+                eopts.print_elision = opts.elision_summary.value_or("");
+                new_fields.emplace_back(f, std::move(eopts));
+                first = false;
+            } else {
+                RPCResultOptions eopts = f.m_opts;
+                eopts.print_elision = HelpElisionSkip{};
+                new_fields.emplace_back(f, std::move(eopts));
+            }
+        }
+        fields = std::move(new_fields);
+    }
+
+    return fields;
 }
diff --git a/depend/bitcoin/src/rpc/rawtransaction_util.h b/depend/bitcoin/src/rpc/rawtransaction_util.h
index 5a1bc604..52d5e394 100644
--- a/depend/bitcoin/src/rpc/rawtransaction_util.h
+++ b/depend/bitcoin/src/rpc/rawtransaction_util.h
@@ -56,13 +56,37 @@ void AddOutputs(CMutableTransaction& rawTx, const UniValue& outputs_in);
 /** Create a transaction from univalue parameters */
 CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, std::optional<bool> rbf, uint32_t version);
 
+enum class ElisionMode {
+    None,        ///< no elision, all top-level fields rendered normally
+    WithSummary, ///< first field carries elision_summary as "...", rest skipped
+    Silent,      ///< all top-level fields skipped silently (no "..." line)
+};
+
 struct TxDocOptions {
     /// The description of the txid field
     std::string txid_field_doc{"The transaction id"};
     /// Include wallet-related fields (e.g. ischange on outputs)
     bool wallet{false};
-    /// Treat this as an elided Result in the help
-    std::optional<std::string> elision_description{};
+    /// Controls top-level field elision in the help
+    ElisionMode elision_mode{ElisionMode::None};
+    /// Summary text shown as "..." required for elision_mode == WithSummary
+    std::optional<std::string> elision_summary{};
+    /// Include prevout field
+    bool prevout{false};
+    /// Mark prevout field as optional (omitted when undo data unavailable)
+    bool prevout_optional{false};
+    /// Include fee field
+    bool fee{false};
+    /// Include hex field
+    bool hex{false};
+    /// Customize the vin item object's description (only meaningful when vin_inner_elision is set)
+    std::optional<std::string> vin_item_doc{};
+    /// Customize the prevout field's description (only meaningful when prevout is true)
+    std::optional<std::string> prevout_doc{};
+    /// Customize the fee field's description (only meaningful when fee is true)
+    std::optional<std::string> fee_doc{};
+    /// Elide vin inner fields but keep vin array with prevout expanded.
+    std::optional<std::string> vin_inner_elision{};
 };
 /** Explain the UniValue "decoded" transaction object, may include extra fields if processed by wallet **/
 std::vector<RPCResult> TxDoc(const TxDocOptions& opts = {});
diff --git a/depend/bitcoin/src/rpc/server.cpp b/depend/bitcoin/src/rpc/server.cpp
index 0894ba1c..1bc8933e 100644
--- a/depend/bitcoin/src/rpc/server.cpp
+++ b/depend/bitcoin/src/rpc/server.cpp
@@ -15,6 +15,7 @@
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <sync.h>
+#include <util/overloaded.h>
 #include <util/signalinterrupt.h>
 #include <util/strencodings.h>
 #include <util/string.h>
@@ -26,8 +27,11 @@
 #include <chrono>
 #include <memory>
 #include <mutex>
+#include <span>
 #include <string_view>
 #include <unordered_map>
+#include <unordered_set>
+#include <variant>
 
 using util::SplitString;
 
@@ -121,24 +125,27 @@ static RPCMethod help()
     return RPCMethod{
         "help",
         "List all commands, or get help for a specified command.\n",
-                {
-                    {"command", RPCArg::Type::STR, RPCArg::DefaultHint{"all commands"}, "The command to get help on"},
-                },
-                {
-                    RPCResult{RPCResult::Type::STR, "", "The help text"},
-                    RPCResult{RPCResult::Type::ANY, "", ""},
-                },
-                RPCExamples{""},
+        {
+            {"command", RPCArg::Type::STR, RPCArg::DefaultHint{"all commands"}, "The command to get help on"},
+        },
+        {
+            RPCResult{RPCResult::Type::STR, "", "The help text"},
+            RPCResult{RPCResult::Type::ANY, "", "The command conversions. (Hidden in dump_all_command_conversions)", /*inner=*/{},
+                      RPCResultOptions{
+                          .print_elision = HelpElisionSkip{},
+                      }},
+        },
+        RPCExamples{""},
         [](const RPCMethod& self, const JSONRPCRequest& jsonRequest) -> UniValue
-{
-    auto command{self.MaybeArg<std::string_view>("command")};
-    if (command == "dump_all_command_conversions") {
-        // Used for testing only, undocumented
-        return tableRPC.dumpArgMap(jsonRequest);
-    }
+        {
+            auto command{self.MaybeArg<std::string_view>("command")};
+            if (command == "dump_all_command_conversions") {
+                // Used for testing only, undocumented
+                return tableRPC.dumpArgMap(jsonRequest);
+            }
 
-    return tableRPC.help(command.value_or(""), jsonRequest);
-},
+            return tableRPC.help(command.value_or(""), jsonRequest);
+        },
     };
 }
 
@@ -235,8 +242,370 @@ static RPCMethod getrpcinfo()
     };
 }
 
+namespace {
+UniValue OpenRPCArgSchema(const RPCArg& arg, bool include_hidden, bool in_skip_type_check);
+UniValue OpenRPCResultSchema(const RPCResult& result);
+
+UniValue MakeObject(std::initializer_list<std::pair<std::string, UniValue>> entries)
+{
+    UniValue obj{UniValue::VOBJ};
+    for (const auto& [key, value] : entries) {
+        obj.pushKV(key, value);
+    }
+    return obj;
+}
+
+void PushUniqueSchema(UniValue& schemas, std::unordered_set<std::string>& seen, UniValue schema)
+{
+    const std::string serialized{schema.write()};
+    if (seen.insert(serialized).second) schemas.push_back(std::move(schema));
+}
+
+// NOLINTNEXTLINE(misc-no-recursion)
+UniValue DedupArrayItemsSchema(std::span<const RPCArg> inner, bool include_hidden, bool in_skip_type_check)
+{
+    if (inner.empty()) return UniValue{UniValue::VOBJ};
+    if (inner.size() == 1) return OpenRPCArgSchema(inner.front(), include_hidden, in_skip_type_check);
+
+    UniValue one_of{UniValue::VARR};
+    std::unordered_set<std::string> seen;
+    for (const auto& item : inner) {
+        PushUniqueSchema(one_of, seen, OpenRPCArgSchema(item, include_hidden, in_skip_type_check));
+    }
+
+    if (one_of.size() == 1) return one_of[0];
+
+    UniValue items{UniValue::VOBJ};
+    items.pushKV(in_skip_type_check ? "anyOf" : "oneOf", std::move(one_of));
+    return items;
+}
+
+// NOLINTNEXTLINE(misc-no-recursion)
+UniValue DedupArrayItemsSchema(std::span<const RPCResult> inner)
+{
+    if (inner.empty()) return UniValue{UniValue::VOBJ};
+    if (inner.size() == 1) return OpenRPCResultSchema(inner.front());
+
+    UniValue one_of{UniValue::VARR};
+    std::unordered_set<std::string> seen;
+    for (const auto& item : inner) {
+        PushUniqueSchema(one_of, seen, OpenRPCResultSchema(item));
+    }
+
+    if (one_of.size() == 1) return one_of[0];
+
+    UniValue items{UniValue::VOBJ};
+    items.pushKV("oneOf", std::move(one_of));
+    return items;
+}
+
+void ApplyTypeStrOverride(UniValue& schema, const RPCArg& arg)
+{
+    if (arg.m_opts.type_str.size() != 2) return;
+    const std::string& type_label{arg.m_opts.type_str[1]};
+    if (type_label.empty()) return;
+
+    static const std::unordered_set<std::string> number_or_string{
+        "integer / string",
+        "string or numeric",
+    };
+    if (number_or_string.contains(type_label)) {
+        UniValue one_of{UniValue::VARR};
+        one_of.push_back(MakeObject({{"type", "integer"}}));
+        one_of.push_back(MakeObject({{"type", "string"}}));
+        schema = UniValue{UniValue::VOBJ};
+        schema.pushKV("oneOf", std::move(one_of));
+    } else {
+        schema.pushKV("x-bitcoin-type-override", type_label);
+    }
+}
+
+void ApplyArgFallback(UniValue& schema, const RPCArg& arg)
+{
+    std::visit(util::Overloaded{
+                   [&](const RPCArg::Default& def) { schema.pushKV("default", def); },
+                   [&](const RPCArg::DefaultHint& hint) { schema.pushKV("x-bitcoin-default-hint", hint); },
+                   [](const RPCArg::Optional&) {},
+               },
+               arg.m_fallback);
+}
+
+// NOLINTNEXTLINE(misc-no-recursion)
+UniValue OpenRPCArgSchema(const RPCArg& arg, bool include_hidden, bool in_skip_type_check)
+{
+    UniValue schema{UniValue::VOBJ};
+    if (arg.m_opts.skip_type_check) {
+        ApplyTypeStrOverride(schema, arg);
+        if (schema.empty() && arg.m_type == RPCArg::Type::ARR) {
+            UniValue items{UniValue::VOBJ};
+            items.pushKV("type", "array");
+            items.pushKV("items", DedupArrayItemsSchema(arg.m_inner, include_hidden, /*in_skip_type_check=*/true));
+
+            UniValue one_of{UniValue::VARR};
+            one_of.push_back(std::move(items));
+            one_of.push_back(MakeObject({{"type", "object"}}));
+            schema.pushKV("oneOf", std::move(one_of));
+        }
+        ApplyArgFallback(schema, arg);
+        return schema;
+    }
+
+    switch (arg.m_type) {
+    case RPCArg::Type::STR:
+        schema = MakeObject({{"type", "string"}});
+        break;
+    case RPCArg::Type::STR_HEX:
+        schema = MakeObject({{"type", "string"}, {"pattern", "^[0-9a-fA-F]+$"}});
+        break;
+    case RPCArg::Type::NUM:
+        schema = MakeObject({{"type", "number"}});
+        break;
+    case RPCArg::Type::BOOL:
+        schema = MakeObject({{"type", "boolean"}});
+        break;
+    case RPCArg::Type::AMOUNT: {
+        UniValue one_of{UniValue::VARR};
+        one_of.push_back(MakeObject({{"type", "number"}}));
+        one_of.push_back(MakeObject({{"type", "string"}}));
+        schema.pushKV("oneOf", std::move(one_of));
+        break;
+    }
+    case RPCArg::Type::RANGE: {
+        UniValue items{UniValue::VARR};
+        items.push_back(MakeObject({{"type", "number"}}));
+        items.push_back(MakeObject({{"type", "number"}}));
+        UniValue range_schema{UniValue::VOBJ};
+        range_schema.pushKV("type", "array");
+        range_schema.pushKV("items", std::move(items));
+        range_schema.pushKV("additionalItems", false);
+        range_schema.pushKV("minItems", 2);
+        range_schema.pushKV("maxItems", 2);
+        UniValue one_of{UniValue::VARR};
+        one_of.push_back(MakeObject({{"type", "number"}}));
+        one_of.push_back(std::move(range_schema));
+        schema.pushKV("oneOf", std::move(one_of));
+        break;
+    }
+    case RPCArg::Type::ARR: {
+        UniValue items{DedupArrayItemsSchema(arg.m_inner, include_hidden, in_skip_type_check)};
+        schema.pushKV("type", "array");
+        schema.pushKV("items", std::move(items));
+        break;
+    }
+    case RPCArg::Type::OBJ:
+    case RPCArg::Type::OBJ_NAMED_PARAMS: {
+        UniValue properties{UniValue::VOBJ};
+        UniValue required{UniValue::VARR};
+        for (const auto& inner : arg.m_inner) {
+            if (!include_hidden && inner.m_opts.hidden) continue;
+            UniValue prop{OpenRPCArgSchema(inner, include_hidden, in_skip_type_check)};
+            if (!inner.m_description.empty()) prop.pushKV("description", inner.m_description);
+            if (inner.m_opts.placeholder) prop.pushKV("x-bitcoin-placeholder", true);
+            if (inner.m_opts.also_positional) prop.pushKV("x-bitcoin-also-positional", true);
+            properties.pushKV(inner.GetFirstName(), std::move(prop));
+            if (!inner.IsOptional()) required.push_back(inner.GetFirstName());
+        }
+        schema.pushKV("type", "object");
+        schema.pushKV("properties", std::move(properties));
+        schema.pushKV("additionalProperties", false);
+        if (!required.empty()) schema.pushKV("required", std::move(required));
+        break;
+    }
+    case RPCArg::Type::OBJ_USER_KEYS: {
+        schema.pushKV("type", "object");
+        if (!arg.m_inner.empty()) {
+            schema.pushKV("additionalProperties", OpenRPCArgSchema(arg.m_inner[0], include_hidden, in_skip_type_check));
+            if (!arg.m_inner[0].m_description.empty()) {
+                schema.pushKV("description", arg.m_inner[0].m_description);
+            }
+        } else {
+            schema.pushKV("additionalProperties", true);
+        }
+        break;
+    }
+    } // no default case, so the compiler can warn about missing cases
+    ApplyTypeStrOverride(schema, arg);
+    ApplyArgFallback(schema, arg);
+    return schema;
+}
+
+// NOLINTNEXTLINE(misc-no-recursion)
+UniValue OpenRPCResultSchema(const RPCResult& result)
+{
+    if (result.m_opts.skip_type_check) {
+        RPCResultOptions opts{result.m_opts};
+        opts.skip_type_check = false;
+        if (result.m_type == RPCResult::Type::OBJ) {
+            UniValue obj_schema{OpenRPCResultSchema(RPCResult{result, std::move(opts)})};
+            if (result.m_key_name.empty()) return obj_schema;
+
+            UniValue one_of{UniValue::VARR};
+            one_of.push_back(std::move(obj_schema));
+            one_of.push_back(MakeObject({{"const", false}}));
+            UniValue schema{UniValue::VOBJ};
+            schema.pushKV("oneOf", std::move(one_of));
+            return schema;
+        }
+        if (result.m_type == RPCResult::Type::ARR) return OpenRPCResultSchema(RPCResult{result, std::move(opts)});
+        return UniValue{UniValue::VOBJ};
+    }
+
+    switch (result.m_type) {
+    case RPCResult::Type::STR:
+        return MakeObject({{"type", "string"}});
+    case RPCResult::Type::STR_AMOUNT:
+        return MakeObject({{"type", "number"}, {"x-bitcoin-unit", "amount"}});
+    case RPCResult::Type::STR_HEX:
+        return MakeObject({{"type", "string"}, {"pattern", "^[0-9a-fA-F]+$"}});
+    case RPCResult::Type::NUM:
+        return MakeObject({{"type", "number"}});
+    case RPCResult::Type::NUM_TIME: {
+        UniValue schema{UniValue::VOBJ};
+        schema.pushKV("type", "number");
+        schema.pushKV("x-bitcoin-unit", "unix-time");
+        return schema;
+    }
+    case RPCResult::Type::BOOL:
+        return MakeObject({{"type", "boolean"}});
+    case RPCResult::Type::NONE:
+        return MakeObject({{"type", "null"}});
+    case RPCResult::Type::ARR: {
+        UniValue items{DedupArrayItemsSchema(result.m_inner)};
+        UniValue schema{UniValue::VOBJ};
+        schema.pushKV("type", "array");
+        schema.pushKV("items", std::move(items));
+        return schema;
+    }
+    case RPCResult::Type::ARR_FIXED: {
+        UniValue items{UniValue::VARR};
+        for (const auto& inner : result.m_inner) {
+            items.push_back(OpenRPCResultSchema(inner));
+        }
+        UniValue schema{UniValue::VOBJ};
+        schema.pushKV("type", "array");
+        schema.pushKV("items", std::move(items));
+        schema.pushKV("additionalItems", false);
+        schema.pushKV("minItems", uint64_t(result.m_inner.size()));
+        schema.pushKV("maxItems", uint64_t(result.m_inner.size()));
+        return schema;
+    }
+    case RPCResult::Type::OBJ: {
+        UniValue properties{UniValue::VOBJ};
+        UniValue required{UniValue::VARR};
+        for (const auto& inner : result.m_inner) {
+            if (inner.m_key_name.empty()) continue;
+            UniValue prop{OpenRPCResultSchema(inner)};
+            if (!inner.m_description.empty()) prop.pushKV("description", inner.m_description);
+            properties.pushKV(inner.m_key_name, std::move(prop));
+            if (!inner.m_optional) required.push_back(inner.m_key_name);
+        }
+        UniValue schema{UniValue::VOBJ};
+        schema.pushKV("type", "object");
+        schema.pushKV("properties", std::move(properties));
+        schema.pushKV("additionalProperties", false);
+        if (!required.empty()) schema.pushKV("required", std::move(required));
+        return schema;
+    }
+    case RPCResult::Type::OBJ_DYN: {
+        UniValue schema{UniValue::VOBJ};
+        schema.pushKV("type", "object");
+        if (!result.m_inner.empty()) {
+            schema.pushKV("additionalProperties", OpenRPCResultSchema(result.m_inner[0]));
+        } else {
+            schema.pushKV("additionalProperties", UniValue{UniValue::VOBJ});
+        }
+        return schema;
+    }
+    case RPCResult::Type::ANY:
+        return UniValue{UniValue::VOBJ};
+    } // no default case, so the compiler can warn about missing cases
+    NONFATAL_UNREACHABLE();
+}
+} // namespace
+
+static RPCResult OpenRPCDocResult()
+{
+    return RPCResult{
+        RPCResult::Type::OBJ, "", "",
+        {
+            {RPCResult::Type::STR, "openrpc", "OpenRPC specification version."},
+            {RPCResult::Type::OBJ, "info", "Metadata about this JSON-RPC interface.",
+                {
+                    {RPCResult::Type::STR, "title", "API title."},
+                    {RPCResult::Type::STR, "version", "Bitcoin Core version string."},
+                    {RPCResult::Type::STR, "description", "API description."},
+                }},
+            {RPCResult::Type::ARR, "methods", "Documented RPC methods.",
+                {{RPCResult::Type::OBJ, "", "An RPC method description object.",
+                    {
+                        {RPCResult::Type::STR, "name", "Method name."},
+                        {RPCResult::Type::STR, "description", "Method description."},
+                        {RPCResult::Type::ARR, "params", "Method parameters.",
+                            {{RPCResult::Type::OBJ, "", "A parameter.",
+                                {
+                                    {RPCResult::Type::STR, "name", "Parameter name."},
+                                    {RPCResult::Type::BOOL, "required", "Whether the parameter is required."},
+                                    {RPCResult::Type::ANY, "schema", "JSON Schema for the parameter."},
+                                    {RPCResult::Type::STR, "description", /*optional=*/true, "Parameter description."},
+                                    {RPCResult::Type::ARR, "x-bitcoin-aliases", /*optional=*/true, "Alternative parameter names.",
+                                        {{RPCResult::Type::STR, "", "An alias."}}},
+                                    {RPCResult::Type::BOOL, "x-bitcoin-placeholder", /*optional=*/true, "Whether the parameter is retained only for compatibility."},
+                                    {RPCResult::Type::BOOL, "x-bitcoin-also-positional", /*optional=*/true, "Whether the parameter can also be passed positionally."},
+                                }}}},
+                        {RPCResult::Type::OBJ, "result", "Method result.",
+                            {
+                                {RPCResult::Type::STR, "name", "Result name."},
+                                {RPCResult::Type::ANY, "schema", "JSON Schema for the result."},
+                            }},
+                        {RPCResult::Type::STR, "x-bitcoin-category", "RPC category."},
+                    }}}},
+        },
+        {.skip_type_check = true}};
+}
+
+static RPCMethod getopenrpcinfo()
+{
+    return RPCMethod{
+        "getopenrpcinfo",
+        "Returns an OpenRPC document for currently available RPC commands.\n",
+        {
+            {"show_hidden", RPCArg::Type::BOOL, RPCArg::Default{false}, "Also include hidden RPC commands and arguments."},
+        },
+        OpenRPCDocResult(),
+        RPCExamples{
+            HelpExampleCli("getopenrpcinfo", "")
+            + HelpExampleRpc("getopenrpcinfo", "")
+        },
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
+        {
+            const bool include_hidden{self.Arg<bool>("show_hidden")};
+            return tableRPC.buildOpenRPCDoc(include_hidden);
+        },
+    };
+}
+
+static RPCMethod rpc_discover()
+{
+    return RPCMethod{
+        "rpc.discover",
+        "Returns an OpenRPC schema as a description of this service.\n",
+        {},
+        OpenRPCDocResult(),
+        RPCExamples{
+            HelpExampleCli("rpc.discover", "")
+            + HelpExampleRpc("rpc.discover", "")
+        },
+        [](const RPCMethod&, const JSONRPCRequest&) -> UniValue
+        {
+            return tableRPC.buildOpenRPCDoc(/*include_hidden=*/false);
+        },
+    };
+}
+
 static const CRPCCommand vRPCCommands[]{
     /* Overall control/query calls */
+    {"control", &getopenrpcinfo},
+    {"control", &rpc_discover},
     {"control", &getrpcinfo},
     {"control", &help},
     {"control", &stop},
@@ -264,6 +633,9 @@ bool CRPCTable::removeCommand(const std::string& name, const CRPCCommand* pcmd)
         auto new_end = std::remove(it->second.begin(), it->second.end(), pcmd);
         if (it->second.end() != new_end) {
             it->second.erase(new_end, it->second.end());
+            if (it->second.empty()) {
+                mapCommands.erase(it);
+            }
             return true;
         }
     }
@@ -524,6 +896,88 @@ std::vector<std::string> CRPCTable::listCommands() const
     return commandList;
 }
 
+UniValue CRPCTable::buildOpenRPCDoc(bool include_hidden) const
+{
+    std::vector<std::string> method_names;
+    for (const auto& [name, cmds] : mapCommands) {
+        if (cmds.empty()) continue;
+        const CRPCCommand* cmd{cmds.front()};
+        if ((!include_hidden && cmd->category == "hidden") || !cmd->metadata_fn) continue;
+        method_names.push_back(name);
+    }
+    std::sort(method_names.begin(), method_names.end());
+
+    UniValue methods{UniValue::VARR};
+    for (const auto& method_name : method_names) {
+        const CRPCCommand* cmd{mapCommands.at(method_name).front()};
+        RPCMethod helpman{cmd->metadata_fn()};
+
+        UniValue params{UniValue::VARR};
+        for (const auto& arg : helpman.GetArgs()) {
+            if (!include_hidden && arg.m_opts.hidden) continue;
+            UniValue param{UniValue::VOBJ};
+            param.pushKV("name", arg.GetFirstName());
+            param.pushKV("required", !arg.IsOptional());
+            param.pushKV("schema", OpenRPCArgSchema(arg, include_hidden, /*in_skip_type_check=*/false));
+
+            std::vector<std::string> names{SplitString(arg.m_names, '|')};
+            if (names.size() > 1) {
+                UniValue aliases{UniValue::VARR};
+                for (size_t i{1}; i < names.size(); ++i) aliases.push_back(names[i]);
+                param.pushKV("x-bitcoin-aliases", std::move(aliases));
+            }
+            if (arg.m_opts.placeholder) param.pushKV("x-bitcoin-placeholder", true);
+            if (arg.m_opts.also_positional) param.pushKV("x-bitcoin-also-positional", true);
+            if (!arg.m_description.empty()) param.pushKV("description", arg.m_description);
+            params.push_back(std::move(param));
+        }
+
+        UniValue result_schema{UniValue::VOBJ};
+        const auto& results{helpman.GetResults().m_results};
+        if (results.size() == 1 && results[0].m_type != RPCResult::Type::ANY) {
+            result_schema = OpenRPCResultSchema(results[0]);
+        } else if (results.size() > 1) {
+            UniValue one_of{UniValue::VARR};
+            for (const auto& r : results) {
+                if (r.m_type == RPCResult::Type::ANY) continue;
+                UniValue schema{OpenRPCResultSchema(r)};
+                if (!r.m_cond.empty()) schema.pushKV("description", r.m_cond);
+                one_of.push_back(std::move(schema));
+            }
+            if (one_of.size() == 1) {
+                result_schema = one_of[0];
+            } else if (one_of.size() > 1) {
+                result_schema.pushKV("oneOf", std::move(one_of));
+            }
+        }
+
+        UniValue method{UniValue::VOBJ};
+        method.pushKV("name", method_name);
+        method.pushKV("description", util::TrimString(helpman.GetDescription()));
+        method.pushKV("params", std::move(params));
+        UniValue result{UniValue::VOBJ};
+        result.pushKV("name", "result");
+        result.pushKV("schema", std::move(result_schema));
+        method.pushKV("result", std::move(result));
+        method.pushKV("x-bitcoin-category", cmd->category);
+        methods.push_back(std::move(method));
+    }
+
+    std::string version{"v" CLIENT_VERSION_STRING};
+    if (!CLIENT_VERSION_IS_RELEASE) version += "-dev";
+
+    UniValue info{UniValue::VOBJ};
+    info.pushKV("title", CLIENT_NAME " JSON-RPC");
+    info.pushKV("version", version);
+    info.pushKV("description", "Autogenerated from " CLIENT_NAME " RPC metadata.");
+
+    UniValue doc{UniValue::VOBJ};
+    doc.pushKV("openrpc", "1.4.1");
+    doc.pushKV("info", std::move(info));
+    doc.pushKV("methods", std::move(methods));
+    return doc;
+}
+
 UniValue CRPCTable::dumpArgMap(const JSONRPCRequest& args_request) const
 {
     JSONRPCRequest request = args_request;
diff --git a/depend/bitcoin/src/rpc/server.h b/depend/bitcoin/src/rpc/server.h
index 5355c320..208dd1be 100644
--- a/depend/bitcoin/src/rpc/server.h
+++ b/depend/bitcoin/src/rpc/server.h
@@ -13,6 +13,7 @@
 #include <functional>
 #include <map>
 #include <string>
+#include <string_view>
 
 #include <univalue.h>
 
@@ -62,6 +63,7 @@ class CRPCCommand
               fn().GetArgNames(),
               intptr_t(fn))
     {
+        this->metadata_fn = fn;
     }
 
     std::string category;
@@ -78,6 +80,7 @@ class CRPCCommand
     //! appended after other arguments, see transformNamedArguments for details.
     std::vector<std::pair<std::string, bool>> argNames;
     intptr_t unique_id;
+    RpcMethodFnType metadata_fn{nullptr};
 };
 
 /**
@@ -104,6 +107,8 @@ class CRPCTable
     * @returns List of registered commands.
     */
     std::vector<std::string> listCommands() const;
+    /** Return a complete OpenRPC 1.4.1 document for registered commands. */
+    UniValue buildOpenRPCDoc(bool include_hidden = false) const;
 
     /**
      * Return all named arguments that need to be converted by the client from string to another JSON type
diff --git a/depend/bitcoin/src/rpc/util.cpp b/depend/bitcoin/src/rpc/util.cpp
index 80b08d01..d9d1adb2 100644
--- a/depend/bitcoin/src/rpc/util.cpp
+++ b/depend/bitcoin/src/rpc/util.cpp
@@ -20,6 +20,7 @@
 #include <tinyformat.h>
 #include <uint256.h>
 #include <univalue.h>
+#include <util/bip32.h>
 #include <util/check.h>
 #include <util/result.h>
 #include <util/strencodings.h>
@@ -99,7 +100,7 @@ CAmount AmountFromValue(const UniValue& value, int decimals)
 {
     if (!value.isNum() && !value.isStr())
         throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number or string");
-    CAmount amount;
+    int64_t amount;
     if (!ParseFixedPoint(value.getValStr(), decimals, &amount))
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount");
     if (!MoneyRange(amount))
@@ -395,6 +396,8 @@ RPCErrorCode RPCErrorFromTransactionError(TransactionError terr)
             return RPC_TRANSACTION_REJECTED;
         case TransactionError::ALREADY_IN_UTXO_SET:
             return RPC_VERIFY_ALREADY_IN_UTXO_SET;
+        case TransactionError::PRIVATE_BROADCAST_FULL:
+            return RPC_LIMIT_EXCEEDED;
         default: break;
     }
     return RPC_TRANSACTION_ERROR;
@@ -614,14 +617,16 @@ std::string RPCResults::ToDescriptionString() const
 {
     std::string result;
     for (const auto& r : m_results) {
-        if (r.m_type == RPCResult::Type::ANY) continue; // for testing only
+        Sections sections;
+        r.ToSections(sections);
+        // A result can be empty via HelpElisionSkip
+        if (sections.m_sections.empty()) continue;
+
         if (r.m_cond.empty()) {
             result += "\nResult:\n";
         } else {
             result += "\nResult (" + r.m_cond + "):\n";
         }
-        Sections sections;
-        r.ToSections(sections);
         result += sections.ToString();
     }
     return result;
@@ -1015,27 +1020,25 @@ void RPCResult::ToSections(Sections& sections, const OuterType outer_type, const
                (this->m_description.empty() ? "" : " " + this->m_description);
     };
 
-    // Ensure at least one elision description exists, if there is any elision
+    // Ensure at least one visible field exists when elision is used
     const auto elision_has_description{[](const std::vector<RPCResult>& inner) {
-        return std::ranges::none_of(inner, [](const auto& res) { return res.m_opts.print_elision.has_value(); }) ||
-               std::ranges::any_of(inner, [](const auto& res) { return res.m_opts.print_elision.has_value() && !res.m_opts.print_elision->empty(); });
+        return std::ranges::any_of(inner, [](const auto& res) {
+            return !std::holds_alternative<HelpElisionSkip>(res.m_opts.print_elision);
+        });
     }};
 
-    if (m_opts.print_elision) {
-        if (!m_opts.print_elision->empty()) {
-            sections.PushSection({indent + "..." + maybe_separator, *m_opts.print_elision});
-        }
+    if (const auto* text = std::get_if<std::string>(&m_opts.print_elision)) {
+        sections.PushSection({indent + "..." + maybe_separator, *text});
         return;
     }
-
-    switch (m_type) {
-    case Type::ELISION: {
-        // Deprecated alias of m_opts.print_elision
-        sections.PushSection({indent + "..." + maybe_separator, m_description});
+    if (std::holds_alternative<HelpElisionSkip>(m_opts.print_elision)) {
         return;
     }
+
+    switch (m_type) {
     case Type::ANY: {
-        NONFATAL_UNREACHABLE(); // Only for testing
+        sections.PushSection({indent + maybe_key + "xxx" + maybe_separator, Description("any")});
+        return;
     }
     case Type::NONE: {
         sections.PushSection({indent + "null" + maybe_separator, Description("json null")});
@@ -1073,7 +1076,7 @@ void RPCResult::ToSections(Sections& sections, const OuterType outer_type, const
         }
         CHECK_NONFATAL(!m_inner.empty());
         CHECK_NONFATAL(elision_has_description(m_inner));
-        if (m_type == Type::ARR && m_inner.back().m_type != Type::ELISION) {
+        if (m_type == Type::ARR && !std::holds_alternative<std::string>(m_inner.back().m_opts.print_elision)) {
             sections.PushSection({indent_next + "...", ""});
         } else {
             // Remove final comma, which would be invalid JSON
@@ -1093,7 +1096,7 @@ void RPCResult::ToSections(Sections& sections, const OuterType outer_type, const
         for (const auto& i : m_inner) {
             i.ToSections(sections, OuterType::OBJ, current_indent + 2);
         }
-        if (m_type == Type::OBJ_DYN && m_inner.back().m_type != Type::ELISION) {
+        if (m_type == Type::OBJ_DYN) {
             // If the dictionary keys are dynamic, use three dots for continuation
             sections.PushSection({indent_next + "...", ""});
         } else {
@@ -1111,7 +1114,6 @@ static std::optional<UniValue::VType> ExpectedType(RPCResult::Type type)
 {
     using Type = RPCResult::Type;
     switch (type) {
-    case Type::ELISION:
     case Type::ANY: {
         return std::nullopt;
     }
@@ -1169,7 +1171,6 @@ UniValue RPCResult::MatchesType(const UniValue& result) const
     }
 
     if (UniValue::VOBJ == result.getType()) {
-        if (!m_inner.empty() && m_inner.at(0).m_type == Type::ELISION) return true;
         UniValue errors(UniValue::VOBJ);
         if (m_type == Type::OBJ_DYN) {
             const RPCResult& doc_inner{m_inner.at(0)}; // Assume all types are the same, randomly pick the first
@@ -1364,7 +1365,7 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl
         range.second = 0;
     }
     std::vector<CScript> ret;
-    for (int i = range.first; i <= range.second; ++i) {
+    for (int64_t i = range.first; i <= range.second; ++i) {
         for (const auto& desc : descs) {
             std::vector<CScript> scripts;
             if (!desc->Expand(i, provider, scripts, provider)) {
@@ -1379,6 +1380,15 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl
     return ret;
 }
 
+std::vector<uint32_t> ParsePathBIP32(const std::string& path)
+{
+    std::vector<uint32_t> out;
+    if (!ParseHDKeypath(path, out)) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid BIP32 keypath");
+    }
+    return out;
+}
+
 /** Convert a vector of bilingual strings to a UniValue::VARR containing their original untranslated values. */
 [[nodiscard]] static UniValue BilingualStringsToUniValue(const std::vector<bilingual_str>& bilingual_strings)
 {
@@ -1418,3 +1428,20 @@ uint256 GetTarget(const CBlockIndex& blockindex, const uint256 pow_limit)
     arith_uint256 target{*CHECK_NONFATAL(DeriveTarget(blockindex.nBits, pow_limit))};
     return ArithToUint256(target);
 }
+
+std::vector<RPCResult> ElideGroup(std::vector<RPCResult> fields, std::string summary)
+{
+    if (fields.empty()) return fields;
+    std::vector<RPCResult> result;
+    result.reserve(fields.size());
+    for (size_t i = 0; i < fields.size(); ++i) {
+        RPCResultOptions opts = fields[i].m_opts;
+        if (i == 0) {
+            opts.print_elision = summary;
+        } else {
+            opts.print_elision = HelpElisionSkip{};
+        }
+        result.emplace_back(fields[i], std::move(opts));
+    }
+    return result;
+}
diff --git a/depend/bitcoin/src/rpc/util.h b/depend/bitcoin/src/rpc/util.h
index 77199dfe..81e8e3d3 100644
--- a/depend/bitcoin/src/rpc/util.h
+++ b/depend/bitcoin/src/rpc/util.h
@@ -43,7 +43,7 @@ namespace node {
 enum class TransactionError;
 } // namespace node
 
-static constexpr bool DEFAULT_RPC_DOC_CHECK{
+inline constexpr bool DEFAULT_RPC_DOC_CHECK{
 #ifdef RPC_DOC_CHECK
     true
 #else
@@ -156,6 +156,9 @@ std::pair<int64_t, int64_t> ParseDescriptorRange(const UniValue& value);
 /** Evaluate a descriptor given as a string, or as a {"desc":...,"range":...} object, with default range of 1000. */
 std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, FlatSigningProvider& provider, bool expand_priv = false);
 
+//! Parse BIP32 path
+std::vector<uint32_t> ParsePathBIP32(const std::string& path);
+
 /**
  * Serializing JSON objects depends on the outer type. Only arrays and
  * dictionaries can be nested in json. The top-level outer type is "NONE".
@@ -170,6 +173,7 @@ struct RPCArgOptions {
     bool skip_type_check{false};
     std::string oneline_description{};   //!< Should be empty unless it is supposed to override the auto-generated summary line
     std::vector<std::string> type_str{}; //!< Should be empty unless it is supposed to override the auto-generated type strings. Vector length is either 0 or 2, m_opts.type_str.at(0) will override the type of the value in a key-value pair, m_opts.type_str.at(1) will override the type in the argument description.
+    bool placeholder{false};             //!< If set, the argument is retained only for compatibility and should generally be omitted.
     bool hidden{false};                  //!< For testing only
     bool also_positional{false};         //!< If set allows a named-parameter field in an OBJ_NAMED_PARAM options object
                                          //!< to have the same name as a top-level parameter. By default the RPC
@@ -236,7 +240,7 @@ struct RPCArg {
         std::string description,
         RPCArgOptions opts = {})
         : m_names{std::move(name)},
-          m_type{std::move(type)},
+          m_type{type},
           m_fallback{std::move(fallback)},
           m_description{std::move(description)},
           m_opts{std::move(opts)}
@@ -252,7 +256,7 @@ struct RPCArg {
         std::vector<RPCArg> inner,
         RPCArgOptions opts = {})
         : m_names{std::move(name)},
-          m_type{std::move(type)},
+          m_type{type},
           m_inner{std::move(inner)},
           m_fallback{std::move(fallback)},
           m_description{std::move(description)},
@@ -292,18 +296,17 @@ struct RPCArg {
     std::string ToDescriptionString(bool is_named_arg) const;
 };
 
+/// Controls how an RPCResult is rendered in human-readable help text.
+/// The std::string alternative carries the summary text rendered as "...".
+struct HelpElisionNone {}; //!< field printed normally
+struct HelpElisionSkip {}; //!< field hidden from help
+using HelpElision = std::variant<HelpElisionNone, HelpElisionSkip, std::string>;
+
 struct RPCResultOptions {
     bool skip_type_check{false};
-    /// Whether to treat this as elided in the human-readable description, and
-    /// possibly supply a description for the elision. Normally, there will be
-    /// one string on any of the elided results, for example `Same output as
-    /// verbosity = 1`, and all other elided strings will be empty.
-    ///
-    /// - If nullopt: normal display.
-    /// - If empty string: suppress from help.
-    /// - If non-empty: show "..." with this description.
-    std::optional<std::string> print_elision{std::nullopt};
+    HelpElision print_elision{HelpElisionNone{}};
 };
+
 // NOLINTNEXTLINE(misc-no-recursion)
 struct RPCResult {
     enum class Type {
@@ -313,13 +316,12 @@ struct RPCResult {
         NUM,
         BOOL,
         NONE,
-        ANY,        //!< Special type to disable type checks (for testing only)
+        ANY,        //!< Special type to disable type checks
         STR_AMOUNT, //!< Special string to represent a floating point amount
         STR_HEX,    //!< Special string with only hex chars
         OBJ_DYN,    //!< Special dictionary with keys that are not literals
         ARR_FIXED,  //!< Special array that has a fixed number of entries
         NUM_TIME,   //!< Special numeric to denote unix epoch time
-        ELISION,    //!< Special type to denote elision (...)
     };
 
     const Type m_type;
@@ -338,7 +340,7 @@ struct RPCResult {
         std::string description,
         std::vector<RPCResult> inner = {},
         RPCResultOptions opts = {})
-        : m_type{std::move(type)},
+        : m_type{type},
           m_key_name{std::move(m_key_name)},
           m_inner{std::move(inner)},
           m_optional{optional},
@@ -366,7 +368,7 @@ struct RPCResult {
         std::string description,
         std::vector<RPCResult> inner = {},
         RPCResultOptions opts = {})
-        : m_type{std::move(type)},
+        : m_type{type},
           m_key_name{std::move(m_key_name)},
           m_inner{std::move(inner)},
           m_optional{optional},
@@ -385,6 +387,16 @@ struct RPCResult {
         RPCResultOptions opts = {})
         : RPCResult{type, std::move(m_key_name), /*optional=*/false, std::move(description), std::move(inner), std::move(opts)} {}
 
+    /// Copy with replacement options, for stamping new opts onto an existing result.
+    RPCResult(const RPCResult& other, RPCResultOptions opts)
+        : m_type{other.m_type},
+          m_key_name{other.m_key_name},
+          m_inner{other.m_inner},
+          m_optional{other.m_optional},
+          m_opts{std::move(opts)},
+          m_description{other.m_description},
+          m_cond{other.m_cond} {}
+
     /** Append the sections of the result. */
     void ToSections(Sections& sections, OuterType outer_type = OuterType::NONE, int current_indent = 0) const;
     /** Return the type string of the result when it is in an object (dict). */
@@ -400,6 +412,10 @@ struct RPCResult {
     void CheckInnerDoc() const;
 };
 
+/// Stamp elision onto an entire vector of RPCResult fields at once.
+/// Merges into existing m_opts so that flags like skip_type_check are preserved.
+std::vector<RPCResult> ElideGroup(std::vector<RPCResult> fields, std::string summary = "");
+
 struct RPCResults {
     const std::vector<RPCResult> m_results;
 
@@ -506,6 +522,9 @@ class RPCMethod
     bool IsValidNumArgs(size_t num_args) const;
     //! Return list of arguments and whether they are named-only.
     std::vector<std::pair<std::string, bool>> GetArgNames() const;
+    const std::string& GetDescription() const { return m_description; }
+    const std::vector<RPCArg>& GetArgs() const { return m_args; }
+    const RPCResults& GetResults() const { return m_results; }
 
     const std::string m_name;
 
diff --git a/depend/bitcoin/src/scheduler.h b/depend/bitcoin/src/scheduler.h
index 5d4affb0..0a05f6cb 100644
--- a/depend/bitcoin/src/scheduler.h
+++ b/depend/bitcoin/src/scheduler.h
@@ -70,6 +70,7 @@ class CScheduler
     void MockForward(std::chrono::seconds delta_seconds) EXCLUSIVE_LOCKS_REQUIRED(!newTaskMutex);
 
     /**
+     * \anchor scheduler
      * Services the queue 'forever'. Should be run in a thread.
      */
     void serviceQueue() EXCLUSIVE_LOCKS_REQUIRED(!newTaskMutex);
diff --git a/depend/bitcoin/src/script/descriptor.cpp b/depend/bitcoin/src/script/descriptor.cpp
index 19315dd6..16868cce 100644
--- a/depend/bitcoin/src/script/descriptor.cpp
+++ b/depend/bitcoin/src/script/descriptor.cpp
@@ -4,29 +4,45 @@
 
 #include <script/descriptor.h>
 
+#include <addresstype.h>
+#include <attributes.h>
+#include <consensus/consensus.h>
+#include <crypto/hex_base.h>
+#include <crypto/sha256.h>
 #include <hash.h>
+#include <key.h>
 #include <key_io.h>
-#include <pubkey.h>
 #include <musig.h>
+#include <primitives/transaction.h>
+#include <pubkey.h>
+#include <script/interpreter.h>
+#include <script/keyorigin.h>
 #include <script/miniscript.h>
 #include <script/parsing.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
+#include <serialize.h>
+#include <tinyformat.h>
 #include <uint256.h>
-
-#include <common/args.h>
-#include <span.h>
 #include <util/bip32.h>
 #include <util/check.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <util/vector.h>
 
 #include <algorithm>
+#include <iterator>
+#include <map>
 #include <memory>
 #include <numeric>
 #include <optional>
+#include <span>
+#include <stdexcept>
 #include <string>
+#include <tuple>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 using util::Split;
@@ -218,6 +234,14 @@ struct PubkeyProvider
     /** Derive a private key, if private data is available in arg and put it into out. */
     virtual void GetPrivKey(int pos, const SigningProvider& arg, FlatSigningProvider& out) const = 0;
 
+    /** Whether private data for this provider is available in arg. */
+    virtual bool HavePrivateKeys(const SigningProvider& arg) const
+    {
+        FlatSigningProvider tmp_provider;
+        GetPrivKey(/*pos=*/0, arg, tmp_provider);
+        return !tmp_provider.keys.empty();
+    }
+
     /** Return the non-extended public key for this PubkeyProvider, if it has one. */
     virtual std::optional<CPubKey> GetRootPubKey() const = 0;
     /** Return the extended public key for this PubkeyProvider, if it has one. */
@@ -231,6 +255,9 @@ struct PubkeyProvider
 
     /** Get the count of keys known by this PubkeyProvider. Usually one, but may be more for key aggregation schemes */
     virtual size_t GetKeyCount() const { return 1; }
+
+    /** Whether this PubkeyProvider can always provide a public key without cache or private key arguments */
+    virtual bool CanSelfExpand() const = 0;
 };
 
 class OriginPubkeyProvider final : public PubkeyProvider
@@ -255,7 +282,7 @@ class OriginPubkeyProvider final : public PubkeyProvider
         Assert(out.pubkeys.contains(pub->GetID()));
         auto& [pubkey, suborigin] = out.origins[pub->GetID()];
         Assert(pubkey == *pub); // m_provider must have a valid origin by this point.
-        std::copy(std::begin(m_origin.fingerprint), std::end(m_origin.fingerprint), suborigin.fingerprint);
+        suborigin.fingerprint = m_origin.fingerprint;
         suborigin.path.insert(suborigin.path.begin(), m_origin.path.begin(), m_origin.path.end());
         return pub;
     }
@@ -301,6 +328,7 @@ class OriginPubkeyProvider final : public PubkeyProvider
     {
         return std::make_unique<OriginPubkeyProvider>(m_expr_index, m_origin, m_provider->Clone(), m_apostrophe);
     }
+    bool CanSelfExpand() const override { return m_provider->CanSelfExpand(); }
 };
 
 /** An object representing a parsed constant public key in a descriptor. */
@@ -323,7 +351,7 @@ class ConstPubkeyProvider final : public PubkeyProvider
     {
         KeyOriginInfo info;
         CKeyID keyid = m_pubkey.GetID();
-        std::copy(keyid.begin(), keyid.begin() + sizeof(info.fingerprint), info.fingerprint);
+        info.fingerprint = keyid.fingerprint();
         out.origins.emplace(keyid, std::make_pair(m_pubkey, info));
         out.pubkeys.emplace(keyid, m_pubkey);
         return m_pubkey;
@@ -365,6 +393,7 @@ class ConstPubkeyProvider final : public PubkeyProvider
     {
         return std::make_unique<ConstPubkeyProvider>(m_expr_index, m_pubkey, m_xonly);
     }
+    bool CanSelfExpand() const final { return true; }
 };
 
 enum class DeriveType {
@@ -388,7 +417,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
         CKey key;
         if (!arg.GetKey(m_root_extkey.pubkey.GetID(), key)) return false;
         ret.nDepth = m_root_extkey.nDepth;
-        std::copy(m_root_extkey.vchFingerprint, m_root_extkey.vchFingerprint + sizeof(ret.vchFingerprint), ret.vchFingerprint);
+        ret.fingerprint = m_root_extkey.fingerprint;
         ret.nChild = m_root_extkey.nChild;
         ret.chaincode = m_root_extkey.chaincode;
         ret.key = key;
@@ -411,10 +440,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
     bool IsHardened() const
     {
         if (m_derive == DeriveType::HARDENED_RANGED) return true;
-        for (auto entry : m_path) {
-            if (entry >> 31) return true;
-        }
-        return false;
+        return HasHardenedDerivation(m_path);
     }
 
 public:
@@ -425,8 +451,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
     std::optional<CPubKey> GetPubKey(int pos, const SigningProvider& arg, FlatSigningProvider& out, const DescriptorCache* read_cache = nullptr, DescriptorCache* write_cache = nullptr) const override
     {
         KeyOriginInfo info;
-        CKeyID keyid = m_root_extkey.pubkey.GetID();
-        std::copy(keyid.begin(), keyid.begin() + sizeof(info.fingerprint), info.fingerprint);
+        info.fingerprint = m_root_extkey.id_key_fingerprint();
         info.path = m_path;
         if (m_derive == DeriveType::UNHARDENED_RANGED) info.path.push_back((uint32_t)pos);
         if (m_derive == DeriveType::HARDENED_RANGED) info.path.push_back(((uint32_t)pos) | 0x80000000L);
@@ -543,9 +568,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
         for (; k < (int)m_path.size(); ++k) {
             end_path.push_back(m_path.at(k));
         }
-        // Get the fingerprint
-        CKeyID id = m_root_extkey.pubkey.GetID();
-        std::copy(id.begin(), id.begin() + 4, origin.fingerprint);
+        origin.fingerprint = m_root_extkey.id_key_fingerprint();
 
         CExtPubKey xpub;
         CExtKey lh_xprv;
@@ -591,6 +614,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
     {
         return std::make_unique<BIP32PubkeyProvider>(m_expr_index, m_root_extkey, m_path, m_derive, m_apostrophe);
     }
+    bool CanSelfExpand() const override { return !IsHardened(); }
 };
 
 /** PubkeyProvider for a musig() expression */
@@ -762,6 +786,11 @@ class MuSigPubkeyProvider final : public PubkeyProvider
         }
     }
 
+    bool HavePrivateKeys(const SigningProvider& arg) const override
+    {
+        return std::ranges::all_of(m_participants, [&](const auto& prov) { return prov->HavePrivateKeys(arg); });
+    }
+
     // Get RootPubKey and GetRootExtPubKey are used to return the single pubkey underlying the pubkey provider
     // to be presented to the user in gethdkeys. As this is a multisig construction, there is no single underlying
     // pubkey hence nothing should be returned.
@@ -794,6 +823,15 @@ class MuSigPubkeyProvider final : public PubkeyProvider
     {
         return 1 + m_participants.size();
     }
+    bool CanSelfExpand() const override
+    {
+        // Participants must be self expandable for all MuSig expressions to be self expandable; the aggregate pubkey cannot be stored
+        // in the descriptor cache, so even aggregate-then-derive still requires the self expansion of participants prior to aggregation.
+        for (const auto& key : m_participants) {
+            if (!key->CanSelfExpand()) return false;
+        }
+        return true;
+    }
 };
 
 /** Base class for all Descriptor implementations. */
@@ -808,7 +846,7 @@ class DescriptorImpl : public Descriptor
     std::vector<std::string> m_warnings;
 
     //! The sub-descriptor arguments (empty for everything but SH and WSH).
-    //! In doc/descriptors.m this is referred to as SCRIPT expressions sh(SCRIPT)
+    //! In doc/descriptors.md this is referred to as SCRIPT expressions sh(SCRIPT)
     //! and wsh(SCRIPT), and distinct from KEY expressions and ADDR expressions.
     //! Subdescriptors can only ever generate a single script.
     const std::vector<std::unique_ptr<DescriptorImpl>> m_subdescriptor_args;
@@ -859,11 +897,8 @@ class DescriptorImpl : public Descriptor
             if (!sub->HavePrivateKeys(arg)) return false;
         }
 
-        FlatSigningProvider tmp_provider;
         for (const auto& pubkey : m_pubkey_args) {
-            tmp_provider.keys.clear();
-            pubkey->GetPrivKey(0, arg, tmp_provider);
-            if (tmp_provider.keys.empty()) return false;
+            if (!pubkey->HavePrivateKeys(arg)) return false;
         }
 
         return true;
@@ -1038,6 +1073,8 @@ class DescriptorImpl : public Descriptor
 
     virtual std::unique_ptr<DescriptorImpl> Clone() const = 0;
 
+    bool HasScripts() const override { return true; }
+
     // NOLINTNEXTLINE(misc-no-recursion)
     std::vector<std::string> Warnings() const override {
         std::vector<std::string> all = m_warnings;
@@ -1081,6 +1118,18 @@ class DescriptorImpl : public Descriptor
         }
         return count;
     }
+
+    // NOLINTNEXTLINE(misc-no-recursion)
+    bool CanSelfExpand() const override
+    {
+        for (const auto& key : m_pubkey_args) {
+            if (!key->CanSelfExpand()) return false;
+        }
+        for (const auto& sub : m_subdescriptor_args) {
+            if (!sub->CanSelfExpand()) return false;
+        }
+        return true;
+    }
 };
 
 /** A parsed addr(A) descriptor. */
@@ -1738,6 +1787,23 @@ class RawTRDescriptor final : public DescriptorImpl
     }
 };
 
+/** A parsed unused(KEY) descriptor */
+class UnusedDescriptor final : public DescriptorImpl
+{
+protected:
+    std::vector<CScript> MakeScripts(const std::vector<CPubKey>& keys, std::span<const CScript> scripts, FlatSigningProvider& out) const override { return {}; }
+public:
+    UnusedDescriptor(std::unique_ptr<PubkeyProvider> prov) : DescriptorImpl(Vector(std::move(prov)), "unused") {}
+    bool IsSingleType() const final { return true; }
+    bool HasScripts() const override { return false; }
+
+    std::unique_ptr<DescriptorImpl> Clone() const override
+    {
+        return std::make_unique<UnusedDescriptor>(m_pubkey_args.at(0)->Clone());
+    }
+};
+
+
 ////////////////////////////////////////////////////////////////////////////
 // Parser                                                                 //
 ////////////////////////////////////////////////////////////////////////////
@@ -2129,7 +2195,7 @@ std::vector<std::unique_ptr<PubkeyProvider>> ParsePubkey(uint32_t& key_exp_index
     KeyOriginInfo info;
     static_assert(sizeof(info.fingerprint) == 4, "Fingerprint must be 4 bytes");
     assert(fpr_bytes.size() == 4);
-    std::copy(fpr_bytes.begin(), fpr_bytes.end(), info.fingerprint);
+    std::copy_n(fpr_bytes.begin(), info.fingerprint.size(), info.fingerprint.begin());
     std::vector<KeyPath> path;
     if (!ParseKeyPath(slash_split, path, apostrophe, error, /*allow_multipath=*/false)) return {};
     info.path = path.at(0);
@@ -2575,6 +2641,27 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
         error = "Can only have rawtr at top level";
         return {};
     }
+    if (ctx == ParseScriptContext::TOP && Func("unused", expr)) {
+        // Check for only one expression, should not find commas, brackets, or parentheses
+        auto arg = Expr(expr);
+        if (expr.size()) {
+            error = strprintf("unused(): only one key expected");
+            return {};
+        }
+        auto keys = ParsePubkey(key_exp_index, arg, ctx, out, error);
+        if (keys.empty()) return {};
+        for (auto& pubkey : keys) {
+            if (pubkey->IsRange()) {
+                error = "unused(): key cannot be ranged";
+                return {};
+            }
+            ret.emplace_back(std::make_unique<UnusedDescriptor>(std::move(pubkey)));
+        }
+        return ret;
+    } else if (Func("unused", expr)) {
+        error = "Can only have unused at top level";
+        return {};
+    }
     if (ctx == ParseScriptContext::TOP && Func("raw", expr)) {
         std::string str(expr.begin(), expr.end());
         if (!IsHex(str)) {
diff --git a/depend/bitcoin/src/script/descriptor.h b/depend/bitcoin/src/script/descriptor.h
index 3ac748a1..26781629 100644
--- a/depend/bitcoin/src/script/descriptor.h
+++ b/depend/bitcoin/src/script/descriptor.h
@@ -6,13 +6,23 @@
 #define BITCOIN_SCRIPT_DESCRIPTOR_H
 
 #include <outputtype.h>
-#include <script/script.h>
-#include <script/sign.h>
-#include <script/signingprovider.h>
+#include <pubkey.h>
+#include <uint256.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <optional>
+#include <set>
+#include <string>
+#include <string_view>
+#include <unordered_map>
 #include <vector>
 
+class CScript;
+class SigningProvider;
+struct FlatSigningProvider;
+
 using ExtPubKeyMap = std::unordered_map<uint32_t, CExtPubKey>;
 
 /** Cache for single descriptor's derived extended pubkeys */
@@ -108,7 +118,7 @@ struct Descriptor {
     /** Convert the descriptor back to a string, undoing parsing. */
     virtual std::string ToString(bool compat_format=false) const = 0;
 
-    /** Whether this descriptor will return one scriptPubKey or multiple (aka is or is not combo) */
+    /** Whether this descriptor will return at most one scriptPubKey or multiple (aka is or is not combo) */
     virtual bool IsSingleType() const = 0;
 
     /** Whether the given provider has all private keys required by this descriptor.
@@ -130,6 +140,9 @@ struct Descriptor {
     /** Convert the descriptor to a normalized string. Normalized descriptors have the xpub at the last hardened step. This fails if the provided provider does not have the private keys to derive that xpub. */
     virtual bool ToNormalizedString(const SigningProvider& provider, std::string& out, const DescriptorCache* cache = nullptr) const = 0;
 
+    /** Whether the descriptor can be used to produce its address(es) without needing a cache or private keys. */
+    virtual bool CanSelfExpand() const = 0;
+
     /** Expand a descriptor at a specified position.
      *
      * @param[in] pos The position at which to expand the descriptor. If IsRange() is false, this is ignored.
@@ -179,6 +192,9 @@ struct Descriptor {
      */
     virtual void GetPubKeys(std::set<CPubKey>& pubkeys, std::set<CExtPubKey>& ext_pubs) const = 0;
 
+    /** Whether this descriptor produces any scripts with the Expand functions */
+    virtual bool HasScripts() const = 0;
+
     /** Semantic/safety warnings (includes subdescriptors). */
     virtual std::vector<std::string> Warnings() const = 0;
 
diff --git a/depend/bitcoin/src/script/interpreter.cpp b/depend/bitcoin/src/script/interpreter.cpp
index 443714ce..98b16eca 100644
--- a/depend/bitcoin/src/script/interpreter.cpp
+++ b/depend/bitcoin/src/script/interpreter.cpp
@@ -8,11 +8,21 @@
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
+#include <prevector.h>
 #include <pubkey.h>
 #include <script/script.h>
+#include <serialize.h>
+#include <span.h>
 #include <tinyformat.h>
 #include <uint256.h>
 
+#include <algorithm>
+#include <cassert>
+#include <compare>
+#include <cstring>
+#include <limits>
+#include <stdexcept>
+
 typedef std::vector<unsigned char> valtype;
 
 namespace {
diff --git a/depend/bitcoin/src/script/interpreter.h b/depend/bitcoin/src/script/interpreter.h
index cbb137e0..47d9bfb0 100644
--- a/depend/bitcoin/src/script/interpreter.h
+++ b/depend/bitcoin/src/script/interpreter.h
@@ -9,21 +9,22 @@
 #include <consensus/amount.h>
 #include <hash.h>
 #include <primitives/transaction.h>
-#include <script/script_error.h> // IWYU pragma: export
-#include <script/verify_flags.h> // IWYU pragma: export
-#include <span.h>
+#include <script/script.h>
+#include <script/script_error.h>
+#include <script/verify_flags.h>
 #include <uint256.h>
 
 #include <cstddef>
 #include <cstdint>
+#include <map>
 #include <optional>
+#include <span>
+#include <string>
+#include <utility>
 #include <vector>
 
 class CPubKey;
-class CScript;
-class CScriptNum;
 class XOnlyPubKey;
-struct CScriptWitness;
 
 /** Signature hash types/flags */
 enum
@@ -44,7 +45,7 @@ enum
  *  flags (A | B) is a subset of the acceptable scripts under flag (A).
  */
 
-static constexpr script_verify_flags SCRIPT_VERIFY_NONE{0};
+inline constexpr script_verify_flags SCRIPT_VERIFY_NONE{0};
 
 enum class script_verify_flag_name : uint8_t {
     // Evaluate P2SH subscripts (BIP16).
@@ -151,12 +152,12 @@ enum class script_verify_flag_name : uint8_t {
 };
 using enum script_verify_flag_name;
 
-static constexpr int MAX_SCRIPT_VERIFY_FLAGS_BITS = static_cast<int>(SCRIPT_VERIFY_END_MARKER);
+inline constexpr int MAX_SCRIPT_VERIFY_FLAGS_BITS = static_cast<int>(SCRIPT_VERIFY_END_MARKER);
 
 // assert there is still a spare bit
 static_assert(0 < MAX_SCRIPT_VERIFY_FLAGS_BITS && MAX_SCRIPT_VERIFY_FLAGS_BITS <= 63);
 
-static constexpr script_verify_flags::value_type MAX_SCRIPT_VERIFY_FLAGS = ((script_verify_flags::value_type{1} << MAX_SCRIPT_VERIFY_FLAGS_BITS) - 1);
+inline constexpr script_verify_flags::value_type MAX_SCRIPT_VERIFY_FLAGS = ((script_verify_flags::value_type{1} << MAX_SCRIPT_VERIFY_FLAGS_BITS) - 1);
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, script_verify_flags flags, ScriptError* serror);
 
@@ -234,16 +235,16 @@ struct ScriptExecutionData
 };
 
 /** Signature hash sizes */
-static constexpr size_t WITNESS_V0_SCRIPTHASH_SIZE = 32;
-static constexpr size_t WITNESS_V0_KEYHASH_SIZE = 20;
-static constexpr size_t WITNESS_V1_TAPROOT_SIZE = 32;
-
-static constexpr uint8_t TAPROOT_LEAF_MASK = 0xfe;
-static constexpr uint8_t TAPROOT_LEAF_TAPSCRIPT = 0xc0;
-static constexpr size_t TAPROOT_CONTROL_BASE_SIZE = 33;
-static constexpr size_t TAPROOT_CONTROL_NODE_SIZE = 32;
-static constexpr size_t TAPROOT_CONTROL_MAX_NODE_COUNT = 128;
-static constexpr size_t TAPROOT_CONTROL_MAX_SIZE = TAPROOT_CONTROL_BASE_SIZE + TAPROOT_CONTROL_NODE_SIZE * TAPROOT_CONTROL_MAX_NODE_COUNT;
+inline constexpr size_t WITNESS_V0_SCRIPTHASH_SIZE = 32;
+inline constexpr size_t WITNESS_V0_KEYHASH_SIZE = 20;
+inline constexpr size_t WITNESS_V1_TAPROOT_SIZE = 32;
+
+inline constexpr uint8_t TAPROOT_LEAF_MASK = 0xfe;
+inline constexpr uint8_t TAPROOT_LEAF_TAPSCRIPT = 0xc0;
+inline constexpr size_t TAPROOT_CONTROL_BASE_SIZE = 33;
+inline constexpr size_t TAPROOT_CONTROL_NODE_SIZE = 32;
+inline constexpr size_t TAPROOT_CONTROL_MAX_NODE_COUNT = 128;
+inline constexpr size_t TAPROOT_CONTROL_MAX_SIZE = TAPROOT_CONTROL_BASE_SIZE + TAPROOT_CONTROL_NODE_SIZE * TAPROOT_CONTROL_MAX_NODE_COUNT;
 
 extern const HashWriter HASHER_TAPSIGHASH; //!< Hasher with tag "TapSighash" pre-fed to it.
 extern const HashWriter HASHER_TAPLEAF;    //!< Hasher with tag "TapLeaf" pre-fed to it.
diff --git a/depend/bitcoin/src/script/keyorigin.h b/depend/bitcoin/src/script/keyorigin.h
index e54133cd..190b4f6b 100644
--- a/depend/bitcoin/src/script/keyorigin.h
+++ b/depend/bitcoin/src/script/keyorigin.h
@@ -5,28 +5,23 @@
 #ifndef BITCOIN_SCRIPT_KEYORIGIN_H
 #define BITCOIN_SCRIPT_KEYORIGIN_H
 
+#include <pubkey.h>
 #include <serialize.h>
 #include <vector>
 
 struct KeyOriginInfo
 {
-    unsigned char fingerprint[4]; //!< First 32 bits of the Hash160 of the public key at the root of the path
+    KeyFingerprint fingerprint; //!< First 32 bits of the Hash160 of the public key at the root of the path
     std::vector<uint32_t> path;
 
-    friend bool operator==(const KeyOriginInfo& a, const KeyOriginInfo& b)
-    {
-        return std::equal(std::begin(a.fingerprint), std::end(a.fingerprint), std::begin(b.fingerprint)) && a.path == b.path;
-    }
+    friend bool operator==(const KeyOriginInfo& a, const KeyOriginInfo& b) = default;
 
     friend bool operator<(const KeyOriginInfo& a, const KeyOriginInfo& b)
     {
         // Compare the fingerprints lexicographically
-        int fpr_cmp = memcmp(a.fingerprint, b.fingerprint, 4);
-        if (fpr_cmp < 0) {
-            return true;
-        } else if (fpr_cmp > 0) {
-            return false;
-        }
+        if (a.fingerprint < b.fingerprint) return true;
+        else if (a.fingerprint > b.fingerprint) return false;
+
         // Compare the sizes of the paths, shorter is "less than"
         if (a.path.size() < b.path.size()) {
             return true;
@@ -41,7 +36,7 @@ struct KeyOriginInfo
 
     void clear()
     {
-        memset(fingerprint, 0, 4);
+        fingerprint.fill(0);
         path.clear();
     }
 };
diff --git a/depend/bitcoin/src/script/miniscript.cpp b/depend/bitcoin/src/script/miniscript.cpp
index 6dc154a8..81160883 100644
--- a/depend/bitcoin/src/script/miniscript.cpp
+++ b/depend/bitcoin/src/script/miniscript.cpp
@@ -2,17 +2,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <limits>
-#include <vector>
+#include <script/miniscript.h>
 
 #include <primitives/transaction.h>
-#include <script/miniscript.h>
 #include <script/script.h>
 #include <script/solver.h>
-#include <span.h>
 #include <util/check.h>
 #include <util/vector.h>
 
+#include <limits>
+#include <vector>
+
 namespace miniscript {
 namespace internal {
 
diff --git a/depend/bitcoin/src/script/miniscript.h b/depend/bitcoin/src/script/miniscript.h
index f2b9cdc4..eba2fe2e 100644
--- a/depend/bitcoin/src/script/miniscript.h
+++ b/depend/bitcoin/src/script/miniscript.h
@@ -5,33 +5,35 @@
 #ifndef BITCOIN_SCRIPT_MINISCRIPT_H
 #define BITCOIN_SCRIPT_MINISCRIPT_H
 
+#include <consensus/consensus.h>
+#include <crypto/hex_base.h>
+#include <policy/policy.h>
+#include <script/interpreter.h>
+#include <script/parsing.h>
+#include <script/script.h>
+#include <serialize.h>
+#include <util/check.h>
+#include <util/strencodings.h>
+#include <util/string.h>
+#include <util/vector.h>
+
 #include <algorithm>
-#include <compare>
 #include <concepts>
 #include <cstdint>
 #include <cstdlib>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <optional>
 #include <set>
+#include <span>
 #include <stdexcept>
+#include <string>
+#include <string_view>
 #include <tuple>
 #include <utility>
+#include <variant>
 #include <vector>
 
-#include <consensus/consensus.h>
-#include <policy/policy.h>
-#include <script/interpreter.h>
-#include <script/parsing.h>
-#include <script/script.h>
-#include <serialize.h>
-#include <span.h>
-#include <util/check.h>
-#include <util/strencodings.h>
-#include <util/string.h>
-#include <util/vector.h>
-
 namespace miniscript {
 
 /** This type encapsulates the miniscript type system properties.
@@ -266,18 +268,18 @@ constexpr bool IsTapscript(MiniscriptContext ms_ctx)
 namespace internal {
 
 //! The maximum size of a witness item for a Miniscript under Tapscript context. (A BIP340 signature with a sighash type byte.)
-static constexpr uint32_t MAX_TAPMINISCRIPT_STACK_ELEM_SIZE{65};
+inline constexpr uint32_t MAX_TAPMINISCRIPT_STACK_ELEM_SIZE{65};
 
 //! version + nLockTime
-constexpr uint32_t TX_OVERHEAD{4 + 4};
+inline constexpr uint32_t TX_OVERHEAD{4 + 4};
 //! prevout + nSequence + scriptSig
-constexpr uint32_t TXIN_BYTES_NO_WITNESS{36 + 4 + 1};
+inline constexpr uint32_t TXIN_BYTES_NO_WITNESS{36 + 4 + 1};
 //! nValue + script len + OP_0 + pushdata 32.
-constexpr uint32_t P2WSH_TXOUT_BYTES{8 + 1 + 1 + 33};
+inline constexpr uint32_t P2WSH_TXOUT_BYTES{8 + 1 + 1 + 33};
 //! Data other than the witness in a transaction. Overhead + vin count + one vin + vout count + one vout + segwit marker
-constexpr uint32_t TX_BODY_LEEWAY_WEIGHT{(TX_OVERHEAD + GetSizeOfCompactSize(1) + TXIN_BYTES_NO_WITNESS + GetSizeOfCompactSize(1) + P2WSH_TXOUT_BYTES) * WITNESS_SCALE_FACTOR + 2};
+inline constexpr uint32_t TX_BODY_LEEWAY_WEIGHT{(TX_OVERHEAD + GetSizeOfCompactSize(1) + TXIN_BYTES_NO_WITNESS + GetSizeOfCompactSize(1) + P2WSH_TXOUT_BYTES) * WITNESS_SCALE_FACTOR + 2};
 //! Maximum possible stack size to spend a Taproot output (excluding the script itself).
-constexpr uint32_t MAX_TAPSCRIPT_SAT_SIZE{GetSizeOfCompactSize(MAX_STACK_SIZE) + (GetSizeOfCompactSize(MAX_TAPMINISCRIPT_STACK_ELEM_SIZE) + MAX_TAPMINISCRIPT_STACK_ELEM_SIZE) * MAX_STACK_SIZE + GetSizeOfCompactSize(TAPROOT_CONTROL_MAX_SIZE) + TAPROOT_CONTROL_MAX_SIZE};
+inline constexpr uint32_t MAX_TAPSCRIPT_SAT_SIZE{GetSizeOfCompactSize(MAX_STACK_SIZE) + (GetSizeOfCompactSize(MAX_TAPMINISCRIPT_STACK_ELEM_SIZE) + MAX_TAPMINISCRIPT_STACK_ELEM_SIZE) * MAX_STACK_SIZE + GetSizeOfCompactSize(TAPROOT_CONTROL_MAX_SIZE) + TAPROOT_CONTROL_MAX_SIZE};
 /** The maximum size of a script depending on the context. */
 constexpr uint32_t MaxScriptSize(MiniscriptContext ms_ctx)
 {
@@ -340,15 +342,15 @@ struct InputStack {
 };
 
 /** A stack consisting of a single zero-length element (interpreted as 0 by the script interpreter in numeric context). */
-static const auto ZERO = InputStack(std::vector<unsigned char>());
+inline const auto ZERO = InputStack(std::vector<unsigned char>());
 /** A stack consisting of a single malleable 32-byte 0x0000...0000 element (for dissatisfying hash challenges). */
-static const auto ZERO32 = InputStack(std::vector<unsigned char>(32, 0)).SetMalleable();
+inline const auto ZERO32 = InputStack(std::vector<unsigned char>(32, 0)).SetMalleable();
 /** A stack consisting of a single 0x01 element (interpreted as 1 by the script interpreted in numeric context). */
-static const auto ONE = InputStack(Vector((unsigned char)1));
+inline const auto ONE = InputStack(Vector((unsigned char)1));
 /** The empty stack. */
-static const auto EMPTY = InputStack();
+inline const auto EMPTY = InputStack();
 /** A stack representing the lack of any (dis)satisfactions. */
-static const auto INVALID = InputStack().SetAvailable(Availability::NO);
+inline const auto INVALID = InputStack().SetAvailable(Availability::NO);
 
 //! A pair of a satisfaction and a dissatisfaction InputStack.
 struct InputResult {
diff --git a/depend/bitcoin/src/script/parsing.cpp b/depend/bitcoin/src/script/parsing.cpp
index dd79f67e..598bb17f 100644
--- a/depend/bitcoin/src/script/parsing.cpp
+++ b/depend/bitcoin/src/script/parsing.cpp
@@ -4,8 +4,6 @@
 
 #include <script/parsing.h>
 
-#include <span.h>
-
 #include <algorithm>
 #include <cstddef>
 #include <string>
diff --git a/depend/bitcoin/src/script/parsing.h b/depend/bitcoin/src/script/parsing.h
index 462a42e7..1c504f36 100644
--- a/depend/bitcoin/src/script/parsing.h
+++ b/depend/bitcoin/src/script/parsing.h
@@ -5,8 +5,7 @@
 #ifndef BITCOIN_SCRIPT_PARSING_H
 #define BITCOIN_SCRIPT_PARSING_H
 
-#include <span.h>
-
+#include <span>
 #include <string>
 
 namespace script {
diff --git a/depend/bitcoin/src/script/script.cpp b/depend/bitcoin/src/script/script.cpp
index 3f764aaf..4097d13d 100644
--- a/depend/bitcoin/src/script/script.cpp
+++ b/depend/bitcoin/src/script/script.cpp
@@ -11,6 +11,7 @@
 #include <uint256.h>
 #include <util/hash_type.h>
 
+#include <compare>
 #include <string>
 
 CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in)) {}
diff --git a/depend/bitcoin/src/script/script.h b/depend/bitcoin/src/script/script.h
index b06be9c9..08cd18f2 100644
--- a/depend/bitcoin/src/script/script.h
+++ b/depend/bitcoin/src/script/script.h
@@ -8,14 +8,15 @@
 
 #include <attributes.h>
 #include <crypto/common.h>
-#include <prevector.h> // IWYU pragma: export
+#include <prevector.h>
 #include <serialize.h>
 #include <uint256.h>
 #include <util/hash_type.h>
 
 #include <cassert>
+#include <cstddef>
 #include <cstdint>
-#include <cstring>
+#include <iterator>
 #include <limits>
 #include <span>
 #include <stdexcept>
@@ -25,43 +26,43 @@
 #include <vector>
 
 // Maximum number of bytes pushable to the stack
-static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520;
+inline constexpr unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520;
 
 // Maximum number of non-push operations per script
-static const int MAX_OPS_PER_SCRIPT = 201;
+inline constexpr int MAX_OPS_PER_SCRIPT = 201;
 
 // Maximum number of public keys per multisig
-static const int MAX_PUBKEYS_PER_MULTISIG = 20;
+inline constexpr int MAX_PUBKEYS_PER_MULTISIG = 20;
 
 /** The limit of keys in OP_CHECKSIGADD-based scripts. It is due to the stack limit in BIP342. */
-static constexpr unsigned int MAX_PUBKEYS_PER_MULTI_A = 999;
+inline constexpr unsigned int MAX_PUBKEYS_PER_MULTI_A = 999;
 
 // Maximum script length in bytes
-static const int MAX_SCRIPT_SIZE = 10000;
+inline constexpr int MAX_SCRIPT_SIZE{10'000};
 
 // Maximum number of values on script interpreter stack
-static const int MAX_STACK_SIZE = 1000;
+inline constexpr int MAX_STACK_SIZE = 1000;
 
 // Threshold for nLockTime: below this value it is interpreted as block number,
 // otherwise as UNIX timestamp.
-static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov  5 00:53:20 1985 UTC
+inline constexpr unsigned int LOCKTIME_THRESHOLD{500'000'000}; // Tue Nov  5 00:53:20 1985 UTC
 
 // Maximum nLockTime. Since a lock time indicates the last invalid timestamp, a
 // transaction with this lock time will never be valid unless lock time
 // checking is disabled (by setting all input sequence numbers to
 // SEQUENCE_FINAL).
-static const uint32_t LOCKTIME_MAX = 0xFFFFFFFFU;
+inline constexpr uint32_t LOCKTIME_MAX = 0xFFFFFFFFU;
 
 // Tag for input annex. If there are at least two witness elements for a transaction input,
 // and the first byte of the last element is 0x50, this last element is called annex, and
 // has meanings independent of the script
-static constexpr unsigned int ANNEX_TAG = 0x50;
+inline constexpr unsigned int ANNEX_TAG = 0x50;
 
 // Validation weight per passing signature (Tapscript only, see BIP 342).
-static constexpr int64_t VALIDATION_WEIGHT_PER_SIGOP_PASSED{50};
+inline constexpr int64_t VALIDATION_WEIGHT_PER_SIGOP_PASSED{50};
 
 // How much weight budget is added to the witness size (Tapscript only, see BIP 342).
-static constexpr int64_t VALIDATION_WEIGHT_OFFSET{50};
+inline constexpr int64_t VALIDATION_WEIGHT_OFFSET{50};
 
 template <typename T>
 std::vector<unsigned char> ToByteVector(const T& in)
@@ -213,7 +214,7 @@ enum opcodetype
 };
 
 // Maximum value that an opcode can be
-static const unsigned int MAX_OPCODE = OP_NOP10;
+inline constexpr unsigned int MAX_OPCODE = OP_NOP10;
 
 std::string GetOpName(opcodetype opcode);
 
@@ -240,7 +241,7 @@ class CScriptNum
         m_value = n;
     }
 
-    static const size_t nDefaultMaxNumSize = 4;
+    static constexpr size_t nDefaultMaxNumSize{4};
 
     explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal,
                         const size_t nMaxNumSize = nDefaultMaxNumSize)
@@ -587,6 +588,8 @@ struct CScriptWitness
     void SetNull() { stack.clear(); stack.shrink_to_fit(); }
 
     std::string ToString() const;
+
+    bool operator==(const CScriptWitness&) const = default;
 };
 
 /** A reference to a CScript: the Hash160 of its serialization */
diff --git a/depend/bitcoin/src/script/sigcache.cpp b/depend/bitcoin/src/script/sigcache.cpp
index 90d1c845..c6fcc8f8 100644
--- a/depend/bitcoin/src/script/sigcache.cpp
+++ b/depend/bitcoin/src/script/sigcache.cpp
@@ -9,12 +9,12 @@
 #include <pubkey.h>
 #include <random.h>
 #include <script/interpreter.h>
-#include <span.h>
 #include <uint256.h>
 #include <util/log.h>
 
 #include <mutex>
 #include <shared_mutex>
+#include <utility>
 #include <vector>
 
 SignatureCache::SignatureCache(const size_t max_size_bytes)
diff --git a/depend/bitcoin/src/script/sigcache.h b/depend/bitcoin/src/script/sigcache.h
index fe9a3562..d11c6ad3 100644
--- a/depend/bitcoin/src/script/sigcache.h
+++ b/depend/bitcoin/src/script/sigcache.h
@@ -10,13 +10,15 @@
 #include <crypto/sha256.h>
 #include <cuckoocache.h>
 #include <script/interpreter.h>
-#include <span.h>
 #include <uint256.h>
-#include <util/byte_units.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/2014.
+#include <util/byte_units.h> // IWYU pragma: keep
 #include <util/hasher.h>
 
 #include <cstddef>
 #include <shared_mutex>
+#include <span>
 #include <vector>
 
 class CPubKey;
@@ -26,9 +28,9 @@ class XOnlyPubKey;
 // DoS prevention: limit cache size to 32MiB (over 1000000 entries on 64-bit
 // systems). Due to how we count cache size, actual memory usage is slightly
 // more (~32.25 MiB)
-static constexpr size_t DEFAULT_VALIDATION_CACHE_BYTES{32_MiB};
-static constexpr size_t DEFAULT_SIGNATURE_CACHE_BYTES{DEFAULT_VALIDATION_CACHE_BYTES / 2};
-static constexpr size_t DEFAULT_SCRIPT_EXECUTION_CACHE_BYTES{DEFAULT_VALIDATION_CACHE_BYTES / 2};
+inline constexpr size_t DEFAULT_VALIDATION_CACHE_BYTES{32_MiB};
+inline constexpr size_t DEFAULT_SIGNATURE_CACHE_BYTES{DEFAULT_VALIDATION_CACHE_BYTES / 2};
+inline constexpr size_t DEFAULT_SCRIPT_EXECUTION_CACHE_BYTES{DEFAULT_VALIDATION_CACHE_BYTES / 2};
 static_assert(DEFAULT_VALIDATION_CACHE_BYTES == DEFAULT_SIGNATURE_CACHE_BYTES + DEFAULT_SCRIPT_EXECUTION_CACHE_BYTES);
 
 /**
diff --git a/depend/bitcoin/src/script/sign.cpp b/depend/bitcoin/src/script/sign.cpp
index 6cbcf07e..c4d59de4 100644
--- a/depend/bitcoin/src/script/sign.cpp
+++ b/depend/bitcoin/src/script/sign.cpp
@@ -5,21 +5,36 @@
 
 #include <script/sign.h>
 
+#include <addresstype.h>
+#include <coins.h>
 #include <consensus/amount.h>
+#include <hash.h>
 #include <key.h>
 #include <musig.h>
 #include <policy/policy.h>
+#include <prevector.h>
 #include <primitives/transaction.h>
-#include <random.h>
 #include <script/keyorigin.h>
 #include <script/miniscript.h>
 #include <script/script.h>
+#include <script/script_error.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
+#include <script/verify_flags.h>
+#include <serialize.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/translation.h>
 #include <util/vector.h>
 
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <functional>
+#include <iterator>
+#include <span>
+#include <string>
+
 typedef std::vector<unsigned char> valtype;
 
 MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction& tx, unsigned int input_idx, const CAmount& amount, const SignOptions& options)
@@ -119,11 +134,11 @@ std::vector<uint8_t> MutableTransactionSignatureCreator::CreateMuSig2Nonce(const
     if (!sighash.has_value()) return {};
 
     MuSig2SecNonce secnonce;
-    std::vector<uint8_t> out = key.CreateMuSig2Nonce(secnonce, *sighash, aggregate_pubkey, pubkeys);
+    std::vector<uint8_t> out = ::CreateMuSig2Nonce(secnonce, *sighash, key, aggregate_pubkey, pubkeys);
     if (out.empty()) return {};
 
     // Store the secnonce in the SigningProvider
-    provider.SetMuSig2SecNonce(MuSig2SessionID(script_pubkey, part_pubkey, *sighash), std::move(secnonce));
+    provider.SetMuSig2SecNonce(MuSig2SessionID(script_pubkey, part_pubkey, *sighash, out), std::move(secnonce));
 
     return out;
 }
@@ -156,12 +171,14 @@ bool MutableTransactionSignatureCreator::CreateMuSig2PartialSig(const SigningPro
     if (!sighash.has_value()) return false;
 
     // Retrieve the secnonce
-    uint256 session_id = MuSig2SessionID(script_pubkey, part_pubkey, *sighash);
+    auto part_pubnonce_it = pubnonces.find(part_pubkey);
+    if (part_pubnonce_it == pubnonces.end()) return false;
+    uint256 session_id = MuSig2SessionID(script_pubkey, part_pubkey, *sighash, part_pubnonce_it->second);
     std::optional<std::reference_wrapper<MuSig2SecNonce>> secnonce = provider.GetMuSig2SecNonce(session_id);
     if (!secnonce || !secnonce->get().IsValid()) return false;
 
     // Compute the sig
-    std::optional<uint256> sig = key.CreateMuSig2PartialSig(*sighash, aggregate_pubkey, pubkeys, pubnonces, *secnonce, tweaks);
+    std::optional<uint256> sig = ::CreateMuSig2PartialSig(*sighash, key, aggregate_pubkey, pubkeys, pubnonces, *secnonce, tweaks);
     if (!sig) return false;
     partial_sig = std::move(*sig);
 
@@ -296,9 +313,7 @@ static bool SignMuSig2(const BaseSignatureCreator& creator, SignatureData& sigda
         CPubKey plain_pub = agg_pub;
         if (XOnlyPubKey(agg_pub) != script_pubkey) {
             if (agg_info.path.empty()) continue;
-            // Compute and compare fingerprint
-            CKeyID keyid = agg_pub.GetID();
-            if (!std::equal(agg_info.fingerprint, agg_info.fingerprint + sizeof(agg_info.fingerprint), keyid.data())) {
+            if (agg_info.fingerprint != agg_pub.GetID().fingerprint()) {
                 continue;
             }
             // Get the BIP32 derivation tweaks
diff --git a/depend/bitcoin/src/script/sign.h b/depend/bitcoin/src/script/sign.h
index 44bc5060..107abb9e 100644
--- a/depend/bitcoin/src/script/sign.h
+++ b/depend/bitcoin/src/script/sign.h
@@ -7,19 +7,25 @@
 #define BITCOIN_SCRIPT_SIGN_H
 
 #include <attributes.h>
-#include <coins.h>
-#include <hash.h>
+#include <consensus/amount.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/keyorigin.h>
+#include <script/script.h>
 #include <script/signingprovider.h>
 #include <uint256.h>
 
-class CKey;
-class CKeyID;
-class CScript;
-class CTransaction;
-class SigningProvider;
+#include <cstdint>
+#include <map>
+#include <optional>
+#include <set>
+#include <utility>
+#include <vector>
+
+class COutPoint;
+class CTxIn;
+class CTxOut;
+class Coin;
 
 struct bilingual_str;
 struct CMutableTransaction;
diff --git a/depend/bitcoin/src/script/signingprovider.cpp b/depend/bitcoin/src/script/signingprovider.cpp
index 19596544..2b5d6e2f 100644
--- a/depend/bitcoin/src/script/signingprovider.cpp
+++ b/depend/bitcoin/src/script/signingprovider.cpp
@@ -3,11 +3,16 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <script/keyorigin.h>
-#include <script/interpreter.h>
 #include <script/signingprovider.h>
 
-#include <logging.h>
+#include <musig.h>
+#include <script/interpreter.h>
+#include <script/keyorigin.h>
+#include <util/check.h>
+#include <util/log.h>
+
+#include <algorithm>
+#include <cstddef>
 
 const SigningProvider& DUMMY_SIGNING_PROVIDER = SigningProvider();
 
diff --git a/depend/bitcoin/src/script/signingprovider.h b/depend/bitcoin/src/script/signingprovider.h
index 31422bb4..ef9141a1 100644
--- a/depend/bitcoin/src/script/signingprovider.h
+++ b/depend/bitcoin/src/script/signingprovider.h
@@ -9,14 +9,26 @@
 #include <addresstype.h>
 #include <attributes.h>
 #include <key.h>
-#include <musig.h>
 #include <pubkey.h>
 #include <script/keyorigin.h>
 #include <script/script.h>
 #include <sync.h>
+#include <uint256.h>
 
+#include <compare>
+#include <cstdint>
 #include <functional>
+#include <map>
+#include <memory>
 #include <optional>
+#include <set>
+#include <span>
+#include <tuple>
+#include <utility>
+#include <variant>
+#include <vector>
+
+class MuSig2SecNonce;
 
 struct ShortestVectorFirstComparator
 {
@@ -289,7 +301,7 @@ class FillableSigningProvider : public SigningProvider
      * payments.
      *
      * The FillableSigningProvider::mapScripts script map should not be confused
-     * with LegacyScriptPubKeyMan::setWatchOnly script set. The two collections
+     * with the wallet::LegacyDataSPKM::setWatchOnly script set. The two collections
      * can hold the same scripts, but they serve different purposes. The
      * setWatchOnly script set is intended to expand the set of outputs the
      * wallet considers payments. Every output with a script it contains is
diff --git a/depend/bitcoin/src/script/solver.cpp b/depend/bitcoin/src/script/solver.cpp
index 783baf07..e99f1f09 100644
--- a/depend/bitcoin/src/script/solver.cpp
+++ b/depend/bitcoin/src/script/solver.cpp
@@ -3,13 +3,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <script/solver.h>
+
+#include <prevector.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/script.h>
-#include <script/solver.h>
-#include <span.h>
 
-#include <algorithm>
 #include <cassert>
 #include <string>
 
diff --git a/depend/bitcoin/src/script/solver.h b/depend/bitcoin/src/script/solver.h
index d2b7fb88..07e7b728 100644
--- a/depend/bitcoin/src/script/solver.h
+++ b/depend/bitcoin/src/script/solver.h
@@ -10,10 +10,10 @@
 
 #include <attributes.h>
 #include <script/script.h>
-#include <span.h>
 
-#include <string>
 #include <optional>
+#include <span>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/depend/bitcoin/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml b/depend/bitcoin/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml
index e9aa6150..c4e0b5d9 100644
--- a/depend/bitcoin/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml
+++ b/depend/bitcoin/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml
@@ -5,6 +5,7 @@ runs:
   steps:
     - run: |
         brew tap LouisBrunner/valgrind
+        brew trust --formula LouisBrunner/valgrind/valgrind
         brew fetch --HEAD LouisBrunner/valgrind/valgrind
         echo "CI_HOMEBREW_CELLAR_VALGRIND=$(brew --cellar valgrind)" >> "$GITHUB_ENV"
       shell: bash
diff --git a/depend/bitcoin/src/secp256k1/.github/workflows/ci.yml b/depend/bitcoin/src/secp256k1/.github/workflows/ci.yml
index 152f9a1f..3371fe31 100644
--- a/depend/bitcoin/src/secp256k1/.github/workflows/ci.yml
+++ b/depend/bitcoin/src/secp256k1/.github/workflows/ci.yml
@@ -39,6 +39,7 @@ env:
   SCHNORRSIG: 'no'
   MUSIG: 'no'
   ELLSWIFT: 'no'
+  SILENTPAYMENTS: 'no'
   ### test options
   SECP256K1_TEST_ITERS: 64
   BENCH: 'yes'
@@ -96,18 +97,18 @@ jobs:
       matrix:
         configuration:
           - env_vars: { WIDEMUL: 'int64',  RECOVERY: 'yes' }
-          - env_vars: { WIDEMUL: 'int64',                   ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
+          - env_vars: { WIDEMUL: 'int64',                   ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
           - env_vars: { WIDEMUL: 'int128' }
           - env_vars: { WIDEMUL: 'int128_struct',                                                             ELLSWIFT: 'yes' }
           - env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes',              EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
-          - env_vars: { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
+          - env_vars: { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes' }
           - env_vars: { WIDEMUL: 'int128', ASM: 'x86_64',                                                     ELLSWIFT: 'yes' }
           - env_vars: {                    RECOVERY: 'yes',              EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
-          - env_vars: { CTIMETESTS: 'no',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', CPPFLAGS: '-DVERIFY' }
+          - env_vars: { CTIMETESTS: 'no',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes', CPPFLAGS: '-DVERIFY' }
           - env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' }
           - env_vars: { CPPFLAGS: '-DDETERMINISTIC' }
           - env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' }
-          - env_vars: { CFLAGS: '-O1',     RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
+          - env_vars: { CFLAGS: '-O1',     RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
           - env_vars: { ECMULTGENKB: 2, ECMULTWINDOW: 2 }
           - env_vars: { ECMULTGENKB: 86, ECMULTWINDOW: 4 }
         cc:
@@ -160,6 +161,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CC: ${{ matrix.cc }}
 
     steps:
@@ -188,6 +190,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
 
     steps:
@@ -218,6 +221,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
 
     steps:
@@ -239,6 +243,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
       CC: ${{ matrix.cc }}
 
@@ -279,6 +284,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
 
     steps:
@@ -324,6 +330,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
       SECP256K1_TEST_ITERS: 2
 
@@ -353,6 +360,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
       CFLAGS: '-fsanitize=undefined,address -g'
       UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
@@ -399,6 +407,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CC: ${{ matrix.cc }}
       SECP256K1_TEST_ITERS: 32
       ASM: 'no'
@@ -424,6 +433,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
       CTIMETESTS: 'no'
 
     strategy:
@@ -456,14 +466,14 @@ jobs:
       fail-fast: false
       matrix:
         env_vars:
-          - { WIDEMUL: 'int64',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
+          - { WIDEMUL: 'int64',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
           - { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
-          - { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
+          - { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
           - { WIDEMUL: 'int128', RECOVERY: 'yes' }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes',            WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc' }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes',            WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
           - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
           - BUILD: 'distcheck'
 
@@ -513,13 +523,13 @@ jobs:
       fail-fast: false
       matrix:
         env_vars:
-          - { WIDEMUL: 'int64',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
+          - { WIDEMUL: 'int64',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
           - { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
-          - { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
+          - { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
           - { WIDEMUL: 'int128', RECOVERY: 'yes' }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
-          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY' }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc' }
+          - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CPPFLAGS: '-DVERIFY' }
           - BUILD: 'distcheck'
 
     steps:
@@ -604,11 +614,10 @@ jobs:
     steps:
       - *CHECKOUT
 
-      - name: Add cl.exe to PATH
-        uses: ilammy/msvc-dev-cmd@v1
-
       - name: C++ (public headers)
+        shell: cmd
         run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           cl.exe -c -WX -TP include/*.h
 
   cxx_fpermissive_debian:
@@ -632,6 +641,7 @@ jobs:
       SCHNORRSIG: 'yes'
       MUSIG: 'yes'
       ELLSWIFT: 'yes'
+      SILENTPAYMENTS: 'yes'
 
     steps:
       - *CHECKOUT
diff --git a/depend/bitcoin/src/secp256k1/.gitignore b/depend/bitcoin/src/secp256k1/.gitignore
index fbc311d7..60d9464e 100644
--- a/depend/bitcoin/src/secp256k1/.gitignore
+++ b/depend/bitcoin/src/secp256k1/.gitignore
@@ -12,6 +12,7 @@ ecdsa_example
 schnorr_example
 ellswift_example
 musig_example
+silentpayments_example
 *.exe
 *.so
 *.a
diff --git a/depend/bitcoin/src/secp256k1/CHANGELOG.md b/depend/bitcoin/src/secp256k1/CHANGELOG.md
index d4beb9c8..fb1e45d6 100644
--- a/depend/bitcoin/src/secp256k1/CHANGELOG.md
+++ b/depend/bitcoin/src/secp256k1/CHANGELOG.md
@@ -7,6 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.0] - 2026-08-03
+
+#### Added
+ - New function `secp256k1_context_set_sha256_compression` for overriding the internal SHA256 compression function used by the library at runtime (e.g., to route SHA256 through a hardware-accelerated implementation).
+ - New module `silentpayments` implements sending and receiving of Silent Payments according to [BIP 352](https://github.com/bitcoin/bips/blob/master/bip-0352.mediawiki). See:
+   - Header file `include/secp256k1_silentpayments.h` which defines the new API.
+   - Usage example `examples/silentpayments.c`.
+ - The `silentpayments` API currently requires full access to the transaction data (light client scanning is not implemented).
+
+#### Fixed
+ - Module `ellswift`: `secp256k1_ellswift_xdh` now treats secret keys greater than or equal to the curve order as invalid and returns 0 as documented. Previously, keys greater than the curve order were silently reduced modulo the order and accepted. The probability that a securely generated key is greater than the curve order is negligible, and thus the old behavior does not constitute a security issue.
+
+#### Changed
+ - The field multiplication and squaring routines of the 5x52 (64-bit) implementation are now force-inlined. This speeds up many library functions with GCC and MSVC (Clang is largely unaffected), e.g. `secp256k1_ecdsa_verify` and `secp256k1_schnorrsig_verify` by up to ~11%, at the cost of a somewhat larger compiled library. Force-inlining is disabled in unoptimized builds and when optimizing for size.
+ - CMake: Shared libraries built with CMake on OpenBSD and NetBSD now create the full versioned filename (e.g. `libsecp256k1.so.6.2` instead of `libsecp256k1.so.6`) and symlink chain, matching the behavior of GNU Autotools builds.
+
+#### Removed
+- Removed previously deprecated pointer `secp256k1_context_no_precomp`. Use `secp256k1_context_static` instead.
+- Removed previously deprecated function alias `secp256k1_schnorrsig_sign`. Use `secp256k1_schnorrsig_sign32` instead.
+- Removed macro `SECP256K1_GNUC_PREREQ` defined in the header file `include/secp256k1.h`. This macro was used in the library headers to check for GNU C extensions. The macro was not actually meant to be part of the public API of libsecp256k1. If you happened to use it in your code nevertheless, use the macros `__GNUC__` and `__GNUC_MINOR__` (defined by compilers with GNU C extensions) directly, or copy the macro definition from an old libsecp256k1 header file into your code.
+
+#### ABI Compatibility
+The symbols `secp256k1_context_no_precomp` and `secp256k1_schnorrsig_sign` were removed.
+Otherwise, the library maintains backward compatibility with versions 0.7.0 and 0.7.1.
+
 ## [0.7.1] - 2026-01-26
 
 #### Changed
@@ -30,7 +55,8 @@ The ABI is backward compatible with version 0.7.0.
  - Removed `SECP256K1_WARN_UNUSED_RESULT` attribute (defined as `__attribute__ ((__warn_unused_result__))`) from several API functions that always return 1. Compilers will no longer warn if the return value is unused.
  - CMake: Building with CMake is no longer considered experimental.
  - CMake: The minimum required CMake version was increased to 3.22.
- - CMake: Shared libraries built with CMake on FreeBSD now create the full versioned filename and symlink chain, matching the behavior of autotools builds.
+ - CMake: Shared libraries built with CMake on FreeBSD now create the full versioned filename (e.g. `libsecp256k1.so.5.0.1` instead of `libsecp256k1.so.5`) and symlink chain, matching the behavior of GNU Autotools builds.
+
 
 #### Removed
 - Removed previously deprecated function aliases `secp256k1_ec_privkey_negate`, `secp256k1_ec_privkey_tweak_add` and
@@ -199,7 +225,8 @@ This version was in fact never released.
 The number was given by the build system since the introduction of autotools in Jan 2014 (ea0fe5a5bf0c04f9cc955b2966b614f5f378c6f6).
 Therefore, this version number does not uniquely identify a set of source files.
 
-[Unreleased]: https://github.com/bitcoin-core/secp256k1/compare/v0.7.1...HEAD
+[Unreleased]: https://github.com/bitcoin-core/secp256k1/compare/v0.8.0...HEAD
+[0.8.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.7.1...v0.8.0
 [0.7.1]: https://github.com/bitcoin-core/secp256k1/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.5.1...v0.6.0
diff --git a/depend/bitcoin/src/secp256k1/CMakeLists.txt b/depend/bitcoin/src/secp256k1/CMakeLists.txt
index 4ef69c08..72682700 100644
--- a/depend/bitcoin/src/secp256k1/CMakeLists.txt
+++ b/depend/bitcoin/src/secp256k1/CMakeLists.txt
@@ -7,7 +7,7 @@ project(libsecp256k1
   # The package (a.k.a. release) version is based on semantic versioning 2.0.0 of
   # the API. All changes in experimental modules are treated as
   # backwards-compatible and therefore at most increase the minor version.
-  VERSION 0.7.2
+  VERSION 0.8.1
   DESCRIPTION "Optimized C library for ECDSA signatures and secret/public key operations on curve secp256k1."
   HOMEPAGE_URL "https://github.com/bitcoin-core/secp256k1"
   LANGUAGES C
@@ -21,8 +21,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # All changes in experimental modules are treated as if they don't affect the
 # interface and therefore only increase the revision.
-set(${PROJECT_NAME}_LIB_VERSION_CURRENT 6)
-set(${PROJECT_NAME}_LIB_VERSION_REVISION 2)
+set(${PROJECT_NAME}_LIB_VERSION_CURRENT 7)
+set(${PROJECT_NAME}_LIB_VERSION_REVISION 1)
 set(${PROJECT_NAME}_LIB_VERSION_AGE 0)
 
 #=============================
@@ -52,6 +52,7 @@ option(SECP256K1_ENABLE_MODULE_EXTRAKEYS "Enable extrakeys module." ON)
 option(SECP256K1_ENABLE_MODULE_SCHNORRSIG "Enable schnorrsig module." ON)
 option(SECP256K1_ENABLE_MODULE_MUSIG "Enable musig module." ON)
 option(SECP256K1_ENABLE_MODULE_ELLSWIFT "Enable ElligatorSwift module." ON)
+option(SECP256K1_ENABLE_MODULE_SILENTPAYMENTS "Enable Silent Payments module." ON)
 
 option(SECP256K1_USE_EXTERNAL_DEFAULT_CALLBACKS "Enable external default callback functions." OFF)
 if(SECP256K1_USE_EXTERNAL_DEFAULT_CALLBACKS)
@@ -147,6 +148,8 @@ if(MSVC)
   string(REGEX REPLACE "/DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
   string(REGEX REPLACE "/DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
   string(REGEX REPLACE "/DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
+  # Match GCC/Clang's size-optimization macro for the inline guard
+  add_compile_definitions($<$<CONFIG:MinSizeRel>:__OPTIMIZE_SIZE__=1>)
 else()
   string(REGEX REPLACE "-DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
   string(REGEX REPLACE "-DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
@@ -287,6 +290,7 @@ message("  extrakeys ........................... ${SECP256K1_ENABLE_MODULE_EXTRA
 message("  schnorrsig .......................... ${SECP256K1_ENABLE_MODULE_SCHNORRSIG}")
 message("  musig ............................... ${SECP256K1_ENABLE_MODULE_MUSIG}")
 message("  ElligatorSwift ...................... ${SECP256K1_ENABLE_MODULE_ELLSWIFT}")
+message("  Silent Payments ..................... ${SECP256K1_ENABLE_MODULE_SILENTPAYMENTS}")
 message("Parameters:")
 message("  ecmult window size .................. ${SECP256K1_ECMULT_WINDOW_SIZE}")
 message("  ecmult gen table size ............... ${SECP256K1_ECMULT_GEN_KB} KiB")
diff --git a/depend/bitcoin/src/secp256k1/Makefile.am b/depend/bitcoin/src/secp256k1/Makefile.am
index 07d7a2ba..02588edc 100644
--- a/depend/bitcoin/src/secp256k1/Makefile.am
+++ b/depend/bitcoin/src/secp256k1/Makefile.am
@@ -210,6 +210,17 @@ musig_example_LDFLAGS += -lbcrypt
 endif
 TESTS += musig_example
 endif
+if ENABLE_MODULE_SILENTPAYMENTS
+noinst_PROGRAMS += silentpayments_example
+silentpayments_example_SOURCES = examples/silentpayments.c
+silentpayments_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
+silentpayments_example_LDADD = libsecp256k1.la
+silentpayments_example_LDFLAGS = -static
+if BUILD_WINDOWS
+silentpayments_example_LDFLAGS += -lbcrypt
+endif
+TESTS += silentpayments_example
+endif
 endif
 
 ### Precomputed tables
@@ -253,6 +264,10 @@ maintainer-clean-local: clean-precomp
 ### (see the comments in the previous section for detailed rationale)
 TESTVECTORS = src/wycheproof/ecdsa_secp256k1_sha256_bitcoin_test.h
 
+if ENABLE_MODULE_SILENTPAYMENTS
+TESTVECTORS += src/modules/silentpayments/vectors.h
+endif
+
 if ENABLE_MODULE_ECDH
 TESTVECTORS += src/wycheproof/ecdh_secp256k1_test.h
 endif
@@ -265,6 +280,10 @@ src/wycheproof/ecdh_secp256k1_test.h:
 	mkdir -p $(@D)
 	python3 $(top_srcdir)/tools/tests_wycheproof_generate_ecdh.py $(top_srcdir)/src/wycheproof/ecdh_secp256k1_test.json > $@
 
+src/modules/silentpayments/vectors.h:
+	mkdir -p $(@D)
+	python3 $(top_srcdir)/tools/tests_silentpayments_generate.py $(top_srcdir)/src/modules/silentpayments/bip352_send_and_receive_test_vectors.json > $@
+
 testvectors: $(TESTVECTORS)
 
 BUILT_SOURCES += $(TESTVECTORS)
@@ -287,9 +306,11 @@ EXTRA_DIST += sage/secp256k1_params.sage
 EXTRA_DIST += sage/weierstrass_prover.sage
 EXTRA_DIST += src/wycheproof/WYCHEPROOF_COPYING
 EXTRA_DIST += src/wycheproof/ecdsa_secp256k1_sha256_bitcoin_test.json
+EXTRA_DIST += src/modules/silentpayments/bip352_send_and_receive_test_vectors.json
 EXTRA_DIST += src/wycheproof/ecdh_secp256k1_test.json
 EXTRA_DIST += tools/tests_wycheproof_generate_ecdsa.py
 EXTRA_DIST += tools/tests_wycheproof_generate_ecdh.py
+EXTRA_DIST += tools/tests_silentpayments_generate.py
 
 if ENABLE_MODULE_ECDH
 include src/modules/ecdh/Makefile.am.include
@@ -314,3 +335,7 @@ endif
 if ENABLE_MODULE_ELLSWIFT
 include src/modules/ellswift/Makefile.am.include
 endif
+
+if ENABLE_MODULE_SILENTPAYMENTS
+include src/modules/silentpayments/Makefile.am.include
+endif
diff --git a/depend/bitcoin/src/secp256k1/README.md b/depend/bitcoin/src/secp256k1/README.md
index 90edae1a..fc64d40e 100644
--- a/depend/bitcoin/src/secp256k1/README.md
+++ b/depend/bitcoin/src/secp256k1/README.md
@@ -22,6 +22,7 @@ Features:
 * Optional module for Schnorr signatures according to [BIP-340](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki).
 * Optional module for ElligatorSwift key exchange according to [BIP-324](https://github.com/bitcoin/bips/blob/master/bip-0324.mediawiki).
 * Optional module for MuSig2 Schnorr multi-signatures according to [BIP-327](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki).
+* Optional module for Silent Payments sending and receiving according to [BIP-352](https://github.com/bitcoin/bips/blob/master/bip-0352.mediawiki).
 
 Implementation details
 ----------------------
@@ -81,20 +82,21 @@ This can be done with the following steps:
     ```
 4. Check out the latest release tag, e.g. 
     ```
-    git checkout v0.6.0
+    git checkout v0.7.1
     ```
 5. Use git to verify the GPG signature: 
    ```
-   % git tag -v v0.6.0 | grep -C 3 'Good signature'
+   % git tag -v v0.7.1 | grep -C 3 'Good signature'
 
-   gpg: Signature made Mon 04 Nov 2024 12:14:44 PM EST
-   gpg:                using RSA key 4BBB845A6F5A65A69DFAEC234861DBF262123605
-   gpg: Good signature from "Jonas Nick <jonas@n-ck.net>" [unknown]
-   gpg:                 aka "Jonas Nick <jonasd.nick@gmail.com>" [unknown]
+   gpg: Signature made Mon 26 Jan 2026 07:42:46 PM UTC
+   gpg:                using RSA key 2840EAABF4BC9F0FFD716AFAFBAFCC46DE2D3FE2
+   gpg: Good signature from "Pieter Wuille <pieter@wuille.net>" [unknown]
+   gpg:                 aka "Pieter Wuille <pieter.wuille@gmail.com>" [full]
+   gpg:                 aka "[jpeg image of size 5996]" [undefined]
    gpg: WARNING: This key is not certified with a trusted signature!
    gpg:          There is no indication that the signature belongs to the owner.
-   Primary key fingerprint: 36C7 1A37 C9D9 88BD E825  08D9 B1A7 0E4F 8DCD 0366
-        Subkey fingerprint: 4BBB 845A 6F5A 65A6 9DFA  EC23 4861 DBF2 6212 3605
+   Primary key fingerprint: 133E AC17 9436 F14A 5CF1  B794 860F EB80 4E66 9320
+        Subkey fingerprint: 2840 EAAB F4BC 9F0F FD71  6AFA FBAF CC46 DE2D 3FE2
    ```
 
 Building with Autotools
@@ -150,6 +152,7 @@ Usage examples can be found in the [examples](examples) directory. To compile th
   * [Deriving a shared secret (ECDH) example](examples/ecdh.c)
   * [ElligatorSwift key exchange example](examples/ellswift.c)
   * [MuSig2 Schnorr multi-signatures example](examples/musig.c)
+  * [Silent Payments send and receive example](examples/silentpayments.c)
 
 To compile the examples, make sure the corresponding modules are enabled.
 
diff --git a/depend/bitcoin/src/secp256k1/SECURITY.md b/depend/bitcoin/src/secp256k1/SECURITY.md
index b515cc1c..a31c53bb 100644
--- a/depend/bitcoin/src/secp256k1/SECURITY.md
+++ b/depend/bitcoin/src/secp256k1/SECURITY.md
@@ -6,10 +6,10 @@ To report security issues send an email to secp256k1-security@bitcoincore.org (n
 
 The following keys may be used to communicate sensitive information to developers:
 
-| Name | Fingerprint |
-|------|-------------|
-| Pieter Wuille | 133E AC17 9436 F14A 5CF1  B794 860F EB80 4E66 9320 |
-| Jonas Nick | 36C7 1A37 C9D9 88BD E825  08D9 B1A7 0E4F 8DCD 0366 |
-| Tim Ruffing | 09E0 3F87 1092 E40E 106E  902B 33BC 86AB 80FF 5516 |
+| Name                 | Fingerprint                                        |
+|----------------------|----------------------------------------------------|
+| Pieter Wuille        | 133E AC17 9436 F14A 5CF1  B794 860F EB80 4E66 9320 |
+| Tim Ruffing          | 09E0 3F87 1092 E40E 106E  902B 33BC 86AB 80FF 5516 |
+| Sebastian Falbesoner | 6A8F 9C26 6528 E25A EB1D  7731 C237 1D91 CB71 6EA7 |
 
 You can import a key by running the following command with that individual’s fingerprint: `gpg --keyserver hkps://keys.openpgp.org --recv-keys "<fingerprint>"` Ensure that you put quotes around fingerprints containing spaces.
diff --git a/depend/bitcoin/src/secp256k1/ci/ci.sh b/depend/bitcoin/src/secp256k1/ci/ci.sh
index 515c14cd..d948c638 100755
--- a/depend/bitcoin/src/secp256k1/ci/ci.sh
+++ b/depend/bitcoin/src/secp256k1/ci/ci.sh
@@ -13,7 +13,7 @@ print_environment() {
     # does not rely on bash.
     for var in WERROR_CFLAGS MAKEFLAGS BUILD \
             ECMULTWINDOW ECMULTGENKB ASM WIDEMUL WITH_VALGRIND EXTRAFLAGS \
-            EXPERIMENTAL ECDH RECOVERY EXTRAKEYS MUSIG SCHNORRSIG ELLSWIFT \
+            EXPERIMENTAL ECDH RECOVERY EXTRAKEYS MUSIG SCHNORRSIG ELLSWIFT SILENTPAYMENTS \
             SECP256K1_TEST_ITERS BENCH SECP256K1_BENCH_ITERS CTIMETESTS SYMBOL_CHECK \
             EXAMPLES \
             HOST WRAPPER_CMD \
@@ -64,6 +64,7 @@ fi
     --enable-module-extrakeys="$EXTRAKEYS" \
     --enable-module-schnorrsig="$SCHNORRSIG" \
     --enable-module-musig="$MUSIG" \
+    --enable-module-silentpayments="$SILENTPAYMENTS" \
     --enable-examples="$EXAMPLES" \
     --enable-ctime-tests="$CTIMETESTS" \
     --with-valgrind="$WITH_VALGRIND" \
diff --git a/depend/bitcoin/src/secp256k1/ci/linux-debian.Dockerfile b/depend/bitcoin/src/secp256k1/ci/linux-debian.Dockerfile
index a575d9b1..e743cda8 100644
--- a/depend/bitcoin/src/secp256k1/ci/linux-debian.Dockerfile
+++ b/depend/bitcoin/src/secp256k1/ci/linux-debian.Dockerfile
@@ -40,7 +40,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
         apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Build and install gcc snapshot
-ARG GCC_SNAPSHOT_MAJOR=16
+ARG GCC_SNAPSHOT_MAJOR=17
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     wget libgmp-dev libmpfr-dev libmpc-dev flex && \
     mkdir gcc && cd gcc && \
diff --git a/depend/bitcoin/src/secp256k1/cmake/SetLibtoolAbiVersion.cmake b/depend/bitcoin/src/secp256k1/cmake/SetLibtoolAbiVersion.cmake
new file mode 100644
index 00000000..0e981053
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/cmake/SetLibtoolAbiVersion.cmake
@@ -0,0 +1,61 @@
+#[=[
+This emulates Libtool to make sure Libtool and CMake agree on
+the ABI version and file naming for shared libraries.
+
+The `version_type` variable is set in `libtool.m4` (installed
+by autoreconf into autotools-aux/m4/).
+For the `major` and `versuffix` variables, see below "Calculate
+the version variables" in `ltmain.sh` (installed by autoreconf
+into autotools-aux/).
+]=]
+function(set_libtool_abi_version target current revision age)
+  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD)$")
+    # version_type = linux | freebsd-elf
+    # major = $current - $age
+    # versuffix = $major.$age.$revision
+    math(EXPR _major "${current} - ${age}")
+    set_target_properties(${target} PROPERTIES
+      SOVERSION ${_major}
+      VERSION ${_major}.${age}.${revision}
+    )
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+    # version_type = sunos
+    # major = $current
+    # versuffix = $current.$revision
+    set_target_properties(${target} PROPERTIES
+      SOVERSION ${current}
+      VERSION ${current}.${revision}
+    )
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+    # version_type = sunos
+    # major = $current
+    # versuffix = $current.$revision
+    set_target_properties(${target} PROPERTIES
+      # OpenBSD has no `soname_spec` defined in `libtool.m4`.
+      VERSION ${current}.${revision}
+    )
+  elseif(APPLE)
+    # version_type = darwin
+    # major = $current - $age
+    math(EXPR _major "${current} - ${age}")
+    math(EXPR _compatibility "${current} + 1")
+    set_target_properties(${target} PROPERTIES
+      SOVERSION ${_major}
+      MACHO_COMPATIBILITY_VERSION ${_compatibility}
+      MACHO_CURRENT_VERSION ${_compatibility}.${revision}
+    )
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    # version_type = windows
+    # major = $current - $age
+    # versuffix = $major
+    math(EXPR _major "${current} - ${age}")
+    set(_windows_name "secp256k1")
+    if(MSVC)
+      set(_windows_name "${PROJECT_NAME}")
+    endif()
+    set_target_properties(${target} PROPERTIES
+      ARCHIVE_OUTPUT_NAME "${_windows_name}"
+      RUNTIME_OUTPUT_NAME "${_windows_name}-${_major}"
+    )
+  endif()
+endfunction()
diff --git a/depend/bitcoin/src/secp256k1/configure.ac b/depend/bitcoin/src/secp256k1/configure.ac
index a21447ce..1c6f1036 100644
--- a/depend/bitcoin/src/secp256k1/configure.ac
+++ b/depend/bitcoin/src/secp256k1/configure.ac
@@ -4,8 +4,8 @@ AC_PREREQ([2.60])
 # the API. All changes in experimental modules are treated as
 # backwards-compatible and therefore at most increase the minor version.
 define(_PKG_VERSION_MAJOR, 0)
-define(_PKG_VERSION_MINOR, 7)
-define(_PKG_VERSION_PATCH, 2)
+define(_PKG_VERSION_MINOR, 8)
+define(_PKG_VERSION_PATCH, 1)
 define(_PKG_VERSION_IS_RELEASE, false)
 
 # The library version is based on libtool versioning of the ABI. The set of
@@ -13,8 +13,8 @@ define(_PKG_VERSION_IS_RELEASE, false)
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # All changes in experimental modules are treated as if they don't affect the
 # interface and therefore only increase the revision.
-define(_LIB_VERSION_CURRENT, 6)
-define(_LIB_VERSION_REVISION, 2)
+define(_LIB_VERSION_CURRENT, 7)
+define(_LIB_VERSION_REVISION, 1)
 define(_LIB_VERSION_AGE, 0)
 
 AC_INIT([libsecp256k1],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_PATCH)m4_if(_PKG_VERSION_IS_RELEASE, [true], [], [-dev]),[https://github.com/bitcoin-core/secp256k1/issues],[libsecp256k1],[https://github.com/bitcoin-core/secp256k1])
@@ -193,6 +193,10 @@ AC_ARG_ENABLE(module_ellswift,
     AS_HELP_STRING([--enable-module-ellswift],[enable ElligatorSwift module [default=yes]]), [],
     [SECP_SET_DEFAULT([enable_module_ellswift], [yes], [yes])])
 
+AC_ARG_ENABLE(module_silentpayments,
+    AS_HELP_STRING([--enable-module-silentpayments],[enable Silent Payments module [default=yes]]), [],
+    [SECP_SET_DEFAULT([enable_module_silentpayments], [yes], [yes])])
+
 AC_ARG_ENABLE(external_default_callbacks,
     AS_HELP_STRING([--enable-external-default-callbacks],[enable external default callback functions [default=no]]), [],
     [SECP_SET_DEFAULT([enable_external_default_callbacks], [no], [no])])
@@ -399,6 +403,14 @@ SECP_CFLAGS="$SECP_CFLAGS $WERROR_CFLAGS"
 
 # Processing must be done in a reverse topological sorting of the dependency graph
 # (dependent module first).
+if test x"$enable_module_silentpayments" = x"yes"; then
+  if test x"$enable_module_extrakeys" = x"no"; then
+    AC_MSG_ERROR([Module dependency error: You have disabled the extrakeys module explicitly, but it is required by the silentpayments module.])
+  fi
+  enable_module_extrakeys=yes
+  SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_SILENTPAYMENTS=1"
+fi
+
 if test x"$enable_module_ellswift" = x"yes"; then
   SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_ELLSWIFT=1"
 fi
@@ -472,6 +484,7 @@ AM_CONDITIONAL([ENABLE_MODULE_EXTRAKEYS], [test x"$enable_module_extrakeys" = x"
 AM_CONDITIONAL([ENABLE_MODULE_SCHNORRSIG], [test x"$enable_module_schnorrsig" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_MUSIG], [test x"$enable_module_musig" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_ELLSWIFT], [test x"$enable_module_ellswift" = x"yes"])
+AM_CONDITIONAL([ENABLE_MODULE_SILENTPAYMENTS], [test x"$enable_module_silentpayments" = x"yes"])
 AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$enable_external_asm" = x"yes"])
 AM_CONDITIONAL([USE_ASM_ARM], [test x"$set_asm" = x"arm32"])
 AM_CONDITIONAL([BUILD_WINDOWS], [test "$build_windows" = "yes"])
@@ -496,6 +509,7 @@ echo "  module extrakeys        = $enable_module_extrakeys"
 echo "  module schnorrsig       = $enable_module_schnorrsig"
 echo "  module musig            = $enable_module_musig"
 echo "  module ellswift         = $enable_module_ellswift"
+echo "  module silentpayments   = $enable_module_silentpayments"
 echo
 echo "  asm                     = $set_asm"
 echo "  ecmult window size      = $set_ecmult_window"
diff --git a/depend/bitcoin/src/secp256k1/doc/release-process.md b/depend/bitcoin/src/secp256k1/doc/release-process.md
index 3cf183df..853fa305 100644
--- a/depend/bitcoin/src/secp256k1/doc/release-process.md
+++ b/depend/bitcoin/src/secp256k1/doc/release-process.md
@@ -15,6 +15,7 @@ This process also assumes that there will be no minor releases for old major rel
 We aim to cut a regular release every 3-4 months, approximately twice as frequent as major Bitcoin Core releases. Every second release should be published one month before the feature freeze of the next major Bitcoin Core release, allowing sufficient time to update the library in Core.
 
 ## Sanity checks
+
 Perform these checks when reviewing the release PR (see below):
 
 1. Ensure `make distcheck` doesn't fail.
@@ -39,20 +40,27 @@ Perform these checks when reviewing the release PR (see below):
    tools/check-abi.sh
    ```
 
-## Regular release
+## Preparing and tagging a release
+
+If you're going to sign the release, make sure that your default GPG signing key is the [expected one](../SECURITY.md).
+You can see your default key by running `echo "test" | gpg --sign --verbose > /dev/null`.
+
+### Regular release
 
 1. Open a PR to the master branch with a commit (using message `"release: prepare for $MAJOR.$MINOR.$PATCH"`, for example) that
    * finalizes the release notes in [CHANGELOG.md](../CHANGELOG.md) by
        * adding a section for the release (make sure that the version number is a link to a diff between the previous and new version),
        * removing the `[Unreleased]` section header,
-       * ensuring that the release notes are not missing entries (check the `needs-changelog` label on github), and
+       * ensuring that the release notes are not missing entries
+         (check the `needs-changelog` label on GitHub and also go manually through the list of commits since the previous release), and
        * including an entry for `### ABI Compatibility` if it doesn't exist,
    * sets `_PKG_VERSION_IS_RELEASE` to `true` in `configure.ac`, and,
    * if this is not a patch release,
        * updates `_PKG_VERSION_*` and `_LIB_VERSION_*`  in `configure.ac`, and
        * updates `project(libsecp256k1 VERSION ...)` and `${PROJECT_NAME}_LIB_VERSION_*` in `CMakeLists.txt`.
-2. Perform the [sanity checks](#sanity-checks) on the PR branch.
-3. After the PR is merged, tag the commit, and push the tag:
+2. Perform the [sanity checks](#sanity-checks) on the PR branch
+   and attach the output of the [`check-abi`](/tools/check-abi.sh) tool (screenshot of the generated compatibility HTML report) to the PR description.
+3. After the PR has been merged, tag the commit, and push the tag:
    ```
    RELEASE_COMMIT=<merge commit of step 1>
    git tag -s v$MAJOR.$MINOR.$PATCH -m "libsecp256k1 $MAJOR.$MINOR.$PATCH" $RELEASE_COMMIT
@@ -64,10 +72,8 @@ Perform these checks when reviewing the release PR (see below):
    * adds an `[Unreleased]` section header and a corresponding `[Unreleased]` link at the bottom of [CHANGELOG.md](../CHANGELOG.md).
 
    If other maintainers are not present to approve the PR, it can be merged without ACKs.
-5. Create a new GitHub release with a link to the corresponding entry in [CHANGELOG.md](../CHANGELOG.md).
-6. Send an announcement email to the bitcoin-dev mailing list.
 
-## Maintenance release
+### Maintenance release
 
 Note that bug fixes need to be backported only to releases for which no compatible release without the bug exists.
 
@@ -83,12 +89,29 @@ Note that bug fixes need to be backported only to releases for which no compatib
      and the `$PATCH` component of `project(libsecp256k1 VERSION ...)` and `${PROJECT_NAME}_LIB_VERSION_REVISION` in `CMakeLists.txt`
      (with commit message `"release: bump versions for $MAJOR.$MINOR.$PATCH"`, for example).
 3. Perform the [sanity checks](#sanity-checks) on the PR branch.
-4. After the PRs are merged, update the release branch, tag the commit, and push the tag:
+4. After the PR has been merged, update the release branch, tag the commit, and push the tag:
    ```
    git checkout $MAJOR.$MINOR && git pull
    git tag -s v$MAJOR.$MINOR.$PATCH -m "libsecp256k1 $MAJOR.$MINOR.$PATCH"
    git push git@github.com:bitcoin-core/secp256k1.git v$MAJOR.$MINOR.$PATCH
    ```
-6. Create a new GitHub release with a link to the corresponding entry in [CHANGELOG.md](../CHANGELOG.md).
-7. Send an announcement email to the bitcoin-dev mailing list.
-8. Open PR to the master branch that includes a commit (with commit message `"release notes: add $MAJOR.$MINOR.$PATCH"`, for example) that adds release notes to [CHANGELOG.md](../CHANGELOG.md).
+5. Open a PR to the master branch that includes a commit (with commit message `"release notes: add $MAJOR.$MINOR.$PATCH"`, for example) that adds release notes to [CHANGELOG.md](../CHANGELOG.md).
+6. Get the PR merged to ensure that the [CHANGELOG.md](../CHANGELOG.md) file on the master branch is current before announcing the release.
+
+## Creating a tarball and announcing the release
+
+1. Create a tarball and a detached GPG signature covering it, and check that the signature verifies under the expected key.
+     ```
+     git archive --output "libsecp256k1-$MAJOR.$MINOR.$PATCH.tar.gz" --prefix "libsecp256k1-$MAJOR.$MINOR.$PATCH/" v$MAJOR.$MINOR.$PATCH
+     gpg --detach-sign "libsecp256k1-$MAJOR.$MINOR.$PATCH.tar.gz"
+     gpg --verify "libsecp256k1-$MAJOR.$MINOR.$PATCH.tar.gz.sig"
+     ```
+2. Create a new GitHub release with a link to the corresponding entry in [CHANGELOG.md](../CHANGELOG.md).
+   Attach the tarball and the detached signature.
+3. Send an announcement email to the bitcoin-dev mailing list.
+
+
+## Cleaning up
+
+1. Close the GitHub milestone, and create a new one. Consider moving unresolved issues to the new milestone.
+2. Remove the `needs-changelog` label from all merged PRs.
diff --git a/depend/bitcoin/src/secp256k1/examples/CMakeLists.txt b/depend/bitcoin/src/secp256k1/examples/CMakeLists.txt
index 808917c4..83547ee2 100644
--- a/depend/bitcoin/src/secp256k1/examples/CMakeLists.txt
+++ b/depend/bitcoin/src/secp256k1/examples/CMakeLists.txt
@@ -31,3 +31,7 @@ endif()
 if(SECP256K1_ENABLE_MODULE_MUSIG)
   add_example(musig)
 endif()
+
+if(SECP256K1_ENABLE_MODULE_SILENTPAYMENTS)
+  add_example(silentpayments)
+endif()
diff --git a/depend/bitcoin/src/secp256k1/examples/silentpayments.c b/depend/bitcoin/src/secp256k1/examples/silentpayments.c
new file mode 100644
index 00000000..f1a5de34
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/examples/silentpayments.c
@@ -0,0 +1,465 @@
+/*************************************************************************
+ * To the extent possible under law, the author(s) have dedicated all    *
+ * copyright and related and neighboring rights to the software in this  *
+ * file to the public domain worldwide. This software is distributed     *
+ * without any warranty. For the CC0 Public Domain Dedication, see       *
+ * EXAMPLES_COPYING or https://creativecommons.org/publicdomain/zero/1.0 *
+ *************************************************************************/
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <secp256k1_extrakeys.h>
+#include <secp256k1_silentpayments.h>
+
+#include "examples_util.h"
+
+#define N_INPUTS  2
+#define N_OUTPUTS 3
+
+/* Static data for Bob and Carol's Silent Payments addresses */
+static unsigned char smallest_outpoint[36] = {
+    0x16, 0x9e, 0x1e, 0x83, 0xe9, 0x30, 0x85, 0x33, 0x91,
+    0xbc, 0x6f, 0x35, 0xf6, 0x05, 0xc6, 0x75, 0x4c, 0xfe,
+    0xad, 0x57, 0xcf, 0x83, 0x87, 0x63, 0x9d, 0x3b, 0x40,
+    0x96, 0xc5, 0x4f, 0x18, 0xf4, 0x00, 0x00, 0x00, 0x00
+};
+static unsigned char bob_scan_key[32] = {
+    0xa8, 0x90, 0x54, 0xc9, 0x5b, 0xe3, 0xc3, 0x01,
+    0x56, 0x65, 0x74, 0xf2, 0xaa, 0x93, 0xad, 0xe0,
+    0x51, 0x85, 0x09, 0x03, 0xa6, 0x9c, 0xbd, 0xd1,
+    0xd4, 0x7e, 0xae, 0x26, 0x3d, 0x7b, 0xc0, 0x31
+};
+static unsigned char bob_spend_key[32] = {
+    0x9d, 0x6a, 0xd8, 0x55, 0xce, 0x34, 0x17, 0xef,
+    0x84, 0xe8, 0x36, 0x89, 0x2e, 0x5a, 0x56, 0x39,
+    0x2b, 0xfb, 0xa0, 0x5f, 0xa5, 0xd9, 0x7c, 0xce,
+    0xa3, 0x0e, 0x26, 0x6f, 0x54, 0x0e, 0x08, 0xb3
+};
+static unsigned char bob_scan_and_spend_pubkeys[2][33] = {
+    {
+        0x02, 0x15, 0x40, 0xae, 0xa8, 0x97, 0x54, 0x7a,
+        0xd4, 0x39, 0xb4, 0xe0, 0xf6, 0x09, 0xe5, 0xf0,
+        0xfa, 0x63, 0xde, 0x89, 0xab, 0x11, 0xed, 0xe3,
+        0x1e, 0x8c, 0xde, 0x4b, 0xe2, 0x19, 0x42, 0x5f, 0x23
+    },
+    {
+        0x02, 0x5c, 0xc9, 0x85, 0x6d, 0x6f, 0x83, 0x75,
+        0x35, 0x0e, 0x12, 0x39, 0x78, 0xda, 0xac, 0x20,
+        0x0c, 0x26, 0x0c, 0xb5, 0xb5, 0xae, 0x83, 0x10,
+        0x6c, 0xab, 0x90, 0x48, 0x4d, 0xcd, 0x8f, 0xcf, 0x36
+    }
+};
+static unsigned char carol_scan_key[32] = {
+    0x04, 0xb2, 0xa4, 0x11, 0x63, 0x5c, 0x09, 0x77,
+    0x59, 0xaa, 0xcd, 0x0f, 0x00, 0x5a, 0x4c, 0x82,
+    0xc8, 0xc9, 0x28, 0x62, 0xc6, 0xfc, 0x28, 0x4b,
+    0x80, 0xb8, 0xef, 0xeb, 0xc2, 0x0c, 0x3d, 0x17
+};
+static unsigned char carol_address[2][33] = {
+    {
+        0x03, 0xbb, 0xc6, 0x3f, 0x12, 0x74, 0x5d, 0x3b,
+        0x9e, 0x9d, 0x24, 0xc6, 0xcd, 0x7a, 0x1e, 0xfe,
+        0xba, 0xd0, 0xa7, 0xf4, 0x69, 0x23, 0x2f, 0xbe,
+        0xcf, 0x31, 0xfb, 0xa7, 0xb4, 0xf7, 0xdd, 0xed, 0xa8
+    },
+    {
+        0x03, 0x81, 0xeb, 0x9a, 0x9a, 0x9e, 0xc7, 0x39,
+        0xd5, 0x27, 0xc1, 0x63, 0x1b, 0x31, 0xb4, 0x21,
+        0x56, 0x6f, 0x5c, 0x2a, 0x47, 0xb4, 0xab, 0x5b,
+        0x1f, 0x6a, 0x68, 0x6d, 0xfb, 0x68, 0xea, 0xb7, 0x16
+    }
+};
+
+/** Labels
+ *
+ *  The structs and callback function are implemented here as a demonstration
+ *  of how the label lookup callback is meant to query a label cache and return
+ *  the label tweak when a match is found. This is for demonstration purposes
+ *  only and not optimized. In production, it is expected that the
+ *  caller will be using a much more performant data structure for storing and
+ *  querying labels, like e.g. a hash table with O(1) lookup cost.
+ *
+ *  Recipients not using labels can ignore these steps and simply pass `NULL`
+ *  for the label_lookup and label_context arguments:
+ *
+ *      secp256k1_silentpayments_recipient_scan_outputs(..., NULL, NULL);
+ */
+
+struct label_cache_entry {
+    unsigned char label[33];
+    unsigned char label_tweak[32];
+};
+
+struct labels_cache {
+    size_t entries_used;
+    struct label_cache_entry entries[5];
+};
+
+const unsigned char* label_lookup(
+    const unsigned char* label33,
+    const void* cache_ptr
+) {
+    const struct labels_cache* cache = (const struct labels_cache*)cache_ptr;
+    size_t i;
+    for (i = 0; i < cache->entries_used; i++) {
+        if (memcmp(cache->entries[i].label, label33, 33) == 0) {
+            return cache->entries[i].label_tweak;
+        }
+    }
+    return NULL;
+}
+
+int main(void) {
+    unsigned char randomize[32];
+    unsigned char serialized_xonly[32];
+    secp256k1_xonly_pubkey tx_inputs[N_INPUTS];
+    const secp256k1_xonly_pubkey *tx_input_ptrs[N_INPUTS];
+    secp256k1_xonly_pubkey tx_outputs[N_OUTPUTS];
+    secp256k1_xonly_pubkey *tx_output_ptrs[N_OUTPUTS];
+    secp256k1_silentpayments_found_output found_outputs[N_OUTPUTS];
+    secp256k1_silentpayments_found_output *found_output_ptrs[N_OUTPUTS];
+    secp256k1_silentpayments_prevouts_summary prevouts_summary;
+    secp256k1_pubkey unlabeled_spend_pubkey;
+    struct labels_cache bob_labels_cache;
+    unsigned char bob_address[2][33];
+    int ret;
+    size_t i;
+    uint32_t n_found_outputs;
+
+    /* Before we can call actual API functions, we need to create a "context" */
+    secp256k1_context* ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
+    if (!fill_random(randomize, sizeof(randomize))) {
+        printf("Failed to generate randomness\n");
+        return EXIT_FAILURE;
+    }
+    /* Randomizing the context is recommended to protect against side-channel
+     * leakage. See `secp256k1_context_randomize` in secp256k1.h for more
+     * information about it. This should never fail. */
+    ret = secp256k1_context_randomize(ctx, randomize);
+    assert(ret);
+
+    /* Set up the pointer arrays. These will be used for sending and scanning. */
+    for (i = 0; i < N_INPUTS; i++) {
+        tx_input_ptrs[i] = &tx_inputs[i];
+    }
+    for (i = 0; i < N_OUTPUTS; i++) {
+        tx_output_ptrs[i] = &tx_outputs[i];
+        found_output_ptrs[i] = &found_outputs[i];
+    }
+
+    /*** Create a labeled Silent Payments address (Bob) ***/
+    {
+        size_t len = 33;
+        secp256k1_silentpayments_label label;
+        secp256k1_pubkey labeled_spend_pubkey;
+        /* Per BIP-352, the label integer value m = 0 is reserved for the receiver's own
+         * change, so only values m >= 1 must be used for publishing addresses. */
+        uint32_t m = 1;
+
+        /* Load Bob's spend public key */
+        ret = secp256k1_ec_pubkey_parse(ctx,
+            &unlabeled_spend_pubkey,
+            bob_scan_and_spend_pubkeys[1],
+            33
+        );
+        assert(ret);
+        /* Create a (label_tweak, label) pair and add them to the labels cache.
+         *
+         * Bob MUST keep track of all of the labels he has used by adding them
+         * to the labels cache. Otherwise, he will not find outputs sent to his
+         * labeled addresses when scanning. */
+        ret = secp256k1_silentpayments_recipient_label_create(ctx,
+            &label,
+            bob_labels_cache.entries[0].label_tweak,
+            bob_scan_key,
+            m
+        );
+        if (!ret) {
+            printf("Something went wrong, event with negligible probability happened.\n");
+            return EXIT_FAILURE;
+        }
+        ret = secp256k1_silentpayments_recipient_label_serialize(ctx, bob_labels_cache.entries[0].label, &label);
+        assert(ret);
+        bob_labels_cache.entries_used = 1;
+        /* Now that the labels cache has been updated, Bob creates his labeled
+         * Silent Payments address and publishes it.
+         */
+        ret = secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(ctx, &labeled_spend_pubkey, &unlabeled_spend_pubkey, &label);
+        if (!ret) {
+            printf("Something went wrong, event with negligible probability happened.\n");
+            return EXIT_FAILURE;
+        }
+        memcpy(bob_address[0], bob_scan_and_spend_pubkeys[0], 33);
+        ret = secp256k1_ec_pubkey_serialize(ctx,
+            bob_address[1],
+            &len,
+            &labeled_spend_pubkey,
+            SECP256K1_EC_COMPRESSED
+        );
+        assert(ret);
+    }
+    /*** Sending (Alice) ***/
+    {
+        secp256k1_keypair sender_keypairs[N_INPUTS];
+        const secp256k1_keypair *sender_keypair_ptrs[N_INPUTS];
+        secp256k1_silentpayments_recipient recipients[N_OUTPUTS];
+        const secp256k1_silentpayments_recipient *recipient_ptrs[N_OUTPUTS];
+        /* 2D array for holding multiple public key pairs. The second index, i.e., [2],
+         * is to represent the spend and scan public keys. */
+        unsigned char (*sp_addresses[N_OUTPUTS])[2][33];
+        unsigned char seckey[32];
+
+        /*** Generate secret keys for the sender ***
+         *
+         * In this example, only taproot inputs are used but the function can be
+         * called with a mix of taproot seckeys and plain seckeys. Taproot
+         * seckeys are passed as keypairs to allow the sending function to check
+         * if the secret keys need to be negated without needing to do an
+         * expensive pubkey generation. This is not needed for plain seckeys
+         * since there is no need for negation.
+         *
+         * The public key from each input keypair is saved in the `tx_inputs`
+         * array. This array will be used later in the example to represent the
+         * public keys the recipient will extract from the transaction inputs.
+         *
+         * If the secret key is zero or out of range (bigger than secp256k1's
+         * order), fail. Note that the probability of this happening is
+         * negligible. */
+        for (i = 0; i < N_INPUTS; i++) {
+            if (!fill_random(seckey, sizeof(seckey))) {
+                printf("Failed to generate randomness\n");
+                return EXIT_FAILURE;
+            }
+            /* Try to create a keypair with a valid context, it should only fail
+             * if the secret key is zero or out of range. */
+            if (secp256k1_keypair_create(ctx, &sender_keypairs[i], seckey)) {
+                sender_keypair_ptrs[i] = &sender_keypairs[i];
+                ret = secp256k1_keypair_xonly_pub(
+                    ctx,
+                    &tx_inputs[i],
+                    NULL,
+                    &sender_keypairs[i]
+                );
+                assert(ret);
+            } else {
+                printf("Failed to create keypair\n");
+                return EXIT_FAILURE;
+            }
+        }
+        /*** Create the recipient objects ***/
+
+        /* Alice is sending to Bob and Carol in this transaction:
+         *
+         *     1. One output to Bob's labeled address
+         *     2. Two outputs for Carol
+         *
+         * To create multiple outputs for Carol, Alice simply passes Carol's
+         * Silent Payments address multiple times.
+         */
+        sp_addresses[0] = &carol_address;
+        sp_addresses[1] = &bob_address;
+        sp_addresses[2] = &carol_address;
+        for (i = 0; i < N_OUTPUTS; i++) {
+            ret = secp256k1_ec_pubkey_parse(ctx,
+                &recipients[i].scan_pubkey,
+                (*(sp_addresses[i]))[0],
+                33
+            );
+            ret &= secp256k1_ec_pubkey_parse(ctx,
+                &recipients[i].spend_pubkey,
+                (*(sp_addresses[i]))[1],
+                33
+            );
+            if (!ret) {
+                printf("Something went wrong, this is not a valid Silent Payments address.\n");
+                return EXIT_FAILURE;
+            }
+
+            /* Alice creates the recipient objects and adds the index of the
+             * original ordering (the ordering of the `sp_addresses` array) to
+             * each object. This index is used to return the generated outputs
+             * in the original ordering so that Alice can match up the generated
+             * outputs with the correct amounts.
+             */
+            recipients[i].index = i;
+            recipient_ptrs[i] = &recipients[i];
+        }
+        ret = secp256k1_silentpayments_sender_create_outputs(ctx,
+            tx_output_ptrs,
+            recipient_ptrs, N_OUTPUTS,
+            smallest_outpoint,
+            sender_keypair_ptrs, N_INPUTS,
+            NULL, 0
+        );
+        if (!ret) {
+            printf("Something went wrong, group limit exceeded or input secret keys sum to zero.\n");
+            return EXIT_FAILURE;
+        }
+        printf("Alice created the following outputs for Bob and Carol:\n");
+        for (i = 0; i < N_OUTPUTS; i++) {
+            printf("    ");
+            ret = secp256k1_xonly_pubkey_serialize(ctx,
+                serialized_xonly,
+                &tx_outputs[i]
+            );
+            assert(ret);
+            print_hex(serialized_xonly, sizeof(serialized_xonly));
+        }
+        /* It's best practice to try to clear secrets from memory after using
+         * them. This is done because some bugs can allow an attacker to leak
+         * memory, for example through "out of bounds" array access (see
+         * Heartbleed), or the OS swapping them to disk. Hence, we overwrite the
+         * secret key buffer with zeros.
+         *
+         * Here we are preventing these writes from being optimized out, as any
+         * good compiler will remove any writes that aren't used. */
+        secure_erase(seckey, sizeof(seckey));
+        for (i = 0; i < N_INPUTS; i++) {
+            secure_erase(&sender_keypairs[i], sizeof(sender_keypairs[i]));
+        }
+    }
+
+    /*** Receiving ***/
+    {
+        {
+            /*** Scanning as a full node (Bob) ***
+             *
+             * Since Bob has access to the full transaction, scanning is simple:
+             *
+             *     1. Collect the relevant prevouts from the transaction and call
+             *        `secp256k1_silentpayments_recipient_prevouts_summary_create`
+             *     2. Call `secp256k1_silentpayments_recipient_scan_outputs`
+             */
+            ret = secp256k1_silentpayments_recipient_prevouts_summary_create(ctx,
+                &prevouts_summary,
+                smallest_outpoint,
+                tx_input_ptrs, N_INPUTS,
+                NULL, 0
+            );
+            if (!ret) {
+                /* We need to always check that the prevouts data object is valid
+                 * before proceeding.
+                 */
+                printf("This transaction is not valid for Silent Payments, skipping.\n");
+                return EXIT_SUCCESS;
+            }
+
+            /* Scan the transaction */
+            n_found_outputs = 0;
+            ret = secp256k1_silentpayments_recipient_scan_outputs(ctx,
+                found_output_ptrs, &n_found_outputs,
+                (const secp256k1_xonly_pubkey**)tx_output_ptrs, N_OUTPUTS,
+                bob_scan_key,
+                &prevouts_summary,
+                &unlabeled_spend_pubkey,
+                label_lookup, &bob_labels_cache /* NULL, NULL for no labels */
+            );
+            if (!ret) {
+                printf("This transaction is not valid for Silent Payments, skipping.\n");
+                return EXIT_SUCCESS;
+            }
+            if (n_found_outputs > 0) {
+                secp256k1_keypair kp;
+                secp256k1_xonly_pubkey xonly_output;
+                unsigned char full_seckey[32];
+
+                printf("\n");
+                printf("Bob found the following outputs: \n");
+                for (i = 0; i < n_found_outputs; i++) {
+                    printf("    ");
+                    ret = secp256k1_xonly_pubkey_serialize(ctx,
+                        serialized_xonly,
+                        &found_outputs[i].output
+                    );
+                    assert(ret);
+                    print_hex(serialized_xonly, sizeof(serialized_xonly));
+
+                    /* Verify that this output is spendable by Bob by reconstructing the full
+                     * secret key for the xonly output.
+                     *
+                     * This is done by adding the tweak from the transaction to Bob's spend key.
+                     * If the output was sent to a labeled address, the label tweak has already
+                     * been added to the tweak in `secp256k1_silentpayments_found_output`.
+                     *
+                     * To verify that we are able to sign for this output, it is sufficient to
+                     * check that the public key generated from `full_seckey` matches the output
+                     * in the transaction. For a full example on signing for a taproot ouput,
+                     * see `examples/schnorr.c`.
+                     */
+                    memcpy(&full_seckey, &bob_spend_key, 32);
+                    ret = secp256k1_ec_seckey_tweak_add(ctx, full_seckey, found_outputs[i].tweak);
+                    ret &= secp256k1_keypair_create(ctx, &kp, full_seckey);
+                    ret &= secp256k1_keypair_xonly_pub(
+                        ctx,
+                        &xonly_output,
+                        NULL,
+                        &kp
+                    );
+                    /* We assert here because the only way the seckey_tweak_add operation can fail
+                     * is if the tweak is the negation of Bob's spend key.
+                     *
+                     * We also assert that the generated public key matches the transaction output,
+                     * as it should be impossible for a mismatch at this point considering the
+                     * scanning function completed without errors and indicated found outputs.
+                     */
+                    assert(ret);
+                    assert(secp256k1_xonly_pubkey_cmp(ctx, &xonly_output, &found_outputs[i].output) == 0);
+                    secure_erase(full_seckey, sizeof(full_seckey));
+                }
+            } else {
+                printf("Bob did not find any outputs in this transaction.\n");
+            }
+        }
+        {
+            /*** Scanning as a full node (Carol) ***/
+            /* TODO: switch this part to light client scanning once it is supported */
+
+            /* Load Carol's spend public key. */
+            ret = secp256k1_ec_pubkey_parse(ctx,
+                &unlabeled_spend_pubkey,
+                carol_address[1],
+                33
+            );
+            assert(ret);
+
+            n_found_outputs = 0;
+            ret = secp256k1_silentpayments_recipient_scan_outputs(ctx,
+                found_output_ptrs, &n_found_outputs,
+                (const secp256k1_xonly_pubkey**)tx_output_ptrs, N_OUTPUTS,
+                carol_scan_key,
+                &prevouts_summary,
+                &unlabeled_spend_pubkey,
+                NULL, NULL /* NULL, NULL for no labels */
+            );
+            if (!ret) {
+                printf("This transaction is not valid for Silent Payments, skipping.\n");
+                return EXIT_SUCCESS;
+            }
+            if (n_found_outputs > 0) {
+                /* Carol would spend these outputs the same as Bob, by tweaking her
+                 * spend key with the tweak corresponding to the found output. See above
+                 * for an example for Bob's outputs. */
+                printf("\n");
+                printf("Carol found the following outputs: \n");
+                for (i = 0; i < n_found_outputs; i++) {
+                    printf("    ");
+                    ret = secp256k1_xonly_pubkey_serialize(ctx,
+                        serialized_xonly,
+                        &found_outputs[i].output
+                    );
+                    assert(ret);
+                    print_hex(serialized_xonly, sizeof(serialized_xonly));
+                }
+            } else {
+                printf("Carol did not find any outputs in this transaction.\n");
+            }
+        }
+    }
+
+    /* This will clear everything from the context and free the memory */
+    secp256k1_context_destroy(ctx);
+    return EXIT_SUCCESS;
+}
diff --git a/depend/bitcoin/src/secp256k1/include/secp256k1.h b/depend/bitcoin/src/secp256k1/include/secp256k1.h
index b7ec6a22..09506f2d 100644
--- a/depend/bitcoin/src/secp256k1/include/secp256k1.h
+++ b/depend/bitcoin/src/secp256k1/include/secp256k1.h
@@ -101,15 +101,6 @@ typedef int (*secp256k1_nonce_function)(
     unsigned int attempt
 );
 
-# if !defined(SECP256K1_GNUC_PREREQ)
-#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
-#   define SECP256K1_GNUC_PREREQ(_maj,_min) \
- ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
-#  else
-#   define SECP256K1_GNUC_PREREQ(_maj,_min) 0
-#  endif
-# endif
-
 /*  When this header is used at build-time the SECP256K1_BUILD define needs to be set
  *  to correctly setup export attributes and nullness checks.  This is normally done
  *  by secp256k1.c but to guard against this header being included before secp256k1.c
@@ -178,12 +169,12 @@ typedef int (*secp256k1_nonce_function)(
 /* Warning attributes
  * NONNULL is not used if SECP256K1_BUILD is set to avoid the compiler optimizing out
  * some paranoid null checks. */
-# if defined(__GNUC__) && SECP256K1_GNUC_PREREQ(3, 4)
+# if defined(__GNUC__)
 #  define SECP256K1_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
 # else
 #  define SECP256K1_WARN_UNUSED_RESULT
 # endif
-# if !defined(SECP256K1_BUILD) && defined(__GNUC__) && SECP256K1_GNUC_PREREQ(3, 4)
+# if !defined(SECP256K1_BUILD) && defined(__GNUC__)
 #  define SECP256K1_ARG_NONNULL(_x)  __attribute__ ((__nonnull__(_x)))
 # else
 #  define SECP256K1_ARG_NONNULL(_x)
@@ -245,10 +236,6 @@ typedef int (*secp256k1_nonce_function)(
  */
 SECP256K1_API const secp256k1_context * const secp256k1_context_static;
 
-/** Deprecated alias for secp256k1_context_static. */
-SECP256K1_API const secp256k1_context * const secp256k1_context_no_precomp
-SECP256K1_DEPRECATED("Use secp256k1_context_static instead");
-
 /** Perform basic self tests (to be used in conjunction with secp256k1_context_static)
  *
  *  This function performs self tests that detect some serious usage errors and
@@ -426,7 +413,7 @@ typedef void (*secp256k1_sha256_compression_function)(
 /**
  * Set a callback function to override the internal SHA256 compression function.
  *
- * This installs a function to replace the built-in block-compression
+ * This installs a callback to replace the built-in block-compression
  * step used by the library's internal SHA256 implementation.
  * The provided callback must exactly implement the effect of n_blocks
  * repeated applications of the SHA256 compression function.
@@ -436,6 +423,21 @@ typedef void (*secp256k1_sha256_compression_function)(
  * specialized implementation. It is NOT meant for replacing SHA256
  * with a different hash function.
  *
+ * Since auxiliary functions exposed by the library via a function
+ * pointer such as secp256k1_nonce_function_default do not take a
+ * context object, they will not use the callback when called directly
+ * from user code. (But they will use the callback when called from
+ * other library functions that do take a context object, e.g., when
+ * noncefp==NULL or noncefp==secp256k1_nonce_function_default is passed
+ * as an argument to secp256k1_ecdsa_sign.)
+ *
+ * Note: The provided function is tested against a set of known SHA256
+ * digests; invokes the context's illegal callback on any mismatch
+ * (which aborts by default), in order to catch basic misbehavior early.
+ * It takes well under 2.5 ms on a desktop machine.
+ * This is NOT a substitute for having proper test coverage of the
+ * supplied function outside this library.
+ *
  * Args:    ctx:             pointer to a context object.
  * In:      fn_compression:  pointer to a function implementing the compression function;
  *                           passing NULL restores the default implementation.
@@ -687,7 +689,7 @@ SECP256K1_API const secp256k1_nonce_function secp256k1_nonce_function_default;
  *  Returns: 1: signature created
  *           0: the nonce generation function failed, or the secret key was invalid.
  *  Args:    ctx:       pointer to a context object (not secp256k1_context_static).
- *  Out:     sig:       pointer to an array where the signature will be placed.
+ *  Out:     sig:       pointer to a signature object.
  *  In:      msghash32: the 32-byte message hash being signed.
  *           seckey:    pointer to a 32-byte secret key.
  *           noncefp:   pointer to a nonce generation function. If NULL,
diff --git a/depend/bitcoin/src/secp256k1/include/secp256k1_recovery.h b/depend/bitcoin/src/secp256k1/include/secp256k1_recovery.h
index 2430f993..45f20aba 100644
--- a/depend/bitcoin/src/secp256k1/include/secp256k1_recovery.h
+++ b/depend/bitcoin/src/secp256k1/include/secp256k1_recovery.h
@@ -73,7 +73,7 @@ SECP256K1_API int secp256k1_ecdsa_recoverable_signature_serialize_compact(
  *  Returns: 1: signature created
  *           0: the nonce generation function failed, or the secret key was invalid.
  *  Args:    ctx:       pointer to a context object (not secp256k1_context_static).
- *  Out:     sig:       pointer to an array where the signature will be placed.
+ *  Out:     sig:       pointer to a signature object.
  *  In:      msghash32: the 32-byte message hash being signed.
  *           seckey:    pointer to a 32-byte secret key.
  *           noncefp:   pointer to a nonce generation function. If NULL,
diff --git a/depend/bitcoin/src/secp256k1/include/secp256k1_schnorrsig.h b/depend/bitcoin/src/secp256k1/include/secp256k1_schnorrsig.h
index 013d4ee7..721b3d2f 100644
--- a/depend/bitcoin/src/secp256k1/include/secp256k1_schnorrsig.h
+++ b/depend/bitcoin/src/secp256k1/include/secp256k1_schnorrsig.h
@@ -124,20 +124,9 @@ SECP256K1_API int secp256k1_schnorrsig_sign32(
     const unsigned char *aux_rand32
 ) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
 
-/** Same as secp256k1_schnorrsig_sign32, but DEPRECATED. Will be removed in
- *  future versions. */
-SECP256K1_API int secp256k1_schnorrsig_sign(
-    const secp256k1_context *ctx,
-    unsigned char *sig64,
-    const unsigned char *msg32,
-    const secp256k1_keypair *keypair,
-    const unsigned char *aux_rand32
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4)
-  SECP256K1_DEPRECATED("Use secp256k1_schnorrsig_sign32 instead");
-
 /** Create a Schnorr signature with a more flexible API.
  *
- *  Same arguments as secp256k1_schnorrsig_sign except that it allows signing
+ *  Same arguments as secp256k1_schnorrsig_sign32 except that it allows signing
  *  variable length messages and accepts a pointer to an extraparams object that
  *  allows customizing signing by passing additional arguments.
  *
diff --git a/depend/bitcoin/src/secp256k1/include/secp256k1_silentpayments.h b/depend/bitcoin/src/secp256k1/include/secp256k1_silentpayments.h
new file mode 100644
index 00000000..54581457
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/include/secp256k1_silentpayments.h
@@ -0,0 +1,396 @@
+#ifndef SECP256K1_SILENTPAYMENTS_H
+#define SECP256K1_SILENTPAYMENTS_H
+
+#include <stdint.h>
+#include "secp256k1.h"
+#include "secp256k1_extrakeys.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** This module provides an implementation for Silent Payments, as specified in
+ *  BIP352. This particularly involves the creation of input tweak data by
+ *  summing up secret or public keys and the derivation of a shared secret using
+ *  Elliptic Curve Diffie-Hellman. Combined are either:
+ *    - spender's secret keys and recipient's public key (a * B, sender side)
+ *    - spender's public keys and recipient's secret key (A * b, recipient side)
+ *  With this result, the necessary key material for ultimately creating/scanning
+ *  or spending Silent Payments outputs can be determined.
+ *
+ *  Note that this module is _not_ a full implementation of BIP352, as it
+ *  inherently doesn't deal with higher-level concepts like addresses, output
+ *  script types or transactions. The intent is to provide a module for
+ *  abstracting away the elliptic-curve operations required for the protocol. For
+ *  any wallet software already using libsecp256k1, this API should provide all
+ *  the functions needed for a Silent Payments implementation without requiring
+ *  any further elliptic-curve operations from the wallet.
+ */
+
+/* Maximum number of Silent Payments recipients per group (i.e.
+ * recipients sharing the same scan public key) as per BIP-352 */
+#define SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT 2323
+
+/** The data from a single recipient address
+ *
+ *  This struct serves as an input argument to `silentpayments_sender_create_outputs`.
+ *
+ *  `index` must be set to the position (starting with 0) of this recipient in the
+ *  `recipients` array passed to `silentpayments_sender_create_outputs`. It is
+ *  used to map the returned generated outputs back to the original recipient.
+ *
+ *  Note:
+ *  The spend public key named `spend_pubkey` may have been optionally tweaked with
+ *  a label by the recipient. Whether `spend_pubkey` has actually been tagged with
+ *  a label is irrelevant for the sender. As a documentation convention in this API,
+ *  `unlabeled_spend_pubkey` is used to indicate when the unlabeled spend public key
+ *  must be used.
+ */
+typedef struct secp256k1_silentpayments_recipient {
+    secp256k1_pubkey scan_pubkey;
+    secp256k1_pubkey spend_pubkey;
+    size_t index;
+} secp256k1_silentpayments_recipient;
+
+/** Create Silent Payments outputs for recipient(s).
+ *
+ *  Given a list of n secret keys a_1...a_n (one for each Silent Payments
+ *  eligible input to spend), a serialized outpoint, and a list of recipients,
+ *  create the taproot outputs. Inputs with conditional branches or multiple
+ *  public keys are excluded from Silent Payments eligible inputs; see BIP352
+ *  for more information.
+ *
+ *  `outpoint_smallest36` refers to the smallest outpoint lexicographically
+ *  from the transaction inputs (both Silent Payments eligible and non-eligible
+ *  inputs). This value MUST be the smallest outpoint out of all of the
+ *  transaction inputs, otherwise the recipient will be unable to find the
+ *  payment. Determining the smallest outpoint from the list of transaction
+ *  inputs is the responsibility of the caller. It is strongly recommended
+ *  that implementations ensure they are doing this correctly by using the
+ *  test vectors from BIP352.
+ *
+ *  When creating more than one generated output, all of the generated outputs
+ *  MUST be included in the final transaction. Dropping any of the generated
+ *  outputs from the final transaction may make all or some of the outputs
+ *  unfindable by the recipient.
+ *
+ *  Returns: 1 if creation of outputs was successful.
+ *           0 on failure, i.e., when one of the following occurs:
+ *             - The size of any group (i.e. recipients sharing the same scan public key)
+ *               exceeds the protocol limit SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT.
+ *             - The sum of all input secret keys is 0.
+ *               (This occurs only with negligible probability if at least one of the
+ *               input secret keys is uniformly random and independent of all other keys.)
+ *             - An invalid output public key is created. (This can only happen for an
+ *               adversarially chosen recipient spend public key.)
+ *
+ *  Args:                ctx: pointer to a context object
+ *                            (not secp256k1_context_static).
+ *  Out:   generated_outputs: pointer to an array of pointers to xonly public keys,
+ *                            one per recipient.
+ *                            The outputs are ordered to match the original
+ *                            ordering of the recipient objects, i.e.,
+ *                            `generated_outputs[0]` is the generated output
+ *                            for the `secp256k1_silentpayments_recipient` object
+ *                            with index = 0.
+ *  In:           recipients: pointer to an array of pointers to Silent Payments
+ *                            recipients, where each recipient is a scan public
+ *                            key, a spend public key, and an index indicating
+ *                            its position in the original ordering. This function
+ *                            may reorder the pointers to the recipient objects
+ *                            within the array, i.e., after the call (including on
+ *                            failure), the index fields of the recipient objects
+ *                            may no longer correspond to the positions in the
+ *                            array. Multiple recipient objects with the same scan
+ *                            public key and/or same spend public key can be passed
+ *                            if they carry different indices.
+ *              n_recipients: the size of the recipients array.
+ *       outpoint_smallest36: serialized (36-byte) smallest outpoint
+ *                            (lexicographically) from the transaction inputs
+ *                  keypairs: pointer to an array of pointers to taproot
+ *                            keypair inputs (can be NULL if no secret keys
+ *                            of taproot inputs are used)
+ *                n_keypairs: the size of the keypairs array.
+ *                   seckeys: pointer to an array of pointers to 32-byte
+ *                            secret keys of non-taproot inputs (can be NULL
+ *                            if no secret keys of non-taproot inputs are
+ *                            used)
+ *                 n_seckeys: the size of the seckeys array.
+ */
+SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_silentpayments_sender_create_outputs(
+    const secp256k1_context *ctx,
+    secp256k1_xonly_pubkey **generated_outputs,
+    const secp256k1_silentpayments_recipient **recipients,
+    size_t n_recipients,
+    const unsigned char *outpoint_smallest36,
+    const secp256k1_keypair * const *keypairs,
+    size_t n_keypairs,
+    const unsigned char * const *seckeys,
+    size_t n_seckeys
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(5);
+
+/** Opaque data structure that holds a Silent Payments label.
+ *
+ *  Guaranteed to be 68 bytes in size. Serialized and parsed with
+ *  `secp256k1_silentpayments_recipient_label_serialize` and
+ *  `secp256k1_silentpayments_recipient_label_parse`.
+ */
+typedef struct secp256k1_silentpayments_label {
+    unsigned char data[68];
+} secp256k1_silentpayments_label;
+
+/** Parse a Silent Payments label.
+ *
+ *  Returns: 1 when the label could be parsed, 0 otherwise.
+ *  Args:    ctx: pointer to a context object
+ *  Out:   label: pointer to a label object
+ *  In:     in33: pointer to the 33-byte label to be parsed
+ */
+SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_silentpayments_recipient_label_parse(
+    const secp256k1_context *ctx,
+    secp256k1_silentpayments_label *label,
+    const unsigned char *in33
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
+
+/** Serialize a Silent Payments label
+ *
+ *  Returns: 1 always
+ *  Args:    ctx: pointer to a context object
+ *  Out:   out33: pointer to a 33-byte array to store the serialized label
+ *  In:    label: pointer to the label
+ */
+SECP256K1_API int secp256k1_silentpayments_recipient_label_serialize(
+    const secp256k1_context *ctx,
+    unsigned char *out33,
+    const secp256k1_silentpayments_label *label
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
+
+/** Create Silent Payments label tweak and label.
+ *
+ *  Given a recipient's 32 byte scan key and a label integer m, calculate the
+ *  corresponding label tweak and label:
+ *
+ *      label_tweak = hash(scan_key || m)
+ *            label = label_tweak * G
+ *
+ *  Returns: 1 if label tweak and label creation was successful.
+ *           0 if scan_key32 is invalid or the hash output label_tweak32 is
+ *             not a valid scalar (negligible probability per hash evaluation).
+ *
+ * WARNING: Creating a large number of labels may significantly degrade
+ * scanning performance in certain Silent Payments wallet implementations,
+ * such as light clients. The scanning function provided in this module,
+ * which is designed for full nodes, performs consistently even with hundreds
+ * of thousands of labels. Other implementations may not share this property
+ * or may be unable to use it due to lacking full transaction data.
+ *
+ * To maximize wallet interoperability, it is recommended to create only
+ * the change label (m = 0) and avoid distributing labeled addresses.
+ *
+ *  Args:                ctx: pointer to a context object
+ *                            (not secp256k1_context_static)
+ *  Out:               label: pointer to the resulting label
+ *             label_tweak32: pointer to the 32 byte label tweak
+ *  In:           scan_key32: pointer to the recipient's 32 byte scan key
+ *                         m: integer for the m-th label (0 is used for change outputs)
+ */
+SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_silentpayments_recipient_label_create(
+    const secp256k1_context *ctx,
+    secp256k1_silentpayments_label *label,
+    unsigned char *label_tweak32,
+    const unsigned char *scan_key32,
+    uint32_t m
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
+
+/** Create Silent Payments labeled spend public key.
+ *
+ *  Given a recipient's spend public key and a label, calculate the
+ *  corresponding labeled spend public key:
+ *
+ *      labeled_spend_pubkey = unlabeled_spend_pubkey + label
+ *
+ *  The result is used by the recipient to create a Silent Payments address,
+ *  consisting of the serialized and concatenated scan public key and
+ *  (labeled) spend public key.
+ *
+ *  Returns: 1 if labeled spend public key creation was successful.
+ *           0 if spend pubkey and label sum to zero (negligible probability for
+ *             labels created according to BIP352).
+ *
+ *  Args:                    ctx: pointer to a context object
+ *  Out:    labeled_spend_pubkey: pointer to the resulting labeled spend public key
+ *  In:   unlabeled_spend_pubkey: pointer to the recipient's unlabeled spend public key
+ *                         label: pointer to the recipient's label
+ */
+SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(
+    const secp256k1_context *ctx,
+    secp256k1_pubkey *labeled_spend_pubkey,
+    const secp256k1_pubkey *unlabeled_spend_pubkey,
+    const secp256k1_silentpayments_label *label
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
+
+/** Opaque data structure that holds Silent Payments prevouts summary data.
+ *
+ *  The exact representation of data inside is implementation defined and not
+ *  guaranteed to be portable between different platforms or versions. It is
+ *  however guaranteed to be 101 bytes in size, and can be safely copied/moved.
+ *  This structure does not contain secret data. It can be created with
+ *  `secp256k1_silentpayments_recipient_prevouts_summary_create`.
+ */
+typedef struct secp256k1_silentpayments_prevouts_summary {
+    unsigned char data[101];
+} secp256k1_silentpayments_prevouts_summary;
+
+/** Compute Silent Payments prevouts summary from prevout public keys and transaction
+ *  inputs.
+ *
+ *  Given a list of n public keys A_1...A_n (one for each Silent Payments
+ *  eligible input to spend) and a serialized outpoint_smallest36, create a
+ *  `prevouts_summary` object. This object summarizes the prevout data from the
+ *  transaction inputs needed for scanning.
+ *
+ *  `outpoint_smallest36` refers to the smallest outpoint lexicographically
+ *  from the transaction inputs (both Silent Payments eligible and non-eligible
+ *  inputs). This value MUST be the smallest outpoint out of all of the
+ *  transaction inputs, otherwise the recipient will be unable to find the
+ *  payment.
+ *
+ *  The public keys have to be passed in via two different parameter pairs, one
+ *  for regular and one for x-only public keys, in order to avoid the need of
+ *  users converting to a common public key format before calling this function.
+ *  The resulting data can be used for scanning on the recipient side.
+ *
+ *  Returns: 1 if prevouts summary creation was successful.
+ *           0 if the transaction is not a Silent Payments transaction.
+ *
+ *  Args:                 ctx: pointer to a context object
+ *  Out:     prevouts_summary: pointer to prevouts_summary object containing the
+ *                             summed public key and input_hash.
+ *  In:   outpoint_smallest36: serialized smallest outpoint (lexicographically)
+ *                             from the transaction inputs
+ *              xonly_pubkeys: pointer to an array of pointers to taproot
+ *                             x-only public keys (can be NULL if no taproot
+ *                             inputs are used)
+ *            n_xonly_pubkeys: the size of the xonly_pubkeys array.
+ *                    pubkeys: pointer to an array of pointers to non-taproot
+ *                             public keys (can be NULL if no non-taproot
+ *                             inputs are used)
+ *                  n_pubkeys: the size of the pubkeys array.
+ */
+SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_silentpayments_recipient_prevouts_summary_create(
+    const secp256k1_context *ctx,
+    secp256k1_silentpayments_prevouts_summary *prevouts_summary,
+    const unsigned char *outpoint_smallest36,
+    const secp256k1_xonly_pubkey * const *xonly_pubkeys,
+    size_t n_xonly_pubkeys,
+    const secp256k1_pubkey * const *pubkeys,
+    size_t n_pubkeys
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
+
+/** Type of callback function for label lookups
+ *
+ *  A function of this type will be used to retrieve the label tweak for a given
+ *  label during scanning. A typical implementation will perform a lookup in a
+ *  key-value store called the "label cache".
+ *
+ *  For creating the label cache data,
+ *  `secp256k1_silentpayments_recipient_label_create` and
+ *  `secp256k1_silentpayments_recipient_label_serialize` can be used.
+ *
+ *  Returns: pointer to the 32-byte label tweak if there is a match.
+ *           NULL pointer if there is no match.
+ *
+ *  In:         label: pointer to the serialized 33-byte label to check
+ *                     (computed during scanning)
+ *      label_context: pointer to the recipient's label cache.
+ */
+typedef const unsigned char* (*secp256k1_silentpayments_label_lookup)(const unsigned char* label33, const void* label_context);
+
+/** Found outputs struct
+ *
+ *  Struct for holding a found output along with data needed to spend it later.
+ *
+ *            output: the x-only public key for the taproot output
+ *             tweak: the 32-byte tweak needed to spend the output
+ *  found_with_label: boolean value to indicate if the output was sent to a
+ *                    labeled address. If true, label will be set to a valid value.
+ *             label: the label used. If found_with_label = false, this is set to
+ *                    an invalid value.
+ */
+typedef struct secp256k1_silentpayments_found_output {
+    secp256k1_xonly_pubkey output;
+    unsigned char tweak[32];
+    int found_with_label;
+    secp256k1_silentpayments_label label;
+} secp256k1_silentpayments_found_output;
+
+/** Scan for Silent Payments transaction outputs.
+ *
+ *  Given a prevouts_summary object, a recipient's 32 byte scan key and spend public key,
+ *  and the relevant transaction outputs, scan for outputs belonging to
+ *  the recipient and return the tweak(s) needed for spending the output(s). An
+ *  optional label_lookup callback function and label_context can be passed if
+ *  the recipient uses labels. This allows for checking if a label exists in
+ *  the recipients label cache and retrieving the label tweak during scanning.
+ *
+ *  If used, the `label_lookup` function must return a pointer to a 32-byte label
+ *  tweak if the label is found, or NULL otherwise. The returned pointer must remain
+ *  valid until the next call to `label_lookup` or until the function returns,
+ *  whichever comes first. It is not retained beyond that.
+ *
+ *  For creating the label cache, `secp256k1_silentpayments_recipient_label_create`
+ *  and `secp256k1_silentpayments_recipient_label_serialize` can be used.
+ *
+ *  Note:
+ *  Scanning is bounded by SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT and may
+ *  miss outputs if a transaction contains more outputs for a single scan public
+ *  key group than this limit.
+ *
+ *  Returns: 1 if output scanning was successful.
+ *           0 if the transaction is not a Silent Payments transaction,
+ *             or if the arguments are invalid.
+ *
+ *  Args:                   ctx: pointer to a context object
+ *  Out:          found_outputs: pointer to an array of pointers to found
+ *                               output objects. The found outputs array MUST
+ *                               have the same length as the tx_outputs array.
+ *              n_found_outputs: pointer to an integer indicating the final
+ *                               size of the found outputs array. This number
+ *                               represents the number of outputs found while
+ *                               scanning (0 if none are found). Can't be larger than
+ *                               SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT.
+ *  In:              tx_outputs: pointer to the transaction's x-only public key outputs,
+ *                               in their original transaction (vout) order
+ *                 n_tx_outputs: the size of the tx_outputs array.
+ *                   scan_key32: pointer to the recipient's 32 byte scan key. The scan
+ *                               key is valid if it passes secp256k1_ec_seckey_verify
+ *             prevouts_summary: pointer to the transaction prevouts summary data (see
+ *                               `secp256k1_silentpayments_recipient_prevouts_summary_create`).
+ *       unlabeled_spend_pubkey: pointer to the recipient's unlabeled spend public key
+ *                 label_lookup: pointer to a callback function for looking up
+ *                               a label value. This function takes a serialized 33-byte
+ *                               label as an argument and returns a pointer to the
+ *                               32-byte label tweak if the label exists, otherwise
+ *                               returns a NULL pointer (NULL if labels are not
+ *                               used)
+ *                label_context: pointer to a label context object (NULL if
+ *                               labels are not used or context is not needed)
+ */
+SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_silentpayments_recipient_scan_outputs(
+    const secp256k1_context *ctx,
+    secp256k1_silentpayments_found_output **found_outputs,
+    uint32_t *n_found_outputs,
+    const secp256k1_xonly_pubkey * const *tx_outputs,
+    size_t n_tx_outputs,
+    const unsigned char *scan_key32,
+    const secp256k1_silentpayments_prevouts_summary *prevouts_summary,
+    const secp256k1_pubkey *unlabeled_spend_pubkey,
+    secp256k1_silentpayments_label_lookup label_lookup,
+    const void *label_context
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4) SECP256K1_ARG_NONNULL(6) SECP256K1_ARG_NONNULL(7) SECP256K1_ARG_NONNULL(8);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SECP256K1_SILENTPAYMENTS_H */
diff --git a/depend/bitcoin/src/secp256k1/src/CMakeLists.txt b/depend/bitcoin/src/secp256k1/src/CMakeLists.txt
index 322f1987..911804f8 100644
--- a/depend/bitcoin/src/secp256k1/src/CMakeLists.txt
+++ b/depend/bitcoin/src/secp256k1/src/CMakeLists.txt
@@ -21,6 +21,15 @@ if(SECP256K1_ENABLE_MODULE_MUSIG)
   set_property(TARGET secp256k1 APPEND PROPERTY PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/include/secp256k1_musig.h)
 endif()
 
+if(SECP256K1_ENABLE_MODULE_SILENTPAYMENTS)
+  if(DEFINED SECP256K1_ENABLE_MODULE_EXTRAKEYS AND NOT SECP256K1_ENABLE_MODULE_EXTRAKEYS)
+    message(FATAL_ERROR "Module dependency error: You have disabled the extrakeys module explicitly, but it is required by the silent payments module.")
+  endif()
+  set(SECP256K1_ENABLE_MODULE_EXTRAKEYS ON)
+  add_compile_definitions(ENABLE_MODULE_SILENTPAYMENTS=1)
+  set_property(TARGET secp256k1 APPEND PROPERTY PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/include/secp256k1_silentpayments.h)
+endif()
+
 if(SECP256K1_ENABLE_MODULE_SCHNORRSIG)
   if(DEFINED SECP256K1_ENABLE_MODULE_EXTRAKEYS AND NOT SECP256K1_ENABLE_MODULE_EXTRAKEYS)
     message(FATAL_ERROR "Module dependency error: You have disabled the extrakeys module explicitly, but it is required by the schnorrsig module.")
@@ -94,35 +103,12 @@ set_target_properties(secp256k1_objs PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:secp256k1,INTERFACE_INCLUDE_DIRECTORIES>"
 )
 
-# This emulates Libtool to make sure Libtool and CMake agree on the ABI version,
-# see below "Calculate the version variables" in autotools-aux/ltmain.sh.
-math(EXPR ${PROJECT_NAME}_soversion "${${PROJECT_NAME}_LIB_VERSION_CURRENT} - ${${PROJECT_NAME}_LIB_VERSION_AGE}")
-set_target_properties(secp256k1 PROPERTIES
-  SOVERSION ${${PROJECT_NAME}_soversion}
+include(SetLibtoolAbiVersion)
+set_libtool_abi_version(secp256k1
+  ${${PROJECT_NAME}_LIB_VERSION_CURRENT}
+  ${${PROJECT_NAME}_LIB_VERSION_REVISION}
+  ${${PROJECT_NAME}_LIB_VERSION_AGE}
 )
-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD)$")
-  set_target_properties(secp256k1 PROPERTIES
-    VERSION ${${PROJECT_NAME}_soversion}.${${PROJECT_NAME}_LIB_VERSION_AGE}.${${PROJECT_NAME}_LIB_VERSION_REVISION}
-  )
-elseif(APPLE)
-  math(EXPR ${PROJECT_NAME}_compatibility_version "${${PROJECT_NAME}_LIB_VERSION_CURRENT} + 1")
-  set_target_properties(secp256k1 PROPERTIES
-    MACHO_COMPATIBILITY_VERSION ${${PROJECT_NAME}_compatibility_version}
-    MACHO_CURRENT_VERSION ${${PROJECT_NAME}_compatibility_version}.${${PROJECT_NAME}_LIB_VERSION_REVISION}
-  )
-  unset(${PROJECT_NAME}_compatibility_version)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(${PROJECT_NAME}_windows "secp256k1")
-  if(MSVC)
-    set(${PROJECT_NAME}_windows "${PROJECT_NAME}")
-  endif()
-  set_target_properties(secp256k1 PROPERTIES
-    ARCHIVE_OUTPUT_NAME "${${PROJECT_NAME}_windows}"
-    RUNTIME_OUTPUT_NAME "${${PROJECT_NAME}_windows}-${${PROJECT_NAME}_soversion}"
-  )
-  unset(${PROJECT_NAME}_windows)
-endif()
-unset(${PROJECT_NAME}_soversion)
 
 if(SECP256K1_BUILD_BENCHMARK)
   add_executable(bench bench.c)
diff --git a/depend/bitcoin/src/secp256k1/src/bench.c b/depend/bitcoin/src/secp256k1/src/bench.c
index f561ad1c..ac2054a5 100644
--- a/depend/bitcoin/src/secp256k1/src/bench.c
+++ b/depend/bitcoin/src/secp256k1/src/bench.c
@@ -32,6 +32,10 @@ static void help(const char *executable_path, int default_iters) {
     printf("    - ElligatorSwift (optional module)\n");
 #endif
 
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+    printf("    - Silent payments (optional module)\n");
+#endif
+
     printf("\n");
     printf("The default number of iterations for each benchmark is %d. This can be\n", default_iters);
     printf("customized using the SECP256K1_BENCH_ITERS environment variable.\n");
@@ -39,33 +43,39 @@ static void help(const char *executable_path, int default_iters) {
     printf("Usage: %s [args]\n", executable_path);
     printf("By default, all benchmarks will be run.\n");
     printf("args:\n");
-    printf("    help              : display this help and exit\n");
-    printf("    ecdsa             : all ECDSA algorithms--sign, verify, recovery (if enabled)\n");
-    printf("    ecdsa_sign        : ECDSA siging algorithm\n");
-    printf("    ecdsa_verify      : ECDSA verification algorithm\n");
-    printf("    ec                : all EC public key algorithms (keygen)\n");
-    printf("    ec_keygen         : EC public key generation\n");
+    printf("    help                                 : display this help and exit\n");
+    printf("    ecdsa                                : all ECDSA algorithms--sign, verify, recovery (if enabled)\n");
+    printf("    ecdsa_sign                           : ECDSA siging algorithm\n");
+    printf("    ecdsa_verify                         : ECDSA verification algorithm\n");
+    printf("    ec                                   : all EC public key algorithms (keygen)\n");
+    printf("    ec_keygen                            : EC public key generation\n");
 
 #ifdef ENABLE_MODULE_RECOVERY
-    printf("    ecdsa_recover     : ECDSA public key recovery algorithm\n");
+    printf("    ecdsa_recover                        : ECDSA public key recovery algorithm\n");
 #endif
 
 #ifdef ENABLE_MODULE_ECDH
-    printf("    ecdh              : ECDH key exchange algorithm\n");
+    printf("    ecdh                                 : ECDH key exchange algorithm\n");
 #endif
 
 #ifdef ENABLE_MODULE_SCHNORRSIG
-    printf("    schnorrsig        : all Schnorr signature algorithms (sign, verify)\n");
-    printf("    schnorrsig_sign   : Schnorr sigining algorithm\n");
-    printf("    schnorrsig_verify : Schnorr verification algorithm\n");
+    printf("    schnorrsig                           : all Schnorr signature algorithms (sign, verify)\n");
+    printf("    schnorrsig_sign                      : Schnorr sigining algorithm\n");
+    printf("    schnorrsig_verify                    : Schnorr verification algorithm\n");
 #endif
 
 #ifdef ENABLE_MODULE_ELLSWIFT
-    printf("    ellswift          : all ElligatorSwift benchmarks (encode, decode, keygen, ecdh)\n");
-    printf("    ellswift_encode   : ElligatorSwift encoding\n");
-    printf("    ellswift_decode   : ElligatorSwift decoding\n");
-    printf("    ellswift_keygen   : ElligatorSwift key generation\n");
-    printf("    ellswift_ecdh     : ECDH on ElligatorSwift keys\n");
+    printf("    ellswift                             : all ElligatorSwift benchmarks (encode, decode, keygen, ecdh)\n");
+    printf("    ellswift_encode                      : ElligatorSwift encoding\n");
+    printf("    ellswift_decode                      : ElligatorSwift decoding\n");
+    printf("    ellswift_keygen                      : ElligatorSwift key generation\n");
+    printf("    ellswift_ecdh                        : ECDH on ElligatorSwift keys\n");
+#endif
+
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+    printf("    silentpayments                       : all Silent payments benchmarks (scan_nomatch, scan_worstcase)\n");
+    printf("    silentpayments_scan_nomatch          : Silent payments scanning common case (no match)\n");
+    printf("    silentpayments_scan_worstcase        : Silent payments scanning worst case (block-sized tx, all match)\n");
 #endif
 
     printf("\n");
@@ -170,6 +180,10 @@ static void bench_keygen_run(void *arg, int iters) {
 # include "modules/ellswift/bench_impl.h"
 #endif
 
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+# include "modules/silentpayments/bench_impl.h"
+#endif
+
 int main(int argc, char** argv) {
     int i;
     secp256k1_pubkey pubkey;
@@ -182,7 +196,8 @@ int main(int argc, char** argv) {
     char* valid_args[] = {"ecdsa", "verify", "ecdsa_verify", "sign", "ecdsa_sign", "ecdh", "recover",
                          "ecdsa_recover", "schnorrsig", "schnorrsig_verify", "schnorrsig_sign", "ec",
                          "keygen", "ec_keygen", "ellswift", "encode", "ellswift_encode", "decode",
-                         "ellswift_decode", "ellswift_keygen", "ellswift_ecdh"};
+                         "ellswift_decode", "ellswift_keygen", "ellswift_ecdh", "silentpayments",
+                         "silentpayments_scan_nomatch", "silentpayments_scan_worstcase"};
     int invalid_args = have_invalid_args(argc, argv, valid_args, ARRAY_SIZE(valid_args));
 
     int default_iters = 20000;
@@ -240,6 +255,15 @@ int main(int argc, char** argv) {
     }
 #endif
 
+#ifndef ENABLE_MODULE_SILENTPAYMENTS
+    if (have_flag(argc, argv, "silentpayments") || have_flag(argc, argv, "silentpayments_scan_nomatch") ||
+        have_flag(argc, argv, "silentpayments_scan_worstcase")) {
+        fprintf(stderr, "./bench: silentpayments module not enabled.\n");
+        fprintf(stderr, "See README.md for configuration instructions.\n\n");
+        return EXIT_FAILURE;
+    }
+#endif
+
     /* ECDSA benchmark */
     data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
 
@@ -284,5 +308,11 @@ int main(int argc, char** argv) {
     run_ellswift_bench(iters, argc, argv);
 #endif
 
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+    /* SilentPayments benchmarks */
+    run_silentpayments_bench(iters, argc, argv);
+#endif
+
+
     return EXIT_SUCCESS;
 }
diff --git a/depend/bitcoin/src/secp256k1/src/bench.h b/depend/bitcoin/src/secp256k1/src/bench.h
index f88277aa..948e8db5 100644
--- a/depend/bitcoin/src/secp256k1/src/bench.h
+++ b/depend/bitcoin/src/secp256k1/src/bench.h
@@ -71,7 +71,7 @@ static void print_number(const int64_t x) {
         buffer[--ptr] = '-';
         g++;
     }
-    printf("%5.*s", g, &buffer[ptr]); /* Prints integer part */
+    printf("%8.*s", g, &buffer[ptr]); /* Prints integer part */
     printf("%-*s", FP_EXP, &buffer[ptr + g]); /* Prints fractional part */
 }
 
@@ -100,7 +100,7 @@ static void run_benchmark(char *name, void (*benchmark)(void*, int), void (*setu
         sum += total;
     }
     /* ',' is used as a column delimiter */
-    printf("%-30s, ", name);
+    printf("%-40s, ", name);
     print_number(min * FP_MULT / iter);
     printf("   , ");
     print_number(((sum * FP_MULT) / count) / iter);
@@ -167,7 +167,7 @@ static void print_output_table_header_row(void) {
     char* min_str = "    Min(us)    "; /* center alignment */
     char* avg_str = "    Avg(us)    ";
     char* max_str = "    Max(us)    ";
-    printf("%-30s,%-15s,%-15s,%-15s\n", bench_str, min_str, avg_str, max_str);
+    printf("%-40s,%-18s,%-18s,%-18s\n", bench_str, min_str, avg_str, max_str);
     printf("\n");
 }
 
diff --git a/depend/bitcoin/src/secp256k1/src/bench_ecmult.c b/depend/bitcoin/src/secp256k1/src/bench_ecmult.c
index eb546db4..12d550a6 100644
--- a/depend/bitcoin/src/secp256k1/src/bench_ecmult.c
+++ b/depend/bitcoin/src/secp256k1/src/bench_ecmult.c
@@ -88,7 +88,7 @@ static void bench_ecmult_teardown_helper(bench_data* data, size_t* seckey_offset
             secp256k1_scalar_add(&sum_scalars, &sum_scalars, &s);
         }
     }
-    secp256k1_ecmult_gen(&data->ctx->ecmult_gen_ctx, &tmp, &sum_scalars);
+    secp256k1_ecmult_gen_gej(&data->ctx->ecmult_gen_ctx, &tmp, &sum_scalars);
     CHECK(secp256k1_gej_eq_var(&tmp, &sum_output));
 }
 
@@ -104,7 +104,7 @@ static void bench_ecmult_gen(void* arg, int iters) {
     int i;
 
     for (i = 0; i < iters; ++i) {
-        secp256k1_ecmult_gen(&data->ctx->ecmult_gen_ctx, &data->output[i], &data->scalars[(data->offset1+i) % POINTS]);
+        secp256k1_ecmult_gen_gej(&data->ctx->ecmult_gen_ctx, &data->output[i], &data->scalars[(data->offset1+i) % POINTS]);
     }
 }
 
diff --git a/depend/bitcoin/src/secp256k1/src/bench_internal.c b/depend/bitcoin/src/secp256k1/src/bench_internal.c
index f3c1be98..453f3bb3 100644
--- a/depend/bitcoin/src/secp256k1/src/bench_internal.c
+++ b/depend/bitcoin/src/secp256k1/src/bench_internal.c
@@ -194,6 +194,17 @@ static void bench_field_normalize(void* arg, int iters) {
     }
 }
 
+static void bench_field_normalize_var(void* arg, int iters) {
+    int i;
+    bench_inv *data = (bench_inv*)arg;
+
+    /* Note that this benchmark measures the optimistic path. The worst-case path with the final
+       reduction is very unlikely to be needed, so this is representative of the common case. */
+    for (i = 0; i < iters; i++) {
+        secp256k1_fe_normalize_var(&data->fe[0]);
+    }
+}
+
 static void bench_field_normalize_weak(void* arg, int iters) {
     int i;
     bench_inv *data = (bench_inv*)arg;
@@ -421,6 +432,7 @@ int main(int argc, char **argv) {
 
     if (d || have_flag(argc, argv, "field") || have_flag(argc, argv, "half")) run_benchmark("field_half", bench_field_half, bench_setup, NULL, &data, 10, iters*100);
     if (d || have_flag(argc, argv, "field") || have_flag(argc, argv, "normalize")) run_benchmark("field_normalize", bench_field_normalize, bench_setup, NULL, &data, 10, iters*100);
+    if (d || have_flag(argc, argv, "field") || have_flag(argc, argv, "normalize")) run_benchmark("field_normalize_var", bench_field_normalize_var, bench_setup, NULL, &data, 10, iters*100);
     if (d || have_flag(argc, argv, "field") || have_flag(argc, argv, "normalize")) run_benchmark("field_normalize_weak", bench_field_normalize_weak, bench_setup, NULL, &data, 10, iters*100);
     if (d || have_flag(argc, argv, "field") || have_flag(argc, argv, "sqr")) run_benchmark("field_sqr", bench_field_sqr, bench_setup, NULL, &data, 10, iters*10);
     if (d || have_flag(argc, argv, "field") || have_flag(argc, argv, "mul")) run_benchmark("field_mul", bench_field_mul, bench_setup, NULL, &data, 10, iters*10);
diff --git a/depend/bitcoin/src/secp256k1/src/ctime_tests.c b/depend/bitcoin/src/secp256k1/src/ctime_tests.c
index f80042a8..0d201d20 100644
--- a/depend/bitcoin/src/secp256k1/src/ctime_tests.c
+++ b/depend/bitcoin/src/secp256k1/src/ctime_tests.c
@@ -40,6 +40,15 @@
 #include "../include/secp256k1_ellswift.h"
 #endif
 
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+#include "../include/secp256k1_silentpayments.h"
+#endif
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic warning "-Wunused-function"
+#endif
+
 static void run_tests(secp256k1_context *ctx, unsigned char *key);
 
 int main(void) {
@@ -94,6 +103,27 @@ static void run_tests(secp256k1_context *ctx, unsigned char *key) {
     unsigned char ellswift[64];
     static const unsigned char prefix[64] = {'t', 'e', 's', 't'};
 #endif
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+    secp256k1_xonly_pubkey generated_output;
+    secp256k1_xonly_pubkey *generated_outputs[1];
+    secp256k1_silentpayments_recipient recipient;
+    secp256k1_silentpayments_label label;
+    const secp256k1_silentpayments_recipient *recipients[1];
+    unsigned char outpoint_smallest[36] = { 0 };
+    secp256k1_keypair sp_keypair;
+    const secp256k1_keypair *sp_keypairs[1];
+    const unsigned char *sp_seckeys[1];
+    secp256k1_silentpayments_found_output found_outputs[1];
+    secp256k1_silentpayments_found_output *found_outputs_ptrs[1];
+    uint32_t n_found_outputs;
+    const secp256k1_xonly_pubkey *tx_outputs[1];
+    secp256k1_silentpayments_prevouts_summary prevouts_summary;
+    unsigned char label_tweak[32] = { 0 };
+    secp256k1_xonly_pubkey sp_xonly_pubkey;
+    const secp256k1_xonly_pubkey *sp_xonly_pubkeys[1];
+    secp256k1_pubkey sp_pubkey;
+    const secp256k1_pubkey *sp_pubkeys[1];
+#endif
 
     for (i = 0; i < 32; i++) {
         msg[i] = i + 1;
@@ -263,5 +293,62 @@ static void run_tests(secp256k1_context *ctx, unsigned char *key) {
         CHECK(ret == 1);
     }
 
+#endif
+
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+    SECP256K1_CHECKMEM_DEFINE(key, 32);
+
+    generated_outputs[0] = &generated_output;
+
+    /* Initialize recipient */
+    CHECK(secp256k1_ec_pubkey_create(ctx, &recipient.scan_pubkey, key));
+    key[31] ^= 1;
+    CHECK(secp256k1_ec_pubkey_create(ctx, &recipient.spend_pubkey, key));
+    key[31] ^= (1 << 1);
+    recipient.index = 0;
+    recipients[0] = &recipient;
+
+    /* Set up secret keys */
+    SECP256K1_CHECKMEM_UNDEFINE(key, 32);
+    ret = secp256k1_keypair_create(ctx, &sp_keypair, key);
+    SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
+    CHECK(ret);
+    key[31] ^= (1 << 2);
+    sp_keypairs[0] = &sp_keypair;
+    sp_seckeys[0] = key;
+
+    ret = secp256k1_silentpayments_sender_create_outputs(ctx, generated_outputs, recipients, 1, outpoint_smallest, sp_keypairs, 1, sp_seckeys, 1);
+    CHECK(ret == 1);
+
+    ret = secp256k1_silentpayments_recipient_label_create(ctx, &label, label_tweak, key, 0);
+    key[31] ^= (1 << 3);
+    SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
+    CHECK(ret == 1);
+
+    CHECK(secp256k1_keypair_xonly_pub(ctx, &sp_xonly_pubkey, NULL, &sp_keypair));
+    SECP256K1_CHECKMEM_DEFINE(&sp_xonly_pubkey, sizeof(sp_xonly_pubkey));
+    sp_xonly_pubkeys[0] = &sp_xonly_pubkey;
+    ret = secp256k1_ec_pubkey_create(ctx, &sp_pubkey, sp_seckeys[0]);
+    SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
+    CHECK(ret == 1);
+    SECP256K1_CHECKMEM_DEFINE(&sp_pubkey, sizeof(sp_pubkey));
+    sp_pubkeys[0] = &sp_pubkey;
+
+    ret = secp256k1_silentpayments_recipient_prevouts_summary_create(ctx, &prevouts_summary, outpoint_smallest, sp_xonly_pubkeys, 1, sp_pubkeys, 1);
+    CHECK(ret == 1);
+
+    tx_outputs[0] = generated_outputs[0];
+    found_outputs_ptrs[0] = &found_outputs[0];
+    n_found_outputs = 1;
+    SECP256K1_CHECKMEM_DEFINE(&recipient.spend_pubkey, sizeof(recipient.spend_pubkey));
+    /* It is sufficient to check _recipient_scan_outputs without a label lookup function, since the shared secret is created once (which is where the constant timeness matters)
+     * and then reused for the rest of the scanning logic.
+     */
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(ctx, found_outputs_ptrs, &n_found_outputs, tx_outputs, 1, key, &prevouts_summary, &recipient.spend_pubkey, NULL, NULL));
+
 #endif
 }
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic pop
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/ecdsa_impl.h b/depend/bitcoin/src/secp256k1/src/ecdsa_impl.h
index 163539eb..32f1e585 100644
--- a/depend/bitcoin/src/secp256k1/src/ecdsa_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/ecdsa_impl.h
@@ -273,14 +273,12 @@ static int secp256k1_ecdsa_sig_verify(const secp256k1_scalar *sigr, const secp25
 
 static int secp256k1_ecdsa_sig_sign(const secp256k1_ecmult_gen_context *ctx, secp256k1_scalar *sigr, secp256k1_scalar *sigs, const secp256k1_scalar *seckey, const secp256k1_scalar *message, const secp256k1_scalar *nonce, int *recid) {
     unsigned char b[32];
-    secp256k1_gej rp;
     secp256k1_ge r;
     secp256k1_scalar n;
     int overflow = 0;
     int high;
 
-    secp256k1_ecmult_gen(ctx, &rp, nonce);
-    secp256k1_ge_set_gej(&r, &rp);
+    secp256k1_ecmult_gen_ge(ctx, &r, nonce);
     secp256k1_fe_normalize(&r.x);
     secp256k1_fe_normalize(&r.y);
     secp256k1_fe_get_b32(b, &r.x);
@@ -296,7 +294,6 @@ static int secp256k1_ecdsa_sig_sign(const secp256k1_ecmult_gen_context *ctx, sec
     secp256k1_scalar_inverse(sigs, nonce);
     secp256k1_scalar_mul(sigs, sigs, &n);
     secp256k1_scalar_clear(&n);
-    secp256k1_gej_clear(&rp);
     secp256k1_ge_clear(&r);
     high = secp256k1_scalar_is_high(sigs);
     secp256k1_scalar_cond_negate(sigs, high);
diff --git a/depend/bitcoin/src/secp256k1/src/ecmult_gen.h b/depend/bitcoin/src/secp256k1/src/ecmult_gen.h
index 8bc4f14c..770b2cb2 100644
--- a/depend/bitcoin/src/secp256k1/src/ecmult_gen.h
+++ b/depend/bitcoin/src/secp256k1/src/ecmult_gen.h
@@ -137,7 +137,8 @@ static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context* ctx
 static void secp256k1_ecmult_gen_context_clear(secp256k1_ecmult_gen_context* ctx);
 
 /** Multiply with the generator: R = a*G */
-static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context* ctx, secp256k1_gej *r, const secp256k1_scalar *a);
+static void secp256k1_ecmult_gen_gej(const secp256k1_ecmult_gen_context* ctx, secp256k1_gej *r, const secp256k1_scalar *a);
+static void secp256k1_ecmult_gen_ge(const secp256k1_ecmult_gen_context* ctx, secp256k1_ge *r, const secp256k1_scalar *a);
 
 static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const secp256k1_hash_ctx *hash_ctx, const unsigned char *seed32);
 
diff --git a/depend/bitcoin/src/secp256k1/src/ecmult_gen_impl.h b/depend/bitcoin/src/secp256k1/src/ecmult_gen_impl.h
index 5a954977..a7a6d34d 100644
--- a/depend/bitcoin/src/secp256k1/src/ecmult_gen_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/ecmult_gen_impl.h
@@ -51,7 +51,7 @@ static void secp256k1_ecmult_gen_scalar_diff(secp256k1_scalar* diff) {
     secp256k1_scalar_add(diff, diff, &neghalf);
 }
 
-static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context *ctx, secp256k1_gej *r, const secp256k1_scalar *gn) {
+static void secp256k1_ecmult_gen_gej(const secp256k1_ecmult_gen_context *ctx, secp256k1_gej *r, const secp256k1_scalar *gn) {
     uint32_t comb_off;
     secp256k1_ge add;
     secp256k1_fe neg;
@@ -281,11 +281,19 @@ static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context *ctx, secp25
     secp256k1_memclear_explicit(&recoded, sizeof(recoded));
 }
 
+SECP256K1_INLINE static void secp256k1_ecmult_gen_ge(const secp256k1_ecmult_gen_context *ctx, secp256k1_ge *r, const secp256k1_scalar *a) {
+    secp256k1_gej rj;
+    secp256k1_ecmult_gen_gej(ctx, &rj, a);
+    secp256k1_ge_set_gej(r, &rj);
+    /* Jacobian coordinates resulting from our multiplication algorithm could potentially leak
+     * information about the secret input scalar, so clear the memory out to be on the safe side. */
+    secp256k1_gej_clear(&rj);
+}
+
 /* Setup blinding values for secp256k1_ecmult_gen. */
 static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const secp256k1_hash_ctx *hash_ctx, const unsigned char *seed32) {
     secp256k1_scalar b;
     secp256k1_scalar diff;
-    secp256k1_gej gb;
     secp256k1_fe f;
     unsigned char nonce32[32];
     secp256k1_rfc6979_hmac_sha256 rng;
@@ -325,15 +333,13 @@ static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const
      * which secp256k1_gej_add_ge cannot handle. */
     secp256k1_scalar_cmov(&b, &secp256k1_scalar_one, secp256k1_scalar_is_zero(&b));
     secp256k1_rfc6979_hmac_sha256_finalize(&rng);
-    secp256k1_ecmult_gen(ctx, &gb, &b);
+    secp256k1_ecmult_gen_ge(ctx, &ctx->ge_offset, &b);
     secp256k1_scalar_negate(&b, &b);
     secp256k1_scalar_add(&ctx->scalar_offset, &b, &diff);
-    secp256k1_ge_set_gej(&ctx->ge_offset, &gb);
 
     /* Clean up. */
     secp256k1_memclear_explicit(nonce32, sizeof(nonce32));
     secp256k1_scalar_clear(&b);
-    secp256k1_gej_clear(&gb);
     secp256k1_fe_clear(&f);
     secp256k1_rfc6979_hmac_sha256_clear(&rng);
 }
diff --git a/depend/bitcoin/src/secp256k1/src/field.h b/depend/bitcoin/src/secp256k1/src/field.h
index 945029ec..8b25d99b 100644
--- a/depend/bitcoin/src/secp256k1/src/field.h
+++ b/depend/bitcoin/src/secp256k1/src/field.h
@@ -166,7 +166,7 @@ static int secp256k1_fe_is_odd(const secp256k1_fe *a);
 /** Determine whether two field elements are equal.
  *
  * On input, a and b must be valid field elements with magnitudes not exceeding
- * 1 and 31, respectively.
+ * 1 and 30, respectively.
  * Returns a = b (mod p).
  */
 static int secp256k1_fe_equal(const secp256k1_fe *a, const secp256k1_fe *b);
diff --git a/depend/bitcoin/src/secp256k1/src/field_10x26_impl.h b/depend/bitcoin/src/secp256k1/src/field_10x26_impl.h
index aa45434d..abd17aa4 100644
--- a/depend/bitcoin/src/secp256k1/src/field_10x26_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/field_10x26_impl.h
@@ -303,38 +303,14 @@ static int secp256k1_fe_impl_set_b32_limit(secp256k1_fe *r, const unsigned char
 
 /** Convert a field element to a 32-byte big endian value. Requires the input to be normalized */
 static void secp256k1_fe_impl_get_b32(unsigned char *r, const secp256k1_fe *a) {
-    r[0] = (a->n[9] >> 14) & 0xff;
-    r[1] = (a->n[9] >> 6) & 0xff;
-    r[2] = ((a->n[9] & 0x3F) << 2) | ((a->n[8] >> 24) & 0x3);
-    r[3] = (a->n[8] >> 16) & 0xff;
-    r[4] = (a->n[8] >> 8) & 0xff;
-    r[5] = a->n[8] & 0xff;
-    r[6] = (a->n[7] >> 18) & 0xff;
-    r[7] = (a->n[7] >> 10) & 0xff;
-    r[8] = (a->n[7] >> 2) & 0xff;
-    r[9] = ((a->n[7] & 0x3) << 6) | ((a->n[6] >> 20) & 0x3f);
-    r[10] = (a->n[6] >> 12) & 0xff;
-    r[11] = (a->n[6] >> 4) & 0xff;
-    r[12] = ((a->n[6] & 0xf) << 4) | ((a->n[5] >> 22) & 0xf);
-    r[13] = (a->n[5] >> 14) & 0xff;
-    r[14] = (a->n[5] >> 6) & 0xff;
-    r[15] = ((a->n[5] & 0x3f) << 2) | ((a->n[4] >> 24) & 0x3);
-    r[16] = (a->n[4] >> 16) & 0xff;
-    r[17] = (a->n[4] >> 8) & 0xff;
-    r[18] = a->n[4] & 0xff;
-    r[19] = (a->n[3] >> 18) & 0xff;
-    r[20] = (a->n[3] >> 10) & 0xff;
-    r[21] = (a->n[3] >> 2) & 0xff;
-    r[22] = ((a->n[3] & 0x3) << 6) | ((a->n[2] >> 20) & 0x3f);
-    r[23] = (a->n[2] >> 12) & 0xff;
-    r[24] = (a->n[2] >> 4) & 0xff;
-    r[25] = ((a->n[2] & 0xf) << 4) | ((a->n[1] >> 22) & 0xf);
-    r[26] = (a->n[1] >> 14) & 0xff;
-    r[27] = (a->n[1] >> 6) & 0xff;
-    r[28] = ((a->n[1] & 0x3f) << 2) | ((a->n[0] >> 24) & 0x3);
-    r[29] = (a->n[0] >> 16) & 0xff;
-    r[30] = (a->n[0] >> 8) & 0xff;
-    r[31] = a->n[0] & 0xff;
+    secp256k1_write_be32(&r[0], (a->n[9] << 10) | (a->n[8] >> 16));
+    secp256k1_write_be32(&r[4], (a->n[8] << 16) | (a->n[7] >> 10));
+    secp256k1_write_be32(&r[8], (a->n[7] << 22) | (a->n[6] >> 4));
+    secp256k1_write_be32(&r[12], (a->n[6] << 28) | (a->n[5] << 2) | (a->n[4] >> 24));
+    secp256k1_write_be32(&r[16], (a->n[4] << 8) | (a->n[3] >> 18));
+    secp256k1_write_be32(&r[20], (a->n[3] << 14) | (a->n[2] >> 12));
+    secp256k1_write_be32(&r[24], (a->n[2] << 20) | (a->n[1] >> 6));
+    secp256k1_write_be32(&r[28], (a->n[1] << 26) | a->n[0]);
 }
 
 SECP256K1_INLINE static void secp256k1_fe_impl_negate_unchecked(secp256k1_fe *r, const secp256k1_fe *a, int m) {
diff --git a/depend/bitcoin/src/secp256k1/src/field_5x52_impl.h b/depend/bitcoin/src/secp256k1/src/field_5x52_impl.h
index 3a976135..6a2987ef 100644
--- a/depend/bitcoin/src/secp256k1/src/field_5x52_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/field_5x52_impl.h
@@ -269,38 +269,10 @@ static int secp256k1_fe_impl_set_b32_limit(secp256k1_fe *r, const unsigned char
 
 /** Convert a field element to a 32-byte big endian value. Requires the input to be normalized */
 static void secp256k1_fe_impl_get_b32(unsigned char *r, const secp256k1_fe *a) {
-    r[0] = (a->n[4] >> 40) & 0xFF;
-    r[1] = (a->n[4] >> 32) & 0xFF;
-    r[2] = (a->n[4] >> 24) & 0xFF;
-    r[3] = (a->n[4] >> 16) & 0xFF;
-    r[4] = (a->n[4] >> 8) & 0xFF;
-    r[5] = a->n[4] & 0xFF;
-    r[6] = (a->n[3] >> 44) & 0xFF;
-    r[7] = (a->n[3] >> 36) & 0xFF;
-    r[8] = (a->n[3] >> 28) & 0xFF;
-    r[9] = (a->n[3] >> 20) & 0xFF;
-    r[10] = (a->n[3] >> 12) & 0xFF;
-    r[11] = (a->n[3] >> 4) & 0xFF;
-    r[12] = ((a->n[2] >> 48) & 0xF) | ((a->n[3] & 0xF) << 4);
-    r[13] = (a->n[2] >> 40) & 0xFF;
-    r[14] = (a->n[2] >> 32) & 0xFF;
-    r[15] = (a->n[2] >> 24) & 0xFF;
-    r[16] = (a->n[2] >> 16) & 0xFF;
-    r[17] = (a->n[2] >> 8) & 0xFF;
-    r[18] = a->n[2] & 0xFF;
-    r[19] = (a->n[1] >> 44) & 0xFF;
-    r[20] = (a->n[1] >> 36) & 0xFF;
-    r[21] = (a->n[1] >> 28) & 0xFF;
-    r[22] = (a->n[1] >> 20) & 0xFF;
-    r[23] = (a->n[1] >> 12) & 0xFF;
-    r[24] = (a->n[1] >> 4) & 0xFF;
-    r[25] = ((a->n[0] >> 48) & 0xF) | ((a->n[1] & 0xF) << 4);
-    r[26] = (a->n[0] >> 40) & 0xFF;
-    r[27] = (a->n[0] >> 32) & 0xFF;
-    r[28] = (a->n[0] >> 24) & 0xFF;
-    r[29] = (a->n[0] >> 16) & 0xFF;
-    r[30] = (a->n[0] >> 8) & 0xFF;
-    r[31] = a->n[0] & 0xFF;
+    secp256k1_write_be64(&r[0], (a->n[4] << 16) | (a->n[3] >> 36));
+    secp256k1_write_be64(&r[8], (a->n[3] << 28) | (a->n[2] >> 24));
+    secp256k1_write_be64(&r[16], (a->n[2] << 40) | (a->n[1] >> 12));
+    secp256k1_write_be64(&r[24], (a->n[1] << 52) | a->n[0]);
 }
 
 SECP256K1_INLINE static void secp256k1_fe_impl_negate_unchecked(secp256k1_fe *r, const secp256k1_fe *a, int m) {
@@ -338,11 +310,11 @@ SECP256K1_INLINE static void secp256k1_fe_impl_add(secp256k1_fe *r, const secp25
     r->n[4] += a->n[4];
 }
 
-SECP256K1_INLINE static void secp256k1_fe_impl_mul(secp256k1_fe *r, const secp256k1_fe *a, const secp256k1_fe * SECP256K1_RESTRICT b) {
+SECP256K1_FORCE_INLINE static void secp256k1_fe_impl_mul(secp256k1_fe *r, const secp256k1_fe *a, const secp256k1_fe * SECP256K1_RESTRICT b) {
     secp256k1_fe_mul_inner(r->n, a->n, b->n);
 }
 
-SECP256K1_INLINE static void secp256k1_fe_impl_sqr(secp256k1_fe *r, const secp256k1_fe *a) {
+SECP256K1_FORCE_INLINE static void secp256k1_fe_impl_sqr(secp256k1_fe *r, const secp256k1_fe *a) {
     secp256k1_fe_sqr_inner(r->n, a->n);
 }
 
diff --git a/depend/bitcoin/src/secp256k1/src/field_5x52_int128_impl.h b/depend/bitcoin/src/secp256k1/src/field_5x52_int128_impl.h
index f23f8ee1..8d1977b2 100644
--- a/depend/bitcoin/src/secp256k1/src/field_5x52_int128_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/field_5x52_int128_impl.h
@@ -15,7 +15,7 @@
 #define VERIFY_BITS(x, n) VERIFY_CHECK(((x) >> (n)) == 0)
 #define VERIFY_BITS_128(x, n) VERIFY_CHECK(secp256k1_u128_check_bits((x), (n)))
 
-SECP256K1_INLINE static void secp256k1_fe_mul_inner(uint64_t *r, const uint64_t *a, const uint64_t * SECP256K1_RESTRICT b) {
+SECP256K1_FORCE_INLINE static void secp256k1_fe_mul_inner(uint64_t *r, const uint64_t *a, const uint64_t * SECP256K1_RESTRICT b) {
     secp256k1_uint128 c, d;
     uint64_t t3, t4, tx, u0;
     uint64_t a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3], a4 = a[4];
@@ -151,7 +151,7 @@ SECP256K1_INLINE static void secp256k1_fe_mul_inner(uint64_t *r, const uint64_t
     /* [r4 r3 r2 r1 r0] = [p8 p7 p6 p5 p4 p3 p2 p1 p0] */
 }
 
-SECP256K1_INLINE static void secp256k1_fe_sqr_inner(uint64_t *r, const uint64_t *a) {
+SECP256K1_FORCE_INLINE static void secp256k1_fe_sqr_inner(uint64_t *r, const uint64_t *a) {
     secp256k1_uint128 c, d;
     uint64_t a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3], a4 = a[4];
     uint64_t t3, t4, tx, u0;
diff --git a/depend/bitcoin/src/secp256k1/src/field_impl.h b/depend/bitcoin/src/secp256k1/src/field_impl.h
index 7aa7de43..19af6aa2 100644
--- a/depend/bitcoin/src/secp256k1/src/field_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/field_impl.h
@@ -27,7 +27,7 @@ SECP256K1_INLINE static int secp256k1_fe_equal(const secp256k1_fe *a, const secp
     SECP256K1_FE_VERIFY(a);
     SECP256K1_FE_VERIFY(b);
     SECP256K1_FE_VERIFY_MAGNITUDE(a, 1);
-    SECP256K1_FE_VERIFY_MAGNITUDE(b, 31);
+    SECP256K1_FE_VERIFY_MAGNITUDE(b, 30);
 
     secp256k1_fe_negate(&na, a, 1);
     secp256k1_fe_add(&na, b);
diff --git a/depend/bitcoin/src/secp256k1/src/hash.h b/depend/bitcoin/src/secp256k1/src/hash.h
index 79d97671..348e05ef 100644
--- a/depend/bitcoin/src/secp256k1/src/hash.h
+++ b/depend/bitcoin/src/secp256k1/src/hash.h
@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#include "../include/secp256k1.h"
+
 typedef struct {
     secp256k1_sha256_compression_function fn_sha256_compression;
 } secp256k1_hash_ctx;
diff --git a/depend/bitcoin/src/secp256k1/src/hash_impl.h b/depend/bitcoin/src/secp256k1/src/hash_impl.h
index 7c40f82e..932367fe 100644
--- a/depend/bitcoin/src/secp256k1/src/hash_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/hash_impl.h
@@ -137,6 +137,71 @@ static void secp256k1_sha256_transform(uint32_t *state, const unsigned char *blo
     }
 }
 
+/* Perform a smoke test on a supplied SHA256 compression function. */
+static int secp256k1_sha256_smoke_test(const secp256k1_sha256_compression_function fn_compression) {
+    secp256k1_hash_ctx ctx;
+    secp256k1_sha256 sha_msg, sha_accum;
+    unsigned char out[32];
+    size_t i, j;
+
+    /* SHA256 works on 64 byte blocks, secp256k1_sha256_write gives as many blocks
+     * at once to compression, so the count is what varies here. A SIMD implementation
+     * typically hashes four or eight at a time, then any left over one by one.
+     * These lengths cover every number from 1 to 9, which includes counts that
+     * divide evenly and counts leaving one, two or three over. */
+    static const size_t msg_lens[] = {
+        0, 1, 28,               /* Shorter than a block, so padding makes up the rest */
+        55, 56,                 /* Final 0x80 and 8 byte length fit in the last block, and don't */
+        64, 128, 192, 256, 320, /* 1 to 5 blocks */
+        384, 448, 512, 576      /* 6 to 9 blocks */
+    };
+    unsigned char msg[640]; /* Longest message, plus 64 for the shifted start */
+
+    /* Accumulated digest of every message, hashed with the built-in secp256k1_sha256_transform.
+     * Note: To regenerate set 'ctx.fn_sha256_compression = secp256k1_sha256_transform' below
+     * and print the sha_accum digest. */
+    static const unsigned char accum_expected[32] = {
+        0x22, 0x8E, 0x6A, 0x1F, 0x78, 0x02, 0x1B, 0xCF,
+        0x4E, 0xF4, 0xEA, 0xB3, 0x8A, 0x40, 0x69, 0xBF,
+        0x8D, 0xF3, 0x72, 0xAB, 0xE2, 0x11, 0x93, 0xA6,
+        0xE6, 0x46, 0x98, 0xBF, 0xD4, 0x3D, 0x19, 0x84,
+    };
+    /* The purpose of this VERIFY_CHECK is to make anyone aware that they
+     * should also change the size of msg_buf when changing the length of the
+     * longest message. */
+    VERIFY_CHECK(msg_lens[ARRAY_SIZE(msg_lens) - 1] == 576);
+
+    VERIFY_CHECK(fn_compression != NULL);
+    secp256k1_hash_ctx_init(&ctx);
+    ctx.fn_sha256_compression = fn_compression;
+    secp256k1_sha256_initialize(&sha_accum);
+
+    /* No two blocks of a message are equal, so a function that doesn't advance the block
+     * pointer gives a different digest. 251 is prime, so its repeats only line up with
+     * block starts every 251 blocks; wrapping at 256 would do so every 4. */
+    for (i = 0; i < sizeof(msg); i++) {
+        msg[i] = (unsigned char)(i % 251);
+    }
+
+    /* Each round starts one byte further along to check different alignments,
+     * secp256k1_sha256_write invokes compression directly on input >= 64 bytes */
+    for (i = 0; i < 64; i++) {
+        unsigned char *m = msg + i;
+        m[0] ^= 0xff; /* Changes the first byte, so every state after it changes too */
+        for (j = 0; j < ARRAY_SIZE(msg_lens); j++) {
+            secp256k1_sha256_initialize(&sha_msg);
+            secp256k1_sha256_write(&ctx, &sha_msg, m, msg_lens[j]);
+            secp256k1_sha256_finalize(&ctx, &sha_msg, out);
+            secp256k1_sha256_write(&ctx, &sha_accum, out, 32);
+        }
+        m[0] ^= 0xff; /* Reset first byte */
+    }
+
+    /* Compare against pre-computed accumulated digest */
+    secp256k1_sha256_finalize(&ctx, &sha_accum, out);
+    return secp256k1_memcmp_var(accum_expected, out, 32) == 0;
+}
+
 static void secp256k1_hash_ctx_init(secp256k1_hash_ctx *hash_ctx) {
     VERIFY_CHECK(hash_ctx != NULL);
     hash_ctx->fn_sha256_compression = secp256k1_sha256_transform;
diff --git a/depend/bitcoin/src/secp256k1/src/modules/ecdh/Makefile.am.include b/depend/bitcoin/src/secp256k1/src/modules/ecdh/Makefile.am.include
index 18660535..81bc6279 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/ecdh/Makefile.am.include
+++ b/depend/bitcoin/src/secp256k1/src/modules/ecdh/Makefile.am.include
@@ -1,5 +1,6 @@
 include_HEADERS += include/secp256k1_ecdh.h
 noinst_HEADERS += src/modules/ecdh/main_impl.h
 noinst_HEADERS += src/modules/ecdh/tests_impl.h
+noinst_HEADERS += src/modules/ecdh/tests_exhaustive_impl.h
 noinst_HEADERS += src/modules/ecdh/bench_impl.h
 noinst_HEADERS += src/wycheproof/ecdh_secp256k1_test.h
diff --git a/depend/bitcoin/src/secp256k1/src/modules/ecdh/main_impl.h b/depend/bitcoin/src/secp256k1/src/modules/ecdh/main_impl.h
index b0359b2c..03c47ad3 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/ecdh/main_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/ecdh/main_impl.h
@@ -60,7 +60,7 @@ int secp256k1_ecdh(const secp256k1_context* ctx, unsigned char *output, const se
     secp256k1_fe_get_b32(x, &pt.x);
     secp256k1_fe_get_b32(y, &pt.y);
 
-    if (hashfp == NULL) {
+    if (hashfp == NULL || hashfp == secp256k1_ecdh_hash_function_sha256) {
         /* Use ctx-aware function by default */
         ret = ecdh_hash_function_sha256_impl(secp256k1_get_hash_context(ctx), output, x, y, data);
     } else {
diff --git a/depend/bitcoin/src/secp256k1/src/modules/ecdh/tests_exhaustive_impl.h b/depend/bitcoin/src/secp256k1/src/modules/ecdh/tests_exhaustive_impl.h
new file mode 100644
index 00000000..2bcd2434
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/ecdh/tests_exhaustive_impl.h
@@ -0,0 +1,56 @@
+/***********************************************************************
+ * Distributed under the MIT software license, see the accompanying    *
+ * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
+ ***********************************************************************/
+
+#ifndef SECP256K1_MODULE_ECDH_TESTS_EXHAUSTIVE_H
+#define SECP256K1_MODULE_ECDH_TESTS_EXHAUSTIVE_H
+
+#include "../../../include/secp256k1_ecdh.h"
+#include "main_impl.h"
+
+static void test_exhaustive_ecdh(const secp256k1_context *ctx, const secp256k1_ge *group) {
+    int i, j;
+    unsigned char seckeys[EXHAUSTIVE_TEST_ORDER - 1][32];
+    secp256k1_pubkey pubkeys[EXHAUSTIVE_TEST_ORDER - 1];
+
+    /* Construct key pairs (32-byte secret key, public key object) for the entire group. */
+    for (i = 1; i < EXHAUSTIVE_TEST_ORDER; i++) {
+        secp256k1_scalar scalar;
+        secp256k1_scalar_set_int(&scalar, i);
+        secp256k1_scalar_get_b32(seckeys[i - 1], &scalar);
+        CHECK(secp256k1_ec_pubkey_create(ctx, &pubkeys[i - 1], seckeys[i - 1]));
+    }
+
+    /* Loop over key combinations. */
+    for (i = 1; i < EXHAUSTIVE_TEST_ORDER; i++) {
+        for (j = 1; j < EXHAUSTIVE_TEST_ORDER; j++) {
+            unsigned char ecdh_result_ij[32];
+            unsigned char ecdh_result_ji[32];
+
+            /* Calculate ECDH(i*G, j) and ECDH(j*G, i) using API function and verify that the results match. */
+            CHECK(secp256k1_ecdh(ctx, ecdh_result_ij, &pubkeys[i - 1], seckeys[j - 1], NULL, NULL));
+            CHECK(secp256k1_ecdh(ctx, ecdh_result_ji, &pubkeys[j - 1], seckeys[i - 1], NULL, NULL));
+            CHECK(secp256k1_memcmp_var(ecdh_result_ij, ecdh_result_ji, 32) == 0);
+
+            /* Recalculate the expected ECDH result manually by invoking the default ECDH hash
+             * function on the precomputed group element (group[i * j]) coordinates, and verify
+             * that it matches the previously calculated public API results. */
+            {
+                secp256k1_ge ecdh_ge_expected = group[(i * j) % EXHAUSTIVE_TEST_ORDER];
+                unsigned char ecdh_result_expected[32];
+                unsigned char x[32];
+                unsigned char y[32];
+
+                secp256k1_fe_normalize_var(&ecdh_ge_expected.x);
+                secp256k1_fe_normalize_var(&ecdh_ge_expected.y);
+                secp256k1_fe_get_b32(x, &ecdh_ge_expected.x);
+                secp256k1_fe_get_b32(y, &ecdh_ge_expected.y);
+                CHECK(secp256k1_ecdh_hash_function_default(ecdh_result_expected, x, y, NULL));
+                CHECK(secp256k1_memcmp_var(ecdh_result_ij, ecdh_result_expected, 32) == 0);
+            }
+        }
+    }
+}
+
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/modules/ellswift/main_impl.h b/depend/bitcoin/src/secp256k1/src/modules/ellswift/main_impl.h
index 27cb3db6..817e7788 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/ellswift/main_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/ellswift/main_impl.h
@@ -449,12 +449,13 @@ int secp256k1_ellswift_create(const secp256k1_context *ctx, unsigned char *ell64
     secp256k1_fe_normalize_var(&p.x);
     secp256k1_fe_normalize_var(&p.y);
 
-    /* Set up hasher state. The used RNG is H(privkey || "\x00"*32 [|| auxrnd32] || cnt++),
+    /* Set up hasher state. The used RNG is H(seckey32 || "\x00"*32 [|| auxrnd32] || cnt++),
      * using BIP340 tagged hash with tag "secp256k1_ellswift_create". */
     secp256k1_ellswift_sha256_init_create(&hash);
     secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, seckey32, 32);
     secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, zero32, sizeof(zero32));
-    secp256k1_declassify(ctx, &hash, sizeof(hash)); /* private key is hashed now */
+    /* Declassify only hash state. seckey32 has been hashed, but copy remains in the hash buffer */
+    secp256k1_declassify(ctx, &hash.s, sizeof(hash.s));
     if (auxrnd32) secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, auxrnd32, 32);
 
     /* Compute ElligatorSwift encoding and construct output. */
@@ -463,6 +464,7 @@ int secp256k1_ellswift_create(const secp256k1_context *ctx, unsigned char *ell64
 
     secp256k1_memczero(ell64, 64, !ret);
     secp256k1_scalar_clear(&seckey_scalar);
+    secp256k1_sha256_clear(&hash);
 
     return ret;
 }
diff --git a/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_exhaustive_impl.h b/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_exhaustive_impl.h
index 839c24ae..2019534d 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_exhaustive_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_exhaustive_impl.h
@@ -30,8 +30,8 @@ static void test_exhaustive_ellswift(const secp256k1_context *ctx, const secp256
         CHECK(secp256k1_ellswift_create(ctx, ell64, sec32, NULL));
 
         /* Decode ellswift pubkey and check that it matches the precomputed group element. */
-        secp256k1_ellswift_decode(ctx, &pub_decoded, ell64);
-        secp256k1_pubkey_load(ctx, &ge_decoded, &pub_decoded);
+        CHECK(secp256k1_ellswift_decode(ctx, &pub_decoded, ell64) == 1);
+        CHECK(secp256k1_pubkey_load(ctx, &ge_decoded, &pub_decoded) == 1);
         CHECK(secp256k1_ge_eq_var(&ge_decoded, &group[i]));
     }
 }
diff --git a/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_impl.h b/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_impl.h
index 7da08d50..71788c51 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/ellswift/tests_impl.h
@@ -249,9 +249,9 @@ void ellswift_encode_decode_roundtrip_tests(void) {
         secp256k1_pubkey_save(&pubkey, &g);
         testrand256(rnd32);
         /* Convert the public key to ElligatorSwift and back. */
-        secp256k1_ellswift_encode(CTX, ell64, &pubkey, rnd32);
-        secp256k1_ellswift_decode(CTX, &pubkey2, ell64);
-        secp256k1_pubkey_load(CTX, &g2, &pubkey2);
+        CHECK(secp256k1_ellswift_encode(CTX, ell64, &pubkey, rnd32) == 1);
+        CHECK(secp256k1_ellswift_decode(CTX, &pubkey2, ell64) == 1);
+        CHECK(secp256k1_pubkey_load(CTX, &g2, &pubkey2) == 1);
         /* Compare with original. */
         CHECK(secp256k1_ge_eq_var(&g, &g2));
     }
@@ -276,8 +276,8 @@ void ellswift_create_tests(void) {
         ret = secp256k1_ellswift_create(CTX, ell64, sec32, (i & 1) ? auxrnd32 : NULL);
         CHECK(ret);
         /* Decode it, and compare with traditionally-computed public key. */
-        secp256k1_ellswift_decode(CTX, &pub, ell64);
-        secp256k1_pubkey_load(CTX, &dec, &pub);
+        CHECK(secp256k1_ellswift_decode(CTX, &pub, ell64) == 1);
+        CHECK(secp256k1_pubkey_load(CTX, &dec, &pub) == 1);
         secp256k1_ecmult(&res, NULL, &secp256k1_scalar_zero, &sec);
         CHECK(secp256k1_gej_eq_ge_var(&res, &dec));
     }
@@ -300,15 +300,15 @@ void ellswift_compute_shared_secret_tests(void) {
         /* Generate random ElligatorSwift encoding for the remote key and decode it. */
         testrand256_test(ell64);
         testrand256_test(ell64 + 32);
-        secp256k1_ellswift_decode(CTX, &pub, ell64);
-        secp256k1_pubkey_load(CTX, &dec, &pub);
+        CHECK(secp256k1_ellswift_decode(CTX, &pub, ell64) == 1);
+        CHECK(secp256k1_pubkey_load(CTX, &dec, &pub) == 1);
         secp256k1_gej_set_ge(&decj, &dec);
         /* Compute the X coordinate of seckey*pubkey using ellswift_xdh. Note that we
          * pass ell64 as claimed (but incorrect) encoding for sec32 here; this works
          * because the "hasher" function we use here ignores the ell64 arguments. */
         ret = secp256k1_ellswift_xdh(CTX, share32, ell64, ell64, sec32, i & 1, &ellswift_xdh_hash_x32, NULL);
         CHECK(ret);
-        (void)secp256k1_fe_set_b32_limit(&share_x, share32); /* no overflow is possible */
+        CHECK(secp256k1_fe_set_b32_limit(&share_x, share32)); /* no overflow is possible */
         SECP256K1_FE_VERIFY(&share_x);
         /* Compute seckey*pubkey directly. */
         secp256k1_ecmult(&resj, &decj, &sec, NULL);
diff --git a/depend/bitcoin/src/secp256k1/src/modules/extrakeys/main_impl.h b/depend/bitcoin/src/secp256k1/src/modules/extrakeys/main_impl.h
index 0c7e2667..163ea281 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/extrakeys/main_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/extrakeys/main_impl.h
@@ -16,6 +16,13 @@ static SECP256K1_INLINE int secp256k1_xonly_pubkey_load(const secp256k1_context*
 }
 
 static SECP256K1_INLINE void secp256k1_xonly_pubkey_save(secp256k1_xonly_pubkey *pubkey, secp256k1_ge *ge) {
+#ifdef VERIFY
+    /* ensure that the group element's Y coordinate is even, as per definition of x-only public keys */
+    secp256k1_fe y = ge->y;
+    secp256k1_fe_normalize_var(&y);
+    VERIFY_CHECK(!secp256k1_fe_is_odd(&y));
+#endif
+
     secp256k1_pubkey_save((secp256k1_pubkey *) pubkey, ge);
 }
 
diff --git a/depend/bitcoin/src/secp256k1/src/modules/extrakeys/tests_impl.h b/depend/bitcoin/src/secp256k1/src/modules/extrakeys/tests_impl.h
index abebd110..a9c10ea3 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/extrakeys/tests_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/extrakeys/tests_impl.h
@@ -53,8 +53,8 @@ static void test_xonly_pubkey(void) {
     CHECK(secp256k1_xonly_pubkey_from_pubkey(CTX, &xonly_pk, &pk_parity, &pk) == 1);
     CHECK(secp256k1_memcmp_var(&xonly_pk, &pk, sizeof(xonly_pk)) != 0);
     CHECK(pk_parity == 1);
-    secp256k1_pubkey_load(CTX, &pk1, &pk);
-    secp256k1_pubkey_load(CTX, &pk2, (secp256k1_pubkey *) &xonly_pk);
+    CHECK(secp256k1_pubkey_load(CTX, &pk1, &pk) == 1);
+    CHECK(secp256k1_pubkey_load(CTX, &pk2, (secp256k1_pubkey *) &xonly_pk) == 1);
     CHECK(secp256k1_fe_equal(&pk1.x, &pk2.x) == 1);
     secp256k1_fe_negate(&y, &pk2.y, 1);
     CHECK(secp256k1_fe_equal(&pk1.y, &y) == 1);
diff --git a/depend/bitcoin/src/secp256k1/src/modules/musig/session_impl.h b/depend/bitcoin/src/secp256k1/src/modules/musig/session_impl.h
index 6a37bfdf..c05801ee 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/musig/session_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/musig/session_impl.h
@@ -415,7 +415,7 @@ static int secp256k1_musig_nonce_gen_internal(const secp256k1_context* ctx, secp
 
     /* Compute pubnonce as two gejs */
     for (i = 0; i < 2; i++) {
-        secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &nonce_ptj[i], &k[i]);
+        secp256k1_ecmult_gen_gej(&ctx->ecmult_gen_ctx, &nonce_ptj[i], &k[i]);
         secp256k1_scalar_clear(&k[i]);
     }
 
@@ -483,11 +483,9 @@ int secp256k1_musig_nonce_gen_counter(const secp256k1_context* ctx, secp256k1_mu
     (void) ret;
 #endif
 
-    if (!secp256k1_musig_nonce_gen_internal(ctx, secnonce, pubnonce, buf, seckey, &pubkey, msg32, keyagg_cache, extra_input32)) {
-        return 0;
-    }
+    ret = secp256k1_musig_nonce_gen_internal(ctx, secnonce, pubnonce, buf, seckey, &pubkey, msg32, keyagg_cache, extra_input32);
     secp256k1_memclear_explicit(seckey, sizeof(seckey));
-    return 1;
+    return ret;
 }
 
 static int secp256k1_musig_sum_pubnonces(const secp256k1_context* ctx, secp256k1_gej *summed_pubnonces, const secp256k1_musig_pubnonce * const* pubnonces, size_t n_pubnonces) {
diff --git a/depend/bitcoin/src/secp256k1/src/modules/musig/tests_impl.h b/depend/bitcoin/src/secp256k1/src/modules/musig/tests_impl.h
index cc644916..7b54afdf 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/musig/tests_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/musig/tests_impl.h
@@ -104,7 +104,7 @@ static void pubnonce_summing_to_inf(secp256k1_musig_pubnonce *pubnonce) {
         secp256k1_ge_neg(&ge[1], &ge[1]);
     }
 
-    secp256k1_musig_sum_pubnonces(CTX, summed_pubnonces, pubnonce_ptr, 2);
+    CHECK(secp256k1_musig_sum_pubnonces(CTX, summed_pubnonces, pubnonce_ptr, 2) == 1);
     CHECK(secp256k1_gej_is_infinity(&summed_pubnonces[0]));
     CHECK(secp256k1_gej_is_infinity(&summed_pubnonces[1]));
 }
@@ -372,9 +372,9 @@ static void musig_api_tests(void) {
     {
         /* Check that the aggnonce encodes two points at infinity */
         secp256k1_ge aggnonce_pt[2];
-        secp256k1_musig_aggnonce_load(CTX, aggnonce_pt, &aggnonce);
+        CHECK(secp256k1_musig_aggnonce_load(CTX, aggnonce_pt, &aggnonce) == 1);
         for (i = 0; i < 2; i++) {
-            secp256k1_ge_is_infinity(&aggnonce_pt[i]);
+            CHECK(secp256k1_ge_is_infinity(&aggnonce_pt[i]) == 1);
         }
     }
     CHECK(secp256k1_musig_nonce_agg(CTX, &aggnonce, pubnonce_ptr, 2) == 1);
@@ -862,7 +862,7 @@ static void musig_test_vectors_nonceagg(void) {
         }
         CHECK(secp256k1_musig_nonce_agg(CTX, &aggnonce, pubnonce_ptr, 2));
         CHECK(secp256k1_musig_aggnonce_serialize(CTX, aggnonce66, &aggnonce));
-        CHECK(secp256k1_memcmp_var(aggnonce66, c->expected, 33) == 0);
+        CHECK(secp256k1_memcmp_var(aggnonce66, c->expected, sizeof(aggnonce66)) == 0);
     }
     for (i = 0; i < ARRAY_SIZE(vector->error_case); i++) {
         const struct musig_nonce_agg_test_case *c = &vector->error_case[i];
diff --git a/depend/bitcoin/src/secp256k1/src/modules/recovery/tests_exhaustive_impl.h b/depend/bitcoin/src/secp256k1/src/modules/recovery/tests_exhaustive_impl.h
index 6bbc02b9..650cd9da 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/recovery/tests_exhaustive_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/recovery/tests_exhaustive_impl.h
@@ -33,7 +33,7 @@ static void test_exhaustive_recovery_sign(const secp256k1_context *ctx, const se
                 secp256k1_scalar_get_b32(sk32, &sk);
                 secp256k1_scalar_get_b32(msg32, &msg);
 
-                secp256k1_ecdsa_sign_recoverable(ctx, &rsig, msg32, sk32, secp256k1_nonce_function_smallint, &k);
+                CHECK(secp256k1_ecdsa_sign_recoverable(ctx, &rsig, msg32, sk32, secp256k1_nonce_function_smallint, &k) == 1);
 
                 /* Check directly */
                 secp256k1_ecdsa_recoverable_signature_load(ctx, &r, &s, &recid, &rsig);
@@ -59,7 +59,7 @@ static void test_exhaustive_recovery_sign(const secp256k1_context *ctx, const se
                 CHECK(recid == expected_recid);
 
                 /* Convert to a standard sig then check */
-                secp256k1_ecdsa_recoverable_signature_convert(ctx, &sig, &rsig);
+                CHECK(secp256k1_ecdsa_recoverable_signature_convert(ctx, &sig, &rsig) == 1);
                 secp256k1_ecdsa_signature_load(ctx, &r, &s, &sig);
                 /* Note that we compute expected_r *after* signing -- this is important
                  * because our nonce-computing function function might change k during
@@ -129,7 +129,7 @@ static void test_exhaustive_recovery_verify(const secp256k1_context *ctx, const
 
                     /* Verify by converting to a standard signature and calling verify */
                     secp256k1_ecdsa_recoverable_signature_save(&rsig, &r_s, &s_s, recid);
-                    secp256k1_ecdsa_recoverable_signature_convert(ctx, &sig, &rsig);
+                    CHECK(secp256k1_ecdsa_recoverable_signature_convert(ctx, &sig, &rsig) == 1);
                     memcpy(&nonconst_ge, &group[sk_s], sizeof(nonconst_ge));
                     secp256k1_pubkey_save(&pk, &nonconst_ge);
                     CHECK(should_verify ==
diff --git a/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/main_impl.h b/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/main_impl.h
index 5100557f..785bc4af 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/main_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/main_impl.h
@@ -123,7 +123,6 @@ static int secp256k1_schnorrsig_sign_internal(const secp256k1_context* ctx, unsi
     secp256k1_scalar sk;
     secp256k1_scalar e;
     secp256k1_scalar k;
-    secp256k1_gej rj;
     secp256k1_ge pk;
     secp256k1_ge r;
     unsigned char nonce32[32] = { 0 };
@@ -160,8 +159,7 @@ static int secp256k1_schnorrsig_sign_internal(const secp256k1_context* ctx, unsi
     ret &= !secp256k1_scalar_is_zero(&k);
     secp256k1_scalar_cmov(&k, &secp256k1_scalar_one, !ret);
 
-    secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &rj, &k);
-    secp256k1_ge_set_gej(&r, &rj);
+    secp256k1_ecmult_gen_ge(&ctx->ecmult_gen_ctx, &r, &k);
 
     /* We declassify r to allow using it as a branch point. This is fine
      * because r is not a secret. */
@@ -183,7 +181,6 @@ static int secp256k1_schnorrsig_sign_internal(const secp256k1_context* ctx, unsi
     secp256k1_scalar_clear(&sk);
     secp256k1_memclear_explicit(seckey, sizeof(seckey));
     secp256k1_memclear_explicit(nonce32, sizeof(nonce32));
-    secp256k1_gej_clear(&rj);
 
     return ret;
 }
@@ -193,10 +190,6 @@ int secp256k1_schnorrsig_sign32(const secp256k1_context* ctx, unsigned char *sig
     return secp256k1_schnorrsig_sign_internal(ctx, sig64, msg32, 32, keypair, secp256k1_nonce_function_bip340, (unsigned char*)aux_rand32);
 }
 
-int secp256k1_schnorrsig_sign(const secp256k1_context* ctx, unsigned char *sig64, const unsigned char *msg32, const secp256k1_keypair *keypair, const unsigned char *aux_rand32) {
-    return secp256k1_schnorrsig_sign32(ctx, sig64, msg32, keypair, aux_rand32);
-}
-
 int secp256k1_schnorrsig_sign_custom(const secp256k1_context* ctx, unsigned char *sig64, const unsigned char *msg, size_t msglen, const secp256k1_keypair *keypair, secp256k1_schnorrsig_extraparams *extraparams) {
     secp256k1_nonce_function_hardened noncefp = NULL;
     void *ndata = NULL;
diff --git a/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/tests_impl.h b/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/tests_impl.h
index 56812e7f..12403c5b 100644
--- a/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/tests_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/modules/schnorrsig/tests_impl.h
@@ -823,9 +823,6 @@ static void test_schnorrsig_sign_internal(void) {
     CHECK(secp256k1_keypair_xonly_pub(CTX, &pk, NULL, &keypair));
     CHECK(secp256k1_schnorrsig_sign32(CTX, sig, msg, &keypair, NULL) == 1);
     CHECK(secp256k1_schnorrsig_verify(CTX, sig, msg, sizeof(msg), &pk));
-    /* Check that deprecated alias gives the same result */
-    CHECK(secp256k1_schnorrsig_sign(CTX, sig2, msg, &keypair, NULL) == 1);
-    CHECK(secp256k1_memcmp_var(sig, sig2, sizeof(sig)) == 0);
 
     /* Test different nonce functions */
     CHECK(secp256k1_schnorrsig_sign_custom(CTX, sig, msg, sizeof(msg), &keypair, &extraparams) == 1);
diff --git a/depend/bitcoin/src/secp256k1/src/modules/silentpayments/Makefile.am.include b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/Makefile.am.include
new file mode 100644
index 00000000..d0c51dc3
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/Makefile.am.include
@@ -0,0 +1,5 @@
+include_HEADERS += include/secp256k1_silentpayments.h
+noinst_HEADERS += src/modules/silentpayments/main_impl.h
+noinst_HEADERS += src/modules/silentpayments/bench_impl.h
+noinst_HEADERS += src/modules/silentpayments/tests_impl.h
+noinst_HEADERS += src/modules/silentpayments/vectors.h
diff --git a/depend/bitcoin/src/secp256k1/src/modules/silentpayments/bench_impl.h b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/bench_impl.h
new file mode 100644
index 00000000..cf0d789a
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/bench_impl.h
@@ -0,0 +1,227 @@
+/***********************************************************************
+ * Copyright (c) 2024 josibake                                         *
+ * Distributed under the MIT software license, see the accompanying    *
+ * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
+ ***********************************************************************/
+
+#ifndef SECP256K1_MODULE_SILENTPAYMENTS_BENCH_H
+#define SECP256K1_MODULE_SILENTPAYMENTS_BENCH_H
+
+#include "../../../include/secp256k1_silentpayments.h"
+
+#include "../../util.h"
+
+/* maximum non-coinbase taproot outputs per block: largest N for 1-in-N-out P2TR transaction
+ * that has a vsize <= (1_000_000 - 81 - 64) [https://bitcoin.stackexchange.com/a/122952]
+ * (needed for constructing the "worst-case scanning attack", where a single
+ *  tx fills up a full bock of taproot outputs that all go to the same scankey group) */
+#define MAX_P2TR_OUTPUTS_PER_BLOCK 23250
+
+#define SP_BENCH_MAX_INPUTS  1
+#define SP_BENCH_MAX_OUTPUTS MAX_P2TR_OUTPUTS_PER_BLOCK
+
+typedef struct {
+    secp256k1_context *ctx;
+    secp256k1_pubkey spend_pubkey;
+    unsigned char scan_key[32];
+    secp256k1_xonly_pubkey *tx_outputs;
+    secp256k1_xonly_pubkey **tx_outputs_ptrs;
+    secp256k1_xonly_pubkey tx_inputs[SP_BENCH_MAX_INPUTS];
+    const secp256k1_xonly_pubkey *tx_inputs_ptrs[SP_BENCH_MAX_INPUTS];
+    secp256k1_silentpayments_found_output *found_outputs;
+    secp256k1_silentpayments_found_output **found_outputs_ptrs;
+    unsigned char smallest_outpoint[36];
+    unsigned char label[33];
+    unsigned char label_tweak[32];
+    int num_outputs;
+    int num_matches;
+} bench_silentpayments_data;
+
+const unsigned char* label_lookup(const unsigned char* key, const void* cache_ptr) {
+    bench_silentpayments_data *data = (bench_silentpayments_data*)cache_ptr;
+    if (secp256k1_memcmp_var(key, data->label, 33) == 0) {
+        return data->label_tweak;
+    }
+    return NULL;
+}
+
+static void bench_silentpayments_scan_setup(void* arg) {
+    int i;
+    bench_silentpayments_data *data = (bench_silentpayments_data*)arg;
+    const unsigned char smallest_outpoint[36] = {
+        0x16, 0x9e, 0x1e, 0x83, 0xe9, 0x30, 0x85, 0x33, 0x91,
+        0xbc, 0x6f, 0x35, 0xf6, 0x05, 0xc6, 0x75, 0x4c, 0xfe,
+        0xad, 0x57, 0xcf, 0x83, 0x87, 0x63, 0x9d, 0x3b, 0x40,
+        0x96, 0xc5, 0x4f, 0x18, 0xf4, 0x00, 0x00, 0x00, 0x00,
+    };
+    const unsigned char spend_pubkey[33] = {
+        0x02,0xee,0x97,0xdf,0x83,0xb2,0x54,0x6a,
+        0xf5,0xa7,0xd0,0x62,0x15,0xd9,0x8b,0xcb,
+        0x63,0x7f,0xe0,0x5d,0xd0,0xfa,0x37,0x3b,
+        0xd8,0x20,0xe6,0x64,0xd3,0x72,0xde,0x9a,0x01
+    };
+    const unsigned char scan_key[32] = {
+        0xa8,0x90,0x54,0xc9,0x5b,0xe3,0xc3,0x01,
+        0x56,0x65,0x74,0xf2,0xaa,0x93,0xad,0xe0,
+        0x51,0x85,0x09,0x03,0xa6,0x9c,0xbd,0xd1,
+        0xd4,0x7e,0xae,0x26,0x3d,0x7b,0xc0,0x31
+    };
+    unsigned char scalar[32];
+    secp256k1_keypair input_keypair;
+    size_t pubkeylen = 33;
+
+    for (i = 0; i < 32; i++) {
+        scalar[i] = i + 1;
+    }
+    /* Create the first input public key for the full scan from the scalar. */
+    CHECK(secp256k1_keypair_create(data->ctx, &input_keypair, scalar));
+    CHECK(secp256k1_keypair_xonly_pub(data->ctx, &data->tx_inputs[0], NULL, &input_keypair));
+    data->tx_inputs_ptrs[0] = &data->tx_inputs[0];
+    CHECK(secp256k1_ec_pubkey_parse(data->ctx, &data->spend_pubkey, spend_pubkey, pubkeylen));
+    memcpy(data->scan_key, scan_key, 32);
+    memcpy(data->smallest_outpoint, smallest_outpoint, 36);
+
+    /* prepare transaction outputs for the "worst-case scanning attack",
+     * can be used for typical scanning scenarios as well */
+    {
+        secp256k1_silentpayments_recipient *recipients = malloc(sizeof(secp256k1_silentpayments_recipient) * data->num_outputs);
+        const secp256k1_silentpayments_recipient **recipients_ptrs = malloc(sizeof(secp256k1_silentpayments_recipient*) * data->num_outputs);
+        const secp256k1_keypair *keypairs_ptrs[SP_BENCH_MAX_INPUTS];
+        secp256k1_pubkey scan_pubkey, other_scan_pubkey;
+        unsigned char other_scan_seckey[32] = {99};
+        secp256k1_silentpayments_label label;
+        secp256k1_pubkey labeled_spend_pubkey;
+        int index_first_k;
+
+        CHECK(data->num_outputs <= SP_BENCH_MAX_OUTPUTS);
+        CHECK(data->num_matches <= data->num_outputs);
+        index_first_k = data->num_outputs - data->num_matches;
+
+        CHECK(secp256k1_ec_pubkey_create(data->ctx, &scan_pubkey, data->scan_key));
+        CHECK(secp256k1_ec_pubkey_create(data->ctx, &other_scan_pubkey, other_scan_seckey));
+
+        CHECK(secp256k1_silentpayments_recipient_label_create(data->ctx, &label, data->label_tweak, data->scan_key, 0));
+        CHECK(secp256k1_silentpayments_recipient_label_serialize(data->ctx, data->label, &label));
+        CHECK(secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(data->ctx,
+            &labeled_spend_pubkey, &data->spend_pubkey, &label));
+
+        data->tx_outputs = malloc(sizeof(secp256k1_xonly_pubkey) * data->num_outputs);
+        data->tx_outputs_ptrs = malloc(sizeof(secp256k1_xonly_pubkey*) * data->num_outputs);
+        data->found_outputs = malloc(sizeof(secp256k1_silentpayments_found_output) * data->num_outputs);
+        data->found_outputs_ptrs = malloc(sizeof(secp256k1_silentpayments_found_output*) * data->num_outputs);
+
+        keypairs_ptrs[0] = &input_keypair;
+        for (i = 0; i < data->num_outputs; i++) {
+            data->tx_outputs_ptrs[i] = &data->tx_outputs[i];
+            recipients_ptrs[i] = &recipients[i];
+            recipients[i].spend_pubkey = labeled_spend_pubkey;
+            if (i >= index_first_k) {
+                recipients[i].scan_pubkey = scan_pubkey;
+            } else {
+                unsigned char tweak[32] = {0};
+                tweak[31] = 1;
+                /* tweak non-match scan pubkey in order to create single-recipient groups
+                 * (we want to avoid running into the recipient group protocol limit) */
+                CHECK(secp256k1_ec_pubkey_tweak_add(data->ctx, &other_scan_pubkey, tweak));
+                recipients[i].scan_pubkey = other_scan_pubkey;
+            }
+            recipients[i].index = i;
+        }
+        CHECK(secp256k1_silentpayments_sender_create_outputs(data->ctx, data->tx_outputs_ptrs, recipients_ptrs,
+            data->num_outputs, data->smallest_outpoint, keypairs_ptrs, SP_BENCH_MAX_INPUTS, NULL, 0));
+
+        for (i = 0; i < data->num_outputs; i++) {
+            data->found_outputs_ptrs[i] = &data->found_outputs[i];
+        }
+        /* reverse outputs within k group to simulate worst-case */
+        for (i = 0; i < data->num_matches / 2; i++) {
+            int pos = index_first_k + i;
+            secp256k1_xonly_pubkey *tmp = data->tx_outputs_ptrs[pos];
+            data->tx_outputs_ptrs[pos] = data->tx_outputs_ptrs[data->num_outputs - i - 1];
+            data->tx_outputs_ptrs[data->num_outputs - i - 1] = tmp;
+        }
+
+        free(recipients_ptrs);
+        free(recipients);
+    }
+}
+
+static void bench_silentpayments_scan_teardown(void* arg, int iters) {
+    bench_silentpayments_data *data = (bench_silentpayments_data*)arg;
+    (void)iters;
+
+    free(data->tx_outputs);
+    free(data->tx_outputs_ptrs);
+    free(data->found_outputs);
+    free(data->found_outputs_ptrs);
+}
+
+static void bench_silentpayments_scan(void* arg, int iters) {
+    bench_silentpayments_data *data = (bench_silentpayments_data*)arg;
+    secp256k1_silentpayments_prevouts_summary prevouts_summary;
+    uint32_t n_found = 0;
+    int i;
+    const secp256k1_silentpayments_label_lookup label_lookup_fn = label_lookup;
+    const void *label_context = data;
+
+    CHECK(data->num_outputs <= SP_BENCH_MAX_OUTPUTS);
+
+    for (i = 0; i < iters; i++) {
+        CHECK(secp256k1_silentpayments_recipient_prevouts_summary_create(data->ctx, &prevouts_summary,
+            data->smallest_outpoint, data->tx_inputs_ptrs, SP_BENCH_MAX_INPUTS, NULL, 0));
+        CHECK(secp256k1_silentpayments_recipient_scan_outputs(data->ctx,
+            data->found_outputs_ptrs, &n_found,
+            (const secp256k1_xonly_pubkey**)data->tx_outputs_ptrs, data->num_outputs,
+            data->scan_key, &prevouts_summary, &data->spend_pubkey,
+            label_lookup_fn, label_context)
+        );
+        CHECK(n_found == (uint32_t)data->num_matches);
+    }
+}
+
+static void run_silentpayments_bench(int iters, int argc, char** argv) {
+    bench_silentpayments_data data;
+    int d = argc == 1;
+
+    data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
+
+    if (d || have_flag(argc, argv, "silentpayments") || have_flag(argc, argv, "silentpayments_scan_nomatch")) {
+        const int num_outputs_bench[] = {2, 5, 10, 100, 1000, 2323, MAX_P2TR_OUTPUTS_PER_BLOCK};
+        size_t o;
+        for (o = 0; o < ARRAY_SIZE(num_outputs_bench); o++) {
+            const int num_outputs = num_outputs_bench[o];
+            char str[64];
+            data.num_outputs = num_outputs;
+            data.num_matches = 0;
+            sprintf(str, "silentpayments_scan_nomatch_N=%i", num_outputs);
+            /* Don't run these slow benchmarks with low iterations (as used e.g. in CI) to prevent slow down */
+            if (iters <= 2 && num_outputs > 10) {
+                printf("Skipping benchmark \"%s\" due to SECP256K1_BENCH_ITERS <= 2\n", str);
+            } else {
+                run_benchmark(str, bench_silentpayments_scan, bench_silentpayments_scan_setup, bench_silentpayments_scan_teardown, &data, 10, num_outputs <= 10 ? iters : 1);
+            }
+        }
+    }
+
+    if (d || have_flag(argc, argv, "silentpayments") || have_flag(argc, argv, "silentpayments_scan_worstcase")) {
+        size_t k;
+        const int num_matches_bench[] = {10, 100, 1000, 2323};
+        for (k = 0; k < ARRAY_SIZE(num_matches_bench); k++) {
+            const int num_matches = num_matches_bench[k];
+            char str[64];
+            data.num_outputs = MAX_P2TR_OUTPUTS_PER_BLOCK;
+            data.num_matches = num_matches;
+            sprintf(str, "silentpayments_scan_worstcase_K=%i", num_matches);
+            /* Don't run these slow benchmarks with low iterations (as used e.g. in CI) to prevent slow down */
+            if (iters <= 2) {
+                printf("Skipping benchmark \"%s\" due to SECP256K1_BENCH_ITERS <= 2\n", str);
+            } else {
+                run_benchmark(str, bench_silentpayments_scan, bench_silentpayments_scan_setup, bench_silentpayments_scan_teardown, &data, 3, 1);
+            }
+        }
+    }
+
+    secp256k1_context_destroy(data.ctx);
+}
+
+#endif /* SECP256K1_MODULE_SILENTPAYMENTS_BENCH_H */
diff --git a/depend/bitcoin/src/secp256k1/src/modules/silentpayments/bip352_send_and_receive_test_vectors.json b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/bip352_send_and_receive_test_vectors.json
new file mode 100644
index 00000000..3a189757
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/bip352_send_and_receive_test_vectors.json
@@ -0,0 +1,5729 @@
+[
+    {
+        "comment": "Simple send: two inputs",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            },
+                            "private_key": "93f5ed907ad5b2bdbbdcb5d9116ebc0a4e1f92f910d5260237fa45a9408aad16"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "3e9fce73d4e77a4809908e3c3a2e54ee147b9312dc5044a193d1fc85de46e3c1"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "028158aff7d61ea66b2fa7f555bc3c5937d1debbde16423d630f9aa7943e14d80d"
+                    ],
+                    "input_private_key_sum": "7ed265a6dac7aba8508a32d6d6b84c7f1dbd0a0941dd01088d69e8d556345f86",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "3e9fce73d4e77a4809908e3c3a2e54ee147b9312dc5044a193d1fc85de46e3c1"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "f438b40179a3c4262de12986c0e6cce0634007cdc79c1dcd3e20b9ebc2e7eef6",
+                            "pub_key": "3e9fce73d4e77a4809908e3c3a2e54ee147b9312dc5044a193d1fc85de46e3c1",
+                            "signature": "74f85b856337fbe837643b86f462118159f93ac4acc2671522f27e8f67b079959195ccc7a5dbee396d2909f5d680d6e30cda7359aa2755822509b70d6b0687a1"
+                        }
+                    ],
+                    "tweak": "024ac253c216532e961988e2a8ce266a447c894c781e52ef6cee902361db960004",
+                    "shared_secret": "028158aff7d61ea66b2fa7f555bc3c5937d1debbde16423d630f9aa7943e14d80d",
+                    "input_pub_key_sum": "032562c1ab2d6bd45d7ca4d78f569999e5333dffd3ac5263924fd00d00dedc4bee"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Simple send: two inputs, order reversed",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            },
+                            "private_key": "93f5ed907ad5b2bdbbdcb5d9116ebc0a4e1f92f910d5260237fa45a9408aad16"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "3e9fce73d4e77a4809908e3c3a2e54ee147b9312dc5044a193d1fc85de46e3c1"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "028158aff7d61ea66b2fa7f555bc3c5937d1debbde16423d630f9aa7943e14d80d"
+                    ],
+                    "input_private_key_sum": "7ed265a6dac7aba8508a32d6d6b84c7f1dbd0a0941dd01088d69e8d556345f86",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "3e9fce73d4e77a4809908e3c3a2e54ee147b9312dc5044a193d1fc85de46e3c1"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "f438b40179a3c4262de12986c0e6cce0634007cdc79c1dcd3e20b9ebc2e7eef6",
+                            "pub_key": "3e9fce73d4e77a4809908e3c3a2e54ee147b9312dc5044a193d1fc85de46e3c1",
+                            "signature": "74f85b856337fbe837643b86f462118159f93ac4acc2671522f27e8f67b079959195ccc7a5dbee396d2909f5d680d6e30cda7359aa2755822509b70d6b0687a1"
+                        }
+                    ],
+                    "tweak": "024ac253c216532e961988e2a8ce266a447c894c781e52ef6cee902361db960004",
+                    "shared_secret": "028158aff7d61ea66b2fa7f555bc3c5937d1debbde16423d630f9aa7943e14d80d",
+                    "input_pub_key_sum": "032562c1ab2d6bd45d7ca4d78f569999e5333dffd3ac5263924fd00d00dedc4bee"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Simple send: two inputs from the same transaction",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 3,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 7,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            },
+                            "private_key": "93f5ed907ad5b2bdbbdcb5d9116ebc0a4e1f92f910d5260237fa45a9408aad16"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "79e71baa2ba3fc66396de3a04f168c7bf24d6870ec88ca877754790c1db357b6"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "03aa707f7b5e94b448abd28aa217e3d7a7cc6bb07f1a8d07be4de91bf7b1417469"
+                    ],
+                    "input_private_key_sum": "7ed265a6dac7aba8508a32d6d6b84c7f1dbd0a0941dd01088d69e8d556345f86",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 3,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 7,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "79e71baa2ba3fc66396de3a04f168c7bf24d6870ec88ca877754790c1db357b6"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "4851455bfbe1ab4f80156570aa45063201aa5c9e1b1dcd29f0f8c33d10bf77ae",
+                            "pub_key": "79e71baa2ba3fc66396de3a04f168c7bf24d6870ec88ca877754790c1db357b6",
+                            "signature": "10332eea808b6a13f70059a8a73195808db782012907f5ba32b6eae66a2f66b4f65147e2b968a1678c5f73d57d5d195dbaf667b606ff80c8490eac1f3b710657"
+                        }
+                    ],
+                    "tweak": "03aeea547819c08413974e2ab2b12212e007166bb2058f88b009e082b9b4914a58",
+                    "shared_secret": "03aa707f7b5e94b448abd28aa217e3d7a7cc6bb07f1a8d07be4de91bf7b1417469",
+                    "input_pub_key_sum": "032562c1ab2d6bd45d7ca4d78f569999e5333dffd3ac5263924fd00d00dedc4bee"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Simple send: two inputs from the same transaction, order reversed",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 7,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 3,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            },
+                            "private_key": "93f5ed907ad5b2bdbbdcb5d9116ebc0a4e1f92f910d5260237fa45a9408aad16"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "f4c2da807f89cb1501f1a77322a895acfb93c28e08ed2724d2beb8e44539ba38"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "03054f5c84b07182ba2a2e10a35e088778f95c04f059f4574b024c372eb8ce5468"
+                    ],
+                    "input_private_key_sum": "7ed265a6dac7aba8508a32d6d6b84c7f1dbd0a0941dd01088d69e8d556345f86",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 7,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 3,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "f4c2da807f89cb1501f1a77322a895acfb93c28e08ed2724d2beb8e44539ba38"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "ab0c9b87181bf527879f48db9f14a02233619b986f8e8f2d5d408ce68a709f51",
+                            "pub_key": "f4c2da807f89cb1501f1a77322a895acfb93c28e08ed2724d2beb8e44539ba38",
+                            "signature": "398a9790865791a9db41a8015afad3a47d60fec5086c50557806a49a1bc038808632b8fe679a7bb65fc6b455be994502eed849f1da3729cd948fc7be73d67295"
+                        }
+                    ],
+                    "tweak": "024cad5180a093d3af0f49f586bdf37f890920178e68e80561ed53351d0fa499ad",
+                    "shared_secret": "03054f5c84b07182ba2a2e10a35e088778f95c04f059f4574b024c372eb8ce5468",
+                    "input_pub_key_sum": "032562c1ab2d6bd45d7ca4d78f569999e5333dffd3ac5263924fd00d00dedc4bee"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Outpoint ordering byte-lexicographically vs. vout-integer",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 1,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 256,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            },
+                            "private_key": "93f5ed907ad5b2bdbbdcb5d9116ebc0a4e1f92f910d5260237fa45a9408aad16"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "a85ef8701394b517a4b35217c4bd37ac01ebeed4b008f8d0879f9e09ba95319c"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "02cb25a6e7c9b7c6d550e0413da63834678465b5e80853a51d0335d318296ac182"
+                    ],
+                    "input_private_key_sum": "7ed265a6dac7aba8508a32d6d6b84c7f1dbd0a0941dd01088d69e8d556345f86",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 1,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 256,
+                            "scriptSig": "48304602210086783ded73e961037e77d49d9deee4edc2b23136e9728d56e4491c80015c3a63022100fda4c0f21ea18de29edbce57f7134d613e044ee150a89e2e64700de2d4e83d4e2103bd85685d03d111699b15d046319febe77f8de5286e9e512703cdee1bf3be3792",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914d9317c66f54ff0a152ec50b1d19c25be50c8e15988ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "a85ef8701394b517a4b35217c4bd37ac01ebeed4b008f8d0879f9e09ba95319c"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "c8ac0292997b5bca98b3ebd99a57e253071137550f270452cd3df8a3e2266d36",
+                            "pub_key": "a85ef8701394b517a4b35217c4bd37ac01ebeed4b008f8d0879f9e09ba95319c",
+                            "signature": "c036ee38bfe46aba03234339ae7219b31b824b52ef9d5ce05810a0d6f62330dedc2b55652578aa5bdabf930fae941acd839d5a66f8fce7caa9710ccb446bddd1"
+                        }
+                    ],
+                    "tweak": "031f9a80d0938cf980b51f7cc4fad713d49037f430646dff129c0570d75a40d8f0",
+                    "shared_secret": "02cb25a6e7c9b7c6d550e0413da63834678465b5e80853a51d0335d318296ac182",
+                    "input_pub_key_sum": "032562c1ab2d6bd45d7ca4d78f569999e5333dffd3ac5263924fd00d00dedc4bee"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: multiple UTXOs from the same public key",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "548ae55c8eec1e736e8d3e520f011f1f42a56d166116ad210b3937599f87f566"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "02f6b40ff17f4010fe732ac4b0f2f211281aa09c9a5fb41f1c151ec2606fee9ec2"
+                    ],
+                    "input_private_key_sum": "d5b8f02cbfe3f1d5295af9fb8a9320e859e9cb07115856486ab1a4e4fb89a621",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "548ae55c8eec1e736e8d3e520f011f1f42a56d166116ad210b3937599f87f566"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "f032695e2636619efa523fffaa9ef93c8802299181fd0461913c1b8daf9784cd",
+                            "pub_key": "548ae55c8eec1e736e8d3e520f011f1f42a56d166116ad210b3937599f87f566",
+                            "signature": "f238386c5d5e5444f8d2c75aabbcb28c346f208c76f60823f5de3b67b79e0ec72ea5de2d7caec314e0971d3454f122dda342b3eede01b3857e83654e36b25f76"
+                        }
+                    ],
+                    "tweak": "0319949463fc6a2368d999a2a6a2bcb2dbf64a2ac6e00b3ba5659780c860a6d9e0",
+                    "shared_secret": "02f6b40ff17f4010fe732ac4b0f2f211281aa09c9a5fb41f1c151ec2606fee9ec2",
+                    "input_pub_key_sum": "03e40664e222ba71e29b80efc907fa22a3c6c64f45e89dbb8511dc7a3712b0a186"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: taproot only inputs with even y-values",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140bd1e708f92dbeaf24a6b8dd22e59c6274355424d62baea976b449e220fd75b13578e262ab11b7aa58e037f0c6b0519b66803b7d9decaa1906dedebfb531c56c1",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                                }
+                            },
+                            "private_key": "fc8716a97a48ba9a05a98ae47b5cd201a25a7fd5d8b73c203c5f7b6b6b3b6ad7"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "de88bea8e7ffc9ce1af30d1132f910323c505185aec8eae361670421e749a1fb"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "02de9719785c6d09f71571dadf44bca59edba2af3e689c65cbc3bb5a4a387732ef"
+                    ],
+                    "input_private_key_sum": "e7638ebfda3ab3849a5707e240a6627671f7f6e609bf172691cf1e9780e51d47",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "02782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140bd1e708f92dbeaf24a6b8dd22e59c6274355424d62baea976b449e220fd75b13578e262ab11b7aa58e037f0c6b0519b66803b7d9decaa1906dedebfb531c56c1",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "de88bea8e7ffc9ce1af30d1132f910323c505185aec8eae361670421e749a1fb"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "3fb9ce5ce1746ced103c8ed254e81f6690764637ddbc876ec1f9b3ddab776b03",
+                            "pub_key": "de88bea8e7ffc9ce1af30d1132f910323c505185aec8eae361670421e749a1fb",
+                            "signature": "c5acd25a8f021a4192f93bc34403fd8b76484613466336fb259c72d04c169824f2690ca34e96cee86b69f376c8377003268fda56feeb1b873e5783d7e19bcca5"
+                        }
+                    ],
+                    "tweak": "02dc59cc8e8873b65c1dd5c416d4fbeb647372c329bd84a70c05b310e222e2c183",
+                    "shared_secret": "02de9719785c6d09f71571dadf44bca59edba2af3e689c65cbc3bb5a4a387732ef",
+                    "input_pub_key_sum": "038180a2125f9d6dd116e1a6139be4d72fd5057dab6aaabaa5654817c11baeb3ba"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: taproot only with mixed even/odd y-values",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "01400a4d0dca6293f40499394d7eefe14a1de11e0e3454f51de2e802592abf5ee549042a1b1a8fb2e149ee9dd3f086c1b69b2f182565ab6ecf599b1ec9ebadfda6c5",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51208c8d23d4764feffcd5e72e380802540fa0f88e3d62ad5e0b47955f74d7b283c4"
+                                }
+                            },
+                            "private_key": "1d37787c2b7116ee983e9f9c13269df29091b391c04db94239e0d2bc2182c3bf"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "77cab7dd12b10259ee82c6ea4b509774e33e7078e7138f568092241bf26b99f1"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "030e7f5ca4bf109fc35c8c2d878f756c891ac04c456cc5f0b05fcec4d3b2b1beb2"
+                    ],
+                    "input_private_key_sum": "cda4ff9a3480e1fbfc6edd61b222f280f9baa0652002c1ffdb612efcc45d2ff2",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "028c8d23d4764feffcd5e72e380802540fa0f88e3d62ad5e0b47955f74d7b283c4"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "01400a4d0dca6293f40499394d7eefe14a1de11e0e3454f51de2e802592abf5ee549042a1b1a8fb2e149ee9dd3f086c1b69b2f182565ab6ecf599b1ec9ebadfda6c5",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51208c8d23d4764feffcd5e72e380802540fa0f88e3d62ad5e0b47955f74d7b283c4"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "77cab7dd12b10259ee82c6ea4b509774e33e7078e7138f568092241bf26b99f1"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "f5382508609771068ed079b24e1f72e4a17ee6d1c979066bf1d4e2a5676f09d4",
+                            "pub_key": "77cab7dd12b10259ee82c6ea4b509774e33e7078e7138f568092241bf26b99f1",
+                            "signature": "ff65833b8fd1ed3ef9d0443b4f702b45a3f2dd457ba247687e8207745c3be9d2bdad0ab3f07118f8b2efc6a04b95f7b3e218daf8a64137ec91bd2fc67fc137a5"
+                        }
+                    ],
+                    "tweak": "03b990f5b1d90ea8fd4bdd5c856a9dfe17035d196958062e2c6cb4c99e413f3548",
+                    "shared_secret": "030e7f5ca4bf109fc35c8c2d878f756c891ac04c456cc5f0b05fcec4d3b2b1beb2",
+                    "input_pub_key_sum": "020f0ab50f420ab1249bc2a21659c607f2873400853035aad0ca6d0ded04d62623"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: taproot input with even y-value and non-taproot input",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "463044021f24e010c6e475814740ba24c8cf9362c4db1276b7f46a7b1e63473159a80ec30221008198e8ece7b7f88e6c6cc6bb8c86f9f00b7458222a8c91addf6e1577bcf7697e2103e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9148cbc7dfe44f1579bff3340bbef1eddeaeb1fc97788ac"
+                                }
+                            },
+                            "private_key": "8d4751f6e8a3586880fb66c19ae277969bd5aa06f61c4ee2f1e2486efdf666d3"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "30523cca96b2a9ae3c98beb5e60f7d190ec5bc79b2d11a0b2d4d09a608c448f0"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "021cd92ff153e638d0a97bcd11fafc81c321b111f5ba1efff593371b7b688efdd3"
+                    ],
+                    "input_private_key_sum": "7823ca0d4895515315a8e3bf602c080b6b732117272429e94751eb9b13a01943",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "463044021f24e010c6e475814740ba24c8cf9362c4db1276b7f46a7b1e63473159a80ec30221008198e8ece7b7f88e6c6cc6bb8c86f9f00b7458222a8c91addf6e1577bcf7697e2103e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9148cbc7dfe44f1579bff3340bbef1eddeaeb1fc97788ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "30523cca96b2a9ae3c98beb5e60f7d190ec5bc79b2d11a0b2d4d09a608c448f0"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "b40017865c79b1fcbed68896791be93186d08f47e416b289b8c063777e14e8df",
+                            "pub_key": "30523cca96b2a9ae3c98beb5e60f7d190ec5bc79b2d11a0b2d4d09a608c448f0",
+                            "signature": "d1edeea28cf1033bcb3d89376cabaaaa2886cbd8fda112b5c61cc90a4e7f1878bdd62180b07d1dfc8ffee1863c525a0c7b5bcd413183282cfda756cb65787266"
+                        }
+                    ],
+                    "tweak": "0233c2a447b8b244e4ffcfb59fe365eaa3bb22288b31e2113b9998861f40d4d6da",
+                    "shared_secret": "021cd92ff153e638d0a97bcd11fafc81c321b111f5ba1efff593371b7b688efdd3",
+                    "input_pub_key_sum": "031ecda9c64faaa6cd57c9f3d7c62bcfc0763c2627ed8dc0e2c3018e9ff37a0bf0"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: taproot input with odd y-value and non-taproot input",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "01400a4d0dca6293f40499394d7eefe14a1de11e0e3454f51de2e802592abf5ee549042a1b1a8fb2e149ee9dd3f086c1b69b2f182565ab6ecf599b1ec9ebadfda6c5",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51208c8d23d4764feffcd5e72e380802540fa0f88e3d62ad5e0b47955f74d7b283c4"
+                                }
+                            },
+                            "private_key": "1d37787c2b7116ee983e9f9c13269df29091b391c04db94239e0d2bc2182c3bf"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "463044021f24e010c6e475814740ba24c8cf9362c4db1276b7f46a7b1e63473159a80ec30221008198e8ece7b7f88e6c6cc6bb8c86f9f00b7458222a8c91addf6e1577bcf7697e2103e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9148cbc7dfe44f1579bff3340bbef1eddeaeb1fc97788ac"
+                                }
+                            },
+                            "private_key": "8d4751f6e8a3586880fb66c19ae277969bd5aa06f61c4ee2f1e2486efdf666d3"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "359358f59ee9e9eec3f00bdf4882570fd5c182e451aa2650b788544aff012a3a"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "03d9437eb3676cf5cc00feebe68bc44c4567332e4b89788dec9eceb3779054442b"
+                    ],
+                    "input_private_key_sum": "700fd97abd324179e8bcc72587bbd9a40b43f67535ce95a0b80175b2dc73a314",
+                    "input_pub_keys": [
+                        "028c8d23d4764feffcd5e72e380802540fa0f88e3d62ad5e0b47955f74d7b283c4",
+                        "03e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "01400a4d0dca6293f40499394d7eefe14a1de11e0e3454f51de2e802592abf5ee549042a1b1a8fb2e149ee9dd3f086c1b69b2f182565ab6ecf599b1ec9ebadfda6c5",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51208c8d23d4764feffcd5e72e380802540fa0f88e3d62ad5e0b47955f74d7b283c4"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "463044021f24e010c6e475814740ba24c8cf9362c4db1276b7f46a7b1e63473159a80ec30221008198e8ece7b7f88e6c6cc6bb8c86f9f00b7458222a8c91addf6e1577bcf7697e2103e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9148cbc7dfe44f1579bff3340bbef1eddeaeb1fc97788ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "359358f59ee9e9eec3f00bdf4882570fd5c182e451aa2650b788544aff012a3a"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "a2f9dd05d1d398347c885d9c61a64d18a264de6d49cea4326bafc2791d627fa7",
+                            "pub_key": "359358f59ee9e9eec3f00bdf4882570fd5c182e451aa2650b788544aff012a3a",
+                            "signature": "96038ad233d8befe342573a6e54828d863471fb2afbad575cc65271a2a649480ea14912b6abbd3fbf92efc1928c036f6e3eef927105af4ec1dd57cb909f360b8"
+                        }
+                    ],
+                    "tweak": "02d4e4f2c4cdb71c9c39a700a9ee1a0fc05b98362a441183f5770af7d6e2b3038c",
+                    "shared_secret": "03d9437eb3676cf5cc00feebe68bc44c4567332e4b89788dec9eceb3779054442b",
+                    "input_pub_key_sum": "03bc118b1c8178915b716d6137633722c71adfe721551ec7b3938054691de6a2b9"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Multiple outputs: multiple outputs, same recipient",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        },
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca",
+                        "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "d97e442d110c0bdd31161a7bb6e7862e038d02a09b1484dfbb463f2e0f7c9230",
+                            "pub_key": "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca",
+                            "signature": "29bd25d0f808d7fcd2aa6d5ed206053899198397506c301b218a9e47a3d7070af03e903ff718978d50d1b6b9af8cc0e313d84eda5d5b1e8e85e5516d630bbeb9"
+                        },
+                        {
+                            "priv_key_tweak": "33ce085c3c11eaad13694aae3c20301a6c83382ec89a7cde96c6799e2f88805a",
+                            "pub_key": "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac",
+                            "signature": "335667ca6cae7a26438f5cfdd73b3d48fa832fa9768521d7d5445f22c203ab0d74ed85088f27d29959ba627a4509996676f47df8ff284d292567b1beef0e3912"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Multiple outputs: multiple outputs, multiple recipients",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        },
+                        {
+                            "address": "sp1qqgrz6j0lcqnc04vxccydl0kpsj4frfje0ktmgcl2t346hkw30226xqupawdf48k8882j0strrvcmgg2kdawz53a54dd376ngdhak364hzcmynqtn",
+                            "scan_pub_key": "02062d49ffc02787d586c608dfbec184aa91a6597d97b463ea5c6babd9d17a95a3",
+                            "spend_pub_key": "0381eb9a9a9ec739d527c1631b31b421566f5c2a47b4ab5b1f6a686dfb68eab716"
+                        },
+                        {
+                            "address": "sp1qqgrz6j0lcqnc04vxccydl0kpsj4frfje0ktmgcl2t346hkw30226xqupawdf48k8882j0strrvcmgg2kdawz53a54dd376ngdhak364hzcmynqtn",
+                            "scan_pub_key": "02062d49ffc02787d586c608dfbec184aa91a6597d97b463ea5c6babd9d17a95a3",
+                            "spend_pub_key": "0381eb9a9a9ec739d527c1631b31b421566f5c2a47b4ab5b1f6a686dfb68eab716"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "2e847bb01d1b491da512ddd760b8509617ee38057003d6115d00ba562451323a",
+                            "841792c33c9dc6193e76744134125d40add8f2f4a96475f28ba150be032d64e8",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "03dd5fd04d3c8863be750a1bd7474df06161461d38d3ce1397a5c78cee112cdcd2",
+                        "03dd5fd04d3c8863be750a1bd7474df06161461d38d3ce1397a5c78cee112cdcd2"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "2e847bb01d1b491da512ddd760b8509617ee38057003d6115d00ba562451323a",
+                        "841792c33c9dc6193e76744134125d40add8f2f4a96475f28ba150be032d64e8",
+                        "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9902c3c56e84002a7cd410113a9ab21d142be7f53cf5200720bb01314c5eb920",
+                        "scan_priv_key": "060b751d7892149006ed7b98606955a29fe284a1e900070c0971f5fb93dbf422"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgrz6j0lcqnc04vxccydl0kpsj4frfje0ktmgcl2t346hkw30226xqupawdf48k8882j0strrvcmgg2kdawz53a54dd376ngdhak364hzcmynqtn"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "72cd082cccb633bf85240a83494b32dc943a4d05647a6686d23ad4ca59c0ebe4",
+                            "pub_key": "2e847bb01d1b491da512ddd760b8509617ee38057003d6115d00ba562451323a",
+                            "signature": "38745f3d9f5eef0b1cfb17ca314efa8c521efab28a23aa20ec5e3abb561d42804d539906dce60c4ee7977966184e6f2cab1faa0e5377ceb7148ec5218b4e7878"
+                        },
+                        {
+                            "priv_key_tweak": "2f17ea873a0047fc01ba8010fef0969e76d0e4283f600d48f735098b1fee6eb9",
+                            "pub_key": "841792c33c9dc6193e76744134125d40add8f2f4a96475f28ba150be032d64e8",
+                            "signature": "c26f4e3cf371b90b840f48ea0e761b5ec31883ed55719f9ef06a90e282d85f565790ab780a3f491bc2668cc64e944dca849d1022a878cdadb8d168b8da4a6da3"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "03dd5fd04d3c8863be750a1bd7474df06161461d38d3ce1397a5c78cee112cdcd2",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Receiving with labels: label with even parity",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjex54dmqmmv6rw353tsuqhs99ydvadxzrsy9nuvk74epvee55drs734pqq",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "0259352add837b6686e8d22b87017814a46b3ad308702167c65bd5c8599cd28d1c"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "d014d4860f67d607d60b1af70e0ee236b99658b61bb769832acbbe87c374439a"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "d014d4860f67d607d60b1af70e0ee236b99658b61bb769832acbbe87c374439a"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": [
+                        2,
+                        3,
+                        1001337
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjex54dmqmmv6rw353tsuqhs99ydvadxzrsy9nuvk74epvee55drs734pqq",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqsg59z2rppn4qlkx0yz9sdltmjv3j8zgcqadjn4ug98m3t6plujsq9qvu5n",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgq7c2zfthc6x3a5yecwc52nxa0kfd20xuz08zyrjpfw4l2j257yq6qgnkdh5"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "51d4e9d0d482b5700109b4b2e16ff508269b03d800192a043d61dca4a0a72a52",
+                            "pub_key": "d014d4860f67d607d60b1af70e0ee236b99658b61bb769832acbbe87c374439a",
+                            "signature": "c30fa63bad6f0a317f39a773a5cbf0b0f8193c71dfebba05ee6ae4ed28e3775e6e04c3ea70a83703bb888122855dc894cab61692e7fd10c9b3494d479a60785e"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Receiving with labels: label with odd parity",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqsg59z2rppn4qlkx0yz9sdltmjv3j8zgcqadjn4ug98m3t6plujsq9qvu5n",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "0208a144a18433a83f633c822c1bf5ee4c8c8e24601d6ca75e20a7dc57a0ff9280"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "67626aebb3c4307cf0f6c39ca23247598fabf675ab783292eb2f81ae75ad1f8c"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "67626aebb3c4307cf0f6c39ca23247598fabf675ab783292eb2f81ae75ad1f8c"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": [
+                        2,
+                        3,
+                        1001337
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjex54dmqmmv6rw353tsuqhs99ydvadxzrsy9nuvk74epvee55drs734pqq",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqsg59z2rppn4qlkx0yz9sdltmjv3j8zgcqadjn4ug98m3t6plujsq9qvu5n",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgq7c2zfthc6x3a5yecwc52nxa0kfd20xuz08zyrjpfw4l2j257yq6qgnkdh5"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "6024ae214876356b8d917716e7707d267ae16a0fdb07de2a786b74a7bbcddead",
+                            "pub_key": "67626aebb3c4307cf0f6c39ca23247598fabf675ab783292eb2f81ae75ad1f8c",
+                            "signature": "a86d554d0d6b7aa0907155f7e0b47f0182752472fffaeddd68da90e99b9402f166fd9b33039c302c7115098d971c1399e67c19e9e4de180b10ea0b9d6f0db832"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Receiving with labels: large label integer",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgq7c2zfthc6x3a5yecwc52nxa0kfd20xuz08zyrjpfw4l2j257yq6qgnkdh5",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "03d85092bbe3468f684ce1d8a2a66ebec96a9e6e09e7110720a5d5faa4aa7880d0"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "7efa60ce78ac343df8a013a2027c6c5ef29f9502edcbd769d2c21717fecc5951"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "7efa60ce78ac343df8a013a2027c6c5ef29f9502edcbd769d2c21717fecc5951"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": [
+                        2,
+                        3,
+                        1001337
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjex54dmqmmv6rw353tsuqhs99ydvadxzrsy9nuvk74epvee55drs734pqq",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqsg59z2rppn4qlkx0yz9sdltmjv3j8zgcqadjn4ug98m3t6plujsq9qvu5n",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgq7c2zfthc6x3a5yecwc52nxa0kfd20xuz08zyrjpfw4l2j257yq6qgnkdh5"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "e336b92330c33030285ce42e4115ad92d5197913c88e06b9072b4a9b47c664a2",
+                            "pub_key": "7efa60ce78ac343df8a013a2027c6c5ef29f9502edcbd769d2c21717fecc5951",
+                            "signature": "c9e80dd3bdd25ca2d352ce77510f1aed37ba3509dc8cc0677f2d7c2dd04090707950ce9dd6c83d2a428063063aff5c04f1744e334f661f2fc01b4ef80b50f739"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Multiple outputs with labels: un-labeled and labeled address; same recipient",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "03a6739499dc667d308baefea4de0c4a85cc72aece181bc05712d3919662610ff1"
+                        },
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                        ],
+                        [
+                            "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c",
+                            "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                        "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": [
+                        1
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "43100f89f1a6bf10081c92b473ffc57ceac7dbed600b6aba9bb3976f17dbb914",
+                            "pub_key": "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "signature": "15c92509b67a6c211ebb4a51b7528d0666e6720de2343b2e92cfb97942ca14693c1f1fdc8451acfdb2644039f8f5c76114807fdc3d3a002d8a46afab6756bd75"
+                        },
+                        {
+                            "priv_key_tweak": "33ce085c3c11eaad13694aae3c20301a6c83382ec89a7cde96c6799e2f88805a",
+                            "pub_key": "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac",
+                            "signature": "335667ca6cae7a26438f5cfdd73b3d48fa832fa9768521d7d5445f22c203ab0d74ed85088f27d29959ba627a4509996676f47df8ff284d292567b1beef0e3912"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Multiple outputs with labels: multiple outputs for labeled address; same recipient",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "03a6739499dc667d308baefea4de0c4a85cc72aece181bc05712d3919662610ff1"
+                        },
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "03a6739499dc667d308baefea4de0c4a85cc72aece181bc05712d3919662610ff1"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                        "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": [
+                        1
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "43100f89f1a6bf10081c92b473ffc57ceac7dbed600b6aba9bb3976f17dbb914",
+                            "pub_key": "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "signature": "15c92509b67a6c211ebb4a51b7528d0666e6720de2343b2e92cfb97942ca14693c1f1fdc8451acfdb2644039f8f5c76114807fdc3d3a002d8a46afab6756bd75"
+                        },
+                        {
+                            "priv_key_tweak": "9d5fd3b91cac9ddfea6fc2e6f9386f680e6cee623cda02f53706306c081de87f",
+                            "pub_key": "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c",
+                            "signature": "db0dfacc98b6a6fcc67cc4631f080b1ca38c60d8c397f2f19843f8f95ec91594b24e47c5bd39480a861c1209f7e3145c440371f9191fb96e324690101eac8e8e"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Multiple outputs with labels: un-labeled, labeled, and multiple outputs for labeled address; same recipients",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        },
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "03a6739499dc667d308baefea4de0c4a85cc72aece181bc05712d3919662610ff1"
+                        },
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjyh2ju7hd5gj57jg5r9lev3pckk4n2shtzaq34467erzzdfajfggty6aa5",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "0244baa5cf5db444a9e922832ff2c88716b566a85d62e8235aebd91884d4f64942"
+                        },
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjyh2ju7hd5gj57jg5r9lev3pckk4n2shtzaq34467erzzdfajfggty6aa5",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "0244baa5cf5db444a9e922832ff2c88716b566a85d62e8235aebd91884d4f64942"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "006a02c308ccdbf3ac49f0638f6de128f875db5a213095cf112b3b77722472ae",
+                            "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                            "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa"
+                        ],
+                        [
+                            "006a02c308ccdbf3ac49f0638f6de128f875db5a213095cf112b3b77722472ae",
+                            "3edf1ff6657c6e69568811bd726a7a7f480493aa42161acfe8dd4f44521f99ed",
+                            "7ee1543ed5d123ffa66fbebc128c020173eb490d5fa2ba306e0c9573a77db8f3",
+                            "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa"
+                        ],
+                        [
+                            "006a02c308ccdbf3ac49f0638f6de128f875db5a213095cf112b3b77722472ae",
+                            "7ee1543ed5d123ffa66fbebc128c020173eb490d5fa2ba306e0c9573a77db8f3",
+                            "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c",
+                            "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701"
+                        ],
+                        [
+                            "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "3c54444944d176437644378c23efb999ab6ab1cacdfe1dc1537b607e3df330e2",
+                            "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa",
+                            "f4569fc5f69c10f0082cfbb8e072e6266ec55f69fba8cffca4cbb4c144b7e59b"
+                        ],
+                        [
+                            "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac",
+                            "f4569fc5f69c10f0082cfbb8e072e6266ec55f69fba8cffca4cbb4c144b7e59b"
+                        ],
+                        [
+                            "3c54444944d176437644378c23efb999ab6ab1cacdfe1dc1537b607e3df330e2",
+                            "602e10e6944107c9b48bd885b493676578c935723287e0ab2f8b7f136862568e",
+                            "7ee1543ed5d123ffa66fbebc128c020173eb490d5fa2ba306e0c9573a77db8f3",
+                            "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa"
+                        ],
+                        [
+                            "3c54444944d176437644378c23efb999ab6ab1cacdfe1dc1537b607e3df330e2",
+                            "7ee1543ed5d123ffa66fbebc128c020173eb490d5fa2ba306e0c9573a77db8f3",
+                            "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c",
+                            "f4569fc5f69c10f0082cfbb8e072e6266ec55f69fba8cffca4cbb4c144b7e59b"
+                        ],
+                        [
+                            "3edf1ff6657c6e69568811bd726a7a7f480493aa42161acfe8dd4f44521f99ed",
+                            "7ee1543ed5d123ffa66fbebc128c020173eb490d5fa2ba306e0c9573a77db8f3",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac",
+                            "f4569fc5f69c10f0082cfbb8e072e6266ec55f69fba8cffca4cbb4c144b7e59b"
+                        ],
+                        [
+                            "3edf1ff6657c6e69568811bd726a7a7f480493aa42161acfe8dd4f44521f99ed",
+                            "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa",
+                            "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca",
+                            "f4569fc5f69c10f0082cfbb8e072e6266ec55f69fba8cffca4cbb4c144b7e59b"
+                        ],
+                        [
+                            "602e10e6944107c9b48bd885b493676578c935723287e0ab2f8b7f136862568e",
+                            "7ee1543ed5d123ffa66fbebc128c020173eb490d5fa2ba306e0c9573a77db8f3",
+                            "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                        ],
+                        [
+                            "602e10e6944107c9b48bd885b493676578c935723287e0ab2f8b7f136862568e",
+                            "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                            "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa",
+                            "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca"
+                        ],
+                        [
+                            "83dc944e61603137294829aed56c74c9b087d80f2c021b98a7fae5799000696c",
+                            "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                            "e976a58fbd38aeb4e6093d4df02e9c1de0c4513ae0c588cef68cda5b2f8834ca",
+                            "f4569fc5f69c10f0082cfbb8e072e6266ec55f69fba8cffca4cbb4c144b7e59b"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "006a02c308ccdbf3ac49f0638f6de128f875db5a213095cf112b3b77722472ae",
+                        "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                        "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                        "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": [
+                        1,
+                        1337
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqaxww2fnhrx05cghth75n0qcj59e3e2anscr0q9wyknjxtxycg07y3pevyj",
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjyh2ju7hd5gj57jg5r9lev3pckk4n2shtzaq34467erzzdfajfggty6aa5"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "4e3352fbe0505c25e718d96007c259ef08db34f8c844e4ff742d9855ff03805a",
+                            "pub_key": "006a02c308ccdbf3ac49f0638f6de128f875db5a213095cf112b3b77722472ae",
+                            "signature": "6eeae1ea9eb826e3d0e812f65937100e0836ea188c04f36fabc4981eda29de8d3d3529390a0a8b3d830f7bca4f5eae5994b9788ddaf05ad259ffe26d86144b4b"
+                        },
+                        {
+                            "priv_key_tweak": "43100f89f1a6bf10081c92b473ffc57ceac7dbed600b6aba9bb3976f17dbb914",
+                            "pub_key": "39f42624d5c32a77fda80ff0acee269afec601d3791803e80252ae04e4ffcf4c",
+                            "signature": "15c92509b67a6c211ebb4a51b7528d0666e6720de2343b2e92cfb97942ca14693c1f1fdc8451acfdb2644039f8f5c76114807fdc3d3a002d8a46afab6756bd75"
+                        },
+                        {
+                            "priv_key_tweak": "bf709f98d4418f8a67e738154ae48818dad44689cd37fbc070891a396dd1c633",
+                            "pub_key": "ae1a780c04237bd577283c3ddb2e499767c3214160d5a6b0767e6b8c278bd701",
+                            "signature": "42a19fd8a63dde1824966a95d65a28203e631e49bf96ca5dae1b390e7a0ace2cc8709c9b0c5715047032f57f536a3c80273cbecf4c05be0b5456c183fa122c06"
+                        },
+                        {
+                            "priv_key_tweak": "736f05e4e3072c3b8656bedef2e9bf54cbcaa2b6fe5320d3e86f5b96874dda71",
+                            "pub_key": "ca64abe1e0f737823fb9a94f597eed418fb2df77b1317e26b881a14bb594faaa",
+                            "signature": "2e61bb3d79418ecf55f68847cf121bfc12d397b39d1da8643246b2f0a9b96c3daa4bfe9651beb5c9ce20e1f29282c4566400a4b45ee6657ec3b18fdc554da0b4"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: use silent payments for sender change",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        },
+                        {
+                            "address": "sp1qqw6vczcfpdh5nf5y2ky99kmqae0tr30hgdfg88parz50cp80wd2wqqlv6saelkk5snl4wfutyxrchpzzwm8rjp3z6q7apna59z9huq4x754e5atr",
+                            "scan_pub_key": "03b4cc0b090b6f49a684558852db60ee5eb1c5f74352839c3d18a8fc04ef7354e0",
+                            "spend_pub_key": "03ecd43b9fdad484ff57278b21878b844276ce390622d03dd0cfb4288b7e02a6f5"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "be368e28979d950245d742891ae6064020ba548c1e2e65a639a8bb0675d95cff",
+                            "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                        "037d12c02c3aed482658a28b8d1be030dac1daf995551491d74c00543af98572fb"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "be368e28979d950245d742891ae6064020ba548c1e2e65a639a8bb0675d95cff",
+                        "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "b8f87388cbb41934c50daca018901b00070a5ff6cc25a7e9e716a9d5b9e4d664",
+                        "scan_priv_key": "11b7a82e06ca2648d5fded2366478078ec4fc9dc1d8ff487518226f229d768fd"
+                    },
+                    "labels": [
+                        0
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqw6vczcfpdh5nf5y2ky99kmqae0tr30hgdfg88parz50cp80wd2wqqauj52ymtc4xdkmx3tgyhrsemg2g3303xk2gtzfy8h8ejet8fz8jcw23zua",
+                        "sp1qqw6vczcfpdh5nf5y2ky99kmqae0tr30hgdfg88parz50cp80wd2wqqlv6saelkk5snl4wfutyxrchpzzwm8rjp3z6q7apna59z9huq4x754e5atr"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "80cd767ed20bd0bb7d8ea5e803f8c381293a62e8a073cf46fb0081da46e64e1f",
+                            "pub_key": "be368e28979d950245d742891ae6064020ba548c1e2e65a639a8bb0675d95cff",
+                            "signature": "7fbd5074cf1377273155eefafc7c330cb61b31da252f22206ac27530d2b2567040d9af7808342ed4a09598c26d8307446e4ed77079e6a2e61fea736e44da5f5a"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "037d12c02c3aed482658a28b8d1be030dac1daf995551491d74c00543af98572fb",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            },
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "be368e28979d950245d742891ae6064020ba548c1e2e65a639a8bb0675d95cff",
+                        "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "33ce085c3c11eaad13694aae3c20301a6c83382ec89a7cde96c6799e2f88805a",
+                            "pub_key": "f207162b1a7abc51c42017bef055e9ec1efc3d3567cb720357e2b84325db33ac",
+                            "signature": "335667ca6cae7a26438f5cfdd73b3d48fa832fa9768521d7d5445f22c203ab0d74ed85088f27d29959ba627a4509996676f47df8ff284d292567b1beef0e3912"
+                        }
+                    ],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Single recipient: taproot input with NUMS point",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0440c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b22205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5ac21c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac00150",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120da6f0595ecb302bbe73e2f221f05ab10f336b06817d36fd28fc6691725ddaa85"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140bd1e708f92dbeaf24a6b8dd22e59c6274355424d62baea976b449e220fd75b13578e262ab11b7aa58e037f0c6b0519b66803b7d9decaa1906dedebfb531c56c1",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                                }
+                            },
+                            "private_key": "fc8716a97a48ba9a05a98ae47b5cd201a25a7fd5d8b73c203c5f7b6b6b3b6ad7"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "0340268d31a9276f6380107d5321cafa6d9e8e5ea39204318fdc8206b31507c891c3bbcea3c99e2208d73bd127a8e8c5f1e45a54f1bd217205414ddb566ab7eda0092220e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85dac21c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51200a3c9365ceb131f89b0a4feb6896ebd67bb15a98c31eaa3da143bb955a0f3fcb"
+                                }
+                            },
+                            "private_key": "8d4751f6e8a3586880fb66c19ae277969bd5aa06f61c4ee2f1e2486efdf666d3"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "79e79897c52935bfd97fc6e076a6431a0c7543ca8c31e0fc3cf719bb572c842d"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "036f040608cd1e5ee79c54e78bea85904c895591f547beae080d0c5f6946c2730d"
+                    ],
+                    "input_private_key_sum": "fc8716a97a48ba9a05a98ae47b5cd201a25a7fd5d8b73c203c5f7b6b6b3b6ad7",
+                    "input_pub_keys": [
+                        "02782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0440c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b22205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5ac21c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac00150",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120da6f0595ecb302bbe73e2f221f05ab10f336b06817d36fd28fc6691725ddaa85"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140bd1e708f92dbeaf24a6b8dd22e59c6274355424d62baea976b449e220fd75b13578e262ab11b7aa58e037f0c6b0519b66803b7d9decaa1906dedebfb531c56c1",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "0340268d31a9276f6380107d5321cafa6d9e8e5ea39204318fdc8206b31507c891c3bbcea3c99e2208d73bd127a8e8c5f1e45a54f1bd217205414ddb566ab7eda0092220e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85dac21c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51200a3c9365ceb131f89b0a4feb6896ebd67bb15a98c31eaa3da143bb955a0f3fcb"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "79e79897c52935bfd97fc6e076a6431a0c7543ca8c31e0fc3cf719bb572c842d"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "3ddec3232609d348d6b8b53123b4f40f6d4f5398ca586f087b0416ec3b851496",
+                            "pub_key": "79e79897c52935bfd97fc6e076a6431a0c7543ca8c31e0fc3cf719bb572c842d",
+                            "signature": "d7d06e3afb68363031e4eb18035c46ceae41bdbebe7888a4754bc9848c596436869aeaecff0527649a1f458b71c9ceecec10b535c09d01d720229aa228547706"
+                        }
+                    ],
+                    "tweak": "02213b872c9a6ee28a0d861384a1b3e3ec7257f4855ed09b4323e3899f3b028989",
+                    "shared_secret": "036f040608cd1e5ee79c54e78bea85904c895591f547beae080d0c5f6946c2730d",
+                    "input_pub_key_sum": "02782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Pubkey extraction from malleated p2pkh",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 1,
+                            "scriptSig": "0075473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 2,
+                            "scriptSig": "5163473045022100e7d26e77290b37128f5215ade25b9b908ce87cc9a4d498908b5bb8fd6daa1b8d022002568c3a8226f4f0436510283052bfb780b76f3fe4aa60c4c5eb118e43b187372102e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d67483046022100c0d3c851d3bd562ae93d56bcefd735ea57c027af46145a4d5e9cac113bfeb0c2022100ee5b2239af199fa9b7aa1d98da83a29d0a2cf1e4f29e2f37134ce386d51c544c2102ad0f26ddc7b3fcc340155963b3051b85289c1869612ecb290184ac952e2864ec68",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914c82c5ec473cbc6c86e5ef410e36f9495adcf979988ac"
+                                }
+                            },
+                            "private_key": "72b8ae09175ca7977f04993e651d88681ed932dfb92c5158cdf0161dd23fda6e"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "4612cdbf845c66c7511d70aab4d9aed11e49e48cdb8d799d787101cdd0d53e4f"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "034773b97ccad9791cb4213964ff9896ccd6581ee69345de5d114786d9d86b03a2"
+                    ],
+                    "input_private_key_sum": "610e0f75fd05e5e80e088b57af0a46da06cb0700c0c5907aa6d29c6b4ce46348",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                        "02e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 1,
+                            "scriptSig": "0075473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 2,
+                            "scriptSig": "5163473045022100e7d26e77290b37128f5215ade25b9b908ce87cc9a4d498908b5bb8fd6daa1b8d022002568c3a8226f4f0436510283052bfb780b76f3fe4aa60c4c5eb118e43b187372102e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d67483046022100c0d3c851d3bd562ae93d56bcefd735ea57c027af46145a4d5e9cac113bfeb0c2022100ee5b2239af199fa9b7aa1d98da83a29d0a2cf1e4f29e2f37134ce386d51c544c2102ad0f26ddc7b3fcc340155963b3051b85289c1869612ecb290184ac952e2864ec68",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914c82c5ec473cbc6c86e5ef410e36f9495adcf979988ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "4612cdbf845c66c7511d70aab4d9aed11e49e48cdb8d799d787101cdd0d53e4f"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "10bde9781def20d7701e7603ef1b1e5e71c67bae7154818814e3c81ef5b1a3d3",
+                            "pub_key": "4612cdbf845c66c7511d70aab4d9aed11e49e48cdb8d799d787101cdd0d53e4f",
+                            "signature": "6137969f810e9e8ef6c9755010e808f5dd1aed705882e44d7f0ae64eb0c509ec8b62a0671bee0d5914ac27d2c463443e28e999d82dc3d3a4919f093872d947bb"
+                        }
+                    ],
+                    "tweak": "028d6617f9bfe08604beb2188f4eebec923f5f8cc436fa6d14e4256e49bc32e7c8",
+                    "shared_secret": "034773b97ccad9791cb4213964ff9896ccd6581ee69345de5d114786d9d86b03a2",
+                    "input_pub_key_sum": "038b0d201fe111bdc0e6953772bd02a41959d25d5b2f66bcbe348af27bbdd42735"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "P2PKH and P2WPKH Uncompressed Keys are skipped",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b974104782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233387c5343bf58e23269e903335b958a12182f9849297321e8d710e49a8727129cab",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9144b92ac4ac6fe6212393894addda332f2e47a315688ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "02473045022100e7d26e77290b37128f5215ade25b9b908ce87cc9a4d498908b5bb8fd6daa1b8d022002568c3a8226f4f0436510283052bfb780b76f3fe4aa60c4c5eb118e43b187374104e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d6fe8190e189be57d0d5bcd17dbcbcd04c9b4a1c5f605b10d5c90abfcc0d12884",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00140423f731a07491364e8dce98b7c00bda63336950"
+                                }
+                            },
+                            "private_key": "72b8ae09175ca7977f04993e651d88681ed932dfb92c5158cdf0161dd23fda6e"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "67fee277da9e8542b5d2e6f32d660a9bbd3f0e107c2d53638ab1d869088882d6"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "0295a54c359da5b2640601ddbedb26e040cb97b6a3432e60b76d1258e85f72fa64"
+                    ],
+                    "input_private_key_sum": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a91419c2f3ae0ca3b642bd3e49598b8da89f50c1416188ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b974104782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233387c5343bf58e23269e903335b958a12182f9849297321e8d710e49a8727129cab",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9144b92ac4ac6fe6212393894addda332f2e47a315688ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "02473045022100e7d26e77290b37128f5215ade25b9b908ce87cc9a4d498908b5bb8fd6daa1b8d022002568c3a8226f4f0436510283052bfb780b76f3fe4aa60c4c5eb118e43b187374104e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d6fe8190e189be57d0d5bcd17dbcbcd04c9b4a1c5f605b10d5c90abfcc0d12884",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00140423f731a07491364e8dce98b7c00bda63336950"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "67fee277da9e8542b5d2e6f32d660a9bbd3f0e107c2d53638ab1d869088882d6"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "688fa3aeb97d2a46ae87b03591921c2eaf4b505eb0ddca2733c94701e01060cf",
+                            "pub_key": "67fee277da9e8542b5d2e6f32d660a9bbd3f0e107c2d53638ab1d869088882d6",
+                            "signature": "72e7ad573ac23255d4651d5b0326a200496588acb7a4894b22092236d5eda6a0a9a4d8429b022c2219081fefce5b33795cae488d10f5ea9438849ed8353624f2"
+                        }
+                    ],
+                    "tweak": "02b04034f00da0678507d1345b7d56fecef825a1151f9dc7d8ca6946452a9e1f43",
+                    "shared_secret": "0295a54c359da5b2640601ddbedb26e040cb97b6a3432e60b76d1258e85f72fa64",
+                    "input_pub_key_sum": "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Skip invalid P2SH inputs",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "16001419c2f3ae0ca3b642bd3e49598b8da89f50c14161",
+                            "txinwitness": "02483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "a9148629db5007d5fcfbdbb466637af09daf9125969387"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 1,
+                            "scriptSig": "1600144b92ac4ac6fe6212393894addda332f2e47a3156",
+                            "txinwitness": "02473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b974104782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233387c5343bf58e23269e903335b958a12182f9849297321e8d710e49a8727129cab",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "a9146c9bf136fbb7305fd99d771a95127fcf87dedd0d87"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 2,
+                            "scriptSig": "00493046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d601483045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b97014c695221025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be52103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233382102e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d53ae",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "a9141044ddc6cea09e4ac40fbec2ba34ad62de6db25b87"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "67fee277da9e8542b5d2e6f32d660a9bbd3f0e107c2d53638ab1d869088882d6"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "0295a54c359da5b2640601ddbedb26e040cb97b6a3432e60b76d1258e85f72fa64"
+                    ],
+                    "input_private_key_sum": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "16001419c2f3ae0ca3b642bd3e49598b8da89f50c14161",
+                            "txinwitness": "02483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d621025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "a9148629db5007d5fcfbdbb466637af09daf9125969387"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 1,
+                            "scriptSig": "1600144b92ac4ac6fe6212393894addda332f2e47a3156",
+                            "txinwitness": "02473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b974104782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233387c5343bf58e23269e903335b958a12182f9849297321e8d710e49a8727129cab",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "a9146c9bf136fbb7305fd99d771a95127fcf87dedd0d87"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 2,
+                            "scriptSig": "00493046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d601483045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b97014c695221025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be52103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233382102e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d53ae",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "a9141044ddc6cea09e4ac40fbec2ba34ad62de6db25b87"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "67fee277da9e8542b5d2e6f32d660a9bbd3f0e107c2d53638ab1d869088882d6"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "688fa3aeb97d2a46ae87b03591921c2eaf4b505eb0ddca2733c94701e01060cf",
+                            "pub_key": "67fee277da9e8542b5d2e6f32d660a9bbd3f0e107c2d53638ab1d869088882d6",
+                            "signature": "72e7ad573ac23255d4651d5b0326a200496588acb7a4894b22092236d5eda6a0a9a4d8429b022c2219081fefce5b33795cae488d10f5ea9438849ed8353624f2"
+                        }
+                    ],
+                    "tweak": "02b04034f00da0678507d1345b7d56fecef825a1151f9dc7d8ca6946452a9e1f43",
+                    "shared_secret": "0295a54c359da5b2640601ddbedb26e040cb97b6a3432e60b76d1258e85f72fa64",
+                    "input_pub_key_sum": "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Recipient ignores unrelated outputs",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgrz6j0lcqnc04vxccydl0kpsj4frfje0ktmgcl2t346hkw30226xqupawdf48k8882j0strrvcmgg2kdawz53a54dd376ngdhak364hzcmynqtn",
+                            "scan_pub_key": "02062d49ffc02787d586c608dfbec184aa91a6597d97b463ea5c6babd9d17a95a3",
+                            "spend_pub_key": "0381eb9a9a9ec739d527c1631b31b421566f5c2a47b4ab5b1f6a686dfb68eab716"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "841792c33c9dc6193e76744134125d40add8f2f4a96475f28ba150be032d64e8"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "03dd5fd04d3c8863be750a1bd7474df06161461d38d3ce1397a5c78cee112cdcd2"
+                    ],
+                    "input_private_key_sum": "ee55616ce5a93e508f03f21949ecbe70a2a0b107b6e1df5d98b4e4da4adaca1b",
+                    "input_pub_keys": [
+                        "025a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5",
+                        "03782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0140c459b671370d12cfb5acee76da7e3ba7cc29b0b4653e3af8388591082660137d087fdc8e89a612cd5d15be0febe61fc7cdcf3161a26e599a4514aa5c3e86f47b",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "51205a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b972103782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9147cdd63cc408564188e8e472640e921c7c90e651d88ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "841792c33c9dc6193e76744134125d40add8f2f4a96475f28ba150be032d64e8",
+                        "782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [],
+                    "tweak": "0314bec14463d6c0181083d607fecfba67bb83f95915f6f247975ec566d5642ee8",
+                    "shared_secret": "038efbcbc1b0938fba3bf59fea1219a3c54b6d6f9107560da05001407adc13f413",
+                    "input_pub_key_sum": "03853f51bef283502181e93238c8708ae27235dc51ae45a0c4053987c52fc6428b"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "No valid inputs, sender generates no outputs",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d641045a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5c61836c9b1688ba431f7ea3039742251f62f0dca3da1bee58a47fa9b456c2d52",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914460e8b41545d2dbe7e0671f0f573e2232814260a88ac"
+                                }
+                            },
+                            "private_key": "eadc78165ff1f8ea94ad7cfdc54990738a4c53f6e0507b42154201b8e5dff3b1"
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b974104782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233387c5343bf58e23269e903335b958a12182f9849297321e8d710e49a8727129cab",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9144b92ac4ac6fe6212393894addda332f2e47a315688ac"
+                                }
+                            },
+                            "private_key": "0378e95685b74565fa56751b84a32dfd18545d10d691641b8372e32164fad66a"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        []
+                    ],
+                    "shared_secrets": [
+                        null
+                    ],
+                    "input_pub_keys": []
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16",
+                            "vout": 0,
+                            "scriptSig": "483046022100ad79e6801dd9a8727f342f31c71c4912866f59dc6e7981878e92c5844a0ce929022100fb0d2393e813968648b9753b7e9871d90ab3d815ebf91820d704b19f4ed224d641045a1e61f898173040e20616d43e9f496fba90338a39faa1ed98fcbaeee4dd9be5c61836c9b1688ba431f7ea3039742251f62f0dca3da1bee58a47fa9b456c2d52",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a914460e8b41545d2dbe7e0671f0f573e2232814260a88ac"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+                            "vout": 0,
+                            "scriptSig": "473045022100a8c61b2d470e393279d1ba54f254b7c237de299580b7fa01ffcc940442ecec4502201afba952f4e4661c40acde7acc0341589031ba103a307b886eb867b23b850b974104782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c3799373233387c5343bf58e23269e903335b958a12182f9849297321e8d710e49a8727129cab",
+                            "txinwitness": "",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "76a9144b92ac4ac6fe6212393894addda332f2e47a315688ac"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "782eeb913431ca6e9b8c2fd80a5f72ed2024ef72a3c6fb10263c379937323338",
+                        "e0ec4f64b3fa2e463ccfcf4e856e37d5e1e20275bc89ec1def9eb098eff1f85d"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [],
+                    "tweak": null,
+                    "shared_secret": null
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Input keys sum up to zero / point at infinity: sending fails, receiver skips tx",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "024730440220085003179ce1a3a88ce0069aa6ea045e140761ab88c22a26ae2a8cfe983a6e4602204a8a39940f0735c8a4424270ac8da65240c261ab3fda9272f6d6efbf9cfea366012102557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149d9e24f9fab4e35bf1a6df4b46cb533296ac0792"
+                                }
+                            },
+                            "private_key": "a6df6a0bb448992a301df4258e06a89fe7cf7146f59ac3bd5ff26083acb22ceb"
+                        },
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402204586a68e1d97dd3c6928e3622799859f8c3b20c3c670cf654cc905c9be29fdb7022043fbcde1689f3f4045e8816caf6163624bd19e62e4565bc99f95c533e599782c012103557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149860538b5575962776ed0814ae222c7d60c72d7b"
+                                }
+                            },
+                            "private_key": "592095f44bb766d5cfe20bda71f9575ed2df6b9fb9addc7e5fdffe0923841456"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqtrqglu5g8kh6mfsg4qxa9wq0nv9cauwfwxw70984wkqnw2uwz0w2qnehen8a7wuhwk9tgrzjh8gwzc8q2dlekedec5djk0js9d3d7qhnq6lqj3s",
+                            "scan_pub_key": "02c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5",
+                            "spend_pub_key": "0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        []
+                    ],
+                    "shared_secrets": [
+                        null
+                    ],
+                    "input_pub_keys": [
+                        "02557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                        "03557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "024730440220085003179ce1a3a88ce0069aa6ea045e140761ab88c22a26ae2a8cfe983a6e4602204a8a39940f0735c8a4424270ac8da65240c261ab3fda9272f6d6efbf9cfea366012102557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149d9e24f9fab4e35bf1a6df4b46cb533296ac0792"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402204586a68e1d97dd3c6928e3622799859f8c3b20c3c670cf654cc905c9be29fdb7022043fbcde1689f3f4045e8816caf6163624bd19e62e4565bc99f95c533e599782c012103557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149860538b5575962776ed0814ae222c7d60c72d7b"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "0000000000000000000000000000000000000000000000000000000000000000"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "0000000000000000000000000000000000000000000000000000000000000001",
+                        "scan_priv_key": "0000000000000000000000000000000000000000000000000000000000000002"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqtrqglu5g8kh6mfsg4qxa9wq0nv9cauwfwxw70984wkqnw2uwz0w2qnehen8a7wuhwk9tgrzjh8gwzc8q2dlekedec5djk0js9d3d7qhnq6lqj3s"
+                    ],
+                    "outputs": [],
+                    "tweak": null,
+                    "shared_secret": null
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Input keys intermediate sum is zero but final sum is non-zero",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402203e5537fa8c876b3475e7efe4f1474b0f48b7a6e4169179db5de9bb5b55ad1bd10220200e06f8f4d29dbc48bbcdf90df3278e798ce6cbf3c9fbf90427599fde147867012102557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149d9e24f9fab4e35bf1a6df4b46cb533296ac0792"
+                                }
+                            },
+                            "private_key": "a6df6a0bb448992a301df4258e06a89fe7cf7146f59ac3bd5ff26083acb22ceb"
+                        },
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402207fdad0faf46edc54f5a5c67d33b2fa8d3f1fdc869381fd96e659f9e0c470ab1e022044f0d973339618b18667cef9a6251817f7f431f7f2b252a8cb760ccb40e7d823012103557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149860538b5575962776ed0814ae222c7d60c72d7b"
+                                }
+                            },
+                            "private_key": "592095f44bb766d5cfe20bda71f9575ed2df6b9fb9addc7e5fdffe0923841456"
+                        },
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 2,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402203e5537fa8c876b3475e7efe4f1474b0f48b7a6e4169179db5de9bb5b55ad1bd10220200e06f8f4d29dbc48bbcdf90df3278e798ce6cbf3c9fbf90427599fde147867012102557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149d9e24f9fab4e35bf1a6df4b46cb533296ac0792"
+                                }
+                            },
+                            "private_key": "a6df6a0bb448992a301df4258e06a89fe7cf7146f59ac3bd5ff26083acb22ceb"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv",
+                            "scan_pub_key": "0220bcfac5b99e04ad1a06ddfb016ee13582609d60b6291e98d01a9bc9a16c96d4",
+                            "spend_pub_key": "025cc9856d6f8375350e123978daac200c260cb5b5ae83106cab90484dcd8fcf36"
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        [
+                            "7e88a7536c90770be4d2693a84ed03abe3fdcc5a29f96ec3433effec3b0c2194"
+                        ]
+                    ],
+                    "shared_secrets": [
+                        "037dc4e5904ab4770dbdbb628860b54265fdbb7810b8afdf9f582fedaabfdebef0"
+                    ],
+                    "input_private_key_sum": "a6df6a0bb448992a301df4258e06a89fe7cf7146f59ac3bd5ff26083acb22ceb",
+                    "input_pub_keys": [
+                        "02557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                        "03557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                        "02557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402203e5537fa8c876b3475e7efe4f1474b0f48b7a6e4169179db5de9bb5b55ad1bd10220200e06f8f4d29dbc48bbcdf90df3278e798ce6cbf3c9fbf90427599fde147867012102557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149d9e24f9fab4e35bf1a6df4b46cb533296ac0792"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 1,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402207fdad0faf46edc54f5a5c67d33b2fa8d3f1fdc869381fd96e659f9e0c470ab1e022044f0d973339618b18667cef9a6251817f7f431f7f2b252a8cb760ccb40e7d823012103557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149860538b5575962776ed0814ae222c7d60c72d7b"
+                                }
+                            }
+                        },
+                        {
+                            "txid": "3a286147b25e16ae80aff406f2673c6e565418c40f45c071245cdebc8a94174e",
+                            "vout": 2,
+                            "scriptSig": "",
+                            "txinwitness": "0247304402203e5537fa8c876b3475e7efe4f1474b0f48b7a6e4169179db5de9bb5b55ad1bd10220200e06f8f4d29dbc48bbcdf90df3278e798ce6cbf3c9fbf90427599fde147867012102557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "00149d9e24f9fab4e35bf1a6df4b46cb533296ac0792"
+                                }
+                            }
+                        }
+                    ],
+                    "outputs": [
+                        "7e88a7536c90770be4d2693a84ed03abe3fdcc5a29f96ec3433effec3b0c2194"
+                    ],
+                    "key_material": {
+                        "spend_priv_key": "9d6ad855ce3417ef84e836892e5a56392bfba05fa5d97ccea30e266f540e08b3",
+                        "scan_priv_key": "0f694e068028a717f8af6b9411f9a133dd3565258714cc226594b34db90c1f2c"
+                    },
+                    "labels": []
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqgste7k9hx0qftg6qmwlkqtwuy6cycyavzmzj85c6qdfhjdpdjtdgqjuexzk6murw56suy3e0rd2cgqvycxttddwsvgxe2usfpxumr70xc9pkqwv"
+                    ],
+                    "outputs": [
+                        {
+                            "priv_key_tweak": "3d5b7a284108f93b9fe78f2c300d2ca9ef3b4e0cd0de673fc72990f2a4f417b9",
+                            "pub_key": "7e88a7536c90770be4d2693a84ed03abe3fdcc5a29f96ec3433effec3b0c2194",
+                            "signature": "f8d5222f1a682215c40ab677f2104606f2a0e6c5cb1a2d248d970fb61d4eadb31702353e6b41ea5a9b24817efa0eaf535552eeee8a794b662c3cf303b6c86672"
+                        }
+                    ],
+                    "tweak": "039c68bacb7efbf2175d781822f460afc4839a5798fabb055b50d939231bf57bb6",
+                    "shared_secret": "037dc4e5904ab4770dbdbb628860b54265fdbb7810b8afdf9f582fedaabfdebef0",
+                    "input_pub_key_sum": "02557ef3e55b0a52489b4454c1169e06bdea43687a69c1f190eb50781644ab6975"
+                }
+            }
+        ]
+    },
+    {
+        "comment": "Maximum per-group recipient limit K_max is exceeded (2324 matches): sending fails, receiver doesn't scan beyond limit",
+        "sending": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "3cde0e7ad8adf24a4e52fd18efafffb94f73f4c7facf2627a5b588ad1c9db87f",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "01407ce01bc5ef2e4aae353e7f291fec32623d6a491b5421be6dccc70345f32ebae5baa6654c60c074e72da76fd06b343474370e56d3ec0413156ec6261757125ad4",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120bca87f72e604e8850064552bedf380ca4584227057efe12a6cc238470658aaa3"
+                                }
+                            },
+                            "private_key": "0000000000000000000000000000000000000000000000000000000000001337"
+                        }
+                    ],
+                    "recipients": [
+                        {
+                            "address": "sp1qqtnvg7hxjck9ag24naytgd7pjwsmevwh95ydwht58w3uh7uw0ta7kqmk4a3pm24z0yepw6aw27pku56md0hq5ace0l3p3jstkqaajwrsjqc5dde5",
+                            "scan_pub_key": "02e6c47ae6962c5ea1559f48b437c193a1bcb1d72d08d75d743ba3cbfb8e7afbeb",
+                            "spend_pub_key": "0376af621daaa27932176bae57836e535b6bee0a77197fe218ca0bb03bd9387090",
+                            "count": 2324
+                        }
+                    ]
+                },
+                "expected": {
+                    "outputs": [
+                        []
+                    ],
+                    "shared_secrets": [
+                        null
+                    ],
+                    "input_private_key_sum": "0000000000000000000000000000000000000000000000000000000000001337",
+                    "input_pub_keys": [
+                        "02bca87f72e604e8850064552bedf380ca4584227057efe12a6cc238470658aaa3"
+                    ]
+                }
+            }
+        ],
+        "receiving": [
+            {
+                "given": {
+                    "vin": [
+                        {
+                            "txid": "3cde0e7ad8adf24a4e52fd18efafffb94f73f4c7facf2627a5b588ad1c9db87f",
+                            "vout": 0,
+                            "scriptSig": "",
+                            "txinwitness": "01407ce01bc5ef2e4aae353e7f291fec32623d6a491b5421be6dccc70345f32ebae5baa6654c60c074e72da76fd06b343474370e56d3ec0413156ec6261757125ad4",
+                            "prevout": {
+                                "scriptPubKey": {
+                                    "hex": "5120bca87f72e604e8850064552bedf380ca4584227057efe12a6cc238470658aaa3"
+                                }
+                            },
+                            "private_key": "0000000000000000000000000000000000000000000000000000000000001337"
+                        }
+                    ],
+                    "outputs": [
+                        "5cfb6fd7a7e5d2af0fee276f2104ce2e5c86cde7955b98f2f1fb32811b448f2f",
+                        "da290e0d79ead5cd2e5d150aac80dcab54dbd0e68f241a6c34dc30906eabd13d",
+                        "d4a2b1458f0c8b20d756bde8e545560d7e7a65f6b4158f01ed34a913ba3a4603",
+                        "24752e555b0edcca123f769113692224bf1e6db137cddeb7d69ae52e51144e9e",
+                        "c911f722ef9a3594d6b85c585d4f3ed8dc437f850591dc627a0154723644114b",
+                        "ef91ddaa83a0b748d638dc9be8c9771b049a04815f03967b7ee993bde6c260ab",
+                        "ee4ed334fb38af95f52c6bbadcf2f491e646b9cc8ed31da67635f36c3cfdaba0",
+                        "a17d61b4772e453b32782744902261e051510cbafc04f086f53480d1ceee1a9c",
+                        "44d89f5e903739072e3aff8a3eb2f351520f77ff288ac8be277be3f28834bdd2",
+                        "3eff02a4a04d66d63f6bc93a693f23db703f351c0a1ff1656b907ed348a9a35f",
+                        "628c23a6e21e6a47b80274fc80e4decb98ff79b8040c7f9ea5972e4920b62b6d",
+                        "e72190c0a5ea167c2663b18d378520b9228da61ebbc99c3fa2af39e01fb9501e",
+                        "24183edbc5b80588e0e5b803e924e77fc1cab1afca54cfd285dad9bfc2a34f6d",
+                        "c45bad25a223f0f617e8167f858037907e4454210a745f3b9798c8913646dfc6",
+                        "9f9cec85011d7f718f96ee1a2940df21920a857cd1a545255579cb615f285a42",
+                        "8c60891f9bc2f772efc51d44f7cc885161412835b6fd5aac3b0cf57c3c2f9154",
+                        "85ac46a6ac9569ed67d1bc5342ed3b591af5e01581d1b09bcb2c71deb9b2c2c9",
+                        "8a6bfe47e616c6854fc797a4af53ef51c942b99eae18f316594fc8eb8869ca05",
+                        "ed5e1aa6a8b4e805273367b8ec3ade16ed6494270fc2169ba920b89770efe8eb",
+                        "2448503c55a1a7035c069e1d5461b81774c43bf6061421fdd0157009bfe96a8a",
+                        "d0dcb3d7b551eac8d31fceccb83df415c554860d5541dd08ff5fa0028ce5704f",
+                        "f11a298b54b650613e0b0183552c9c9e42c3812e03cf713d351ef71106b6ee3f",
+                        "49749206f23791f858c453cb60160d48710075bdbfd33907b0046d10f0b0295e",
+                        "3fbfdb52cbf0ea9e6655a211748bf2ac2dc92ff3cfeeef0f0a26be9987016de0",
+                        "d4a29144511981919cadbe8227fc68379e85d3fe399f177c2ae36c304b6ad6b0",
+                        "c586cc196ff56f42396f426a0200afee3a6c41058d81f19caf6536ec0efd5605",
+                        "c666994f027ceab025256af28d8ea6aec452fb8b0e1f69e7e13a4f3c5119f4ae",
+                        "5c9216cc4529c3f9c62caf70b04f8354ce9ec2cabaef745092bea1b160328fda",
+                        "d9aea54323503d78c026a8cd465c19a6df54b32ee866714d190e8260054361da",
+                        "ba71f87ca1d74eee115d8e8a26293fe2c88d9d66cff185a7a079282f02f931ad",
+                        "b8b930666b2df74c33dc8963221080c115246070e3fcd51f39bee71312db4fc4",
+                        "b7f42d2f18a3ac61f570b64ae6864f7dbff774a370ba27358d76797e841d5304",
+                        "d636d179055241a0f8bb7db193912da513a8999684d9829b266985a8083819a9",
+                        "be9622aec125f9605bcee193a99ca27c16bc591122ff8b44c511a85e6f63ec9d",
+                        "af5beb25776f84fadd6079c3ffd85775a35ad74096a58229e1d5076d836ca25d",
+                        "75fb55ec31e304456f663c9a66321e67f9d9bd8f43749494acc5189ed57b0d4a",
+                        "8dfebff33c514486d06eeb4ab8eb8471496556858c4382f73780620101a77f71",
+                        "93bfd4e75706951de4a59c7f70c5d2ce4c617b4bde0b0b23ae046df096116726",
+                        "b6eeca22f43bd62a4fcb3eee719e07d39ea703fa0707970fc197916f2efebbb5",
+                        "0437c3971f73342e5c41178590e1cb1364cb855b2d20b7b6c1c1ed0e7da5b57b",
+                        "d284c831cd9d52793977925ce3111b68f36d1ea456e46716158fe6947fb6d635",
+                        "d95b8d2789fd06cc764d47cc7e0697404220ae8f938ef47dcc9a1bba299fbb9f",
+                        "33599fb1fe313b5a2680b126bfee93cb097d938915d425a63e307e5834479b95",
+                        "05ba86903fac2f02ef2e152072bc6067008ee8ee34ce55ad460801303373eaab",
+                        "0b757802e56728b6d5b28e671a90de573d7251a47fc1bcd9319b617cac8e1463",
+                        "b4a2451e725e4cbcdf47fc736139cfe29c847e2f75cbb7653d80c8522bd48a6c",
+                        "8dd800c3a7cb1ee60f52db3bb69413c4c4247b0b134576552c675970f9903c9b",
+                        "4de21129c6fdf5568040346bbdda272caaadd58218ec6f1f152518068dac4d4d",
+                        "22f6927eae0c3717395df6483d756028839fbf0814f8cf0391159efa65dd2854",
+                        "192d26fe0bc772c705c2657dd5c5033ac41ba408793e6c721f74c53747be16e8",
+                        "9527b8e19570a16ce2d8dd3620dfd915e461bccc82340fe682f7f811b978814d",
+                        "f84039ff95cd44f842d7cf6982a726957a89d90bb151a368e62770720d3efbee",
+                        "b5b36dd84b352cddf715246d0463984b9d7894f50b566a20042c4d485df41946",
+                        "592e1bd733a1095b9e5b770021769090df0c001260803fce9a9b761ba697a5e7",
+                        "dd2fdbd6932d8b56d6ff91db3ed28f282a6ca01588ee5a552d061da215580411",
+                        "82f95ef71d4d0b32e3f0cef89e6e90a8c271cd5536b38c507fc69b354ab51062",
+                        "1800903b2d5f8483a12f0b98a5b35ed39d6cf8f4a52f495395f1816d6e3c139c",
+                        "121a2c2ea70a6986af8bde71b7f75ac9f9e1189eeb9756395e7281702f01936d",
+                        "8578df7e8ec4b068f64dca679310894afec095dbbedbefef5944c3a319809b8b",
+                        "5cebde1dbb352ff62841d7c50c3c45cd0fd1b7b3ebe884a7cf29cef6686695ab",
+                        "362f7a73f2620ea061586b5edbee01f9c026ae6e0d95131c570c44933fc41f10",
+                        "3a19b5976236d44a3d1d6920b348fcef9ec830aac56aa672353c711471ebc36a",
+                        "842c43c5293b03811165f1ff7e04c189ccd355fe08d37808a843a0995541c075",
+                        "0ab1fdbf7117c88aed3f882d5f7dee8964c9246030086b9ee3e2ebed4eb2c731",
+                        "7cf8ca4463d4bd500cc12623ac9d3984cc48e7fbb98bebb4a498c2fd66d54cde",
+                        "631676f3369eb479686256cef33c4fb061c212cc215ab442d8f7837c039ddacc",
+                        "2fff6de5386b65efe6062cc2242b692a1e811a083612ab79fa7f7517f1488767",
+                        "3c7d8b7f2a56e22ade186a70a3039b4d4e4e3c0be6e661770b0a7b2ef18b178b",
+                        "e030882188281a754c00706f621084f96869bf95bb5d005ccc7b2649fbfc747e",
+                        "072cb899c3eb621240792a39bf727bf59398329748317d5ca1addfd8ee2f7e92",
+                        "37cfa6b7214e99bbec6323802115b9615b10851ac85cdc26f213b9532fdefcb8",
+                        "68b14b71ad6b5e2d41ef47fe1b9229a0b8297ede0812d1b9cb95aac185d1a5b8",
+                        "652ef549580cf412bb217fb15b2a0a1db8feb3c79969b95364a80dd97d565f09",
+                        "dd3504b7563a65115a050505bc88ee23a50e37c354773cac329355c16c43d839",
+                        "6d7f05d6ee71459d2ea982f7a5cd4a251d7466d4892e6c8b6aaf45eec66472d7",
+                        "14c28adbf9008d0cbcc978006b6c1ec7be51a134bd5587e94ee33844b62c1ffb",
+                        "f9c20067f16feaaf3f8daa8456dd9334725ebdc8b49b4f74f5a02c38ef5f2804",
+                        "e2c537948a01054b7a0d630952c2ddd395a3a265d618e22ee9d99d4597f82322",
+                        "70e3a71945fee29350b5b10a8ee8dcbd19c2f734e22407bb6b50ec3acb1035a5",
+                        "effbced848df72cd467b1ada7353b1ddc0b7f3f08190c0f2fc747f18303ed9f8",
+                        "02d6eedc5abc295bcfbd4c30a8fa3406c8256d8e51f4714800b4aecb795a976b",
+                        "92134c6158993a0390af92565e166418561c9b157989d02304b68c2ee1babe14",
+                        "6065e3e3aff3e2b2f33bf4af9256e9368b8a303335b0587c8cc9e31cb9db42bd",
+                        "732fd2ba9efabc6d79bd7404c1c6f1d5c1f14c9bfe02ee1320621824847935c2",
+                        "209f9c958b5f4813b32205a44d05c83aa1009cb7b9c7343f0ca3717ae069defc",
+                        "1d274fcb65b6d4c846e95030c37851a97d161f926ed88f6c4dec4ed7007fc23b",
+                        "1d3787106cf47e1e9d08761a6c6f427ef6c07d4a571f23d340ae2d31d34b1d8e",
+                        "5697a3f56a0a2a6bd6991ba05559df9b526d5c42e19604c398548a7cb0dec0b5",
+                        "8c0f581f38238215f10f8017e3d234cbda9d94ca017bbd6b076ac8666014b3d3",
+                        "78f061b0fc912fbbeb0d207b92528ad78ded55ec145c8f18133991847fb9cbe9",
+                        "1e3555081a869f3aafa3d74d6b5afa942baace60869ecd4cd33635f84602b715",
+                        "4f0e36ac0c4813db3fdf79d85ef0db89150dc1be2c879ba06299c049288ab8be",
+                        "6b048c38924b7a1f970cdff081124b739202b703db5c17bafa4ad23a5bcb97e9",
+                        "a5f5e9238aec20bd706262f64671ca2d05961f55ca383953d489edf857e4b2a4",
+                        "a047b08e2af7ae5bfb9e54f98051ff7cd5e7dc88a25afacdd9a324526cd33c63",
+                        "66ae2b9513a0e0ad125001bcd5f3a36e18b4ec009db4020ea4afc4951cb39a34",
+                        "621d8269c8f93b6336f8b7480516d2191cfb15a1d9501463771d0fb70c1afa33",
+                        "76b94079066bff52a077ba1d1ba8cdec4d6484d1ce2f7454b2b04aa3d9cf52ed",
+                        "33c6a108f9d4fe054c085991d89d2a5c32b8f108c95b0e688c5763424c283e54",
+                        "52575ed2ad84295a070a99e7785ff0e4dd32a93d3830be7f7c2811804f3df2f3",
+                        "158dfe014c271c148b38459ef16b49cc3b5c6bdfe052795a6f6a6aacbb3e47b4",
+                        "d471729cb231deeb2f1a67f91962ecfcb9e8c66f66b6b79fe1117d34ae86a7c0",
+                        "e086b1a09ab5307d953e25366b1acf7c41047a926aa6a4d122c5a34e3e0d93d4",
+                        "d541d825401a1734d9961fdb4f0e9ce7af220c6929648e0aa2e885cd28696343",
+                        "a555af7a52ac07e681c247f1d6597f8240d28e76036bbf3b2be1f7cfab90dfd6",
+                        "8598fe7a4a6c6fa865c0ca8e8e65c96301c80965e19e48f5d4ca29ac073551c7",
+                        "70c9ac61ab3508a7419ead73503d8fe51b4ecba73a55d4b167cd4db6c9b0cb8a",
+                        "e594eb83b38ad916176abff3f0ec16d7a814a461012c8f9bc8286274af3f1856",
+                        "fa4e0df6df82f21050394fc2caaa8a8713b131d0d1f7d21eb92b56796095bf17",
+                        "891711c535579b555105e5ec18ea0f2f610c6fe5126ff0f6a4257e99a24033c5",
+                        "f192c9b2c49dab7515d405052f825abead30ef9a870ba3bdad98c1d6256be461",
+                        "70c22f6ceb81744c83eb8dae69980f4583c75431457dbb14f5ecd6c9fae3e63d",
+                        "7d563f44bdfcb2a10ee053f4c05b8d46fa90d44822775f97ee8cfbdeda7a4ca1",
+                        "c09b3df69eaa232a9119e2fb805cdccacb658b2fb9c7f3a2106c8399aa928033",
+                        "15b4b3d50fef72de80fef6e3351dae0f203902e4c4db8ce8d8737b67aed9104d",
+                        "c9b7718633714b3ce1b489f13e53fc647be53cba7703f07a35a8815245b23ff3",
+                        "2d344af9852fc2451ca5d2ed7155e074efd2c53ca9cbed7f48c74658967aeca6",
+                        "c8b778b5c1fc378365d8b342915215117c3d365e12f61f3ccefbe4091879e373",
+                        "1deb076e44c029027c1aa10000305c3eded5d401a036c21a4dd3d3455c0c33a1",
+                        "d2d2dfe410cefbae2309e746690818e8d52dcd80ebd192cddaa00204b6833d05",
+                        "d18a0a0bcc678908ff00b236296f0a955a9aa52a802ee4175849d0bcb3d6738a",
+                        "7af51e08357e455e4dda86d60da75899b5ffce4bebc7f96037d1e404b1260ebe",
+                        "65b930580f9738e1a7af2ac56faad5bdc6a417e75cb872b7f62513f4e8e36b33",
+                        "71c8e88c7c478a4d919d0c80d351331102584d032d82aa25510801e18bb5d6b9",
+                        "2166bad16a6e4a1f77a22b0fb13f7f11d618a123c3c077dbf1ed1504ed68cbb4",
+                        "717a3a5903c2b12aea8be15599ea9864259a964c0139125e649fefbec763890e",
+                        "0d042f5767f6cb2f94526b5b6da8ef986e4a5927eb5f734bdeb6c6ec3bb8211a",
+                        "bb67d586774ae9f3653c609dbdd98f216315b54c0ce24ad9e359d0c2c21614a3",
+                        "945b2962ec44c54ea25e3e35e32a2362c130fc3a9495b16871e8a2eadbe457e7",
+                        "7d5324e5e158c82388cba0d497530c6de0c1ba97131688931c03dbfc60ca7541",
+                        "21805a8f8d43aede3e927b80ef04924d388e96f3cc3947a0dbc1bd1b812539f0",
+                        "27ec492fde5fc3d3784359d9a270b735c1820bc4a6f15ac87797d97de047a6b5",
+                        "4fda2f855ab08a8d4dcba1874402e1662315c872e3ad55681fc4d6c5a89665a3",
+                        "b0dc69204deaa17ac4e0f197f8b23211418b5d54f5bac55414445a66c57fd6f2",
+                        "209262521ab45331639a57523f2e3bbf8250052b84fba81c50c990166a6f58b6",
+                        "b02857949ebddecc58aaba80b9d635ae95cf71f4bfc5ea8fbe05fc55d4c73e96",
+                        "5194133163b28182a261ce0473b1f3ab991a53a08d0e813d3bfb533cfaf1255b",
+                        "c56fe98848fe79124ae1ee09d1b214ee87da51c1440134210c67fe15bf6d1bb0",
+                        "851d949ac91f439ec84f07c481598728ca93acf79cb6505bd77ef776559275f1",
+                        "eeccaf0cd29cb002e2140cffa9fe2c08c53ffd73b99167f4b5e6ab5c94481066",
+                        "821f1058ae54732723937c5ae535cdc0a9ce673eec7fc02bd03c240c93aff24c",
+                        "de836fd21ce91d4a6add661f5d259d0ade4e0ff927d03f67ab5d0b24bff37242",
+                        "fdac0470c61d81d1498e4e0c6fc4ca5ccd02f727413e33c84478ebe844feba13",
+                        "469b4f5af2b2377dc09e5824af17c57f1dd8fbe02294059e16641c1307eff125",
+                        "b77348b40d52d531378dead61cf2eb6fafb4c89f85285a98cd4b6032c0e30a16",
+                        "2cf9616aefee83eddb2df0dda1a3331185f0b772c3a8a62ea3ffbb325290f32b",
+                        "2d23a9035ec627187108b9d13b24134d69ad7cb6f77d2c3ab939db17cc6f129c",
+                        "4925a7008584e04fa769661dd9eb766fe2ea3b66622691249142ca155423f368",
+                        "69090019b3c1635da9d9e4661f55863cb3ab561bcedf2632360745e62b06afc5",
+                        "5cecb744c3e65889c22e14a58e42bb69d068c721f1c547c8c704fbc688c6c6e2",
+                        "2f7371ba97f17c64c4c487742f83755ab61aeb1ee537bcd5f16beb4440d0233a",
+                        "9d1e3dcad79b153296a67238771b91a92c430432a9cc9f7b2ad7667fd67b4de3",
+                        "e9a34ca0067dbb6dbba48e736e1d32337cca5e93f2b76229fafef501979d84ae",
+                        "4d5d36724a2baa0d73657a140493a9ba95e1de95cad74c9753eaad785ac18cbd",
+                        "d135fe3d44b6b0875c1662ecfe33556be0f1b39bc8279dc8730d5e9e351f36ae",
+                        "1fb8439b54ead68f72b7ba4fcaa5041f38d313d92826b57dbda299dab06ab716",
+                        "b96e8d59a7c1006f15b0ac10cd35c08a8008e0c2ecba26d87db3f08c0f6fc991",
+                        "73300dd04c53d270420023957c50410147ea4a2814085d3b98ef25d8d44afeed",
+                        "6941323a74081c1ee28846c4ffe3b4023b29eb3a3b64d0d2dea0f47349fc2138",
+                        "f7cebcfc608a982a3e11b3941abf482d8108a7d59c3719279563788173a2cc6c",
+                        "b76c687ff464c50b58e4231379c5105470264de2826574e8d7fc58d6889d0753",
+                        "f0148c800120bd34159684196bdfb34f08d1af93c74232dd9f59e2ca0a66aed4",
+                        "51e0334c027b5e43e7cd557e301bceb0189903a189dadec2a11c1e2d675e3e9c",
+                        "32a3f110862c9340106f2dbba85c8af5d7ed575635d55cf2af7637a59c83103d",
+                        "b35bc38a430ebd8c7584d0c90bdaaa15aa252b3977fcac456646e839746f9c0a",
+                        "87ea74b899c0b929e83bf31a8d146faea3d26140ea99a3d0d3e0be93a4d6eeb4",
+                        "e222ed1dfcf6505fad77b9cf2e3e38d0ea86fe89a969b88e729ebdf2e6c63f0e",
+                        "d5e92da54ae3432603ea96cd770f4da442f7dcbd0a4f2d82774a33675690297e",
+                        "01e372d5dee08beefd03317d0897d5ef1c5126bbfe00c8967ec9aa05523c5e25",
+                        "369df1d577f66ea1c93b58b770783a74606907713b14ad86b316319d94f84ac7",
+                        "ef7e648860a8b3490440f2a8d541a268b4613f4a94c0dbf685df5973b55f0e88",
+                        "f19f4b29d4d7b70abc4624c01a4ef7ab772bd4feae8cb33bb502f30a11dab29f",
+                        "8ccbea64791275ea047a3648b092ed281acfa21f62a4b50ed111b954e534a697",
+                        "d60a6b4846f218a8369db8deb45972760a1df33c7532d0ef1ae679ba0294216e",
+                        "7aa4638be336fb77bc1ac5dfcd3f5ae002aeed8c42bb46475f718e3c278f0097",
+                        "06a82a57d7951a5629a1153240f6b1f09c150f0b9b777d7c64a0a628e24a0bdc",
+                        "d23d2ce73e24b434f2fe5a6eef2b88eaed4e57848cf357055da6914bb234851d",
+                        "0dfbe791dfc86570004538c64195a7702e33ed121490fee5819537676a021932",
+                        "8e2a510bc84d4600f25812994dfd5b4566c281a153e459cc9460c006ababd093",
+                        "cf73a8cdabecf4323a194f3249cb5b1674037f779c747690eb0d9c9f703f7c8c",
+                        "a8999928014db24e80a27cfb572eacf902b50cdac259b5be80229fe73260ce08",
+                        "f2a13b90ffda09f999ca5d7f9a2cd171ac33ee2a9a889c70a2e2d454dee0ddeb",
+                        "a5fa0377e644e743a38f0b427adefab90d218ba8e9e2894fc1f1f71cd815a92d",
+                        "1a27dc6f452362eca3745218915d24726b72f5d6963a9c41a34b9b7a12aeedda",
+                        "74657a8b361a7d235d94878cf2ac2cf3e18dbd76fa1a88440e3be7ac7a8dc54a",
+                        "15059499248e579d66827fb6700d3c31ab3c1e824fd0b0de583668631f31abe1",
+                        "21dab269f60f67bbce69447b7fec674662bbfe2bf1fb998e164d44e92086a89a",
+                        "a266bfdd44a5969f46985337359fe5ebb6083b8a21cf310ebdf4a62aa16dcb89",
+                        "612ebf41822f25ab638867c1232596a83de60c5bc1a62aea81464cd87c50a53e",
+                        "7c7e8506946118e3af1f5c36f94fc5cddb945e6346a009d21934ea0a384778ac",
+                        "82cc3dcfa10188e9cee8d84a60ab86cef7b564208734ebe8d1c6f4fd583e5466",
+                        "7ec2dce8c901de5c5b5da218d4ca6c304c4a8691568631b1d9d625deab025e8a",
+                        "baf8884aec756bba04cafe11f82e84d5721bc66689a59418e24dba0471e5ed9c",
+                        "2033109b98dec88046390619d056fba7ab1e207591b049b5ca4e5ca7905a0736",
+                        "04337d0bc9948530c0f6bd541442a14cb8da9342cbaae84ffd21f49a3a4ff9b5",
+                        "95a390c9ff01592aefaab09d6409dd618263bd596d5134e024d2e04fc080f9d2",
+                        "c314b11e8ab0957c8c11770b6dd3bf9ba8a281c312f0c25d0dbdb0dab2bf6176",
+                        "9372c5731f8e38ca30845e277b499e77dd3f5fa442f5496c4bdde0512de1e922",
+                        "84ff2e4e6c23f0953aec51c9d8642b1d71c653731d7585fdf021e045ebaa0c11",
+                        "c4472b40a9ec2b01de30d79bafcff2cd4853edb77724a5ae02f4387597deaf53",
+                        "de59785aaed498deb953dc239d06847baed05797fe3dd2420a5c6f35a4ddaa1b",
+                        "9622558b5b744223868445c32fd92ff2ba0d9c56f5b34bbf9de7f3e26206a277",
+                        "80887a104ef050b442514ff8292132f050bfda9b640a840c3258f01893e75f42",
+                        "cbfb1b0ad1df2f84e6ddfa190362225f9306eb62a9f5541cc5deb5da781fa213",
+                        "b01734822f1598f9edceacfe3d828203c629313c7ea0f51111f6b10474e070f9",
+                        "a12cab7ec7e781e90a49f837e6efab253d896dab615aba3f6327b264df5b91be",
+                        "ff54a2a3cae5ac505347c5577e010f713411b5401bff7491cebc18b34592683c",
+                        "99529fea4b50b9b8bd91aee8f8a25cf88dd3612ede12610acb24e73a1fda35ae",
+                        "679c55a753495d26c5ff8ee7e9dd2f6329fe76bc3bba1324f27ff5f3ecb7f8c5",
+                        "c805e4ae5d2358af561cce2ab0ae13a83b68a80886fd11ce5e8200b0194a0085",
+                        "5fbec47c66e62ecc3c483c440f0e39711f414dcc8c0ad72b17325bedb8bce577",
+                        "c8e43b97b4aae188ac288e16f856f16e839e67ee149d8bc8f8bb6aa05a186704",
+                        "ff4748fce9a654b3876905aef033f19030938880da461ae9e05bfe84698658ff",
+                        "c6e39da9593ab92827ce0e81d29fd85003d110bb2e85d530769eaeb0b3fcb122",
+                        "0a1cd405a53aeeb8c03e69eda64aca2dc6df3d599c41551e0e71067c2c3299d2",
+                        "41a3b0883541b8e28e321b9cf326c99f07fe0bf8354e080539511dc27d382728",
+                        "47f3ee76ee3a53b8b6c84de48dbfe40d4487c0f1e024be7ad735b4cb01b240e3",
+                        "4605541e0a8b64ebfb694d092456455e366312df0fdb6edb975d5df6738d5f64",
+                        "f140f701e73403c39925a8ec3bf6fc033df1de9c5d013a0b866b71808f77c3b2",
+                        "0a9f71c5ea3656600032d72147b1fb795f1ec515eb0c0e9b142a51b63ccdd236",
+                        "773a797fa4bb49ec882c2c972b71e509bcc094b89083340df1ebdd64a68f6045",
+                        "bd004ac4dc73dd5304e33abe88de5b3889f233d1b27327b14814f2941f47131e",
+                        "5c2b636057904e70179efc5366acf56b238780b1bd50d5733f3cfd06e4a894f8",
+                        "30cd462a2b16211e365728808b2dea5591fdae5f8e7f816300440e255839d9aa",
+                        "388cd1a37c37a2e7fc75da6363e894618c7e011f6db275cf64011312f3d377ed",
+                        "f88beb132412107250f73babe32b820fe6b277b2cf21035bb4c36e7b60a9585a",
+                        "c38eb4323358d7ae5f9aa8d459dee525427a9a490650246a2e8104d1346599dd",
+                        "212947c08a738977407b769756f1f4d192eca956b07413bb3f702402aeff1307",
+                        "c6bb090f1ea6e4350d6e71cba3c096adca356ce16d997f48dd081eaeeac50267",
+                        "2da0a61f2510fe2fbafb40b27ba5aa8d0fac8254d7d69e475fdff6f3777b4d6a",
+                        "785fc19dee1f3e84307dc836550f5ace30b672460267751e6fcd5e33ac46c296",
+                        "370020c80d7e1f3f53566b5f51931a1297fa1a4efdc81ccf7c5ab72e2577ae40",
+                        "259bc6129f4c136073173a83e0d5d5954203beb997ce140d8f69d7b950e0187c",
+                        "11cb148948a9c92a2c962f6f2da0bc9a024ce63c12e62aab3f0693847c23ad0e",
+                        "a09df031dc5d362e71b730b91a0e84677353406309aa06fce96f83eb77671b4c",
+                        "046bd72f9bedc26c0ffa2bb7bb9679b7b1afc7c9cc72a0de2da2fd9e9f08837e",
+                        "9ee8b7df8898711a797fd8816a32c181e641ae77f9d04f69fbccdcf5916cb668",
+                        "98813c8870bd227cb607e97a296195e673829e66f6c18434e852f36719fe823e",
+                        "5ff5c13d156c6c20c0018848eb761cc24a1739b1a2964e279e1841d587ce3441",
+                        "11caa777f57c824055e6cfec2281deeccea4cc6a9a0cd971ec1b9ea7de49cbca",
+                        "3a8e126522f84bb01239c8d1c51bada77fb0e3e76d51ca82245cbed04dcb7739",
+                        "860a27fef1b6b537a6be688753599f84f29a2600f462bddb5180f0575cf10bf7",
+                        "0bfb8295a95da4b08f084135ce5b221f4e5ea4cb7e63d96410e1b0161f0eb5ec",
+                        "684b917015396fe12a0b84845c805f3e07534070e1a0410bd6319f40704fe392",
+                        "5809b9f126cc43329050dec45c6ec7215c588ae85a0647a23816a73e2eee7e8b",
+                        "21ce0014bae97d4599230abcf322b031d49fee0f48e578f173b317478f0098a2",
+                        "79192c7dec85ace4a9cbb6daa82e76105d10e988ffabf1050a0b27e1eddc706b",
+                        "9a4545f77055b0320345d7f147adae0552191e0b77ba53fcd82749b5ef45e334",
+                        "e154afdc575fcfec7acc74e634eb767a87354b7e4c9277d6218174919f21fd7e",
+                        "12c94ad4e5fccd6a8a24229298b1aee2efa0f231fb209aaa4581a5ae970e4636",
+                        "cd089347c67b34ab0d80db569233b6f42792d9fbb08eddb769c5d2c06c03b78f",
+                        "c95de3ac861cb2435096b17b6a6e96880331ccfe730b15fb14771ce6414fbf36",
+                        "b355cc801fd8712315d0247517eb2ff1ffcf90ce66e786f66c0b70b05c3aac13",
+                        "ead6b1e3c8ce5380567394714a8d3e71b739a128872a4310fd52ccc0cd015bca",
+                        "b2aa10099a3d806f3b5fefc4cf5aade2c91e518a93a03eff4b4bfed37aa98bc1",
+                        "ba727d2be80bdb3b47b860b7588a46ac93984db5de47ee999ad946aedc411a3b",
+                        "5de5016468e7f8b981bd5f1b04b270eb7c5ba3665481b9f2215607137c5d6ecb",
+                        "44a38331d4f01c48fd89cb306be7d40910f61e85c01efa64be56007e168eb704",
+                        "876407f1f2289e2212c3f09fbdddd40e4d99331e618fe1fe76e54c0007146cca",
+                        "3c12bc0d8d061735b0b03371c4869f9ebb423eb84ba6a80bdddf863601287190",
+                        "35426258f74c650aac3cacfe5294871a989306eec1f93c85f34648d3e1e64b57",
+                        "24b0f6118578f557278af2deaea6bcff73b7c1fc2c034f0529b804b5a3667f7c",
+                        "a853095e6abb3da36dab40eba98107044c9bd706a59569c27df4956af6a2867a",
+                        "7bc75c278a522c3f2fe32b83c4e5ac1f002b970424ea9534ecb70519e2ffe1f5",
+                        "968a9fabed55c4ffe4df25e7aa61da56e67bb39f407d6c138d8949f0ebd2d654",
+                        "c01b876bfce242254ed98ebe8999d5bce9d6aa8a0afcd643f192c9c58ba05697",
+                        "0f25ddf33af868397a40586b9b29c759b5f48c5d5ecffd65c8025eae40cd455c",
+                        "9b2aa176b8978b1a6ed7c1a7ea238fa59414085797fcc91a2f0bcd4ba2a56b17",
+                        "454807437182e5bd112654fa4dd079fa0ec3d701f61075d1671c6300e77cc3a2",
+                        "dfb43a5c2c31241a80a316403612fc16007a8bb04652eb3316bbcf1a0f8783ef",
+                        "f0c2b72b9e3f3e0dda04e2c94ad826890cb8fa891b519b63a1646fb00690772b",
+                        "8fc8c2fb737c13eee55751ce1dc798fa291d428858e1cd862eabd89507dd0f65",
+                        "a84481a8966b29dcade6a3e58692ad8868a0b729eeeffa1e25cfc95f7b3912db",
+                        "91c8e0ebbee601828719aa29d7664b5d94e3501f3778999c60a975ea74bb00f8",
+                        "86862070933c5b4cbe7d1b29e15c728766079109dada7f51ab02b03796ffea61",
+                        "2aca32ca5da86a14878e221dd132cf11e9f858a1694eb66c29cd245ed49a81c4",
+                        "621a41b83f8e9299fa89f2f5245ccbe34ddf352e1270c6ef094161708f86edcf",
+                        "23984583b0ab9321f11a5c054ca891c1b5940ca0ee0174a701ed91d8f7c52d33",
+                        "69dc06a85efe0e51884bb0e8215d50ea2d2cd59ff9708079e90434bb2412b217",
+                        "96bd0d2f1ff8360f4846e79d20a31b6eab3705f52fd737741bda0568e629acd0",
+                        "7df4dd373b3fac18a0ec775c111b47f96484f3270a6d5d9b1455d4337c031b62",
+                        "65b585500d0e4f021bf4f625c7f48bfb02d32e9e532ec9cbc0c264247f9c9446",
+                        "28e2b11230c728131c2312f86434b934b1e34e985c1601fa17740b7820775fc1",
+                        "f1eec6722e3a8a3626a3b9cb45ce9c80fd08bb7e71c38d7b637aa986c6206273",
+                        "cd5c00f5aa138760efd51fabfba83c0964c47eaa2e54f95b952b437ed66a5a80",
+                        "16557e57e3b29f120e52c5d9c08f07f93340bc79910a29953df8a4fcda6b745e",
+                        "683fca73c707ae662b516a2c0e2793e6a764b990af2f2ce8c3151ea75e9379af",
+                        "b77d4a94dbc5ce109210288aa0cd3edc83f671ae9a9172495e705ea902ba90e7",
+                        "5506fe1e6126cabdbfdeb4cb59bf30bf21edc868046b263d692345649b3fd6c2",
+                        "e94b83fb44f81d60f82a9844edb2559563ffc876bc584f4fc4e11049237ac60e",
+                        "395cc58f6dc01018cd334bf6ac29b8f5ec3385ec325470b408bc2e8d9af11755",
+                        "3463442e45c1c1df952e9760f91b99ea8a0fb604b203c27f03a955fea0381ceb",
+                        "41f4c041586f3e7468fa44de1ea745e3d41b9942dc19cf35b5565978449a78dd",
+                        "31b31a285469f516015a5045dd8434642b2f55f19373b9e0d5530e843deeccf7",
+                        "943b282f0be57bc8c9b5ad4f47aadfc0a439af58522a4495b7cb36e0ad43a6ca",
+                        "f1d7d6d9dc97dd43e3b76bc13c6973e31572fa1792335ce0387ca171236838b5",
+                        "01cc0fadd0cbb9e8aaa0dd49291e39f3f325030943c8041178738bfb662a716a",
+                        "d96ec821e29cbeeb8b9f25f7123c8d5d708159daf8acd12e7a800c72521a4efa",
+                        "b5395de909f1cade846176880210f4a560ccd3180f8b70d2d4bf15325f196ddb",
+                        "e447d8ecd54443d4674c84cc84763a18b9161c76399eadaa82dd74cf31535064",
+                        "8f47c23e998213388a6abc7d3b5754336bd0eacf4eb545b0825abade1ae48feb",
+                        "b2b553a0af737c3912207071469517222d3d3704c7c45bed01f3cae1b50c54d4",
+                        "ebd2711b2330377b5d7fd2f39a720b896a7eef7d7f0ac2a1d0739002a1511a00",
+                        "d62a3142e4c4a2c87e8014012b804805dfa6f7d5da1a270f7c3401479a3b2f51",
+                        "0142c36fee839b588918bdadaf8c737f91d61b920dfc581e05335f6f2cbc3310",
+                        "e729c42028460ee33d01a15c2e369048bb79f8ddfd70a22dccd43b1c58d41933",
+                        "6fd227ca8a63cd5aae1cb590c6d3baccc3518306e22db68095de25f0ccb4b49f",
+                        "80ece14b164adb418170ba9feaa4d352cfc6cb1e31e47b3239163d2cdb54eaf8",
+                        "04205ac29beea2aad32008fe47c9acc02e3ebc9f66c16db685c8f0976f3562aa",
+                        "071d3e6a4659c37fec52601fe99ccb4d2a2480f3a4a7bcd16f12ff21fe84a666",
+                        "57f2fce9dc52bccdec3de4763a02e3700d13953003190d560a8ab306b81c1221",
+                        "076c6ea3b84d7f2535d034e5371378e9345dee62947ffe4de3185d02a2152340",
+                        "0e386ca6f2161a1c64a4072ce7a507e1131edbd90446723d84a41dcddaed4324",
+                        "48042f945a825bc8cea4e8fef1da5c85b252054137adb5e123dbefbcc189db93",
+                        "410d27dddbea610ff9c4e6354b187fe8a2f7c5b19c5563e2a1bca1a4b4b8c6f1",
+                        "453ce5c10b3de7a4fd1b0bd5f96512d05fba41117299d588a4740585fc295590",
+                        "677e34874e3dde27ba4a987778de7b1a64b6c63051f3cfc774ebd4c3fc605b7a",
+                        "c9bfc40e1be4befc1b44e38b471167667f6b12457d5c82662ef3a0a0e9f66e2e",
+                        "4cd169e13f4aca41b158924d9f1b972aa4d167d6d9c116e7094a7a06d96e6387",
+                        "aad5a84ac08dcbcd06b4fd5a0c5d2c1af8eb0d6568f17b3d8cc47d064b72a3de",
+                        "4d495f70907d93c7c1142990927f1a3d59e3218a34db881714250ea6e9aea84b",
+                        "8c43d66f0d23b88c17d19aa01c64ab1d2af7c43704952326129b0dab4453cfcc",
+                        "c12581dc707a3a6da47886aca1c2aabb5babcc0e0fb21808c27c6d5a939841db",
+                        "2c63aef84a0c812b53e37656cc6d5e8f64f8e4f8552e4e502dbb1aa0319e13c1",
+                        "86886a41f2639a791085b6a2be4f2ac4f76d951880eff5cafc722785ab4d64f7",
+                        "73bb646c6363f96e1ecc19f5ddf7df417327b9089c1b70a867f799af03cb3d66",
+                        "ebe518fccbdf53bfed56fd1f8f3b114b5849a8fb6e14ad7bf3f2a2baf29775c2",
+                        "db82684a4b314c554fa6139c4c7ede0245f68b32a885c819efee12ab0c027414",
+                        "5a985ff0be58aa5a46a0f4122cb70c7ebb937f7802a33a32d8262e63b3771796",
+                        "938ffa6e22fccdc71d6ca1544cece54518b9fb75cac5736a0468420cb9f504b3",
+                        "4726ef072888e9d5ad65342790b285c7ff024d60b084c32377eae6faf67db536",
+                        "57292f406904048855148e3dc04cdb08ce05a58f174867de688b252e448096f0",
+                        "ef8e25e005dda6d6cac7947006e1f688c743efacb7633c34ebbed7f87707a3d7",
+                        "b90e5ada245515dc90c2fec028ce8359708a610927c3f9cb92bd93eff2fb59de",
+                        "32ded7b174c9528307b8042692bd00480d31db9683c9476a4f50085aa6810893",
+                        "532a40b49048d2695ab6ce15572377ea0befb57bf6311e5bc89a3b579561837f",
+                        "587782fd3913fdd01f9f475f25e0704ab834d89fac46a0be1d88e54de6b50701",
+                        "b91389a5cf8a1c10e890ee4c740fe9994d48e999b59a2c6320397a389ec7a316",
+                        "6e737036b6c0c9d72a72c8545cc835d4cf7da70c5ea33f6c6003fb844565354f",
+                        "2f239f75caba3909f2b6f059a782c2624a71b591a7e132ef72b4add3c9c2d738",
+                        "95d4dd64bcc89d80efe84c9fb5d4a17ac7115d1b38a0ac0262e7687905eb1c4f",
+                        "4487d612260e1a6c676d2967cedd84cc5adee2ac845ab2900aa193a1b86fade2",
+                        "97edff35d1872b6a95f43606f084de35aef0292cd411541243bf7336a905a938",
+                        "9001c5d627af968d68f12200662585921aab14619935c8be4775c457e2a40867",
+                        "ba959223c1636c7b0d10b43b78c1821e7af6f6aee1f80337c555a470867c5ad8",
+                        "9f8b4937db8172a5e01b31310cb3b74824910f9c52c356c17035d70173794089",
+                        "1750c07b09dfc52f0cb0f09f4560095db135127cab4c511c525f560c42025abd",
+                        "a51ee98093bf11eb0455cf106b3a4e027135e870e3e5fb212c42d62e190f153f",
+                        "35501a82a47804cf7718d6bd2e4bb6fd67d7639984eade0c1232bc2c74588343",
+                        "9c3192c2435a9cf815b717ecbc6c539cac03c7f582dbda889b39485895f3e174",
+                        "ddf04cdfd5366d08b5886ef736dbf547a403f583cdd7c089f9f3c4239e554210",
+                        "2675b30bcda3da6a2cb6837e614ada858c1bddbd42e6c3963eb220c290fbf967",
+                        "dbd9134ad3f09406a76eba91323ab3ad2a4fc0bff4975b2cc480bd4403ac7560",
+                        "2929520c43b14ce24a94bf56870520ddfe4d29bbcba0d0e1c4624292d8719832",
+                        "f71513cd36ec057435881587013b2fea181cb57df1cd9798e9b4bc2b0457e778",
+                        "b83971a9cbba7903239a1d2a5907351c61028b952d4dd207dd49f6fcc9abc13c",
+                        "c3b7e679bd4d0dab1a2e7938b0d5cd8c28200c5da9534bda97ea0f1ea81c4aaf",
+                        "77ccaeb09a35c5a1df5bece681062f6ce9fea08bbc2c2075ae235946e8e1d9d4",
+                        "51001f07d1462cd9312b077be915dfd5225b85c3ba760e2a414275aba5fee655",
+                        "ab0f6f8f5e58803093fff168c38de2710c2aff8b47661eaa3ae2a337c0e71ecf",
+                        "96e9ce518bea74432b7aa4c857b2e2423a4b3f48275fc4b48f87caec87800b87",
+                        "60c0b7a0ccbe7792b9332ad6072636d9790ff736e2d83a12f50e7dfec65a2680",
+                        "38175abae6191a78d957e3c63121036688cb6b8c46d42d026551ad37a6aeccb1",
+                        "48d82a8ce43a65f567584bfe7fb28cf8c84bc725c73413b8768d2e6688ae77f9",
+                        "18621d94f2733bf9289e0353f066c53d95ef8dde449b2e160e28232caf17df74",
+                        "e86c65449e6b871ac6886526107b8d7bfaca468ef270172576bd9f39fd208aad",
+                        "c32bde208f9087259fab6b053db25b1b136b38276942e2420482855a5d7ad17a",
+                        "dfb55a5293f934d40ff7c0a6749aad57806e571df185f592044e69e680e995a2",
+                        "8c2a1c5eea4c8dad313bbc6beae0c4d94828fcb2a4877b19761e75c74fc10164",
+                        "eed8a70bc0d94fdd32629373b50eb9ef830282b42dcb1d8b96fdb9b8a1797df9",
+                        "2c4735a60cfae0273c4f309be579a51c6ebbed0200715a826048b1ee568d4934",
+                        "f7e56418539529401d0780879ad1266aee0f0354da07486ceab82011a069deef",
+                        "aca86fb3d7d9fb64e920ee5ddccfa78227a0a3a3e40bb3b275f114186e488c78",
+                        "bd4b2c02f07305164010353383415b08f570fbf3fb297df74a38d6f6e3ae99ab",
+                        "589908e264b0c91b1358f1a51f020daf473b7e4d5faf493b3625782866b476ff",
+                        "70360b520b95938174c5b0c2400da3b047743e60d837bf567767732d748e991a",
+                        "a54ed87456ed361b714da5c56fae7c4cfd92f8ac4a6e8e901a565241a39569dc",
+                        "9df7afdf237605066f98cf95611f49f5c5f383a080c86dc3753390c5627efca1",
+                        "6281424793e144590ddb68a85972c45272a5ca39227f9d24d0bfe78e2bb82580",
+                        "13657e27b82c768942fab407deeb645ecfd958f506a6e02c95d119620cac86ec",
+                        "cc67906e35cda000740c83f50b24b92bd04c58f2a0c45580e9a134c284580804",
+                        "44e92cefa2c869560d185d18baafa780bf16f148d1a7ea186f05597b18783606",
+                        "8ae261dd18679d8e203e7b4c8dd241a51634a84f83855b559f7ba55728d9c9de",
+                        "0269bb4c3079709fb80f3aa451a895b639e3b7db83360a14f078f26816979dae",
+                        "2faf079e75b3e9e0298fb15ef8c6d53715cba427c8c551e98d44a3c46a67414e",
+                        "745a15e40bf06483cf58188b9c7df99e796754dc4bf3eb0547b11fd8016c5c66",
+                        "70dbd06038f269ead55d560b7f960d24c7cb3a9c8864fe68c0daebf315cfcc9e",
+                        "1dda0994af0142dc5f71646735ed3bbdb4f6eb40955836db16fc7524eff22ed7",
+                        "492af127ff75fa55f94ed919386917778ed9c51e4cd193b75d82524c186a1b5d",
+                        "5031aec77ba13f73b21e5cf92708f44c0edfd1081c89b4630a0ee3a50b91794b",
+                        "859b7197bd1a5d6b8dbca9d6c96321e706708cba23866d44bf3f014deba6a4bf",
+                        "3108f998d14696b3e945569ca9b47346b26f8a3700cdd444f545fd0a03968891",
+                        "b7cde7af47f0df23419ccba57da19a5ff7645fa160e136d43c827f41b460decc",
+                        "18cb7236904f9784d611eb67b53daa31efac1a8a9a7d2ff47dc34255ba276a57",
+                        "1670703aaef6d8c722bdacacc31a80dcbac0326dcee64becba1339bcf630e330",
+                        "6ae67bdc91167c7efd005be6881b58d24abde9f8c3a71e6aecdb8e6738f3d169",
+                        "3efdadf9ad79dd00eeee1d80e40a8297254f249a9dde4b4d94b656d58338fc5f",
+                        "d14ad9887a66067658afeb25a64866bf90debccb49cb8213184b807e9f1284aa",
+                        "7f2bb055f5dd834bedc5ba9d63b3c83322e4325de7866b2af7ff8692bb2b52ec",
+                        "729e0ab27d04bf1c14dc28c42ea56cd7fc1a8207ef207ac34e676577fc32006e",
+                        "3aea585e172df036a10a0a3c26ebf4705972eb3efb5b61602231b8a2b2942b19",
+                        "a3b01753e934a16eea44aed4a756b7582aa1b469ac462ccfe4c92268705591b4",
+                        "d5af668caeda6f6af27a778359ce9196ba091cc04d9f9b3928f8f5203fc3fc88",
+                        "a6319eb545257cd4c849e2cca4c6faabea9490eafa3723434800331f222b86fb",
+                        "a4f001d05640267e07caac4cad7122771451f3f997caee435965cbd19e64a621",
+                        "f852577eacf926a5db6921da93b4a78f00f57e06fc064ac02633976e35d9e00a",
+                        "c48da9db46193fcda552476b8c08fe35a73ff1bc1950a41f3b1ec098d2f75a47",
+                        "7b26f8d832edc5d6c025be9189216766b58ab27f59e7b253d0ece4d28f51e2d8",
+                        "cc5b9121f74988f1bafbe4ebdb7296d2255a4af6f01f6967c7391568c32377ce",
+                        "29fe88933391cedc886475d8aa7b68415a7f3e80e153d8837cacbaec3f47d8c1",
+                        "392cf2ab942625fad754d738f33732d3172f4213a8606368330f72373ec99c64",
+                        "b9ca5c8d1d64334e586ba1f0303d3fe802a03eca9c2aa12d2f57e79836d0b64a",
+                        "c47d0f78a14f36ea4a9d1fdca74596a88f93dd9a0e746d97c91a79762420390e",
+                        "74a1f274dda992663e03a2a10f29c84d41e2e202bf56e658c1a42ebed46db202",
+                        "dfa9dcc132701d8b1f4332e2a6bc7faae3c7cf11ac0909a83c4c7e30fcbe7dcb",
+                        "35d4395190d570f8288d255533eca2fd7bb13e720d6e8f5a7113094f97538c5f",
+                        "70a16244e7480d092b617242786deee67056d07cb15365fe51d0e8ab1e8932a1",
+                        "a26843f48f4f2a218b8f5b219147641ca236a1abd96905d8534350e570b164e2",
+                        "5d9eed350175b4d1217b25e671c2f3c9868c8732b6dfa80e62e4a9bc7010dcf6",
+                        "72db3913aa066e04662cc170f3363578fa47799b64561d3b9e84598b43ee8c26",
+                        "e406db4deb9cc79c8eb7d658c382c2291668d7917d73c652c415f37a3f713b0f",
+                        "a0faece933213756d22239d1a066c1730fe58b3e815df52c2de1fca102b03caf",
+                        "9d6bc10478d9345260c53c40de93ccd7b1f344dc25e6e4cc8199e1ed9c6dc824",
+                        "ff1a79b9d954943147a0b29d67ce6fcae1f9f8d5476c2b8eaf78ac575f95247c",
+                        "ba31c30e4a28d5ad22a364042b7155e5f4ee008929f22eceb3fb7371d0c1c2a0",
+                        "797bb553ef79e09eb1aa5400a889bcaa513583662c3708614e29b202cfc3b80d",
+                        "3df07ae6890b2c332556c247ee91abf341c5dce226e38df09f7010b1c21615f6",
+                        "30de2051725d9f0fc371cfa55aaded73b12e0668b1624775b657ae0f41ed8daf",
+                        "035e448afdafd5069a783abcd6e268a82f43a52d9ea805c1141d329557d2029f",
+                        "1cd59a8ac8c61f8f97cfcd1e43d633f41f0b3b3782e3deb3d0a9d80942b52077",
+                        "b1bd938d8288167f4a985abf342f977cfd1c2f1da70c6037c9bdc4295a705726",
+                        "418297a2f0c0e5c3d6b2c4d80824e1a909a61fce6c18bc937720eecb1ce3682f",
+                        "06031df90b06aa84d58da9de78808f7b2cd7d563f41dbed683e74bcd7884720d",
+                        "28961517d508b8e963f98272dcbe636af5f99e6fbf436d14b9b64273b17857a0",
+                        "bac113e3e3572e90dad38b0c2b32deb78f9027e59b75db03d0fb86c49c2d6d9d",
+                        "26a5e2f817b0596d95c8a82cbbfeec6971da2247ce1cfa52bc5098ebdfd3c084",
+                        "ba7bae49a577e15e14568cec5f779c4700c8ecbd21bc8cfbd3aa56eb0948dd27",
+                        "90bdd504836627c40d4c14d54da1b3dc5cf5b6b1cacfe2e220d1aa44850f6fba",
+                        "02f1553ab9b4f4486fbee6f5735ffe0d9b305feae9a120df2ea311fde4cc6076",
+                        "2a9ec46cca5184106d4df225de39422136c6cc995fb9d124bdd640ea45667a13",
+                        "28a25bb686696fcfcdeed1a996ff4f8956dd4c41587d599eb78a83ab6b1358c8",
+                        "422bb78c5107f8f0a5e1a253347a72894704cc4d8d1f60a49a49f8c5dbaaf298",
+                        "74f3c43fcc95c26354129e18241a1e747c78975c4bfbb0b90a2b67c117dd85b5",
+                        "8c0f5a2aeb81ef4e5805c1070bfb8667ae185b59705c3cab2aac50363327daed",
+                        "87deb9c6b62b237a5f83b7333776baeebb4eaf804ef78b9ca2c62ab92388a697",
+                        "42897cf080c2e405a77fd501360a7a86d0a1cb7d573f5fb07e094bb13a942f03",
+                        "0d3b80df67851ee640b906d761fd95ad7e47d0186cdcddc59a10a22e011816ed",
+                        "dd222577e63a176e688a09834ba7dfbc7d25af9cecda7b130e48a25fec558e2c",
+                        "f6f7bd7315404bee4a9611e69fe5d3387de5e4577ac28267d04d69946f42f18c",
+                        "03cce690c88d34689a3fa66b6f8c9da75747ed568e63fb20715def88e7228b38",
+                        "d9a4eced4646f53c7840f817b4296b5bf16e7b3d5e906953b6302d7b8a848dd9",
+                        "319741447aa9b6c819cab13368125a52f3c35d264249d5b4068d2f379010f4d6",
+                        "0a0f3eab30a538a23ac52e4f251d383d418bccc96d5975446e093cb424e8c247",
+                        "550942f02799dc998561d8695fdafc4554c5a89f12333403cfd7c4c9cb15bbec",
+                        "1b0d7536d6774149b4ed8db577268f176e4c1f76e88c9f956d51577d7349cfa6",
+                        "5d27bef5a988fb678c4e178b4b1063c4151c5d3780c1dff1ec2ca898f8f8cb5a",
+                        "6bb4b71ce2a72c465e83586c39a2c1d2f77a47ecfca14b45af365a4ec29448ca",
+                        "938e0c409a837260a9fc27ad5878f3b8936ca0e6219ecd3f9bd4bef6c402acd2",
+                        "d8aea1404c3d5fca7289e2512982bda873437b43e7b8b2a912f383340f821c8f",
+                        "1f4cd386950035ca3cec81cba5d6a506620863056da90c7dc9a5afe47d0d9dd1",
+                        "dac066c881d458341c7db30fde7d9197e498ee577bb4f0e0e48fb859f3790143",
+                        "09381cdc27896ab6c73c341673a61927099eaf2d300d3e00ea37ea6cecb262b8",
+                        "65f65598a48e7b2e38efa51d454ef1f26be016c6a70181e26bf35921998671ea",
+                        "98d991cab4e708f9281d1f56b1a507026a114ab0733ec2dd572bbeaa22fa4887",
+                        "1c2a4e2bf0dc9a09e511baff42c297b321cb8da45c18ec50e4c39ca2465d7cd5",
+                        "327c7a6d05d522536e61aa1fbe8fa19f781f915e20a66a647ea90abed8879fb4",
+                        "cb46cc08d32b5bc7ae9480f30884c7670b8e8694d66d5438e5f8fe81785dcd1c",
+                        "537fa4c41690903a48b7a632249144f154c5dc4686f51868df0159a0350a4ea5",
+                        "75a5e4322582d7e240de8e8b0ab9ad73b7e283428537338b41b35107dd63ea2c",
+                        "1f87054001c06863b66f55b3a897ac0d76f361908900b30e1d8ffa46742bfd16",
+                        "22197f4735d51aa39ef48c88c4d60818245fca73b98df8b9669dc434c6ac8796",
+                        "a2e14dc37362b89a5b85c57b3b48169adb2e6dd5360b8030de7a0e028a6db3b2",
+                        "676f7706eb7a57397f6c9f69de04cb037d3a1045281b8ad8390244b9afc7a2d1",
+                        "8defc187fb1f0d7bfea657619f9a020f303f0cede255b473d18817b500b94b75",
+                        "be1166434669922a764541789705f9d86af0587241cf3da9e33a7983d048177b",
+                        "c5adb9840c2cba41c6e49f9e97c3b78d8d0a1c4af88929e89af205f75f61cebe",
+                        "a83b4a5b3282ab0a2dfa4b1620dd0e3ecefd89cd43fcee45a1a6e4760453e9a8",
+                        "ae2117b3fadabe7e3d94153da7e68c6d7b371efc20373aa8e1d9326ed9a3b369",
+                        "a0b5970a81570a1b2b4d058b32ba5f207273765be398986490ed5e9109d07863",
+                        "9ea221fe02ecd3c974957ec24796afb677672fd1ca770a13ec9c3a94135ef06c",
+                        "a8316aa74116d533973b74f528dac5bc257a3e9cfdeae39db7d8d32f38085f4e",
+                        "efc5250bdfe42346a1d032ef4c7189cfeaf303af28a12b3be074daeea810b171",
+                        "9aa7194fdc5f39e9ea59a13d04158913df4c87ed385b32a37f216c17abfc69c1",
+                        "a17f4cce7a3aa86d9bd5d51f3c38f235fcc4b086a746030af939997d05e54fe5",
+                        "98b049494b468b0c6cdb3cf382283110668d919005678e4e8a5550a892ce133b",
+                        "1ff264905c3f040c3fcaa107b7df3c38ec0dc7d59ddf9ff8780d6aff0381da57",
+                        "ef6077b9e143f01f8b500e2eb6b6ff02043ec00befeb78ee44db5f00d037bbf9",
+                        "ca1af382997fd751c70fa1fea1cdee6ee1d2a22246463ed7867d56e57619aaa5",
+                        "be8045324dcbd46d31a1b24be314d5f0ed7bd1d1ca67bf71ba5cc43043d5c9e3",
+                        "70455e4b87d4b01585564a77a6a414a53338c05a984de6dcd14d7126306e22af",
+                        "5bb2bfe0be18cf76e3f70ab3c6ef2816dd988074d43389a3c4479703d1a61041",
+                        "3c95b917d6409a12360186d7c8839b33d6fb9a7f66f2e0e3a887601927d14043",
+                        "0259cb83d1129316ee620361341d083c43690ae542e5fec01f887acaf2fb04b9",
+                        "9aa9b67c720b3b2fe3eff8732fdc359ab15ed4fe1092e289fc27b7e55a9c5b50",
+                        "1151155d7be1017544c0c2b7432ea1f67cf3191baee64771e9364f3bd1da3708",
+                        "9c45b3560ce8419825ae84affed5223683fcccfd6e35247d1c03f4b988e8f48d",
+                        "a3242aa0a01b82c6d5faf748c22a616b950ecd30ef0f72685aa5860f9320761c",
+                        "0f07485d78018a506a69021080b41861f801ddad09666090e53fff3bff0cfa92",
+                        "e819c861150099438a5ef2613bbc8e4c854cb8410521e9699fe90500a9127443",
+                        "4e78cd42978462aaedb993b6a49a5ba1315519db360522a26add6a17c8adac8e",
+                        "b21ef6dd5976ca60b6e335e78e479a655409da184e68c10e0b4010ff9d208c64",
+                        "e8bd4c3f3e0a8345ae5b2b5748060b15ef0c7529fc3eff080bec1a9a77584592",
+                        "3c8d2c54c7d5d826498d730a289d36f903720b7e2ce1f699ccfa152999b5a0fe",
+                        "fb6e025eec367e2bf4b44af67ea674d767b77397d0568528e7fe3aa7574ae730",
+                        "9236e92010421a2c1674eb0a8044ac2b215b605c0b94b903f3a2872d0fabd344",
+                        "9ea25f2f9472292aba590e298fc5ff15c4cb22608b2f0f2ce1bf26e148920007",
+                        "d4d18a3b2db8540a7bf72e0cb14b176919f995e70f0df607489d5adeedb0a932",
+                        "e6f6e272b36731484782bcd4844087cf45678a05d8b84819f9d41f5376f0f8ca",
+                        "5088a2b878336dd33c3a7c55c09aa70bfb1d34815f031d4b3e92402c7633b400",
+                        "3d12743c540c798ec2587301a3fb2b4f0f6e1278e4bb15280c247272ffed0651",
+                        "52c17f712792472ca80df50f7b9f96f51a6eb155c872ba9ef460aa6d4e10fe39",
+                        "b97f17e90b9fc70044f8789379639e52f97707eac2863a35e9a19376555f52dc",
+                        "19701f39368b26bd3c71a2f0630b5e89586f7249431843eb6c890045f7789280",
+                        "49ea123cea990f6fb2029e8cbc9ff7ba7e049c32db1f6519306ab980d74d0d38",
+                        "fd574068f0c0df88faf7b54341a310446c0ec94931bc459748e11c58435d6ea4",
+                        "fdd6cc2c790b22471f03a32b906635b4028debfd691a0a57f847e15061a2904c",
+                        "b7a173017905bf55dfe03c1640a4e808dd6a1d6bdaeb27722a7c839766b8465e",
+                        "74b799aae53dafe2131b183068d8cf5fa8f2a3006c9bb9944aa493c7491b94cc",
+                        "cef9c06a87ada326bb03e6a301f53fe5fe6d68df015b4d72f1965581545c7fd8",
+                        "db390feffd9cdd7f8a34acafa77d80889a820c9275095e84b439ff5f05781ceb",
+                        "57e17c1b71a226c7bf02687565e92689e5c966f5c864e64d9a621bb6757f4f2f",
+                        "b8c8dc2624b8aa73874647bb89be2765fda8223fa7055796a59c7f4d1918e8ff",
+                        "08a2553e3004a255c9a4135930bd9f8724423747135c0dfe45747285549e4ea2",
+                        "4d4966d172bd8c367d828eb8a14f853999df1394fda96fdcdf5e41d70725ba21",
+                        "23888052d915017c4b47b5307d25158fd13daa02bef1d4a2c11bfef79a851470",
+                        "52a97f2b532139784f4a6a6250b2e61a3989a2c94534c2434041aefa13af2871",
+                        "73c82b469fce6ce8b6b2828441bd31b66784b0994e57b82d331be9e03cdccca8",
+                        "cdbb2bec43b864ec0d7caf5def1222c3cbe20c79d97c7642350dab42b5d1af3e",
+                        "e047c075c048467400806f61489cc503dfcdffc73d4b9b6bfa470427f95127f2",
+                        "82de0f386c63555542e8a34ece6dd42f2a4671d437e00aca7da175e7d18bbc85",
+                        "fee469874ca3fb72f0871a24f410284c04311446f4c5f04480d7b3ceb4e78efa",
+                        "830d8aa08ae29fa0941efc576cb59975d035139cc27213d0a04a0153e45207d4",
+                        "f444da313f6e7bd9e27396f9a95129c83977e1462f86e7a9b5addb1a7ff30580",
+                        "fa601478a412743bdf29bcf44ecd5fdedc09792c8e469a7399bc17c64e134585",
+                        "cec5ef97aa6a39f3c146c5e3f955bc9028798591d4e38094f38f70e981566d58",
+                        "6bbf46cb35bc96854a8fae0e20935f2ed32ab5a940e7891fa7f268d28ce5d549",
+                        "955d9741503c2e5244f513e2c2430bf814201a2d7dc74e2e5c9c9aeed401ebc5",
+                        "9f2e6590991e25b4fbcacbee5bf7381092cfcd7d4f3e258bf4b41b84102fc179",
+                        "647c657c3c930537bc13047cf886869f5a0699fc52496ab30c997e5fea1b3dbd",
+                        "9802afd3ddb4d5067fd0db7ead8c66ffb3ad1c29391ce56321c4b8f34174eeb5",
+                        "60f782f178f30f3d9321017b2c6591f25a82f957ef1c704c6901fe2fc92ed76f",
+                        "109992589b06b8eeba15fc2f6104140fec043b2031c8df3e9025fb094978ddaf",
+                        "091adb2a123d0cbeae7dd399a39f4ca4a3b68086410e6c7aef0526bb2ad2fb82",
+                        "64143c36d10d8d0659f9431dcf30cec804f4487452d5376639157354bb7ee637",
+                        "9602ec038d85b2cc617dbdbbff0a3293ec62048f70b16a6b38702e26b99074a6",
+                        "1c6b6508f0f0c772137ed1a53cb559fb1aa4b3690f6e1f6fd3ddbe5b74da7676",
+                        "a4df5d4c393b255674bfd64aea4ae82da5175732d39591fa671a233004d2d0bf",
+                        "928a67d956422b29189df8c6e88e345ed2cfc8ac941d06f15a7c24cf30bc5296",
+                        "79abadbacc8e8bcf8930e8295dbf6626e3c2c71b8c4c6883318dd1c72e03ecba",
+                        "ddfc0d445cc013734947279fdf7c6f0d474a622da65db4ab1c0c9cea7f60d0fd",
+                        "61ce62f67c3526d4183f74ef0d457216c7ba9913c9a0243944c972cac6dbf42c",
+                        "9cbe363f9bc69639efc73b9bc02264e29f7d0f8ea3b1f35ba16640a5767c5db2",
+                        "d7a25bfdc1e8bfba013bbcdc8afe41d81511e15cece155e9be7bf1ce81af27c3",
+                        "93f9632756d3b0d8bc72c4718dffaac5ef81630d6bd79364b7bbcc9ffbc302d5",
+                        "2311829f9842404d9cc2243dd149bdb26d210031ea78dfb066e90381a392e641",
+                        "cd08a8a153ded8be5d705390e3bf53cb56d7b8c20e0e08c39adb3689a68b9602",
+                        "8d310a900176ade581ad42108605cc6bf867f21cc115e6abbf2a5e083c2bbae5",
+                        "43c5cb40e94874eb80ec26b7df732cea255453f511992fd61ddbf4de739f3b35",
+                        "a2a9abf1c835b824a9d311105a4c92b3d6ca8eb2761b45da7241f5879d05bcab",
+                        "ec48aab645d64498938781156b6daffadc0ec9f3556b7e995c8dbd63299c3121",
+                        "05f6c84dd8ff3468d8992d9dfcb4e31597f7a378828cc0108320c009ef16ceaf",
+                        "d4d39f9d3724cad98bf1466577b79c4dcdca104ecb489e877fa8f44adb1b2ba2",
+                        "b23a123b0bb6c11060658fd14786dd345ad2a2c699e4fdc7c8de79b1eba41fc1",
+                        "f27d04707f4b1110ffd978f8610b2f094ac0f24c1dc819b59b70e1f64cd86a99",
+                        "42895aa8dc4c0ca50b98c7157fbaafa53fc3d8a5221b660dc86837eed7e6d319",
+                        "ea9f13a6e1cbe9c308bf85b50ddc729abe112c46d74b50ef53d0bd7ece84121d",
+                        "e8d250858b5de70d138213342a6765948419b81b8e8ed65b3763b20ddf009fdf",
+                        "827b1279e3ea50b1b7aeda4a7969cdf18bed45fa018e552190e8341d2b8be2a1",
+                        "3584a32e4fa98cc72c35e0050fc00f46462b7286e9d6ad675c340a8d1e56fed2",
+                        "196435304b5e92922c3453ad9f31a8d1b2821634ee6a29c07543b05eafd7b061",
+                        "a86b7271d28b011a2749b302fcdbbf712f89d9f3efa24b9a169e97e67a57e594",
+                        "d40ed1342bca6c536e736f1fa15aa5f5a01274b4208ac4690a4f8c293dd40b0c",
+                        "513256a2ae5c50af825420724fadd88aa0a77d93f64e1425f768f33bc56bf862",
+                        "83381a3fb9ec95f2fccc410ae48e0581ee4f492881cd0c20c90cf19823ffca7e",
+                        "0d51b0210f527afde630887455f5d231425f8a8aab5d8567e5ccd49441f5effb",
+                        "c584a68f8f6a5d8841d9b51fa9cff1a3aee73b1b4f8c8f378843c79ba5ce5902",
+                        "b5396ef2974c2a1040b8e8ff023a82ed4ddbff2b69e5569249d139ec01dafaef",
+                        "e52c0b2f5da5c4c5f68f4c1b7e3dc81e9572bcb6299d3386d54bf881c43dcec4",
+                        "ba60878ab1ffd5e5b85d843ba049d669ec4d0094330147c3942a62f0394c32e5",
+                        "e412b797b242a5619823b6b33008f45bb0b11bac0ff365b4f8c73c9f3fe6e590",
+                        "50933f5388c97812aff9aa52db014d71556383c63c6b1b7ce294195c8efcb540",
+                        "643ee4638b7d9c626522f9178bce2a53a875453252c46ee3ed4d524ad2710a4e",
+                        "e72b8739dbff60185cfe3da8783fd9af56b7da9974610428a11adaf5c433b2c7",
+                        "48c3cb8b5c7a90728fbc104f8b191a98119f8a2777c00f8c1000244013745527",
+                        "34845f23b0bcf4e5e7fac5f82c059cd08d9bd7cabb11edbd62fdf1b40df95758",
+                        "33bcac68cb4ae201b3d3fd356c62feac888ea3f7e0f59ff0dfa2fef97f1eb558",
+                        "778d833969b28ccda7711e0f6e37345fa598ac1a9fd1c6a497dcfbb0d2a9d590",
+                        "5fca36d19c656d347e71c9ca43df0d701852d9811b758d63b3ae6522dd4c0b68",
+                        "74f0e0b61425240202486eb26a74e53bdf8460203352f1c1adf698be9c01dda5",
+                        "d2b4e304a065b74641f42966a43398a96e85c14cb209ff06d18e6fdd8a30e1bd",
+                        "df6401c07b51c72f6ea2654aa3069fb6bf0d8a3adbf00d926d534400d88733b0",
+                        "3850acc410d21b19110d9f229c63d67e36e2484915693f21569b627b0f3395bb",
+                        "6143ef6a8f8edfb6b40ad2314c0f9595fbed1f55fac3b8abbacd72f691da7780",
+                        "b14ae396d6da8ee43a3eaf5e9a06333ce6515cbf1819bb5283d73a68cd39d2c2",
+                        "2ccb1721e1ed7add382cf8838f7cd82106232c7b0bb7fbbc5f36291936fc8f52",
+                        "cbde7da6d0dbf518da6923c7d82749def1260eb6632f03a7e3eaa62cb3a4eecf",
+                        "9a9df0550f1629c3cc3c539ec83ca7e815ab8c9319ceb91f42b6b9dfc3384ede",
+                        "f48737960c6bfd1b4631cd39048b55cad33bd0fa925a8ae094456466e16b7791",
+                        "2514869fcc6ff50736da7f509dcc55cfe8372f82beb46529d757c0ad98fca10e",
+                        "b21124fa2ab9868f3e7375cebd5cf95a48d0d62ed6fb62ef0e0f08f7337bb212",
+                        "84835fd51e9bd4624f4b6feaf2387bf3652f0b03efd56cde086079f86bcf9cc2",
+                        "868492cf4941bc0fd0ca8c37a30008fabf58e56bb3b41f7bd91e09b43914618d",
+                        "00a8ba1a607be27447cfd6f60447a22ff6e603e347eaad21604bf56cfd3b1434",
+                        "e50a1c9ab7655b55cda75ff82bc1d28ea48cc7fd292e5f7c72e0f48acee712de",
+                        "249df64d683697b530c6013692fba966655c6d4e38ba40fd05a282f60570ee67",
+                        "1e66d4f9bf24724b6ebeeba7f2ccce22cc039cba53b7e7fa76723f1dbb934e34",
+                        "db6767231847109ee8ae86b459f0303e08e2fcf5b4165faf7edc33c66909735a",
+                        "406ee377180093d25cc204105aaa3030473ab112f209ae1dd608ebe115a3f95b",
+                        "0763bf2c13cdd4525a95f123d5a42ddcc9b3aad27c90dfac1f19fe2cc643f636",
+                        "3cb4c58f6597a2e937c8bcc870bbef98fe4a2ef16089c94a0afcd0ecbbca140b",
+                        "1a448036689115f5ad50e0587d114cd77901f23a07070b4d18ae816256d8811e",
+                        "4bc718cc25242feeced0c3f07c5459d30e5ecd91011237dd869a2b1d32c390b9",
+                        "127d4282b45be11fe780f20db6c1737192912449c0ba6b44ac499d9fcf546a48",
+                        "2882d864f8aadec1babadf7ea312ca3774fd0202a4702779415a7296501e5828",
+                        "2c1a8fb6d739f4ebfd01044c2ca11b484de6933d33c6d120c5bf36475ab7b457",
+                        "d4224f53e199e315ffba0bb317dcf7743d764642d93770e8f6eff12506df888a",
+                        "b8d8b26045f477d58aa21e5bd835883ae1a7bf47e416032080750e80ea7b008a",
+                        "fad3f5f3c9d29a2165efdd3e33f0aae9e58365b379f0ac61f41ff8912f7e9281",
+                        "c05aa5280e7bb5dc66265a8862932aeb268162c25ac2be8fca44949f94ec1ee7",
+                        "af2c85d7085cbd5ff2760f744d22e1e5be0bb8db8817deaa14c06ba9e4cdf516",
+                        "00305a938c19feb580e7945aaf55f217d5089185176561c5896d3643551c1aa9",
+                        "8ac01d950862d0598424e3488ede8e9a285dd068c1d401759ecfa3c97f9bdc85",
+                        "33f3b9159541a44f2198e6e7bff59160bb52f81c35c9f80433992edb5ed0a340",
+                        "31244c0e5b1f7c934f92aefaab2e06b0c2b88c98576777d3e5c514a6b8ba97ad",
+                        "72ed3556b3a25c229bb436b6bf809173540368bcc434c74548373c043f4f8602",
+                        "00947670a458adcae6c83f223cc0b2b05cc1debeed514ea4011044ce375c8eab",
+                        "123376bfe0702b06b98915e38ad3c8d3d8d270f2c81db595922c298d980a7991",
+                        "b9ea637bee6f3f3bee40fb76dd375b6419fcce5fbab8523785d04b1c4956570f",
+                        "601b25e3e686fcc9c3470bdbf4fd2af9d008ea1858cef028180e3f62df0fca7b",
+                        "6d5a1265a95ee04afd7df5c9aee4341f31de35b9e87f2fc9e02d2fd7e0d5fa2d",
+                        "77bef4f6fde9b94b5397e63d1690c6bcd553ca53b58c2bfcdf92726590246317",
+                        "27f110882479c6cf64c0bb38d121e389d5ff17db4b216597c75151b78b24b2be",
+                        "3d1d9cc9b494b22ab1df806d7b1e9745d132dd6d72ba4726f55af9210f3df4b7",
+                        "84d60c1d787bc5d15a952183acad447856c0501c2bd5809145f8d8582c97decf",
+                        "b79fa13459e7f875488cf30ccd2f0431cbe8dffc671880c10cd72d7e2be7e8cd",
+                        "061c36fb310210ab07b22f39178b7f451d5142a395ececa1ec783af9c52b730b",
+                        "fa16976c19becae31248c8477ff0e746c4e28ddcea5ee36408c05be86a142471",
+                        "82235891577986898debf0cc0bab31fa765e925d01a27c27ec694103320d82a3",
+                        "39989431d3ac81a61b0311181d499018fb4cddfb74b1afe4a9260b5841135989",
+                        "a846acdc0cf349a8d2b352d3dfa8784893f5038c05277d327341d3ef7de41bce",
+                        "f3cd88ff101e9dcaa9e05998db425b590dc45dadfcd8b8a6bc0ac7e932372055",
+                        "a159443648d0796956f92ec4efc5aa44af0cc2fb7ba97de7e6a8e0dd16638530",
+                        "9e381ca3bd9488a656e965de17a44487f8c0da8896ebf9c0af4c0146ce034951",
+                        "4cfafb85f2faa88a88034c4e04b7a37be20eff7e02d3e21bdb79d5aa7de833df",
+                        "eeae101eeff05cb6a0dee3bd70b7999858b898b8c0cc7fa96a5e9235d1377381",
+                        "786ad41ea86eda551d0bfd3e702622e118b21e619c604772befe546e55d4cedc",
+                        "2c2f151ad2b9d7bb8f52dc4b060d194bcc63848754d0d2983def1eb992f194dc",
+                        "530b5035473e95e2bf117e3ba2d88d6de1e648f8672baa0c9dcb83e80ef47580",
+                        "b34801289f8a80277b7d5fdb602ed3df305d9e915138761eb20cdd42b338509f",
+                        "eff8301ccf9032fb1398c62896f8502a564889242c9cce7cfddf1b9b87dc9189",
+                        "1babe594d5c84b3e67237b6abcf14b9a091368c587958eccedd4ab0367601a6f",
+                        "b2e8b56a474d41acb1a53646d825bec845cb12c7b96dff588d6d1051136dae11",
+                        "7b400ad7fa14af9182259b51e810e16029c947f2509fb129ebe111fdd977af3a",
+                        "842d63a701a80a9799357ac704f2288ab62af3a62d476fd740c0f8f5c35a46b6",
+                        "dd146653c3aabc3747df891c3a6685d24e9cfe4d61e52f5c7fc7df6f079d59ee",
+                        "2564c5ffb78c4c132cf8c6dc06591661f2d7ee12004af6ec078af8aca04b42aa",
+                        "8c01eb1dcc1e13892a782e9826288711f28ca7c716bb9756e49b41c8d9946694",
+                        "f68743f290c5002b746d912702c1084cee82bdd3c323200dc0710381d98a41c1",
+                        "292a6383fd16ec5afa4cffbf7a6fcc8c6553d4cbd2574886f623b00bf12b1e4b",
+                        "4980e074baa3623551a56263d46933f5fca5465615467ea914fcf6e389e5eb6b",
+                        "4cf461bc4b7f8e1104cb225bae1f3be5dc70ea47a3879257d6652b42ee302a6c",
+                        "79f626c481d62c454a9a8e5d008141befb190c0f4e78c0f9796cdfd8b490c2d0",
+                        "8b4ab8a45964bdb5ab237c0e014c840e224ab1ef50cf2afe79f8810613de8c9d",
+                        "6daef9ecc84a1d29833c0edbfd38663b0e5b76f6ae1d5a22cb081984be8a1ba1",
+                        "7cf7620117fda4ba2e7e1392a39c2c0467e3b90ef96ab021f90708e46df97e94",
+                        "44f6020ce6f1831ef60cb293f456a5ed770aa92b1837fb571ecbf00963e77249",
+                        "b53bc8f19e29660d7c2c9622fc080eb3839eee4b601df47eb3ac20aff8ef8343",
+                        "114f8884785cb1ea54087bf3d19418129fbac44f8c496677778714743e678c72",
+                        "640e38abc942b35d60027a7ca1671ef96da9dbda8d3aac61917189e0f1613a1f",
+                        "23bc1dfe86d5be148155bcb7aea39b8cb68a887a07c7159a8832d7fa8af8d449",
+                        "8ad3f2e44ac576c4a9c364fe497b840bae3a5673a29e69f0806208499332a001",
+                        "ba11731e009801147b11770a0822e2f1e6cab3923726ed79efb3ed5675289c05",
+                        "409e700d67c2541afa301f2c09a4a98de150ff30662f25dcce0bec82da44a1bb",
+                        "74aebd9823146c25c615aff0cac7a2a7b43a3678fd4acdba428bc874c2de2351",
+                        "1ab29e97945c3ead550846ae8af77e6f02d77d24fa8d6af4a866c45568055be2",
+                        "729944aa7565a697548f162e0ec9f39a634fec17615a4b1b65c7b68d06da8ec7",
+                        "dbff2d93d089c5fc366cb89c702f99022ccc53ceb39418e2a9921b1f9d895c95",
+                        "170f0177e2fd6e2ad5e96bf1c7d5fe8443f824ca80c51cb19fe985020bac4dc6",
+                        "44321c4c2e53ab3faa16443e0dd56d0bb18ad444224c09a686285528c04333fd",
+                        "2af9827f953129f8eec520d1409be4d9747fe2213e877ccb06a82e9bfae761bb",
+                        "65831a1f6d27ecf91d452140be9219d010695af0fcb2ef3f19764a4f6b3e07f9",
+                        "103f4a32f26764273b7ab1abed25b768e7994a6bcfe4c029d2eb5a30c4e506ed",
+                        "545d4fd5dcc11f7c29a6ba552562cf4d23890761c76ff86d6940dc707368a0ad",
+                        "4ff9f091da95e9e8892bbe017a8fe29a05955c5c62992a78e23d3bfa4b3c7d15",
+                        "8e82f5c6062204966bfff0f299b26b5921358e22e0880a5130004280c418827f",
+                        "1a6df2e84c39918881ec151d620cc74007c0d122020f6c501dcaff8822f46891",
+                        "01ff674c4dc5d40f0a53318e4a210f418dd2e504077f80e640360db4d2470be0",
+                        "fb4b597769166e58a3b28a698f18ad0bd4c1e24d6c0e3cf58cb800b131f4fea5",
+                        "dbef3658df7ce530752ca69e5248cbf2832c1c458f0b85918f2a4f3666d7b301",
+                        "9b651ab03463dbfb3e7dff410e758430fe535d409805506018bb3f9ba98d726f",
+                        "0795034bae75b616aa3d94df004f4b80717c593aae42e0eeea2bda508fd091c6",
+                        "52d8998c0c3ea0a42e6271a43660f24f17e6201dcbe28a4e1374dd20758327b9",
+                        "a04159ad9cdb943b39160af9eba203f3aeff9bbfd933843bf6cc32f40bbc1f54",
+                        "cf250507d4d9f066221a2c5ce190da42e2c8e9afce5a539f09305af5074b759f",
+                        "5fca2bf5cbda4284eb2a9aa26b55f54d43e28d0efb97e429482a11b66cbc7f8f",
+                        "a740d86574c321a0d3ffec5124431c9a2e52882f85520f296bdb230778e74201",
+                        "5543633ba06069b459f10a9174dff488575830c86bd32c1da6724847791ea055",
+                        "8cb684f24f0a95ad5f4376aa8f0d9bdda6e413bf04a3c8821a547fdf46dd1938",
+                        "b167590ad1040def2161bb854d08fc62b8e4ff4a2d60376c1692c87cb2008e7b",
+                        "a00f55c70f539a98a23b51888c892f2b5a9b86328ec99cd56a11f0e5d8d4d49c",
+                        "73dc98bc6b3862a513320e0e4cd61f5021b30170a2d054abbb62e87036f4ea08",
+                        "ac0f7cc6fbc94a64b50565a929ed6aebd4c6c36000dd40b4f826052b60e98103",
+                        "e24d3edf80ad414a6e5ffca904a259c6a28f1058c0488a524908d1ca8a2faa26",
+                        "38d020a513200b0a6d7bad5fe1e87e39efc7f80b940698ba23a78bbe2cde0fda",
+                        "ffb2bdb644990f4751b4795b94784b5e3c00a5d40afa2b110822eb7dd0cf2d63",
+                        "40a6543d5faecc7fd797d8aaf091d5e4ddf5f075e7f4798b36b6ff2669afbfca",
+                        "07ee87b5c221a21104881b0a6255c2354abfeca80be635803a387a3ef9032f3b",
+                        "d3fe1eefcaa0d03434e6759f8b48fc50f4223edec547c94bf072d49427e2f418",
+                        "0ce4d7ed2eb07f798588df1df044d9e124604f0178ca8941e189854daf64f26c",
+                        "4e5657ffdeb3b88cee74452cd24a8d78ea33013f600d0a6e97c56eef47c36819",
+                        "8e5a2d6f8b4d0878a438d7b33ed8bb7c32294968f71ebf45ab51ba45bc3836e3",
+                        "0f81dcd7f649bbfdd0db6fc69ae5f5a7d89b99388e7d20312705ba07d16a4ab8",
+                        "1cc3486005fa6151d957d0cb6e2599df2680055949b81d4dab85562622ded07d",
+                        "78c8021936527768d5cd7e1dcc30ce55ab13ceb6a1209996a829e3cff8e7239d",
+                        "ab1747694e6e07051b6739e3df2916e09d7cd8a135753c9136a8dbba0449e83a",
+                        "25d6f0d435679e7d84147da65006a48a5a0f893ed2e956518bbcd6b98f40d368",
+                        "3554c7682f565a20b336c40129b5f7182239f2b0b1169f39f8421f25b9ad52cd",
+                        "51b263e67a4421f6b858eb3cafe303af0b3339e0b0509eb068fe3092d394f530",
+                        "2bdcbc0df01dbdab2c91c4658bb9b160fe3efbb5dfecdd85ab525dc21033d90a",
+                        "aa0105f9628907cdeebaa743c45a458553942c3e089d64a02bdcaef293581337",
+                        "d4636ae50f908fb11cfa1f338314260f587f26c29c86cd682e5003fccb554efa",
+                        "31ae9547640c8ebad28019e8eb66cf608074d5c1a95aefa065db97da4c1e1044",
+                        "a228c94293d05874a00c3aa46ee128a41d10405c28e5bed3f7e7f548243fafd2",
+                        "a7d5f3e4630be48f88cfe45147b94b9010718e55d6eaae6462a41aac52e866c3",
+                        "56d4a383be9efe8694a572a143649be7bf89b1eb12842438162532827f7bf101",
+                        "79f7177cf2655951fe0fe7c98cd1cca252e7eafc0b81066aab0841f7cd7895f5",
+                        "abc1746768383ad59c647846b13dbdf51d50f9a5f2c50fac9f676531ed6d08a6",
+                        "a1ad8a55e14acf37cd4eb5085405b62a53948065dcd3bbf299477d03b1d8cc6f",
+                        "c731487e9086642d4e92ecbada3dc31b72049583d446d65bda3a09b4370cafdb",
+                        "729c914190c753c6ab1f648ed04889baba5adc43e05102587672a7a0051b279d",
+                        "3fcbf09cd64d4070062dd2eaf9ff595d3e1fefaea6996ab134e9f394e0814f56",
+                        "2efc8bdc74b41138f0075e2603ec227f7265d3eb6e7ca16a7e1696aa83cc3635",
+                        "cf05b470683e4090959a5e6222aabb1026d60907f9df98256ed0dc62103eff79",
+                        "cae8a98b1c421ba34af46610134a71153d525636c02cccad8e0362b7109d7410",
+                        "cbf00526ae885899747bad4c395b9f2c02e62bbf39fcee82565fecb1224bc311",
+                        "b6ddac871381353848dbb438f0b7ef14fca4eb39fbda7b4eb1747ea454b3155a",
+                        "375b66c16668308f1e768c09bc2dbb0def9dd04d2f90c42c49453f558220a338",
+                        "a2387da7be7ec4a0ce7ef03cb1bd701330e5e950be120854efac13d903367248",
+                        "21f4efbd857d838626a5b6eb935c1d8dc3a0a6c8defd23928c8018c4956663c1",
+                        "ac96b176999b37719fe3a67231b811a7a435ee7b5e807fd1430803a29cab70ff",
+                        "9c06f32a7f016a0e702b928f7de9a82297498400654109ec3a17a1c2531a36d0",
+                        "fa932de504e54776e5b8fe75a2aa7067cff79865b766882542608eb31de1f3af",
+                        "d994c1c85ab3611ad12fbbd4ee7e7afb30ff9ce3c67ca619d9786553b0383668",
+                        "2e5789ccd625cf20f42a72de7cdc246ab92a1cd85ee619570549a8effa476ff9",
+                        "ec4145c429fecc6b5109d5a4e1434c4418925fc65f53bda6cd06620dbd2d1b69",
+                        "0978239a7a14bb768e1ca71e1d40e37a102091ad01a75f5f92c5da900761c79d",
+                        "3382546aefe321d644bd3626c7b767bbf940df0cebfd3917c05f69c7973136cc",
+                        "227e8c8045928af96e794585a87d6869c3ced7dab3689c5565cec54e168641a9",
+                        "c0a3f1b8c27d0234fc64fd8d1ff9f6d3ca157b03033e505bd443f1b7bba62f7e",
+                        "2e848b33465df0fa0a2b75d23c4df4f02824f431e78e80c0221ff5aa61348a91",
+                        "14656b6da232af334beffd02ffb86992637993ce4aa530acf8bbc2081c5dd2eb",
+                        "1697567eea595c835310638672cc7ff2067a568198731128280bf4167b2e45ee",
+                        "749a784a544085ed3fe56e3ce9643d0e13aab8f3480f2fdfe7c16e15ef08d0b3",
+                        "0b2b27579b615e086959fb35f7741791615e25c611f8ab7851c83bdfeda7d7c9",
+                        "e444de3a6fc90b1d2626987fe98c956c1e0db2008cdbe6d863ad410e9fe0a8a3",
+                        "89a757ea85e9d24b3e584538cded1e5db3a90bb01066af609d3401d1bb5b205f",
+                        "b00b5a1ccbc1ec142c5ef063daa88aaac1d3e52af12256cd892803aa348c3f30",
+                        "0ea22dee4f62ac35e5b45a3beeff82c8c32231193bcc33ba7575916dacbdebde",
+                        "5c428762fa847e9a97fce0f306c7f0d8c4b4abdf9defcb0df0dafec41590ebb8",
+                        "8eacd0d7d08645ad8366807a5cc9f91a4b22fd52ab4d8c74efaeb9fba398f24d",
+                        "648ed141936c9497702be348e260b9a4aa9ff5dadc6b654381c9e54160a07f4b",
+                        "682cc4ae34101c80a98fe4a674ef0b16d11ce70b56b3a7fc5b191b360deeaecd",
+                        "2b82b8fa930e14bcc38f1b9bf6a99f3987b32c7e74363d20acf6bd05057cfb5e",
+                        "1d2c04136aa4ce34040a9756ba9f16af6a3fad26b7a9669a62c3563d66a4d4a5",
+                        "04ab01586e7e4615656127d95cd558e318457ed1641c2229b75ed676f21ae1d5",
+                        "a7a5c84706284a3c98121e35e89e3361c39ab8b5ce26c3e479cdb4c2f30aaea9",
+                        "d12b3299cd334b9899ce855a088577d8d757dc32125921f2ee561daa94814b7b",
+                        "48714a6b92c6e98e3406ee38539721a3ba60254ace52c741925222955a89a8bb",
+                        "27597f719f1a11522733a0db69462fd7d28f0a64d6cb508af5dbfee291b52f81",
+                        "44c2fc25551c204419d798aafacde9e75b4aed663d47c0cca8c5c3482b7660ac",
+                        "9cfc7a76eafe717ecd56501bc16aa644bac189cab58dbb90bbb0cf3a4e3053ef",
+                        "029223d300c7186ab0c823474f67590a86e7d08a9d1ed39588307def876ad59b",
+                        "533054cb85955768daaedd98ccd79495e4726b2e5e7d345a3cc70beb19538a57",
+                        "60e7f410dd3c32e1c88638ca4e758db9a2a8f7e52e2faee358fdbf5dd3fce27e",
+                        "3ed8f47b67c5cc36b0e6745a29251d0470795cb14f0ad9b30170c0e5c8efcbe6",
+                        "1f889c28d68e869bf711e214dbe739acc35780e8b19ef9576dede8e2e91bdb9d",
+                        "dbf00c8bd10f5ae12f38c625c8af8089cd28ff92f34a1d949dbdc20d7a80d797",
+                        "960ef9daa1b246bb656aed819cbe898dc14ca8e558070c9468f840487c05db92",
+                        "fe1b43ac2709550840c682ecc23d2699e9b3fcf55851999d9f09b02370aad502",
+                        "9f58ad99bdc049a7cc29f7bc482629302d56b32ba3b4a703223945c8a61f4254",
+                        "af61383d241fa4cee95f8065527537a237914d9b1494ac8fd3ed476a604882af",
+                        "503e10b0bd880beb400e91fce69c4fc9f36e3c816ae86b7b8d9729d00d08efc7",
+                        "beb9c475c020f4af8659aa27ef0d1dd143479029a8ef2f605adae61bd693c9ce",
+                        "73b93de4843e323d7db0726e0bc301ff0194b9656bb40bd3baae073b9a4df96b",
+                        "3f3a78847d9964cae0df94acbd73ba24eb042f44e5a473b1dc665a4db518dcbd",
+                        "240d37aeb82815e4a61db5729ca10d069d9554e3f209eecd881d12719a47dab6",
+                        "87f8197177364e5b345abc75771b0418890afaa0c109e2f6da58df071868c7de",
+                        "9d0f1a386ab8b2192f4531281d50df5d354a96afca98b9122198982e0120d384",
+                        "0bd411fccce089fbbd2eb04da0cecc3f030d036a44b78f37352816bd2bec9c1d",
+                        "a5587eb1bb907b021e206cf17beaaeeff2c34c22a9857c0ead14d68f62b1818c",
+                        "ed96c8097a4fa7debe2db8b1aff9baea5ebad839b60b7ac878fc93dd704f9633",
+                        "c244897280ea22de3494642c6a8219500b884ccc77802b953f71cf12de445e28",
+                        "e11b64f780d2e2314fe969a74a86129b8cdaf4d223376843b94f4e64e9be7eec",
+                        "1a7771432e6782bf9a5ef436874bb9aa44a5f46d1a5a7aa785dd1fb2311d9d58",
+                        "215be42fb8c3511dbcbccd1634895857d48d2f26de9f9f167ffa86f141819298",
+                        "5635725b8e48404be37a8c9db3274195cd7e36a651c65d09ee8419c571d1d233",
+                        "3bbe9d510574073e795b4f843f272a1900f31510f9ad36a522525845c90075ee",
+                        "1b19a47569f1803ecc66d1d5163c4c6e7ab9f7e99abe3e8bcf55f8cdbb00ef7a",
+                        "c155578db721fb204f9759119f8ff004d78ba068869c938d9ce0a57e650e085c",
+                        "017d7f31830417c7a0ef240d7837ef9cf047ed0a8414eb085da37fe2cddbdf64",
+                        "78ea7551cf28cb954259a28ec1340ee66d715f02c5eb7fec48145298581464f1",
+                        "b89ee6474841186f5afab538f9ca17b4171c303d5dcc89247b79ce38389bc0da",
+                        "f15ceaf2a19e8eb599bac5959aba3518688d4791321e618b5ff4af1700fc969f",
+                        "6c0be8eac8a473b665f89bc3a310c033c093f5b062527a227921b072aa3123be",
+                        "60950a25415add062c9bd5427cf5e0eb75d6fd7363af9d44656831d04cdcf7fe",
+                        "c8ee6f1b5cafc14571642946e8d8e56191c3a9a020e5322ec30a698258c24a17",
+                        "fd5a24fb185292c845fb8759d924a72f24c18758fe9ac5e0df99d1365e0657a4",
+                        "85db138de6940bcd58f37836e431c6d0dda1722d21f7fe2e519d08ec8d990d7b",
+                        "13a18fb4b02a808771e8a5eb2a64829bf27c7e6fb82b2adf8d44a920fa6a5900",
+                        "cf37460c8ad19a604cd4d1475e8258ddbf72e3163d07bad676a0db39248f298d",
+                        "16aaf7854629a4612442c7c7b67836990ce60a78b95bb0221646cb9d27454e2a",
+                        "f3ff2a33d32daff5a2606ad41d8b9fa469fed175ab2d12cba2432d2cec320bcd",
+                        "3f84dcab7582376089e959b42b47ed237ad52f5e633093bf7fcbff6164b74cbd",
+                        "1776d3f2ca165cc20e0736e7ba69ce320b1e19575245e0e78bf628bf8a3b4c90",
+                        "4b815273385785fe9e57dbe6bbab75423b6302f8daef245c12bc4b8572696893",
+                        "f9daf148d2ece99869e00ed44ffc1a740792569a36d6dc21a94388453c31a08b",
+                        "0a7f0cc9bc54b816a21785f84414bdb99f34a49a3e33e5fa1d105ba026540627",
+                        "05ec349ece9f47e92ec0bada62dc00a7896abe818b213914b95d3cc301afa0cf",
+                        "3f652f63459aba4684390a90687e117bfd79e09b42542733acb734adbb0a01cf",
+                        "d7be18e61d11c4e5757f2ad5fb6b8eb70ab1f621f7785d048baec87e3c81ddb7",
+                        "cb4ef5ac7ff2c34808e9398ff7e313cfb5b73e8b3cf9c0c3ab8059983159213c",
+                        "c1f66f86c3dc26b2212cd7536bd40bde14015a19108d997e24d0f5b1532c5201",
+                        "2e8766d4dd56646f8fca1cc12fe66785bd90f42d27074c71e3380732f5616558",
+                        "feb95b15d26976b6b31bd488430da464d87102d5b35cec8bb578cffc91bc7933",
+                        "bef956f6a785e9937e4e3bad0b1468c428534fc06658738d5e02c1a604c77003",
+                        "fb471f8b762add49e6d91eb46cc018a6990ca7bf1fb15d26aec90f6ba968f6cd",
+                        "d4f35e4a4e006546af1bf09f5e49b5dda60ae5dd526b85ba92d871f4f09df77b",
+                        "795fda42bece1d711437fe504f78e940f309c89830bdb5e9dd46afe3fbb1b150",
+                        "abaf0bc879b70ace0a82af4b9d4f32085ddc7c5d920a673c47e83199959b4de6",
+                        "ae69a784b18524bf95e7b2349cd1c36709eb810b0168e7e140a7a411443a02dd",
+                        "7858fa7acf40bbc2168ebf05e3389ae646d1fd4567b17470506596baa5e00ea9",
+                        "d9f1d5f5ba2a228915342e41510bcdaac533e10025531eb9a1960b93ae667332",
+                        "5a0def567978daf9e17209cf27f261256f11d0f8cc946c888ba3bd15e56c786a",
+                        "589c40f1e0e442e1e227c1d45ddbd799c41cc38d025ae871bbbad98e0b65d2c4",
+                        "d25e897ed507bc4dcbbf349cc2de3d2240ad6bede49c89fb07c9b5dcc138363c",
+                        "b480a7829783c502490abec998b2d0253aeeee68e54bc165a5f1e98cb6a9f4c5",
+                        "ae8c6d400c2d517eb69379c486e1ad35497e692292bbe495f0d01b4d4e48e265",
+                        "27fe2f66e35f873b8094d7e2ced46e55811f5a936f9019e5e2db41b7ae5e819b",
+                        "1d767698a7e6a1d6adfb55c1584880350f2c4e80f40e51776bd33a6a2e47ba8a",
+                        "70114481a06394db7de45673ff702a2ca4047d2715d780884f3f841a493790b3",
+                        "404487dd890566585291dbf1a22cbbb7fd70e4870b36f39ee7c710320aa0c270",
+                        "b908e1a132f73bc705594db6e08b82fb277a87456142f6e6145fa4701d7de09c",
+                        "7f0734a0c77fbb88b5a5a4d49f995bad567f0a676cc9326c3267211d06ffffe7",
+                        "204e168e47177bf41e3066b1ffa5f0779d98fdc7a0ff8ac5399f1c3abd6998cd",
+                        "fae75f8b1c0302a15813cdacc724fb9c9d06d6ac7c6a358b1f1c33a9df3da5c3",
+                        "c18e90a57bd273f5d27751fe81ea9302f5604f24c2a2a9d306e2b0b26ed65cdc",
+                        "dc084d1ec5c777f8cb78fa955903adb7bcc68b0d18cd2de66f9c32acfe9e9948",
+                        "4fbad69a041e89833b72a21907459d2a9985bef82d05f70a8740f4d1abbac471",
+                        "f0d752ca1604efdc9102728c70fc2198ed466b21acdafe6a234f7124cdc3c531",
+                        "96a291d08e64c21d74c94982a2d1a146ca25ef24b4c2ffcdb3a8bcd77288072b",
+                        "d84f7a140461dc63b72d66dc97af315127f8260a6176159f7120ad15e0ffbb42",
+                        "e323b02b16317a133f695b892900cbed463c146310f13847cf52f5e8a1556403",
+                        "56f9986c62059e091f741f5febd25cd26400acfd51302e09e853c49815345372",
+                        "4a91c13e08448237509eefdc09ed41470f72309aeb0f3577bfbdaf2f45b359ca",
+                        "3f1214f03f2bb53d779d05f2a3a647d0bc2550b5540ef159c2917cbab8abe006",
+                        "c00d7a898094e86d4659ecd1ebead956c2d74969a9c7ea05b2ef5daf456cbfde",
+                        "c9f7b7bd863e12133688f089abc3846578a8c50f8fe95d33ffae1472cd61d396",
+                        "9c4cb359614595f16ba7a76a3a5f7a78205c32a23653a935400f147206eb4a2e",
+                        "f81f1b1b6ec3af3a09c79607ff09a025162ddfc14cf85ddaf4ed678599031bcb",
+                        "07518a7b6771f27678761c04c584da6475af520f2358b0886ac0f792e5b07e79",
+                        "3d8edf9ff36d26b12f22af02685c72a8f9106295c7cd06cfe74fd59967501ef9",
+                        "957afb2e2abda010d44ee4eda67a2b70b61c56594a31964f860b26a28cb8454f",
+                        "f136ce60520308496e1802b6de253f4911afe61e910358b2ead474a9cf48ee6c",
+                        "7c90e7fd57edfe1fd3504153c5fc31342a7b354e93038b45140b67fb6fd18e65",
+                        "629c3a127f091ebee42b4d487d029bd4c3fa2ec72dbecc715e6c8c9d2671b736",
+                        "41e8646e02f9bb0537b627ae5f269154b03d916fc490d38abbcfc3ebf6d9dda4",
+                        "72d66600ed0cc1faa6d91c2a0da81bd90d4538cee893aae4bb0cc14eeb4dc280",
+                        "81889ef1c6d2c81067e366ab7185eb2199be8789f114ddd6a3b693ef7821bbec",
+                        "8adb60319e326ca0afa70e7f8ce7209bef89e1ec820a5d70f13d606add534ab6",
+                        "ddcebfd51afd77e78f06d5a5dccbfb4d6dc61977c47ac9b1a2f6402940d9a156",
+                        "b4cc18127051cfd93b1a5eb0358153c03f1d44b841a41cf3c2a7a23a14dec4f4",
+                        "a3d44b5e13a0c0e6eb22da6e8811d4995d495d4d780e840ee85c83f2b1656082",
+                        "eb69269adfc48cad8200b8e31807e9454ec615b8d33b67e7191cead52549007a",
+                        "cc6bed8de65dc9b905e2aa95ad5fd57bb82ee21c49968cf30a6cb4b002be5f6d",
+                        "0ee85d0f8f0f5bfb77f957de73fcb2da0ff2691b2971ea681432a67ae5c7c378",
+                        "d8a2af3e7a30804574e74ed97275804fcc22c19607ea30251f7fcecfc86c8cd4",
+                        "be4f45e912a7cc5a174d6cd1c058412042308381f9882d2a74c43cef9a93e51c",
+                        "b2137011b2206e9737392b735787c1861d5df47690b5682cbd432fcac4c05198",
+                        "f4fcc63e7a123783b643adbf0b97580b789def70d8ce5af5955b35b263f4a4fe",
+                        "1cdf85f46a7dd1937cd43c941f1b555d582f36d3091097231f86602c73c84c7d",
+                        "76cd77e06f946eab3f59cdccd3a3e20395f04d5e61ebc5ae6cfebbf72d96214a",
+                        "f080f232fbf74a104a25ff2df6958e0008662596f81cfb84cd72c2a940c9b5fd",
+                        "70a13b34f284353ecae70355403e6297fbab263f207707860ec22dc8a2da4c94",
+                        "2d1bceb4417eabef500af978c975f18ab1b01b12946ff411832af267652f5d49",
+                        "74847cb2b631547a13df246f10f21053e1d412b4bcc83d2a28285033c75a2839",
+                        "0df6e0d42f19ca95d31d9b762fb58b9ee4ef0a2037cab32e49509c575c6ed19b",
+                        "e9b6acc84e087163ed1ea23f7b7aa0fa4ea37f15473a47af6618d7f30e8f56a7",
+                        "3578384eae5e7a10731d6de0972072f1f568a764ee9a2c2c6152eee141fdd3d7",
+                        "69653aa6632c7fb7c69a8129861e9f3226b726a8804471165642481b598dd099",
+                        "a296c05fca5e44afc5c2cd583cbde4a1791bdb7a8461c6676b97ea63c11fe393",
+                        "077900cf366702fe8add4f0265cc52273b343a14218ea59ab26cd628a38240fa",
+                        "a63d694c0e6728166e578d90061d24146d56ccda4ef281c41ce6076ad51727bc",
+                        "1623e53bff3af6346b27b38cfc0d98f6f2ec80830789f88bbccfbecb4ce1162c",
+                        "ce5c3ddd1852bb75590b6d8db16b4e6264a8993a3aad89f1731753565d5e54fb",
+                        "3dc87d48cddba8c9aea71e8307e9d803925c9e4c4f55d7730d3e651dbfc7ba45",
+                        "1cd04f320cca7fe33c2f43dd9e0098cda82edf20162a67320e68ebaf3fd74fe5",
+                        "8d63274c4a44170e5008d2d1b790d5f468269abfa91a54c329152433a30665b9",
+                        "89ff3946f2111436afd2b41932c475a0d09223e23b6b9e9a9ccf164d3cbe0b11",
+                        "db63caf3eda1222a308deb317a0bc8f1deb95a6b3b0108f71d2d16691244927b",
+                        "3d1ba03634ffaeb5d906032273191fe2595bd655a70dd8c22680fa4929012c6f",
+                        "0d355563eac60a85c52b4b2a54c21ee7610819a9a3b30e69a9a37b5655b9b5db",
+                        "373a44ab3936104a3d9d26a246d2365127c1726c34d2f1d7e87d7d7f6058f248",
+                        "16022145fe055769433d4c3cd9639ce0f8f668e157bf9711e2c7bd7907178df4",
+                        "6b34e7d77649a72887fa46cb34618d813a32fbb77e4ebdd6691527eacf5fd84c",
+                        "df915fc7ca49225b34f2d419554d2594c8b2ffd834b2bb92f49397fcff381eac",
+                        "6002c0ef73c781b20d7d4d9e01322f8efa8aa78e5e9792bce29a9169c7032f57",
+                        "3a0debbc0ee42304a9edb10db770d0b8180c403971f42dad8832cc16e395c11c",
+                        "6d76b23d46aae2e574ec2947c490f2ead9acf9592e417069e72050721224fba4",
+                        "593602ee2803bcdd743fce93962f672cb877edc7d009be65c02a562b8604a74c",
+                        "64759e44d4e426d1c147b405330e2fe1ed1afe168b8db60a87c935cf07ea10f6",
+                        "d8f1eea3b2c56c9bdeeea5cc57d5fb38cda7c2dcef9276ed5602d27b9788c194",
+                        "0da1328dfa5efb29034215279a87bf026e70aa7ceb2793e8c0ba9354580d552b",
+                        "8bf631c56ecb7ab31c0d30bf31dd28a62877402cd6825d0ecc9c71e26f4be643",
+                        "ae29941b70abb79f690de45e32c8b55f8114b30cae4376e991b963d4e03d970d",
+                        "0b87ec546259a15a8c8752634c3ef219459c382d383f155f219c04d9d5bd7f01",
+                        "87605721bbed02e5f279a29dbf5fb857a5e1d41ffbc50689ec4e1ad1ed3f2b76",
+                        "64d33c169662adb9ae01cc1a902b8725ea84162226d860b05b22c1cf8b716b88",
+                        "dd3e22b9aaf98f165f20c449618ebf776727386daf5695e68847462a1573f1fa",
+                        "2eed687fa82a0df68fb2a1ccd9c7e0679f5ada28b831b105718dbd0580c0aeb6",
+                        "3748437a03b2e086825a1b26b9a363495cb04ee3b5c6125f16fa7153d388b38d",
+                        "d6f69cb9ff2388175b1e549df23171ea6cf0f181c52902e90740dec0fef941b5",
+                        "81e173033c052c2a8b6c2ce928c7d9e7f7b956e9744156c8b40cf815f093de69",
+                        "627027e95f078f86d70df8b97d509bd556c6397693025367ae4b43edc9b6fdf2",
+                        "9c8bee1ae58091342dac7901e5846df4acbbc409656457b03e1702eeabbfc8f5",
+                        "ee387d8e66f5bf75dfdcdeb97d28b4dbbcb1302bf20d6bf8465b7b41832550ad",
+                        "681f0145ff4dd8a84e42b02ca5bdf4bbe8adfdff11e3ae57673740a4f98f0c67",
+                        "9f7d29a27a80e64603c98125d6f77e23afac3ae85ab0fbbe91e74e498fa69c89",
+                        "f23c72f39810dfa196ddac4a2b30fc97f3e05cfd67d91ef2e6ab063ee29483a9",
+                        "cb02c55cbe1a20d200bd53e718c78f9f2307d0476082bb425d4476a70ef47172",
+                        "2c56d7a46e2e989c71d754a9ed2ed22285adb9bc7ea0ce85e7ad0146798836e0",
+                        "161f8ede4832a65d9d082699e93299189916a9feae06703aabba7aa7100c8078",
+                        "c14f24845530dbca3372c7d7453441113682d76ca7c5ee93a86f8705dfa6754b",
+                        "98e2302a8c27aff16705eac3c9b4861e0d670571ca493dd0077280785d1d32a3",
+                        "1af7252bf32de08559d47dc9273c82a7e6cf89c2ad0d755084116bdc30e2dcb9",
+                        "b662f05da0258a7218659df10926cb716fc6d092654ebdf9d8a0efcab72f311e",
+                        "ad8807bdc9c0db6fff8ba8963af51f14ed809ff5cff5944d27b1923bc5cec68e",
+                        "4502bbe76bba11effb1f91a822732bb4d1c6cbd20a12722cf7cf2276bcb224ef",
+                        "bd100da2cd60b60a2923299e505c6c0fd23cfdeebefbcec8119567fee2b8d5ac",
+                        "2725060e6d944dceab24729b82d3a64275ebd82cb42ab330af43f53cefa27893",
+                        "9cad96ee381a6d63d841569e475eeff6dee67836e2d05113a8f18aee590673b2",
+                        "c22c8e48d846ad43fc8319c4d3ed8c4af31ea7c3e079595cbb557b78e50f0a60",
+                        "24a9bcf359c2345fdc35812a10f9f08229d11f17c5951120cda1264adb2e6d71",
+                        "54658722a2c31e13616e4a38a817927c01d2df37830dab7e76ec16e7ec93e298",
+                        "fdf9d5820ce67e076d78db09766a5827c6d14678d1336c8f936608d80ae83d72",
+                        "f3c55939c47563aecd9a0be2fd16c8d839331c811403ea22d47a8dedb636f389",
+                        "9a62ce2c9a3238370ab983857b27a6ebba407540c6a55b8d3e62fb012b9177d5",
+                        "32ea29fa721d7727b0ad77f534bba0ccd4f08b16b1c809c60da2e83c37cd052f",
+                        "0c8eab2d814623966122a83e079ae8629897d405fc471fe70eb8ecf63d53a6a4",
+                        "b5f81d6be6c5ed881db8e195b850c3ebfa2cb455d0a1d14df79740eebe5d549e",
+                        "ff39acb8667a42faa265d97a90fa7d5802c6a581dfa6bc868fc6e953b4fe3b10",
+                        "cd1a9a932859370e971587fa26255782a1aee9a1efeafd17badd1aca3c822363",
+                        "780034cf738e520971387345b73f42cd13770dc8cf68948ec9e8e1f6a6327f61",
+                        "0d97a70b467fbf4af625a6b539035b19e86d011782bb7a9ce538bb89d81438f5",
+                        "ca8dcf9e3454d6c2a346a01372c798cf2cf8c49c38f9581d705c42e4f1e7c4b4",
+                        "0c21834cdce637a85f931e8d2d961573d1dba0ab7bee93189f74c6331995c914",
+                        "c8aa251601172c9479b4ab2c1382a2d6608b547cf6b7a4a04a75a91fde4c08b3",
+                        "14d36f3db5b2cfac7a99df066016eba59a21ef651e991d631c04acb11d1d2b51",
+                        "89006b74bc61637b0808bf786df16039d0f5a26d1cde1348de0f33718d47e75c",
+                        "098621c303cb1b9dda387a0ee66ecd267172a70defc1b403887ea74c53d5b911",
+                        "f9428c1dc527138be5c9ddbfeed43077d06f2826b75edf9218e7b90df8b5ec29",
+                        "245270fc3442e19475818ca0d5cd32a4728a25b5c4f2231d571eafa281e61e18",
+                        "753e79f5b9edd2e49c30c17d3d5050a2c0265027abdf8e661281d22e6cacb701",
+                        "7ac9b5239a33b2689c63739de793dfbbd0955c044fe062bab28f7b9e72af4755",
+                        "ba6c405725d69b2c74661f3e4259242b054d13f197db5700d1d7728110e56955",
+                        "a7ff3309d156a8d4af88c92e5959c98617e0c1b95a10caa544fd761f93715b80",
+                        "4185a1fd84ac173ac31493ea80b4a6d38d37325e8d82d07ee31bbd7f5c661e17",
+                        "78826fde40d9fed3355c37bcaaf0656a4236d58404a892d1da402955698e2904",
+                        "9f591f6bb853601a315de1edebc0927bde202e6cdacacace8dd32bc824a8a094",
+                        "3ae950afe6ce59737c943cd90dc8f100de10de1ee952b2d295514c4f710aa7d2",
+                        "a75089fa658b1206f03622608239f2de628b4a4693548c864d6096e2cef76490",
+                        "efa7ea258d706b04547b8d4a791b1113fc77a4e5547c8a308a89bcbbf8161e56",
+                        "f0c8cd991b168fa30685d9adb508e9aeb4f2b63dc08a153b814b0cf1f989183b",
+                        "6f1946a94c3138276073dcfe0d0d48d3cff0452993b34965a8fefe90161f0fcd",
+                        "2bc40489956125fa47c9cff896091977b8dd0b7a0e0150f614592b11a2e4d1ff",
+                        "b2f96fc311567ddbef1bf0fc487f973145f717f283883606ee03b4384da74003",
+                        "afb571e0e140ddda917b23d993474493d61a8414b0bd191092b6780bed309756",
+                        "687a64c739ccc3941a0eb74554bcd0135e0063922933ff892c7b90b88e21c7b8",
+                        "5ddc34627e55a68c4fd82c789c10d7fecf3e380b458ecd18eb8c5ae041c0b288",
+                        "ee7584bbd58e279c2667ffc07c1c4977654fc948a63e33633a563c757f0dd9fd",
+                        "3b7fb2e668fbef730803f10eea0e6cd9a2819eee7c1c1418431d1dc683def7f2",
+                        "b4e18431bfedbd98c924a64497c60ca9e4a82f22084fa1ad24c09f79b2ea6a94",
+                        "a5073a937e8b5cbbabb8915cfd2f2fe7307e4e334d5f434077995815475f0df2",
+                        "455b0de46808bf01d625c22f0cea27120780c8c69c0c11cf837e98823faf58ff",
+                        "a2b26681847ad348da10f7b578cae28087a3f5aabc5f84de188ae7ba9dc754f4",
+                        "f03694a80d8dcf0b98d4c4ae69a797218cff7688f80ea97e627e817ad36f3795",
+                        "006670166e382b2bf369907cb2b4834d58ccdc55a4bbd6494e8f9c129f5140e6",
+                        "ba02ab95f8cdf7e40f03a629e47a0f7d5b77096549f17a158c73e2b96c6cf0ed",
+                        "e1180c4ae2e094ff0ef2dd8107e5f2b02bebfad6501b18965b75ce8689efea2a",
+                        "a8114db88256707afdb0f589c4e375a7b165380a0f8c2795c0c0dc0d02f5684c",
+                        "a8ff66f47c414f56d8129e33a45a0bd9b9d1a640a3a3454d3496ba3a800b2d1f",
+                        "f36ca0f95e603f806380dce52d91036d8e3a5545e1dd7620a19196397b91359b",
+                        "1c207b576a1e9e765209ac6756c7948fa3f252a4687696d0f8e831f14ca52b92",
+                        "cc5eb95f7759dfb6cc55027d49a5fe9c52f3006568cd97a0c544638be7a887ee",
+                        "4e15d5885837d4e5e79bff21930dcacba97d2bac39e506896e005fd55aad7e67",
+                        "5e2e62808fbe25793a6917dfbfd06029ea30eee0892116fe6ea4696fcf62ef53",
+                        "334d575dcfb7f6b606866af045d0a378f53447ef51d5b3d1afd83d78c0aee1eb",
+                        "591c6dc98541b9fa044ab89f78856374c3f42ca5f8021bfa0e119d8a04a28646",
+                        "c502d6853c8eb8a2657e069659c1f3b06878498d1b1a15f771fffaf886a1ae52",
+                        "2d4b16c2b6cee606af3c02ae8d6a86560e2393306fed2ac0b72456a8e35e24b6",
+                        "b2ee8ad11dbd4ddbca245b403ada57354b5df94a9de54bdf574bf0eb41645c89",
+                        "a895e7d8adaec8c44b603648f36774980707d30ede4f5dbaf2bd3d2e3d4e90b4",
+                        "1e76fe8a5aa1b516db5d04f3496e69170d3a6910aea79ad7554e2527b81b6b5a",
+                        "1576d0f08a566bc422049efcdd942ba455e61a1bb2d6e1ad470e098899128f75",
+                        "ffc42cbcc82b0b23c5616301e90aa6ed76f485cd63506ba52097a42b5c17420e",
+                        "27fa1edc6938b7d3658c5c9d894136857fc0be8fa743924a86ee4baf583599bf",
+                        "4c8a502fb162a9580502f4f2618be83041782f245c6023e1d6c3ecd7bbf2cbd2",
+                        "5b72391f63f61ba48fbf8fd308ca6afb7d72b9545d1812538f2e4d1414c6fb1d",
+                        "1968aab09560c49509dc7cdac8c5c919629a3da0a39d7628b172d5e7bde99c20",
+                        "97656482e3f4c9dbd01cf1fd91f0deb0b319c15a89b5deec6a57fac647a81753",
+                        "d1392d6f39252c12b76aca6762fd95086785433913e5960b3c14a708401c2897",
+                        "c11244439c754d91aa30a2fcddeef5a0be7e300b94a5c98967785f112cdbcfff",
+                        "21c529765b6a1048c8c946578be14e63750eeae28521fd845bf7a3ae669f203b",
+                        "c2f22169832b5de185aaa5642f125738f164001083438328d2541c15a7f986af",
+                        "293583e0b2b86f041204e4ddc9546ca74431407f88ce36665337a5602dbe3bbd",
+                        "1c270bcff184b5efcdec7f630e707c3e7c90a519302233fdc08aa744d4cc0f9f",
+                        "88a9d5a81d358a14cd92c14d669903032c93371915725d764fb01c7c1673d4e0",
+                        "c733a54fa8d1ef07070c52ce77898eb93f148b13cdd1b6fa69884dae4b62144c",
+                        "acc7546cee77ad0a641bd33253869e0459325db8e6e3a9c7e3812916939e5345",
+                        "edb6a177be83d61f8e67db1b3837db0316d0205cc7303c242c697fb3c2a1af25",
+                        "8e1e002d811734ae8033333794c2bdbe826f1c69f4dd6197e595e75837a3ca64",
+                        "316f26c9d7b2dc523838fd4d8a102e7b817a44d00a4f31dcd30bd6529ca3070b",
+                        "0ae34d23335c3138e2ad4a282b3bdb89542bdc29a4df69d202ac41f140e15aa9",
+                        "6c6d48776be2e5a30e91af97bd6b0bc5a5eb76a5fd713adc399f8664918cee9f",
+                        "dfd7c371eef529314fa853918ed4fac86e473d5bfcd9dbe261e57201d70c082f",
+                        "0046ae85e6230a07ef27a9c7c75dc6f6ccb7742433cf8be17343ea8666512259",
+                        "dd9fe83a560f0897bd19f23474fe744c8eade026cdb1f048e84f3459e0f19303",
+                        "3e6a71ec2a652defe81127e60e22728c5c2b6b7ebd3f8946e347d662ff3a868b",
+                        "a4229eb078f80905f012a474545e0e2786f98bf7fb2073dcead7ec73c65fbe9b",
+                        "7dcad9638f5473ae40af1a5d9334ca763a09c66812806f67e75bb44e457f87c3",
+                        "374ff61877eb866ee324a87077eb71d0a269e9845847e55a5e10fe5f3c77aade",
+                        "ef6f393a0d140250e071d3b82f5086c13bb429266cf944bae8cdaa28834cef8b",
+                        "9651ad41b55c6e8d6abb345d4ea06e4399cf2902d2c1cf13ebbfba0b7140c8bc",
+                        "9d0540e58a6445fd868ea65c40185a7da7858524f419797084a602427ace7477",
+                        "5d812312bfa56dced2d010ddbd98b79ec946a4c13fc545088c80d037e4df3c3b",
+                        "c75d28a33c292a50e293d4e88f25421bc03c83fdbafaba4f526b8c6a7e5c2e2e",
+                        "53cc98e7b41fa8cf94ae5ddb9807fcf8c73c209d910c892f266621fa05782ece",
+                        "f6b589decfffc6c33957cd061404dea6482435abcabbad3485266cf4a8e7fc05",
+                        "e4e03d0c467c2420923815fdef774f530d07c0c415e9975bed75db2ce4227dbf",
+                        "7178a3cf86b9b27023e576a0f112ddbd3e240289bf8c4256ec384962207d749d",
+                        "58c29327189acf5670bf364f2c9023439eab2dff643a4ff36f3d35b43263111e",
+                        "d9b365bae902827f415288ab30e5e75d93038ffc1466356d6f5280863f18dad2",
+                        "ffd371a7a95b47d197bc947e0e1c3cd50a96657ca14116fad6fb7ec96aec3bf1",
+                        "10ab513a9aa33ce2ea4cf293dd0c435b5aad5a1adff65604dd3f07cfa1f340ee",
+                        "40863aa43e50ba80bdafdba66ae053896370421d48f59c2aa962ec5e2914bd96",
+                        "0363498ed651cf53bd469fd0dd8ffdcee6c6b4641a67bf52fd177ee7e9e81324",
+                        "7804a9ccc78fcc0e6b6583e2fe28a32d3b409a08dc48061233f8faf88dbcfa03",
+                        "68ae59987180df7089fe2566c5d2a61d554b267332a24dc44ffba97c1ab1b596",
+                        "f2c29ca8dd0b0429df3fe25fe3e36e6fdef1170dbed8baa30cde80f13cd093f5",
+                        "06d4400c68d16ce0b1b70f8fef726fdf633af85eac4e285694db95c0f8e503cd",
+                        "8db9481d31cd20f8ebf15b2ac559ee46796f0da83b8a94139ab998e2be19f035",
+                        "4c4a93fcff164e070a9eac32c8b7a582a00c6d32f8dd146cc603520d91fb11dd",
+                        "3d70cb493fee1f8575dc7da9c7627d31ebf42c9842275f772ce6f0d42e06db0a",
+                        "9f28537ea916ceebf76f1a42544c43e13e9075929228f32190d9ba4f5bb5c9b0",
+                        "673af69eacb58312c01c9b4e93167bf8e5bec2ccb4450ab833baee81cdbbd95b",
+                        "0d0b61e12e81bed69380c9b8eb23a2384a48bb13a4b7808a21ebdb00960e7e4c",
+                        "284b4b1d0f126cc76b743eed1d255b181a4ea45839ef0c1dd2749ce5ae83270c",
+                        "70cbb1998efc52d6b6aecca67551e42bb44eb6dd6e400241d2e2bab34ef9c1f5",
+                        "a47582681ac364f031f9d19c42e0b68edc0749c5b3da9581009b5187b8b503f4",
+                        "808c8d746109d74eae54b97f45ab7b9ed24f32835cf8a1ec9d7d46c3fae5178b",
+                        "ab0e3e550b11a95ebe15edb506a534d70e4bdfbbc9172b251668cb8eaffa5c7b",
+                        "8d24d23ec2012ff57024b1241dd401eea2ec104645e5dd4088b32546fd8ff904",
+                        "523fc99da5bd881da326c94b303a852c0796792c1f3abfc1fdc7590c9a1ad80a",
+                        "bef023158f2dfff9af92f2aa64e7da3087afe08b2cd5bed4d6a0933e46efd411",
+                        "bdb056bd0ae30d8b926688b56a6e06029905ecb5b25922fe4f6f2004d4adfa11",
+                        "94a65dc8805bbee393a49a95ce8c95574ab280d6cfcc4a1490cec8352754c6a4",
+                        "50410fb63b9759e697bbb5c62d39820ce5d1f76ae9697e064578a15e0621b792",
+                        "90bc57b7055d84741c13f3a7707770de07ac2118015e3f0d08ac9ca3a4a6e177",
+                        "4b703ad6aaf1cbbd6f4fcaeb9745fa82f6fb055611d7164c572892b0fb786114",
+                        "0ab836aa1a9ab4467708652e8dbec2885119358e37b32f51b46d45f33c88046c",
+                        "1a118c7d922133ccd430b9f9857b62f8f2ce4df7d648a197f6edd3fefc07cecd",
+                        "40e846cc774ddf6392d673f69ce95245690f25786770051ba5ad49461310b0df",
+                        "5aadcafbcf0b1b4723d39c5d4048a8d9f3889a3f68aab66cac0ea4f0ef7d549d",
+                        "acdd2f2a548cd325fc06b49c257bfbc9b09c016ab0859cb947aac64c4570f6e9",
+                        "0b3ab537044f2e6142ff425079d25fcd87e0dd8187f03bf0dfc479142d8b9abd",
+                        "497c6521a301865863f7dfcd03316ae0db690e98546116c14df05d98e8cdc893",
+                        "ccdf5949457b2394df193f21d8cacd4971942ea3a1467e2ab13fc0cf38a2aca6",
+                        "b38079f35e81d62e2ec89a5511537abd020e0d49f47cfeacb1fdf0000e3898c3",
+                        "b5477b70b3e6f62fc281e349303e8e160a5cbf6af135bf3c991955b3cb963039",
+                        "64e8bcf3fdb18248ead8b6c5a23b156d76cbc6ab5789815a2b45c365ab20d353",
+                        "86c981eecb0af6e8ada8e68a9ba9a6cb93d0ed527a366121ab0dcf9f44d2a38d",
+                        "93ff8bbd4dced9f09d343b2227099d63a28c121389dda386c8b58acac7e020aa",
+                        "b9b7cc4a4e8b9f5a1ec1116d378e3f90ab3e8e4605d4cdc95b3e4b7df2815a1c",
+                        "f2f37eaae0ce72d792c65a906b6c7334c2377c3c31e454063305e7e63e5329e0",
+                        "cdfcf71c42e3d8d056cab0fbf3625c1b13704870709a4e0850006447f128efc0",
+                        "83566f6ad1536d4aa2543258bdee98989807ffa133d36af3a26672708ead8410",
+                        "68b89c27a8254d5fa39096943bd9bb0074e950fac7e686209c0113df088ae054",
+                        "0e8c8d00c7e71968371f4597da934aeaedc4142586c6454790fff7a4e61af30e",
+                        "0bc7e2ff2af89d45812349f03973406f27a4475c44e71589c4121a9cae9cf37e",
+                        "53738bebafb5a06ce8140b83ef922a31a05521c07c42cb09fbcf6619bf959697",
+                        "809f6e691647916082cde741c82df020254de10148b4b712744f1db345bc2694",
+                        "82238f89893476756a48eaa42cffb4fcf07c8cf4cdbe12a1c43145d2b67aac07",
+                        "ee995fdc7633e803741fffcad712a48aeafef16e5a91aba899e4295bcfa3b577",
+                        "b65b0489ecfa62b9725b7a4c4150caf0f01350de9cfd613c90c60d0fa4875ff2",
+                        "7988a77872e593e831989c6ca5e5e6861b63e1c2a42030d684b51fb88ab73004",
+                        "914ea37de5dc3b2f9035cdb7fb80e6e692a0a5934756beb6d8e2ea8eee7a3895",
+                        "d9c28dc8bc385283650fb2aeb1efe10caf848c39de37a78dbe6f47b8f3bd8b51",
+                        "49a2581f6ebc753d70dc30d3b093882153fef2d0825252354e5beb1b35eb90aa",
+                        "7791d37475e1e15bb9b817b180811d784963d2398c5e736a851af2ef8e622e77",
+                        "3957f179aa7676eadd2c312cd6096f84b7a0424bc99f05c8997bac9fed057ae5",
+                        "9d954ab5224ffd2e0301ff9b33ef834d019596a6c3f56fb634ccc9779b9c694f",
+                        "e6235eda52b721bcc3b997bc8da554f1998b5c7ff43cb86c2d7f1915150c4ded",
+                        "c0684e197ace1cb57ab553203b16fbccce5c993b876b90499e96d94ce308b956",
+                        "70cb7be7ca2d01bb41c09c06fefc04e8d6dbfcdbd9b8df4bd38caa3c7fbb6001",
+                        "96235ac39c397550e28b63f63a4bebf549215c5e72cc78488efeef131b0cdcf8",
+                        "f3bc2994745fcbbc792d905ce1858978814bcec9a5a0a3eea4913bb87939378e",
+                        "caf6345a1bc6013c428933fcf151ee366a11ee41070c3de2a3e5036a65145194",
+                        "ce92dd8170fc721b8bb69c261cd868b82a2d1ccc556bef3999128a3c20bd7c5a",
+                        "45e73df58de1b26bdc1b842b5a951da84381708cd15b40eab87ad44641777c6f",
+                        "1a57c8e01d94f7455719c85c662f76580b9f4f530aabbecee9c5abe00fd7def4",
+                        "c92b4679c9376df3e41d79131f42961fddcdf99afd2c476168daf9657f769373",
+                        "2a2893a114df2630e4b32c47bd60612b4f3d9b04891e944af55fd2767d260314",
+                        "98dfd86f3bb1b56d0e5b3d0a9b3227642b09ee0a2ae78f19eb504edd1bd91ba1",
+                        "2bca879ad4553c1406e38ab072cda33740cf1681f18e7cf548ce040528fa5d05",
+                        "5c3039135e50309be3292559fc0f0d6a5de7ab2803c83f206c8cfcc06683b54e",
+                        "7b46b23f8ca2c45baf6124165030a1ee5fc27f1ae3d1226defb2574177cf728f",
+                        "b37b504ccbcc5ae9f8b787fcc8da194fdda3a25b94fbf217444c13fa4a0863d5",
+                        "36d5d669f4afaf603a54902269087a0f65f89962f87ba03be56b552bf04ce81f",
+                        "f57f94affbe464d876235351bd20660ad5896e5f5bd38978d64346564a089754",
+                        "4637eacec37dc577f7d0c780ce46a57de6da9b5173f4d0626963af480b95213b",
+                        "e22295a0995837f730cf99e9465b0e5c41c1f4a99456f6b27d26d66b8ef2c4bf",
+                        "33d01fca1bb71c53d131b757afe6d97342006694ae752c17747a461717f42f8d",
+                        "ed239b46bcf7f8a66b92c15135488e1249f668625c6fd0a08a0f49c733806de0",
+                        "324c9a8fbc527d9e9357595b1b3509847847f340cd557b9305e78fa2ba963be4",
+                        "2fc5f4089b8b6375a41bb70257be3281cdd32778db05663c55f96cbeb976ef1c",
+                        "691fc9f8e0e0fd9c0a0f42f17f33ea83c3462e35d777dd54734108bf273b5a4f",
+                        "e21e3a565655f1f58ebdb421c94110e19a55030777dbbe455e350868020a574a",
+                        "2c3e5c5791cb68bb2177332f5b79c8f7d1cf4a577a903acf225a0d11e45aa5c5",
+                        "5707100bd5a978ef7fe1def6ba895ad388466a4db13679a899c93bcb802d3a7f",
+                        "fb537a7e26384ea9867ad9ac845067553c1461f5c75a5bd50df1afe40b063b1c",
+                        "afea4fc11996d2552a83a4b7bec586c9dbf3346cf2b3ee7a862b8f6ccf163522",
+                        "67a83eb66b438519cd92e6962566f3d1277395d2edfcecdb06565e33b9b4200e",
+                        "a763a731e9fd04d5ef02aef4e7cdc1726a34c7a048cd78c45ddf9f05c52773be",
+                        "c992b26e5d9f56c3f1615fe30fd5d4a70d639e192583e5792909baad8695e90f",
+                        "5f63a2abf7fde874a260f469f56f7392c715f43581fa0e0ad99522dde7c047da",
+                        "2d92ebb998b264b0c7fe1d9dc94c8f3ac171f31a38867eefd8687216342ad4ac",
+                        "36758fd2cddfa3f6c1658a649508727ede3db00c36b5a619260212b50b3e5da7",
+                        "19237f8184a40216542e1f326527f7e512ada4ff9923380f9a7a7e73a0c4aba1",
+                        "3f2d551638a07d4c6b03265f131adae2639d1600a9f31a337d5561bc22c41af6",
+                        "212a3841885d5890d53c698bfc2ee6114c13ed4636483f65bf9f43e2a23c2dc7",
+                        "30c6c4fede61dd964588586338cacee4e0ef8977b556b4fc104fcb6120d45d3e",
+                        "413981cdcd8428b9e76a34010c95f810ed5f39ee66edfcda92ab0ad94f030871",
+                        "c70a24bad26cd871d82aa4563199ce82ef8d00cebc48a1cd698ee1933ac8b6a1",
+                        "d228077b8f08942f4f5c445f5431f6a388d8dec122471f8c24a56ac158c90742",
+                        "6d25f50ee65fc7f46a86e1742f30afc9b9536b65762f75d9bfd1f9ca30df1d75",
+                        "2a7ac6f4b98849eb4d6962c424e91537967350ccb60c5cad40400d46fb0dc3d6",
+                        "002721d6c430ad953c9125dac7b4235a3f5edf80309b23fe9e197d0ef12ab0e2",
+                        "5464573c76aa26e98ba45180d7783bf83a1ec7939c8fd8a210d635225ea1ef42",
+                        "18395b65b1a46358ec085bafcc873706fb482866f54e02e042522ca09ff0452b",
+                        "f4ff0049dc8e5a4f06c6274a1bcdbf8b5f8b841f921a264ea5bff329378fd620",
+                        "19bdc09f26645d82ea05cd1fa0ffaa68885c66530b3f0eb05caa55b88aee4efa",
+                        "6e749013aca97a5ef3b156da4dc621bfefa7e0186e5e4780c31332f9c62ac7f7",
+                        "83800ecc6922e2a6ec0c34c1736a12f2dfcd94eb9f27c6948a5b28d961bc4ae9",
+                        "86b6fe2935f0206083c952c07ea38c25388955eb8a806c10b69d3e52d6ec26e5",
+                        "c7db870f8b09b9498d39b22d828b60a806f7a1de694c43d6bd29f3d76a11677d",
+                        "b0a5809735c83af8e2a3eeb93da682bce95a699392c0c4abc8d39188563e381f",
+                        "63af21f2f1f82d3120e4d8d98e7fda2d9f39d102c57d9c4111d07079a9ffcd47",
+                        "ad654b3ed5a11b9a2a52fbb8dda47e91a72e4b7bac3a4ad75c074786f14c046f",
+                        "6d9c4a44bf22648c07881e2e92a81ffe002c0177d9c7892416ce01ed1f693872",
+                        "16f279dbb7b3f6c3d4f190b36fe2283efd5fe4669a8f70d209eeed96bf55907c",
+                        "f79a83867614dc4d2e47353f53cb5a833582446329dbe4d5e8df941b0926dcb5",
+                        "0cebcc9ea3729487c1b20adb8eafc6fb1398710ff6179a7fdafb1985e5f4a8e8",
+                        "5a53e473fda88a9fd818defdc2c8e68bcea0c5aeded0c1910d6004b0e77ace89",
+                        "f97965894c4a296fca42905242a27228e5a9a0150d31a55e65d637dcb9e60ac1",
+                        "ec72e9e2fe2f4ab9db10b7075012c9e7cd2a4ec02b4c3b76df17f6eb27348ca2",
+                        "a4e92900f9f5490b66e21fb66c0ae094d106eed5366a85418a86a8a3f8f87a28",
+                        "225f9b50f64a97b9eadb625662b1a3e1b400eb86cee50fec8c62260027b4d390",
+                        "7cd4971b0e5453d210c097904480403bd53c689c19d52e4c6a37925d14e4272d",
+                        "3edaf61be8b6cfa06e1d42d7abd2df32033bf63cd14df8bb3ce337e62a822f16",
+                        "89fd8d0e59d8d757b7b8a2c3a2b826e799c028df166b6897a42f08f2284d3bdd",
+                        "0aa2fcdd4e83a4395cb5f514e1ef61ad4bb517d7c60f81bea030d5191c3c79b7",
+                        "80a275ddf6caa4bef4039860d4c5b0c4bd1009953c19ec2c63294ad2c5c56d1d",
+                        "e85d450859d702a0473363070a6e56d5021ebd1111232f2af28a60963acdac16",
+                        "54d48012bd8af661baae940fb6f0d10348137cbb13c650626f42051ede55ec8f",
+                        "bdb3a9bed24420afc6eb80930694b4afe0992318e49428156acdba5762c69e16",
+                        "cd277985e4b4c30a1999e5bf7bf7d1cc903640a04678a93efaac1f9bb5482dea",
+                        "d1319c6862feb76be11c089c753f62873519ec29a0c83b186efe57f50c4e342b",
+                        "1662d8e6db309700071a801a3d066ce97f942abce241c8085f3c023258927eb9",
+                        "e179e018705eb4a49ffa4e5271ddaa4fe1273029b521aea7a69f8f3b764ae017",
+                        "0e7347cdb154f6d96fc8f9eb8991d4149fbb21aa3270c21fa5df61ca140a4fe1",
+                        "34f182c2f44fab5ac9403543493be5006814b2379e0e6b7603d9e0fe76390367",
+                        "5d710a970ba007bffbecdf12d1c920fbda1f57023719d506825e0895a2affc49",
+                        "b99e0f318386f90df96c1d1cd4dc5bbe4726410f327ecc108108ad898e450eb5",
+                        "7eb9ae1f66a6bdc4482175d031bd6af270fe4ff8ed1138200d6eb49e13c0b8e8",
+                        "c508f259179f67bb6e05f2b9c5c5ea751f3a013eb925c6bfcc2a2624b962e059",
+                        "f3d0dab6f1d30ce74c97b89f551ce0820bebad2bc1cbf4a449b11d5408cbc140",
+                        "c116f6b0a0852a30c8a913f9e0f1680ff1be06165e19eac4d00c4e426ca9b6b3",
+                        "25df122cffe53ab88ecb94abae69e0a1d4323eadb7537c5e4894c0e082d58529",
+                        "a30d97485d4162e910b12effc549374221217c216b0a9487e5a07ff1fca835b8",
+                        "5dffc63818983f6a7db2ab65d621819be9f9edac58df38571887cba22aaaf1cf",
+                        "f042fb4eb01dde4b285f2df328f191d20621b66d7630d7691e7c69d9dcc04aaa",
+                        "d4190e2bf10aa9800a1c2395c0c4a38737c21f8bc42dffb23addf762ff309aa6",
+                        "4745eb0e771c9f2144ffd4abf39e63cf6d0ebe122df5f32ae399cc15fe3f7011",
+                        "806c6fabb4059c51865f723ae619e0c55718f973680ce7eb84c49b935f59ff02",
+                        "3352add492d3a7fa9ee046040a3f7795ec375af875c87edfdb0bc876ba14fb3b",
+                        "27dacac03594cae3db57550410bd0f8d166863992895548f6ab782a8332462c6",
+                        "1708396a0792c2a33b8174dd950c4a59ff06e969db873eaf2a7d82453e233b99",
+                        "5680174e172ddbe6943cede98f8d854dabb66ba65e3349889cd6262cdf462a80",
+                        "4960f0a4c46286d62e5bae021da9236ed0258f6c4c779e1797a9e66a47803f0a",
+                        "06af18499315d7dd1c8d16533f0e13465d606fea2946115f23735f3fe2f6d882",
+                        "73b0ee02de1c3c8a9b2bb8a9c48705c94df76c9c2d68a222c8493848c75327ad",
+                        "42044a69f91d56cf8b993166dc1c724ec7d311eff01c8255987cf563d58fa5a2",
+                        "187382209cf9b45c1df5655801a651463854a6495a7aa303887d65ad0e5b915f",
+                        "3e44b609a8f97ea0b412abf88d7748edfa62b7ceaa174bae008e508b1b133e7e",
+                        "d7b1c0b1bb02a6411eeb888ae26bef44c20364113bcfc1a4a3410396cb52b950",
+                        "5534bafcac199f54a48fa713c6f7ce0568abb11b341e38b4a968bddbffffa507",
+                        "84044786d9f286e241174796073fa47ce25c154616ba27bcca69fee1482942e1",
+                        "45eb4756d3895fffeb913bfe149746f56e184f4c336dad29f6f81fc2a3c0168f",
+                        "b583374fc47629a3f17476f4c9c751e851b7c4881eda50e4bead35afb77808b5",
+                        "4a99c32e81aa36e824bc4be78495458020b1faa47d558e7263f2c0477a16e6d8",
+                        "888b7d3a32f4566f21407c251b753b3890604001db91f88d45773bd8a53b2541",
+                        "53eb65e5b425e7acd56ee6234ebf3d40d8fc45a3dab9968ef4273cee307c38a9",
+                        "4bec2659f865dfae69862e128e710680f6114866b3478de257aa5ac596a66555",
+                        "543cbc31d271c10cabc9417a4d4b6dce2dac73c20ff29bfffbbe55584e5329a1",
+                        "4970e6469f1ace57971103d1cb2324b595ff12e34504ef8249971c76296bf578",
+                        "010810a21205384741812fe98489cd7369d9f6fd9e6818b11dea07c78a9073b1",
+                        "6114e32fefd54c1c2352ddf9327727bb6a34a9d8b3b7d01ce59c6e0d32700c7f",
+                        "ecc7248b7093678e7e0ae58333dcef0eaa18e3af261b2d1722d29acacce2b8f5",
+                        "0dc74b6f19b2bbf2f0e7f511440d4dbbc67952050bd1d962516b683ff6f9ec9b",
+                        "fb8447ff1d5200c3acc768992705d2108c37d61b0451c7474304803e76cc09e2",
+                        "f7f222b44c49d2d927fc2e345d64e2f0ed5f9a602758fc5f5ccc73d3b087f8bc",
+                        "295fcc7e7fcb601b3e79c1fe403f920b622bde0f4975419c3641c4d432de8f50",
+                        "e016f042fea1d93fcd4b2326b3ef6051e293b4abd066b3fa5c430ee7773e443c",
+                        "7c8347faa1ad96169f5650a1d138cb10bfb60dcf861d5e2dfce6a986997d2dab",
+                        "060928467611f28b99eaf284bc6c09d6760904ab5a6f9e072a44915a646e3ec8",
+                        "ba582c64b17221c46d27aaf6ce1e2818562639b321666c9513c1e85727a623e6",
+                        "e73793b5e2f33f60887c6ab428339d40d21fcf75530640977215a18db34fd7b4",
+                        "0ea32380009a639b705fda94d93ff032d88c3126503c0d153bd0f104b039bf60",
+                        "13bc02f7f971910299b8c61d1a16782726f22f63b31b2c0c34faece873f4418e",
+                        "a99b3ff6413262f46cf9a44c3fd5d0424109a6373e2580fe97938c3dc04e60df",
+                        "72b149e7ff672ec6b23352493cbcac166062282911e46d2b7ae5228d5814b720",
+                        "58d67077a2b7c836dbc19457eef1b1e1f734370a800388bdfb1012840fb7a240",
+                        "32beefd48538abe6eed6ae137199e03e05229d124628205cce7deb53f16f8f16",
+                        "3e466fb18e2a437292f00acf9f6e662fdc6e0b7cb9c0606e613f81dea3393e39",
+                        "9e537b504916eb6e9838f13eccf0c753869351778201c0813ee35cc19205409c",
+                        "404c0560dbcd46d1aa9cd76246654bd01f62ecafd40ad2b364c426f849941c5e",
+                        "89e5cbab667b81f08eeee6203be0af9cbe9dc0655af3272b0cb3fa722116c200",
+                        "2fac933a1b980ba75339703bd02f055199d057355a8dbe94eda724b79c2ac534",
+                        "c0200b5442f41779316e0e250b7bd011e12551b2babc96c9228f3187fbd17eb3",
+                        "f3269d2e80bfa7e80397a8d32815f8fb8fc0f8dc01dd1c75cd57028a23e5d462",
+                        "d6be8612904259aa6ff43ff30a2bbeba9d58e02f479f56480a8affc2cc9bee64",
+                        "a67a26fdd90d624fff7e501a2a946681134e32e3afe3094a0c3776229e7db123",
+                        "43234eef33f6bad45358374d23ded2731a35c12f472cce58d05e6d9ee56c9535",
+                        "f0217ee0507b13f56f8417d0c92e3c76026da461c22dbb7fdb653442dcf65ef5",
+                        "d9572135cdc5ba7afbf9871de3ffb68a1ca933e71b80e8766e678bde59ad2b52",
+                        "9d32d8b859188827a48fbbc7660900fa51bdb1bbf3dca2ecac1392a1cbbf4757",
+                        "daedaf79fde7f4e49a736f5b81f8b6f505884a073c5aad83997b93bb9685ee52",
+                        "fe7b3ac50841778d1283fd836996b1865f45392d53b95f3bef90ff657a49c498",
+                        "b89b62e4130fe4d40232744fb0182d477047acd40d32bcd15fb6181ddc890a6a",
+                        "0ae8786dcd5bffb824b81fa038b10c9127b811664e0d9655d537d95377d6d93c",
+                        "8608661859b838a7e8ec16e15db1114aa9db6b141877851e09439c591b46d830",
+                        "f5351c6f978f600be1a71c95abb638bdda6a7f6587e3f66d53bda682c7aa631f",
+                        "b6bcd591af74caa9970d39e0747bf20b56590878cc5b76da411525fd34b71cab",
+                        "bff91200c32ad862bfee68ac1fac4b85a5e6dbba4fd00a7d09e217cd226ce777",
+                        "40e5ebfabd309ba228262431317a2ffa268074cdf83556682d5f5e8c77660c5f",
+                        "c379dedb960b327f684e794ec212b11fd1eb8f20a6847676554be85aa4527dd2",
+                        "e405b5be582345aec0595f1a8a4aac6f938b539426fc7910d1271f3e2d1ba81d",
+                        "e27a84e97deb5450a38bffa685d0461dd90e2fc9c42aa1261da9d3b9fc8fa0b0",
+                        "c8b7e2506c4a067bacda36ed1bba81327b18a08df3fd373be25690754b9d8439",
+                        "5b8d011d0493a5217b74d086f4b8db0bb38cb357c76b1d59441af36806ead1f5",
+                        "4ad67654188a9c920bf0bfe25d22c433035d876e28f79a7c09c5649ae7b970eb",
+                        "2a0abcd054b303b2077ba72f2681a7832712b526b145b62c601741efecb360db",
+                        "bff88f3f33650251f8b9240b1bd94621460baf5d7b224030ff9619a6c708c56a",
+                        "d8846d0b025e2eb7eb528eabb478902ad5990d507837cff5c90b1113addf4c75",
+                        "e57728788dee9191e55c5588236680bec3f0d2cb8791da18064a6cb341b5b7a5",
+                        "f291bfd6644103b66aaa5208ecfb536a28d6209462f98493847ba6454896a369",
+                        "8b0a1b5d290d1069f771d50369e662c5f3c777c2ec3efee722d1a0ea58c6d9f8",
+                        "cdc255d80343d5967d7418ad4edb8dc99ac7138c1621bb8beb0869dafce44cb3",
+                        "cf363923e12340b2e95d7397df7775e3d6d98539001d8262048c67539be6a7c4",
+                        "aa8e17f4657e2aa01025d8c99112d7002fdb1abb086cecb23d428081c87de6dc",
+                        "59faa9c953bfd7f7d5bbfd363c25ed4089fbcce464b2958c9aedcd5729d4883b",
+                        "fd0e1bdf4b5130bfaff244ebd4654e4e0df288abf7673df010bb909286f93ce2",
+                        "f354946364f1449f4cb93847742ad2c2ec82163ccd7fb4e0d5687fccf1a2a018",
+                        "8be151375abca57a5df2d52428068eff6f82dad14d5bfd08a699f8e747ddcf99",
+                        "14a1cb09f11e6401ca5b119808a3176f893db83a0c23fdf9c393ac78139ba429",
+                        "1043a8492b8a8b6a8b9355669a29fc3f2e1e01df59741458bfd3014420df60c8",
+                        "338caae1b0d36e70fb8bbfb3e230a25fc9eab8a1c5b727e1313d61174c878411",
+                        "8e1509bd3f536a9e263d5bbd5cb5d892aa0a860c104f0ac7af74493b9d164bd6",
+                        "de5f3b69cd11a453b41b1595ee919dc2175ef867541c66571e6e71abba2661e4",
+                        "653934f935d080105495891b1889aaf0403223077af687feab1570d03cc08d29",
+                        "0cfc8f472eb4c7e30b17ecf91ba335ac1b479a01154e442d33fd0ef3c0e5dc4d",
+                        "fbc10b32be63288c096a64a70c75dfc76f162707be9f3b09675eeb08d98a4f52",
+                        "d76bf859e647ec2d77a7e5b5f726e8eeef59c6ab7fc1bb01c981b5cde26f3eb3",
+                        "64fe376e3defceb8149411cc4cdffdf3dac15aedb2ae45263a0b94877c8b9ac4",
+                        "3faacaf41e61750af0ac6df1b5a79927dba509d293a7fa2fa9e76bd3a574fd3c",
+                        "a7a80a4cd46db9010cfe1fa8859d658d7b4534832e7b44fddee51c53d6be6408",
+                        "c0268812c0e6cad694d5632f819b5623383fbc3e551122cad33b82536f733791",
+                        "a5a2a39a433131759be0f1f6339c4730de3d401c54c71813066def40e6cfb046",
+                        "61f4ea199859377dd681fd26610068f87e99081866cbf9aeaaaa1163e68fd950",
+                        "65e2e5e77b37be178505f7f40de4e64fd4e86acb9c6236ffec62392e8184692f",
+                        "bc82892fc9c6dc5d7bbf16ba4b2bea2cb9666815bf3f680f72be395384a299e7",
+                        "db5139acccf8dc1294eeb56fae06397f17a040e093d307a9e7b0d62ad6b42ae2",
+                        "43e63ea9672a65432e1b1c21baac7741c9a5f1d6c4e60ae0b4618587415c5a9f",
+                        "75e8ad0712bf9f279d89b252e7fc17ee0add1587df3f355568999fda4dfb0a2a",
+                        "83491196e6dfdec6dc2d09e12380cf55fca8acd4ed8af12012e41f3ac2270978",
+                        "b31d6592a4bedfc5e5d93565a4824f2917326566070ea981e45bdaadaf3022ba",
+                        "ad3b86deac6998141aaaf372f299bc1c39e8bbee4807cb2b6cab7cff32749815",
+                        "e2ea5f557fea88d002756c080dff0350e2ae9c15dbbd423a2be45d660107813b",
+                        "7750f2575cf347fc1b24fdd5b149eba76a438109f7ae02a515e2451179b2c98e",
+                        "c34cafe9369b18ed88c2936cd7cfaa2dad9ff105a9c3a53e49da5e7ad4ae4b4d",
+                        "c7542b4b36dab508ea0de2e1957d451160fb3616c4c81ab967d2aaa97cc0d8c8",
+                        "9da5cd367d3dc450b2c76dfa1ea0ad1e52db56eb7426fa031f2d08d919eb39d6",
+                        "340a3d854262aaf7a8a6bf005c21ae7ef62d58d052c1d108e7e09e708ac3f0d1",
+                        "dc2baad94c21cf7e37a4208a6dddd74bcc84aec852eb308a39ce9f81f6fb883c",
+                        "d21cb6a6f34d9a66c167c4939619a8823be213ceac2bf401721495628d2ea3ff",
+                        "55f3144838496089eb2af67adccd4b27340155cf2b1cc885427f4c7d4e7a8666",
+                        "86ac6e18b9931bd435b38f96d97aed092e1fa8be47089f00bc44b6f7897e64ff",
+                        "b4044a883dfb2eb9f4baa42d259f87d5ab39821470f977548a435cc65897a162",
+                        "d75f0fca387134162a37b5037c5006c3e25c991fd5c0d3eecaed3e75df90b30a",
+                        "4ef8fd941ecc624d1f13ec8c0004744cf907bf91f0a25ea0986294b81d5e45ea",
+                        "015e5322f9f2153091b70b0341912ea37a0da3ed20cfe9b8356c1ce882c00900",
+                        "65f0ffa646fdd7a98f1dde849611f19b2f443703a11ff5a61568b0ba7f85b0ef",
+                        "d9515617ba3fddf4595e395e0e033e9eae484810a478be85bb0eb3851000459b",
+                        "e3858e031fe47a5edc3ec572173de5ea77e9ed292968af2c6ff2fbd98e5d7996",
+                        "4fcaaf279411aa84d92f548b1dfc05458af2afe9ff577221e4b1d82a2e37368b",
+                        "269b84393f62de52b612e2f9922a67d06e523e27d4d2fe6d3aa68caed7a2a190",
+                        "4d179db7af1ec1b6094dd55ce21d26a54e395f23cc3428c0de6ef171d6b015ea",
+                        "1a508533186b12799e418ae46978c8bb8bc88fbd8a478fbea38b86987d197ce1",
+                        "ca4e5990f8a59ddaa61ea319c9ecba88cf321558b8735fc262aaa172185801b1",
+                        "0d48ac9f64fd82bf2e95ffb1eb9f1f73a8dc778417672fbdff374e5093a35f23",
+                        "c2b88c4f59cea3fd60369fc386ac89d22f6998a69b24f4c8ab7fee63247851a9",
+                        "75fa241c04b786f0f2670e0b1e45134aa76445efb26280cf6dfd926f0e77446a",
+                        "b6b80a7ed9aa4d50ec56812cd5a04fa290591976b0adce14e6657815764d1645",
+                        "c29d8b54a265d59ba2e8eb1bed27450e411ee34ccfda853d3a83c1da2fb75b3c",
+                        "180681a90fddc13a6f216b87128055a0947736248d967a5170149a50ec8020f8",
+                        "f65b08dc2c498a0f01adf70e45c5ba21205e259186f928305961718fd086e08b",
+                        "43e8f556219e8e6a7508a2c5ae19d6de0cda7b9f6e893bc19bb68e361c37c786",
+                        "367709af13a857bd2b97701b27c88a7c430a0e791a76c72896b575e017d8d9d6",
+                        "c9207c31bf4517e18513602801a0780242fdb91c1ef85924c2ad4ded7bbf1ada",
+                        "9e48f7bd1d77dc7269d121584eb914303aacf25a336d42914300659e0f67871a",
+                        "8a2b8b728756feef55e9c9bacc138eacf609589afb4422ba2ec2bf9aaaa6b0fb",
+                        "5440c68bcfe6a804c5865c3bbf033033bcabe29e20dbd9f36f5968e2eb0bef02",
+                        "432af6a45d6f2a44d5d6de8c82c4b43ebfc8b289b08866d0c4b4dbfe7337b31f",
+                        "4fb77ac98b549ebda2ba41cf0ee99b55c23386dde4cb505ccc497c4337b243be",
+                        "3f1af916ee3982bb79c31921da5c90a315c9719ef93d87be323bdfb13c6e2770",
+                        "4268889b9776502d948382bc1c9e065793104a2ed0e8aa75b2153b62b4ccc097",
+                        "e14719c99770cf507552d3d64eb822c8c7a6c4d12c769d6cecb6e6e05db85e47",
+                        "70adecdd90fccabd0f39e9d41dc19c6ba9afd11ddb7f09c6ca9c3e568b9e7194",
+                        "c9a94d170bbcb06d9170badf89f2f3533daf8e15b633dbe7ea1d02c62fd2d847",
+                        "538c3cff924df23105e51cb100c844f356d0d05d06e3aacb7c30f98c91292f72",
+                        "bee2c32fb72004ceb24d207bd890ba8fb4126848d2a7bb02ba580c2669f7d27d",
+                        "98db2db86a3da56f16411bf6c2e27f2755afd38673bccc15af8991fca283cd8b",
+                        "fd8f89cfc412008ec0752fabaec3ac72d6c89ad81286980e8138edf6ff4cd992",
+                        "009704c84f0954d45036969fd15c7293048156ff97a76d9c72a08248a4dcd725",
+                        "593b8d1e74c299da61950db52fd3b08f44d6cf972ec05a5c5914da9f230cacc5",
+                        "e8a6d9cff900567aef290b62a57d8d5528b7468adbe2ee0bcef8ac47e2dc1d7c",
+                        "9fbba3e66b12c7c926b88afb5b4a9eb03d1afaac94f673d45639ce9d4dd51416",
+                        "b7f9c83320d1b04ecb9b4f714da462b7bb4e4ab7cf3625a5f0bb497f5405a038",
+                        "4da28a828ab79336ff2e766d3f32e3a5ad11af8203c4428d97ce5c0054aaeca6",
+                        "d1d9ee683589c16d6d043f383ec2023953c482f9c32704fe1a461ba17da05ea2",
+                        "0706b6349613201f5bbb9c6125c48306ff53d4688f64dd994405abad1872d450",
+                        "b22580d4aeda8ed6d73c59bf74efd26c3edbdeb0865c0c4b6ca61db39fc6fcdd",
+                        "978e4abd23ead67962bb223e372c8873f283f2d6bc3b0b0ef6a21fdedbf48420",
+                        "d37e209428acd60797e1e77636bdda5204c56af262d487469b6eb069dc5ba0d9",
+                        "44622d438823091e0823695e5c08b633b3f0c46af0286989798e27530a20273a",
+                        "8902b51c808d5143cf6e368faa11e4e86ff0d373cef041553662da373376ff59",
+                        "8250faa8be69d0ccbc2df66b1046d1ccd6750503855943542b6610a9a6e9cfc2",
+                        "e75d7f1982478da0379f975f964410f4e5645f954ace65f0ba0eeb1ba7d7b190",
+                        "5836da561d17e30faac4342fc555878d144b1108f27112af7f425aaf90f42efb",
+                        "b0d06739420bc6d96ccbae8336bb9b6a28adcac61f1f5712915ef42456222332",
+                        "c8839deeb39bf4e9743d617cf5efc29e9a59f39d681128baa4e900203acab6bc",
+                        "9fca90ccfc4d102cb60b2a6d992c9086a71b1f742dd805cb40b945e598bd255f",
+                        "b08651ed30172874bdb63711d32ef549b43861bae4cee530da74b7874d0deffb",
+                        "f59d3938a18249d47eae4be568d3098688df1c5eee393a913203af87f92ab871",
+                        "68b30e55a656422b4f7757e887a7356781f17ec91acd25d2f062bb9012741423",
+                        "ba79b09ddea8bbdbe7723a906c367b4a51cd8aa47fbe2836c169ec28b4e51af4",
+                        "51b2803fc4d01eb5e9f011c74c5e6b294327f44052e9e56fd0b75475b3f2167b",
+                        "2a40ad807c8ec22752fd4886570008b62762d208a5ea24140813808b64792c48",
+                        "f2abe05e84099e996c1f9a2be789b77259322c5b28a1a24ec418038e77a7c252",
+                        "e39996b22b171c30c0d9d7f3f9b89c8cdde606af69dbf6936ab50d4a8540a43c",
+                        "6782c67e3849c9ce43967ee303d29b12545af84fea12c5cc4cf1f973214eb2d1",
+                        "3477e62c947ab134c3242522425c234318e22998b4f6d7b08422427e36d01004",
+                        "c2020358b71b1f043bff47e117027bc8112d4dd0d65131063e667da9e0974357",
+                        "5e3c95247d735f46b45940288d0e8c0016ee553c4939aa4192ba7e52cbe63b63",
+                        "f3ef5179680400a2a83fa5b01d823bc3906d68ffd29ef18923262472afb8c685",
+                        "5a2f1f9be05ce5402fc0728614f98e6c5d8a30a7008fd7114d2e32f128b99468",
+                        "80489be62cf13a2efe0f72ae08422eb8b9a033bb24783bb075e5a030b12f4d12",
+                        "01aa376514be84131de256c9fd1f3cfa05edd4408a332e699c2f0512e8653203",
+                        "6a59eb72f291d9209aa9ee2580a977707b28e3714d04859352826b7003759f1a",
+                        "1ed1699d9c8af25571a1280b6f5251cf690d0005bbc222829ed1b5c8368fb7d0",
+                        "2b8966e5eafc875e7df9b828674d7adfca2225a5c5458efe5d3490932c0011be",
+                        "d0f30db6d5b92d763aa39c910bfd007d8ce08f58cabdfdb67e38b12478851a81",
+                        "2b5370d6abbb3e0c0cf3d9187e5173d7784622b770dfba6c33b8d672e22e12c9",
+                        "7a874cc8981afc43943b02be3428c2150ca2d94dc2735904be475872fd48bf4b",
+                        "ab8bc740762787a90716c3f1fee072e57031a1525d52ce20214a984e793307b1",
+                        "40983e94cc324c141ba33a7cc5682f3f187d832dd665a2503c4101ce3710b2d1",
+                        "ea73153725b2ef43b2e10a05b7426aa8e241284b1702214e8dd9cd04b38df68d",
+                        "4ab724b8efa9a325df30695daea6894d5da08aaef739f20e716619f4e595885e",
+                        "cceb8bbf3b3bbef90da4b219fe547ad6a3edd9dcd2ae48066f2511a8769e286b",
+                        "b8c442596d32a409e8fa7b4401d52cc8cd2e82ac216d374933dd9013535b443b",
+                        "0a7d2aaff8434564372ad339e2ed316650f490f9932afbc9cfb5f9726edd227d",
+                        "117e018ab57319440ca476a5799a3eb87eb7738a793fde1b95c34d32cbeb4522",
+                        "7c84152e37659e4be0e0806e11fa7ab154e5dde6bba50409c8c475f480016120",
+                        "4408ece10877a6ac3f4320941617b72c27fe122bf0a0b94932bec6f7f6c5953f",
+                        "5b425b6d0c9bdb4fe93fdcb1314b2ecf3cafb77cadea5a3fbc1a377c04c77aa3",
+                        "2352dff4400aeaefaaaa61cf37512d2076e3f5bea92d2ad51aa99f630ef25a67",
+                        "08c9db753634d99a25264104c5b816ebc15b95e0d2f84855d32e52aa90aa5aa7",
+                        "91d5571d7b2e0566426cef2498a5690d32e30268c0a3fc17d81e4d3acdaf65f4",
+                        "71b408acc816438a0acf055260a433b5b0fca4a71e627e54ed7dc96079846c44",
+                        "4c925a3c7a5c74d7ddc2095fd3c303fe9af708cc54ec1992f89719a45dd2e98e",
+                        "60f56a735c8f2f31efd7580c90234e9fc622efcae366849c63a796bf80006a12",
+                        "43961c4f8130c54f32b45f9ee39fe88faab957a734501e7b49e7d7ac8f81ba91",
+                        "5a503cee0a815b1fcc4ee6000b8d88e7fa176f7fff7ebf9abe82379a9b87037c",
+                        "b19e6f323d3ce96402d8ced832944a02728d9df0674a9a7bd8e18dc8896de94c",
+                        "a743c955a7b559a34cd8907b9eb7a40d86f8f15a58e90b91c9fd87414a91b3ef",
+                        "b40cb00eaa805c0d27e86cc289e34dd354d820453382954ed2ac24b27d38c2d4",
+                        "e6016c78523ce714a360f77ad95b39bb8a724277430e6d2ea5a2130334011727",
+                        "e8b448a80c197809e559b30fbff6a7a99d1bae7409ec00c766a129ab70e47f5f",
+                        "4b42f9bb88185504e200703c9fa8dfbaf850978a60827cfe7688c434c502de0f",
+                        "d48a1aaa1f36222f4acbaaa8218e249d5774acf8abea087c9e2ee9e21dfb2ab1",
+                        "cd11b4f441f834863a99988fbecdf8b19be665edfd19ad4db62e9d290a98bd02",
+                        "2d6152c003c48f8f6a1c2693dbb5cc5528e7e164a16beb798c772dc85bf2ee21",
+                        "0f9af43eaaeadb7118498e562e45be1ee1e9b7f3787cbec3aeadf671a2c3138b",
+                        "e87a2dab8e4945b8ad5fb7866efc8dc76a990638822542050506d1d0ce78fcb9",
+                        "190a2cb2ea8d06d989d23ff075bcf61b236841a27975f89bdc085cff823e55b5",
+                        "9b09d9ad2f3a069a4c9b33e77a833fdd6605a2095e8062f8b79a5fe197dda466",
+                        "06dd4f3da3273bd8fe869a976006745235347ab53612247d3e0428fe152787a6",
+                        "8dd9a7dcd863f7a8fe98ed2f452615a74560ab7ab964ff161834a6a6d5b21b4e",
+                        "f68bdbccd9955c40848cd3acd5133f991becbcfbcf167e5d2018633229d1c0ee",
+                        "d1990ee38345d528f0115a99aad45cf41d3a579ee1be601bee3820f181819f4a",
+                        "b09339818aa6b2bd5bf955109969d4ed43830a672c479cf34bca1661e31eacf1",
+                        "c5dc68711d6a27092ee6db8a779fb1972d769a4d571b759e6bca257493b1031e",
+                        "6f7e4d57051949b2abee3b329b299d5a6f555d06cdd83811fdc7d47531ff7179",
+                        "45862ace8f36c0a3a6d4326817f0f80f3041622e85e055e2eb89dbd20d0df324",
+                        "b57841327c49f6c475534d0cd18ff578958790ec3c819fa5b97d8971252138e6",
+                        "e83615f0779683ae32d0f019b20cbf2da935403f509bbb9d2856dc6201b613bb",
+                        "be524d2863d41baa171561328c9435163eca92d6e085ebbc29a4e1e3cc6753ca",
+                        "9dd3c020ae3e8be0f6fcc97e6fb0e8c76ce9694dd5ca8a2e8a122862f552a421",
+                        "a7e5ca5d0be1d24c69f4992a3c1a8f6acee7929afb2538045cf737a5da62898b",
+                        "0cdda68b16cf1e43b41e2d2eedd6547972eeb5491930f9057a3c07743219c1db",
+                        "5c83bb522e9a09d6c81af19b7802ea30ad22484b2ef0c609ade92089e7cc7248",
+                        "078a6ea5a4b2be65c7c423f7ad5e4ad909248729b08264b8f880ac5d90f009f3",
+                        "47a73b39d4c6c631d148b9cc31dd43311d20d91592a9ed38d87579491cd9d855",
+                        "7c625f9d16a27bd30064682fc896a15c4b504819233610fc4a88cccd271059a4",
+                        "5f4c8d2cc5c67a0c393493474e74f770f8c09751cf4d712f0c906d9d3903fcc0",
+                        "60a628f0347932c8679436a3990fe3dcf4d02fb9c24fe4fa9754717c176591e0",
+                        "2fb12765c5e1eb877c55f574c7dc61a4123ebf7c7e72cec7d7e83420fa578853",
+                        "2ef3b7fb03472c1f5a850b40e9b35d9a35d87f05292c1d0d43e863d7e7ec6b4d",
+                        "16c54fff31b4da393130f6eb18111392a96e85421fcd1e928e17ae6359172221",
+                        "56ba9c544d0ca5de806803a36a1a19f53ba914f286d92bce307f91eca1bf5652",
+                        "e8df51a49ab47130db5332e1dd3f1ddafcc2ce80150ae3c37eb100f5627b6bf7",
+                        "3df4f7f14f87f1ea6df31b9b8269cbdcac2d8590a89a2753d7bb11fb8ec576ce",
+                        "ed2560a20088fa40572837ba321394fb3665cc60c15b19a2fd07333101636953",
+                        "a5ecff5434cd0aaa835073066abb2b9f9e493dc4cb7b26983f93c94016c09297",
+                        "af3ef059dd49490d483b8b9a99b245695483aaedbbab25bd1a54852a26b28802",
+                        "39d2d8d4da53e0c373a1e39b4847821317f10d9fff8b7ac598b59b7e79e2be6f",
+                        "b1b6815684cc275278a6a3b0a7de9d0c7d4216f8f1b8c8f1d075be64f70b79f4",
+                        "fb2abc840ce8866537feb12531f420dc89ca9de12b4e192e1ef7cbe765cc4816",
+                        "c7b6c8d3d4ec9457b4caf29f6a6198f893c51263d73d0b12e8bcf5630fea1e7f",
+                        "aa5ae0d35bbba924165abccb826604c80f6ad55781c49e6016bd8207196f66bf",
+                        "650d0eedab56b6492743e7c5692651e8aad37d1a9939963141a67482a686e9c3",
+                        "22d0b3451a44adb8ef87a116097e3ac46b5f8345ebf0e5dcec960d2d55a72d93",
+                        "e3110bee29e6162f431aa68c170d622f819bc4e289f6c3e1d695cc444c8dc171",
+                        "92fc6ae91caffeefc1e16e816a0ef299e17c63a968d41bb91b7a6f587d34f8f2",
+                        "76d986dbb1668f0069867df25251328e1aa15e6f31233eacc856e61b5d328e6c",
+                        "560b821428968d6304aa517c6b0df4469059a097171e7180c0bdc1de4c8c2dfb",
+                        "199db247cd1e61526d67823aa89c7d3e9a849a1c48983902f4e732d37491ac95",
+                        "f3000de6fbdf5997bcd5067bddbebd4c1057346a69164446e4a2fd0fe575461d",
+                        "a36d62775f7abac51834f25572e05a0238de20394f0b8a5cc1f33b47984c4a02",
+                        "b6df530ded76cd3cac5eb5f6516b7b5aad5ee43beb0876c8f1eddc38f4e173af",
+                        "a939753b3d570927cc8d90e512239cfb6e52d81b5d56ea80eb4d0c46572d9ffb",
+                        "915cf3bab38606e7266a5f7c2179ad469b07b134765900ff6ca2a5ab83fbe80c",
+                        "c084076c1d75861928f6a28f566527ad2913a2bf829489f57dfc8947c368c50c",
+                        "b71e574bfd980be24d08395d32430a000953a021556ffc4d7693190c00e74e77",
+                        "4cb8e212261c1ec6fbc52df8cac337d6f5d189537645f7d5a7f911db882db716",
+                        "533abcd8780f59049a8462ab7ef505f5ccf1d342150c30dbab5949fb084cdf21",
+                        "db533c3913044c03977baf092f0156071c2628208d14d81872162436b87123fa",
+                        "ca8ac0dbf15bef994221f78c0248b9a6408ead1166e623c6db7652a16c016c06",
+                        "0990b3a317a95d36b6b6ff1fc6736fea01529a39c0fe06e49b7fd564080b6df4",
+                        "787469298f138d1c490251895a85d6080e52aa1df375643d195dbe7e87847949",
+                        "68a371372ba0f489c8ab8672e257f265a418e50c6c969bbec4b24105850c371b",
+                        "f8ba30581f3cf31050db47b7a43a5551d13b9ce7001c896bb79409f4f1d0a31f",
+                        "23a5c21151808ad600e97139099b79c3e1ce23ac1252db87b2d4cb88359cde4a",
+                        "9886c12c93ec0ea5d14478fa4a9a38c4a1025f8b9d595deb371d6aff79f93b04",
+                        "4e4f81cf1628b6f43db1db218773db5f7a405311aa7ee5ae2072148a867a1437",
+                        "a019556336364cf6a38501be26e917b0aa2cc2c37c137fc269659aa44a3e5ee8",
+                        "7c6b6a1324fc40c2373c6215ad699f723b826f02397eb6f6326c1a5ed558a115",
+                        "bd21001934e50a47ade3d713cec8dec036d54da0a976ed3b690ac080a7bc9ac4",
+                        "4db0292758deb6ab35aac12fd6387276b2f32cdc859a15642f01931c845fb0ef",
+                        "5431a87a0cd32b11db5ced545effb22f220ffc69a60ac552844db86bc7998e84",
+                        "c6f343782af6f6ad784f9f85c1123fba0b82ac07119a61ac39ed2fbd92fc0a90",
+                        "c412d2dea34ebbda964b17cc12c1da70e7dc428c92eaf494e17100e9ac65ffa4",
+                        "e9b947aba6755de52a67725be3849e3383e187099aeb1bef5315d22609368b23",
+                        "0b2d1949bead9e9995b717a821f6e5dc3136857b178638350a16c1a32149c6ff",
+                        "dffb51c4bc98c9f0c07ce18a88877d48947706cf57f56cc6a29ce82cf2f74c07",
+                        "97dbf9a48f3c92fd4674b20ed6f635bbd92af003de523feb5ecc4758169e5857",
+                        "cf701be33d1b3abd3357a74ab2f7f03fa78f7ebe0362994256020fb1fad75251",
+                        "fb26930bfdbbdd6f69be65c3c01536e09a30cedb747b69719035e31636e47937",
+                        "5725b8ebf2345fe7e660579ae94b84e251259487da4428a5f1f0cfec19db0639",
+                        "61b92f8043e5a035b2144fad7b1df3ca7130c56cabbe0dd2757dd737719719fc",
+                        "35a2f85adbd0b6a818d84a16d8ccbc0947bda389b6cf43ce6ee9aa9b4aea19f2",
+                        "69dbaa6d8a1d44259bf095b55311dd39ce028ab20de30ca49b1a173d6171109e",
+                        "3b68203efda022be691480952c5132129d514b2cdceb0d3a8f137595be7f1c25",
+                        "388d3dd82eecf369794186b42c964871575c03fa9772d57d31280d678f87a636",
+                        "6b493f049d19b3d1e268babf0211d48abd018c912787a913ff71457d54ac3606",
+                        "53261340605f5e63ecea85eabc5716f31be1d16d1c91c04f3a090773b288e62f",
+                        "7bc9e1a6b36320bf97e60da91091c0ea848653a56cfda13f129e42719623c500",
+                        "7347ad263d90e20635eca6fe1bc89df06a4ec273ad50e1ef78a27fb9fcffca13",
+                        "fd286c0a1d9e4a0e0aaf97b7f2da4b219e385d7a9afc4982698574d72ae49daf",
+                        "0f42f9f37bf77fc47e1c75e0206654e0059703f2b7dd261f91719e49e586e7ad",
+                        "5c1eb8efa7c26ebb6a3e2cb19148783df0b7d5dac0e80b3c793ecb556166a88a",
+                        "0fd0ace6df8a7ba03aa6d52f78c3e58a4720a3852ad936bba80e08bf7c61a287",
+                        "020d473e1c9504366a2204d566b1ca6c968320e30382129f95a40c739cba7f19",
+                        "ff7051698eaa84a3ffc25d5dbcf923933a1a59730db33e8161698160a090a45d",
+                        "df0b1d015cf77e47512cda3d49be662782e52715fb747cd0f73934109a066ff1",
+                        "930edae2fb341f18849c9b8aace01d5ed2cfaa013f59647cb542daf33ee60db6",
+                        "acd5d0212d8d1bed17253050038a481d968cbb8007c5c69f35d328cc887723c1",
+                        "17f76ba6af39c2d64b95554ba27b12818e60284d166a9da60a3110091c1dc3ec",
+                        "e03914821b7b6185e239eae45598d504558175443c4f34b700c2b329beaf14cc",
+                        "cbde6cf03818faf19d93a082a509c3601a6b043a66a222d389cd44d4a91d38cc",
+                        "c42abe41dfa793e60e2ab797e626bd8a5904e03633b61c513c9f80c2be9ef0d0",
+                        "b47f9040a5561c94bb5c11ac8042f34d80e144a3f5a8b7c0e47d7aa3c10812ec",
+                        "07f44825dbef5d2c5fb089411e2eb2d4f7e7eeef6697852084acc7b1f48aa77e",
+                        "ab143316522be7e11b267b89677251a5a1d48ce7c90ee27a6c66e1857d71e576",
+                        "3e03c42ebff10fddf113e731d91c96cba59d8d29acb8f6e63e0fd171657414d2",
+                        "12a073e1548bd7551d477f3ffaa790d42105596f7c161a623650f1a053c6f053",
+                        "4882fb1b192fe817b836fff3baf788d89442f75d3ae7a529297febc3ea896779",
+                        "a3b5c64eb6d70663ce13bad27c28cfe46ecbf721aa12d667f3903e155f37471f",
+                        "19283ceafa4e91731909817f264f997836d529c523881913fef99c04c23f636a",
+                        "2c9ebde51c783478616c534f8cf30c1d9bcba627e82873678054f8c05f72cd20",
+                        "6addbacf1779166778a472eafa5388de1e51765c9264db7f44297808f30cc940",
+                        "33c39d4cf80eddc5b93cbf11f5cf6de02023709b71c3388dfffd485becf93de5",
+                        "73d7856eb00d8f0eef1cc6ebab299384aba68e5e7c90e4526c4a33a3f7b9725b",
+                        "f45968304cd3eaaf430b7744dac3bd2c287c51ab1418e02973fb2f6bfd3d7847",
+                        "1e18a797ff5a58a2a3251358d7ea2e84895a939dd63fb5a3c77753f324b9c86e",
+                        "3ff531919376e2ad060436f9d27129b7ef17fb8ff29cfce1ef3726833aed96dd",
+                        "92a1626588c06d5a3d74a59f23e506460f99323c09d35bf5d49bd73450803f50",
+                        "be288f4cfe34bc80521860940d76e5a42c85f68ca190a4ad71dcdc18c4198103",
+                        "9339b6786bf2c8c1dd4830c384e03dedac22e92bc1aa9cdc3449c674bef72ca6",
+                        "1b22a0e578c641613e3602764129e027e101e2d423d9fde2a6718a7dbd726eb7",
+                        "c6be938d80860b8ccc96ba087fdb2a00d980808a61dc79483710ba87f1529dde",
+                        "4bbb241fdc1feccd155ac9feb2ab91cbe714030cab20dfbf34318ae72ecd4a6c",
+                        "706c4c5215f54df3c0c256e9d6c54de897716618824d1fc630d00d3af059352c",
+                        "93e883284fa263b442a033252e84dd637a6943f49f9db224855327139dc8417c",
+                        "689dc122cf1c3b550ac11e0041b45844b794a45c31a2896a4238242422b23819",
+                        "1aeed96414641bbf27a32c1a94b5bc224947f87bb915a53dd2362a5baaac9ba0",
+                        "0c0f53761b2c3f168b01cb9cc05894cb86ee53a02ff0c5fd5f160a8d0d15ae76",
+                        "da8b72cfb9146b496da6719d87da1c52f295086935e1f15da60a86b24bf29b97",
+                        "2389058fa5e0174f217260522f49d07b76c7758b0d3f7296809104cf78561b40",
+                        "0a59439df43ceb691a13038b87b7ed5ed2d05f7acddeb2cc502d6df537b71311",
+                        "ad9989dc2e5e4d1a473e2f30f9581ad5dd161f68765adb6d2e70c8effb23f3ff",
+                        "466309e21fe5c8555a231e5214596e196ad44683a8e8376e453daf42b8085d9c",
+                        "a6ceea7c560556cdba4d7b433400688ffeffcbf27bc7d05ea507dd2d4ce948c2",
+                        "b77e4ed4bee931d43571d6f22f0ae253ae2dc63871c5e4845c6676c7dd3f0eb7",
+                        "7ebef185856fed824ebc3f38b79f82746b2983f8106c2ca6a8b64e410040de10",
+                        "e9a0458703175d02b8fce2b8ca87d2a6062270e97499130aa81aea621b42567d",
+                        "ae17cd0fa9460c9caf2c158e1ac809d0baa510933aca2413c316840ca42d69dd",
+                        "0d485a3ddf329e8b8dd47b569c7ba6faf17d4dbe280521a520ece56136ecc218",
+                        "20241e5f5bea83a9efe54520cb4e18b2bbda3eb83b0875f44c62994cc2f4a481",
+                        "ecd706d3f483600f37f3b2b268cf38033db1290e0359a089e7dd44d35300eb39",
+                        "326a9ece9955f2f872f0f6e401ff4281f1992d9f22f247ecaf25a44f5661c732",
+                        "36f0d608c831ea7365b0ab0f2d78d44f9b6cf0a3edda625d02a0e8db1250c644",
+                        "fb476cab0554ccbd17ef87ab086fb70310f1b468e61050e4c47a9c003f71a88f",
+                        "eae0d52bc60c959f73cbf3ff7a84f1005b935e3d71b64dd076f23851b61e19df",
+                        "c8320f5862f6c97350570d41ac318ab729aac137043d0ca73f467eca670fd2cd",
+                        "ad83f844f80d1bdc54559399d55f09160e3041f63bd85f9482ef0e0159e576eb",
+                        "faca90225e0b75e9ecdb380a4f45937016f843f188f48a956b24601dbe2e7eeb",
+                        "da4e04a00f8b7a2724c60b78a8df4caf6d3f65a8f5b8a86561ceb9933eb87a72",
+                        "c17975d1893a8b62915a085e714f9c6f85d9442f7916ddec6a822090c8dc655b",
+                        "7b7f3cb7bf35478e8dab8f33acc8746aa6ed70189e0daa8e893783deb55fc50d",
+                        "d0311b9d76278b80d7f55b8c4bacaa8dca293cccea20a784ea9fe254abe93b5a",
+                        "91d99863528e63d01fd353457a910ad683d11614458708b31fae2454fa224b5b",
+                        "b0ae1e07f65c9dd764db153aa46cf42f68d780e4b28e642a4559ec90e8e3cc39",
+                        "43fea848ab8ea34e591ac9c9f98783b3f83a812a9bef6339e81bd380d4d0b0d9",
+                        "80695fc224bc3d9f16e1be9078e62d91b1769c4147dc44421531a213b4a69460",
+                        "ebb6cfe7e39f666efb4e256af94b5b21aac14902ef3c23e6788ffb32d16da24c",
+                        "ef5b6beeb6cf57ad290d3be9fe6790221fe4685d99ced85082f66cea6b2e2d96",
+                        "a4556671f393544c118880d5e2b6e0b6a9d571325e35972c8bfa5ae70a9aec8a",
+                        "0df55165d1eb0fdd4b62a25222e060b21a4e5be7b8388e29380b86b2940efdad",
+                        "19b60ec413d47f58a62173098d1591609281e701dd079656a09512e8684badaf",
+                        "52e4284b527671369be86b4b20545217254f85faaa8abe39953b59fa1557442d",
+                        "8eb1a4325c5783a09e0febbc365313f3c4d35a2c1618ee6532572ab2ef1124e3",
+                        "48a251c051cc0c8b051b806600f00342ab81e3aa111e066e74adc044502379f9",
+                        "97fefae91a85838a8b93a4a8cc0edadc2e50b43c1ac0e36a259a40fdf8a4e213",
+                        "aa1342bfc905f3f255c44aa09df477228c41977c060fb5f936fc6b4838c5be7a",
+                        "b9e6594d64492899962352ee5c918c3ade3efdf92e16bd4320e0da27ab3ce2ae",
+                        "1a5db6b7d6da5386f76ef77cd6ddc99ff67de917819afa746dc3c5378a95f30c",
+                        "bf64bc337a886d5d799d839f03eee210acab95f613a17db30165d3e249d07e87",
+                        "37b794fdf56c4ab8d2b4d00506ae67f02060625d55adf6c208cd2f53b6787cb8",
+                        "7df41b919abd69e7acee85a552ed81023aad7a4f1773b35f104af8d253e9020e",
+                        "71be6114d2cd31bea00baa69981edc59bfaa7891ed5849178f3711f37e5a9223",
+                        "7e8908c6f9e14300d44c2254d022578f689d8c0cab56ad73ab97c748a71e7371",
+                        "06a70fc0c9e0e0a3a67dfec26eb5367836dc932f20f65770cd27511f76a4ef7f",
+                        "5f902ed069cac194a12c903fd9231b3b9b73ae499e47206179a5db78053b7d48",
+                        "c4587b59006d177ecb76f64a083c8bafc926b243a6e9ee6ef12bf0f3fae367ff",
+                        "eeff57364b4cee2e43ed7811728c6e0dc155c94bd8630567981c00e7983c202f",
+                        "d9ed39b27fc2cd3e1c3bdda317c856557795363bac22e5475f58614be9da5f0a",
+                        "5fe8295650a3ca6dceb6adda98a9b2a52c8ff5aa2b879dbe74dc479c14df783e",
+                        "bb74a5396ca5059aee5f6973f760285858dc7ee84f34631100b641d8f48b89b3",
+                        "bc357b63fb90baaff808482eb645d5523323bf52d98c3fe493ac8eaaa4773677",
+                        "2d052d15ac1ce4eae8e7988c586779ca83b7f20134899d1a72bc05bc94c0b35c",
+                        "ec20f72f981ef2d1397d3f05c0cdb32110e4c7bb9b876a9aa8296f5daeee6cc4",
+                        "039cb433d2315ab0011d4f1b3d040ec7e1f1006fc3278b96e9a8e0491d1a9d60",
+                        "2dcdb4800462a1c11c0e832d04a1c49d9f62103f2da332286c48fe94b456b92e",
+                        "4a8b6e2279a7392cefb1e7da03b42371a678f84c856de77cf13ff9c0891d9b00",
+                        "57bcdcfc0ded16c30a50204f409dfc81df4ad4b1fe673d99920d9f79a397d8b7",
+                        "0261b6d4b9c1c5a585ab93951761c05ae9cd62c56359dd821486d2b1fbbb3177",
+                        "2a71c8ea5108d9a459c6ccb1a614cc2546ddbd85efa1eb39ab3ce0a504cdb916",
+                        "251698409786d137dbce1f4490f83fecedaf384809eaea793c3e688bbf61811f",
+                        "2ace8689de6c19ba00afddca95b6c4d32b9929390c628b9339a77ed21dd9ec97",
+                        "10e81239fd71cd6fc6a7b858986c7c4e1d064811ffa0cedff96ec34e3fa9f454",
+                        "1981916f528ccbc3547bd0daed092031c4045e1d1426398f88298f7d29e61f8b",
+                        "271cf2cafb0c86c1058d1247771cf90cd398916ee1eb4988b19765673a2c03e6",
+                        "9d086afd05abd5ed8e554891229752b2bd98bb124d83e5c517c727a6e41750fa",
+                        "5f2c7ea24040a74f3badd941fc602bb8ba2c2f3dc8a6f12bf3565579587b5ac9",
+                        "0cd14ff3e26eb0253503592d3c2231f067c0d34c9a08478b3ccb6f9708e63bb3",
+                        "7d8c41eb7c106d34679fda959f40538e268441214561488988384d52bc4959bb",
+                        "ad844d292ee314dcfe7b9673493aa46fc09437a3215984514f7d6e25516d82e1",
+                        "1a2a86d0c46010632d2cc42225c28e81d33831a762904c07fc165696e0b21f56",
+                        "dd5549881dea36dc21d79af4fe8fd523ea7198354b09f11d45cdbc16f2f1a593",
+                        "f163f190fa2603da18b5c4d6a8ce38135027e1e27765786dda3d4aea2a9cb80b",
+                        "6e09fafb8b6e87d6189f46e244bfac72ac097f881fd3e20548bc9b2b77a06494",
+                        "050e25827579544b11a0659b33779e36091a9386e10529de15661476f621b4be",
+                        "2e106b4ee4214443a32a625a8050bfbe23c994d5d11f7c06604d67449dc4b65c",
+                        "f46f7dc3ed0045f94584f0638fed6b4a1428e757d0286e64a7d09b90bd379f44",
+                        "4a2c43aa7fa22812393b64ef4735c4ce9dad96b2324d06204d17cd489d7ce412",
+                        "98862e2f2fbafaf00755c99a60aa0476cb449041ee71556e1e7c6442e149e51b",
+                        "4c118375e7aac9cd504042c81c94f58f123924bcc2dbdd07efdf3ac283bd06ec",
+                        "bebddec9428e7802423acb00e58d998f5daa5a26bfdae57697deb463e9e86feb",
+                        "53b03c24b8c7b3c56e56ee1e708df3eeb032bf383d7cb1b2d3fd0bb11cb984b2",
+                        "784badbf46476520b5c6635401f74e99ef7c7a003a393aa1fd57867f185dd721",
+                        "2f3caaeb46d182b613605bcb8bedd3831bfd1ea4e7a041c4f76e0d4718aa9eef",
+                        "1b3aa9204c47e2d2ba2657e13382926d2ead35d868353551eaf9a66a70c669ec",
+                        "c9f2a7d878c3f80d7627ae2b832007dababd27fd2fc13709901faebcb14b2932",
+                        "5a39dc81cb0b6518f00f5c66ac659dbd72f881a78e0c0b13dc88ade430abb90f",
+                        "2f0ee5fedfa55f94832fb2744a80af32bdbf7708ba65a3e0d08b446358da1499",
+                        "1d07c7dda8607fe8e06cefe30123fb4a38302ca4e091f5ee9df4013778e13fb3",
+                        "3fabeb2e7e8cb221b62d4e11ded6d5eaa1db1380b7639c943f60a1c5c30cad09",
+                        "51a1fd08466d6b37cbe7a6bab184c21ca50c9feb5938283d58d89fdc1035fc9f",
+                        "0708c2dc87f7ffaecd46d3c7dac910700bbdd5f9331f262819ec9fc90545d3c8",
+                        "2d8f59f27fbf1306ba8453c032a2d8bc6a18ad2d8f3fec4ec260af16f6213dde",
+                        "3a7455c90f216f2692b108f4c907cde0f64872ed13e6f75b44e5f857695ad824",
+                        "5f1fe505ad82e5de86f16977be619103b511b0ca09393daed964ec61962cb942",
+                        "3decaf9907eda934c124f603d3252929ccb9b99aeacf745018f2cd612ba3dcdb",
+                        "4d232fa8d81cb6abd1fb6806b45c069b7fa7011248f55d1873daa335312dddab",
+                        "55000d6b9fd4132be58fdfcc87b55b28dbb2bc259c33d50e03a9d470e503553a",
+                        "225d9a9f991b12fab890ccf06ee654afad4878a3a8c0bb3ddfdd54af3ba74ee3",
+                        "40df7f285dccf966031f1e8815bec7473a748f37c9405ad98b0ccd40c87f986d",
+                        "c4156b9659801913909aa5955548725ed2a251e9d3b3a587786094dc299a8f61",
+                        "5dc3a95d6f96b946237a9977b4c1e05b24799729f03c191b084c6118106fd712",
+                        "118bf0b7868f02b1154198107b4a86873ef471153967ec7bb11341caf70c4355",
+                        "1ad3a5310730b0b698512c8c7d3e7a8552f75b5c7eec4546860bfdc622f75e7d",
+                        "fb74a1c13b1eb19423dd805a4d85ee771ecf52e3956b51b0409cc5bbeec34569",
+                        "7405d158d51c83cfb8dabb3201f692e3bc089f020cae6b62a2af2c88dd8f03ed",
+                        "08f20e5a8dea1f3217c990bc112fe510ca5aacdefabd5a2a6958339abb88ad7a",
+                        "dec3f7bbee141e55a68d1d164e891d9bf832cab148061a1551475fe33c1bc868",
+                        "0a311678a6266de62ceb20154e6ba5ba5560507d58d8c5798474967b4924651c",
+                        "b4f48fd17a7cd9e0b26e90a8adfa2f9a150d47e9a203cb89df114585645c87b6",
+                        "26a5c76a25d02b0feb4b22e549ac88447abb8fe7c86196a73292f13d8eea61aa",
+                        "2f41b58911b04c3418bcf76dfcc500d03a55fbf1749ee83a4e981fce4e32eb4a",
+                        "411a18b6785d5cabf9b666a9a70cdfc5a1e29228f92f80b9f8d613face0195f1",
+                        "b17d0a2cb46dcc365e065267bbc2cc36e92e20bc0ce24d144089d69282e6fa19",
+                        "30ede26b25bcc2e6cc42f248386c61499ae477d4fb392ee289238c40c88ab5ab",
+                        "f1bbaafdc5f0e00a5dad95c9ddf659747c74d093e1cba8a0e72f1db1d5cd904e",
+                        "09e411ef140daba69cfdc2c3c32fd84cd572a842f53388124b51aa2eb1e40fa5",
+                        "2c408b685afb2574e9fe2a212e92c638090e851026ac80c9a639daf234fdb984",
+                        "a342b54ed7092264595569a37a5e5140a48d5117f62833de3dc1923516d5b917",
+                        "b90af846ef17cbdfdc06399f2d6790194fd2d781babbcb2c3ba005031a278650",
+                        "16c65a8054f7c7c6beedb172498972f2c3dcf0e8da240cc8f120dcee7439c95f",
+                        "8979da949593c80f9164828107f04602d70ca494947d6ca7722180ca85c8c0d2",
+                        "eb4ef64a1eb138e6ec7414b3d841d24e61d6aca94a870d3568f89bfeec28ce5b",
+                        "8db828055ca1154a1c1b60b992299b2a3cc9f9ff217e15a329b642c8d5515344",
+                        "5813ff09a79cd74b6fb3307c277caf7e80f3506afb677eeec65555b7fdb8bccb",
+                        "e15883831714acb3d5c08a3898ddc6280114f1b41c450f6e93a27bb36e7c6766",
+                        "95ee3e0acc204a6bd5f5b484e907056695cf5ace25449fabe87f25d61b1262f1",
+                        "8eb0d5da9c247c962eba9081b9b58413b8f7aaec03df2813c77ce44573a3ab1f",
+                        "afb841db4f6c64fcfda654cf058f0a883166b4066fba6be6df5dad564da30515",
+                        "68fce267894ffd76f551a169c9508e53810bb12e773015aa4c547a56a5806fee",
+                        "6e614d1afb783e6b45301b2fa03788a1fe27f2808cd2b513eabeb1226e6241dd",
+                        "6bb0cdb7d8686d79abb5453c3f5045c1acc2e268b3f2b32444e60796a18d4c12",
+                        "9b99c863068f24297df3431025ec6564b66f2b9f64c1678b528a1dbc4bf71b16",
+                        "204b6f2f3ec5bd0f1907fdb460e4ed6fb0d25de5cc12f777a1ce10aacbed40c4",
+                        "615fba5e47ab0d959fbcef39996936da656e2615b954f03b61fbfaa8e1a4f500",
+                        "529895a7de063cf6e2497d30d849a8df3c4f7339e22a486044cbb3e7496fec22",
+                        "b7fd2e4c0b845850f044f32c5d5123af9d5eaaa693d4350c4ca8758bfb857b19",
+                        "059e015cff4b33f019921f9242533cb45cd65e507ed882205367b746b27f4442",
+                        "1b79153a3a25bc82c7f52a577c140d85854d76b3268e332b5871a4de4eaaa47e",
+                        "b9730c36bf7402a5d06c8226dc11ebec9c0a4bd6a23762a6e9e78d1b996a4630",
+                        "d22427bf91dccfacba55357d4a8038f797eeff2c4dab56220cb00d9ae897b783",
+                        "da19f42f6dc60fcc3d075d6f38671949ce2dad31b37496a638d341757822e92d",
+                        "78132589eb98ac63e53a329f7cee32584dd447bb9fbbbc01e27245ca29c23a23",
+                        "e467ea63a727b9c36e666d435664875c822f94f047f60ac0d89f2733bd4d1f01",
+                        "f4f89149b1a5779dfdfa3a9b7dc5b88791deb32c20db6d611fa013b9a2eade6b",
+                        "7b40c196aef97aa032f8a1ba0b88aed12baf4331acacae6513e8f4fbb102dc98",
+                        "dc87f4206941dfd0431dbae606358b03741e52c9c9830017847042f99caa1a89",
+                        "293c650a8f2b442da199ba6dc31cbc7616c09bdfcb685d216fe5f6964ebdcc19",
+                        "cf3736739c87082a71653540be254cad9dd2b80c788910ff51833053de0f6833",
+                        "b7904a9d282ee147c41a87ab1de0c68f6fe6e8681b728a50b07dbf82ab61990f",
+                        "ff43760bacfbd8a86b77ee50524df729bfc322d221bf39d73fbdcc5172be25cf",
+                        "94b19511a901d6c9863b4e698bd3203bb45f459a706f17d5fd0217b7d4d2e880",
+                        "5fb42d90123e7d17bdf84717dba17f8d6e2e4cb9856ebcb5dbf6892fd227d4f8",
+                        "d403da452541afc98ea45671522db8605d28a1373baa96279149d70fec56e8db",
+                        "c515c1f3132d7124546c2149d2f96bf8899954ed28db737d81149cbd9f84ba87",
+                        "7559f506a7dfdd3ac7f13dbc616629b56b88f8e43e6039205182b17136e45e6d",
+                        "6b3f153c83caaa5f7bff608f4fbc514feee1ad49652691393b26e60a3860ac49",
+                        "b25dc960443d800d107491ed43a224db6df66c12b02b7dbd3415ad4cf38c1f25",
+                        "a70e10b5d457c0c10ae765d7696e96d1721bbd0557386cd00db27f7dd61c8039",
+                        "c12df355cfaa94c9154a29848e53dfb2d1bcc7b68cb1506d067f5feebeca2134",
+                        "c9a697b7434305777c8068af8b5bfd654d74bc5ad82220f84fe16e1cc9cb2173",
+                        "261dab494a2e8adcbdfa76b171a1dfeae0a70cfee528d781883537c35ad37546",
+                        "df2aababde59eec1b7b499858984c1204557f599659f05f6671d1d66d2273d68",
+                        "36bbadcddfe80758e7b91dc8bbd2d2cfca89aa1c50ad41a706c99bd192c1042f",
+                        "bbbd1e0d041cf1b340f9b0873d876ead1b76c60f593e8ba82e2d700309ea5b4c",
+                        "07708bd4113b5e2773ac0d65323a793e5dcc366b1260eb55f6ed80f6fb3eece5",
+                        "b7fd39d21af1c3ff30225230a86cb382680bab72cd83c081495df252bbd31dca",
+                        "a01f7348d23cfc9c72d4c6c8d41d00f25331a9f6b28f704e314f46b9a5fe8836",
+                        "e14b6869725e9f7c8b4d0fbd88d1cbf9a969e800bddeb3b426ab13a9e1c6873f",
+                        "ad16ff69baf5690783aba8de17d09a92af4fe62a985e33c0969ed734d09bede2",
+                        "d3edfb7f2ee7cd654793fce245666efe24655095b9098152093b3e5a12cc41f7",
+                        "50cdf981025f02190aef3c09b5aded26472fe5b155c689acd1600b6f163b0aef",
+                        "d944eee476fcd32ecf4d85d5796e17ec2adca8f9f6ce1c1f66687e2d99a29f2c",
+                        "6eae57da9514dd54a3f5920e1891529982d88c17e7ad6f6d8d24c731e1507992",
+                        "ba0b8bdba07211878e29c71e21bb5aba5186e50fd45b4303f846897b8c409ae5",
+                        "16828f8c425552366cedc41a7ca7f0df1c5e5a9dc543bfd9b0df65021d087a48",
+                        "338222d8ae91833de9008c65cf519b1d021c6072d09cfc08f78d002300b6dbf3",
+                        "c0a24805f980cbf60892cd89af249fb06c079c694e3cd84f0cba7f21f9e6fc9b",
+                        "fbdde53f5541ec1feec1a381409d5ec9c6baffe97ca0c7e06f24e841d2b1161a",
+                        "1752a73a37c14d5080efc1ec13bb1dccb9bcc0281a4d95cc2ef4b853ecfa6c31",
+                        "fd2e0c2b50b472b90d7f4bd119085224219ee533a99922ebd8cb0f2cbee9cd7e",
+                        "3a1d28fe96af222b8bcbbd2e937ad0d1f4128c7de8c7ae4ddf7015b07a1f6bc8",
+                        "7919fe4c1265bc194272f2d3e0a0a0dd4853b9f318baf6287484549b01404b68",
+                        "10f6bf39d6329af3916a571ea4ae1de70cc23a9818a866be45c267284d3abfd5",
+                        "cb0c691d7266460c4af283861919c3ee427c09831e70161c0b7485b3f420c051",
+                        "69d7916a1618b94a9794dbfffbdafe155f921b57b40c6a55e8ca17405d1183b0",
+                        "0c59dc8c3caf16b480847e086cc53f4bcc55c0ad0b2d6954f943eedab457c86b",
+                        "8accbc6c5c4abd38dd2574cf0a84286709bb377aeae9d50668b2145190ff94eb",
+                        "66213a6bb4469587379b204233f5c4cb9213c9443c6ac8a8f5748f339223bcf8",
+                        "1512294a5bacf0e03dd013bd22c0469b02c6a56ae6ab03d089d1b59f9bf47ba9",
+                        "a5ed327b1392f514a7ca393657194e0cc1f5f454aefdba63e867a3905c9f3ba6",
+                        "af21c0215b6b801617c9b590a5bbca4874f5a23e7fff46e2fc380b4e501b1b42",
+                        "48d97a310cffb3c3f576b5615ca7d30491461980e9e6ddba01e9ab8b69c6fb87",
+                        "c23b5db245f1cc4791a6a7f57dcbd3a72750431e1a67f5f783668c8a2825a0ea",
+                        "ea2c2b9190a3a2e7bca55d33bdd1566863284587cbcfcdad74a617a571d006da",
+                        "f00c701d6e9eb10e8ef79276cdc154e8ba8c4422f1d08ff330ef3f55d054d337",
+                        "43a9d6c9ab48dc22ca3c9cf8250db069e7513537e53cd632424035f96371b52a",
+                        "9668811e88849fe80a78b79fe33a05252ec3274a8c4c924609b8c85281ccd46b",
+                        "f2f93449bf57bbd79c852a412dc55922802044e40a10d5b70b940a585ee720ee",
+                        "d20bda52ea5a7e785ab94177f1d90f5688d21b3968326e9909c8d26cfe160b6c",
+                        "1eee37e54171be9e11fdae188b2edfb0bc024b5f94de55dda4b175596d449bde",
+                        "0af11c745a8c4891e888eed30309edc37748d712e154a078d4bdd5b13cf220b1",
+                        "15982ded9a62a5482a3acc1ad4c33159fe6c42f09aa14365a292d1f8e4434861",
+                        "429e21c28b9f0e415e2211ff953a01b408b9399dd2b67d0cbf212653aa9e3de5",
+                        "9b21c3118ea6bd778beb58728a3e319c2bdc18fe9bb2218024e4d7d537758988",
+                        "730d819c74a968d95a749664b659fece7f28f85ebb9e860542969b1f83f7135c",
+                        "07734cbfaf9de00aa8bfdda5f205dd887fd7df72535ab729d873a5ea23080c8c",
+                        "472f6c62614c64e30fa642fe8370b2108fc6c624bfc3652ddcabdc943b93d12e",
+                        "41161aea39995afac088fa514c8df9905a21984920ab7ed9f5ef52f603932f4a",
+                        "ff0ac19b15cf71021ba255bb88b9b48b8d813446364defcbd3648719c0ab4a4c",
+                        "d9836a3268981bfe94ad1f77f2b3ced20b7079f09025391357de906d03c40e83",
+                        "7e55b991f5f34ac4389f5574bb493fe43493e65668918329489fcd9e473eadad",
+                        "d32bc70e6246bb9345bb5efb2ffb68f6173a0b675a8cd4c7ca74b354adaa2909",
+                        "b9d8bbf671e794da22b3d2318c9ba690448e3a41f406b903f638b5025f7564d8",
+                        "b28a5816f46942f4270bc625ec876659d37c5e40aaa913a6223e49e7576235d2",
+                        "43781bb2014fa51a94bb3498c99623b76eb963f48238f9b1df9b6f31322c0970",
+                        "8dc87e8f4df3ae436fae06c170909b87542352d349384b9c7027e950b402f65a",
+                        "339cbb45be7f44b72f31f96503860c5a25c5f2abde498a93561fb59b433f293f",
+                        "f2e6d476a7d47acc13d2eabd4d309398684ca739f8bce57eb55b1e79f3d1e519",
+                        "56af0198847aa027beeb25867b66c211c78fddbf74d32c1d833d87c778120fac",
+                        "9ac6f60c776459541ec6bc8801fb2fd02e36585debfcf3212fb0b1614ae2f6cd",
+                        "e1792f3d1d3d161adf761720889612dd3cc96eedbbe2a432a03f7539b0cf405b",
+                        "0618cceaafb6f8e91a6c592127ea2b5b0cb1194c3210c3d643cbd25e047a2c5c",
+                        "c7deb398d09de0de32c114870e0843d7700252917eb69fb0546830437308e970",
+                        "e0ac7eb0b844399d04bdf65c93459a19b00c9a23bfbee05b3deca40a05b9d389",
+                        "23a16f8f604e45d067ae5a3b94755fd327505b4a0959844aab30ff5808f79b46",
+                        "488b6589b506e1a4501b2485091e717411867900783807af78f87dff7a46cf0c",
+                        "56c965124e66ae2c716bf67050bdb320f38385280e7a7c6cd51bd7f7ce43d32b",
+                        "19edef6e3e69990ec222877913340628049da39409aab79c93af2b6948a93d58",
+                        "128eab2b73e6a6e9c535e15b22559826c3e9d678859d92653a5b0611acd12d52",
+                        "b60504a4e6fb685fefeb7053d02d89bff2c41c86795c4061a89d0c3685da8e84",
+                        "6038bf6c7728e0927950e6865113a34a6646cf0ec0a2d15e1f1015b87ed6b091",
+                        "1bc443a013d98a82943adba3b89cbdbbb38d8aabbc0d4df57d218717d50f50c1",
+                        "9765ae2f7bd51d2631470a84f4acb6d9669f3e211ba7b3d1480b80a0cb53dea5",
+                        "cdbb6c307084183baa8b44cd6a93f014687b2e8f6aaae063fec6eb2c61d3a331",
+                        "d386012578fa5b91e761a714209d38301129c8ca4d1d393549a4801a9b1e0094",
+                        "05387de7db27a628101147c5e01cf481a68866c5f4be570f35a50e5a96dd8976",
+                        "ad2775261f5a12d7fcaea9666b48dac6ffec096d643df0bdb53dab400abc9fa9",
+                        "c95adaffc299856ba5bdceb376860a43c0a55383ccda166614af9333986f18b5",
+                        "2db34fa42ab7e9970883aa5744fd4ae926463a3acbd35ecabd5854f369bf3f5e",
+                        "068881adabd87a5d568f27064212ab1bb362583ab9fcae18fdb03dbc0f3185aa",
+                        "9ef7cd94ebb5f2b74db7933a06459ad972f43f21260ce84baf26904eae9090a6",
+                        "99afd610f6087a27df4c16d1faa3e80af5dba4194e7aad1347dc282f493951d8",
+                        "d036a9a86f34c9eda2f4d54a8f9df4c470c0f97695c4e5dc9de60e85af56a1e2",
+                        "7f0137290a2f6b51638f1a439091c26c66ddd7afc9a8525c86d0490952957f5e",
+                        "a755f2fa40c875c9592313dfad65fbe58d17940dd1fd5ffc38f9520f91b8fa63",
+                        "6690697131f9aeea3f3a74f83c6e34475cf3c1d6c63e1555174ad875a908ece5",
+                        "26f83c084041837eafe3647ce38404a2e24b2c3f5a870fbc57ee2f75fe863156",
+                        "aa90255d432e68be319e26ab5b1423400d2013117121636cb27ec494a887ce49",
+                        "72a7f09acd5ab6283df40bd92802a67c66c5308f661e98f3c12b2dd3c26817ce",
+                        "de85e7574117c4c773bec442121ac01cdcdecd533946624f5956258644eed440",
+                        "51e4500dcd4477c425cf9276a556041162c6d9978d56f394d32a10c963f3049e",
+                        "7a37ec2c99e082dac260c89e7fb72c23a1f958c31e50624217391cb31b715ef4",
+                        "1611fa2786e97a786d6f0a9eed8bf4b9a30a2158c6b9722eba150b4d53398e1e",
+                        "0ce07e0ba171681afaa50f91d3ba9e1c1801f6c9d49d7d695d2bee3ca563dab2",
+                        "4a9cfeba7938b7c64cd17a04e6191e9ee3b07eb39720f76794518b264817eaed",
+                        "ba2e9a35c933057f7775202da766bd3686c4268f32d9287d8cd3e0a371002d76",
+                        "41e92e37ed2717cac094610c3da3c64079d81b0f18adfbfbcdc46860082d05ba",
+                        "1dd6a4446b8615ea23597f2f1fb4f01e8bb999c5cd098099694dd2d9fba09e71",
+                        "a32552daccda15299cf311e0bb4c7ef3378f303997e5b2f3892cf3265c9aafd0",
+                        "4a17194413577d14d26f1c1fce778081c7cedee904af0ed3a25abbde34774885",
+                        "2d5b0ed95502bae6f4bd6738def6edf4e7e351f879b8c034646fa7421d0bf675",
+                        "0c32676576aa6862d224cbc313ee6576fdcfb71c8041e83a789380c58413354e",
+                        "f1c53b8e6989c4f0d55a5a08239393a9b8a5517244d8f04577300048f9e21e87",
+                        "4c6e479e828fbd26116908338cf72758557d523d190b7cbe3c33cdb00f91f281",
+                        "fcbab6fae7d8bacee71d82f2c1ab679c48a85ea750247f93478baafe4d8682f9",
+                        "f79fced898dfdd08f18178825490803c4203a029faf29cbf08d8f1602f032430",
+                        "d2f0731c4ff11f4cb6234e6f22717d0a2ae395409329cac53785269a7c26ec3a",
+                        "535b3030171da4c461763c488d7da9e89c8cfd7c1c2dadbd360bb99edeb9b0aa",
+                        "9f5e861a8376f92be1917f3157180c119f5b2bea66ef40bdfa77ec8f6136df7b",
+                        "9a7f91c1a05612ddc81567d6637a6279b614dc9fba3cd0322777f437f6cf11ee",
+                        "3e1474061b17403e96e750b3ad725b570d4ca96f98f583e0cd5dd26b84877cbe",
+                        "c046e99c6ceb99a1ee02f92bf5099e2c44a5adebd5290dee742cc5ae9da7076f",
+                        "0736d3d6b42c0b68cea5a9c774183db0d7ac138e6303036e46da245dda405f44",
+                        "2677862a927266eedf5f926a1844495ed7f31f671dac9f58996ae17c637ca140",
+                        "df622da8693db1d4245400e8bdf8a28190c1d29c27d30046f9fd1178a7554c67",
+                        "b0adea932e628a977282825083c96a26a276dc13e623380a45a590fccd543be1",
+                        "1c54ee5a29b8ed8013b00cdcbdd654272965ce4be0e38d7afb413e65cc8525e3",
+                        "62b605565cc85abfa0861daebbdb0b13d58732e59bc1163d9ee5b411fc6f7af3",
+                        "7b7226d49d687fd471e0eae0f54d9529f330d58b40a255aa871ccd36c8b048c4",
+                        "9ea175109678095977395a2337781a4b7a0bad3984d030b6bb0223772487d27e",
+                        "949862062b71287fb7eba6eb72efed9a06402d4372e8d4c32de15961298b9455",
+                        "4200d4862ab89d7e11f465dbb15e722eea2ead1b6eadcf55eb76cdee2dcaaeb2",
+                        "daeb4b3ae41eab84db5c30d4032541872bd9910f36c2f3708467b640f3d56217",
+                        "8340ac58b1ea529e8f4f0bcf297dc402d89f412252deb830d9e6ea626ec2221b",
+                        "b1a09ab896bccb3a2b2dd487d97392e5a3de1f2a8937cb30091a5be8320e43d6",
+                        "772812821e2409ab4b668507b3cf42fe3bef220d4970081db69cfbb992c54a0b",
+                        "af59ff44fe6084dcb0f148dd58429a66985c8f445d58bf7d734ee5d6cf80002c",
+                        "308def2d531cbe674b75dcc421bc3a5ef9d1ab5c8df737243643b2692a7280a6",
+                        "e207877fa88deb5ffae9b19ebc61d0ee6453d6c7bf911aa01263030cfa64f8a2",
+                        "eea9b387577ce6c76eae8f5d2d4fac9de61dbfe4b03382024a752c7f90a8e366",
+                        "ebd0fa6d638bbf5ef8948054b2c2424d490b16dcf19ba35801c25cb388a4004f",
+                        "0f41ea73a5debb480585af132f3910f3c7b98a577fd595882121631431af470a",
+                        "4dd11303be6ed6afbdc8a9017827c6fbf2fa8ea263117a9f08f09284559bd3a2",
+                        "77dce608339c3e4933ebda49d99d52c3eba9e585f81bb6b94de1eeb6c4f19aff",
+                        "e6bca493413498ac5b2ecb083cd17687e02f2fbfad5da93d4c31a02c9eb72c81",
+                        "4b7eaef4ba7578f43422618c729ce5b1d362a11c437f4d9693da8eee9bbe6b01",
+                        "0fffe2e60e034ee0092da0c22f560bcdce5553fc95eaf8478c3aed2d9713dcf1",
+                        "d7dc0f79e6077711fbd11be2c49a57d984dfe43e2357de902f694f561cce6691",
+                        "51cfd0c3aa1b96da6be92c65ef7dc25ac5f10236b515403cb7f8492791f3bbc3",
+                        "309d74e89ffd04cc8f050dfc4be50085f197f6c23ac5f84c22f79a2729ca62b1",
+                        "a139b028838d489dce5fa08da18ba5ea10969860dd813eb64c755f9f8a0c856e",
+                        "2987cd385ac6ee4a84b0c2c472fea3828306b7addd11cdd28aa416ad9950a9f2",
+                        "97e9199855dfed3d4fc6a8746ed9dee32586d73066e024e8a96bb124a187b3c6",
+                        "d5aca4fca7529a7917cd26c7710c20eefad94ab118b592db8fa22a4c258e99ff",
+                        "08a67a8a0f262f70e4039e10091a296fcc196e9520d5ac37f836ab109205181c",
+                        "e71586f3b63c70b6d65672a7d84781aa67ce0d70f41e4240f56066ab67d1baeb",
+                        "f2bfba19ad8573d2c7d48527ab2cc275f91fe08d82829908013f53dacb9478e1",
+                        "8af272ab08b9367911a97394a580c59d6e6ffe763aadc619edef7c3b827bc927",
+                        "8980fd4836c9ff27cfd5a999fa5a535ca557e32adce854752addef70c4144aa3",
+                        "5d976c7296257e3a0b8411bfba3f372f8d35bd7e73ed92bc26af88e322177178",
+                        "a01565d4915e7fb6689db3f1fb7fbddfc9e8647381c115e1c0a7b1490e8f755b",
+                        "a8fcedb1c3ed358fc5305bdc8b618bc0f354781472eccbb8960c8ca3a0f3233c",
+                        "094ac7a83a427bfab8eff10ecbce65c26670bacd70c941f623ff0298d354edc3",
+                        "d7b2b22315b3ee15e124dcf4560d3bea585842f4163daf0b879a8b0c55390637",
+                        "e6e8072a24ab7bffa9ce6e9a359c33b210e8b66172e1d35a5c8ed28871c40029",
+                        "39c1bcabe1c30d0798d8bbc275d83a503299b08fa2935552892ce03bad2c0bc9",
+                        "2ce057410a13bb152f276afa305eb94e0e31c5dd82a2eb828d0a01710a276756",
+                        "86b8f99ed5240df548dcd85fd87fb2dbc78e21e117524eacebe7ed88d7340a8f",
+                        "0ace53d368852d27daea0ec59bef8f1d5088ceda03719add6a02bc70e3aac785",
+                        "48c7e89b19636c77e186a093b1f2946ddd692f964ba6f2d2ed136b8c2f490566",
+                        "6d9e0dcbe46da467509a5a8a2aa709a31d47795f9f3bdb3a01812ced98dddd5c",
+                        "1526564dfcf5b6ae528444ee7a260771bbf30aa846da37d07dafb1d743c9f68f",
+                        "2987aef1d875722ea6f1684883eefb0ad566fd0017b7ef6094a1752e2ba68550",
+                        "22bc33eea0b2fdfd447021a90c90d10d24652add142991676418a72e8151682c",
+                        "0d72148b5f75fe9f6e36c5f042244bb5e35a27b62777db7ca1e1072eee9a8e48",
+                        "ef71137c514cfa65fa5fda9b517e3c267a9c7a7a7fcd4b9177dad57d0fc2add5",
+                        "11efa0f3f84cd47c1cb0c2d4634f317202ce00e52fa18468910a68cb317326fa",
+                        "750711ec221178fb1ee7549333d5dfa060283226953f9096782c24cf78771345",
+                        "9d621cbeb49423a46c56581dd621246766d6c1d2e885f38cd36ca18f88c6966e",
+                        "e459b29d49a394e84000903ccad0edde2b83096f73e93d144cf8a4fd041d37bc",
+                        "902e39fc44a6a9a712c9d42e0b98a08f793f9eb468ab13c120c87bf6309b68f6",
+                        "5fd3dd562fb5d0c97a66fc5d6f2d047b7c12e9518b95d6d4b96d3cc649e893c4",
+                        "ae5a35203af76d78f8d4c506b18fb4e1c67e5798706d7a1b98912e9fbf6669ed",
+                        "8806e940bc2274296217b392b69987b4772bac5aa5a96980a848c1ec769bb8d5",
+                        "bad155b7d45404ede0f07382e8d74d344dbbfe462c8b3658dc6ead106d418e9a",
+                        "fcf3012d4e101fd7affd972b1768ea8200fddce6e0fb7e403e4fd9ba3f01bac0",
+                        "8ce68b64c7b5675e0663e81e61c4b4379cc5f8845dbdf191031b591a0e10914e",
+                        "ec2253aabaa2731500b94ca5b60c8226e405ea23831e87882fa127cacbed1e70",
+                        "8333c77cd6b63b5e538dde44a5f1c37822c5e1259d7c6674ebc98d17431720af",
+                        "abecc9a68c658a5c31008c6c594d581d36fee313f8ec2aaac469f2fdf4525569",
+                        "e4b493bfaeeb85f35f83e84a318b3a1df7df1497ba1b03b498099e747956ef52",
+                        "8dda479f521d6dfee106e861380824d6d06c770d1472a189bcf251a1bf0a0f55",
+                        "e38a654a52e216ff4a200af142e4a8b9c38c448876b70b84dfc9de5211ca7024",
+                        "12b0bf0288ad6eaad0392192143f5765bddc84d7c99c3ce7e33711083251e878",
+                        "98055e28a5af0dbe2cdc674820e18c92a38ac89cd2b6d3e2f87a589e1f054eab",
+                        "8e05d03fef5e1e2f69f9d4fac674d82e351e34106ad29073ae9490e9ffc15b25",
+                        "bcbb675310f133824ce336a3c43f36f8f6bc1dc9be8efbfe3e7270fa0e7eb5af",
+                        "20af3852b4aef5ea3fabd3847cd03c064cd822b30b5c1652b91b414d08704fb8",
+                        "cc18a3362023966193c072630da0afe74cc08d9eb767866d85c557e6a6f26387",
+                        "950e603915e7fcedf0dc158daff822db034c0a240f7cdc5063bbb428d1408414",
+                        "12658fe8bebcd857c22f584c8e31d6172a87f089e1d883130b7dcb4c1600518b",
+                        "661d8c02f86e16355681f3a682aa0efea86a985ad29e2b64b343f5315a9268b2",
+                        "617a333e2cd2482f83715845421a1e25506724d4737f7bf8dbe9f3faa5a94aa9",
+                        "1cf208a9abaff984c259300f9345c92683eadd83d11a6a4024ee47b3b4d1d045",
+                        "db15ccc93275a34f2728c92076086f0f4c7b2068fab2b009adf7f0d48bdb888a",
+                        "befb08a1da6b7c3136dca3d29c7c0c853c2d91644e55e4303cfc8be64f699538",
+                        "ca3755a1d62e3b4a74fc458daa9a7faa3316fe7f6fb40a62282e9128882d4675",
+                        "4fe123bbaa5d874195f63e85aea06ab08355e0e57f2204308439917ffb080a92",
+                        "cae10b8938dd5806cfe5ea1944b39296a0a73b5957a82f308d9141558b21c6eb",
+                        "124dfeb77b60b21d782aeb2e4998ef15ca8755a3809fc3420b1f4a7125a1f4f5",
+                        "406e044140ce58e8cdf36d57a41892fe4b15a16871f8318afb4ba0ce43365b5a",
+                        "59f62af4c197b3ab5b58998677a39f42ae62738fb962f775529889cd7db10925",
+                        "7eaa2867fa01e79b9e64e17f41df246f099a3f1ec05f9feef690274f55b00182",
+                        "3c0125bf287ec0efa250f7dfdc4f784a4b11475e7bdc5ecccbf7c6dc591d0284",
+                        "06b9701560e87fcad9f9f9eb761b9b78bed1eb979bcbc252b9ebaaa465319a2b",
+                        "64bf409c31578efb2717df97ff8125c218e5b2740cce771186288de418110e2c",
+                        "91adc1e2ecabaa94988334b107b23a78af49d6cd6a8a7fa45dd0a3de7e7a5bb5",
+                        "99ae7e7cbf973d9eee35901a95212ced0cacccdea07eac0d88b5cd29e980b956",
+                        "563e70183d98c899d0f0fca96634f77ec89ad4bacb3f52ed2f736555149779e0",
+                        "7f01f980bfd6c3c60f3628d61afd9bc5c92f50998b3ebb0813db0487d2c23f56",
+                        "aaa5cfc4028fa4a0b2f1303372ab35e5c4e4a6d5816bd6b819926e8949a4bd73",
+                        "52968b2efd496a5de2dcf26a6502e8c6c74dd1249a40723a17e84bd331dae9b6",
+                        "9137b4da3041a7e4a3b88deffe35f371c0d8f746867c9959eca986d4a24034eb",
+                        "1d81a4be4ab49d3baa09a94794061d770bd224d3701fe00b76680297ca819bee",
+                        "628cc2eb26c7278894ed8ec317b4c60afe8ad5fda359f151300e1501d6b27091",
+                        "cc9378c99c54db8ea7cfa4261e74349b30e53fea0232dfc65e595419b7311c78",
+                        "3f3a959ed7bd378b9ea2822b166760ececc99ff65c340e9a99b550b4e233bc38",
+                        "234aeab4fff850bdd013574828def84a96ebf53a59187fae764d691c1e16fc9b",
+                        "b065e4e7d29530028fe92e1f48fd4944cfbcd4a4bb1aeedab43866b694f0fba5",
+                        "5df39fea0e235a747476259f34f8b66d739f9d7bf47f50c19891222fb66ed6f3",
+                        "67fef34becf3a89191220819e985761682583e9e2fac7fcce2181843e567b13c",
+                        "587293d74305af4ad1bcc2d88f6ac16c47ba265e3ac5ffa5f0f6235ea8cac952",
+                        "36a9a03e9fbc0237bd52ecf7fa23626d8ac83e91d54cc0471cc9277929582879",
+                        "78a673152ae87540f2b3a38ba47ec5bd5cf047da62cd6be3682a723bc87ee1a9",
+                        "8b48afe535024d84514d81fdea58934ca0f23e031565d7f74d05ec7a7d946801",
+                        "d81ee7e407ad1311d68f0b53994e6fb68131c596735329f76cb4d18c4ddbfb77",
+                        "16be4607f8bee1e191857372b0263ed401bfa173f2752736fbe50abb7e58da98",
+                        "d05083dd5e6d5e0a2c320a1752c724d3a13428b9dbd2833fc67c86628f6eb1c3",
+                        "0b2f6370271a17242d09d0292a1e0344d2806cc89e8e6e125c72ed47317171c9",
+                        "aa1332229c78544ada666a1e7cc54fb5fa31c586370de5388bfadd86176b2250",
+                        "d605e3d0ca62ce111f73d2ea48c5fbb56c5d47c2bc28eb68c398515703119072",
+                        "9e0549f039e6c530dc1432adcaa40a3ee2d69329fe1a2245c6c0461c16931eaa",
+                        "cb2f3789ae09d724f9eddb3f104e755ed2ddc3f5bac87aeb91f76fa53784e881",
+                        "6e3b3835f989decf5441e8c524aa95b6b312d5732d614fe24d80f9dd39bad1c5",
+                        "318440cfef57053d806d6f9c03c1331947018cf2f479b71d9f5ff4d1bf940ae9",
+                        "51050b2569885e0a61fc2487c8428e6fdb8861727de7e8d97f7901e6f583acc7",
+                        "02e37462d082a033c382c04ec6d90c629bd96cd0379eac6399a718d9988bf3b9",
+                        "3515eaa553cf9f35d85fdeb367eb3eb930a79dcdefcdaf2e6eb00c550deea9f5",
+                        "1321c47c060f371589bf9a1dc6557b9b49434a4ad6ad15f6749a2bf71e26ce14",
+                        "627cf526b8c336e3a3d8c3e82e5503fea6338f14a438e8de6bb3dc5674a10da6",
+                        "7cd3b2289dc1190b6ea21b9d011ec5574fa251d222af63a52bebefecbd89d7c1",
+                        "9bb3ad4efd34c6839bf4b641d1f745d8ce60c829f22b773de0fedd566c3ca60d",
+                        "679c477e999ae78bde65ce99acb6c2bacbcea8214ba4b7fd477ae91b1d21792d",
+                        "bd3ec90f50cdbfa74372cfcee0f017fe7342935eb93d9367ca277dff7b02eaff",
+                        "6a73b3ac5c74db3e940df13ea5e049432e2488b3997767dfd700e9aeb34f9cfa",
+                        "a642e0ef2b4c17cbacb868ec0ca7d43ae9cefee5e0dc29e59e561b44aff05615",
+                        "1a77398f0d8673a9fccd3342338f6e5fc1e96800beebe04f4aba48afdd41f6a3",
+                        "d2bf9e00bf6050ad68e7a3ea1261b3c9f9b6394d53da2f9f1712199ff5fa96ac",
+                        "d17c0276250825f6c8ab121c999c61cc892874488a4bc95a104dc0382e511aaa",
+                        "7be2cb478a857b81957d7169a01c6692a254e7b029b42995b6c262e6d30f0038",
+                        "2af54e9f62193195b0b927462e63a661c5abe69fff22037e047257dd41089646",
+                        "120849c155437bbec39e71267d3320eae464e949c7ed1e812c91f3c5ead6ba1d",
+                        "4d77309ed2522ec89b7e8e0f0189cfe9124babae465007ab5c905a9541d63a4b",
+                        "4eebf5a0cca448832d9a5224a39250ecac4a18c650baafe2d8804241c274dfc1",
+                        "5d29b8c14ac83e531b87534ef17531cfec84f49c764e6410c8d5682fd80204a7",
+                        "625d9a10f136b103e85f0e7863df74db8049f77a75e52361748873fbdb2a3f73",
+                        "eb21a9d33e58daa0ead2dad3a71d4e5eaa7b0321c6cc2d4e86464c70cf366634",
+                        "6b9066c0d9049b0634edf92b34140d02a49e7a6d76483d14c32125f3ea41d8f4",
+                        "b68f5ebb20554bddbcbd92371c4e536210a0674e61577d552b6b405939acddfc",
+                        "2f8fc98373422a6dce98f183f25488520794b45b947c18ab0e1b924dee353b61",
+                        "64643340086927f78905c52784692557869bcf723b2ad19b69fd0349601aa7e5",
+                        "39c72e17874ba3a3850231ad77319c564e5fc1f23414c80d0531f8e618895ac6",
+                        "9e2afd30de5bfa30e237d9f2f773766a82e20d1a7efa10d34e37048b172d2e91",
+                        "c0888a46377fe1194a84313d3e9f64e90cb94648cbadc93ca1c077960b2946bf",
+                        "c7a54836aa914f27df8424e40d4c42183c7dce32798f7964fade258768beaa4d",
+                        "485865c169e3e60c2b0cd97fe7caf04bb5592a9a08c5abf53de92f5fa745845a",
+                        "77038185b0024d9e2e0881b8d57e4dea0b59fcbd2bc2a776c8d7b29b5356a240",
+                        "19be080d3f5d828b2826c221f35a07200540c47c5bd5c374175f8d1b55dcc8e9",
+                        "32d5a77433130085014cfa02eb0b0ff36be96763b8f100502ee09a93fa4a62bd",
+                        "9572c95caca053688f8cde1436a7d5652f1bb5bb4da92dd200df11d2a27da378",
+                        "b3db618f9e7680be0c485377b1f9e874798b5b9cb2800a098053b025c47e70f6",
+                        "67a77a0cdf101d5fca5d17bf2b49f3c00632bb4a53c4ef06617762f36c8c8e07",
+                        "1fff3805be7779014868c91462838db4e8f88e7759179f144008534a1724fcda",
+                        "efd453c249b898711874f643c4b66efd58e91ad5b3aee1aa6ad7a477b7248a94",
+                        "bf94e5f1c7b5c8483285a8dea4345e7519581d486fcb27a8da43a2b48be22346",
+                        "7ccb34279395a288bc3ce100245c6de77fd9fc35956f9ece35e6475bbd6f6ef8",
+                        "810ce536aa750b60cfc6acff3ff65b36515f60c1abe5816aa5e38549b0cf21ad",
+                        "be1c2775730ae524f44e05fc989ea33b24d262db5cb630cd13d56a2324f8fe37",
+                        "7b8bf85e45285fa4b800e544da002c0c43c2b87644dfb62c42090631c5abd1d5",
+                        "96e286ddeb65c5e54b4a8325cd695b53f4aff1fda635ce72c7b14ce1e926c7d4",
+                        "12e0310edca52b08cb8a18dd2e382da62908b476f14b1a8e0aa993a945e84399",
+                        "e8ceee44ab4241cb19d5da582abc8b9c7ec4d71bbfa456bbda2d3dfb120c1e82",
+                        "e3951d2637df7a24c3fb48360da87247d998c9f092d7ebe349bf5b493cf89034",
+                        "2657c928cb139ac30cb495a790e8a125d452a541267e71ca1635cb69d830c349",
+                        "4d0fab3685c9e14d8382253670d0453430010fdb95da9a0cf5427760ff8f4bf5",
+                        "85a65d69081dc88743067a1ae0f5abef0adf79ba23500954217f990bdd17246d",
+                        "b3d6e83386b11a0d736d43f1eb3235388abdfaf2c90e94ba02d4c50a3c830a66",
+                        "f1f207e702a02318635f35a70141ff96d50b1058f57c01f84fd5973112eec5bd",
+                        "10e412a4f7c37f47b63d39cbde4721f65670bc2085ec8db8a6ebd2db0f19531c",
+                        "a7679d3b0d86f7d19b865f9c25aa91c1bbcfcc89cac3415138393f68958699f2",
+                        "9be5b69545813b368cb6fd8e8e2f0843a3299c268f3c78691d62f14cc08e1fd5",
+                        "c7ef2594ead75dd56e8effb151e72c72efd2e3151c22f113a9952c2d2a094ef8",
+                        "43406fa30813bf114ad791f19f91783ee623dbf5882e9361dbb9dd42dcc124a9",
+                        "f45c2618d639e25d60a6ff4e3d3c54aca3afda8887feeda48b3931d5fb3a890d",
+                        "021d36f9b63ae9509a139f5919a2c7c6daaa8b775b67d175d9fdc2caf1545247",
+                        "221662e3384acfda6b419aca64194a7e2b515c470eb515641a43ad280f5d8c64",
+                        "93a2280c52123349f7143d8f90b8862985eab8856ce01c1e65847f74e82f3585",
+                        "97595d2f3e15492623c1180c3448d91e27e8caa91a2286ffdde6e0e01d73487c",
+                        "554e51f4e422d00765369712a73dbe5e18c4f59aa55546b9aff3f1b94c8f75ee",
+                        "373c9b4a6fa3fc747881123d342ad6fd4bfe280c1550517f329e7b5fd9c90824",
+                        "5466a29fb42efa17c090eedb46bb213988ef7656634eff61d399c4540bf185d4",
+                        "68882db32387229d3c096e4f075c9075d1128759c3fdf5e5d8bcdfe24072d559",
+                        "f703f98c5b75380e73f861b3ceb685094aee6341309d5161b761fcca78acda0e",
+                        "59f93b2d63f4643f566199a92d955bd78caaf7ec7e3078fd5264f5b478ac09b2",
+                        "639731cfd7ab582be092da8ec8da53718c206b8f0fa5c75953fcff3cb116a172",
+                        "2bfe2a097a074fdff140fef54c104953996a032dc162edf32dc357e09abb3fcc",
+                        "466dd64bfa5468a071705d8b3f86206a481673ced10e0a4f172d7486cd29e8ce",
+                        "a40e511b719b6275dedb1b46f2c5f8b0cd725312ab239132c5b9b29547f6f764",
+                        "6583f450fd9001e5355551acb58a3c95ac663f8f58a82cc3f9f31135fe492442",
+                        "2a818d069c34b05be52769437dba3051f931aae1b1453e950c591b3920c3b3ee",
+                        "0b26d32e1e31400f4c3a5e2750fee52239b2dc3728f927ec455ba49fcc16bbbd",
+                        "7d90705556fd11248be8e53c04bafeb395b123c3b42d3e0e07f02ae5bba74681",
+                        "79ad2329c40c96cd2e4d694d51d2610b8a28971d6b253f5a54c22301afdb293d",
+                        "147eed7b0ff213c3ba36f679ba864cb2b050de968fdedcdcb48e6916bc264574",
+                        "d027dfcaaf6e04f676c619244515b823e7adff3dd01da6730342421168a61c45",
+                        "e2199dbc29264ddf0edc446706d684cc19ab7c81fd19f2c25a6aedfaf38bff61",
+                        "74219656debd84f572508135fb03c4ddb80a992c629a1483a4b32535156ee1b7",
+                        "cc6b74e9616a1facb82a483e19039348ccbc6a387a3c6991f50133ca844bb499",
+                        "3084b541105fe892ddfad7efe4d428a8cfb5890c6970d4c4d05bc1b1e7ea38ef",
+                        "a0b5c69bf883147418969ffca6cd45e9f710223b8da9bd93d77ce8aec76d4bea",
+                        "e08c7e844d6fa6cdcabb04975fb6c66ceda4cadef3b1e4fad7367207d674e973",
+                        "6033e2342b470e18a442cc73eebfc5e77303cd4ecb3507930f777cd2fb740a15",
+                        "3c20d132ea8e829fd8fb7b18cf5f9a5a71dd88bf35bc81f7cf37b4ab4cc7b961",
+                        "0ee98db4b01bea147bbcb1bd492a66c85abe9e20985738bb5a035d587badff8d",
+                        "bd78400ee797aba19c82c3bf060a13d720be4cab6358a39075e1ad721cfd0b99",
+                        "91c0f7efc5e43eefa3e587d1e2685bbbf68a7b064c06da9b21f3e38be2f8915e",
+                        "f0c2ff1abe61e4c0c3092afba482e7eef6f0744c267b5334e060485d01974b18",
+                        "dd4d830bd248066832624a2a5ceca133b9f5b9fa66c1d3a41eb4cc29169f955d",
+                        "04175c02b43883fa4b3c4b990334e2c3e23e85ddc36edcf04bee9f86e8a116af",
+                        "2eafcbc1db5005dbf74c90a56554ba71201e21d21ef4a77094f4b1c6c6d10497",
+                        "f6c826a659eef7eca7685ce1e574066a007906163041aaba2ac90a12f0315660",
+                        "2dc4d5de794e832b499f493c99fa948e10079f74552f23fc5d3700722e8d0f8d",
+                        "c02e4905c3876a3fa382c1a7f90cf91496d66da1b2495cb3f5a345993360280a",
+                        "5a375be2718ac37a38ee1c84b84476695a384e2a2ff43068c8d7989b4fd3cea5",
+                        "b70b2e6d667be606bd1c511f7e2cf631f533948cbb5af26db8650d4101253f63",
+                        "35a49d20ab277ac8c092985c9faad58320d1af7427124c4828888f4bd7491b36",
+                        "2a67df5cdd3e8c2a1241dfd24554af46feee6b138b4809663f86e9012ec47b27",
+                        "b50c7e29386970d39258f395e05f3caeb8648d9a40a0c14a603ba1e729c1782e",
+                        "0db1d79fc1686e0388b8439fe7331862314b77ced506dfdaccc2a21faf74f44f",
+                        "6b3393eacda7dc18a2ce451f2541681f5dd4e9af21a2624956542b60268a9405",
+                        "8e17ed5e690277e1156294c6904f6899de1497d15d8862a98cfe349c5296ec13",
+                        "e44b9eb141e8ff07acd5bc5a2fdd6d334192e27b27b5f4c26a225ad28cd9ab9a",
+                        "02b6fe45acb7af83932640c81519a7cf4d33af40e8c66510855286f1b869df7f",
+                        "c8aff4d8670456d4e64051e65f018226f7abcb40dc77b7a36a934f4afeb42888",
+                        "aa4a4dabb9038bb1bc8dafa93397b77b81e263fcfff59eb86c07920e6c8c218f",
+                        "3b8203b9ed708044720313b67f9b98cf9e96544e95ada0200bc4ea0e54a3c633",
+                        "524aced0165da7aa4aed8d02720276c3895a37fcfd8db9cffbc9d353ccc960c4",
+                        "553fcf8e9e53d37da153a4f8bfd16a2c5379da0472076719b05a26d10100801b",
+                        "fbb7b3e31f1d0d1606dc34bf1c624db7c62133e173203dad5cf4c3792351fbbb",
+                        "e62eddd4a815b35bf6916c615a52f185395baceaa52cee8a836de3a4db0c5381",
+                        "9ea285ecbb3cc9189511d2148e3d732bd98582324d2a597ccb942e8b0158548c",
+                        "6c9ecf00a9f605bd50375d0793e8ebad382060daebbbad0ec1427d5501b95186",
+                        "00a5392f9bf5114694596652d3f47debb758a1ef4a408490688a8b3b6f4d076d",
+                        "c9d5bf16c017b12a95d62a92b270c9c100fee78fc85c91f830c56be00235ce7f",
+                        "68ea43f029fa915aafc14bfa5eb8ab1ab1e6e20c467c0985dfeeb72af1859659",
+                        "172c4fada590aedd1eb45a16ca2ac669cc0371f12aceecf1467e0dd6e2af387c",
+                        "0e8c60669d5b505ff9f6fb941f3247bee6458fa1d6f1829c1444135c55b5b58a",
+                        "83e174c96ba972dd05b14f9e7d8dc0923ad96cdf6b2926c81baece8c7c3ccbc0",
+                        "55699232a0c96bd45cf5bbb81ae2e033d22b534b2fcec3b70ab661d22bc25b0f",
+                        "9d4ba8d5cb7404ae253587e6a583c595214407007c049988a08b51e8c05a67ef",
+                        "1d63978b718b86d8d84bd1f6e7cd053fec76dbc922c597abeeee64066d02b57a",
+                        "6d03e10f0787dd16296266414cb6bacb961387fbec686348f586a4d053718f02",
+                        "e4ae9203d1b61a37a98b21769f110e46de7ab6772d15b4af93a9f39cb2d096a8",
+                        "a5de66a7fa9666e03e6dd9e114d3cbed11e14454758fb20f42586685509f315e",
+                        "f0accba58611444a9eb7c3d41218740ffed85556762d5245f4d1bbd6d958d488",
+                        "95de4a732eaee2996786c28c3ae80a7bbfd34ad276694cdd64194e7d45d6b1b8",
+                        "59b03bd978a4a5ed212fd094e90048aca406d16c196410eb8be8122f2856d1d0",
+                        "2b6c3018cfd7cc55746864434c9b2c610a4971e60d9128a338451d46c78bfc86",
+                        "2428da7b24364be8aa93c6a255543d7da27f4cbe57dde5f14a8512fa5ffb981d",
+                        "bce26d655a0efb6f287be49da07393f30feee6bb6c2306bbad88e04c8984e7d0",
+                        "0fe2ad6dbadcd9c423b5eebde12b78365ff1c4fbc85e933206523afc2a2f8a48",
+                        "67482decfd58bdc49de9ec5a8147945130a928b98202457647c66865ca336c71",
+                        "7d22130b398f4085766f4909a68b4f7fa2c4b26db1e107f3a2ef29417ee5cfae",
+                        "98778612b5124e3d7d455f725f4f2462ef780f0323e0c36cb9bc81811c00a045",
+                        "51e7511c0f2ef6bfc7e17c7906fd604e42e862f3f4475d50d86bfc1401099d0d",
+                        "f120fe5e0ef2b223977b4519069cac7e4e77c587c5b011663d06aa08f80fd477",
+                        "9d00ace943765ba7f2a3a414f534d8e751af83fed0f8e872c36b311a15ae21bf",
+                        "93cc266fd13aaa341f03d20115f066cb126497bc0d6d5de719c9f80604a2e57c",
+                        "ddddd5d3636ab27be531f09a9a93e5d8b39fb2c03a79d4b7908f2b40b52bd1f2",
+                        "626c9f4c4e3bad8d65523b0f4b820f4e59a720007fc35aa925bc99d9deae3e00",
+                        "af9d9060c20e16bb1f94b3da86b8f4c074c472f2d402ebcadb879d9d5853dc78",
+                        "309db5e72eed85d70fb56caffd8bfc1dffb79fb9b599916468a68982c975dca9",
+                        "0738d677af3228b95cf444baba3469dd67aaeba54a93c91ae62845d2ab12bb3b",
+                        "720666a5e21383c6546a87b8cc93be7044c87c015ee2995f87b55bb291e9924b",
+                        "21d91ecc9946962e60ae1119f45687a670eb725a392425e3dca05d108808a314",
+                        "253c1ba525d54f4075c8aa01ee5383d0ea6a41b62d243fb06d4f90987e557578",
+                        "73429a7a5981f25624a1ea521c95c1aa4e744bca69c6b63f495e3c72571d403f",
+                        "e92100e5825a11d06c55a544f83e71a1cb86516805549d0d16c085a690645682",
+                        "3969b8d71699943cd01e410fb2b072638ffdc59d10eb3316ee12a98783c09181",
+                        "3dd6b9d720af724e3bba14e7fc41213a0c6b7fd5c4a6d6081cdde8b05941023e",
+                        "a8c6b92481b9b52f50fc996f3fc023f720b832f79f306aebe9e1db5d5d680f33",
+                        "84bde27cda62db77fac212cc9a399467cf466e0d5af32984b04f389c28e6b0b6",
+                        "d416c534ceaa07ce856d3fe9fb6d8cae21f28aa45eadd4fee27b791e69c8f045",
+                        "0b370fe3369b09d22ddd43f870a428c4b65974430a18261c59781ae77d941480",
+                        "906ad75351144066d6d0d914c5145664825d2004d778aeb41aec56644f81ba25",
+                        "3c57221b786a6de68d8d8db9db8ed3928a20eff9e688ad1121d73085a0fe9d75",
+                        "e1c262992728e3ede684e77f4a06efde3e2eebf8f12a0406dcede1aafe299648",
+                        "c60819a050b2d4e6ac4d72ea6683fde04dbaf6b66bd74ff988fbc7d2b29b9bf2",
+                        "e8468896b3f9734cd0f7c721ee0896ad1548902340242b7fdd16e39b361c4ac5",
+                        "6a8f24b12c66adc9e771cc6b52392688bb8535c1ba026ca7f79d26ce2c7ed9a2",
+                        "f5d607b7d774d7c5d81d6c8d58b4a7ed576403a4dfce8f2e63e1b7ce9c7f8a02",
+                        "011d439d089fcb3c7d44c2d5a6420cf60cf1b8716db31286f7c9ce390a0f2fa6",
+                        "d6fe9c609aefadabb0efff44e5375ea4eacc5237c21b58a2e199cc2899dbfbb0",
+                        "3a0b54bd93d3305354b07b6bb7807bace50476c4e120a0b327de1cdb93617079",
+                        "41e55404a5998f71571a200c032127a6241b2e7b232e82147fb6769d8256bd29",
+                        "5756ac43c1df14927d3af8ef161c403ee1f92b1ed296d0adc72e2cb45d98d7de",
+                        "f82cf2b7895ba7802d0478d2b20b069d3c8500637fe98d4194da02c884cf9d17",
+                        "3a10b6cc7cc3bb244fbd0d49910e588abe7dbaf759d4cf44783a7139af064824",
+                        "5a9b9b31eaedbb651f42d207a14b502b4b73885330c37f8e615ad89e3e61213b",
+                        "e61688578b28b999d906798525736d64a5aac1b5544b7507badb20b34b556d8c",
+                        "45b27a6ef06340c3ed81433083ac81ce99abcc951f5e334919f3ff56cd1c75d6",
+                        "fceb7a9bd727f1e8438f617d02674039902f195dcbbfb01b43d5f72edea02831",
+                        "d19c5e3b8aeb8f8b4c08ee8b61f34277bfe579398a76e28e58b972cd69089b61",
+                        "a32c7ab77af334e2d5c4eb3caf95d3aaad689f28a2dc3a7557f2528be402407e",
+                        "b6c17c21cecca5ac92a1fdc1032369e4c6d9cf2fd4f1d5b4406e1d7e7606b2ac",
+                        "be1b81276adee2c0f4df4cdc6d1b82df87dceaf516b7e4d994e023a937479f9f",
+                        "439251ab04c231c48b891702a2061921fa88cfef44741ee173853b6bf8490430",
+                        "26b7068c7272d9feaab03fef3083e50d49885e375f77792d59ff0cd502c03df1",
+                        "85dce2eba1a9ae5a41d06854f4db88dd7fe022727be35ad6b18e6087c8b91f1b",
+                        "e4f7178d36429096577518bf47e2d296c021ae7349aca78e2c0a4c606acca5a8",
+                        "e8d88f547187b278275c799b25a94d814f3174bac46077df9820a338b4d9c267",
+                        "ac8f48385b06e1c43da7fb74e522d347603b7b973ac3c3d06412ad72f5762fd6",
+                        "22f39a936e8e401a404457cbbef921c3568ce016a5c75de9256011b988c252c6",
+                        "77fa7038e7ded01577a2ae592cdc9663311b5e1e42f5f87ad8a66ae0e9a54c28",
+                        "87f6e5ae2adc65a736c9b1746ec1f18340bbee45481d7c1f5509ad71d5f3c9c2",
+                        "180e9ee8a321a1e91c490cd90afd74d556ae2a9bae223ec6c094587f359870b0",
+                        "f6c87366cdd0be058ebf9295d8b6b42729be58a0f7f057fe3243f9b2949ada26",
+                        "d45c27211e8a4b77a9e76c12db25e6e9ba9d03647f3691d158edbd8b7c38ab69",
+                        "8ebac15b55c4a2c5d3f4866858fe3ab9324bd785036dc0ce8ababa396419eb35",
+                        "6a80d86e69694ebeec5f6f5a5d37d12c2f813147c1116d5d26538d25f8882729",
+                        "2cf7e4c33c2a63ef54c444020bac3648738bee48779db4a3a0f9e72ca5b4e380",
+                        "9d101afcd85b7331d4008230f29b761b9f798e8814d123140e8b648b230261f9",
+                        "c6ee0ade266785f9dadcf6892bf4b98d7bbc292aaf2bfe5b7dd484785760375b",
+                        "94d239b78781096e3e8e7e6a7d9ad70d0804adeb6a6675fc5da4f05d1152c19d",
+                        "55ca49e0e313f14ae0f214ac0a51843158ee07aa5f381cb9d596b8612dbd3f36",
+                        "e3e3672131fe9a71f54a41b0e8143c63bc0aeb823288527bda069a1616a41529",
+                        "ad1b386b668b79c7cada251a6c2bd19c53e51045e4a4562b4b9212852d334556",
+                        "bd08a3ba2d8603332b31b2394a556edf6ef949ec8d49e5d54a13318213a0da65",
+                        "b34731e855ce7fc834aa0846c72ce7f455f40564b11181b340ec07a003787e88",
+                        "ae292c8d03de63af642539e6559960770d80dc4e9590c46f54ab8a74b68f145c",
+                        "10a28c04e90016bc744986e50d2a240ff553cea32c8ccbfc218445d6f9e32271",
+                        "182df763c8b4dc2c1698567546dac90ed5de00c033322c9f731a64f08cf7ae61",
+                        "eaad2e6f6dbc000fe3b8f60fc7ce7011c22c4d062ae2c33a3621098190027381",
+                        "1e7d630f59f8c968c54a803f8c70e15d85a1214be4e0f8e82cab9b2056df4ef6",
+                        "af485e0990350c9814bf8a8b3db91f44d4d459f513f9e0635ff54a444a45055e",
+                        "c5339ed11420ef44af6d7eec085a7495ac1f59264119184d3183a937d7012295",
+                        "ee4c98e7b5e1b5fc19c8e5e75b9be39690ebf15bc9b1e5fbb3ecb75a2ec89d3a",
+                        "c88b24689438c8f097cec81f2178fd162d4c53ba51f1b835c9b7d1f33f3bfed4",
+                        "b3f12ee06f773536bc4882441d7b40153fd02ff4abd97a5686bc8ec294de5303",
+                        "74b69c91d7b24cbc734d5bbfccf3442b10aa94f835dd49e84aeb9fb93d48f984",
+                        "7249af9eedd2ff198a93c9fd96d3847d05fd24e4a2dee3213f8b0157028a7a1e",
+                        "4c663e23616d31135cf9b4c33a89556d9973b2df0fe8b5a851163ce3e770df33",
+                        "4afede394dff0a2b6f0b1b3dedf82614ca5133814c9466e7856a53cf33a83359",
+                        "b7f3d596f87080e6fe4b0c5e17364dc87ba269ca561689d20085c9890270145a",
+                        "a91c666326b9198e9954c4461da9e173c21042edbc8e63e6527f69aa06144ad5",
+                        "c11375b5ba44d9be64cf8ccc8eaba4689ce8d0a1d75f4b932d14b4e26b962ba8",
+                        "c737cddd051af963d4109063a7c98bfbbe500abdf2761545fb2e3f592f1c3183",
+                        "9b09f03742db7491a7a96f20d2735d669383b59570c919c5f8f4d804ccf552af",
+                        "112ba278ae78125b0ee2a9ae9d4c857d7b09d3636d8afd9e175a3557917409f2",
+                        "3ec2366bdb151bc04838ad4459790d217d7e70104dbb6a13de48c8e97873c874",
+                        "e592d021807bc768bc2eb1b6b7832d7326565c39b82658ce9c340ee50a443626",
+                        "446de54c9e312644e2fd20f49b8d9926edeb2c995e627414da25b664f14e4fb2",
+                        "c0e6c970fb25f5ec11f0c76316e7eff5bb180acd21bc777616ad3212edf5cb3c",
+                        "32c3a1e954262361dfea8dcd6d4e74c436d53e6518a2bfd080302187e454ef3d",
+                        "af6c5f72dbd65e75a91a40ba9c6abad575f12b7fd8b66c41d88948fa8e026f3d",
+                        "2f858194e1da082ac8ba94373768de9fa1842a1adba13b2bf6c67474d0a233c8",
+                        "74b19f6456e34582f963dba6d7faebb6289050227f55d5bead6aed9f6394eb41",
+                        "e249aa1cc573b722bfb4e6613dfc70e2a5d6cb7df94ba1002e7f549f57aedcef",
+                        "0ad80c6bbea362b8bdb966cbc50135bfa321bb8cbb0179f76f445dde3d156c8b",
+                        "898f699a5c52bdada6a62d24ac05ec8cb043f5679b554ae5a9b4d666a440fb76",
+                        "305cf536a22fcbdee3353cdf59ddbd42e24ea1a8b91967d5038ca3f9094868c5",
+                        "2847f3395f902b011e2eb0ce5e995cd97af861c925e04021a5bd893447025060",
+                        "91f09953dda135db571d5e159e07a495b0ca9d2eb6ba584b6bff019ae5693624",
+                        "648126d6266a94fd567040da2a9becb5e6be4055f9f4176d252ea8b29915b8a1",
+                        "46451db7b8576c094fa561a81e6d1300220b42b886e3e3b5faeb95c78090e6e0",
+                        "97817465e9219742eaf8121d0d053224793083991313a7b376093f5cdf7329b2",
+                        "4e5c52de7f2d110910f12126b36f9ee712f4a70ec48a86ef10b21767b876396f",
+                        "6510078a1522e2f137600f9183802c1581f882bd9fa0f8f1391484f84cf0fb43",
+                        "2b687ea5a740865b89abc5657546a55b7d5f7fe4e4796354b4b4266f0c0ec10c",
+                        "879d6960613b3138e2a92c821026f5858a99338db1f769923ccb7f32ec4afcd6",
+                        "6c37cd022e745b6666c0388b81296be90dce442972de52400fa3adb8e734d2ee",
+                        "e58f22310f59fdddb90479cc36c763c1fcf60d6e09501d51c495dcb95c033d05",
+                        "70ac02944106daddc97b53db0a0f9bdc1cdf7e789b698b4234a88d8acb945233",
+                        "e797d50c461ed06e255f8106694f1e3c3dff45ca342b631c9d93fd6868ee7862",
+                        "d645d1ce9d365a5ea79ccaa9b24ec597a029e07e667bdd5461a7cec83344f83a",
+                        "2fdc7e98eaa0910fd04914e2ac4c1216e2a4d37621e23c69daa7539b6d403ad6",
+                        "3ea00f497980193dac3261c3e12d7593b1668465227775c53b01e0029a3dbaee",
+                        "eff07e9c0aa7f889f74bd0daabfa20017aeac105fb09d11647059f37eb1027eb",
+                        "69d3cce33ba2f60e895201dd8d0a92db55e4db99b04de54976d3f11ca280dfe4",
+                        "64aef37268e77bcbbda83cb568ba365aa650c4363e22f08ebd9ea8dd4c5ec3ba",
+                        "837f82d3bed0341335bd5ab9d633bb5b1117a0b71664315643f710321451b08d",
+                        "52b1677f38980e1ba9eee33faf8a60f50d76a9020fc18aadad44ef12d102c630",
+                        "c5727a2a22170ed9a40b4e003e7039bb6f51ef719faa103159869f715cd79d64",
+                        "2bd8376008ef3339ad49383a12754f63710ab01657cf717aa945f8ebeb351d26",
+                        "617d5e3734a176c6aaa970e78f412532263398023f922604d69d73a34d7c9600",
+                        "b508b6f323862d1393522ce67c9f267f8f7a08c4f17ec2d7e9230df6a7dcc83d",
+                        "003b1c8857c2366b415d5b1eb23ab8c0705065bd87fe08e7c25114098bc2d020",
+                        "9c18e71750ab5a52520fa5c6f4b48047d34af42b9feedfcfa96a9b9cf6c2231d",
+                        "c3d69220994caf490d6d8f4c7f7689da6e533bdbf775309af7b13b25359c15db",
+                        "64945a074fe5d593413f740fbb0fb036efc1585073a5c769e6b7bba5083bff67",
+                        "da64240fb5aefe994b80dcbf86c6775e1d8b9827c90ea914dc89ed96994c1b06",
+                        "f3dcceebebff82171d500aa5bfa42d923af47fd9d935ff3b24e4246c2c240bb0",
+                        "5e9c33d78cdd3d5f71a74981aee540c199f9928c132f047ff975f9c4528929ed",
+                        "e83e08ca018747334d5bef54eff1527d03fc478a9a2ce3bc1d08eb74b1e05c5a",
+                        "2b4404ceb208a4cbcca4eca597cc25e50c156d1d4320b937795c201bf62e8e27",
+                        "6cf6e54742a3e3a2469296b51863123d6939a3e4f18973bed3350f361a0a7fa1",
+                        "173648ce3c3faebf66b1b400e2ba1d09a6f7a0e90c4f6eb259cf141cf2702868",
+                        "1602f84cd08034833d4d6b6f0a63017840b0517fcd716dc5bb82071f81cacf22",
+                        "5c9a5a89db7ce103784cd0a185ef589967930fa6e92aa90fb8c02031694a9404",
+                        "a99a83be39be7d0d247f3805d7c78f47bf16a3babf9d63cb68e28c0f630e15c2",
+                        "9a92a01899a649676ac792b2a2be8db3ab24f1f464a1af6b3c03b7f67e572510",
+                        "e0448af4bfdabe13a044362ab133a5560a77e8e6605df7d9b36f22a9ccdd806f",
+                        "8f675662f98a9961e9a67114a98f442359b8797f729c94c5a041ebdb937e0b57",
+                        "6dd8437315fb9be06fcbb22ebc82103648da5b142622857175dd75a0f78c7a8f",
+                        "6c4a96d440dbfc0f26f1bdf1e1c0ac273b573c36f14e55342fd98435e806b676",
+                        "700725449099dc98933ea1c8f1b9fdaf21ccb7f7439451cbdcf763e7b633e52d",
+                        "22c986a29a24c02703a8be6fc3a17f00975fe6f323366da8284a4c1070b18160",
+                        "037036f85de49e6136d1f54c2b1f754d61c262bb88c806b72a156e272d60c535",
+                        "8813017f3878a97b15c272982b95b3534a4475dbc3a6f40aaee3eb9dd593eb2a",
+                        "403a7a97d3c47c57e89982086de458cc1c62d01449945e9adeb160bdb487e7c8",
+                        "e1ae2a3ca0a102d9d7b80462c5c75ce1fd49a341a3ae60a497a98c9e84dc4d2c",
+                        "7d3cf5fdda0516c200a2a5d622c256d481f9764d6a72799995e01b31c97f4f26",
+                        "a080f0e1bf33dc8190c844c3b13c56c058ea08af44e1c7363d55e8fd8a7a3afc",
+                        "a611f43917fd4c23e5bb65ba8dcbde6db510142346cad2b9ab596fa75635d9e3",
+                        "ba068f56418356e2c0ee98119cc3030fa7a9b8c27d5530c93f134e899afedc02",
+                        "81a7d27fa4e8d911410a733248f102e5a9eff4d8f5617114e97c1267cbf3d348",
+                        "ea711ec0f66cec18c17b3bfa39967b00480a0df0575412c0e8a7aa8869ab93ac",
+                        "dc2efe412c0c7cf5d7e838641bdbe2d59877ca74357536da58aaa0fd1b711ac0",
+                        "93e321c3371d69fade1451f2f537579c54934aba5271a018540f70d4ac91a78e",
+                        "8f1368dfc99618f3e1b2302ebee88319371106bef78471b0eb876f2f06a3a818",
+                        "5fffc415587f815bf9645acdd481294fc4d83ac5b9a37275e8725921eaeed7f7",
+                        "3f29e067de0e036efd2684b9c54e0e6b2787fb9d83504c1201c4d0a017a0785f",
+                        "07f4a000178a78a4a8faa370d5aea0aa5628ff669522fbf6ee0d016ce016f8dc",
+                        "773ac8e936b1618243407a82d1ec9a6feaa5ebd9cbd82619d19b5bd7f0297536",
+                        "af56203cef3a9126c3442d964fe09bfeba50d9243fd9bb87ec38a961c59b5960",
+                        "fbbdfc94f38b514470de4290bba2ebdff7aac5523d97a0abbb20859ebc82065a",
+                        "471ab6bea6f7cae837a9fc601f70c7c8e53e84a544e43008d945875d61df04ad",
+                        "e20fa6fa46cd4d80d54d393c86e49b282ea1526c5f339e579bad5b39304498b8",
+                        "cac629d37126684710d0bb74fb52d529f2d16c73734f2005de6de9a504ad84ff",
+                        "a953032ffba659a809d5f733daa9db681082aa65dd08c0b05664dbefd87707ba",
+                        "5bab2244233e9f9f2d7191dfbe1ac968652ea1bc0fac48a5557b01c40d260f4a",
+                        "9d09dc8281294423fd516835ab30f15416cfd011e74dff4bf5e05f87416f0cf6",
+                        "893776d2cccda1f86b0e405d13a75a11a96528a45e0872e4ffc0b87513594100",
+                        "758a1e6461aeb3ffb55c231caacce8f663d83eef4d12f8cf94d69b09252b6e06",
+                        "0dee497dd3a7bbc26c1b2b2f807e55bc62765b3557cd50960e8b913a2e3acdba",
+                        "35a08cc32bdce97e91ba274bde6d6f19c74ae3fd3566cf1c40002a0775872505",
+                        "689104a13715e4e881a4640fd5e4bcd46687c67f53c91db4b8cae8d21cf90722",
+                        "e48d19e8a8a211358e7e7ffe964e981d3a1d11ae76a2b44a44faa856566abc5b",
+                        "28d7c2498774be7540d3b85cd67e873db198267ebd59cefb1164969d56544940",
+                        "8440cbb16acf418689ac4fe6d2b65ddd949e96458542539d30bfe2125e3a88ca",
+                        "6f837c7e4a9f4c4c1b17fb202a5bc7479add8cc0d26564766328f77455627961",
+                        "fb786f9dc125141f04857fd1393abe9172ad9c3aade782bd4d8dc23018c662bb",
+                        "be101e3278740014287a572b2b27fe3e20712bf589db356e800fad1e633d34b6",
+                        "02770ff50283c20a9a9de291de391fe7ebb4744da607a7780b10a20c49a753c2",
+                        "84801d626b5998746e0865aec4fcd1378bb376edcc763a80ee96373b01cbf72c",
+                        "1da1dd3aa77a4e2d8aa0857ccd857d4952e58ab49c26a1f0cb60275030f6607e",
+                        "04fefbda5ec9f182c2a22ad6bbbc42ffa322338e3562976b8d32b3406c2e38c9",
+                        "e8ccdcb248078a482359f4f7973d3b2069794b9777c4e2ac21558fbffee59c8c",
+                        "51507a05fbdfcc522a1f29099cc06458591bcd5809d2b210901e275dc1daed7d",
+                        "05e6b311d3a3241022b0152924627706edf857161004dc785983c5c8e4059b19",
+                        "986ccd7ef43c8085b738a0e2eb84b98aa920fd19f372c34c37569a5c7354d6df",
+                        "37c4370297131fcef6101bb43e37ada63ee4c63eadd53c683cdffda2c22b6a5f",
+                        "c8a736669a5a1c69c6088735306b2aa6da1fa685584446b27c53612344a28d39",
+                        "0c829d4a74a40e4338a406a268de64a9ac1b58ad2f0655cf1412cfe10a81f128",
+                        "ea8aeeeb0fcfa66319b5d1560c1c7e805cb445b678f60735a5450233a08f5146",
+                        "0c03e2902e4374dc2ae6e9d46b27028af86c461ec65b9708829f6e341c5dfa86",
+                        "427623b7f21f13216b47d64b3cce69d8695a12a8b76ceda909038e8ed1ad7ad6",
+                        "309bd0bf85e4b9bb130a17df032a6d057d2f4774abca3a8af6fdbf25de9182d9",
+                        "7f3da6402da41b66b0e5e957a40a787c53a3a31228f06d45f6ddfc275c06e815",
+                        "9453352b0b6541e28b5c36d1ef833b7f49dad472ac7bc01712f04a1d0bd8cb3d",
+                        "35b6a024cb364ee9e7ac55b3ee07e137b7dc7756c6e7131d02d603613f876578",
+                        "6ce8b20bf01933590374ff85f4a2fcab43cde2bbf9bf7b56c7e4c21acce02af1",
+                        "f02acb1e0f786b78b042e5d5e4d25fe711ecc05b2cbdc37077a4a1b66d925808",
+                        "b5697acfcc9d3d4b58bf01ee959bb519b165d6e2b3ff799dcd8581f2e4ecc4b4",
+                        "e5dcd86553008584de8d4e67edb1049198922900801bf51da55efcb7de45c37b",
+                        "e0c3e5997bd114db9c09728c21b8b35748eee68f8eb305b5cc099be3c265d327",
+                        "6c1e0ef8496d1c39fcde030239772ddf1182807dde25d54fea68085434a08b02",
+                        "4fbd6bcb31a607f792cca7f514d8259a05f684092be8ac91b242bc90169a7042",
+                        "9dbd18a509716c53037d8713d0353094d55b48253cb0d38cd7bc08959d7ff014",
+                        "a444e2b82333cbd5dfe250e393e245d5db8b78f91bbb6a572761a0a43ed56b38",
+                        "b163cba8c2d0441ac59033f7742733cb77812bd74de1147ae8173faae4f9269b",
+                        "0ac9c6fc35728d1317490b51b36277e825a49ba95be2a6783ef7af99e49228f7",
+                        "abe44cdbc6aea6876b8f009d6279479dca2c4f17c650c51bd7de410bbf23cd24",
+                        "4b9370d4ae2fe08db33f468ffceca5d9fe6b0273ef2887a4ea8522293870e0a1",
+                        "98b3b29996faf548b808efa1fd4ca779882bb75cc2ab3304f049b429a3638a97",
+                        "dfb57e8a34f4911773133529e0e222f6a5cf691b25a65c288f8d6baa68b5f406",
+                        "d1e35d54b3df21193102e9dcbb194a294323522ae35c68597b4b08f53cbf36ec",
+                        "53e8bb244f3c2c90fcc8ceb1662e03aab3e1a781fa1697f7383e0bdc59831195",
+                        "255874e4ced532485777b878f2d779c62853bd8d4d05ddadfa6163465703dc8c",
+                        "6b61c176da93e56226cb6fb7a4f8acf1df87d02be81f823dc851680ae64f80b6",
+                        "f035af0a109e467fd4ecd7c45bed043dd1ba0d02164c2b2aa0ab1989d8eaeff7",
+                        "81b239e1213841934e989034959c9ca0448ad64ac3ab919751c2289600a20723",
+                        "251b4f7823c8449e2e154cbab4aa72fb2cc55495da5fdc2d31075aa5647ba4cd",
+                        "0769a11a881bfd2f02a087803235d344ad2f005010e40ecd7af5db96245dd719",
+                        "f4963f675eefacf4cdd14ff7b759d5752aecee4cd704744e58b9bbbe078e0faa",
+                        "28916a97e55790f8e0a95c1203c1f8f1eac99b866aac5800445ef2d888b4be87",
+                        "575a46ecc4c7757656b9371e9b8dc058f99f9d9ad20a3e6de2d4e6cbc193711c",
+                        "935994c1df9323d2bdcbab8762904e48edf6298904f3ae7e234599366bfd86ef",
+                        "dec5bac62e0ef64db4936f818e325e12aed29ee0933277259185da1298dd0a28",
+                        "3ba063cbea967fc0b7bb9a25c5a12ee801eaa92f5570d1d1a977a229834fd0a0",
+                        "3327cc41ebebc9e82f06f836d5868f9c5023b05498bd73d836f04179d24fc7b9",
+                        "8d70f449bda2223d0d647d7543bc3a2c29fedffaef789dc5bd73d25a6f0afd38",
+                        "9902826a10b226265f357562bb20774358dbc636e790257a57af7f791b600acf",
+                        "c5821a347232865496580de7f3043822ca56eea4f8266c51e3be4a16016cdeed",
+                        "2817d6dee3e6706b92989f2dcef7cd0fef5d2263ed3d1c5dab8ba99550b1e5d5",
+                        "b918f2ce206701dfe60eee1d40fad119540e928b8da813fe29d77a2e26c2738b",
+                        "7f836479ecd2c4aec31c96935e2ce932135249c6077184b837f724fbdd425408",
+                        "1381c39fb5a68c134b948aacf72b5127a7b0d5a721ed2091da25a3856b9a9af8",
+                        "80e6ab5756de5eba8551f62d8943e5f650f4ae8864ea6bdffc3257ef1072679a",
+                        "ae7dd5fcf4688844f5ef72471cc0273e0e2f8f43ba4fc3dd41208f70b880e5d4",
+                        "e0f1d8c1a745ede1198fefbd0555bc118f7ccbd9ee783d8ed7a148f54fb1903f",
+                        "33c8a75fad49fd3b3bb1e031fb283858f79b05a8b461eb1f8f0e9d41c53474bc",
+                        "3864e97cd6f47c2eaf3fdcbb105e014accb4eb902be8a43dfca77dfe0d92761e",
+                        "e524e7c40053d3d1da35ac8a584ad7034cd30de0e9513bf7731f8e5f51f7178e",
+                        "12e121ad8a9be231659d08746b1a8b2b9247304dddc69cec074711970986cc6d",
+                        "149a0d197a6c2dba3044e43f5fac90f6a797e0d4c8d91e241725e963083bb472",
+                        "6a062ba02e79d2b2c001e1689daa1b3ade7c917ef26b30987798123818b202bd",
+                        "99e47c124d128f741f30e7c5bc7575f11a005befaa26ab60b560fe4a65717aa0",
+                        "147961e3d28573540582cb4a6e266f3a677d9e5b24da19c29fa611d3f8fba8a9",
+                        "59261c94c9000fe26b3b050c4cf7ab06343d4ffcbe3934da65f12d8a7b0c6862",
+                        "7428bc174ef7fd68911d46b35da30bbf8a292bb6b9ea99489b0c28bb55876e54",
+                        "6fbff71f7187e67e5cc11f85ecc7d063284c6829ffc2b647d9439cf6d80c71b3",
+                        "d49db17aa1e54596333d1962db0050b54a96abc6184f28b46778ac3eb9bc2290",
+                        "082436ca15376750587883056c2b5fceafd232f6fd91d839dcf7f138583565d0",
+                        "2d6c7614ddf121cedd9db989f73da61c3e5d5d7a876139d2d441d8dc28bef0ab",
+                        "10b5eb9db4b22b9047b2c9a2b40abefc9786d8f0b33514bcef81c462f241ca60"
+                    ],
+                    "key_material": {
+                        "scan_priv_key": "000000000000000000000000000000000000000000000000000000000000dead",
+                        "spend_priv_key": "000000000000000000000000000000000000000000000000000000000000beef"
+                    },
+                    "labels": [
+                        0
+                    ]
+                },
+                "expected": {
+                    "addresses": [
+                        "sp1qqtnvg7hxjck9ag24naytgd7pjwsmevwh95ydwht58w3uh7uw0ta7kq6xcdal4dazgg2txp472hdz4svms98328lqdflmpxppmc6ykamcrv9s7w9g",
+                        "sp1qqtnvg7hxjck9ag24naytgd7pjwsmevwh95ydwht58w3uh7uw0ta7kqmk4a3pm24z0yepw6aw27pku56md0hq5ace0l3p3jstkqaajwrsjqc5dde5"
+                    ],
+                    "n_outputs": 2323,
+                    "tweak": "022c333a8938ca0c7433c5e39d440b469f58374d0363b5bffc66aca1cc10d7b609",
+                    "shared_secret": "03abe0979dbbe4e1bb2cd2e06524a411c0b829c1d2282052da817b46f1d6e598e4",
+                    "input_pub_key_sum": "02bca87f72e604e8850064552bedf380ca4584227057efe12a6cc238470658aaa3"
+                }
+            }
+        ]
+    }
+]
diff --git a/depend/bitcoin/src/secp256k1/src/modules/silentpayments/main_impl.h b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/main_impl.h
new file mode 100644
index 00000000..58c760a7
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/main_impl.h
@@ -0,0 +1,805 @@
+/***********************************************************************
+ * Distributed under the MIT software license, see the accompanying    *
+ * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
+ ***********************************************************************/
+
+#ifndef SECP256K1_MODULE_SILENTPAYMENTS_MAIN_H
+#define SECP256K1_MODULE_SILENTPAYMENTS_MAIN_H
+
+#include "../../../include/secp256k1.h"
+#include "../../../include/secp256k1_extrakeys.h"
+#include "../../../include/secp256k1_silentpayments.h"
+
+#include "../../eckey.h"
+#include "../../ecmult.h"
+#include "../../ecmult_const.h"
+#include "../../ecmult_gen.h"
+#include "../../group.h"
+#include "../../hash.h"
+#include "../../hsort.h"
+
+/** magic bytes for ensuring prevouts_summary objects were initialized correctly. */
+static const unsigned char secp256k1_silentpayments_prevouts_summary_magic[4] = { 0xa7, 0x1c, 0xd3, 0x5e };
+
+/** Sort an array of Silent Payments recipients. This is used to group recipients by scan pubkey to
+ *  ensure the correct values of k are used when creating multiple outputs for a recipient.
+ *  Since heap sort is unstable, we use the recipient's index as tie-breaker to have a well-defined
+ *  order, i.e. within scan pubkey groups, the spend pubkeys appear in the same order as they were
+ *  passed in.
+ */
+static int secp256k1_silentpayments_recipient_sort_cmp(const void* pk1, const void* pk2, void *ctx) {
+    const secp256k1_silentpayments_recipient *r1 = *(const secp256k1_silentpayments_recipient **)pk1;
+    const secp256k1_silentpayments_recipient *r2 = *(const secp256k1_silentpayments_recipient **)pk2;
+
+    const int ret = secp256k1_ec_pubkey_cmp((secp256k1_context *)ctx, &r1->scan_pubkey, &r2->scan_pubkey);
+    if (ret != 0) {
+        return ret;
+    } else {
+        return (r1->index > r2->index) - (r1->index < r2->index);
+    }
+}
+
+static void secp256k1_silentpayments_recipient_sort(const secp256k1_context* ctx, const secp256k1_silentpayments_recipient **recipients, size_t n_recipients) {
+    /* Suppress wrong warning (fixed in MSVC 19.33) */
+    #if defined(_MSC_VER) && (_MSC_VER < 1933)
+    #pragma warning(push)
+    #pragma warning(disable: 4090)
+    #endif
+
+    secp256k1_hsort(recipients, n_recipients, sizeof(*recipients), secp256k1_silentpayments_recipient_sort_cmp, (void *)ctx);
+
+    #if defined(_MSC_VER) && (_MSC_VER < 1933)
+    #pragma warning(pop)
+    #endif
+}
+
+/** Set hash state to the BIP340 tagged hash midstate for "BIP0352/Inputs". */
+static void secp256k1_silentpayments_sha256_init_inputs(secp256k1_sha256* hash) {
+    static const uint32_t midstate[8] = {
+        0xd4143ffcul, 0x012ea4b5ul, 0x36e21c8ful, 0xf7ec7b54ul,
+        0x4dd4e2acul, 0x9bcaa0a4ul, 0xe244899bul, 0xcd06903eul
+    };
+    secp256k1_sha256_initialize_midstate(hash, 64, midstate);
+}
+
+/** Callers must ensure that pubkey_sum is not the point at infinity before calling this function. */
+static int secp256k1_silentpayments_calculate_input_hash_scalar(const secp256k1_hash_ctx *hash_ctx, secp256k1_scalar *input_hash_scalar, const unsigned char *outpoint_smallest36, secp256k1_ge *pubkey_sum) {
+    secp256k1_sha256 hash;
+    unsigned char pubkey_sum_ser[33];
+    unsigned char input_hash[32];
+    int overflow;
+
+    secp256k1_silentpayments_sha256_init_inputs(&hash);
+    secp256k1_sha256_write(hash_ctx, &hash, outpoint_smallest36, 36);
+    secp256k1_eckey_pubkey_serialize33(pubkey_sum, pubkey_sum_ser);
+    secp256k1_sha256_write(hash_ctx, &hash, pubkey_sum_ser, sizeof(pubkey_sum_ser));
+    secp256k1_sha256_finalize(hash_ctx, &hash, input_hash);
+    /* Convert input_hash to a scalar.
+     *
+     * This can only fail if the output of the hash function is zero or greater than or equal to the curve order, which
+     * happens with negligible probability. Normally, we would use VERIFY_CHECK as opposed to returning an error
+     * since returning an error here would result in an untestable branch in the code. But in this case, we return
+     * an error to ensure strict compliance with BIP0352.
+     */
+    secp256k1_scalar_set_b32(input_hash_scalar, input_hash, &overflow);
+    return (!secp256k1_scalar_is_zero(input_hash_scalar)) & (!overflow);
+}
+
+static void secp256k1_silentpayments_create_shared_secret(unsigned char *shared_secret33, const secp256k1_ge *public_component, const secp256k1_scalar *secret_component) {
+    secp256k1_gej ss_j;
+    secp256k1_ge ss;
+
+    VERIFY_CHECK(!secp256k1_ge_is_infinity(public_component));
+    VERIFY_CHECK(!secp256k1_scalar_is_zero(secret_component));
+
+    secp256k1_ecmult_const(&ss_j, public_component, secret_component);
+    secp256k1_ge_set_gej(&ss, &ss_j);
+
+    /* serialize shared secret in constant-time */
+    secp256k1_fe_normalize(&ss.x);
+    secp256k1_fe_normalize(&ss.y);
+    shared_secret33[0] = SECP256K1_TAG_PUBKEY_EVEN | secp256k1_fe_is_odd(&ss.y);
+    secp256k1_fe_get_b32(&shared_secret33[1], &ss.x);
+
+    /* Leaking these values would break indistinguishability of the transaction, so clear them. */
+    secp256k1_ge_clear(&ss);
+    secp256k1_gej_clear(&ss_j);
+}
+
+/** Set hash state to the BIP340 tagged hash midstate for "BIP0352/SharedSecret". */
+static void secp256k1_silentpayments_sha256_init_sharedsecret(secp256k1_sha256* hash) {
+    static const uint32_t midstate[8] = {
+        0x88831537ul, 0x5127079bul, 0x69c2137bul, 0xab0303e6ul,
+        0x98fa21faul, 0x4a888523ul, 0xbd99daabul, 0xf25e5e0aul
+    };
+    secp256k1_sha256_initialize_midstate(hash, 64, midstate);
+}
+
+static int secp256k1_silentpayments_create_output_tweak(const secp256k1_context *ctx, secp256k1_scalar *t_k_scalar, const unsigned char *shared_secret33, uint32_t k) {
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(ctx);
+    secp256k1_sha256 hash;
+    unsigned char hash_ser[32];
+    unsigned char k_serialized[4];
+    int overflow;
+
+    /* Compute hash(shared_secret || ser_32(k))  [sha256 with tag "BIP0352/SharedSecret"] */
+    secp256k1_silentpayments_sha256_init_sharedsecret(&hash);
+    secp256k1_sha256_write(hash_ctx, &hash, shared_secret33, 33);
+    secp256k1_write_be32(k_serialized, k);
+    secp256k1_sha256_write(hash_ctx, &hash, k_serialized, sizeof(k_serialized));
+    secp256k1_sha256_finalize(hash_ctx, &hash, hash_ser);
+
+    /* The only thing that the attacker can do with the hashed secret is derive the final pubkeys.
+     * On the side of the sender, we assume that will reveal those on the blockchain anyway.
+     * On the side of the scanner, we assume that the caller wants to branch when a payment is found. */
+    secp256k1_declassify(ctx, hash_ser, sizeof(hash_ser));
+
+    /* Convert output tweak t_k to a scalar.
+     *
+     * This can only fail if the output of the hash function is zero or greater than or equal to the curve order, which
+     * happens with negligible probability. Normally, we would use VERIFY_CHECK as opposed to returning an error
+     * since returning an error here would result in an untestable branch in the code. But in this case, we return
+     * an error to ensure strict compliance with BIP0352.
+     */
+    secp256k1_scalar_set_b32(t_k_scalar, hash_ser, &overflow);
+    /* Leaking this value would break indistinguishability of the transaction, so clear it. */
+    secp256k1_memclear_explicit(hash_ser, sizeof(hash_ser));
+    secp256k1_sha256_clear(&hash);
+    return (!secp256k1_scalar_is_zero(t_k_scalar)) & (!overflow);
+}
+
+static int secp256k1_silentpayments_create_output_pubkey(const secp256k1_context *ctx, secp256k1_xonly_pubkey *output_xonly, const unsigned char *shared_secret33, const secp256k1_pubkey *spend_pubkey, uint32_t k) {
+    secp256k1_ge output_ge;
+    secp256k1_scalar t_k_scalar;
+    /* Calculate the output tweak t_k and convert it to a scalar.
+     *
+     * Note: _create_output_tweak can only fail if the output of the hash function is zero or greater than or equal to
+     * the curve order, which is statistically improbable. Returning an error here results in an untestable branch in
+     * the code, but we do this anyways to ensure strict compliance with BIP0352.
+     */
+    if (!secp256k1_silentpayments_create_output_tweak(ctx, &t_k_scalar, shared_secret33, k)) {
+        secp256k1_scalar_clear(&t_k_scalar);
+        return 0;
+    }
+
+    if (!secp256k1_pubkey_load(ctx, &output_ge, spend_pubkey)) {
+        secp256k1_scalar_clear(&t_k_scalar);
+        return 0;
+    }
+    /* `tweak_add` only fails if t_k_scalar * G = -spend_pubkey. Considering t_k is the output of a hash function, this
+     * will happen only with negligible probability for honestly created spend_pubkey, but we handle this error anyway
+     * to protect against this function being called with malicious inputs, i.e.,
+     *     spend_pubkey = -(_create_output_tweak(shared_secret33, k))*G
+     */
+    if (!secp256k1_eckey_pubkey_tweak_add(&output_ge, &t_k_scalar)) {
+        secp256k1_scalar_clear(&t_k_scalar);
+        return 0;
+    }
+    secp256k1_fe_normalize_var(&output_ge.y);
+    secp256k1_extrakeys_ge_even_y(&output_ge);
+    secp256k1_xonly_pubkey_save(output_xonly, &output_ge);
+
+    /* Leaking this value would break indistinguishability of the transaction, so clear it. */
+    secp256k1_scalar_clear(&t_k_scalar);
+    return 1;
+}
+
+int secp256k1_silentpayments_sender_create_outputs(
+    const secp256k1_context *ctx,
+    secp256k1_xonly_pubkey **generated_outputs,
+    const secp256k1_silentpayments_recipient **recipients,
+    size_t n_recipients,
+    const unsigned char *outpoint_smallest36,
+    const secp256k1_keypair * const *keypairs,
+    size_t n_keypairs,
+    const unsigned char * const *seckeys,
+    size_t n_seckeys
+) {
+    size_t i;
+    uint32_t k;
+    secp256k1_scalar seckey_sum_scalar, addend, input_hash_scalar;
+    secp256k1_ge prevouts_pubkey_sum_ge;
+    unsigned char shared_secret[33];
+    secp256k1_pubkey current_scan_pubkey;
+    int ret, sum_is_zero;
+
+    /* Sanity check inputs. */
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
+    ARG_CHECK(generated_outputs != NULL);
+    ARG_CHECK(recipients != NULL);
+    ARG_CHECK(n_recipients > 0);
+    ARG_CHECK(outpoint_smallest36 != NULL);
+    ARG_CHECK((seckeys != NULL) || (keypairs != NULL));
+    if (keypairs != NULL) {
+        ARG_CHECK(n_keypairs > 0);
+        for (i = 0; i < n_keypairs; i++) {
+            ARG_CHECK(keypairs[i] != NULL);
+        }
+    } else {
+        ARG_CHECK(n_keypairs == 0);
+    }
+    if (seckeys != NULL) {
+        ARG_CHECK(n_seckeys > 0);
+        for (i = 0; i < n_seckeys; i++) {
+            ARG_CHECK(seckeys[i] != NULL);
+        }
+    } else {
+        ARG_CHECK(n_seckeys == 0);
+    }
+    for (i = 0; i < n_recipients; i++) {
+        ARG_CHECK(generated_outputs[i] != NULL);
+        ARG_CHECK(recipients[i] != NULL);
+        ARG_CHECK(recipients[i]->index == i);
+    }
+
+    seckey_sum_scalar = secp256k1_scalar_zero;
+    for (i = 0; i < n_seckeys; i++) {
+        ret = secp256k1_scalar_set_b32_seckey(&addend, seckeys[i]);
+        secp256k1_declassify(ctx, &ret, sizeof(ret));
+        if (!ret) {
+            secp256k1_scalar_clear(&addend);
+            secp256k1_scalar_clear(&seckey_sum_scalar);
+            return 0;
+        }
+        secp256k1_scalar_add(&seckey_sum_scalar, &seckey_sum_scalar, &addend);
+    }
+    /* Secret keys used for taproot outputs have to be negated if they result in an odd point. This is to ensure
+     * the sender and recipient can arrive at the same shared secret when using x-only public keys. */
+    for (i = 0; i < n_keypairs; i++) {
+        secp256k1_ge addend_point;
+        ret = secp256k1_keypair_load(ctx, &addend, &addend_point, keypairs[i]);
+        secp256k1_declassify(ctx, &ret, sizeof(ret));
+        if (!ret) {
+            secp256k1_scalar_clear(&addend);
+            secp256k1_scalar_clear(&seckey_sum_scalar);
+            return 0;
+        }
+        if (secp256k1_fe_is_odd(&addend_point.y)) {
+            secp256k1_scalar_negate(&addend, &addend);
+        }
+        secp256k1_scalar_add(&seckey_sum_scalar, &seckey_sum_scalar, &addend);
+    }
+    /* If there are any failures in loading/summing up the secret keys, fail early. */
+    sum_is_zero = secp256k1_scalar_is_zero(&seckey_sum_scalar);
+    secp256k1_declassify(ctx, &sum_is_zero, sizeof(sum_is_zero));
+    secp256k1_scalar_clear(&addend);
+    if (sum_is_zero) {
+        secp256k1_scalar_clear(&seckey_sum_scalar);
+        return 0;
+    }
+    secp256k1_ecmult_gen_ge(&ctx->ecmult_gen_ctx, &prevouts_pubkey_sum_ge, &seckey_sum_scalar);
+    /* We declassify the pubkey sum because serializing a group element (done in the
+     * `_calculate_input_hash_scalar` call following) is not a constant-time operation.
+     */
+    secp256k1_declassify(ctx, &prevouts_pubkey_sum_ge, sizeof(prevouts_pubkey_sum_ge));
+
+    /* Calculate the input_hash and convert it to a scalar so that it can be multiplied with the summed up private keys, i.e., a_sum = a_sum * input_hash.
+     * By multiplying the scalars together first, we can save an elliptic curve multiplication.
+     *
+     * Note: _input_hash_scalar can only fail if the output of the hash function is zero or greater than or equal to the
+     * curve order, which is statistically improbable. Returning an error here results in an untestable branch in the
+     * code, but we do this anyways to ensure strict compliance with BIP0352.
+     */
+    if (!secp256k1_silentpayments_calculate_input_hash_scalar(secp256k1_get_hash_context(ctx), &input_hash_scalar, outpoint_smallest36, &prevouts_pubkey_sum_ge)) {
+        secp256k1_scalar_clear(&seckey_sum_scalar);
+        return 0;
+    }
+    secp256k1_scalar_mul(&seckey_sum_scalar, &seckey_sum_scalar, &input_hash_scalar);
+    /* _recipient_sort sorts the array of recipients in place by their scan public keys (lexicographically).
+     * This ensures that all recipients with the same scan public key are grouped together, as specified in BIP0352.
+     *
+     * More specifically, this ensures `k` is incremented from 0 to the number of requested outputs for each recipient group,
+     * where a recipient group is all addresses with the same scan public key.
+     */
+    secp256k1_silentpayments_recipient_sort(ctx, recipients, n_recipients);
+    current_scan_pubkey = recipients[0]->scan_pubkey;
+    k = 0;  /* This is a dead store but clang will emit a false positive warning if we omit it. */
+    for (i = 0; i < n_recipients; i++) {
+        if ((i == 0) || (secp256k1_ec_pubkey_cmp(ctx, &current_scan_pubkey, &recipients[i]->scan_pubkey) != 0)) {
+            /* If we are on a different scan pubkey, its time to recreate the shared secret and reset k to 0.
+             * It's very unlikely the scan public key is invalid by this point, since this means the caller would
+             * have created the _silentpayments_recipient object incorrectly, but just to be sure we still check that
+             * the public key is valid.
+             */
+            secp256k1_ge pk;
+            if (!secp256k1_pubkey_load(ctx, &pk, &recipients[i]->scan_pubkey)) {
+                secp256k1_scalar_clear(&seckey_sum_scalar);
+                /* Leaking this value would break indistinguishability of the transaction, so clear it. */
+                secp256k1_memclear_explicit(&shared_secret, sizeof(shared_secret));
+                return 0;
+            }
+            /* Creating the shared secret requires that the public and secret components are
+             * non-infinity and non-zero, respectively. Note that the involved parts (input hash,
+             * secret key sum, and scan public key) have all been verified at this point. */
+            secp256k1_silentpayments_create_shared_secret(shared_secret, &pk, &seckey_sum_scalar);
+            k = 0;
+        }
+        /* If creating another output for the current recipient group exceeded the
+         * protocol limit, fail, as the recipient wouldn't be guaranteed to find it. */
+        if (k >= SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT) {
+            secp256k1_scalar_clear(&seckey_sum_scalar);
+            secp256k1_memclear_explicit(&shared_secret, sizeof(shared_secret));
+            return 0;
+        }
+        if (!secp256k1_silentpayments_create_output_pubkey(ctx, generated_outputs[recipients[i]->index], shared_secret, &recipients[i]->spend_pubkey, k)) {
+            secp256k1_scalar_clear(&seckey_sum_scalar);
+            secp256k1_memclear_explicit(&shared_secret, sizeof(shared_secret));
+            return 0;
+        }
+        current_scan_pubkey = recipients[i]->scan_pubkey;
+        k++;
+    }
+    secp256k1_scalar_clear(&seckey_sum_scalar);
+    secp256k1_memclear_explicit(&shared_secret, sizeof(shared_secret));
+    return 1;
+}
+
+/** Set hash state to the BIP340 tagged hash midstate for "BIP0352/Label". */
+static void secp256k1_silentpayments_sha256_init_label(secp256k1_sha256* hash) {
+    static const uint32_t midstate[8] = {
+        0x26b95d63ul, 0x8bf1b740ul, 0x10a5986ful, 0x06a387a5ul,
+        0x2d1c1c30ul, 0xd035951aul, 0x2d7f0f96ul, 0x29e3e0dbul
+    };
+    secp256k1_sha256_initialize_midstate(hash, 64, midstate);
+}
+
+static const unsigned char secp256k1_silentpayments_label_magic[4] = { 0x27, 0x9d, 0x44, 0xba };
+
+/* Saves a group element into a label. Requires that the provided group element is not infinity. */
+static void secp256k1_silentpayments_label_save(secp256k1_silentpayments_label* label, const secp256k1_ge* ge) {
+    memcpy(&label->data[0], secp256k1_silentpayments_label_magic, 4);
+    secp256k1_ge_to_bytes(label->data + 4, ge);
+}
+
+/* Loads a group element from a label. Returns 1 unless the label wasn't properly initialized. */
+static int secp256k1_silentpayments_label_load(const secp256k1_context* ctx, secp256k1_ge* ge, const secp256k1_silentpayments_label* label) {
+    ARG_CHECK(secp256k1_memcmp_var(&label->data[0], secp256k1_silentpayments_label_magic, 4) == 0);
+    secp256k1_ge_from_bytes(ge, label->data + 4);
+    return 1;
+}
+
+int secp256k1_silentpayments_recipient_label_parse(const secp256k1_context* ctx, secp256k1_silentpayments_label* label, const unsigned char *in33) {
+    secp256k1_ge ge;
+
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(label != NULL);
+    memset(label, 0, sizeof(*label));
+    ARG_CHECK(in33 != NULL);
+
+    if (!secp256k1_eckey_pubkey_parse(&ge, in33, 33)) {
+        return 0;
+    }
+
+    secp256k1_silentpayments_label_save(label, &ge);
+    return 1;
+}
+
+int secp256k1_silentpayments_recipient_label_serialize(const secp256k1_context* ctx, unsigned char *out33, const secp256k1_silentpayments_label* label) {
+    secp256k1_ge ge;
+
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(out33 != NULL);
+    memset(out33, 0, 33);
+    ARG_CHECK(label != NULL);
+
+    if (!secp256k1_silentpayments_label_load(ctx, &ge, label)) {
+        return 0;
+    }
+    secp256k1_eckey_pubkey_serialize33(&ge, out33);
+    return 1;
+}
+
+int secp256k1_silentpayments_recipient_label_create(const secp256k1_context *ctx, secp256k1_silentpayments_label *label, unsigned char *label_tweak32, const unsigned char *scan_key32, uint32_t m) {
+    secp256k1_sha256 hash;
+    unsigned char m_serialized[4];
+    secp256k1_ge label_ge;
+    secp256k1_scalar label_tweak_scalar;
+    int ret;
+
+    /* Sanity check inputs. */
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(label != NULL);
+    memset(label, 0, sizeof(*label));
+    ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
+    ARG_CHECK(label_tweak32 != NULL);
+    ARG_CHECK(scan_key32 != NULL);
+
+    /* ensure that the passed scan key is valid, in order to avoid creating unspendable labels */
+    ret = secp256k1_ec_seckey_verify(ctx, scan_key32);
+
+    /* Compute hash(ser_256(b_scan) || ser_32(m))  [sha256 with tag "BIP0352/Label"] */
+    secp256k1_silentpayments_sha256_init_label(&hash);
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, scan_key32, 32);
+    secp256k1_write_be32(m_serialized, m);
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, m_serialized, sizeof(m_serialized));
+    secp256k1_sha256_finalize(secp256k1_get_hash_context(ctx), &hash, label_tweak32);
+
+    ret &= secp256k1_ec_pubkey_create_helper(&ctx->ecmult_gen_ctx, &label_tweak_scalar, &label_ge, label_tweak32);
+    secp256k1_silentpayments_label_save(label, &label_ge);
+    secp256k1_memczero(label, sizeof(*label), !ret);
+    secp256k1_memczero(label_tweak32, 32, !ret);
+
+    secp256k1_scalar_clear(&label_tweak_scalar);
+    secp256k1_memclear_explicit(m_serialized, sizeof(m_serialized));
+    secp256k1_sha256_clear(&hash);
+
+    return ret;
+}
+
+int secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(const secp256k1_context *ctx, secp256k1_pubkey *labeled_spend_pubkey, const secp256k1_pubkey *unlabeled_spend_pubkey, const secp256k1_silentpayments_label *label) {
+    secp256k1_ge labeled_spend_pubkey_ge, label_addend;
+    secp256k1_gej result_gej;
+    secp256k1_ge result_ge;
+    int ret;
+
+    /* Sanity check inputs. */
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(labeled_spend_pubkey != NULL);
+    memset(labeled_spend_pubkey, 0, sizeof(*labeled_spend_pubkey));
+    ARG_CHECK(unlabeled_spend_pubkey != NULL);
+    ARG_CHECK(label != NULL);
+
+    /* Calculate labeled_spend_pubkey = unlabeled_spend_pubkey + label.
+     * If either the label or spend public key is invalid, return early.
+     */
+    ret = secp256k1_pubkey_load(ctx, &labeled_spend_pubkey_ge, unlabeled_spend_pubkey);
+    ret &= secp256k1_silentpayments_label_load(ctx, &label_addend, label);
+    if (!ret) {
+        return 0;
+    }
+    secp256k1_gej_set_ge(&result_gej, &labeled_spend_pubkey_ge);
+    secp256k1_gej_add_ge_var(&result_gej, &result_gej, &label_addend, NULL);
+    if (secp256k1_gej_is_infinity(&result_gej)) {
+        return 0;
+    }
+
+    secp256k1_ge_set_gej_var(&result_ge, &result_gej);
+    secp256k1_pubkey_save(labeled_spend_pubkey, &result_ge);
+
+    return 1;
+}
+
+/** An explanation of the prevouts_summary object and its usage:
+ *
+ *  The prevouts_summary object contains:
+ *
+ *  [magic: 4 bytes][boolean: 1 byte][prevouts_pubkey_sum: 64 bytes][input_hash: 32 bytes]
+ *
+ *  The magic bytes are checked by functions using the prevouts_summary object to
+ *  check that the prevouts_summary object was initialized correctly.
+ *
+ *  The boolean (combined) indicates whether or not the summed prevout public keys and the
+ *  input_hash scalar have already been combined or are both included. The reason
+ *  for keeping input_hash and the summed prevout public keys separate is so that an elliptic
+ *  curve multiplication can be avoided when creating the shared secret, i.e.,
+ *  (recipient_scan_key * input_hash) * prevouts_pubkey_sum.
+ *
+ *  But when storing the prevouts_summary object (not supported yet), either to send to
+ *  light clients or for wallet rescans, we can save 32-bytes by combining the input_hash
+ *  and prevouts_pubkey_sum and saving the resulting point serialized as a compressed
+ *  public key, i.e., input_hash * prevouts_pubkey_sum.
+ *
+ *  For each function:
+ *
+ *  - `_recipient_prevouts_summary_create` always creates a prevouts_summary object with combined = false
+ */
+
+int secp256k1_silentpayments_recipient_prevouts_summary_create(
+    const secp256k1_context *ctx,
+    secp256k1_silentpayments_prevouts_summary *prevouts_summary,
+    const unsigned char *outpoint_smallest36,
+    const secp256k1_xonly_pubkey * const *xonly_pubkeys,
+    size_t n_xonly_pubkeys,
+    const secp256k1_pubkey * const *pubkeys,
+    size_t n_pubkeys
+) {
+    size_t i;
+    secp256k1_ge prevouts_pubkey_sum_ge, addend;
+    secp256k1_gej prevouts_pubkey_sum_gej;
+    secp256k1_scalar input_hash_scalar;
+
+    /* Sanity check inputs */
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(prevouts_summary != NULL);
+    memset(prevouts_summary, 0, sizeof(*prevouts_summary));
+    ARG_CHECK(outpoint_smallest36 != NULL);
+    ARG_CHECK((pubkeys != NULL) || (xonly_pubkeys != NULL));
+    if (xonly_pubkeys != NULL) {
+        ARG_CHECK(n_xonly_pubkeys > 0);
+        for (i = 0; i < n_xonly_pubkeys; i++) {
+            ARG_CHECK(xonly_pubkeys[i] != NULL);
+        }
+    } else {
+        ARG_CHECK(n_xonly_pubkeys == 0);
+    }
+    if (pubkeys != NULL) {
+        ARG_CHECK(n_pubkeys > 0);
+        for (i = 0; i < n_pubkeys; i++) {
+            ARG_CHECK(pubkeys[i] != NULL);
+        }
+    } else {
+        ARG_CHECK(n_pubkeys == 0);
+    }
+
+    /* Compute prevouts_pubkey_sum = A_1 + A_2 + ... + A_n.
+     *
+     * Since an attacker can maliciously craft transactions where the public keys sum to zero, fail early here
+     * to avoid making the caller do extra work, e.g., when building an index or scanning a malicious transaction.
+     *
+     * This will also fail if any of the provided prevout public keys are malformed.
+     */
+    secp256k1_gej_set_infinity(&prevouts_pubkey_sum_gej);
+    for (i = 0; i < n_pubkeys; i++) {
+        if (!secp256k1_pubkey_load(ctx, &addend, pubkeys[i])) {
+            return 0;
+        }
+        secp256k1_gej_add_ge_var(&prevouts_pubkey_sum_gej, &prevouts_pubkey_sum_gej, &addend, NULL);
+    }
+    for (i = 0; i < n_xonly_pubkeys; i++) {
+        if (!secp256k1_xonly_pubkey_load(ctx, &addend, xonly_pubkeys[i])) {
+            return 0;
+        }
+        secp256k1_gej_add_ge_var(&prevouts_pubkey_sum_gej, &prevouts_pubkey_sum_gej, &addend, NULL);
+    }
+    if (secp256k1_gej_is_infinity(&prevouts_pubkey_sum_gej)) {
+        return 0;
+    }
+    secp256k1_ge_set_gej_var(&prevouts_pubkey_sum_ge, &prevouts_pubkey_sum_gej);
+    /* Calculate the input_hash and convert it to a scalar.
+     *
+     * Note: _input_hash_scalar can only fail if the output of the hash function is zero or greater than or equal to the
+     * curve order, which is statistically improbable. Returning an error here results in an untestable branch in the
+     * code, but we do this anyways to ensure strict compliance with BIP0352.
+     */
+    if (!secp256k1_silentpayments_calculate_input_hash_scalar(secp256k1_get_hash_context(ctx), &input_hash_scalar, outpoint_smallest36, &prevouts_pubkey_sum_ge)) {
+        return 0;
+    }
+    memcpy(&prevouts_summary->data[0], secp256k1_silentpayments_prevouts_summary_magic, 4);
+    prevouts_summary->data[4] = 0;
+    secp256k1_ge_to_bytes(&prevouts_summary->data[5], &prevouts_pubkey_sum_ge);
+    secp256k1_scalar_get_b32(&prevouts_summary->data[5 + 64], &input_hash_scalar);
+    return 1;
+}
+
+/* Label scanning involves the transformation from Jacobian (gej) to affine (ge) coordinates
+ * for serializing label candidates. As this is an expensive operation involving modular
+ * inversion, we don't do this one by one for each tx output, but collect multiple label
+ * candidates in Jacobian in order to apply Montgomery's trick for batch inversion (using
+ * the function `secp256k1_ge_set_all_gej_var`). For transactions with a large number of
+ * outputs, this speeds up scanning significantly (~2.5x). */
+enum { LABEL_BATCH_SIZE = 8 }; /* batch size expressed in number of tx outputs */
+
+/* Check the label cache for each pair of candidates in a batch.
+ * Returns the first matching tx output index, or -1 if none has a matching label. */
+static int secp256k1_silentpayments_check_label_batch(
+    secp256k1_ge *label_ge,
+    const unsigned char **label_tweak,
+    const secp256k1_gej *label_candidates_gej,
+    size_t n_batch,
+    size_t j_start,
+    secp256k1_silentpayments_label_lookup label_lookup,
+    const void *label_context
+) {
+    secp256k1_ge label_candidates_ge[2 * LABEL_BATCH_SIZE];
+    unsigned char label33[33];
+    size_t i;
+
+    *label_tweak = NULL;
+    secp256k1_ge_set_all_gej_var(label_candidates_ge, label_candidates_gej, 2 * n_batch);
+    for (i = 0; i < 2 * n_batch; i++) {
+        /* Note: serialize will only fail if a label candidate is the point at infinity, but we know
+         * this cannot happen since we only collect candidates if tx_output != unlabeled_output. Thus,
+         * we know that label_candidate = tx_output - unlabeled_output cannot be the point at infinity.
+         */
+        VERIFY_CHECK(!secp256k1_ge_is_infinity(&label_candidates_ge[i]));
+        secp256k1_eckey_pubkey_serialize33(&label_candidates_ge[i], label33);
+        *label_tweak = label_lookup(label33, label_context);
+        if (*label_tweak != NULL) {
+            *label_ge = label_candidates_ge[i];
+            return (int)(j_start + i / 2);
+        }
+    }
+    return -1;
+}
+
+int secp256k1_silentpayments_recipient_scan_outputs(
+    const secp256k1_context *ctx,
+    secp256k1_silentpayments_found_output **found_outputs, uint32_t *n_found_outputs,
+    const secp256k1_xonly_pubkey * const *tx_outputs, size_t n_tx_outputs,
+    const unsigned char *scan_key32,
+    const secp256k1_silentpayments_prevouts_summary *prevouts_summary,
+    const secp256k1_pubkey *unlabeled_spend_pubkey,
+    secp256k1_silentpayments_label_lookup label_lookup,
+    const void *label_context
+) {
+    secp256k1_scalar scan_key_scalar;
+    secp256k1_ge unlabeled_spend_pubkey_ge, prevouts_pubkey_sum_ge, tx_output_ge;
+    unsigned char shared_secret[33];
+    uint32_t k, k_max;
+    size_t i;
+    int found_idx, combined, valid_scan_key, ret;
+
+    /* Sanity check inputs */
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(found_outputs != NULL);
+    ARG_CHECK(n_found_outputs != NULL);
+    *n_found_outputs = 0;
+    ARG_CHECK(tx_outputs != NULL);
+    ARG_CHECK(n_tx_outputs > 0);
+    for (i = 0; i < n_tx_outputs; i++) {
+        ARG_CHECK(found_outputs[i] != NULL);
+        ARG_CHECK(tx_outputs[i] != NULL);
+        /* Validate each tx output object early so malformed pubkeys are always rejected. */
+        if (!secp256k1_xonly_pubkey_load(ctx, &tx_output_ge, tx_outputs[i])) {
+            return 0;
+        }
+    }
+    ARG_CHECK(scan_key32 != NULL);
+    ARG_CHECK(prevouts_summary != NULL);
+    ARG_CHECK(secp256k1_memcmp_var(&prevouts_summary->data[0], secp256k1_silentpayments_prevouts_summary_magic, 4) == 0);
+    ARG_CHECK(unlabeled_spend_pubkey != NULL);
+    /* Passing a context without a lookup function is non-sensical */
+    if (label_context != NULL) {
+        ARG_CHECK(label_lookup != NULL);
+    }
+    valid_scan_key = secp256k1_scalar_set_b32_seckey(&scan_key_scalar, scan_key32);
+    secp256k1_declassify(ctx, &valid_scan_key, sizeof(valid_scan_key));
+    if (!valid_scan_key) {
+        secp256k1_scalar_clear(&scan_key_scalar);
+        return 0;
+    }
+    secp256k1_ge_from_bytes(&prevouts_pubkey_sum_ge, &prevouts_summary->data[5]);
+    combined = (int)prevouts_summary->data[4];
+    /* Note that the "combined" flag can currently only be 0, as we only have support for full nodes, i.e.,
+     * the following branch is always taken. "combined" can also be 1 once we add light client support. */
+    if (!combined) {
+        secp256k1_scalar input_hash_scalar;
+        secp256k1_scalar_set_b32(&input_hash_scalar, &prevouts_summary->data[5 + 64], NULL);
+        secp256k1_scalar_mul(&scan_key_scalar, &scan_key_scalar, &input_hash_scalar);
+    }
+    ret = secp256k1_pubkey_load(ctx, &unlabeled_spend_pubkey_ge, unlabeled_spend_pubkey);
+    if (!ret) {
+        secp256k1_scalar_clear(&scan_key_scalar);
+        return 0;
+    }
+    /* Creating the shared secret requires that the public and secret components are
+     * non-infinity and non-zero, respectively. Note that the involved parts (input hash,
+     * scan secret key, and prevouts public key sum) have all been verified at this point,
+     * assuming that the user hasn't tampered the `prevouts_summary` object manually. */
+    secp256k1_silentpayments_create_shared_secret(shared_secret, &prevouts_pubkey_sum_ge, &scan_key_scalar);
+    /* Clear the scan_key_scalar since we no longer need it and leaking this value would break indistinguishability of the transaction. */
+    secp256k1_scalar_clear(&scan_key_scalar);
+
+    found_idx = -1;
+    /* Don't look further than the per-group recipient limit, in order to avoid quadratic scaling issues. */
+    k_max = (n_tx_outputs < SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT) ?
+             n_tx_outputs : SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT;
+    for (k = 0; k < k_max; k++) {
+        secp256k1_scalar t_k_scalar;
+        secp256k1_xonly_pubkey unlabeled_output_xonly;
+        secp256k1_ge unlabeled_output_ge = unlabeled_spend_pubkey_ge;
+        secp256k1_ge unlabeled_output_negated_ge;
+        secp256k1_gej label_candidates_gej[2 * LABEL_BATCH_SIZE]; /* two candidates per tx output (one per y-parity) */
+        size_t label_batch_idx = 0; /* current index within a batch */
+        const unsigned char *label_tweak = NULL;
+        secp256k1_ge label_ge;
+        size_t j;
+
+        /* Calculate the output tweak t_k and convert it to a scalar.
+         *
+         * Note: _create_output_tweak can only fail if the output of the hash function is zero or greater than or equal
+         * to the curve order, which is statistically improbable. Returning an error here results in an untestable
+         * branch in the code, but we do this anyways to ensure strict compliance with BIP0352.
+         */
+        if (!secp256k1_silentpayments_create_output_tweak(ctx, &t_k_scalar, shared_secret, k)) {
+            secp256k1_scalar_clear(&t_k_scalar);
+            secp256k1_memclear_explicit(&shared_secret, sizeof(shared_secret));
+            return 0;
+        }
+
+        /* Calculate unlabeled_output = unlabeled_spend_pubkey + t_k * G.
+         * This can fail if t_k * G is the negation of unlabeled_spend_pubkey, but this happens only with negligible
+         * probability for honestly created unlabeled_spend_pubkey as t_k is the output of a hash function. */
+        if (!secp256k1_eckey_pubkey_tweak_add(&unlabeled_output_ge, &t_k_scalar)) {
+            /* Leaking these values would break indistinguishability of the transaction, so clear them. */
+            secp256k1_scalar_clear(&t_k_scalar);
+            secp256k1_memclear_explicit(&shared_secret, sizeof(shared_secret));
+            return 0;
+        }
+        /* Calculate unlabeled_output_negated = -unlabeled_output */
+        secp256k1_ge_neg(&unlabeled_output_negated_ge, &unlabeled_output_ge);
+
+        found_idx = -1;
+        secp256k1_fe_normalize_var(&unlabeled_output_ge.y);
+        secp256k1_extrakeys_ge_even_y(&unlabeled_output_ge);
+        secp256k1_xonly_pubkey_save(&unlabeled_output_xonly, &unlabeled_output_ge);
+        for (j = 0; j < n_tx_outputs; j++) {
+            if (secp256k1_xonly_pubkey_cmp(ctx, &unlabeled_output_xonly, tx_outputs[j]) == 0) {
+                label_tweak = NULL;
+                found_idx = j;
+                /* An earlier label match takes precedence over this direct match. */
+                if (label_batch_idx > 0) {
+                    int label_found_idx = secp256k1_silentpayments_check_label_batch(
+                        &label_ge, &label_tweak, label_candidates_gej, label_batch_idx,
+                        j - label_batch_idx, label_lookup, label_context);
+                    if (label_found_idx != -1) {
+                        found_idx = label_found_idx;
+                    }
+                }
+                break;
+            }
+
+            /* If not found, proceed to check for labels (if a label lookup function is provided). */
+            if (label_lookup != NULL) {
+                secp256k1_gej tx_output_gej;
+                secp256k1_gej *label_candidate1 = &label_candidates_gej[2 * label_batch_idx];
+                secp256k1_gej *label_candidate2 = &label_candidates_gej[2 * label_batch_idx + 1];
+
+                /* Calculate scan label candidates:
+                 *     label_candidate1 =  tx_output - unlabeled_output
+                 *     label_candidate2 = -tx_output - unlabeled_output
+                 * and store them in the batch */
+                secp256k1_xonly_pubkey_load(ctx, &tx_output_ge, tx_outputs[j]);
+                secp256k1_gej_set_ge(&tx_output_gej, &tx_output_ge);
+                secp256k1_gej_add_ge_var(label_candidate1, &tx_output_gej, &unlabeled_output_negated_ge, NULL);
+                secp256k1_gej_neg(&tx_output_gej, &tx_output_gej);
+                secp256k1_gej_add_ge_var(label_candidate2, &tx_output_gej, &unlabeled_output_negated_ge, NULL);
+                label_batch_idx++;
+                /* If the batch is filled or we have reached the last transaction output, perform batch
+                 * inversion and check the label cache for each label candidate entry in the batch */
+                if (label_batch_idx == LABEL_BATCH_SIZE || j == (n_tx_outputs-1)) {
+                    found_idx = secp256k1_silentpayments_check_label_batch(
+                        &label_ge, &label_tweak, label_candidates_gej, label_batch_idx,
+                        j + 1 - label_batch_idx, label_lookup, label_context);
+                    label_batch_idx = 0;
+                }
+                if (found_idx != -1) {
+                    break;
+                }
+            }
+        }
+        if (found_idx != -1) {
+            found_outputs[k]->output = *tx_outputs[found_idx];
+            secp256k1_scalar_get_b32(found_outputs[k]->tweak, &t_k_scalar);
+            /* Clear the t_k_scalar since we no longer need it and leaking this value would
+             * break indistinguishability of the transaction. */
+            secp256k1_scalar_clear(&t_k_scalar);
+            if (label_tweak != NULL) {
+                found_outputs[k]->found_with_label = 1;
+                /* This is extremely unlikely to fail in that it can only really happen if label_tweak
+                 * is the negation of the shared secret tweak. But since both tweak and label_tweak are
+                 * created by hashing data, practically speaking this would only happen if an attacker
+                 * tricked us into using a particular label_tweak (deviating from the protocol).
+                 * Note that this call could also fail due to a malformed label_tweak data from the
+                 * label cache, but we generally assume the passed in data is created using the API
+                 * functions and thus have already been checked for correctness.
+                 *
+                 * Furthermore, although technically a failure for ec_seckey_tweak_add, this is not treated
+                 * as a failure for Silent Payments because the output is still spendable with just the
+                 * spend secret key. We set `tweak = 0` for this case.
+                 */
+                if (!secp256k1_ec_seckey_tweak_add(ctx, found_outputs[k]->tweak, label_tweak)) {
+                    memset(found_outputs[k]->tweak, 0, 32);
+                }
+                secp256k1_silentpayments_label_save(&found_outputs[k]->label, &label_ge);
+            } else {
+                found_outputs[k]->found_with_label = 0;
+                /* Set the label to an invalid value. */
+                memset(&found_outputs[k]->label, 0, sizeof(found_outputs[k]->label));
+            }
+            /* Reset everything for the next round of scanning. */
+            label_tweak = NULL;
+        } else {
+            secp256k1_scalar_clear(&t_k_scalar);
+            break;
+        }
+    }
+    *n_found_outputs = k;
+
+    /* Leaking the shared_secret would break indistinguishability of the transaction, so clear it. */
+    secp256k1_memclear_explicit(shared_secret, sizeof(shared_secret));
+    return 1;
+}
+
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/modules/silentpayments/tests_impl.h b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/tests_impl.h
new file mode 100644
index 00000000..8a60a95b
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/tests_impl.h
@@ -0,0 +1,933 @@
+/***********************************************************************
+ * Distributed under the MIT software license, see the accompanying    *
+ * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
+ ***********************************************************************/
+
+#ifndef SECP256K1_MODULE_SILENTPAYMENTS_TESTS_H
+#define SECP256K1_MODULE_SILENTPAYMENTS_TESTS_H
+
+#include "../../../include/secp256k1_silentpayments.h"
+#include "../../unit_test.h"
+#include "../../util.h"
+#include "../../../src/modules/silentpayments/vectors.h"
+
+/** Constants
+ *
+ *   Malformed Seckey: a seckey that is all zeros
+ *          Addresses: scan and spend public keys for Bob and Carol
+ *            Outputs: generated outputs from Alice's secret key and Bob/Carol's
+ *                     scan public keys
+ *  Smallest Outpoint: smallest outpoint lexicographically from the transaction
+ *             Seckey: secret key for Alice
+ *
+ *  The values themselves are not important.
+ */
+static unsigned char MALFORMED_SECKEY[32] = { 0x00 };
+static unsigned char BOB_ADDRESS[2][33] = {
+    {
+        0x02, 0x15, 0x40, 0xae, 0xa8, 0x97, 0x54, 0x7a,
+        0xd4, 0x39, 0xb4, 0xe0, 0xf6, 0x09, 0xe5, 0xf0,
+        0xfa, 0x63, 0xde, 0x89, 0xab, 0x11, 0xed, 0xe3,
+        0x1e, 0x8c, 0xde, 0x4b, 0xe2, 0x19, 0x42, 0x5f,
+        0x23
+    },
+    {
+        0x02, 0x3e, 0xff, 0xf8, 0x18, 0x51, 0x65, 0xea,
+        0x63, 0xa9, 0x92, 0xb3, 0x9f, 0x31, 0xd8, 0xfd,
+        0x8e, 0x0e, 0x64, 0xae, 0xf9, 0xd3, 0x88, 0x07,
+        0x34, 0x97, 0x37, 0x14, 0xa5, 0x3d, 0x83, 0x11,
+        0x8d
+    }
+};
+static unsigned char CAROL_ADDRESS[2][33] = {
+    {
+        0x03, 0xbb, 0xc6, 0x3f, 0x12, 0x74, 0x5d, 0x3b,
+        0x9e, 0x9d, 0x24, 0xc6, 0xcd, 0x7a, 0x1e, 0xfe,
+        0xba, 0xd0, 0xa7, 0xf4, 0x69, 0x23, 0x2f, 0xbe,
+        0xcf, 0x31, 0xfb, 0xa7, 0xb4, 0xf7, 0xdd, 0xed,
+        0xa8
+    },
+    {
+        0x03, 0x81, 0xeb, 0x9a, 0x9a, 0x9e, 0xc7, 0x39,
+        0xd5, 0x27, 0xc1, 0x63, 0x1b, 0x31, 0xb4, 0x21,
+        0x56, 0x6f, 0x5c, 0x2a, 0x47, 0xb4, 0xab, 0x5b,
+        0x1f, 0x6a, 0x68, 0x6d, 0xfb, 0x68, 0xea, 0xb7,
+        0x16
+    }
+};
+static unsigned char BOB_OUTPUT[32] = {
+    0x46, 0x0d, 0x68, 0x08, 0x65, 0x64, 0x45, 0xee,
+    0x4d, 0x4e, 0xc0, 0x8e, 0xba, 0x8a, 0x66, 0xea,
+    0x66, 0x8e, 0x4e, 0x12, 0x98, 0x9a, 0x0e, 0x60,
+    0x4b, 0x5c, 0x36, 0x0e, 0x43, 0xf5, 0x5a, 0xfa
+};
+static unsigned char CAROL_OUTPUT_ONE[32] = {
+    0x4b, 0x81, 0x34, 0x5d, 0x53, 0x89, 0xba, 0xa3,
+    0xd8, 0x93, 0xe2, 0xfb, 0xe7, 0x08, 0xdd, 0x6d,
+    0x82, 0xdc, 0xd8, 0x49, 0xab, 0x03, 0xc1, 0xdb,
+    0x68, 0xbe, 0xc7, 0xe9, 0x2a, 0x45, 0xfa, 0xc5
+};
+static unsigned char CAROL_OUTPUT_TWO[32] = {
+    0xb7, 0xf3, 0xc6, 0x79, 0x30, 0x4a, 0xef, 0x8c,
+    0xc0, 0xc7, 0x61, 0xf1, 0x00, 0x99, 0xdd, 0x7b,
+    0x20, 0x65, 0x20, 0xd7, 0x11, 0x6f, 0xb7, 0x91,
+    0xee, 0x74, 0x54, 0xa2, 0xfc, 0x22, 0x79, 0xf4
+};
+static unsigned char SMALLEST_OUTPOINT[36] = {
+    0x16, 0x9e, 0x1e, 0x83, 0xe9, 0x30, 0x85, 0x33, 0x91,
+    0xbc, 0x6f, 0x35, 0xf6, 0x05, 0xc6, 0x75, 0x4c, 0xfe,
+    0xad, 0x57, 0xcf, 0x83, 0x87, 0x63, 0x9d, 0x3b, 0x40,
+    0x96, 0xc5, 0x4f, 0x18, 0xf4, 0x00, 0x00, 0x00, 0x00
+};
+static unsigned char ALICE_SECKEY[32] = {
+    0xea, 0xdc, 0x78, 0x16, 0x5f, 0xf1, 0xf8, 0xea,
+    0x94, 0xad, 0x7c, 0xfd, 0xc5, 0x49, 0x90, 0x73,
+    0x8a, 0x4c, 0x53, 0xf6, 0xe0, 0x50, 0x7b, 0x42,
+    0x15, 0x42, 0x01, 0xb8, 0xe5, 0xdf, 0xf3, 0xb1
+};
+
+struct label_cache_entry {
+    unsigned char label[33];
+    unsigned char label_tweak[32];
+};
+struct labels_cache {
+    size_t entries_used;
+    struct label_cache_entry entries[10];
+};
+struct labels_cache labels_cache;
+const unsigned char* label_lookup(const unsigned char* key, const void* cache_ptr) {
+    const struct labels_cache* cache;
+    size_t i;
+
+    if (cache_ptr == NULL) {
+        return NULL;
+    }
+    cache = (const struct labels_cache*)cache_ptr;
+    for (i = 0; i < cache->entries_used; i++) {
+        if (secp256k1_memcmp_var(cache->entries[i].label, key, 33) == 0) {
+            return cache->entries[i].label_tweak;
+        }
+    }
+    return NULL;
+}
+
+static void test_recipient_sort_helper(unsigned char (*sp_addresses[3])[2][33], unsigned char (*sp_outputs[3])[32]) {
+    unsigned char const *seckey_ptrs[1];
+    secp256k1_silentpayments_recipient recipients[3];
+    const secp256k1_silentpayments_recipient *recipient_ptrs[3];
+    secp256k1_xonly_pubkey generated_outputs[3];
+    secp256k1_xonly_pubkey *generated_output_ptrs[3];
+    unsigned char xonly_ser[32];
+    size_t i;
+    int ret;
+
+    seckey_ptrs[0] = ALICE_SECKEY;
+    for (i = 0; i < 3; i++) {
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &recipients[i].scan_pubkey, (*sp_addresses[i])[0], 33));
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &recipients[i].spend_pubkey,(*sp_addresses[i])[1], 33));
+        recipients[i].index = i;
+        recipient_ptrs[i] = &recipients[i];
+        generated_output_ptrs[i] = &generated_outputs[i];
+    }
+    ret = secp256k1_silentpayments_sender_create_outputs(CTX,
+        generated_output_ptrs,
+        recipient_ptrs, 3,
+        SMALLEST_OUTPOINT,
+        NULL, 0,
+        seckey_ptrs, 1
+    );
+    CHECK(ret == 1);
+    for (i = 0; i < 3; i++) {
+        CHECK(secp256k1_xonly_pubkey_serialize(CTX, xonly_ser, &generated_outputs[i]) == 1);
+        CHECK(secp256k1_memcmp_var(xonly_ser, (*sp_outputs[i]), 32) == 0);
+    }
+}
+
+static void test_recipient_sort(void) {
+    unsigned char (*sp_addresses[3])[2][33];
+    unsigned char (*sp_outputs[3])[32];
+
+    /* With a fixed set of addresses and a fixed set of inputs,
+     * test that we always get the same outputs, regardless of the ordering
+     * of the recipients
+     */
+    sp_addresses[0] = &CAROL_ADDRESS;
+    sp_addresses[1] = &BOB_ADDRESS;
+    sp_addresses[2] = &CAROL_ADDRESS;
+
+    sp_outputs[0] = &CAROL_OUTPUT_ONE;
+    sp_outputs[1] = &BOB_OUTPUT;
+    sp_outputs[2] = &CAROL_OUTPUT_TWO;
+    test_recipient_sort_helper(sp_addresses, sp_outputs);
+
+    sp_addresses[0] = &CAROL_ADDRESS;
+    sp_addresses[1] = &CAROL_ADDRESS;
+    sp_addresses[2] = &BOB_ADDRESS;
+
+    sp_outputs[0] = &CAROL_OUTPUT_ONE;
+    sp_outputs[1] = &CAROL_OUTPUT_TWO;
+    sp_outputs[2] = &BOB_OUTPUT;
+    test_recipient_sort_helper(sp_addresses, sp_outputs);
+
+    sp_addresses[0] = &BOB_ADDRESS;
+    sp_addresses[1] = &CAROL_ADDRESS;
+    sp_addresses[2] = &CAROL_ADDRESS;
+
+    sp_outputs[0] = &BOB_OUTPUT;
+    sp_outputs[1] = &CAROL_OUTPUT_ONE;
+    sp_outputs[2] = &CAROL_OUTPUT_TWO;
+    test_recipient_sort_helper(sp_addresses, sp_outputs);
+}
+
+static void test_send_api(void) {
+    unsigned char (*sp_addresses[2])[2][33];
+    unsigned char const *p[1];
+    secp256k1_keypair const *t[1];
+    secp256k1_silentpayments_recipient r[2];
+    const secp256k1_silentpayments_recipient *rp[2];
+    secp256k1_xonly_pubkey o[2];
+    secp256k1_xonly_pubkey *op[2];
+    secp256k1_keypair taproot;
+    size_t i;
+
+    /* Set up Bob and Carol as the recipients */
+    sp_addresses[0] = &BOB_ADDRESS;
+    sp_addresses[1] = &CAROL_ADDRESS;
+    for (i = 0; i < 2; i++) {
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &r[i].scan_pubkey, (*sp_addresses[i])[0], 33));
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &r[i].spend_pubkey,(*sp_addresses[i])[1], 33));
+        /* Set the index value incorrectly */
+        r[i].index = 0;
+        rp[i] = &r[i];
+        op[i] = &o[i];
+    }
+    /* Set up a taproot key and a plain key for Alice */
+    CHECK(secp256k1_keypair_create(CTX, &taproot, ALICE_SECKEY));
+    t[0] = &taproot;
+    p[0] = ALICE_SECKEY;
+
+    /* Fails if the index is set incorrectly */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+
+    /* Set the index correctly for the next tests */
+    for (i = 0; i < 2; i++) {
+        r[i].index = i;
+    }
+    CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+
+    /* Check that NULL in "array of pointers" arguments is not allowed */
+    for (i = 0; i < 2; i++) {
+        secp256k1_xonly_pubkey *original_ptr_xpk = op[i];
+        const secp256k1_silentpayments_recipient *original_ptr_rec = rp[i];
+
+        op[i] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+        op[i] = original_ptr_xpk;
+
+        rp[i] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+        rp[i] = original_ptr_rec;
+    }
+    {
+        secp256k1_keypair const *original_ptr = t[0];
+        t[0] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, t, 1, NULL, 0));
+        t[0] = original_ptr;
+    }
+    {
+        unsigned char const *original_ptr = p[0];
+        p[0] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+        p[0] = original_ptr;
+    }
+
+    /* Check that null arguments are handled */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, NULL, rp, 2, SMALLEST_OUTPOINT, t, 1, p, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, NULL, 2, SMALLEST_OUTPOINT, t, 1, p, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, NULL, t, 1, p, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 1, p, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, t, 1, NULL, 1));
+
+    /* Check correct context is used */
+    CHECK_ILLEGAL(STATIC_CTX, secp256k1_silentpayments_sender_create_outputs(STATIC_CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+
+    /* Check that array arguments are verified */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, NULL, 0));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 0, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, t, 0, p, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, t, 1, p, 0));
+
+    /* Create malformed keys for Alice by using a key that will overflow */
+    CHECK(secp256k1_ec_seckey_verify(CTX, secp256k1_group_order_bytes) == 0);
+    p[0] = secp256k1_group_order_bytes;
+    CHECK(secp256k1_keypair_create(CTX, &taproot, ALICE_SECKEY));
+    /* Malleate the keypair object so that the secret key is all zeros. We need to keep
+     * public key as is since it is loaded first and would hit an ARG_CHECK if invalid.
+     */
+    memset(&taproot.data[0], 0, 32);
+    /* Check that an invalid plain secret key is caught */
+    CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 0);
+    /* Check that an invalid keypair is caught */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, t, 1, NULL, 0));
+    /* Create malformed keys for Alice by using a zero'd seckey */
+    p[0] = MALFORMED_SECKEY;
+    CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 0);
+    p[0] = ALICE_SECKEY;
+    /* Create malformed recipients by setting all of the public key bytes to zero.
+     * Realistically, this would never happen since a bad public key would get caught when
+     * trying to parse the public key with _ec_pubkey_parse
+     */
+    {
+         secp256k1_pubkey tmp = r[1].spend_pubkey;
+         memset(&r[1].spend_pubkey, 0, sizeof(r[1].spend_pubkey));
+         CHECK_ILLEGAL(CTX, secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1));
+         r[1].spend_pubkey = tmp;
+    }
+    {
+        secp256k1_pubkey tmp = r[1].scan_pubkey;
+        int32_t ecount = 0;
+
+        memset(&r[1].scan_pubkey, 0, sizeof(r[1].scan_pubkey));
+        secp256k1_context_set_illegal_callback(CTX, counting_callback_fn, &ecount);
+        CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 0);
+        CHECK(ecount == 2);
+        secp256k1_context_set_illegal_callback(CTX, NULL, NULL);
+        r[1].scan_pubkey = tmp;
+    }
+    {
+        unsigned char malformed_spend_key[32] = {
+                0x83, 0xe1, 0x79, 0xdf, 0x51, 0xbb, 0xc9, 0x6f,
+                0xfb, 0x59, 0xb6, 0x2e, 0x57, 0xcf, 0x4e, 0x54,
+                0x71, 0x79, 0x04, 0x9c, 0x01, 0x47, 0x00, 0xfe,
+                0x52, 0xef, 0x5f, 0x53, 0x76, 0x39, 0xec, 0xe0
+        };
+        secp256k1_pubkey neg_spend_pubkey;
+        CHECK(secp256k1_ec_pubkey_create(CTX, &neg_spend_pubkey, malformed_spend_key));
+        CHECK(secp256k1_ec_pubkey_negate(CTX, &neg_spend_pubkey));
+        r[0].spend_pubkey = neg_spend_pubkey;
+        for (i = 0; i < 2; i++) {
+            r[i].index = i;
+            rp[i] = &r[i];
+        }
+        CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, op, rp, 2, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 0);
+    }
+
+    /* check that sending API respects the per-group recipient limit (K_max) */
+    {
+        const size_t total_recipients = 10 * SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT;
+        secp256k1_silentpayments_recipient *recipients = checked_malloc(&CTX->error_callback, sizeof(*recipients) * total_recipients);
+        const secp256k1_silentpayments_recipient **recipients_ptrs = checked_malloc(&CTX->error_callback, sizeof(*recipients_ptrs) * total_recipients);
+        secp256k1_xonly_pubkey *outputs = checked_malloc(&CTX->error_callback, sizeof(*outputs) * total_recipients);
+        secp256k1_xonly_pubkey **outputs_ptrs = checked_malloc(&CTX->error_callback, sizeof(*outputs_ptrs) * total_recipients);
+        size_t test_num_recipients;
+
+        for (i = 0; i < total_recipients; i++) {
+            /* use the same scan/spend pubkey for every recipient initially; the scan pubkeys
+             * will change later on for each test case to modify the group sizes, while the
+             * spend pubkeys will remain unchanged, as they are not relevant for the scenarios */
+            recipients[i].scan_pubkey = r[1].scan_pubkey;
+            recipients[i].spend_pubkey = r[1].spend_pubkey;
+            recipients[i].index = i;
+            recipients_ptrs[i] = &recipients[i];
+            outputs_ptrs[i] = &outputs[i];
+        }
+
+        /* one group with the number of recipients being just on the limit => succeeds */
+        test_num_recipients = SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT;
+        CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, outputs_ptrs, recipients_ptrs,
+            test_num_recipients, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 1);
+
+        /* one group with the number of recipients exceeding the limit => fails */
+        test_num_recipients = SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT + 1;
+        CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, outputs_ptrs, recipients_ptrs,
+            test_num_recipients, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 0);
+
+        /* multiple groups with each being just on the limit => succeeds */
+        for (i = 0; i < total_recipients; i++) {
+            /* create recipient blocks of K_max size, each with different tweak values */
+            uint32_t tweak_value = i / SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT;
+            unsigned char tweak[32] = {0};
+            secp256k1_write_be32(&tweak[28], tweak_value);
+            CHECK(secp256k1_ec_pubkey_tweak_add(CTX, &recipients[i].scan_pubkey, tweak) == 1);
+        }
+        test_num_recipients = total_recipients;
+        CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, outputs_ptrs, recipients_ptrs,
+            test_num_recipients, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 1);
+
+        /* multiple groups, one of them exceeding the limit => fails */
+        for (i = 0; i < total_recipients; i++) { /* restore original order first */
+            recipients_ptrs[i] = &recipients[i];
+        }
+        recipients[SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT].scan_pubkey =
+            recipients[SECP256K1_SILENTPAYMENTS_RECIPIENT_GROUP_LIMIT-1].scan_pubkey;
+        test_num_recipients = total_recipients;
+        CHECK(secp256k1_silentpayments_sender_create_outputs(CTX, outputs_ptrs, recipients_ptrs,
+            test_num_recipients, SMALLEST_OUTPOINT, NULL, 0, p, 1) == 0);
+
+        free(outputs_ptrs);
+        free(outputs);
+        free(recipients_ptrs);
+        free(recipients);
+    }
+}
+
+static void test_label_api(void) {
+    secp256k1_silentpayments_label l;
+    secp256k1_pubkey s, ls, e;   /* spend pk, labeled spend pk, expected labeled spend pk */
+    unsigned char lt[32];        /* label tweak */
+    unsigned char label_ser[33]; /* serialized label */
+    const unsigned char expected[33] = {
+        0x03, 0xdc, 0x7f, 0x09, 0x9a, 0xbe, 0x95, 0x7a,
+        0x58, 0x43, 0xd2, 0xb6, 0xbb, 0x35, 0x79, 0x61,
+        0x5c, 0x60, 0x36, 0xa4, 0x9b, 0x86, 0xf4, 0xbe,
+        0x46, 0x38, 0x60, 0x28, 0xa8, 0x1a, 0x77, 0xd4,
+        0x91
+    };
+
+    /* Create a label and labeled spend public key, verify we get the expected result */
+    CHECK(secp256k1_ec_pubkey_parse(CTX, &s, BOB_ADDRESS[1], 33));
+    CHECK(secp256k1_silentpayments_recipient_label_create(CTX, &l, lt, ALICE_SECKEY, 1));
+    CHECK(secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, &s, &l));
+    CHECK(secp256k1_ec_pubkey_parse(CTX, &e, expected, 33));
+    CHECK(secp256k1_ec_pubkey_cmp(CTX, &ls, &e) == 0);
+
+    /* Check label (de)serialization round-trip */
+    {
+        secp256k1_silentpayments_label parsed_label;
+        unsigned char parsed_label_ser[33];
+        static const unsigned char invalid_label_ser[33] = {0};
+
+        CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, label_ser, &l));
+        CHECK(secp256k1_silentpayments_recipient_label_parse(CTX, &parsed_label, label_ser));
+        CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, parsed_label_ser, &parsed_label));
+        CHECK(secp256k1_memcmp_var(label_ser, parsed_label_ser, 33) == 0);
+
+        CHECK(secp256k1_silentpayments_recipient_label_parse(CTX, &parsed_label, invalid_label_ser) == 0);
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_serialize(CTX, parsed_label_ser, &parsed_label));
+    }
+
+    /* Check null values are handled */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_create(CTX, NULL, lt, ALICE_SECKEY, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_create(CTX, &l, NULL, ALICE_SECKEY, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_create(CTX, &l, lt, NULL, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_parse(CTX, NULL, expected));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_parse(CTX, &l, NULL));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_serialize(CTX, NULL, &l));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_label_serialize(CTX, label_ser, NULL));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, NULL, &s, &l));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, NULL, &l));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, &s, NULL));
+    /* Check that creating a label with an invalid scan key fails */
+    CHECK(secp256k1_silentpayments_recipient_label_create(CTX, &l, lt, MALFORMED_SECKEY, 1) == 0);
+    CHECK(secp256k1_silentpayments_recipient_label_create(CTX, &l, lt, secp256k1_group_order_bytes, 1) == 0);
+    /* Check for malformed spend public key and label, i.e., any single pubkey is malformed or the public
+     * keys are valid but sum up to zero.
+     */
+    {
+        secp256k1_pubkey neg_spend_pubkey = s;
+        unsigned char neg_spend_label_ser[33];
+        size_t serlen = 33;
+        secp256k1_silentpayments_label neg_spend_label;
+
+        CHECK(secp256k1_ec_pubkey_negate(CTX, &neg_spend_pubkey));
+        CHECK(secp256k1_ec_pubkey_serialize(CTX, neg_spend_label_ser, &serlen, &neg_spend_pubkey, SECP256K1_EC_COMPRESSED));
+        CHECK(secp256k1_silentpayments_recipient_label_parse(CTX, &neg_spend_label, neg_spend_label_ser));
+
+        CHECK(secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, &s, &neg_spend_label) == 0);
+        /* Also test with a malformed spend public key. */
+        memset(&s, 0, sizeof(s));
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, &s, &neg_spend_label));
+        /* Reset s back to a valid public key for the next test. */
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &s, BOB_ADDRESS[1], 33));
+        memset(&l, 0, sizeof(l));
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, &s, &l));
+        /* Reset l back to a valid public key for the next test */
+        CHECK(secp256k1_silentpayments_recipient_label_create(CTX, &l, lt, ALICE_SECKEY, 1));
+        memset(&s, 0, sizeof(s));
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(CTX, &ls, &s, &l));
+    }
+}
+
+static void test_recipient_api(void) {
+    secp256k1_silentpayments_prevouts_summary ps; /* prevouts_summary */
+    secp256k1_silentpayments_found_output f;      /* a silent payment found output */
+    secp256k1_silentpayments_found_output *fp[1]; /* array of pointers to found outputs */
+    secp256k1_xonly_pubkey t;                     /* taproot x-only public key */
+    secp256k1_xonly_pubkey malformed_t;           /* malformed x-only public key */
+    secp256k1_xonly_pubkey const *tp[1];          /* array of pointers to xonly pks */
+    secp256k1_pubkey p;                           /* plain public key */
+    secp256k1_pubkey malformed_p;                 /* malformed public key */
+    secp256k1_pubkey const *pp[1];                /* array of pointers to plain pks */
+    uint32_t n_f;                                 /* number of found outputs */
+
+    CHECK(secp256k1_ec_pubkey_parse(CTX, &p, BOB_ADDRESS[0], 33));
+    memset(&malformed_p, 0, sizeof(malformed_p));
+    memset(&malformed_t, 0, sizeof(malformed_t));
+    CHECK(secp256k1_xonly_pubkey_parse(CTX, &t, &BOB_ADDRESS[0][1]));
+    tp[0] = &t;
+    pp[0] = &p;
+    fp[0] = &f;
+    CHECK(secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+    /* Reusing a prevouts_summary after a failure must not leave the old object valid. */
+    {
+        secp256k1_pubkey neg_p = p;
+        secp256k1_pubkey const *pp_sum_zero[2];
+
+        CHECK(secp256k1_ec_pubkey_negate(CTX, &neg_p));
+        pp_sum_zero[0] = &p;
+        pp_sum_zero[1] = &neg_p;
+        CHECK(secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, NULL, 0, pp_sum_zero, 2) == 0);
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, NULL, NULL));
+        CHECK(secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+    }
+    /* Check that malformed input public keys are caught. Input public keys summing to zero is tested later,
+     * in the BIP0352 test vectors.
+     */
+    pp[0] = &malformed_p;
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+    pp[0] = &p;
+    /* Check that malformed x-only input public keys are caught. */
+    tp[0] = &malformed_t;
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+    tp[0] = &t;
+
+    /* Check that NULL in "array of pointers" arguments is not allowed */
+    {
+        secp256k1_xonly_pubkey const *original_ptr = tp[0];
+        tp[0] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+        tp[0] = original_ptr;
+    }
+    {
+        secp256k1_pubkey const *original_ptr = pp[0];
+        pp[0] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+        pp[0] = original_ptr;
+    }
+
+    /* Check null values are handled */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, NULL, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, NULL, tp, 1, pp, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, NULL, 1, pp, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, NULL, 1));
+
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 0, pp, 1));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 0));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, NULL, 0, pp, 0));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, NULL, 0, NULL, 0));
+    CHECK(secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &ps, SMALLEST_OUTPOINT, tp, 1, pp, 1));
+
+    /* check the _recipient_scan_outputs cornercase where internal tweaking would fail;
+       this is the case if the recipient spend public key is P = -(create_output_tweak(shared_secret, k))*G */
+    {
+        unsigned char output_tweak[32] = {
+            0x96, 0x32, 0xb4, 0x06, 0xeb, 0x56, 0xcc, 0xb2,
+            0x0f, 0xc6, 0xe5, 0x2c, 0x41, 0xd5, 0x73, 0xb2,
+            0xae, 0xa0, 0x45, 0x07, 0x63, 0xf1, 0xf6, 0x22,
+            0xfa, 0x87, 0xc2, 0x4c, 0x7d, 0x80, 0x58, 0x62,
+        };
+        secp256k1_pubkey neg_spend_pubkey;
+        CHECK(secp256k1_ec_pubkey_create(CTX, &neg_spend_pubkey, output_tweak));
+        CHECK(secp256k1_ec_pubkey_negate(CTX, &neg_spend_pubkey));
+        CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &neg_spend_pubkey, &label_lookup, &labels_cache) == 0);
+    }
+    /* check the _recipients_scan_outputs cornercase where the output_tweak is the negation of the label_tweak */
+    {
+        unsigned char output_tweak[32] = {
+            0x96, 0x32, 0xb4, 0x06, 0xeb, 0x56, 0xcc, 0xb2,
+            0x0f, 0xc6, 0xe5, 0x2c, 0x41, 0xd5, 0x73, 0xb2,
+            0xae, 0xa0, 0x45, 0x07, 0x63, 0xf1, 0xf6, 0x22,
+            0xfa, 0x87, 0xc2, 0x4c, 0x7d, 0x80, 0x58, 0x62,
+        };
+        static const unsigned char zero[32] = {0};
+        secp256k1_pubkey spk, neg_label_pubkey;
+        secp256k1_xonly_pubkey output_xonly;
+        secp256k1_xonly_pubkey const *output_xonly_ptrs[1];
+        size_t len = 33;
+        uint32_t found;
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &spk, BOB_ADDRESS[0], 33));
+        CHECK(secp256k1_xonly_pubkey_from_pubkey(CTX, &output_xonly, NULL, &spk));
+        output_xonly_ptrs[0] = &output_xonly;
+        CHECK(secp256k1_ec_seckey_negate(CTX, output_tweak));
+        CHECK(secp256k1_ec_pubkey_create(CTX, &neg_label_pubkey, output_tweak));
+        CHECK(secp256k1_ec_pubkey_serialize(CTX, labels_cache.entries[0].label, &len, &neg_label_pubkey, SECP256K1_EC_COMPRESSED));
+        memcpy(labels_cache.entries[0].label_tweak, output_tweak, 32);
+        labels_cache.entries_used = 1;
+        found = 0;
+        CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &found, output_xonly_ptrs, 1, ALICE_SECKEY, &ps, &spk, &label_lookup, &labels_cache));
+        CHECK(found == 1);
+        CHECK(secp256k1_memcmp_var(fp[0]->tweak, zero, 32) == 0);
+        CHECK(fp[0]->found_with_label == 1);
+        {
+            unsigned char found_label_ser[33];
+            CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, found_label_ser, &fp[0]->label));
+            CHECK(secp256k1_memcmp_var(found_label_ser, labels_cache.entries[0].label, 33) == 0);
+        }
+    }
+
+    n_f = 0;
+    labels_cache.entries_used = 0;
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, &label_lookup, &labels_cache));
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, &label_lookup, NULL));
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, NULL, NULL));
+
+    /* Check that NULL in "array of pointers" arguments is not allowed */
+    {
+        secp256k1_silentpayments_found_output *original_ptr = fp[0];
+        fp[0] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, NULL, NULL));
+        fp[0] = original_ptr;
+    }
+    {
+        secp256k1_xonly_pubkey const *original_ptr = tp[0];
+        tp[0] = NULL;
+        CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, NULL, NULL));
+        tp[0] = original_ptr;
+    }
+
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, NULL, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, NULL, tp, 1, ALICE_SECKEY, &ps, &p, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, NULL, 1, ALICE_SECKEY, &ps, &p, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, NULL, &ps, &p, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, NULL, &p, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, NULL, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 0, ALICE_SECKEY, &ps, &p, &label_lookup, &labels_cache));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, NULL, &labels_cache));
+
+    /* Check that malformed secret key, public keys, and prevouts_summary arguments are handled */
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &malformed_p, NULL, NULL));
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, MALFORMED_SECKEY, &ps, &p, NULL, NULL) == 0);
+    memset(&ps, 0, sizeof(ps));
+    CHECK_ILLEGAL(CTX, secp256k1_silentpayments_recipient_scan_outputs(CTX, fp, &n_f, tp, 1, ALICE_SECKEY, &ps, &p, NULL, NULL));
+}
+
+static void test_recipient_scan_label_precedes_direct_match(void) {
+    static const unsigned char sender_seckey[32] = { 1 };
+    static const unsigned char scan_seckey[32] = { 2 };
+    static const unsigned char spend_seckey[32] = { 3 };
+    secp256k1_pubkey sender_pubkey, scan_pubkey, unlabeled_spend_pubkey, labeled_spend_pubkey;
+    const secp256k1_pubkey *prevout_pubkeys[1];
+    const unsigned char *sender_seckeys[1];
+    secp256k1_silentpayments_prevouts_summary prevouts_summary;
+    secp256k1_silentpayments_label label;
+    secp256k1_silentpayments_recipient recipient;
+    const secp256k1_silentpayments_recipient *recipients[1];
+    secp256k1_xonly_pubkey labeled_output, direct_output;
+    secp256k1_xonly_pubkey *generated_outputs[1];
+    const secp256k1_xonly_pubkey *tx_outputs[2];
+    secp256k1_silentpayments_found_output found_output[2];
+    secp256k1_silentpayments_found_output *found_outputs[2];
+    struct labels_cache cache;
+    unsigned char found_label[33];
+    uint32_t n_found_outputs;
+
+    CHECK(secp256k1_ec_pubkey_create(CTX, &sender_pubkey, sender_seckey));
+    CHECK(secp256k1_ec_pubkey_create(CTX, &scan_pubkey, scan_seckey));
+    CHECK(secp256k1_ec_pubkey_create(CTX, &unlabeled_spend_pubkey, spend_seckey));
+    prevout_pubkeys[0] = &sender_pubkey;
+    sender_seckeys[0] = sender_seckey;
+    CHECK(secp256k1_silentpayments_recipient_prevouts_summary_create(
+        CTX, &prevouts_summary, SMALLEST_OUTPOINT, NULL, 0, prevout_pubkeys, 1));
+
+    memset(&cache, 0, sizeof(cache));
+    CHECK(secp256k1_silentpayments_recipient_label_create(
+        CTX, &label, cache.entries[0].label_tweak, scan_seckey, 1));
+    CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, cache.entries[0].label, &label));
+    cache.entries_used = 1;
+    CHECK(secp256k1_silentpayments_recipient_create_labeled_spend_pubkey(
+        CTX, &labeled_spend_pubkey, &unlabeled_spend_pubkey, &label));
+
+    recipient.scan_pubkey = scan_pubkey;
+    recipient.spend_pubkey = labeled_spend_pubkey;
+    recipient.index = 0;
+    recipients[0] = &recipient;
+    /* Produce two k = 0 outputs, with the labeled output first. */
+    generated_outputs[0] = &labeled_output;
+    CHECK(secp256k1_silentpayments_sender_create_outputs(
+        CTX, generated_outputs, recipients, 1, SMALLEST_OUTPOINT, NULL, 0, sender_seckeys, 1));
+    recipient.spend_pubkey = unlabeled_spend_pubkey;
+    generated_outputs[0] = &direct_output;
+    CHECK(secp256k1_silentpayments_sender_create_outputs(
+        CTX, generated_outputs, recipients, 1, SMALLEST_OUTPOINT, NULL, 0, sender_seckeys, 1));
+    CHECK(secp256k1_xonly_pubkey_cmp(CTX, &labeled_output, &direct_output) != 0);
+
+    tx_outputs[0] = &labeled_output;
+    tx_outputs[1] = &direct_output;
+    found_outputs[0] = &found_output[0];
+    found_outputs[1] = &found_output[1];
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(
+        CTX, found_outputs, &n_found_outputs, tx_outputs, 2, scan_seckey, &prevouts_summary,
+        &unlabeled_spend_pubkey, label_lookup, &cache));
+    CHECK(n_found_outputs == 1);
+    CHECK(secp256k1_xonly_pubkey_cmp(CTX, &found_output[0].output, &labeled_output) == 0);
+    CHECK(found_output[0].found_with_label);
+    CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, found_label, &found_output[0].label));
+    CHECK(secp256k1_memcmp_var(found_label, cache.entries[0].label, sizeof(found_label)) == 0);
+}
+
+void run_silentpayments_test_vector_send(const struct bip352_test_vector *test) {
+    static secp256k1_silentpayments_recipient recipients[MAX_OUTPUTS_PER_TEST_CASE];
+    static const secp256k1_silentpayments_recipient *recipient_ptrs[MAX_OUTPUTS_PER_TEST_CASE];
+    static secp256k1_xonly_pubkey generated_outputs[MAX_OUTPUTS_PER_TEST_CASE];
+    static secp256k1_xonly_pubkey *generated_output_ptrs[MAX_OUTPUTS_PER_TEST_CASE];
+    static secp256k1_keypair keypairs[MAX_INPUTS_PER_TEST_CASE];
+    static secp256k1_keypair const *keypair_ptrs[MAX_INPUTS_PER_TEST_CASE];
+    static unsigned char const *seckeys[MAX_INPUTS_PER_TEST_CASE];
+    unsigned char created_output[32];
+    size_t i, j, k;
+    int match, ret;
+
+    /* Check that sender creates expected outputs */
+    j = 0; /* index to expand given recipient entries (with possible repeated entries) to full list */
+    for (i = 0; i < test->num_recipient_entries; i++) {
+        size_t c;
+        secp256k1_pubkey scan_pubkey, spend_pubkey;
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &scan_pubkey, test->recipient_pubkeys[i].scan_pubkey, 33));
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &spend_pubkey, test->recipient_pubkeys[i].spend_pubkey, 33));
+        for (c = 0; c < test->recipient_pubkeys[i].count; c++) {
+            recipients[j].scan_pubkey = scan_pubkey;
+            recipients[j].spend_pubkey = spend_pubkey;
+            recipients[j].index = j;
+            recipient_ptrs[j] = &recipients[j];
+            generated_output_ptrs[j] = &generated_outputs[j];
+            j++;
+        }
+    }
+    CHECK(j == test->num_outputs);
+    for (i = 0; i < test->num_plain_inputs; i++) {
+        seckeys[i] = test->plain_seckeys[i];
+    }
+    for (i = 0; i < test->num_taproot_inputs; i++) {
+        CHECK(secp256k1_keypair_create(CTX, &keypairs[i], test->taproot_seckeys[i]));
+        keypair_ptrs[i] = &keypairs[i];
+    }
+    {
+        int32_t ecount = 0;
+        secp256k1_context_set_illegal_callback(CTX, counting_callback_fn, &ecount);
+        ret = secp256k1_silentpayments_sender_create_outputs(CTX,
+            generated_output_ptrs,
+            recipient_ptrs,
+            test->num_outputs,
+            test->outpoint_smallest,
+            test->num_taproot_inputs > 0 ? keypair_ptrs : NULL, test->num_taproot_inputs,
+            test->num_plain_inputs > 0 ? seckeys : NULL, test->num_plain_inputs
+        );
+        secp256k1_context_set_illegal_callback(CTX, NULL, NULL);
+        /* We expect exactly one ARG_CHECK if the number of input keys was 0. */
+        CHECK(ecount == ((test->num_taproot_inputs + test->num_plain_inputs) == 0));
+    }
+    /* If the expected number of recipient outputs is zero, check that the creation of outputs
+     * failed (e.g. due to input keys summing to zero) */
+    if (test->num_recipient_outputs == 0) {
+        CHECK(!ret);
+        return;
+    }
+    CHECK(ret);
+
+    match = 0;
+    for (i = 0; i < test->num_output_sets; i++) {
+        size_t n_matches = 0;
+        for (j = 0; j < test->num_outputs; j++) {
+            CHECK(secp256k1_xonly_pubkey_serialize(CTX, created_output, &generated_outputs[j]));
+            /* Loop over both lists to ensure tests don't fail due to different orderings of outputs */
+            for (k = 0; k < test->num_recipient_outputs; k++) {
+                if (secp256k1_memcmp_var(created_output, test->recipient_outputs[i][k], 32) == 0) {
+                    n_matches++;
+                    break;
+                }
+            }
+        }
+        if (n_matches == test->num_recipient_outputs) {
+            match = 1;
+            break;
+        }
+    }
+    CHECK(match);
+}
+
+void run_silentpayments_test_vector_receive(const struct bip352_test_vector *test, const struct bip352_receive_subtest *subtest) {
+    static secp256k1_pubkey pubkeys_objs[MAX_INPUTS_PER_TEST_CASE];
+    static secp256k1_xonly_pubkey xonly_pubkeys_objs[MAX_INPUTS_PER_TEST_CASE];
+    static secp256k1_xonly_pubkey tx_output_objs[MAX_OUTPUTS_PER_TEST_CASE];
+    static secp256k1_silentpayments_found_output found_output_objs[MAX_OUTPUTS_PER_TEST_CASE];
+    static secp256k1_pubkey const *pubkeys[MAX_INPUTS_PER_TEST_CASE];
+    static secp256k1_xonly_pubkey const *xonly_pubkeys[MAX_INPUTS_PER_TEST_CASE];
+    static secp256k1_xonly_pubkey const *tx_outputs[MAX_OUTPUTS_PER_TEST_CASE];
+    static secp256k1_silentpayments_found_output *found_outputs[MAX_OUTPUTS_PER_TEST_CASE];
+    secp256k1_pubkey recipient_scan_pubkey;
+    secp256k1_pubkey recipient_spend_pubkey;
+    secp256k1_silentpayments_label label;
+    size_t i,j;
+    int ret;
+    uint32_t n_found = 0;
+    unsigned char found_output[32];
+    secp256k1_silentpayments_prevouts_summary prevouts_summary;
+
+
+    /* prepare the inputs */
+    for (i = 0; i < test->num_plain_inputs; i++) {
+        CHECK(secp256k1_ec_pubkey_parse(CTX, &pubkeys_objs[i], test->plain_pubkeys[i], 33));
+        pubkeys[i] = &pubkeys_objs[i];
+    }
+    for (i = 0; i < test->num_taproot_inputs; i++) {
+        CHECK(secp256k1_xonly_pubkey_parse(CTX, &xonly_pubkeys_objs[i], test->xonly_pubkeys[i]));
+        xonly_pubkeys[i] = &xonly_pubkeys_objs[i];
+    }
+    {
+        int32_t ecount = 0;
+        secp256k1_context_set_illegal_callback(CTX, counting_callback_fn, &ecount);
+        ret = secp256k1_silentpayments_recipient_prevouts_summary_create(CTX, &prevouts_summary,
+            test->outpoint_smallest,
+            test->num_taproot_inputs > 0 ? xonly_pubkeys : NULL, test->num_taproot_inputs,
+            test->num_plain_inputs > 0 ? pubkeys : NULL, test->num_plain_inputs
+        );
+        secp256k1_context_set_illegal_callback(CTX, NULL, NULL);
+        /* We expect exactly one ARG_CHECK if the number of input keys was 0. */
+        CHECK(ecount == ((test->num_taproot_inputs + test->num_plain_inputs) == 0));
+    }
+    /* If we are unable to create the prevouts_summary object, e.g., the input public keys sum to
+     * zero, check that the expected number of recipient outputs for this test case is zero
+     */
+    if (!ret) {
+        CHECK(subtest->num_found_output_pubkeys == 0);
+        return;
+    }
+    /* prepare the outputs */
+    for (i = 0; i < subtest->num_to_scan_outputs; i++) {
+        CHECK(secp256k1_xonly_pubkey_parse(CTX, &tx_output_objs[i], subtest->to_scan_outputs[i]));
+        tx_outputs[i] = &tx_output_objs[i];
+        found_outputs[i] = &found_output_objs[i];
+    }
+
+    /* scan / spend pubkeys are not in the given data of the recipient part, so let's compute them */
+    CHECK(secp256k1_ec_pubkey_create(CTX, &recipient_scan_pubkey, subtest->scan_seckey));
+    CHECK(secp256k1_ec_pubkey_create(CTX, &recipient_spend_pubkey, subtest->spend_seckey));
+
+    /* create labels cache */
+    labels_cache.entries_used = 0;
+    for (i = 0; i < subtest->num_labels; i++) {
+        unsigned int m = subtest->label_integers[i];
+        struct label_cache_entry *cache_entry = &labels_cache.entries[labels_cache.entries_used];
+        CHECK(secp256k1_silentpayments_recipient_label_create(CTX, &label, cache_entry->label_tweak, subtest->scan_seckey, m));
+        CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, cache_entry->label, &label));
+        labels_cache.entries_used++;
+    }
+    CHECK(secp256k1_silentpayments_recipient_scan_outputs(CTX,
+        found_outputs, &n_found,
+        tx_outputs, subtest->num_to_scan_outputs,
+        subtest->scan_seckey,
+        &prevouts_summary,
+        &recipient_spend_pubkey,
+        label_lookup, &labels_cache)
+    );
+    if (subtest->full_check) {
+        /* compare expected and scanned outputs (including calculated seckey tweaks and signatures) */
+#ifdef ENABLE_MODULE_SCHNORRSIG
+        static unsigned char found_signatures[MAX_OUTPUTS_PER_TEST_CASE][64];
+        /* sha256("message") */
+        static unsigned char MSG32[32] = {
+            0xab,0x53,0x0a,0x13,0xe4,0x59,0x14,0x98,
+            0x2b,0x79,0xf9,0xb7,0xe3,0xfb,0xa9,0x94,
+            0xcf,0xd1,0xf3,0xfb,0x22,0xf7,0x1c,0xea,
+            0x1a,0xfb,0xf0,0x2b,0x46,0x0c,0x6d,0x1d
+        };
+        /* sha256("random auxiliary data") */
+        static unsigned char AUX32[32] = {
+            0x0b,0x3f,0xdd,0xfd,0x67,0xbf,0x76,0xae,
+            0x76,0x39,0xee,0x73,0x5b,0x70,0xff,0x15,
+            0x83,0xfd,0x92,0x48,0xc0,0x57,0xd2,0x86,
+            0x07,0xa2,0x15,0xf4,0x0b,0x0a,0x3e,0xcc
+        };
+        for (i = 0; i < n_found; i++) {
+            unsigned char full_seckey[32];
+            secp256k1_keypair keypair;
+            unsigned char signature[64];
+            memcpy(&full_seckey, subtest->spend_seckey, 32);
+            CHECK(secp256k1_ec_seckey_tweak_add(CTX, full_seckey, found_outputs[i]->tweak));
+            CHECK(secp256k1_keypair_create(CTX, &keypair, full_seckey));
+            CHECK(secp256k1_schnorrsig_sign32(CTX, signature, MSG32, &keypair, AUX32));
+            memcpy(found_signatures[i], signature, 64);
+        }
+#endif
+
+        for (i = 0; i < n_found; i++) {
+            int match = 0;
+            CHECK(secp256k1_xonly_pubkey_serialize(CTX, found_output, &found_outputs[i]->output));
+            for (j = 0; j < subtest->num_found_output_pubkeys; j++) {
+                if (secp256k1_memcmp_var(&found_output, subtest->found_output_pubkeys[j], 32) == 0) {
+                    CHECK(secp256k1_memcmp_var(found_outputs[i]->tweak, subtest->found_seckey_tweaks[j], 32) == 0);
+#ifdef ENABLE_MODULE_SCHNORRSIG
+                    CHECK(secp256k1_memcmp_var(found_signatures[i], subtest->found_signatures[j], 64) == 0);
+#endif
+                    match = 1;
+                    break;
+                }
+            }
+            CHECK(match);
+
+            if (subtest->num_labels == 0) {
+                /* if the test case doesn't involve labels, we must not have any labeled matches */
+                CHECK(!found_outputs[i]->found_with_label);
+            } else if (found_outputs[i]->found_with_label) {
+                /* if the test case involves labels and we have a labeled match, verify that the returned
+                 * label is in the list of expected ones by manually checking against the label cache
+                 * (note that the test vectors only contain a list of used labels, but not exactly which one
+                 * of these have been applied for each individual output, so that's the best we can do) */
+                unsigned char found_label_ser[33];
+                const unsigned char *found_label_tweak;
+                CHECK(secp256k1_silentpayments_recipient_label_serialize(CTX, found_label_ser, &found_outputs[i]->label));
+                found_label_tweak = label_lookup(found_label_ser, &labels_cache);
+                CHECK(found_label_tweak != NULL);
+            }
+        }
+    }
+    CHECK(n_found == subtest->num_found_output_pubkeys);
+}
+
+static void silentpayments_sha256_tag_test(void) {
+    secp256k1_sha256 sha;
+    {
+        /* "BIP0352/Inputs" */
+        static const unsigned char tag[] = {'B','I','P','0','3','5','2','/','I','n','p','u','t','s'};
+        secp256k1_silentpayments_sha256_init_inputs(&sha);
+        test_sha256_tag_midstate(&CTX->hash_ctx, &sha, tag, sizeof(tag));
+    }
+    {
+        /* "BIP0352/SharedSecret" */
+        static const unsigned char tag[] = {'B','I','P','0','3','5','2','/','S','h','a','r','e','d', 'S','e','c','r','e','t'};
+        secp256k1_silentpayments_sha256_init_sharedsecret(&sha);
+        test_sha256_tag_midstate(&CTX->hash_ctx, &sha, tag, sizeof(tag));
+    }
+    {
+        /* "BIP0352/Label" */
+        static const unsigned char tag[] = {'B','I','P','0','3','5','2','/','L','a','b','e','l'};
+        secp256k1_silentpayments_sha256_init_label(&sha);
+        test_sha256_tag_midstate(&CTX->hash_ctx, &sha, tag, sizeof(tag));
+    }
+}
+
+
+void run_silentpayments_test_vectors(void) {
+    size_t i, j;
+
+    for (i = 0; i < ARRAY_SIZE(bip352_test_vectors); i++) {
+        const struct bip352_test_vector *test = &bip352_test_vectors[i];
+        run_silentpayments_test_vector_send(test);
+        for (j = 0; j < test->num_receive_subtests; j++) {
+            run_silentpayments_test_vector_receive(test, &test->receive_subtests[j]);
+        }
+    }
+}
+
+/* --- Test registry --- */
+static const struct tf_test_entry tests_silentpayments[] = {
+    CASE1(test_recipient_sort),
+    CASE1(test_send_api),
+    CASE1(test_label_api),
+    CASE1(test_recipient_api),
+    CASE1(test_recipient_scan_label_precedes_direct_match),
+    CASE1(run_silentpayments_test_vectors),
+    CASE1(silentpayments_sha256_tag_test),
+};
+
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/modules/silentpayments/vectors.h b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/vectors.h
new file mode 100644
index 00000000..51663dc7
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/src/modules/silentpayments/vectors.h
@@ -0,0 +1,4747 @@
+/* Note: this file was autogenerated using tests_silentpayments_generate.py. Do not edit. */
+
+#include <stddef.h>
+
+#define MAX_INPUTS_PER_TEST_CASE  3
+#define MAX_OUTPUTS_PER_TEST_CASE 2324
+#define MAX_RECIPIENT_ENTRIES_PER_TEST_CASE 4
+#define MAX_LABELS_PER_TEST_CASE  4
+#define MAX_PERMUTATIONS_PER_SENDING_TEST_CASE 12
+#define MAX_RECEIVE_SUBTESTS 2
+
+struct bip352_recipient_addressdata {
+    unsigned char scan_pubkey[33];
+    unsigned char spend_pubkey[33];
+    size_t count;
+};
+
+struct bip352_receive_subtest {
+    /* Given recipient data */
+    unsigned char scan_seckey[32];
+    unsigned char spend_seckey[32];
+    size_t num_to_scan_outputs;
+    unsigned char to_scan_outputs[MAX_OUTPUTS_PER_TEST_CASE][32];
+    size_t num_labels;
+    unsigned int label_integers[MAX_LABELS_PER_TEST_CASE];
+
+    /* Expected recipient data */
+    size_t full_check; /* 1..detailed check against tweaks and signatures, 0..only check found outputs count */
+    size_t num_found_output_pubkeys;
+    unsigned char found_output_pubkeys[MAX_OUTPUTS_PER_TEST_CASE][32];
+    unsigned char found_seckey_tweaks[MAX_OUTPUTS_PER_TEST_CASE][32];
+    unsigned char found_signatures[MAX_OUTPUTS_PER_TEST_CASE][64];
+};
+
+struct bip352_test_vector {
+    /* Inputs (private keys / public keys + smallest outpoint) */
+    size_t num_plain_inputs;
+    unsigned char plain_seckeys[MAX_INPUTS_PER_TEST_CASE][32];
+    unsigned char plain_pubkeys[MAX_INPUTS_PER_TEST_CASE][33];
+    size_t num_taproot_inputs;
+    unsigned char taproot_seckeys[MAX_INPUTS_PER_TEST_CASE][32];
+    unsigned char xonly_pubkeys[MAX_INPUTS_PER_TEST_CASE][32];
+    unsigned char outpoint_smallest[36];
+
+    /* Given sender data (pubkeys encoded per output address to send to) */
+    size_t num_outputs;
+    size_t num_recipient_entries;
+    struct bip352_recipient_addressdata recipient_pubkeys[MAX_RECIPIENT_ENTRIES_PER_TEST_CASE];
+
+    /* Expected sender data */
+    size_t num_output_sets;
+    size_t num_recipient_outputs;
+    unsigned char recipient_outputs[MAX_PERMUTATIONS_PER_SENDING_TEST_CASE][MAX_OUTPUTS_PER_TEST_CASE][32];
+
+    size_t num_receive_subtests;
+    struct bip352_receive_subtest receive_subtests[MAX_RECEIVE_SUBTESTS];
+};
+
+#define SECP256K1_SILENTPAYMENTS_NUMBER_TESTVECTORS 28
+
+static const struct bip352_test_vector bip352_test_vectors[SECP256K1_SILENTPAYMENTS_NUMBER_TESTVECTORS] = {
+    /* ----- Simple send: two inputs (1) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x93,0xf5,0xed,0x90,0x7a,0xd5,0xb2,0xbd,0xbb,0xdc,0xb5,0xd9,0x11,0x6e,0xbc,0x0a,0x4e,0x1f,0x92,0xf9,0x10,0xd5,0x26,0x02,0x37,0xfa,0x45,0xa9,0x40,0x8a,0xad,0x16},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0xbd,0x85,0x68,0x5d,0x03,0xd1,0x11,0x69,0x9b,0x15,0xd0,0x46,0x31,0x9f,0xeb,0xe7,0x7f,0x8d,0xe5,0x28,0x6e,0x9e,0x51,0x27,0x03,0xcd,0xee,0x1b,0xf3,0xbe,0x37,0x92},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x3e,0x9f,0xce,0x73,0xd4,0xe7,0x7a,0x48,0x09,0x90,0x8e,0x3c,0x3a,0x2e,0x54,0xee,0x14,0x7b,0x93,0x12,0xdc,0x50,0x44,0xa1,0x93,0xd1,0xfc,0x85,0xde,0x46,0xe3,0xc1},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x3e,0x9f,0xce,0x73,0xd4,0xe7,0x7a,0x48,0x09,0x90,0x8e,0x3c,0x3a,0x2e,0x54,0xee,0x14,0x7b,0x93,0x12,0xdc,0x50,0x44,0xa1,0x93,0xd1,0xfc,0x85,0xde,0x46,0xe3,0xc1},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x3e,0x9f,0xce,0x73,0xd4,0xe7,0x7a,0x48,0x09,0x90,0x8e,0x3c,0x3a,0x2e,0x54,0xee,0x14,0x7b,0x93,0x12,0xdc,0x50,0x44,0xa1,0x93,0xd1,0xfc,0x85,0xde,0x46,0xe3,0xc1},
+        },
+        {
+            {0xf4,0x38,0xb4,0x01,0x79,0xa3,0xc4,0x26,0x2d,0xe1,0x29,0x86,0xc0,0xe6,0xcc,0xe0,0x63,0x40,0x07,0xcd,0xc7,0x9c,0x1d,0xcd,0x3e,0x20,0xb9,0xeb,0xc2,0xe7,0xee,0xf6},
+        },
+        {
+            {0x74,0xf8,0x5b,0x85,0x63,0x37,0xfb,0xe8,0x37,0x64,0x3b,0x86,0xf4,0x62,0x11,0x81,0x59,0xf9,0x3a,0xc4,0xac,0xc2,0x67,0x15,0x22,0xf2,0x7e,0x8f,0x67,0xb0,0x79,0x95,0x91,0x95,0xcc,0xc7,0xa5,0xdb,0xee,0x39,0x6d,0x29,0x09,0xf5,0xd6,0x80,0xd6,0xe3,0x0c,0xda,0x73,0x59,0xaa,0x27,0x55,0x82,0x25,0x09,0xb7,0x0d,0x6b,0x06,0x87,0xa1},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Simple send: two inputs, order reversed (2) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x93,0xf5,0xed,0x90,0x7a,0xd5,0xb2,0xbd,0xbb,0xdc,0xb5,0xd9,0x11,0x6e,0xbc,0x0a,0x4e,0x1f,0x92,0xf9,0x10,0xd5,0x26,0x02,0x37,0xfa,0x45,0xa9,0x40,0x8a,0xad,0x16},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0xbd,0x85,0x68,0x5d,0x03,0xd1,0x11,0x69,0x9b,0x15,0xd0,0x46,0x31,0x9f,0xeb,0xe7,0x7f,0x8d,0xe5,0x28,0x6e,0x9e,0x51,0x27,0x03,0xcd,0xee,0x1b,0xf3,0xbe,0x37,0x92},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x3e,0x9f,0xce,0x73,0xd4,0xe7,0x7a,0x48,0x09,0x90,0x8e,0x3c,0x3a,0x2e,0x54,0xee,0x14,0x7b,0x93,0x12,0xdc,0x50,0x44,0xa1,0x93,0xd1,0xfc,0x85,0xde,0x46,0xe3,0xc1},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x3e,0x9f,0xce,0x73,0xd4,0xe7,0x7a,0x48,0x09,0x90,0x8e,0x3c,0x3a,0x2e,0x54,0xee,0x14,0x7b,0x93,0x12,0xdc,0x50,0x44,0xa1,0x93,0xd1,0xfc,0x85,0xde,0x46,0xe3,0xc1},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x3e,0x9f,0xce,0x73,0xd4,0xe7,0x7a,0x48,0x09,0x90,0x8e,0x3c,0x3a,0x2e,0x54,0xee,0x14,0x7b,0x93,0x12,0xdc,0x50,0x44,0xa1,0x93,0xd1,0xfc,0x85,0xde,0x46,0xe3,0xc1},
+        },
+        {
+            {0xf4,0x38,0xb4,0x01,0x79,0xa3,0xc4,0x26,0x2d,0xe1,0x29,0x86,0xc0,0xe6,0xcc,0xe0,0x63,0x40,0x07,0xcd,0xc7,0x9c,0x1d,0xcd,0x3e,0x20,0xb9,0xeb,0xc2,0xe7,0xee,0xf6},
+        },
+        {
+            {0x74,0xf8,0x5b,0x85,0x63,0x37,0xfb,0xe8,0x37,0x64,0x3b,0x86,0xf4,0x62,0x11,0x81,0x59,0xf9,0x3a,0xc4,0xac,0xc2,0x67,0x15,0x22,0xf2,0x7e,0x8f,0x67,0xb0,0x79,0x95,0x91,0x95,0xcc,0xc7,0xa5,0xdb,0xee,0x39,0x6d,0x29,0x09,0xf5,0xd6,0x80,0xd6,0xe3,0x0c,0xda,0x73,0x59,0xaa,0x27,0x55,0x82,0x25,0x09,0xb7,0x0d,0x6b,0x06,0x87,0xa1},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Simple send: two inputs from the same transaction (3) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x93,0xf5,0xed,0x90,0x7a,0xd5,0xb2,0xbd,0xbb,0xdc,0xb5,0xd9,0x11,0x6e,0xbc,0x0a,0x4e,0x1f,0x92,0xf9,0x10,0xd5,0x26,0x02,0x37,0xfa,0x45,0xa9,0x40,0x8a,0xad,0x16},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0xbd,0x85,0x68,0x5d,0x03,0xd1,0x11,0x69,0x9b,0x15,0xd0,0x46,0x31,0x9f,0xeb,0xe7,0x7f,0x8d,0xe5,0x28,0x6e,0x9e,0x51,0x27,0x03,0xcd,0xee,0x1b,0xf3,0xbe,0x37,0x92},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x03,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x79,0xe7,0x1b,0xaa,0x2b,0xa3,0xfc,0x66,0x39,0x6d,0xe3,0xa0,0x4f,0x16,0x8c,0x7b,0xf2,0x4d,0x68,0x70,0xec,0x88,0xca,0x87,0x77,0x54,0x79,0x0c,0x1d,0xb3,0x57,0xb6},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x79,0xe7,0x1b,0xaa,0x2b,0xa3,0xfc,0x66,0x39,0x6d,0xe3,0xa0,0x4f,0x16,0x8c,0x7b,0xf2,0x4d,0x68,0x70,0xec,0x88,0xca,0x87,0x77,0x54,0x79,0x0c,0x1d,0xb3,0x57,0xb6},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x79,0xe7,0x1b,0xaa,0x2b,0xa3,0xfc,0x66,0x39,0x6d,0xe3,0xa0,0x4f,0x16,0x8c,0x7b,0xf2,0x4d,0x68,0x70,0xec,0x88,0xca,0x87,0x77,0x54,0x79,0x0c,0x1d,0xb3,0x57,0xb6},
+        },
+        {
+            {0x48,0x51,0x45,0x5b,0xfb,0xe1,0xab,0x4f,0x80,0x15,0x65,0x70,0xaa,0x45,0x06,0x32,0x01,0xaa,0x5c,0x9e,0x1b,0x1d,0xcd,0x29,0xf0,0xf8,0xc3,0x3d,0x10,0xbf,0x77,0xae},
+        },
+        {
+            {0x10,0x33,0x2e,0xea,0x80,0x8b,0x6a,0x13,0xf7,0x00,0x59,0xa8,0xa7,0x31,0x95,0x80,0x8d,0xb7,0x82,0x01,0x29,0x07,0xf5,0xba,0x32,0xb6,0xea,0xe6,0x6a,0x2f,0x66,0xb4,0xf6,0x51,0x47,0xe2,0xb9,0x68,0xa1,0x67,0x8c,0x5f,0x73,0xd5,0x7d,0x5d,0x19,0x5d,0xba,0xf6,0x67,0xb6,0x06,0xff,0x80,0xc8,0x49,0x0e,0xac,0x1f,0x3b,0x71,0x06,0x57},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Simple send: two inputs from the same transaction, order reversed (4) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x93,0xf5,0xed,0x90,0x7a,0xd5,0xb2,0xbd,0xbb,0xdc,0xb5,0xd9,0x11,0x6e,0xbc,0x0a,0x4e,0x1f,0x92,0xf9,0x10,0xd5,0x26,0x02,0x37,0xfa,0x45,0xa9,0x40,0x8a,0xad,0x16},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0xbd,0x85,0x68,0x5d,0x03,0xd1,0x11,0x69,0x9b,0x15,0xd0,0x46,0x31,0x9f,0xeb,0xe7,0x7f,0x8d,0xe5,0x28,0x6e,0x9e,0x51,0x27,0x03,0xcd,0xee,0x1b,0xf3,0xbe,0x37,0x92},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x8d,0xd4,0xf5,0xfb,0xd5,0xe9,0x80,0xfc,0x02,0xf3,0x5c,0x6c,0xe1,0x45,0x93,0x5b,0x11,0xe2,0x84,0x60,0x5b,0xf5,0x99,0xa1,0x3c,0x6d,0x41,0x5d,0xb5,0x5d,0x07,0xa1,0x03,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0xf4,0xc2,0xda,0x80,0x7f,0x89,0xcb,0x15,0x01,0xf1,0xa7,0x73,0x22,0xa8,0x95,0xac,0xfb,0x93,0xc2,0x8e,0x08,0xed,0x27,0x24,0xd2,0xbe,0xb8,0xe4,0x45,0x39,0xba,0x38},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0xf4,0xc2,0xda,0x80,0x7f,0x89,0xcb,0x15,0x01,0xf1,0xa7,0x73,0x22,0xa8,0x95,0xac,0xfb,0x93,0xc2,0x8e,0x08,0xed,0x27,0x24,0xd2,0xbe,0xb8,0xe4,0x45,0x39,0xba,0x38},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0xf4,0xc2,0xda,0x80,0x7f,0x89,0xcb,0x15,0x01,0xf1,0xa7,0x73,0x22,0xa8,0x95,0xac,0xfb,0x93,0xc2,0x8e,0x08,0xed,0x27,0x24,0xd2,0xbe,0xb8,0xe4,0x45,0x39,0xba,0x38},
+        },
+        {
+            {0xab,0x0c,0x9b,0x87,0x18,0x1b,0xf5,0x27,0x87,0x9f,0x48,0xdb,0x9f,0x14,0xa0,0x22,0x33,0x61,0x9b,0x98,0x6f,0x8e,0x8f,0x2d,0x5d,0x40,0x8c,0xe6,0x8a,0x70,0x9f,0x51},
+        },
+        {
+            {0x39,0x8a,0x97,0x90,0x86,0x57,0x91,0xa9,0xdb,0x41,0xa8,0x01,0x5a,0xfa,0xd3,0xa4,0x7d,0x60,0xfe,0xc5,0x08,0x6c,0x50,0x55,0x78,0x06,0xa4,0x9a,0x1b,0xc0,0x38,0x80,0x86,0x32,0xb8,0xfe,0x67,0x9a,0x7b,0xb6,0x5f,0xc6,0xb4,0x55,0xbe,0x99,0x45,0x02,0xee,0xd8,0x49,0xf1,0xda,0x37,0x29,0xcd,0x94,0x8f,0xc7,0xbe,0x73,0xd6,0x72,0x95},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Outpoint ordering byte-lexicographically vs. vout-integer (5) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x93,0xf5,0xed,0x90,0x7a,0xd5,0xb2,0xbd,0xbb,0xdc,0xb5,0xd9,0x11,0x6e,0xbc,0x0a,0x4e,0x1f,0x92,0xf9,0x10,0xd5,0x26,0x02,0x37,0xfa,0x45,0xa9,0x40,0x8a,0xad,0x16},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0xbd,0x85,0x68,0x5d,0x03,0xd1,0x11,0x69,0x9b,0x15,0xd0,0x46,0x31,0x9f,0xeb,0xe7,0x7f,0x8d,0xe5,0x28,0x6e,0x9e,0x51,0x27,0x03,0xcd,0xee,0x1b,0xf3,0xbe,0x37,0x92},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x01,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0xa8,0x5e,0xf8,0x70,0x13,0x94,0xb5,0x17,0xa4,0xb3,0x52,0x17,0xc4,0xbd,0x37,0xac,0x01,0xeb,0xee,0xd4,0xb0,0x08,0xf8,0xd0,0x87,0x9f,0x9e,0x09,0xba,0x95,0x31,0x9c},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0xa8,0x5e,0xf8,0x70,0x13,0x94,0xb5,0x17,0xa4,0xb3,0x52,0x17,0xc4,0xbd,0x37,0xac,0x01,0xeb,0xee,0xd4,0xb0,0x08,0xf8,0xd0,0x87,0x9f,0x9e,0x09,0xba,0x95,0x31,0x9c},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0xa8,0x5e,0xf8,0x70,0x13,0x94,0xb5,0x17,0xa4,0xb3,0x52,0x17,0xc4,0xbd,0x37,0xac,0x01,0xeb,0xee,0xd4,0xb0,0x08,0xf8,0xd0,0x87,0x9f,0x9e,0x09,0xba,0x95,0x31,0x9c},
+        },
+        {
+            {0xc8,0xac,0x02,0x92,0x99,0x7b,0x5b,0xca,0x98,0xb3,0xeb,0xd9,0x9a,0x57,0xe2,0x53,0x07,0x11,0x37,0x55,0x0f,0x27,0x04,0x52,0xcd,0x3d,0xf8,0xa3,0xe2,0x26,0x6d,0x36},
+        },
+        {
+            {0xc0,0x36,0xee,0x38,0xbf,0xe4,0x6a,0xba,0x03,0x23,0x43,0x39,0xae,0x72,0x19,0xb3,0x1b,0x82,0x4b,0x52,0xef,0x9d,0x5c,0xe0,0x58,0x10,0xa0,0xd6,0xf6,0x23,0x30,0xde,0xdc,0x2b,0x55,0x65,0x25,0x78,0xaa,0x5b,0xda,0xbf,0x93,0x0f,0xae,0x94,0x1a,0xcd,0x83,0x9d,0x5a,0x66,0xf8,0xfc,0xe7,0xca,0xa9,0x71,0x0c,0xcb,0x44,0x6b,0xdd,0xd1},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Single recipient: multiple UTXOs from the same public key (6) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x54,0x8a,0xe5,0x5c,0x8e,0xec,0x1e,0x73,0x6e,0x8d,0x3e,0x52,0x0f,0x01,0x1f,0x1f,0x42,0xa5,0x6d,0x16,0x61,0x16,0xad,0x21,0x0b,0x39,0x37,0x59,0x9f,0x87,0xf5,0x66},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x54,0x8a,0xe5,0x5c,0x8e,0xec,0x1e,0x73,0x6e,0x8d,0x3e,0x52,0x0f,0x01,0x1f,0x1f,0x42,0xa5,0x6d,0x16,0x61,0x16,0xad,0x21,0x0b,0x39,0x37,0x59,0x9f,0x87,0xf5,0x66},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x54,0x8a,0xe5,0x5c,0x8e,0xec,0x1e,0x73,0x6e,0x8d,0x3e,0x52,0x0f,0x01,0x1f,0x1f,0x42,0xa5,0x6d,0x16,0x61,0x16,0xad,0x21,0x0b,0x39,0x37,0x59,0x9f,0x87,0xf5,0x66},
+        },
+        {
+            {0xf0,0x32,0x69,0x5e,0x26,0x36,0x61,0x9e,0xfa,0x52,0x3f,0xff,0xaa,0x9e,0xf9,0x3c,0x88,0x02,0x29,0x91,0x81,0xfd,0x04,0x61,0x91,0x3c,0x1b,0x8d,0xaf,0x97,0x84,0xcd},
+        },
+        {
+            {0xf2,0x38,0x38,0x6c,0x5d,0x5e,0x54,0x44,0xf8,0xd2,0xc7,0x5a,0xab,0xbc,0xb2,0x8c,0x34,0x6f,0x20,0x8c,0x76,0xf6,0x08,0x23,0xf5,0xde,0x3b,0x67,0xb7,0x9e,0x0e,0xc7,0x2e,0xa5,0xde,0x2d,0x7c,0xae,0xc3,0x14,0xe0,0x97,0x1d,0x34,0x54,0xf1,0x22,0xdd,0xa3,0x42,0xb3,0xee,0xde,0x01,0xb3,0x85,0x7e,0x83,0x65,0x4e,0x36,0xb2,0x5f,0x76},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Single recipient: taproot only inputs with even y-values (7) ----- */
+    {
+        0,
+        { /* input plain seckeys */
+            "",
+        },
+        { /* input plain pubkeys */
+            "",
+        },
+        2,
+        { /* input taproot seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0xfc,0x87,0x16,0xa9,0x7a,0x48,0xba,0x9a,0x05,0xa9,0x8a,0xe4,0x7b,0x5c,0xd2,0x01,0xa2,0x5a,0x7f,0xd5,0xd8,0xb7,0x3c,0x20,0x3c,0x5f,0x7b,0x6b,0x6b,0x3b,0x6a,0xd7},
+        },
+        { /* input x-only pubkeys */
+            {0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0xde,0x88,0xbe,0xa8,0xe7,0xff,0xc9,0xce,0x1a,0xf3,0x0d,0x11,0x32,0xf9,0x10,0x32,0x3c,0x50,0x51,0x85,0xae,0xc8,0xea,0xe3,0x61,0x67,0x04,0x21,0xe7,0x49,0xa1,0xfb},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0xde,0x88,0xbe,0xa8,0xe7,0xff,0xc9,0xce,0x1a,0xf3,0x0d,0x11,0x32,0xf9,0x10,0x32,0x3c,0x50,0x51,0x85,0xae,0xc8,0xea,0xe3,0x61,0x67,0x04,0x21,0xe7,0x49,0xa1,0xfb},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0xde,0x88,0xbe,0xa8,0xe7,0xff,0xc9,0xce,0x1a,0xf3,0x0d,0x11,0x32,0xf9,0x10,0x32,0x3c,0x50,0x51,0x85,0xae,0xc8,0xea,0xe3,0x61,0x67,0x04,0x21,0xe7,0x49,0xa1,0xfb},
+        },
+        {
+            {0x3f,0xb9,0xce,0x5c,0xe1,0x74,0x6c,0xed,0x10,0x3c,0x8e,0xd2,0x54,0xe8,0x1f,0x66,0x90,0x76,0x46,0x37,0xdd,0xbc,0x87,0x6e,0xc1,0xf9,0xb3,0xdd,0xab,0x77,0x6b,0x03},
+        },
+        {
+            {0xc5,0xac,0xd2,0x5a,0x8f,0x02,0x1a,0x41,0x92,0xf9,0x3b,0xc3,0x44,0x03,0xfd,0x8b,0x76,0x48,0x46,0x13,0x46,0x63,0x36,0xfb,0x25,0x9c,0x72,0xd0,0x4c,0x16,0x98,0x24,0xf2,0x69,0x0c,0xa3,0x4e,0x96,0xce,0xe8,0x6b,0x69,0xf3,0x76,0xc8,0x37,0x70,0x03,0x26,0x8f,0xda,0x56,0xfe,0xeb,0x1b,0x87,0x3e,0x57,0x83,0xd7,0xe1,0x9b,0xcc,0xa5},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Single recipient: taproot only with mixed even/odd y-values (8) ----- */
+    {
+        0,
+        { /* input plain seckeys */
+            "",
+        },
+        { /* input plain pubkeys */
+            "",
+        },
+        2,
+        { /* input taproot seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x1d,0x37,0x78,0x7c,0x2b,0x71,0x16,0xee,0x98,0x3e,0x9f,0x9c,0x13,0x26,0x9d,0xf2,0x90,0x91,0xb3,0x91,0xc0,0x4d,0xb9,0x42,0x39,0xe0,0xd2,0xbc,0x21,0x82,0xc3,0xbf},
+        },
+        { /* input x-only pubkeys */
+            {0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x8c,0x8d,0x23,0xd4,0x76,0x4f,0xef,0xfc,0xd5,0xe7,0x2e,0x38,0x08,0x02,0x54,0x0f,0xa0,0xf8,0x8e,0x3d,0x62,0xad,0x5e,0x0b,0x47,0x95,0x5f,0x74,0xd7,0xb2,0x83,0xc4},
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x77,0xca,0xb7,0xdd,0x12,0xb1,0x02,0x59,0xee,0x82,0xc6,0xea,0x4b,0x50,0x97,0x74,0xe3,0x3e,0x70,0x78,0xe7,0x13,0x8f,0x56,0x80,0x92,0x24,0x1b,0xf2,0x6b,0x99,0xf1},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x77,0xca,0xb7,0xdd,0x12,0xb1,0x02,0x59,0xee,0x82,0xc6,0xea,0x4b,0x50,0x97,0x74,0xe3,0x3e,0x70,0x78,0xe7,0x13,0x8f,0x56,0x80,0x92,0x24,0x1b,0xf2,0x6b,0x99,0xf1},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x77,0xca,0xb7,0xdd,0x12,0xb1,0x02,0x59,0xee,0x82,0xc6,0xea,0x4b,0x50,0x97,0x74,0xe3,0x3e,0x70,0x78,0xe7,0x13,0x8f,0x56,0x80,0x92,0x24,0x1b,0xf2,0x6b,0x99,0xf1},
+        },
+        {
+            {0xf5,0x38,0x25,0x08,0x60,0x97,0x71,0x06,0x8e,0xd0,0x79,0xb2,0x4e,0x1f,0x72,0xe4,0xa1,0x7e,0xe6,0xd1,0xc9,0x79,0x06,0x6b,0xf1,0xd4,0xe2,0xa5,0x67,0x6f,0x09,0xd4},
+        },
+        {
+            {0xff,0x65,0x83,0x3b,0x8f,0xd1,0xed,0x3e,0xf9,0xd0,0x44,0x3b,0x4f,0x70,0x2b,0x45,0xa3,0xf2,0xdd,0x45,0x7b,0xa2,0x47,0x68,0x7e,0x82,0x07,0x74,0x5c,0x3b,0xe9,0xd2,0xbd,0xad,0x0a,0xb3,0xf0,0x71,0x18,0xf8,0xb2,0xef,0xc6,0xa0,0x4b,0x95,0xf7,0xb3,0xe2,0x18,0xda,0xf8,0xa6,0x41,0x37,0xec,0x91,0xbd,0x2f,0xc6,0x7f,0xc1,0x37,0xa5},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Single recipient: taproot input with even y-value and non-taproot input (9) ----- */
+    {
+        1,
+        { /* input plain seckeys */
+            {0x8d,0x47,0x51,0xf6,0xe8,0xa3,0x58,0x68,0x80,0xfb,0x66,0xc1,0x9a,0xe2,0x77,0x96,0x9b,0xd5,0xaa,0x06,0xf6,0x1c,0x4e,0xe2,0xf1,0xe2,0x48,0x6e,0xfd,0xf6,0x66,0xd3},
+        },
+        { /* input plain pubkeys */
+            {0x03,0xe0,0xec,0x4f,0x64,0xb3,0xfa,0x2e,0x46,0x3c,0xcf,0xcf,0x4e,0x85,0x6e,0x37,0xd5,0xe1,0xe2,0x02,0x75,0xbc,0x89,0xec,0x1d,0xef,0x9e,0xb0,0x98,0xef,0xf1,0xf8,0x5d},
+        },
+        1,
+        { /* input taproot seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+        },
+        { /* input x-only pubkeys */
+            {0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x30,0x52,0x3c,0xca,0x96,0xb2,0xa9,0xae,0x3c,0x98,0xbe,0xb5,0xe6,0x0f,0x7d,0x19,0x0e,0xc5,0xbc,0x79,0xb2,0xd1,0x1a,0x0b,0x2d,0x4d,0x09,0xa6,0x08,0xc4,0x48,0xf0},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x30,0x52,0x3c,0xca,0x96,0xb2,0xa9,0xae,0x3c,0x98,0xbe,0xb5,0xe6,0x0f,0x7d,0x19,0x0e,0xc5,0xbc,0x79,0xb2,0xd1,0x1a,0x0b,0x2d,0x4d,0x09,0xa6,0x08,0xc4,0x48,0xf0},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x30,0x52,0x3c,0xca,0x96,0xb2,0xa9,0xae,0x3c,0x98,0xbe,0xb5,0xe6,0x0f,0x7d,0x19,0x0e,0xc5,0xbc,0x79,0xb2,0xd1,0x1a,0x0b,0x2d,0x4d,0x09,0xa6,0x08,0xc4,0x48,0xf0},
+        },
+        {
+            {0xb4,0x00,0x17,0x86,0x5c,0x79,0xb1,0xfc,0xbe,0xd6,0x88,0x96,0x79,0x1b,0xe9,0x31,0x86,0xd0,0x8f,0x47,0xe4,0x16,0xb2,0x89,0xb8,0xc0,0x63,0x77,0x7e,0x14,0xe8,0xdf},
+        },
+        {
+            {0xd1,0xed,0xee,0xa2,0x8c,0xf1,0x03,0x3b,0xcb,0x3d,0x89,0x37,0x6c,0xab,0xaa,0xaa,0x28,0x86,0xcb,0xd8,0xfd,0xa1,0x12,0xb5,0xc6,0x1c,0xc9,0x0a,0x4e,0x7f,0x18,0x78,0xbd,0xd6,0x21,0x80,0xb0,0x7d,0x1d,0xfc,0x8f,0xfe,0xe1,0x86,0x3c,0x52,0x5a,0x0c,0x7b,0x5b,0xcd,0x41,0x31,0x83,0x28,0x2c,0xfd,0xa7,0x56,0xcb,0x65,0x78,0x72,0x66},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Single recipient: taproot input with odd y-value and non-taproot input (10) ----- */
+    {
+        1,
+        { /* input plain seckeys */
+            {0x8d,0x47,0x51,0xf6,0xe8,0xa3,0x58,0x68,0x80,0xfb,0x66,0xc1,0x9a,0xe2,0x77,0x96,0x9b,0xd5,0xaa,0x06,0xf6,0x1c,0x4e,0xe2,0xf1,0xe2,0x48,0x6e,0xfd,0xf6,0x66,0xd3},
+        },
+        { /* input plain pubkeys */
+            {0x03,0xe0,0xec,0x4f,0x64,0xb3,0xfa,0x2e,0x46,0x3c,0xcf,0xcf,0x4e,0x85,0x6e,0x37,0xd5,0xe1,0xe2,0x02,0x75,0xbc,0x89,0xec,0x1d,0xef,0x9e,0xb0,0x98,0xef,0xf1,0xf8,0x5d},
+        },
+        1,
+        { /* input taproot seckeys */
+            {0x1d,0x37,0x78,0x7c,0x2b,0x71,0x16,0xee,0x98,0x3e,0x9f,0x9c,0x13,0x26,0x9d,0xf2,0x90,0x91,0xb3,0x91,0xc0,0x4d,0xb9,0x42,0x39,0xe0,0xd2,0xbc,0x21,0x82,0xc3,0xbf},
+        },
+        { /* input x-only pubkeys */
+            {0x8c,0x8d,0x23,0xd4,0x76,0x4f,0xef,0xfc,0xd5,0xe7,0x2e,0x38,0x08,0x02,0x54,0x0f,0xa0,0xf8,0x8e,0x3d,0x62,0xad,0x5e,0x0b,0x47,0x95,0x5f,0x74,0xd7,0xb2,0x83,0xc4},
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x35,0x93,0x58,0xf5,0x9e,0xe9,0xe9,0xee,0xc3,0xf0,0x0b,0xdf,0x48,0x82,0x57,0x0f,0xd5,0xc1,0x82,0xe4,0x51,0xaa,0x26,0x50,0xb7,0x88,0x54,0x4a,0xff,0x01,0x2a,0x3a},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x35,0x93,0x58,0xf5,0x9e,0xe9,0xe9,0xee,0xc3,0xf0,0x0b,0xdf,0x48,0x82,0x57,0x0f,0xd5,0xc1,0x82,0xe4,0x51,0xaa,0x26,0x50,0xb7,0x88,0x54,0x4a,0xff,0x01,0x2a,0x3a},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x35,0x93,0x58,0xf5,0x9e,0xe9,0xe9,0xee,0xc3,0xf0,0x0b,0xdf,0x48,0x82,0x57,0x0f,0xd5,0xc1,0x82,0xe4,0x51,0xaa,0x26,0x50,0xb7,0x88,0x54,0x4a,0xff,0x01,0x2a,0x3a},
+        },
+        {
+            {0xa2,0xf9,0xdd,0x05,0xd1,0xd3,0x98,0x34,0x7c,0x88,0x5d,0x9c,0x61,0xa6,0x4d,0x18,0xa2,0x64,0xde,0x6d,0x49,0xce,0xa4,0x32,0x6b,0xaf,0xc2,0x79,0x1d,0x62,0x7f,0xa7},
+        },
+        {
+            {0x96,0x03,0x8a,0xd2,0x33,0xd8,0xbe,0xfe,0x34,0x25,0x73,0xa6,0xe5,0x48,0x28,0xd8,0x63,0x47,0x1f,0xb2,0xaf,0xba,0xd5,0x75,0xcc,0x65,0x27,0x1a,0x2a,0x64,0x94,0x80,0xea,0x14,0x91,0x2b,0x6a,0xbb,0xd3,0xfb,0xf9,0x2e,0xfc,0x19,0x28,0xc0,0x36,0xf6,0xe3,0xee,0xf9,0x27,0x10,0x5a,0xf4,0xec,0x1d,0xd5,0x7c,0xb9,0x09,0xf3,0x60,0xb8},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Multiple outputs: multiple outputs, same recipient (11) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        2,
+        2,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        2,
+        { /* recipient outputs */
+        {
+                {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        2,
+        { /* outputs to scan */
+            {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        2,
+        {
+            {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        {
+            {0xd9,0x7e,0x44,0x2d,0x11,0x0c,0x0b,0xdd,0x31,0x16,0x1a,0x7b,0xb6,0xe7,0x86,0x2e,0x03,0x8d,0x02,0xa0,0x9b,0x14,0x84,0xdf,0xbb,0x46,0x3f,0x2e,0x0f,0x7c,0x92,0x30},
+            {0x33,0xce,0x08,0x5c,0x3c,0x11,0xea,0xad,0x13,0x69,0x4a,0xae,0x3c,0x20,0x30,0x1a,0x6c,0x83,0x38,0x2e,0xc8,0x9a,0x7c,0xde,0x96,0xc6,0x79,0x9e,0x2f,0x88,0x80,0x5a},
+        },
+        {
+            {0x29,0xbd,0x25,0xd0,0xf8,0x08,0xd7,0xfc,0xd2,0xaa,0x6d,0x5e,0xd2,0x06,0x05,0x38,0x99,0x19,0x83,0x97,0x50,0x6c,0x30,0x1b,0x21,0x8a,0x9e,0x47,0xa3,0xd7,0x07,0x0a,0xf0,0x3e,0x90,0x3f,0xf7,0x18,0x97,0x8d,0x50,0xd1,0xb6,0xb9,0xaf,0x8c,0xc0,0xe3,0x13,0xd8,0x4e,0xda,0x5d,0x5b,0x1e,0x8e,0x85,0xe5,0x51,0x6d,0x63,0x0b,0xbe,0xb9},
+            {0x33,0x56,0x67,0xca,0x6c,0xae,0x7a,0x26,0x43,0x8f,0x5c,0xfd,0xd7,0x3b,0x3d,0x48,0xfa,0x83,0x2f,0xa9,0x76,0x85,0x21,0xd7,0xd5,0x44,0x5f,0x22,0xc2,0x03,0xab,0x0d,0x74,0xed,0x85,0x08,0x8f,0x27,0xd2,0x99,0x59,0xba,0x62,0x7a,0x45,0x09,0x99,0x66,0x76,0xf4,0x7d,0xf8,0xff,0x28,0x4d,0x29,0x25,0x67,0xb1,0xbe,0xef,0x0e,0x39,0x12},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Multiple outputs: multiple outputs, multiple recipients (12) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        3,
+        3,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                {0x02,0x06,0x2d,0x49,0xff,0xc0,0x27,0x87,0xd5,0x86,0xc6,0x08,0xdf,0xbe,0xc1,0x84,0xaa,0x91,0xa6,0x59,0x7d,0x97,0xb4,0x63,0xea,0x5c,0x6b,0xab,0xd9,0xd1,0x7a,0x95,0xa3},
+                {0x03,0x81,0xeb,0x9a,0x9a,0x9e,0xc7,0x39,0xd5,0x27,0xc1,0x63,0x1b,0x31,0xb4,0x21,0x56,0x6f,0x5c,0x2a,0x47,0xb4,0xab,0x5b,0x1f,0x6a,0x68,0x6d,0xfb,0x68,0xea,0xb7,0x16},
+                1,
+            },
+            {
+                {0x02,0x06,0x2d,0x49,0xff,0xc0,0x27,0x87,0xd5,0x86,0xc6,0x08,0xdf,0xbe,0xc1,0x84,0xaa,0x91,0xa6,0x59,0x7d,0x97,0xb4,0x63,0xea,0x5c,0x6b,0xab,0xd9,0xd1,0x7a,0x95,0xa3},
+                {0x03,0x81,0xeb,0x9a,0x9a,0x9e,0xc7,0x39,0xd5,0x27,0xc1,0x63,0x1b,0x31,0xb4,0x21,0x56,0x6f,0x5c,0x2a,0x47,0xb4,0xab,0x5b,0x1f,0x6a,0x68,0x6d,0xfb,0x68,0xea,0xb7,0x16},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        3,
+        { /* recipient outputs */
+        {
+                {0x2e,0x84,0x7b,0xb0,0x1d,0x1b,0x49,0x1d,0xa5,0x12,0xdd,0xd7,0x60,0xb8,0x50,0x96,0x17,0xee,0x38,0x05,0x70,0x03,0xd6,0x11,0x5d,0x00,0xba,0x56,0x24,0x51,0x32,0x3a},
+                {0x84,0x17,0x92,0xc3,0x3c,0x9d,0xc6,0x19,0x3e,0x76,0x74,0x41,0x34,0x12,0x5d,0x40,0xad,0xd8,0xf2,0xf4,0xa9,0x64,0x75,0xf2,0x8b,0xa1,0x50,0xbe,0x03,0x2d,0x64,0xe8},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x06,0x0b,0x75,0x1d,0x78,0x92,0x14,0x90,0x06,0xed,0x7b,0x98,0x60,0x69,0x55,0xa2,0x9f,0xe2,0x84,0xa1,0xe9,0x00,0x07,0x0c,0x09,0x71,0xf5,0xfb,0x93,0xdb,0xf4,0x22},
+        {0x99,0x02,0xc3,0xc5,0x6e,0x84,0x00,0x2a,0x7c,0xd4,0x10,0x11,0x3a,0x9a,0xb2,0x1d,0x14,0x2b,0xe7,0xf5,0x3c,0xf5,0x20,0x07,0x20,0xbb,0x01,0x31,0x4c,0x5e,0xb9,0x20},
+        3,
+        { /* outputs to scan */
+            {0x2e,0x84,0x7b,0xb0,0x1d,0x1b,0x49,0x1d,0xa5,0x12,0xdd,0xd7,0x60,0xb8,0x50,0x96,0x17,0xee,0x38,0x05,0x70,0x03,0xd6,0x11,0x5d,0x00,0xba,0x56,0x24,0x51,0x32,0x3a},
+            {0x84,0x17,0x92,0xc3,0x3c,0x9d,0xc6,0x19,0x3e,0x76,0x74,0x41,0x34,0x12,0x5d,0x40,0xad,0xd8,0xf2,0xf4,0xa9,0x64,0x75,0xf2,0x8b,0xa1,0x50,0xbe,0x03,0x2d,0x64,0xe8},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        2,
+        {
+            {0x2e,0x84,0x7b,0xb0,0x1d,0x1b,0x49,0x1d,0xa5,0x12,0xdd,0xd7,0x60,0xb8,0x50,0x96,0x17,0xee,0x38,0x05,0x70,0x03,0xd6,0x11,0x5d,0x00,0xba,0x56,0x24,0x51,0x32,0x3a},
+            {0x84,0x17,0x92,0xc3,0x3c,0x9d,0xc6,0x19,0x3e,0x76,0x74,0x41,0x34,0x12,0x5d,0x40,0xad,0xd8,0xf2,0xf4,0xa9,0x64,0x75,0xf2,0x8b,0xa1,0x50,0xbe,0x03,0x2d,0x64,0xe8},
+        },
+        {
+            {0x72,0xcd,0x08,0x2c,0xcc,0xb6,0x33,0xbf,0x85,0x24,0x0a,0x83,0x49,0x4b,0x32,0xdc,0x94,0x3a,0x4d,0x05,0x64,0x7a,0x66,0x86,0xd2,0x3a,0xd4,0xca,0x59,0xc0,0xeb,0xe4},
+            {0x2f,0x17,0xea,0x87,0x3a,0x00,0x47,0xfc,0x01,0xba,0x80,0x10,0xfe,0xf0,0x96,0x9e,0x76,0xd0,0xe4,0x28,0x3f,0x60,0x0d,0x48,0xf7,0x35,0x09,0x8b,0x1f,0xee,0x6e,0xb9},
+        },
+        {
+            {0x38,0x74,0x5f,0x3d,0x9f,0x5e,0xef,0x0b,0x1c,0xfb,0x17,0xca,0x31,0x4e,0xfa,0x8c,0x52,0x1e,0xfa,0xb2,0x8a,0x23,0xaa,0x20,0xec,0x5e,0x3a,0xbb,0x56,0x1d,0x42,0x80,0x4d,0x53,0x99,0x06,0xdc,0xe6,0x0c,0x4e,0xe7,0x97,0x79,0x66,0x18,0x4e,0x6f,0x2c,0xab,0x1f,0xaa,0x0e,0x53,0x77,0xce,0xb7,0x14,0x8e,0xc5,0x21,0x8b,0x4e,0x78,0x78},
+            {0xc2,0x6f,0x4e,0x3c,0xf3,0x71,0xb9,0x0b,0x84,0x0f,0x48,0xea,0x0e,0x76,0x1b,0x5e,0xc3,0x18,0x83,0xed,0x55,0x71,0x9f,0x9e,0xf0,0x6a,0x90,0xe2,0x82,0xd8,0x5f,0x56,0x57,0x90,0xab,0x78,0x0a,0x3f,0x49,0x1b,0xc2,0x66,0x8c,0xc6,0x4e,0x94,0x4d,0xca,0x84,0x9d,0x10,0x22,0xa8,0x78,0xcd,0xad,0xb8,0xd1,0x68,0xb8,0xda,0x4a,0x6d,0xa3},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Receiving with labels: label with even parity (13) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x59,0x35,0x2a,0xdd,0x83,0x7b,0x66,0x86,0xe8,0xd2,0x2b,0x87,0x01,0x78,0x14,0xa4,0x6b,0x3a,0xd3,0x08,0x70,0x21,0x67,0xc6,0x5b,0xd5,0xc8,0x59,0x9c,0xd2,0x8d,0x1c},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0xd0,0x14,0xd4,0x86,0x0f,0x67,0xd6,0x07,0xd6,0x0b,0x1a,0xf7,0x0e,0x0e,0xe2,0x36,0xb9,0x96,0x58,0xb6,0x1b,0xb7,0x69,0x83,0x2a,0xcb,0xbe,0x87,0xc3,0x74,0x43,0x9a},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0xd0,0x14,0xd4,0x86,0x0f,0x67,0xd6,0x07,0xd6,0x0b,0x1a,0xf7,0x0e,0x0e,0xe2,0x36,0xb9,0x96,0x58,0xb6,0x1b,0xb7,0x69,0x83,0x2a,0xcb,0xbe,0x87,0xc3,0x74,0x43,0x9a},
+        },
+        /* labels */
+        3, {2, 3, 1001337, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0xd0,0x14,0xd4,0x86,0x0f,0x67,0xd6,0x07,0xd6,0x0b,0x1a,0xf7,0x0e,0x0e,0xe2,0x36,0xb9,0x96,0x58,0xb6,0x1b,0xb7,0x69,0x83,0x2a,0xcb,0xbe,0x87,0xc3,0x74,0x43,0x9a},
+        },
+        {
+            {0x51,0xd4,0xe9,0xd0,0xd4,0x82,0xb5,0x70,0x01,0x09,0xb4,0xb2,0xe1,0x6f,0xf5,0x08,0x26,0x9b,0x03,0xd8,0x00,0x19,0x2a,0x04,0x3d,0x61,0xdc,0xa4,0xa0,0xa7,0x2a,0x52},
+        },
+        {
+            {0xc3,0x0f,0xa6,0x3b,0xad,0x6f,0x0a,0x31,0x7f,0x39,0xa7,0x73,0xa5,0xcb,0xf0,0xb0,0xf8,0x19,0x3c,0x71,0xdf,0xeb,0xba,0x05,0xee,0x6a,0xe4,0xed,0x28,0xe3,0x77,0x5e,0x6e,0x04,0xc3,0xea,0x70,0xa8,0x37,0x03,0xbb,0x88,0x81,0x22,0x85,0x5d,0xc8,0x94,0xca,0xb6,0x16,0x92,0xe7,0xfd,0x10,0xc9,0xb3,0x49,0x4d,0x47,0x9a,0x60,0x78,0x5e},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Receiving with labels: label with odd parity (14) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x08,0xa1,0x44,0xa1,0x84,0x33,0xa8,0x3f,0x63,0x3c,0x82,0x2c,0x1b,0xf5,0xee,0x4c,0x8c,0x8e,0x24,0x60,0x1d,0x6c,0xa7,0x5e,0x20,0xa7,0xdc,0x57,0xa0,0xff,0x92,0x80},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x67,0x62,0x6a,0xeb,0xb3,0xc4,0x30,0x7c,0xf0,0xf6,0xc3,0x9c,0xa2,0x32,0x47,0x59,0x8f,0xab,0xf6,0x75,0xab,0x78,0x32,0x92,0xeb,0x2f,0x81,0xae,0x75,0xad,0x1f,0x8c},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x67,0x62,0x6a,0xeb,0xb3,0xc4,0x30,0x7c,0xf0,0xf6,0xc3,0x9c,0xa2,0x32,0x47,0x59,0x8f,0xab,0xf6,0x75,0xab,0x78,0x32,0x92,0xeb,0x2f,0x81,0xae,0x75,0xad,0x1f,0x8c},
+        },
+        /* labels */
+        3, {2, 3, 1001337, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x67,0x62,0x6a,0xeb,0xb3,0xc4,0x30,0x7c,0xf0,0xf6,0xc3,0x9c,0xa2,0x32,0x47,0x59,0x8f,0xab,0xf6,0x75,0xab,0x78,0x32,0x92,0xeb,0x2f,0x81,0xae,0x75,0xad,0x1f,0x8c},
+        },
+        {
+            {0x60,0x24,0xae,0x21,0x48,0x76,0x35,0x6b,0x8d,0x91,0x77,0x16,0xe7,0x70,0x7d,0x26,0x7a,0xe1,0x6a,0x0f,0xdb,0x07,0xde,0x2a,0x78,0x6b,0x74,0xa7,0xbb,0xcd,0xde,0xad},
+        },
+        {
+            {0xa8,0x6d,0x55,0x4d,0x0d,0x6b,0x7a,0xa0,0x90,0x71,0x55,0xf7,0xe0,0xb4,0x7f,0x01,0x82,0x75,0x24,0x72,0xff,0xfa,0xed,0xdd,0x68,0xda,0x90,0xe9,0x9b,0x94,0x02,0xf1,0x66,0xfd,0x9b,0x33,0x03,0x9c,0x30,0x2c,0x71,0x15,0x09,0x8d,0x97,0x1c,0x13,0x99,0xe6,0x7c,0x19,0xe9,0xe4,0xde,0x18,0x0b,0x10,0xea,0x0b,0x9d,0x6f,0x0d,0xb8,0x32},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Receiving with labels: large label integer (15) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x03,0xd8,0x50,0x92,0xbb,0xe3,0x46,0x8f,0x68,0x4c,0xe1,0xd8,0xa2,0xa6,0x6e,0xbe,0xc9,0x6a,0x9e,0x6e,0x09,0xe7,0x11,0x07,0x20,0xa5,0xd5,0xfa,0xa4,0xaa,0x78,0x80,0xd0},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x7e,0xfa,0x60,0xce,0x78,0xac,0x34,0x3d,0xf8,0xa0,0x13,0xa2,0x02,0x7c,0x6c,0x5e,0xf2,0x9f,0x95,0x02,0xed,0xcb,0xd7,0x69,0xd2,0xc2,0x17,0x17,0xfe,0xcc,0x59,0x51},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x7e,0xfa,0x60,0xce,0x78,0xac,0x34,0x3d,0xf8,0xa0,0x13,0xa2,0x02,0x7c,0x6c,0x5e,0xf2,0x9f,0x95,0x02,0xed,0xcb,0xd7,0x69,0xd2,0xc2,0x17,0x17,0xfe,0xcc,0x59,0x51},
+        },
+        /* labels */
+        3, {2, 3, 1001337, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x7e,0xfa,0x60,0xce,0x78,0xac,0x34,0x3d,0xf8,0xa0,0x13,0xa2,0x02,0x7c,0x6c,0x5e,0xf2,0x9f,0x95,0x02,0xed,0xcb,0xd7,0x69,0xd2,0xc2,0x17,0x17,0xfe,0xcc,0x59,0x51},
+        },
+        {
+            {0xe3,0x36,0xb9,0x23,0x30,0xc3,0x30,0x30,0x28,0x5c,0xe4,0x2e,0x41,0x15,0xad,0x92,0xd5,0x19,0x79,0x13,0xc8,0x8e,0x06,0xb9,0x07,0x2b,0x4a,0x9b,0x47,0xc6,0x64,0xa2},
+        },
+        {
+            {0xc9,0xe8,0x0d,0xd3,0xbd,0xd2,0x5c,0xa2,0xd3,0x52,0xce,0x77,0x51,0x0f,0x1a,0xed,0x37,0xba,0x35,0x09,0xdc,0x8c,0xc0,0x67,0x7f,0x2d,0x7c,0x2d,0xd0,0x40,0x90,0x70,0x79,0x50,0xce,0x9d,0xd6,0xc8,0x3d,0x2a,0x42,0x80,0x63,0x06,0x3a,0xff,0x5c,0x04,0xf1,0x74,0x4e,0x33,0x4f,0x66,0x1f,0x2f,0xc0,0x1b,0x4e,0xf8,0x0b,0x50,0xf7,0x39},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Multiple outputs with labels: un-labeled and labeled address; same recipient (16) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        2,
+        2,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x03,0xa6,0x73,0x94,0x99,0xdc,0x66,0x7d,0x30,0x8b,0xae,0xfe,0xa4,0xde,0x0c,0x4a,0x85,0xcc,0x72,0xae,0xce,0x18,0x1b,0xc0,0x57,0x12,0xd3,0x91,0x96,0x62,0x61,0x0f,0xf1},
+                1,
+            },
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        2,
+        2,
+        { /* recipient outputs */
+        {
+                {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+            },
+        {
+                {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+                {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        2,
+        { /* outputs to scan */
+            {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        /* labels */
+        1, {1, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        2,
+        {
+            {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        {
+            {0x43,0x10,0x0f,0x89,0xf1,0xa6,0xbf,0x10,0x08,0x1c,0x92,0xb4,0x73,0xff,0xc5,0x7c,0xea,0xc7,0xdb,0xed,0x60,0x0b,0x6a,0xba,0x9b,0xb3,0x97,0x6f,0x17,0xdb,0xb9,0x14},
+            {0x33,0xce,0x08,0x5c,0x3c,0x11,0xea,0xad,0x13,0x69,0x4a,0xae,0x3c,0x20,0x30,0x1a,0x6c,0x83,0x38,0x2e,0xc8,0x9a,0x7c,0xde,0x96,0xc6,0x79,0x9e,0x2f,0x88,0x80,0x5a},
+        },
+        {
+            {0x15,0xc9,0x25,0x09,0xb6,0x7a,0x6c,0x21,0x1e,0xbb,0x4a,0x51,0xb7,0x52,0x8d,0x06,0x66,0xe6,0x72,0x0d,0xe2,0x34,0x3b,0x2e,0x92,0xcf,0xb9,0x79,0x42,0xca,0x14,0x69,0x3c,0x1f,0x1f,0xdc,0x84,0x51,0xac,0xfd,0xb2,0x64,0x40,0x39,0xf8,0xf5,0xc7,0x61,0x14,0x80,0x7f,0xdc,0x3d,0x3a,0x00,0x2d,0x8a,0x46,0xaf,0xab,0x67,0x56,0xbd,0x75},
+            {0x33,0x56,0x67,0xca,0x6c,0xae,0x7a,0x26,0x43,0x8f,0x5c,0xfd,0xd7,0x3b,0x3d,0x48,0xfa,0x83,0x2f,0xa9,0x76,0x85,0x21,0xd7,0xd5,0x44,0x5f,0x22,0xc2,0x03,0xab,0x0d,0x74,0xed,0x85,0x08,0x8f,0x27,0xd2,0x99,0x59,0xba,0x62,0x7a,0x45,0x09,0x99,0x66,0x76,0xf4,0x7d,0xf8,0xff,0x28,0x4d,0x29,0x25,0x67,0xb1,0xbe,0xef,0x0e,0x39,0x12},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Multiple outputs with labels: multiple outputs for labeled address; same recipient (17) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        2,
+        2,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x03,0xa6,0x73,0x94,0x99,0xdc,0x66,0x7d,0x30,0x8b,0xae,0xfe,0xa4,0xde,0x0c,0x4a,0x85,0xcc,0x72,0xae,0xce,0x18,0x1b,0xc0,0x57,0x12,0xd3,0x91,0x96,0x62,0x61,0x0f,0xf1},
+                1,
+            },
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x03,0xa6,0x73,0x94,0x99,0xdc,0x66,0x7d,0x30,0x8b,0xae,0xfe,0xa4,0xde,0x0c,0x4a,0x85,0xcc,0x72,0xae,0xce,0x18,0x1b,0xc0,0x57,0x12,0xd3,0x91,0x96,0x62,0x61,0x0f,0xf1},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        2,
+        { /* recipient outputs */
+        {
+                {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+                {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        2,
+        { /* outputs to scan */
+            {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+            {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+        },
+        /* labels */
+        1, {1, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        2,
+        {
+            {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+            {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+        },
+        {
+            {0x43,0x10,0x0f,0x89,0xf1,0xa6,0xbf,0x10,0x08,0x1c,0x92,0xb4,0x73,0xff,0xc5,0x7c,0xea,0xc7,0xdb,0xed,0x60,0x0b,0x6a,0xba,0x9b,0xb3,0x97,0x6f,0x17,0xdb,0xb9,0x14},
+            {0x9d,0x5f,0xd3,0xb9,0x1c,0xac,0x9d,0xdf,0xea,0x6f,0xc2,0xe6,0xf9,0x38,0x6f,0x68,0x0e,0x6c,0xee,0x62,0x3c,0xda,0x02,0xf5,0x37,0x06,0x30,0x6c,0x08,0x1d,0xe8,0x7f},
+        },
+        {
+            {0x15,0xc9,0x25,0x09,0xb6,0x7a,0x6c,0x21,0x1e,0xbb,0x4a,0x51,0xb7,0x52,0x8d,0x06,0x66,0xe6,0x72,0x0d,0xe2,0x34,0x3b,0x2e,0x92,0xcf,0xb9,0x79,0x42,0xca,0x14,0x69,0x3c,0x1f,0x1f,0xdc,0x84,0x51,0xac,0xfd,0xb2,0x64,0x40,0x39,0xf8,0xf5,0xc7,0x61,0x14,0x80,0x7f,0xdc,0x3d,0x3a,0x00,0x2d,0x8a,0x46,0xaf,0xab,0x67,0x56,0xbd,0x75},
+            {0xdb,0x0d,0xfa,0xcc,0x98,0xb6,0xa6,0xfc,0xc6,0x7c,0xc4,0x63,0x1f,0x08,0x0b,0x1c,0xa3,0x8c,0x60,0xd8,0xc3,0x97,0xf2,0xf1,0x98,0x43,0xf8,0xf9,0x5e,0xc9,0x15,0x94,0xb2,0x4e,0x47,0xc5,0xbd,0x39,0x48,0x0a,0x86,0x1c,0x12,0x09,0xf7,0xe3,0x14,0x5c,0x44,0x03,0x71,0xf9,0x19,0x1f,0xb9,0x6e,0x32,0x46,0x90,0x10,0x1e,0xac,0x8e,0x8e},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Multiple outputs with labels: un-labeled, labeled, and multiple outputs for labeled address; same recipients (18) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        4,
+        4,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x03,0xa6,0x73,0x94,0x99,0xdc,0x66,0x7d,0x30,0x8b,0xae,0xfe,0xa4,0xde,0x0c,0x4a,0x85,0xcc,0x72,0xae,0xce,0x18,0x1b,0xc0,0x57,0x12,0xd3,0x91,0x96,0x62,0x61,0x0f,0xf1},
+                1,
+            },
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x44,0xba,0xa5,0xcf,0x5d,0xb4,0x44,0xa9,0xe9,0x22,0x83,0x2f,0xf2,0xc8,0x87,0x16,0xb5,0x66,0xa8,0x5d,0x62,0xe8,0x23,0x5a,0xeb,0xd9,0x18,0x84,0xd4,0xf6,0x49,0x42},
+                1,
+            },
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x44,0xba,0xa5,0xcf,0x5d,0xb4,0x44,0xa9,0xe9,0x22,0x83,0x2f,0xf2,0xc8,0x87,0x16,0xb5,0x66,0xa8,0x5d,0x62,0xe8,0x23,0x5a,0xeb,0xd9,0x18,0x84,0xd4,0xf6,0x49,0x42},
+                1,
+            },
+        },
+        12,
+        4,
+        { /* recipient outputs */
+        {
+                {0x00,0x6a,0x02,0xc3,0x08,0xcc,0xdb,0xf3,0xac,0x49,0xf0,0x63,0x8f,0x6d,0xe1,0x28,0xf8,0x75,0xdb,0x5a,0x21,0x30,0x95,0xcf,0x11,0x2b,0x3b,0x77,0x72,0x24,0x72,0xae},
+                {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+                {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+                {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+            },
+        {
+                {0x00,0x6a,0x02,0xc3,0x08,0xcc,0xdb,0xf3,0xac,0x49,0xf0,0x63,0x8f,0x6d,0xe1,0x28,0xf8,0x75,0xdb,0x5a,0x21,0x30,0x95,0xcf,0x11,0x2b,0x3b,0x77,0x72,0x24,0x72,0xae},
+                {0x3e,0xdf,0x1f,0xf6,0x65,0x7c,0x6e,0x69,0x56,0x88,0x11,0xbd,0x72,0x6a,0x7a,0x7f,0x48,0x04,0x93,0xaa,0x42,0x16,0x1a,0xcf,0xe8,0xdd,0x4f,0x44,0x52,0x1f,0x99,0xed},
+                {0x7e,0xe1,0x54,0x3e,0xd5,0xd1,0x23,0xff,0xa6,0x6f,0xbe,0xbc,0x12,0x8c,0x02,0x01,0x73,0xeb,0x49,0x0d,0x5f,0xa2,0xba,0x30,0x6e,0x0c,0x95,0x73,0xa7,0x7d,0xb8,0xf3},
+                {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+            },
+        {
+                {0x00,0x6a,0x02,0xc3,0x08,0xcc,0xdb,0xf3,0xac,0x49,0xf0,0x63,0x8f,0x6d,0xe1,0x28,0xf8,0x75,0xdb,0x5a,0x21,0x30,0x95,0xcf,0x11,0x2b,0x3b,0x77,0x72,0x24,0x72,0xae},
+                {0x7e,0xe1,0x54,0x3e,0xd5,0xd1,0x23,0xff,0xa6,0x6f,0xbe,0xbc,0x12,0x8c,0x02,0x01,0x73,0xeb,0x49,0x0d,0x5f,0xa2,0xba,0x30,0x6e,0x0c,0x95,0x73,0xa7,0x7d,0xb8,0xf3},
+                {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+                {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+            },
+        {
+                {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+                {0x3c,0x54,0x44,0x49,0x44,0xd1,0x76,0x43,0x76,0x44,0x37,0x8c,0x23,0xef,0xb9,0x99,0xab,0x6a,0xb1,0xca,0xcd,0xfe,0x1d,0xc1,0x53,0x7b,0x60,0x7e,0x3d,0xf3,0x30,0xe2},
+                {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+                {0xf4,0x56,0x9f,0xc5,0xf6,0x9c,0x10,0xf0,0x08,0x2c,0xfb,0xb8,0xe0,0x72,0xe6,0x26,0x6e,0xc5,0x5f,0x69,0xfb,0xa8,0xcf,0xfc,0xa4,0xcb,0xb4,0xc1,0x44,0xb7,0xe5,0x9b},
+            },
+        {
+                {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+                {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+                {0xf4,0x56,0x9f,0xc5,0xf6,0x9c,0x10,0xf0,0x08,0x2c,0xfb,0xb8,0xe0,0x72,0xe6,0x26,0x6e,0xc5,0x5f,0x69,0xfb,0xa8,0xcf,0xfc,0xa4,0xcb,0xb4,0xc1,0x44,0xb7,0xe5,0x9b},
+            },
+        {
+                {0x3c,0x54,0x44,0x49,0x44,0xd1,0x76,0x43,0x76,0x44,0x37,0x8c,0x23,0xef,0xb9,0x99,0xab,0x6a,0xb1,0xca,0xcd,0xfe,0x1d,0xc1,0x53,0x7b,0x60,0x7e,0x3d,0xf3,0x30,0xe2},
+                {0x60,0x2e,0x10,0xe6,0x94,0x41,0x07,0xc9,0xb4,0x8b,0xd8,0x85,0xb4,0x93,0x67,0x65,0x78,0xc9,0x35,0x72,0x32,0x87,0xe0,0xab,0x2f,0x8b,0x7f,0x13,0x68,0x62,0x56,0x8e},
+                {0x7e,0xe1,0x54,0x3e,0xd5,0xd1,0x23,0xff,0xa6,0x6f,0xbe,0xbc,0x12,0x8c,0x02,0x01,0x73,0xeb,0x49,0x0d,0x5f,0xa2,0xba,0x30,0x6e,0x0c,0x95,0x73,0xa7,0x7d,0xb8,0xf3},
+                {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+            },
+        {
+                {0x3c,0x54,0x44,0x49,0x44,0xd1,0x76,0x43,0x76,0x44,0x37,0x8c,0x23,0xef,0xb9,0x99,0xab,0x6a,0xb1,0xca,0xcd,0xfe,0x1d,0xc1,0x53,0x7b,0x60,0x7e,0x3d,0xf3,0x30,0xe2},
+                {0x7e,0xe1,0x54,0x3e,0xd5,0xd1,0x23,0xff,0xa6,0x6f,0xbe,0xbc,0x12,0x8c,0x02,0x01,0x73,0xeb,0x49,0x0d,0x5f,0xa2,0xba,0x30,0x6e,0x0c,0x95,0x73,0xa7,0x7d,0xb8,0xf3},
+                {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+                {0xf4,0x56,0x9f,0xc5,0xf6,0x9c,0x10,0xf0,0x08,0x2c,0xfb,0xb8,0xe0,0x72,0xe6,0x26,0x6e,0xc5,0x5f,0x69,0xfb,0xa8,0xcf,0xfc,0xa4,0xcb,0xb4,0xc1,0x44,0xb7,0xe5,0x9b},
+            },
+        {
+                {0x3e,0xdf,0x1f,0xf6,0x65,0x7c,0x6e,0x69,0x56,0x88,0x11,0xbd,0x72,0x6a,0x7a,0x7f,0x48,0x04,0x93,0xaa,0x42,0x16,0x1a,0xcf,0xe8,0xdd,0x4f,0x44,0x52,0x1f,0x99,0xed},
+                {0x7e,0xe1,0x54,0x3e,0xd5,0xd1,0x23,0xff,0xa6,0x6f,0xbe,0xbc,0x12,0x8c,0x02,0x01,0x73,0xeb,0x49,0x0d,0x5f,0xa2,0xba,0x30,0x6e,0x0c,0x95,0x73,0xa7,0x7d,0xb8,0xf3},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+                {0xf4,0x56,0x9f,0xc5,0xf6,0x9c,0x10,0xf0,0x08,0x2c,0xfb,0xb8,0xe0,0x72,0xe6,0x26,0x6e,0xc5,0x5f,0x69,0xfb,0xa8,0xcf,0xfc,0xa4,0xcb,0xb4,0xc1,0x44,0xb7,0xe5,0x9b},
+            },
+        {
+                {0x3e,0xdf,0x1f,0xf6,0x65,0x7c,0x6e,0x69,0x56,0x88,0x11,0xbd,0x72,0x6a,0x7a,0x7f,0x48,0x04,0x93,0xaa,0x42,0x16,0x1a,0xcf,0xe8,0xdd,0x4f,0x44,0x52,0x1f,0x99,0xed},
+                {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+                {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+                {0xf4,0x56,0x9f,0xc5,0xf6,0x9c,0x10,0xf0,0x08,0x2c,0xfb,0xb8,0xe0,0x72,0xe6,0x26,0x6e,0xc5,0x5f,0x69,0xfb,0xa8,0xcf,0xfc,0xa4,0xcb,0xb4,0xc1,0x44,0xb7,0xe5,0x9b},
+            },
+        {
+                {0x60,0x2e,0x10,0xe6,0x94,0x41,0x07,0xc9,0xb4,0x8b,0xd8,0x85,0xb4,0x93,0x67,0x65,0x78,0xc9,0x35,0x72,0x32,0x87,0xe0,0xab,0x2f,0x8b,0x7f,0x13,0x68,0x62,0x56,0x8e},
+                {0x7e,0xe1,0x54,0x3e,0xd5,0xd1,0x23,0xff,0xa6,0x6f,0xbe,0xbc,0x12,0x8c,0x02,0x01,0x73,0xeb,0x49,0x0d,0x5f,0xa2,0xba,0x30,0x6e,0x0c,0x95,0x73,0xa7,0x7d,0xb8,0xf3},
+                {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+            },
+        {
+                {0x60,0x2e,0x10,0xe6,0x94,0x41,0x07,0xc9,0xb4,0x8b,0xd8,0x85,0xb4,0x93,0x67,0x65,0x78,0xc9,0x35,0x72,0x32,0x87,0xe0,0xab,0x2f,0x8b,0x7f,0x13,0x68,0x62,0x56,0x8e},
+                {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+                {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+                {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+            },
+        {
+                {0x83,0xdc,0x94,0x4e,0x61,0x60,0x31,0x37,0x29,0x48,0x29,0xae,0xd5,0x6c,0x74,0xc9,0xb0,0x87,0xd8,0x0f,0x2c,0x02,0x1b,0x98,0xa7,0xfa,0xe5,0x79,0x90,0x00,0x69,0x6c},
+                {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+                {0xe9,0x76,0xa5,0x8f,0xbd,0x38,0xae,0xb4,0xe6,0x09,0x3d,0x4d,0xf0,0x2e,0x9c,0x1d,0xe0,0xc4,0x51,0x3a,0xe0,0xc5,0x88,0xce,0xf6,0x8c,0xda,0x5b,0x2f,0x88,0x34,0xca},
+                {0xf4,0x56,0x9f,0xc5,0xf6,0x9c,0x10,0xf0,0x08,0x2c,0xfb,0xb8,0xe0,0x72,0xe6,0x26,0x6e,0xc5,0x5f,0x69,0xfb,0xa8,0xcf,0xfc,0xa4,0xcb,0xb4,0xc1,0x44,0xb7,0xe5,0x9b},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        4,
+        { /* outputs to scan */
+            {0x00,0x6a,0x02,0xc3,0x08,0xcc,0xdb,0xf3,0xac,0x49,0xf0,0x63,0x8f,0x6d,0xe1,0x28,0xf8,0x75,0xdb,0x5a,0x21,0x30,0x95,0xcf,0x11,0x2b,0x3b,0x77,0x72,0x24,0x72,0xae},
+            {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+            {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+            {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+        },
+        /* labels */
+        2, {1, 1337, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        4,
+        {
+            {0x00,0x6a,0x02,0xc3,0x08,0xcc,0xdb,0xf3,0xac,0x49,0xf0,0x63,0x8f,0x6d,0xe1,0x28,0xf8,0x75,0xdb,0x5a,0x21,0x30,0x95,0xcf,0x11,0x2b,0x3b,0x77,0x72,0x24,0x72,0xae},
+            {0x39,0xf4,0x26,0x24,0xd5,0xc3,0x2a,0x77,0xfd,0xa8,0x0f,0xf0,0xac,0xee,0x26,0x9a,0xfe,0xc6,0x01,0xd3,0x79,0x18,0x03,0xe8,0x02,0x52,0xae,0x04,0xe4,0xff,0xcf,0x4c},
+            {0xae,0x1a,0x78,0x0c,0x04,0x23,0x7b,0xd5,0x77,0x28,0x3c,0x3d,0xdb,0x2e,0x49,0x97,0x67,0xc3,0x21,0x41,0x60,0xd5,0xa6,0xb0,0x76,0x7e,0x6b,0x8c,0x27,0x8b,0xd7,0x01},
+            {0xca,0x64,0xab,0xe1,0xe0,0xf7,0x37,0x82,0x3f,0xb9,0xa9,0x4f,0x59,0x7e,0xed,0x41,0x8f,0xb2,0xdf,0x77,0xb1,0x31,0x7e,0x26,0xb8,0x81,0xa1,0x4b,0xb5,0x94,0xfa,0xaa},
+        },
+        {
+            {0x4e,0x33,0x52,0xfb,0xe0,0x50,0x5c,0x25,0xe7,0x18,0xd9,0x60,0x07,0xc2,0x59,0xef,0x08,0xdb,0x34,0xf8,0xc8,0x44,0xe4,0xff,0x74,0x2d,0x98,0x55,0xff,0x03,0x80,0x5a},
+            {0x43,0x10,0x0f,0x89,0xf1,0xa6,0xbf,0x10,0x08,0x1c,0x92,0xb4,0x73,0xff,0xc5,0x7c,0xea,0xc7,0xdb,0xed,0x60,0x0b,0x6a,0xba,0x9b,0xb3,0x97,0x6f,0x17,0xdb,0xb9,0x14},
+            {0xbf,0x70,0x9f,0x98,0xd4,0x41,0x8f,0x8a,0x67,0xe7,0x38,0x15,0x4a,0xe4,0x88,0x18,0xda,0xd4,0x46,0x89,0xcd,0x37,0xfb,0xc0,0x70,0x89,0x1a,0x39,0x6d,0xd1,0xc6,0x33},
+            {0x73,0x6f,0x05,0xe4,0xe3,0x07,0x2c,0x3b,0x86,0x56,0xbe,0xde,0xf2,0xe9,0xbf,0x54,0xcb,0xca,0xa2,0xb6,0xfe,0x53,0x20,0xd3,0xe8,0x6f,0x5b,0x96,0x87,0x4d,0xda,0x71},
+        },
+        {
+            {0x6e,0xea,0xe1,0xea,0x9e,0xb8,0x26,0xe3,0xd0,0xe8,0x12,0xf6,0x59,0x37,0x10,0x0e,0x08,0x36,0xea,0x18,0x8c,0x04,0xf3,0x6f,0xab,0xc4,0x98,0x1e,0xda,0x29,0xde,0x8d,0x3d,0x35,0x29,0x39,0x0a,0x0a,0x8b,0x3d,0x83,0x0f,0x7b,0xca,0x4f,0x5e,0xae,0x59,0x94,0xb9,0x78,0x8d,0xda,0xf0,0x5a,0xd2,0x59,0xff,0xe2,0x6d,0x86,0x14,0x4b,0x4b},
+            {0x15,0xc9,0x25,0x09,0xb6,0x7a,0x6c,0x21,0x1e,0xbb,0x4a,0x51,0xb7,0x52,0x8d,0x06,0x66,0xe6,0x72,0x0d,0xe2,0x34,0x3b,0x2e,0x92,0xcf,0xb9,0x79,0x42,0xca,0x14,0x69,0x3c,0x1f,0x1f,0xdc,0x84,0x51,0xac,0xfd,0xb2,0x64,0x40,0x39,0xf8,0xf5,0xc7,0x61,0x14,0x80,0x7f,0xdc,0x3d,0x3a,0x00,0x2d,0x8a,0x46,0xaf,0xab,0x67,0x56,0xbd,0x75},
+            {0x42,0xa1,0x9f,0xd8,0xa6,0x3d,0xde,0x18,0x24,0x96,0x6a,0x95,0xd6,0x5a,0x28,0x20,0x3e,0x63,0x1e,0x49,0xbf,0x96,0xca,0x5d,0xae,0x1b,0x39,0x0e,0x7a,0x0a,0xce,0x2c,0xc8,0x70,0x9c,0x9b,0x0c,0x57,0x15,0x04,0x70,0x32,0xf5,0x7f,0x53,0x6a,0x3c,0x80,0x27,0x3c,0xbe,0xcf,0x4c,0x05,0xbe,0x0b,0x54,0x56,0xc1,0x83,0xfa,0x12,0x2c,0x06},
+            {0x2e,0x61,0xbb,0x3d,0x79,0x41,0x8e,0xcf,0x55,0xf6,0x88,0x47,0xcf,0x12,0x1b,0xfc,0x12,0xd3,0x97,0xb3,0x9d,0x1d,0xa8,0x64,0x32,0x46,0xb2,0xf0,0xa9,0xb9,0x6c,0x3d,0xaa,0x4b,0xfe,0x96,0x51,0xbe,0xb5,0xc9,0xce,0x20,0xe1,0xf2,0x92,0x82,0xc4,0x56,0x64,0x00,0xa4,0xb4,0x5e,0xe6,0x65,0x7e,0xc3,0xb1,0x8f,0xdc,0x55,0x4d,0xa0,0xb4},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Single recipient: use silent payments for sender change (19) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        2,
+        2,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                {0x03,0xb4,0xcc,0x0b,0x09,0x0b,0x6f,0x49,0xa6,0x84,0x55,0x88,0x52,0xdb,0x60,0xee,0x5e,0xb1,0xc5,0xf7,0x43,0x52,0x83,0x9c,0x3d,0x18,0xa8,0xfc,0x04,0xef,0x73,0x54,0xe0},
+                {0x03,0xec,0xd4,0x3b,0x9f,0xda,0xd4,0x84,0xff,0x57,0x27,0x8b,0x21,0x87,0x8b,0x84,0x42,0x76,0xce,0x39,0x06,0x22,0xd0,0x3d,0xd0,0xcf,0xb4,0x28,0x8b,0x7e,0x02,0xa6,0xf5},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        2,
+        { /* recipient outputs */
+        {
+                {0xbe,0x36,0x8e,0x28,0x97,0x9d,0x95,0x02,0x45,0xd7,0x42,0x89,0x1a,0xe6,0x06,0x40,0x20,0xba,0x54,0x8c,0x1e,0x2e,0x65,0xa6,0x39,0xa8,0xbb,0x06,0x75,0xd9,0x5c,0xff},
+                {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+            },
+        },
+        2, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x11,0xb7,0xa8,0x2e,0x06,0xca,0x26,0x48,0xd5,0xfd,0xed,0x23,0x66,0x47,0x80,0x78,0xec,0x4f,0xc9,0xdc,0x1d,0x8f,0xf4,0x87,0x51,0x82,0x26,0xf2,0x29,0xd7,0x68,0xfd},
+        {0xb8,0xf8,0x73,0x88,0xcb,0xb4,0x19,0x34,0xc5,0x0d,0xac,0xa0,0x18,0x90,0x1b,0x00,0x07,0x0a,0x5f,0xf6,0xcc,0x25,0xa7,0xe9,0xe7,0x16,0xa9,0xd5,0xb9,0xe4,0xd6,0x64},
+        2,
+        { /* outputs to scan */
+            {0xbe,0x36,0x8e,0x28,0x97,0x9d,0x95,0x02,0x45,0xd7,0x42,0x89,0x1a,0xe6,0x06,0x40,0x20,0xba,0x54,0x8c,0x1e,0x2e,0x65,0xa6,0x39,0xa8,0xbb,0x06,0x75,0xd9,0x5c,0xff},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        /* labels */
+        1, {0, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0xbe,0x36,0x8e,0x28,0x97,0x9d,0x95,0x02,0x45,0xd7,0x42,0x89,0x1a,0xe6,0x06,0x40,0x20,0xba,0x54,0x8c,0x1e,0x2e,0x65,0xa6,0x39,0xa8,0xbb,0x06,0x75,0xd9,0x5c,0xff},
+        },
+        {
+            {0x80,0xcd,0x76,0x7e,0xd2,0x0b,0xd0,0xbb,0x7d,0x8e,0xa5,0xe8,0x03,0xf8,0xc3,0x81,0x29,0x3a,0x62,0xe8,0xa0,0x73,0xcf,0x46,0xfb,0x00,0x81,0xda,0x46,0xe6,0x4e,0x1f},
+        },
+        {
+            {0x7f,0xbd,0x50,0x74,0xcf,0x13,0x77,0x27,0x31,0x55,0xee,0xfa,0xfc,0x7c,0x33,0x0c,0xb6,0x1b,0x31,0xda,0x25,0x2f,0x22,0x20,0x6a,0xc2,0x75,0x30,0xd2,0xb2,0x56,0x70,0x40,0xd9,0xaf,0x78,0x08,0x34,0x2e,0xd4,0xa0,0x95,0x98,0xc2,0x6d,0x83,0x07,0x44,0x6e,0x4e,0xd7,0x70,0x79,0xe6,0xa2,0xe6,0x1f,0xea,0x73,0x6e,0x44,0xda,0x5f,0x5a},
+        },
+        },
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        2,
+        { /* outputs to scan */
+            {0xbe,0x36,0x8e,0x28,0x97,0x9d,0x95,0x02,0x45,0xd7,0x42,0x89,0x1a,0xe6,0x06,0x40,0x20,0xba,0x54,0x8c,0x1e,0x2e,0x65,0xa6,0x39,0xa8,0xbb,0x06,0x75,0xd9,0x5c,0xff},
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0xf2,0x07,0x16,0x2b,0x1a,0x7a,0xbc,0x51,0xc4,0x20,0x17,0xbe,0xf0,0x55,0xe9,0xec,0x1e,0xfc,0x3d,0x35,0x67,0xcb,0x72,0x03,0x57,0xe2,0xb8,0x43,0x25,0xdb,0x33,0xac},
+        },
+        {
+            {0x33,0xce,0x08,0x5c,0x3c,0x11,0xea,0xad,0x13,0x69,0x4a,0xae,0x3c,0x20,0x30,0x1a,0x6c,0x83,0x38,0x2e,0xc8,0x9a,0x7c,0xde,0x96,0xc6,0x79,0x9e,0x2f,0x88,0x80,0x5a},
+        },
+        {
+            {0x33,0x56,0x67,0xca,0x6c,0xae,0x7a,0x26,0x43,0x8f,0x5c,0xfd,0xd7,0x3b,0x3d,0x48,0xfa,0x83,0x2f,0xa9,0x76,0x85,0x21,0xd7,0xd5,0x44,0x5f,0x22,0xc2,0x03,0xab,0x0d,0x74,0xed,0x85,0x08,0x8f,0x27,0xd2,0x99,0x59,0xba,0x62,0x7a,0x45,0x09,0x99,0x66,0x76,0xf4,0x7d,0xf8,0xff,0x28,0x4d,0x29,0x25,0x67,0xb1,0xbe,0xef,0x0e,0x39,0x12},
+        },
+        },
+        },
+    },
+
+    /* ----- Single recipient: taproot input with NUMS point (20) ----- */
+    {
+        0,
+        { /* input plain seckeys */
+            "",
+        },
+        { /* input plain pubkeys */
+            "",
+        },
+        1,
+        { /* input taproot seckeys */
+            {0xfc,0x87,0x16,0xa9,0x7a,0x48,0xba,0x9a,0x05,0xa9,0x8a,0xe4,0x7b,0x5c,0xd2,0x01,0xa2,0x5a,0x7f,0xd5,0xd8,0xb7,0x3c,0x20,0x3c,0x5f,0x7b,0x6b,0x6b,0x3b,0x6a,0xd7},
+        },
+        { /* input x-only pubkeys */
+            {0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x79,0xe7,0x98,0x97,0xc5,0x29,0x35,0xbf,0xd9,0x7f,0xc6,0xe0,0x76,0xa6,0x43,0x1a,0x0c,0x75,0x43,0xca,0x8c,0x31,0xe0,0xfc,0x3c,0xf7,0x19,0xbb,0x57,0x2c,0x84,0x2d},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x79,0xe7,0x98,0x97,0xc5,0x29,0x35,0xbf,0xd9,0x7f,0xc6,0xe0,0x76,0xa6,0x43,0x1a,0x0c,0x75,0x43,0xca,0x8c,0x31,0xe0,0xfc,0x3c,0xf7,0x19,0xbb,0x57,0x2c,0x84,0x2d},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x79,0xe7,0x98,0x97,0xc5,0x29,0x35,0xbf,0xd9,0x7f,0xc6,0xe0,0x76,0xa6,0x43,0x1a,0x0c,0x75,0x43,0xca,0x8c,0x31,0xe0,0xfc,0x3c,0xf7,0x19,0xbb,0x57,0x2c,0x84,0x2d},
+        },
+        {
+            {0x3d,0xde,0xc3,0x23,0x26,0x09,0xd3,0x48,0xd6,0xb8,0xb5,0x31,0x23,0xb4,0xf4,0x0f,0x6d,0x4f,0x53,0x98,0xca,0x58,0x6f,0x08,0x7b,0x04,0x16,0xec,0x3b,0x85,0x14,0x96},
+        },
+        {
+            {0xd7,0xd0,0x6e,0x3a,0xfb,0x68,0x36,0x30,0x31,0xe4,0xeb,0x18,0x03,0x5c,0x46,0xce,0xae,0x41,0xbd,0xbe,0xbe,0x78,0x88,0xa4,0x75,0x4b,0xc9,0x84,0x8c,0x59,0x64,0x36,0x86,0x9a,0xea,0xec,0xff,0x05,0x27,0x64,0x9a,0x1f,0x45,0x8b,0x71,0xc9,0xce,0xec,0xec,0x10,0xb5,0x35,0xc0,0x9d,0x01,0xd7,0x20,0x22,0x9a,0xa2,0x28,0x54,0x77,0x06},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Pubkey extraction from malleated p2pkh (21) ----- */
+    {
+        3,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+            {0x72,0xb8,0xae,0x09,0x17,0x5c,0xa7,0x97,0x7f,0x04,0x99,0x3e,0x65,0x1d,0x88,0x68,0x1e,0xd9,0x32,0xdf,0xb9,0x2c,0x51,0x58,0xcd,0xf0,0x16,0x1d,0xd2,0x3f,0xda,0x6e},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+            {0x02,0xe0,0xec,0x4f,0x64,0xb3,0xfa,0x2e,0x46,0x3c,0xcf,0xcf,0x4e,0x85,0x6e,0x37,0xd5,0xe1,0xe2,0x02,0x75,0xbc,0x89,0xec,0x1d,0xef,0x9e,0xb0,0x98,0xef,0xf1,0xf8,0x5d},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x46,0x12,0xcd,0xbf,0x84,0x5c,0x66,0xc7,0x51,0x1d,0x70,0xaa,0xb4,0xd9,0xae,0xd1,0x1e,0x49,0xe4,0x8c,0xdb,0x8d,0x79,0x9d,0x78,0x71,0x01,0xcd,0xd0,0xd5,0x3e,0x4f},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x46,0x12,0xcd,0xbf,0x84,0x5c,0x66,0xc7,0x51,0x1d,0x70,0xaa,0xb4,0xd9,0xae,0xd1,0x1e,0x49,0xe4,0x8c,0xdb,0x8d,0x79,0x9d,0x78,0x71,0x01,0xcd,0xd0,0xd5,0x3e,0x4f},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x46,0x12,0xcd,0xbf,0x84,0x5c,0x66,0xc7,0x51,0x1d,0x70,0xaa,0xb4,0xd9,0xae,0xd1,0x1e,0x49,0xe4,0x8c,0xdb,0x8d,0x79,0x9d,0x78,0x71,0x01,0xcd,0xd0,0xd5,0x3e,0x4f},
+        },
+        {
+            {0x10,0xbd,0xe9,0x78,0x1d,0xef,0x20,0xd7,0x70,0x1e,0x76,0x03,0xef,0x1b,0x1e,0x5e,0x71,0xc6,0x7b,0xae,0x71,0x54,0x81,0x88,0x14,0xe3,0xc8,0x1e,0xf5,0xb1,0xa3,0xd3},
+        },
+        {
+            {0x61,0x37,0x96,0x9f,0x81,0x0e,0x9e,0x8e,0xf6,0xc9,0x75,0x50,0x10,0xe8,0x08,0xf5,0xdd,0x1a,0xed,0x70,0x58,0x82,0xe4,0x4d,0x7f,0x0a,0xe6,0x4e,0xb0,0xc5,0x09,0xec,0x8b,0x62,0xa0,0x67,0x1b,0xee,0x0d,0x59,0x14,0xac,0x27,0xd2,0xc4,0x63,0x44,0x3e,0x28,0xe9,0x99,0xd8,0x2d,0xc3,0xd3,0xa4,0x91,0x9f,0x09,0x38,0x72,0xd9,0x47,0xbb},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- P2PKH and P2WPKH Uncompressed Keys are skipped (22) ----- */
+    {
+        1,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x67,0xfe,0xe2,0x77,0xda,0x9e,0x85,0x42,0xb5,0xd2,0xe6,0xf3,0x2d,0x66,0x0a,0x9b,0xbd,0x3f,0x0e,0x10,0x7c,0x2d,0x53,0x63,0x8a,0xb1,0xd8,0x69,0x08,0x88,0x82,0xd6},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x67,0xfe,0xe2,0x77,0xda,0x9e,0x85,0x42,0xb5,0xd2,0xe6,0xf3,0x2d,0x66,0x0a,0x9b,0xbd,0x3f,0x0e,0x10,0x7c,0x2d,0x53,0x63,0x8a,0xb1,0xd8,0x69,0x08,0x88,0x82,0xd6},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x67,0xfe,0xe2,0x77,0xda,0x9e,0x85,0x42,0xb5,0xd2,0xe6,0xf3,0x2d,0x66,0x0a,0x9b,0xbd,0x3f,0x0e,0x10,0x7c,0x2d,0x53,0x63,0x8a,0xb1,0xd8,0x69,0x08,0x88,0x82,0xd6},
+        },
+        {
+            {0x68,0x8f,0xa3,0xae,0xb9,0x7d,0x2a,0x46,0xae,0x87,0xb0,0x35,0x91,0x92,0x1c,0x2e,0xaf,0x4b,0x50,0x5e,0xb0,0xdd,0xca,0x27,0x33,0xc9,0x47,0x01,0xe0,0x10,0x60,0xcf},
+        },
+        {
+            {0x72,0xe7,0xad,0x57,0x3a,0xc2,0x32,0x55,0xd4,0x65,0x1d,0x5b,0x03,0x26,0xa2,0x00,0x49,0x65,0x88,0xac,0xb7,0xa4,0x89,0x4b,0x22,0x09,0x22,0x36,0xd5,0xed,0xa6,0xa0,0xa9,0xa4,0xd8,0x42,0x9b,0x02,0x2c,0x22,0x19,0x08,0x1f,0xef,0xce,0x5b,0x33,0x79,0x5c,0xae,0x48,0x8d,0x10,0xf5,0xea,0x94,0x38,0x84,0x9e,0xd8,0x35,0x36,0x24,0xf2},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Skip invalid P2SH inputs (23) ----- */
+    {
+        1,
+        { /* input plain seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x67,0xfe,0xe2,0x77,0xda,0x9e,0x85,0x42,0xb5,0xd2,0xe6,0xf3,0x2d,0x66,0x0a,0x9b,0xbd,0x3f,0x0e,0x10,0x7c,0x2d,0x53,0x63,0x8a,0xb1,0xd8,0x69,0x08,0x88,0x82,0xd6},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x67,0xfe,0xe2,0x77,0xda,0x9e,0x85,0x42,0xb5,0xd2,0xe6,0xf3,0x2d,0x66,0x0a,0x9b,0xbd,0x3f,0x0e,0x10,0x7c,0x2d,0x53,0x63,0x8a,0xb1,0xd8,0x69,0x08,0x88,0x82,0xd6},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x67,0xfe,0xe2,0x77,0xda,0x9e,0x85,0x42,0xb5,0xd2,0xe6,0xf3,0x2d,0x66,0x0a,0x9b,0xbd,0x3f,0x0e,0x10,0x7c,0x2d,0x53,0x63,0x8a,0xb1,0xd8,0x69,0x08,0x88,0x82,0xd6},
+        },
+        {
+            {0x68,0x8f,0xa3,0xae,0xb9,0x7d,0x2a,0x46,0xae,0x87,0xb0,0x35,0x91,0x92,0x1c,0x2e,0xaf,0x4b,0x50,0x5e,0xb0,0xdd,0xca,0x27,0x33,0xc9,0x47,0x01,0xe0,0x10,0x60,0xcf},
+        },
+        {
+            {0x72,0xe7,0xad,0x57,0x3a,0xc2,0x32,0x55,0xd4,0x65,0x1d,0x5b,0x03,0x26,0xa2,0x00,0x49,0x65,0x88,0xac,0xb7,0xa4,0x89,0x4b,0x22,0x09,0x22,0x36,0xd5,0xed,0xa6,0xa0,0xa9,0xa4,0xd8,0x42,0x9b,0x02,0x2c,0x22,0x19,0x08,0x1f,0xef,0xce,0x5b,0x33,0x79,0x5c,0xae,0x48,0x8d,0x10,0xf5,0xea,0x94,0x38,0x84,0x9e,0xd8,0x35,0x36,0x24,0xf2},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Recipient ignores unrelated outputs (24) ----- */
+    {
+        1,
+        { /* input plain seckeys */
+            {0x03,0x78,0xe9,0x56,0x85,0xb7,0x45,0x65,0xfa,0x56,0x75,0x1b,0x84,0xa3,0x2d,0xfd,0x18,0x54,0x5d,0x10,0xd6,0x91,0x64,0x1b,0x83,0x72,0xe3,0x21,0x64,0xfa,0xd6,0x6a},
+        },
+        { /* input plain pubkeys */
+            {0x03,0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        1,
+        { /* input taproot seckeys */
+            {0xea,0xdc,0x78,0x16,0x5f,0xf1,0xf8,0xea,0x94,0xad,0x7c,0xfd,0xc5,0x49,0x90,0x73,0x8a,0x4c,0x53,0xf6,0xe0,0x50,0x7b,0x42,0x15,0x42,0x01,0xb8,0xe5,0xdf,0xf3,0xb1},
+        },
+        { /* input x-only pubkeys */
+            {0x5a,0x1e,0x61,0xf8,0x98,0x17,0x30,0x40,0xe2,0x06,0x16,0xd4,0x3e,0x9f,0x49,0x6f,0xba,0x90,0x33,0x8a,0x39,0xfa,0xa1,0xed,0x98,0xfc,0xba,0xee,0xe4,0xdd,0x9b,0xe5},
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x06,0x2d,0x49,0xff,0xc0,0x27,0x87,0xd5,0x86,0xc6,0x08,0xdf,0xbe,0xc1,0x84,0xaa,0x91,0xa6,0x59,0x7d,0x97,0xb4,0x63,0xea,0x5c,0x6b,0xab,0xd9,0xd1,0x7a,0x95,0xa3},
+                {0x03,0x81,0xeb,0x9a,0x9a,0x9e,0xc7,0x39,0xd5,0x27,0xc1,0x63,0x1b,0x31,0xb4,0x21,0x56,0x6f,0x5c,0x2a,0x47,0xb4,0xab,0x5b,0x1f,0x6a,0x68,0x6d,0xfb,0x68,0xea,0xb7,0x16},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x84,0x17,0x92,0xc3,0x3c,0x9d,0xc6,0x19,0x3e,0x76,0x74,0x41,0x34,0x12,0x5d,0x40,0xad,0xd8,0xf2,0xf4,0xa9,0x64,0x75,0xf2,0x8b,0xa1,0x50,0xbe,0x03,0x2d,0x64,0xe8},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        2,
+        { /* outputs to scan */
+            {0x84,0x17,0x92,0xc3,0x3c,0x9d,0xc6,0x19,0x3e,0x76,0x74,0x41,0x34,0x12,0x5d,0x40,0xad,0xd8,0xf2,0xf4,0xa9,0x64,0x75,0xf2,0x8b,0xa1,0x50,0xbe,0x03,0x2d,0x64,0xe8},
+            {0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        0,
+        {
+            "",
+        },
+        {
+            "",
+        },
+        {
+            "",
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- No valid inputs, sender generates no outputs (25) ----- */
+    {
+        0,
+        { /* input plain seckeys */
+            "",
+        },
+        { /* input plain pubkeys */
+            "",
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x16,0x9e,0x1e,0x83,0xe9,0x30,0x85,0x33,0x91,0xbc,0x6f,0x35,0xf6,0x05,0xc6,0x75,0x4c,0xfe,0xad,0x57,0xcf,0x83,0x87,0x63,0x9d,0x3b,0x40,0x96,0xc5,0x4f,0x18,0xf4,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        0,
+        { /* recipient outputs */
+        {
+                "",
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        2,
+        { /* outputs to scan */
+            {0x78,0x2e,0xeb,0x91,0x34,0x31,0xca,0x6e,0x9b,0x8c,0x2f,0xd8,0x0a,0x5f,0x72,0xed,0x20,0x24,0xef,0x72,0xa3,0xc6,0xfb,0x10,0x26,0x3c,0x37,0x99,0x37,0x32,0x33,0x38},
+            {0xe0,0xec,0x4f,0x64,0xb3,0xfa,0x2e,0x46,0x3c,0xcf,0xcf,0x4e,0x85,0x6e,0x37,0xd5,0xe1,0xe2,0x02,0x75,0xbc,0x89,0xec,0x1d,0xef,0x9e,0xb0,0x98,0xef,0xf1,0xf8,0x5d},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        0,
+        {
+            "",
+        },
+        {
+            "",
+        },
+        {
+            "",
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Input keys sum up to zero / point at infinity: sending fails, receiver skips tx (26) ----- */
+    {
+        2,
+        { /* input plain seckeys */
+            {0xa6,0xdf,0x6a,0x0b,0xb4,0x48,0x99,0x2a,0x30,0x1d,0xf4,0x25,0x8e,0x06,0xa8,0x9f,0xe7,0xcf,0x71,0x46,0xf5,0x9a,0xc3,0xbd,0x5f,0xf2,0x60,0x83,0xac,0xb2,0x2c,0xeb},
+            {0x59,0x20,0x95,0xf4,0x4b,0xb7,0x66,0xd5,0xcf,0xe2,0x0b,0xda,0x71,0xf9,0x57,0x5e,0xd2,0xdf,0x6b,0x9f,0xb9,0xad,0xdc,0x7e,0x5f,0xdf,0xfe,0x09,0x23,0x84,0x14,0x56},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x55,0x7e,0xf3,0xe5,0x5b,0x0a,0x52,0x48,0x9b,0x44,0x54,0xc1,0x16,0x9e,0x06,0xbd,0xea,0x43,0x68,0x7a,0x69,0xc1,0xf1,0x90,0xeb,0x50,0x78,0x16,0x44,0xab,0x69,0x75},
+            {0x03,0x55,0x7e,0xf3,0xe5,0x5b,0x0a,0x52,0x48,0x9b,0x44,0x54,0xc1,0x16,0x9e,0x06,0xbd,0xea,0x43,0x68,0x7a,0x69,0xc1,0xf1,0x90,0xeb,0x50,0x78,0x16,0x44,0xab,0x69,0x75},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x4e,0x17,0x94,0x8a,0xbc,0xde,0x5c,0x24,0x71,0xc0,0x45,0x0f,0xc4,0x18,0x54,0x56,0x6e,0x3c,0x67,0xf2,0x06,0xf4,0xaf,0x80,0xae,0x16,0x5e,0xb2,0x47,0x61,0x28,0x3a,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0xc6,0x04,0x7f,0x94,0x41,0xed,0x7d,0x6d,0x30,0x45,0x40,0x6e,0x95,0xc0,0x7c,0xd8,0x5c,0x77,0x8e,0x4b,0x8c,0xef,0x3c,0xa7,0xab,0xac,0x09,0xb9,0x5c,0x70,0x9e,0xe5},
+                {0x02,0x79,0xbe,0x66,0x7e,0xf9,0xdc,0xbb,0xac,0x55,0xa0,0x62,0x95,0xce,0x87,0x0b,0x07,0x02,0x9b,0xfc,0xdb,0x2d,0xce,0x28,0xd9,0x59,0xf2,0x81,0x5b,0x16,0xf8,0x17,0x98},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        0,
+        { /* recipient outputs */
+        {
+                "",
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
+        1,
+        { /* outputs to scan */
+            {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        0,
+        {
+            "",
+        },
+        {
+            "",
+        },
+        {
+            "",
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Input keys intermediate sum is zero but final sum is non-zero (27) ----- */
+    {
+        3,
+        { /* input plain seckeys */
+            {0xa6,0xdf,0x6a,0x0b,0xb4,0x48,0x99,0x2a,0x30,0x1d,0xf4,0x25,0x8e,0x06,0xa8,0x9f,0xe7,0xcf,0x71,0x46,0xf5,0x9a,0xc3,0xbd,0x5f,0xf2,0x60,0x83,0xac,0xb2,0x2c,0xeb},
+            {0x59,0x20,0x95,0xf4,0x4b,0xb7,0x66,0xd5,0xcf,0xe2,0x0b,0xda,0x71,0xf9,0x57,0x5e,0xd2,0xdf,0x6b,0x9f,0xb9,0xad,0xdc,0x7e,0x5f,0xdf,0xfe,0x09,0x23,0x84,0x14,0x56},
+            {0xa6,0xdf,0x6a,0x0b,0xb4,0x48,0x99,0x2a,0x30,0x1d,0xf4,0x25,0x8e,0x06,0xa8,0x9f,0xe7,0xcf,0x71,0x46,0xf5,0x9a,0xc3,0xbd,0x5f,0xf2,0x60,0x83,0xac,0xb2,0x2c,0xeb},
+        },
+        { /* input plain pubkeys */
+            {0x02,0x55,0x7e,0xf3,0xe5,0x5b,0x0a,0x52,0x48,0x9b,0x44,0x54,0xc1,0x16,0x9e,0x06,0xbd,0xea,0x43,0x68,0x7a,0x69,0xc1,0xf1,0x90,0xeb,0x50,0x78,0x16,0x44,0xab,0x69,0x75},
+            {0x03,0x55,0x7e,0xf3,0xe5,0x5b,0x0a,0x52,0x48,0x9b,0x44,0x54,0xc1,0x16,0x9e,0x06,0xbd,0xea,0x43,0x68,0x7a,0x69,0xc1,0xf1,0x90,0xeb,0x50,0x78,0x16,0x44,0xab,0x69,0x75},
+            {0x02,0x55,0x7e,0xf3,0xe5,0x5b,0x0a,0x52,0x48,0x9b,0x44,0x54,0xc1,0x16,0x9e,0x06,0xbd,0xea,0x43,0x68,0x7a,0x69,0xc1,0xf1,0x90,0xeb,0x50,0x78,0x16,0x44,0xab,0x69,0x75},
+        },
+        0,
+        { /* input taproot seckeys */
+            "",
+        },
+        { /* input x-only pubkeys */
+            "",
+        },
+        /* smallest outpoint */
+        {0x4e,0x17,0x94,0x8a,0xbc,0xde,0x5c,0x24,0x71,0xc0,0x45,0x0f,0xc4,0x18,0x54,0x56,0x6e,0x3c,0x67,0xf2,0x06,0xf4,0xaf,0x80,0xae,0x16,0x5e,0xb2,0x47,0x61,0x28,0x3a,0x00,0x00,0x00,0x00},
+        1,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0x20,0xbc,0xfa,0xc5,0xb9,0x9e,0x04,0xad,0x1a,0x06,0xdd,0xfb,0x01,0x6e,0xe1,0x35,0x82,0x60,0x9d,0x60,0xb6,0x29,0x1e,0x98,0xd0,0x1a,0x9b,0xc9,0xa1,0x6c,0x96,0xd4},
+                {0x02,0x5c,0xc9,0x85,0x6d,0x6f,0x83,0x75,0x35,0x0e,0x12,0x39,0x78,0xda,0xac,0x20,0x0c,0x26,0x0c,0xb5,0xb5,0xae,0x83,0x10,0x6c,0xab,0x90,0x48,0x4d,0xcd,0x8f,0xcf,0x36},
+                1,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        1,
+        { /* recipient outputs */
+        {
+                {0x7e,0x88,0xa7,0x53,0x6c,0x90,0x77,0x0b,0xe4,0xd2,0x69,0x3a,0x84,0xed,0x03,0xab,0xe3,0xfd,0xcc,0x5a,0x29,0xf9,0x6e,0xc3,0x43,0x3e,0xff,0xec,0x3b,0x0c,0x21,0x94},
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x0f,0x69,0x4e,0x06,0x80,0x28,0xa7,0x17,0xf8,0xaf,0x6b,0x94,0x11,0xf9,0xa1,0x33,0xdd,0x35,0x65,0x25,0x87,0x14,0xcc,0x22,0x65,0x94,0xb3,0x4d,0xb9,0x0c,0x1f,0x2c},
+        {0x9d,0x6a,0xd8,0x55,0xce,0x34,0x17,0xef,0x84,0xe8,0x36,0x89,0x2e,0x5a,0x56,0x39,0x2b,0xfb,0xa0,0x5f,0xa5,0xd9,0x7c,0xce,0xa3,0x0e,0x26,0x6f,0x54,0x0e,0x08,0xb3},
+        1,
+        { /* outputs to scan */
+            {0x7e,0x88,0xa7,0x53,0x6c,0x90,0x77,0x0b,0xe4,0xd2,0x69,0x3a,0x84,0xed,0x03,0xab,0xe3,0xfd,0xcc,0x5a,0x29,0xf9,0x6e,0xc3,0x43,0x3e,0xff,0xec,0x3b,0x0c,0x21,0x94},
+        },
+        /* labels */
+        0, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, },
+        1, /* full check? */
+        /* expected output data (pubkeys and seckey tweaks) */
+        1,
+        {
+            {0x7e,0x88,0xa7,0x53,0x6c,0x90,0x77,0x0b,0xe4,0xd2,0x69,0x3a,0x84,0xed,0x03,0xab,0xe3,0xfd,0xcc,0x5a,0x29,0xf9,0x6e,0xc3,0x43,0x3e,0xff,0xec,0x3b,0x0c,0x21,0x94},
+        },
+        {
+            {0x3d,0x5b,0x7a,0x28,0x41,0x08,0xf9,0x3b,0x9f,0xe7,0x8f,0x2c,0x30,0x0d,0x2c,0xa9,0xef,0x3b,0x4e,0x0c,0xd0,0xde,0x67,0x3f,0xc7,0x29,0x90,0xf2,0xa4,0xf4,0x17,0xb9},
+        },
+        {
+            {0xf8,0xd5,0x22,0x2f,0x1a,0x68,0x22,0x15,0xc4,0x0a,0xb6,0x77,0xf2,0x10,0x46,0x06,0xf2,0xa0,0xe6,0xc5,0xcb,0x1a,0x2d,0x24,0x8d,0x97,0x0f,0xb6,0x1d,0x4e,0xad,0xb3,0x17,0x02,0x35,0x3e,0x6b,0x41,0xea,0x5a,0x9b,0x24,0x81,0x7e,0xfa,0x0e,0xaf,0x53,0x55,0x52,0xee,0xee,0x8a,0x79,0x4b,0x66,0x2c,0x3c,0xf3,0x03,0xb6,0xc8,0x66,0x72},
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+    /* ----- Maximum per-group recipient limit K_max is exceeded (2324 matches): sending fails, receiver doesn't scan beyond limit (28) ----- */
+    {
+        0,
+        { /* input plain seckeys */
+            "",
+        },
+        { /* input plain pubkeys */
+            "",
+        },
+        1,
+        { /* input taproot seckeys */
+            {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0x37},
+        },
+        { /* input x-only pubkeys */
+            {0xbc,0xa8,0x7f,0x72,0xe6,0x04,0xe8,0x85,0x00,0x64,0x55,0x2b,0xed,0xf3,0x80,0xca,0x45,0x84,0x22,0x70,0x57,0xef,0xe1,0x2a,0x6c,0xc2,0x38,0x47,0x06,0x58,0xaa,0xa3},
+        },
+        /* smallest outpoint */
+        {0x7f,0xb8,0x9d,0x1c,0xad,0x88,0xb5,0xa5,0x27,0x26,0xcf,0xfa,0xc7,0xf4,0x73,0x4f,0xb9,0xff,0xaf,0xef,0x18,0xfd,0x52,0x4e,0x4a,0xf2,0xad,0xd8,0x7a,0x0e,0xde,0x3c,0x00,0x00,0x00,0x00},
+        2324,
+        1,
+        { /* recipient pubkey entries (address data) */
+            {
+                {0x02,0xe6,0xc4,0x7a,0xe6,0x96,0x2c,0x5e,0xa1,0x55,0x9f,0x48,0xb4,0x37,0xc1,0x93,0xa1,0xbc,0xb1,0xd7,0x2d,0x08,0xd7,0x5d,0x74,0x3b,0xa3,0xcb,0xfb,0x8e,0x7a,0xfb,0xeb},
+                {0x03,0x76,0xaf,0x62,0x1d,0xaa,0xa2,0x79,0x32,0x17,0x6b,0xae,0x57,0x83,0x6e,0x53,0x5b,0x6b,0xee,0x0a,0x77,0x19,0x7f,0xe2,0x18,0xca,0x0b,0xb0,0x3b,0xd9,0x38,0x70,0x90},
+                2324,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+            {
+                "",
+                "",
+                0,
+            },
+        },
+        1,
+        0,
+        { /* recipient outputs */
+        {
+                "",
+            },
+        },
+        1, /* number of receive subtests */
+        {
+        {
+        /* recipient data (scan and spend seckeys) */
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xde,0xad},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xbe,0xef},
+        2324,
+        { /* outputs to scan */
+            {0x5c,0xfb,0x6f,0xd7,0xa7,0xe5,0xd2,0xaf,0x0f,0xee,0x27,0x6f,0x21,0x04,0xce,0x2e,0x5c,0x86,0xcd,0xe7,0x95,0x5b,0x98,0xf2,0xf1,0xfb,0x32,0x81,0x1b,0x44,0x8f,0x2f},
+            {0xda,0x29,0x0e,0x0d,0x79,0xea,0xd5,0xcd,0x2e,0x5d,0x15,0x0a,0xac,0x80,0xdc,0xab,0x54,0xdb,0xd0,0xe6,0x8f,0x24,0x1a,0x6c,0x34,0xdc,0x30,0x90,0x6e,0xab,0xd1,0x3d},
+            {0xd4,0xa2,0xb1,0x45,0x8f,0x0c,0x8b,0x20,0xd7,0x56,0xbd,0xe8,0xe5,0x45,0x56,0x0d,0x7e,0x7a,0x65,0xf6,0xb4,0x15,0x8f,0x01,0xed,0x34,0xa9,0x13,0xba,0x3a,0x46,0x03},
+            {0x24,0x75,0x2e,0x55,0x5b,0x0e,0xdc,0xca,0x12,0x3f,0x76,0x91,0x13,0x69,0x22,0x24,0xbf,0x1e,0x6d,0xb1,0x37,0xcd,0xde,0xb7,0xd6,0x9a,0xe5,0x2e,0x51,0x14,0x4e,0x9e},
+            {0xc9,0x11,0xf7,0x22,0xef,0x9a,0x35,0x94,0xd6,0xb8,0x5c,0x58,0x5d,0x4f,0x3e,0xd8,0xdc,0x43,0x7f,0x85,0x05,0x91,0xdc,0x62,0x7a,0x01,0x54,0x72,0x36,0x44,0x11,0x4b},
+            {0xef,0x91,0xdd,0xaa,0x83,0xa0,0xb7,0x48,0xd6,0x38,0xdc,0x9b,0xe8,0xc9,0x77,0x1b,0x04,0x9a,0x04,0x81,0x5f,0x03,0x96,0x7b,0x7e,0xe9,0x93,0xbd,0xe6,0xc2,0x60,0xab},
+            {0xee,0x4e,0xd3,0x34,0xfb,0x38,0xaf,0x95,0xf5,0x2c,0x6b,0xba,0xdc,0xf2,0xf4,0x91,0xe6,0x46,0xb9,0xcc,0x8e,0xd3,0x1d,0xa6,0x76,0x35,0xf3,0x6c,0x3c,0xfd,0xab,0xa0},
+            {0xa1,0x7d,0x61,0xb4,0x77,0x2e,0x45,0x3b,0x32,0x78,0x27,0x44,0x90,0x22,0x61,0xe0,0x51,0x51,0x0c,0xba,0xfc,0x04,0xf0,0x86,0xf5,0x34,0x80,0xd1,0xce,0xee,0x1a,0x9c},
+            {0x44,0xd8,0x9f,0x5e,0x90,0x37,0x39,0x07,0x2e,0x3a,0xff,0x8a,0x3e,0xb2,0xf3,0x51,0x52,0x0f,0x77,0xff,0x28,0x8a,0xc8,0xbe,0x27,0x7b,0xe3,0xf2,0x88,0x34,0xbd,0xd2},
+            {0x3e,0xff,0x02,0xa4,0xa0,0x4d,0x66,0xd6,0x3f,0x6b,0xc9,0x3a,0x69,0x3f,0x23,0xdb,0x70,0x3f,0x35,0x1c,0x0a,0x1f,0xf1,0x65,0x6b,0x90,0x7e,0xd3,0x48,0xa9,0xa3,0x5f},
+            {0x62,0x8c,0x23,0xa6,0xe2,0x1e,0x6a,0x47,0xb8,0x02,0x74,0xfc,0x80,0xe4,0xde,0xcb,0x98,0xff,0x79,0xb8,0x04,0x0c,0x7f,0x9e,0xa5,0x97,0x2e,0x49,0x20,0xb6,0x2b,0x6d},
+            {0xe7,0x21,0x90,0xc0,0xa5,0xea,0x16,0x7c,0x26,0x63,0xb1,0x8d,0x37,0x85,0x20,0xb9,0x22,0x8d,0xa6,0x1e,0xbb,0xc9,0x9c,0x3f,0xa2,0xaf,0x39,0xe0,0x1f,0xb9,0x50,0x1e},
+            {0x24,0x18,0x3e,0xdb,0xc5,0xb8,0x05,0x88,0xe0,0xe5,0xb8,0x03,0xe9,0x24,0xe7,0x7f,0xc1,0xca,0xb1,0xaf,0xca,0x54,0xcf,0xd2,0x85,0xda,0xd9,0xbf,0xc2,0xa3,0x4f,0x6d},
+            {0xc4,0x5b,0xad,0x25,0xa2,0x23,0xf0,0xf6,0x17,0xe8,0x16,0x7f,0x85,0x80,0x37,0x90,0x7e,0x44,0x54,0x21,0x0a,0x74,0x5f,0x3b,0x97,0x98,0xc8,0x91,0x36,0x46,0xdf,0xc6},
+            {0x9f,0x9c,0xec,0x85,0x01,0x1d,0x7f,0x71,0x8f,0x96,0xee,0x1a,0x29,0x40,0xdf,0x21,0x92,0x0a,0x85,0x7c,0xd1,0xa5,0x45,0x25,0x55,0x79,0xcb,0x61,0x5f,0x28,0x5a,0x42},
+            {0x8c,0x60,0x89,0x1f,0x9b,0xc2,0xf7,0x72,0xef,0xc5,0x1d,0x44,0xf7,0xcc,0x88,0x51,0x61,0x41,0x28,0x35,0xb6,0xfd,0x5a,0xac,0x3b,0x0c,0xf5,0x7c,0x3c,0x2f,0x91,0x54},
+            {0x85,0xac,0x46,0xa6,0xac,0x95,0x69,0xed,0x67,0xd1,0xbc,0x53,0x42,0xed,0x3b,0x59,0x1a,0xf5,0xe0,0x15,0x81,0xd1,0xb0,0x9b,0xcb,0x2c,0x71,0xde,0xb9,0xb2,0xc2,0xc9},
+            {0x8a,0x6b,0xfe,0x47,0xe6,0x16,0xc6,0x85,0x4f,0xc7,0x97,0xa4,0xaf,0x53,0xef,0x51,0xc9,0x42,0xb9,0x9e,0xae,0x18,0xf3,0x16,0x59,0x4f,0xc8,0xeb,0x88,0x69,0xca,0x05},
+            {0xed,0x5e,0x1a,0xa6,0xa8,0xb4,0xe8,0x05,0x27,0x33,0x67,0xb8,0xec,0x3a,0xde,0x16,0xed,0x64,0x94,0x27,0x0f,0xc2,0x16,0x9b,0xa9,0x20,0xb8,0x97,0x70,0xef,0xe8,0xeb},
+            {0x24,0x48,0x50,0x3c,0x55,0xa1,0xa7,0x03,0x5c,0x06,0x9e,0x1d,0x54,0x61,0xb8,0x17,0x74,0xc4,0x3b,0xf6,0x06,0x14,0x21,0xfd,0xd0,0x15,0x70,0x09,0xbf,0xe9,0x6a,0x8a},
+            {0xd0,0xdc,0xb3,0xd7,0xb5,0x51,0xea,0xc8,0xd3,0x1f,0xce,0xcc,0xb8,0x3d,0xf4,0x15,0xc5,0x54,0x86,0x0d,0x55,0x41,0xdd,0x08,0xff,0x5f,0xa0,0x02,0x8c,0xe5,0x70,0x4f},
+            {0xf1,0x1a,0x29,0x8b,0x54,0xb6,0x50,0x61,0x3e,0x0b,0x01,0x83,0x55,0x2c,0x9c,0x9e,0x42,0xc3,0x81,0x2e,0x03,0xcf,0x71,0x3d,0x35,0x1e,0xf7,0x11,0x06,0xb6,0xee,0x3f},
+            {0x49,0x74,0x92,0x06,0xf2,0x37,0x91,0xf8,0x58,0xc4,0x53,0xcb,0x60,0x16,0x0d,0x48,0x71,0x00,0x75,0xbd,0xbf,0xd3,0x39,0x07,0xb0,0x04,0x6d,0x10,0xf0,0xb0,0x29,0x5e},
+            {0x3f,0xbf,0xdb,0x52,0xcb,0xf0,0xea,0x9e,0x66,0x55,0xa2,0x11,0x74,0x8b,0xf2,0xac,0x2d,0xc9,0x2f,0xf3,0xcf,0xee,0xef,0x0f,0x0a,0x26,0xbe,0x99,0x87,0x01,0x6d,0xe0},
+            {0xd4,0xa2,0x91,0x44,0x51,0x19,0x81,0x91,0x9c,0xad,0xbe,0x82,0x27,0xfc,0x68,0x37,0x9e,0x85,0xd3,0xfe,0x39,0x9f,0x17,0x7c,0x2a,0xe3,0x6c,0x30,0x4b,0x6a,0xd6,0xb0},
+            {0xc5,0x86,0xcc,0x19,0x6f,0xf5,0x6f,0x42,0x39,0x6f,0x42,0x6a,0x02,0x00,0xaf,0xee,0x3a,0x6c,0x41,0x05,0x8d,0x81,0xf1,0x9c,0xaf,0x65,0x36,0xec,0x0e,0xfd,0x56,0x05},
+            {0xc6,0x66,0x99,0x4f,0x02,0x7c,0xea,0xb0,0x25,0x25,0x6a,0xf2,0x8d,0x8e,0xa6,0xae,0xc4,0x52,0xfb,0x8b,0x0e,0x1f,0x69,0xe7,0xe1,0x3a,0x4f,0x3c,0x51,0x19,0xf4,0xae},
+            {0x5c,0x92,0x16,0xcc,0x45,0x29,0xc3,0xf9,0xc6,0x2c,0xaf,0x70,0xb0,0x4f,0x83,0x54,0xce,0x9e,0xc2,0xca,0xba,0xef,0x74,0x50,0x92,0xbe,0xa1,0xb1,0x60,0x32,0x8f,0xda},
+            {0xd9,0xae,0xa5,0x43,0x23,0x50,0x3d,0x78,0xc0,0x26,0xa8,0xcd,0x46,0x5c,0x19,0xa6,0xdf,0x54,0xb3,0x2e,0xe8,0x66,0x71,0x4d,0x19,0x0e,0x82,0x60,0x05,0x43,0x61,0xda},
+            {0xba,0x71,0xf8,0x7c,0xa1,0xd7,0x4e,0xee,0x11,0x5d,0x8e,0x8a,0x26,0x29,0x3f,0xe2,0xc8,0x8d,0x9d,0x66,0xcf,0xf1,0x85,0xa7,0xa0,0x79,0x28,0x2f,0x02,0xf9,0x31,0xad},
+            {0xb8,0xb9,0x30,0x66,0x6b,0x2d,0xf7,0x4c,0x33,0xdc,0x89,0x63,0x22,0x10,0x80,0xc1,0x15,0x24,0x60,0x70,0xe3,0xfc,0xd5,0x1f,0x39,0xbe,0xe7,0x13,0x12,0xdb,0x4f,0xc4},
+            {0xb7,0xf4,0x2d,0x2f,0x18,0xa3,0xac,0x61,0xf5,0x70,0xb6,0x4a,0xe6,0x86,0x4f,0x7d,0xbf,0xf7,0x74,0xa3,0x70,0xba,0x27,0x35,0x8d,0x76,0x79,0x7e,0x84,0x1d,0x53,0x04},
+            {0xd6,0x36,0xd1,0x79,0x05,0x52,0x41,0xa0,0xf8,0xbb,0x7d,0xb1,0x93,0x91,0x2d,0xa5,0x13,0xa8,0x99,0x96,0x84,0xd9,0x82,0x9b,0x26,0x69,0x85,0xa8,0x08,0x38,0x19,0xa9},
+            {0xbe,0x96,0x22,0xae,0xc1,0x25,0xf9,0x60,0x5b,0xce,0xe1,0x93,0xa9,0x9c,0xa2,0x7c,0x16,0xbc,0x59,0x11,0x22,0xff,0x8b,0x44,0xc5,0x11,0xa8,0x5e,0x6f,0x63,0xec,0x9d},
+            {0xaf,0x5b,0xeb,0x25,0x77,0x6f,0x84,0xfa,0xdd,0x60,0x79,0xc3,0xff,0xd8,0x57,0x75,0xa3,0x5a,0xd7,0x40,0x96,0xa5,0x82,0x29,0xe1,0xd5,0x07,0x6d,0x83,0x6c,0xa2,0x5d},
+            {0x75,0xfb,0x55,0xec,0x31,0xe3,0x04,0x45,0x6f,0x66,0x3c,0x9a,0x66,0x32,0x1e,0x67,0xf9,0xd9,0xbd,0x8f,0x43,0x74,0x94,0x94,0xac,0xc5,0x18,0x9e,0xd5,0x7b,0x0d,0x4a},
+            {0x8d,0xfe,0xbf,0xf3,0x3c,0x51,0x44,0x86,0xd0,0x6e,0xeb,0x4a,0xb8,0xeb,0x84,0x71,0x49,0x65,0x56,0x85,0x8c,0x43,0x82,0xf7,0x37,0x80,0x62,0x01,0x01,0xa7,0x7f,0x71},
+            {0x93,0xbf,0xd4,0xe7,0x57,0x06,0x95,0x1d,0xe4,0xa5,0x9c,0x7f,0x70,0xc5,0xd2,0xce,0x4c,0x61,0x7b,0x4b,0xde,0x0b,0x0b,0x23,0xae,0x04,0x6d,0xf0,0x96,0x11,0x67,0x26},
+            {0xb6,0xee,0xca,0x22,0xf4,0x3b,0xd6,0x2a,0x4f,0xcb,0x3e,0xee,0x71,0x9e,0x07,0xd3,0x9e,0xa7,0x03,0xfa,0x07,0x07,0x97,0x0f,0xc1,0x97,0x91,0x6f,0x2e,0xfe,0xbb,0xb5},
+            {0x04,0x37,0xc3,0x97,0x1f,0x73,0x34,0x2e,0x5c,0x41,0x17,0x85,0x90,0xe1,0xcb,0x13,0x64,0xcb,0x85,0x5b,0x2d,0x20,0xb7,0xb6,0xc1,0xc1,0xed,0x0e,0x7d,0xa5,0xb5,0x7b},
+            {0xd2,0x84,0xc8,0x31,0xcd,0x9d,0x52,0x79,0x39,0x77,0x92,0x5c,0xe3,0x11,0x1b,0x68,0xf3,0x6d,0x1e,0xa4,0x56,0xe4,0x67,0x16,0x15,0x8f,0xe6,0x94,0x7f,0xb6,0xd6,0x35},
+            {0xd9,0x5b,0x8d,0x27,0x89,0xfd,0x06,0xcc,0x76,0x4d,0x47,0xcc,0x7e,0x06,0x97,0x40,0x42,0x20,0xae,0x8f,0x93,0x8e,0xf4,0x7d,0xcc,0x9a,0x1b,0xba,0x29,0x9f,0xbb,0x9f},
+            {0x33,0x59,0x9f,0xb1,0xfe,0x31,0x3b,0x5a,0x26,0x80,0xb1,0x26,0xbf,0xee,0x93,0xcb,0x09,0x7d,0x93,0x89,0x15,0xd4,0x25,0xa6,0x3e,0x30,0x7e,0x58,0x34,0x47,0x9b,0x95},
+            {0x05,0xba,0x86,0x90,0x3f,0xac,0x2f,0x02,0xef,0x2e,0x15,0x20,0x72,0xbc,0x60,0x67,0x00,0x8e,0xe8,0xee,0x34,0xce,0x55,0xad,0x46,0x08,0x01,0x30,0x33,0x73,0xea,0xab},
+            {0x0b,0x75,0x78,0x02,0xe5,0x67,0x28,0xb6,0xd5,0xb2,0x8e,0x67,0x1a,0x90,0xde,0x57,0x3d,0x72,0x51,0xa4,0x7f,0xc1,0xbc,0xd9,0x31,0x9b,0x61,0x7c,0xac,0x8e,0x14,0x63},
+            {0xb4,0xa2,0x45,0x1e,0x72,0x5e,0x4c,0xbc,0xdf,0x47,0xfc,0x73,0x61,0x39,0xcf,0xe2,0x9c,0x84,0x7e,0x2f,0x75,0xcb,0xb7,0x65,0x3d,0x80,0xc8,0x52,0x2b,0xd4,0x8a,0x6c},
+            {0x8d,0xd8,0x00,0xc3,0xa7,0xcb,0x1e,0xe6,0x0f,0x52,0xdb,0x3b,0xb6,0x94,0x13,0xc4,0xc4,0x24,0x7b,0x0b,0x13,0x45,0x76,0x55,0x2c,0x67,0x59,0x70,0xf9,0x90,0x3c,0x9b},
+            {0x4d,0xe2,0x11,0x29,0xc6,0xfd,0xf5,0x56,0x80,0x40,0x34,0x6b,0xbd,0xda,0x27,0x2c,0xaa,0xad,0xd5,0x82,0x18,0xec,0x6f,0x1f,0x15,0x25,0x18,0x06,0x8d,0xac,0x4d,0x4d},
+            {0x22,0xf6,0x92,0x7e,0xae,0x0c,0x37,0x17,0x39,0x5d,0xf6,0x48,0x3d,0x75,0x60,0x28,0x83,0x9f,0xbf,0x08,0x14,0xf8,0xcf,0x03,0x91,0x15,0x9e,0xfa,0x65,0xdd,0x28,0x54},
+            {0x19,0x2d,0x26,0xfe,0x0b,0xc7,0x72,0xc7,0x05,0xc2,0x65,0x7d,0xd5,0xc5,0x03,0x3a,0xc4,0x1b,0xa4,0x08,0x79,0x3e,0x6c,0x72,0x1f,0x74,0xc5,0x37,0x47,0xbe,0x16,0xe8},
+            {0x95,0x27,0xb8,0xe1,0x95,0x70,0xa1,0x6c,0xe2,0xd8,0xdd,0x36,0x20,0xdf,0xd9,0x15,0xe4,0x61,0xbc,0xcc,0x82,0x34,0x0f,0xe6,0x82,0xf7,0xf8,0x11,0xb9,0x78,0x81,0x4d},
+            {0xf8,0x40,0x39,0xff,0x95,0xcd,0x44,0xf8,0x42,0xd7,0xcf,0x69,0x82,0xa7,0x26,0x95,0x7a,0x89,0xd9,0x0b,0xb1,0x51,0xa3,0x68,0xe6,0x27,0x70,0x72,0x0d,0x3e,0xfb,0xee},
+            {0xb5,0xb3,0x6d,0xd8,0x4b,0x35,0x2c,0xdd,0xf7,0x15,0x24,0x6d,0x04,0x63,0x98,0x4b,0x9d,0x78,0x94,0xf5,0x0b,0x56,0x6a,0x20,0x04,0x2c,0x4d,0x48,0x5d,0xf4,0x19,0x46},
+            {0x59,0x2e,0x1b,0xd7,0x33,0xa1,0x09,0x5b,0x9e,0x5b,0x77,0x00,0x21,0x76,0x90,0x90,0xdf,0x0c,0x00,0x12,0x60,0x80,0x3f,0xce,0x9a,0x9b,0x76,0x1b,0xa6,0x97,0xa5,0xe7},
+            {0xdd,0x2f,0xdb,0xd6,0x93,0x2d,0x8b,0x56,0xd6,0xff,0x91,0xdb,0x3e,0xd2,0x8f,0x28,0x2a,0x6c,0xa0,0x15,0x88,0xee,0x5a,0x55,0x2d,0x06,0x1d,0xa2,0x15,0x58,0x04,0x11},
+            {0x82,0xf9,0x5e,0xf7,0x1d,0x4d,0x0b,0x32,0xe3,0xf0,0xce,0xf8,0x9e,0x6e,0x90,0xa8,0xc2,0x71,0xcd,0x55,0x36,0xb3,0x8c,0x50,0x7f,0xc6,0x9b,0x35,0x4a,0xb5,0x10,0x62},
+            {0x18,0x00,0x90,0x3b,0x2d,0x5f,0x84,0x83,0xa1,0x2f,0x0b,0x98,0xa5,0xb3,0x5e,0xd3,0x9d,0x6c,0xf8,0xf4,0xa5,0x2f,0x49,0x53,0x95,0xf1,0x81,0x6d,0x6e,0x3c,0x13,0x9c},
+            {0x12,0x1a,0x2c,0x2e,0xa7,0x0a,0x69,0x86,0xaf,0x8b,0xde,0x71,0xb7,0xf7,0x5a,0xc9,0xf9,0xe1,0x18,0x9e,0xeb,0x97,0x56,0x39,0x5e,0x72,0x81,0x70,0x2f,0x01,0x93,0x6d},
+            {0x85,0x78,0xdf,0x7e,0x8e,0xc4,0xb0,0x68,0xf6,0x4d,0xca,0x67,0x93,0x10,0x89,0x4a,0xfe,0xc0,0x95,0xdb,0xbe,0xdb,0xef,0xef,0x59,0x44,0xc3,0xa3,0x19,0x80,0x9b,0x8b},
+            {0x5c,0xeb,0xde,0x1d,0xbb,0x35,0x2f,0xf6,0x28,0x41,0xd7,0xc5,0x0c,0x3c,0x45,0xcd,0x0f,0xd1,0xb7,0xb3,0xeb,0xe8,0x84,0xa7,0xcf,0x29,0xce,0xf6,0x68,0x66,0x95,0xab},
+            {0x36,0x2f,0x7a,0x73,0xf2,0x62,0x0e,0xa0,0x61,0x58,0x6b,0x5e,0xdb,0xee,0x01,0xf9,0xc0,0x26,0xae,0x6e,0x0d,0x95,0x13,0x1c,0x57,0x0c,0x44,0x93,0x3f,0xc4,0x1f,0x10},
+            {0x3a,0x19,0xb5,0x97,0x62,0x36,0xd4,0x4a,0x3d,0x1d,0x69,0x20,0xb3,0x48,0xfc,0xef,0x9e,0xc8,0x30,0xaa,0xc5,0x6a,0xa6,0x72,0x35,0x3c,0x71,0x14,0x71,0xeb,0xc3,0x6a},
+            {0x84,0x2c,0x43,0xc5,0x29,0x3b,0x03,0x81,0x11,0x65,0xf1,0xff,0x7e,0x04,0xc1,0x89,0xcc,0xd3,0x55,0xfe,0x08,0xd3,0x78,0x08,0xa8,0x43,0xa0,0x99,0x55,0x41,0xc0,0x75},
+            {0x0a,0xb1,0xfd,0xbf,0x71,0x17,0xc8,0x8a,0xed,0x3f,0x88,0x2d,0x5f,0x7d,0xee,0x89,0x64,0xc9,0x24,0x60,0x30,0x08,0x6b,0x9e,0xe3,0xe2,0xeb,0xed,0x4e,0xb2,0xc7,0x31},
+            {0x7c,0xf8,0xca,0x44,0x63,0xd4,0xbd,0x50,0x0c,0xc1,0x26,0x23,0xac,0x9d,0x39,0x84,0xcc,0x48,0xe7,0xfb,0xb9,0x8b,0xeb,0xb4,0xa4,0x98,0xc2,0xfd,0x66,0xd5,0x4c,0xde},
+            {0x63,0x16,0x76,0xf3,0x36,0x9e,0xb4,0x79,0x68,0x62,0x56,0xce,0xf3,0x3c,0x4f,0xb0,0x61,0xc2,0x12,0xcc,0x21,0x5a,0xb4,0x42,0xd8,0xf7,0x83,0x7c,0x03,0x9d,0xda,0xcc},
+            {0x2f,0xff,0x6d,0xe5,0x38,0x6b,0x65,0xef,0xe6,0x06,0x2c,0xc2,0x24,0x2b,0x69,0x2a,0x1e,0x81,0x1a,0x08,0x36,0x12,0xab,0x79,0xfa,0x7f,0x75,0x17,0xf1,0x48,0x87,0x67},
+            {0x3c,0x7d,0x8b,0x7f,0x2a,0x56,0xe2,0x2a,0xde,0x18,0x6a,0x70,0xa3,0x03,0x9b,0x4d,0x4e,0x4e,0x3c,0x0b,0xe6,0xe6,0x61,0x77,0x0b,0x0a,0x7b,0x2e,0xf1,0x8b,0x17,0x8b},
+            {0xe0,0x30,0x88,0x21,0x88,0x28,0x1a,0x75,0x4c,0x00,0x70,0x6f,0x62,0x10,0x84,0xf9,0x68,0x69,0xbf,0x95,0xbb,0x5d,0x00,0x5c,0xcc,0x7b,0x26,0x49,0xfb,0xfc,0x74,0x7e},
+            {0x07,0x2c,0xb8,0x99,0xc3,0xeb,0x62,0x12,0x40,0x79,0x2a,0x39,0xbf,0x72,0x7b,0xf5,0x93,0x98,0x32,0x97,0x48,0x31,0x7d,0x5c,0xa1,0xad,0xdf,0xd8,0xee,0x2f,0x7e,0x92},
+            {0x37,0xcf,0xa6,0xb7,0x21,0x4e,0x99,0xbb,0xec,0x63,0x23,0x80,0x21,0x15,0xb9,0x61,0x5b,0x10,0x85,0x1a,0xc8,0x5c,0xdc,0x26,0xf2,0x13,0xb9,0x53,0x2f,0xde,0xfc,0xb8},
+            {0x68,0xb1,0x4b,0x71,0xad,0x6b,0x5e,0x2d,0x41,0xef,0x47,0xfe,0x1b,0x92,0x29,0xa0,0xb8,0x29,0x7e,0xde,0x08,0x12,0xd1,0xb9,0xcb,0x95,0xaa,0xc1,0x85,0xd1,0xa5,0xb8},
+            {0x65,0x2e,0xf5,0x49,0x58,0x0c,0xf4,0x12,0xbb,0x21,0x7f,0xb1,0x5b,0x2a,0x0a,0x1d,0xb8,0xfe,0xb3,0xc7,0x99,0x69,0xb9,0x53,0x64,0xa8,0x0d,0xd9,0x7d,0x56,0x5f,0x09},
+            {0xdd,0x35,0x04,0xb7,0x56,0x3a,0x65,0x11,0x5a,0x05,0x05,0x05,0xbc,0x88,0xee,0x23,0xa5,0x0e,0x37,0xc3,0x54,0x77,0x3c,0xac,0x32,0x93,0x55,0xc1,0x6c,0x43,0xd8,0x39},
+            {0x6d,0x7f,0x05,0xd6,0xee,0x71,0x45,0x9d,0x2e,0xa9,0x82,0xf7,0xa5,0xcd,0x4a,0x25,0x1d,0x74,0x66,0xd4,0x89,0x2e,0x6c,0x8b,0x6a,0xaf,0x45,0xee,0xc6,0x64,0x72,0xd7},
+            {0x14,0xc2,0x8a,0xdb,0xf9,0x00,0x8d,0x0c,0xbc,0xc9,0x78,0x00,0x6b,0x6c,0x1e,0xc7,0xbe,0x51,0xa1,0x34,0xbd,0x55,0x87,0xe9,0x4e,0xe3,0x38,0x44,0xb6,0x2c,0x1f,0xfb},
+            {0xf9,0xc2,0x00,0x67,0xf1,0x6f,0xea,0xaf,0x3f,0x8d,0xaa,0x84,0x56,0xdd,0x93,0x34,0x72,0x5e,0xbd,0xc8,0xb4,0x9b,0x4f,0x74,0xf5,0xa0,0x2c,0x38,0xef,0x5f,0x28,0x04},
+            {0xe2,0xc5,0x37,0x94,0x8a,0x01,0x05,0x4b,0x7a,0x0d,0x63,0x09,0x52,0xc2,0xdd,0xd3,0x95,0xa3,0xa2,0x65,0xd6,0x18,0xe2,0x2e,0xe9,0xd9,0x9d,0x45,0x97,0xf8,0x23,0x22},
+            {0x70,0xe3,0xa7,0x19,0x45,0xfe,0xe2,0x93,0x50,0xb5,0xb1,0x0a,0x8e,0xe8,0xdc,0xbd,0x19,0xc2,0xf7,0x34,0xe2,0x24,0x07,0xbb,0x6b,0x50,0xec,0x3a,0xcb,0x10,0x35,0xa5},
+            {0xef,0xfb,0xce,0xd8,0x48,0xdf,0x72,0xcd,0x46,0x7b,0x1a,0xda,0x73,0x53,0xb1,0xdd,0xc0,0xb7,0xf3,0xf0,0x81,0x90,0xc0,0xf2,0xfc,0x74,0x7f,0x18,0x30,0x3e,0xd9,0xf8},
+            {0x02,0xd6,0xee,0xdc,0x5a,0xbc,0x29,0x5b,0xcf,0xbd,0x4c,0x30,0xa8,0xfa,0x34,0x06,0xc8,0x25,0x6d,0x8e,0x51,0xf4,0x71,0x48,0x00,0xb4,0xae,0xcb,0x79,0x5a,0x97,0x6b},
+            {0x92,0x13,0x4c,0x61,0x58,0x99,0x3a,0x03,0x90,0xaf,0x92,0x56,0x5e,0x16,0x64,0x18,0x56,0x1c,0x9b,0x15,0x79,0x89,0xd0,0x23,0x04,0xb6,0x8c,0x2e,0xe1,0xba,0xbe,0x14},
+            {0x60,0x65,0xe3,0xe3,0xaf,0xf3,0xe2,0xb2,0xf3,0x3b,0xf4,0xaf,0x92,0x56,0xe9,0x36,0x8b,0x8a,0x30,0x33,0x35,0xb0,0x58,0x7c,0x8c,0xc9,0xe3,0x1c,0xb9,0xdb,0x42,0xbd},
+            {0x73,0x2f,0xd2,0xba,0x9e,0xfa,0xbc,0x6d,0x79,0xbd,0x74,0x04,0xc1,0xc6,0xf1,0xd5,0xc1,0xf1,0x4c,0x9b,0xfe,0x02,0xee,0x13,0x20,0x62,0x18,0x24,0x84,0x79,0x35,0xc2},
+            {0x20,0x9f,0x9c,0x95,0x8b,0x5f,0x48,0x13,0xb3,0x22,0x05,0xa4,0x4d,0x05,0xc8,0x3a,0xa1,0x00,0x9c,0xb7,0xb9,0xc7,0x34,0x3f,0x0c,0xa3,0x71,0x7a,0xe0,0x69,0xde,0xfc},
+            {0x1d,0x27,0x4f,0xcb,0x65,0xb6,0xd4,0xc8,0x46,0xe9,0x50,0x30,0xc3,0x78,0x51,0xa9,0x7d,0x16,0x1f,0x92,0x6e,0xd8,0x8f,0x6c,0x4d,0xec,0x4e,0xd7,0x00,0x7f,0xc2,0x3b},
+            {0x1d,0x37,0x87,0x10,0x6c,0xf4,0x7e,0x1e,0x9d,0x08,0x76,0x1a,0x6c,0x6f,0x42,0x7e,0xf6,0xc0,0x7d,0x4a,0x57,0x1f,0x23,0xd3,0x40,0xae,0x2d,0x31,0xd3,0x4b,0x1d,0x8e},
+            {0x56,0x97,0xa3,0xf5,0x6a,0x0a,0x2a,0x6b,0xd6,0x99,0x1b,0xa0,0x55,0x59,0xdf,0x9b,0x52,0x6d,0x5c,0x42,0xe1,0x96,0x04,0xc3,0x98,0x54,0x8a,0x7c,0xb0,0xde,0xc0,0xb5},
+            {0x8c,0x0f,0x58,0x1f,0x38,0x23,0x82,0x15,0xf1,0x0f,0x80,0x17,0xe3,0xd2,0x34,0xcb,0xda,0x9d,0x94,0xca,0x01,0x7b,0xbd,0x6b,0x07,0x6a,0xc8,0x66,0x60,0x14,0xb3,0xd3},
+            {0x78,0xf0,0x61,0xb0,0xfc,0x91,0x2f,0xbb,0xeb,0x0d,0x20,0x7b,0x92,0x52,0x8a,0xd7,0x8d,0xed,0x55,0xec,0x14,0x5c,0x8f,0x18,0x13,0x39,0x91,0x84,0x7f,0xb9,0xcb,0xe9},
+            {0x1e,0x35,0x55,0x08,0x1a,0x86,0x9f,0x3a,0xaf,0xa3,0xd7,0x4d,0x6b,0x5a,0xfa,0x94,0x2b,0xaa,0xce,0x60,0x86,0x9e,0xcd,0x4c,0xd3,0x36,0x35,0xf8,0x46,0x02,0xb7,0x15},
+            {0x4f,0x0e,0x36,0xac,0x0c,0x48,0x13,0xdb,0x3f,0xdf,0x79,0xd8,0x5e,0xf0,0xdb,0x89,0x15,0x0d,0xc1,0xbe,0x2c,0x87,0x9b,0xa0,0x62,0x99,0xc0,0x49,0x28,0x8a,0xb8,0xbe},
+            {0x6b,0x04,0x8c,0x38,0x92,0x4b,0x7a,0x1f,0x97,0x0c,0xdf,0xf0,0x81,0x12,0x4b,0x73,0x92,0x02,0xb7,0x03,0xdb,0x5c,0x17,0xba,0xfa,0x4a,0xd2,0x3a,0x5b,0xcb,0x97,0xe9},
+            {0xa5,0xf5,0xe9,0x23,0x8a,0xec,0x20,0xbd,0x70,0x62,0x62,0xf6,0x46,0x71,0xca,0x2d,0x05,0x96,0x1f,0x55,0xca,0x38,0x39,0x53,0xd4,0x89,0xed,0xf8,0x57,0xe4,0xb2,0xa4},
+            {0xa0,0x47,0xb0,0x8e,0x2a,0xf7,0xae,0x5b,0xfb,0x9e,0x54,0xf9,0x80,0x51,0xff,0x7c,0xd5,0xe7,0xdc,0x88,0xa2,0x5a,0xfa,0xcd,0xd9,0xa3,0x24,0x52,0x6c,0xd3,0x3c,0x63},
+            {0x66,0xae,0x2b,0x95,0x13,0xa0,0xe0,0xad,0x12,0x50,0x01,0xbc,0xd5,0xf3,0xa3,0x6e,0x18,0xb4,0xec,0x00,0x9d,0xb4,0x02,0x0e,0xa4,0xaf,0xc4,0x95,0x1c,0xb3,0x9a,0x34},
+            {0x62,0x1d,0x82,0x69,0xc8,0xf9,0x3b,0x63,0x36,0xf8,0xb7,0x48,0x05,0x16,0xd2,0x19,0x1c,0xfb,0x15,0xa1,0xd9,0x50,0x14,0x63,0x77,0x1d,0x0f,0xb7,0x0c,0x1a,0xfa,0x33},
+            {0x76,0xb9,0x40,0x79,0x06,0x6b,0xff,0x52,0xa0,0x77,0xba,0x1d,0x1b,0xa8,0xcd,0xec,0x4d,0x64,0x84,0xd1,0xce,0x2f,0x74,0x54,0xb2,0xb0,0x4a,0xa3,0xd9,0xcf,0x52,0xed},
+            {0x33,0xc6,0xa1,0x08,0xf9,0xd4,0xfe,0x05,0x4c,0x08,0x59,0x91,0xd8,0x9d,0x2a,0x5c,0x32,0xb8,0xf1,0x08,0xc9,0x5b,0x0e,0x68,0x8c,0x57,0x63,0x42,0x4c,0x28,0x3e,0x54},
+            {0x52,0x57,0x5e,0xd2,0xad,0x84,0x29,0x5a,0x07,0x0a,0x99,0xe7,0x78,0x5f,0xf0,0xe4,0xdd,0x32,0xa9,0x3d,0x38,0x30,0xbe,0x7f,0x7c,0x28,0x11,0x80,0x4f,0x3d,0xf2,0xf3},
+            {0x15,0x8d,0xfe,0x01,0x4c,0x27,0x1c,0x14,0x8b,0x38,0x45,0x9e,0xf1,0x6b,0x49,0xcc,0x3b,0x5c,0x6b,0xdf,0xe0,0x52,0x79,0x5a,0x6f,0x6a,0x6a,0xac,0xbb,0x3e,0x47,0xb4},
+            {0xd4,0x71,0x72,0x9c,0xb2,0x31,0xde,0xeb,0x2f,0x1a,0x67,0xf9,0x19,0x62,0xec,0xfc,0xb9,0xe8,0xc6,0x6f,0x66,0xb6,0xb7,0x9f,0xe1,0x11,0x7d,0x34,0xae,0x86,0xa7,0xc0},
+            {0xe0,0x86,0xb1,0xa0,0x9a,0xb5,0x30,0x7d,0x95,0x3e,0x25,0x36,0x6b,0x1a,0xcf,0x7c,0x41,0x04,0x7a,0x92,0x6a,0xa6,0xa4,0xd1,0x22,0xc5,0xa3,0x4e,0x3e,0x0d,0x93,0xd4},
+            {0xd5,0x41,0xd8,0x25,0x40,0x1a,0x17,0x34,0xd9,0x96,0x1f,0xdb,0x4f,0x0e,0x9c,0xe7,0xaf,0x22,0x0c,0x69,0x29,0x64,0x8e,0x0a,0xa2,0xe8,0x85,0xcd,0x28,0x69,0x63,0x43},
+            {0xa5,0x55,0xaf,0x7a,0x52,0xac,0x07,0xe6,0x81,0xc2,0x47,0xf1,0xd6,0x59,0x7f,0x82,0x40,0xd2,0x8e,0x76,0x03,0x6b,0xbf,0x3b,0x2b,0xe1,0xf7,0xcf,0xab,0x90,0xdf,0xd6},
+            {0x85,0x98,0xfe,0x7a,0x4a,0x6c,0x6f,0xa8,0x65,0xc0,0xca,0x8e,0x8e,0x65,0xc9,0x63,0x01,0xc8,0x09,0x65,0xe1,0x9e,0x48,0xf5,0xd4,0xca,0x29,0xac,0x07,0x35,0x51,0xc7},
+            {0x70,0xc9,0xac,0x61,0xab,0x35,0x08,0xa7,0x41,0x9e,0xad,0x73,0x50,0x3d,0x8f,0xe5,0x1b,0x4e,0xcb,0xa7,0x3a,0x55,0xd4,0xb1,0x67,0xcd,0x4d,0xb6,0xc9,0xb0,0xcb,0x8a},
+            {0xe5,0x94,0xeb,0x83,0xb3,0x8a,0xd9,0x16,0x17,0x6a,0xbf,0xf3,0xf0,0xec,0x16,0xd7,0xa8,0x14,0xa4,0x61,0x01,0x2c,0x8f,0x9b,0xc8,0x28,0x62,0x74,0xaf,0x3f,0x18,0x56},
+            {0xfa,0x4e,0x0d,0xf6,0xdf,0x82,0xf2,0x10,0x50,0x39,0x4f,0xc2,0xca,0xaa,0x8a,0x87,0x13,0xb1,0x31,0xd0,0xd1,0xf7,0xd2,0x1e,0xb9,0x2b,0x56,0x79,0x60,0x95,0xbf,0x17},
+            {0x89,0x17,0x11,0xc5,0x35,0x57,0x9b,0x55,0x51,0x05,0xe5,0xec,0x18,0xea,0x0f,0x2f,0x61,0x0c,0x6f,0xe5,0x12,0x6f,0xf0,0xf6,0xa4,0x25,0x7e,0x99,0xa2,0x40,0x33,0xc5},
+            {0xf1,0x92,0xc9,0xb2,0xc4,0x9d,0xab,0x75,0x15,0xd4,0x05,0x05,0x2f,0x82,0x5a,0xbe,0xad,0x30,0xef,0x9a,0x87,0x0b,0xa3,0xbd,0xad,0x98,0xc1,0xd6,0x25,0x6b,0xe4,0x61},
+            {0x70,0xc2,0x2f,0x6c,0xeb,0x81,0x74,0x4c,0x83,0xeb,0x8d,0xae,0x69,0x98,0x0f,0x45,0x83,0xc7,0x54,0x31,0x45,0x7d,0xbb,0x14,0xf5,0xec,0xd6,0xc9,0xfa,0xe3,0xe6,0x3d},
+            {0x7d,0x56,0x3f,0x44,0xbd,0xfc,0xb2,0xa1,0x0e,0xe0,0x53,0xf4,0xc0,0x5b,0x8d,0x46,0xfa,0x90,0xd4,0x48,0x22,0x77,0x5f,0x97,0xee,0x8c,0xfb,0xde,0xda,0x7a,0x4c,0xa1},
+            {0xc0,0x9b,0x3d,0xf6,0x9e,0xaa,0x23,0x2a,0x91,0x19,0xe2,0xfb,0x80,0x5c,0xdc,0xca,0xcb,0x65,0x8b,0x2f,0xb9,0xc7,0xf3,0xa2,0x10,0x6c,0x83,0x99,0xaa,0x92,0x80,0x33},
+            {0x15,0xb4,0xb3,0xd5,0x0f,0xef,0x72,0xde,0x80,0xfe,0xf6,0xe3,0x35,0x1d,0xae,0x0f,0x20,0x39,0x02,0xe4,0xc4,0xdb,0x8c,0xe8,0xd8,0x73,0x7b,0x67,0xae,0xd9,0x10,0x4d},
+            {0xc9,0xb7,0x71,0x86,0x33,0x71,0x4b,0x3c,0xe1,0xb4,0x89,0xf1,0x3e,0x53,0xfc,0x64,0x7b,0xe5,0x3c,0xba,0x77,0x03,0xf0,0x7a,0x35,0xa8,0x81,0x52,0x45,0xb2,0x3f,0xf3},
+            {0x2d,0x34,0x4a,0xf9,0x85,0x2f,0xc2,0x45,0x1c,0xa5,0xd2,0xed,0x71,0x55,0xe0,0x74,0xef,0xd2,0xc5,0x3c,0xa9,0xcb,0xed,0x7f,0x48,0xc7,0x46,0x58,0x96,0x7a,0xec,0xa6},
+            {0xc8,0xb7,0x78,0xb5,0xc1,0xfc,0x37,0x83,0x65,0xd8,0xb3,0x42,0x91,0x52,0x15,0x11,0x7c,0x3d,0x36,0x5e,0x12,0xf6,0x1f,0x3c,0xce,0xfb,0xe4,0x09,0x18,0x79,0xe3,0x73},
+            {0x1d,0xeb,0x07,0x6e,0x44,0xc0,0x29,0x02,0x7c,0x1a,0xa1,0x00,0x00,0x30,0x5c,0x3e,0xde,0xd5,0xd4,0x01,0xa0,0x36,0xc2,0x1a,0x4d,0xd3,0xd3,0x45,0x5c,0x0c,0x33,0xa1},
+            {0xd2,0xd2,0xdf,0xe4,0x10,0xce,0xfb,0xae,0x23,0x09,0xe7,0x46,0x69,0x08,0x18,0xe8,0xd5,0x2d,0xcd,0x80,0xeb,0xd1,0x92,0xcd,0xda,0xa0,0x02,0x04,0xb6,0x83,0x3d,0x05},
+            {0xd1,0x8a,0x0a,0x0b,0xcc,0x67,0x89,0x08,0xff,0x00,0xb2,0x36,0x29,0x6f,0x0a,0x95,0x5a,0x9a,0xa5,0x2a,0x80,0x2e,0xe4,0x17,0x58,0x49,0xd0,0xbc,0xb3,0xd6,0x73,0x8a},
+            {0x7a,0xf5,0x1e,0x08,0x35,0x7e,0x45,0x5e,0x4d,0xda,0x86,0xd6,0x0d,0xa7,0x58,0x99,0xb5,0xff,0xce,0x4b,0xeb,0xc7,0xf9,0x60,0x37,0xd1,0xe4,0x04,0xb1,0x26,0x0e,0xbe},
+            {0x65,0xb9,0x30,0x58,0x0f,0x97,0x38,0xe1,0xa7,0xaf,0x2a,0xc5,0x6f,0xaa,0xd5,0xbd,0xc6,0xa4,0x17,0xe7,0x5c,0xb8,0x72,0xb7,0xf6,0x25,0x13,0xf4,0xe8,0xe3,0x6b,0x33},
+            {0x71,0xc8,0xe8,0x8c,0x7c,0x47,0x8a,0x4d,0x91,0x9d,0x0c,0x80,0xd3,0x51,0x33,0x11,0x02,0x58,0x4d,0x03,0x2d,0x82,0xaa,0x25,0x51,0x08,0x01,0xe1,0x8b,0xb5,0xd6,0xb9},
+            {0x21,0x66,0xba,0xd1,0x6a,0x6e,0x4a,0x1f,0x77,0xa2,0x2b,0x0f,0xb1,0x3f,0x7f,0x11,0xd6,0x18,0xa1,0x23,0xc3,0xc0,0x77,0xdb,0xf1,0xed,0x15,0x04,0xed,0x68,0xcb,0xb4},
+            {0x71,0x7a,0x3a,0x59,0x03,0xc2,0xb1,0x2a,0xea,0x8b,0xe1,0x55,0x99,0xea,0x98,0x64,0x25,0x9a,0x96,0x4c,0x01,0x39,0x12,0x5e,0x64,0x9f,0xef,0xbe,0xc7,0x63,0x89,0x0e},
+            {0x0d,0x04,0x2f,0x57,0x67,0xf6,0xcb,0x2f,0x94,0x52,0x6b,0x5b,0x6d,0xa8,0xef,0x98,0x6e,0x4a,0x59,0x27,0xeb,0x5f,0x73,0x4b,0xde,0xb6,0xc6,0xec,0x3b,0xb8,0x21,0x1a},
+            {0xbb,0x67,0xd5,0x86,0x77,0x4a,0xe9,0xf3,0x65,0x3c,0x60,0x9d,0xbd,0xd9,0x8f,0x21,0x63,0x15,0xb5,0x4c,0x0c,0xe2,0x4a,0xd9,0xe3,0x59,0xd0,0xc2,0xc2,0x16,0x14,0xa3},
+            {0x94,0x5b,0x29,0x62,0xec,0x44,0xc5,0x4e,0xa2,0x5e,0x3e,0x35,0xe3,0x2a,0x23,0x62,0xc1,0x30,0xfc,0x3a,0x94,0x95,0xb1,0x68,0x71,0xe8,0xa2,0xea,0xdb,0xe4,0x57,0xe7},
+            {0x7d,0x53,0x24,0xe5,0xe1,0x58,0xc8,0x23,0x88,0xcb,0xa0,0xd4,0x97,0x53,0x0c,0x6d,0xe0,0xc1,0xba,0x97,0x13,0x16,0x88,0x93,0x1c,0x03,0xdb,0xfc,0x60,0xca,0x75,0x41},
+            {0x21,0x80,0x5a,0x8f,0x8d,0x43,0xae,0xde,0x3e,0x92,0x7b,0x80,0xef,0x04,0x92,0x4d,0x38,0x8e,0x96,0xf3,0xcc,0x39,0x47,0xa0,0xdb,0xc1,0xbd,0x1b,0x81,0x25,0x39,0xf0},
+            {0x27,0xec,0x49,0x2f,0xde,0x5f,0xc3,0xd3,0x78,0x43,0x59,0xd9,0xa2,0x70,0xb7,0x35,0xc1,0x82,0x0b,0xc4,0xa6,0xf1,0x5a,0xc8,0x77,0x97,0xd9,0x7d,0xe0,0x47,0xa6,0xb5},
+            {0x4f,0xda,0x2f,0x85,0x5a,0xb0,0x8a,0x8d,0x4d,0xcb,0xa1,0x87,0x44,0x02,0xe1,0x66,0x23,0x15,0xc8,0x72,0xe3,0xad,0x55,0x68,0x1f,0xc4,0xd6,0xc5,0xa8,0x96,0x65,0xa3},
+            {0xb0,0xdc,0x69,0x20,0x4d,0xea,0xa1,0x7a,0xc4,0xe0,0xf1,0x97,0xf8,0xb2,0x32,0x11,0x41,0x8b,0x5d,0x54,0xf5,0xba,0xc5,0x54,0x14,0x44,0x5a,0x66,0xc5,0x7f,0xd6,0xf2},
+            {0x20,0x92,0x62,0x52,0x1a,0xb4,0x53,0x31,0x63,0x9a,0x57,0x52,0x3f,0x2e,0x3b,0xbf,0x82,0x50,0x05,0x2b,0x84,0xfb,0xa8,0x1c,0x50,0xc9,0x90,0x16,0x6a,0x6f,0x58,0xb6},
+            {0xb0,0x28,0x57,0x94,0x9e,0xbd,0xde,0xcc,0x58,0xaa,0xba,0x80,0xb9,0xd6,0x35,0xae,0x95,0xcf,0x71,0xf4,0xbf,0xc5,0xea,0x8f,0xbe,0x05,0xfc,0x55,0xd4,0xc7,0x3e,0x96},
+            {0x51,0x94,0x13,0x31,0x63,0xb2,0x81,0x82,0xa2,0x61,0xce,0x04,0x73,0xb1,0xf3,0xab,0x99,0x1a,0x53,0xa0,0x8d,0x0e,0x81,0x3d,0x3b,0xfb,0x53,0x3c,0xfa,0xf1,0x25,0x5b},
+            {0xc5,0x6f,0xe9,0x88,0x48,0xfe,0x79,0x12,0x4a,0xe1,0xee,0x09,0xd1,0xb2,0x14,0xee,0x87,0xda,0x51,0xc1,0x44,0x01,0x34,0x21,0x0c,0x67,0xfe,0x15,0xbf,0x6d,0x1b,0xb0},
+            {0x85,0x1d,0x94,0x9a,0xc9,0x1f,0x43,0x9e,0xc8,0x4f,0x07,0xc4,0x81,0x59,0x87,0x28,0xca,0x93,0xac,0xf7,0x9c,0xb6,0x50,0x5b,0xd7,0x7e,0xf7,0x76,0x55,0x92,0x75,0xf1},
+            {0xee,0xcc,0xaf,0x0c,0xd2,0x9c,0xb0,0x02,0xe2,0x14,0x0c,0xff,0xa9,0xfe,0x2c,0x08,0xc5,0x3f,0xfd,0x73,0xb9,0x91,0x67,0xf4,0xb5,0xe6,0xab,0x5c,0x94,0x48,0x10,0x66},
+            {0x82,0x1f,0x10,0x58,0xae,0x54,0x73,0x27,0x23,0x93,0x7c,0x5a,0xe5,0x35,0xcd,0xc0,0xa9,0xce,0x67,0x3e,0xec,0x7f,0xc0,0x2b,0xd0,0x3c,0x24,0x0c,0x93,0xaf,0xf2,0x4c},
+            {0xde,0x83,0x6f,0xd2,0x1c,0xe9,0x1d,0x4a,0x6a,0xdd,0x66,0x1f,0x5d,0x25,0x9d,0x0a,0xde,0x4e,0x0f,0xf9,0x27,0xd0,0x3f,0x67,0xab,0x5d,0x0b,0x24,0xbf,0xf3,0x72,0x42},
+            {0xfd,0xac,0x04,0x70,0xc6,0x1d,0x81,0xd1,0x49,0x8e,0x4e,0x0c,0x6f,0xc4,0xca,0x5c,0xcd,0x02,0xf7,0x27,0x41,0x3e,0x33,0xc8,0x44,0x78,0xeb,0xe8,0x44,0xfe,0xba,0x13},
+            {0x46,0x9b,0x4f,0x5a,0xf2,0xb2,0x37,0x7d,0xc0,0x9e,0x58,0x24,0xaf,0x17,0xc5,0x7f,0x1d,0xd8,0xfb,0xe0,0x22,0x94,0x05,0x9e,0x16,0x64,0x1c,0x13,0x07,0xef,0xf1,0x25},
+            {0xb7,0x73,0x48,0xb4,0x0d,0x52,0xd5,0x31,0x37,0x8d,0xea,0xd6,0x1c,0xf2,0xeb,0x6f,0xaf,0xb4,0xc8,0x9f,0x85,0x28,0x5a,0x98,0xcd,0x4b,0x60,0x32,0xc0,0xe3,0x0a,0x16},
+            {0x2c,0xf9,0x61,0x6a,0xef,0xee,0x83,0xed,0xdb,0x2d,0xf0,0xdd,0xa1,0xa3,0x33,0x11,0x85,0xf0,0xb7,0x72,0xc3,0xa8,0xa6,0x2e,0xa3,0xff,0xbb,0x32,0x52,0x90,0xf3,0x2b},
+            {0x2d,0x23,0xa9,0x03,0x5e,0xc6,0x27,0x18,0x71,0x08,0xb9,0xd1,0x3b,0x24,0x13,0x4d,0x69,0xad,0x7c,0xb6,0xf7,0x7d,0x2c,0x3a,0xb9,0x39,0xdb,0x17,0xcc,0x6f,0x12,0x9c},
+            {0x49,0x25,0xa7,0x00,0x85,0x84,0xe0,0x4f,0xa7,0x69,0x66,0x1d,0xd9,0xeb,0x76,0x6f,0xe2,0xea,0x3b,0x66,0x62,0x26,0x91,0x24,0x91,0x42,0xca,0x15,0x54,0x23,0xf3,0x68},
+            {0x69,0x09,0x00,0x19,0xb3,0xc1,0x63,0x5d,0xa9,0xd9,0xe4,0x66,0x1f,0x55,0x86,0x3c,0xb3,0xab,0x56,0x1b,0xce,0xdf,0x26,0x32,0x36,0x07,0x45,0xe6,0x2b,0x06,0xaf,0xc5},
+            {0x5c,0xec,0xb7,0x44,0xc3,0xe6,0x58,0x89,0xc2,0x2e,0x14,0xa5,0x8e,0x42,0xbb,0x69,0xd0,0x68,0xc7,0x21,0xf1,0xc5,0x47,0xc8,0xc7,0x04,0xfb,0xc6,0x88,0xc6,0xc6,0xe2},
+            {0x2f,0x73,0x71,0xba,0x97,0xf1,0x7c,0x64,0xc4,0xc4,0x87,0x74,0x2f,0x83,0x75,0x5a,0xb6,0x1a,0xeb,0x1e,0xe5,0x37,0xbc,0xd5,0xf1,0x6b,0xeb,0x44,0x40,0xd0,0x23,0x3a},
+            {0x9d,0x1e,0x3d,0xca,0xd7,0x9b,0x15,0x32,0x96,0xa6,0x72,0x38,0x77,0x1b,0x91,0xa9,0x2c,0x43,0x04,0x32,0xa9,0xcc,0x9f,0x7b,0x2a,0xd7,0x66,0x7f,0xd6,0x7b,0x4d,0xe3},
+            {0xe9,0xa3,0x4c,0xa0,0x06,0x7d,0xbb,0x6d,0xbb,0xa4,0x8e,0x73,0x6e,0x1d,0x32,0x33,0x7c,0xca,0x5e,0x93,0xf2,0xb7,0x62,0x29,0xfa,0xfe,0xf5,0x01,0x97,0x9d,0x84,0xae},
+            {0x4d,0x5d,0x36,0x72,0x4a,0x2b,0xaa,0x0d,0x73,0x65,0x7a,0x14,0x04,0x93,0xa9,0xba,0x95,0xe1,0xde,0x95,0xca,0xd7,0x4c,0x97,0x53,0xea,0xad,0x78,0x5a,0xc1,0x8c,0xbd},
+            {0xd1,0x35,0xfe,0x3d,0x44,0xb6,0xb0,0x87,0x5c,0x16,0x62,0xec,0xfe,0x33,0x55,0x6b,0xe0,0xf1,0xb3,0x9b,0xc8,0x27,0x9d,0xc8,0x73,0x0d,0x5e,0x9e,0x35,0x1f,0x36,0xae},
+            {0x1f,0xb8,0x43,0x9b,0x54,0xea,0xd6,0x8f,0x72,0xb7,0xba,0x4f,0xca,0xa5,0x04,0x1f,0x38,0xd3,0x13,0xd9,0x28,0x26,0xb5,0x7d,0xbd,0xa2,0x99,0xda,0xb0,0x6a,0xb7,0x16},
+            {0xb9,0x6e,0x8d,0x59,0xa7,0xc1,0x00,0x6f,0x15,0xb0,0xac,0x10,0xcd,0x35,0xc0,0x8a,0x80,0x08,0xe0,0xc2,0xec,0xba,0x26,0xd8,0x7d,0xb3,0xf0,0x8c,0x0f,0x6f,0xc9,0x91},
+            {0x73,0x30,0x0d,0xd0,0x4c,0x53,0xd2,0x70,0x42,0x00,0x23,0x95,0x7c,0x50,0x41,0x01,0x47,0xea,0x4a,0x28,0x14,0x08,0x5d,0x3b,0x98,0xef,0x25,0xd8,0xd4,0x4a,0xfe,0xed},
+            {0x69,0x41,0x32,0x3a,0x74,0x08,0x1c,0x1e,0xe2,0x88,0x46,0xc4,0xff,0xe3,0xb4,0x02,0x3b,0x29,0xeb,0x3a,0x3b,0x64,0xd0,0xd2,0xde,0xa0,0xf4,0x73,0x49,0xfc,0x21,0x38},
+            {0xf7,0xce,0xbc,0xfc,0x60,0x8a,0x98,0x2a,0x3e,0x11,0xb3,0x94,0x1a,0xbf,0x48,0x2d,0x81,0x08,0xa7,0xd5,0x9c,0x37,0x19,0x27,0x95,0x63,0x78,0x81,0x73,0xa2,0xcc,0x6c},
+            {0xb7,0x6c,0x68,0x7f,0xf4,0x64,0xc5,0x0b,0x58,0xe4,0x23,0x13,0x79,0xc5,0x10,0x54,0x70,0x26,0x4d,0xe2,0x82,0x65,0x74,0xe8,0xd7,0xfc,0x58,0xd6,0x88,0x9d,0x07,0x53},
+            {0xf0,0x14,0x8c,0x80,0x01,0x20,0xbd,0x34,0x15,0x96,0x84,0x19,0x6b,0xdf,0xb3,0x4f,0x08,0xd1,0xaf,0x93,0xc7,0x42,0x32,0xdd,0x9f,0x59,0xe2,0xca,0x0a,0x66,0xae,0xd4},
+            {0x51,0xe0,0x33,0x4c,0x02,0x7b,0x5e,0x43,0xe7,0xcd,0x55,0x7e,0x30,0x1b,0xce,0xb0,0x18,0x99,0x03,0xa1,0x89,0xda,0xde,0xc2,0xa1,0x1c,0x1e,0x2d,0x67,0x5e,0x3e,0x9c},
+            {0x32,0xa3,0xf1,0x10,0x86,0x2c,0x93,0x40,0x10,0x6f,0x2d,0xbb,0xa8,0x5c,0x8a,0xf5,0xd7,0xed,0x57,0x56,0x35,0xd5,0x5c,0xf2,0xaf,0x76,0x37,0xa5,0x9c,0x83,0x10,0x3d},
+            {0xb3,0x5b,0xc3,0x8a,0x43,0x0e,0xbd,0x8c,0x75,0x84,0xd0,0xc9,0x0b,0xda,0xaa,0x15,0xaa,0x25,0x2b,0x39,0x77,0xfc,0xac,0x45,0x66,0x46,0xe8,0x39,0x74,0x6f,0x9c,0x0a},
+            {0x87,0xea,0x74,0xb8,0x99,0xc0,0xb9,0x29,0xe8,0x3b,0xf3,0x1a,0x8d,0x14,0x6f,0xae,0xa3,0xd2,0x61,0x40,0xea,0x99,0xa3,0xd0,0xd3,0xe0,0xbe,0x93,0xa4,0xd6,0xee,0xb4},
+            {0xe2,0x22,0xed,0x1d,0xfc,0xf6,0x50,0x5f,0xad,0x77,0xb9,0xcf,0x2e,0x3e,0x38,0xd0,0xea,0x86,0xfe,0x89,0xa9,0x69,0xb8,0x8e,0x72,0x9e,0xbd,0xf2,0xe6,0xc6,0x3f,0x0e},
+            {0xd5,0xe9,0x2d,0xa5,0x4a,0xe3,0x43,0x26,0x03,0xea,0x96,0xcd,0x77,0x0f,0x4d,0xa4,0x42,0xf7,0xdc,0xbd,0x0a,0x4f,0x2d,0x82,0x77,0x4a,0x33,0x67,0x56,0x90,0x29,0x7e},
+            {0x01,0xe3,0x72,0xd5,0xde,0xe0,0x8b,0xee,0xfd,0x03,0x31,0x7d,0x08,0x97,0xd5,0xef,0x1c,0x51,0x26,0xbb,0xfe,0x00,0xc8,0x96,0x7e,0xc9,0xaa,0x05,0x52,0x3c,0x5e,0x25},
+            {0x36,0x9d,0xf1,0xd5,0x77,0xf6,0x6e,0xa1,0xc9,0x3b,0x58,0xb7,0x70,0x78,0x3a,0x74,0x60,0x69,0x07,0x71,0x3b,0x14,0xad,0x86,0xb3,0x16,0x31,0x9d,0x94,0xf8,0x4a,0xc7},
+            {0xef,0x7e,0x64,0x88,0x60,0xa8,0xb3,0x49,0x04,0x40,0xf2,0xa8,0xd5,0x41,0xa2,0x68,0xb4,0x61,0x3f,0x4a,0x94,0xc0,0xdb,0xf6,0x85,0xdf,0x59,0x73,0xb5,0x5f,0x0e,0x88},
+            {0xf1,0x9f,0x4b,0x29,0xd4,0xd7,0xb7,0x0a,0xbc,0x46,0x24,0xc0,0x1a,0x4e,0xf7,0xab,0x77,0x2b,0xd4,0xfe,0xae,0x8c,0xb3,0x3b,0xb5,0x02,0xf3,0x0a,0x11,0xda,0xb2,0x9f},
+            {0x8c,0xcb,0xea,0x64,0x79,0x12,0x75,0xea,0x04,0x7a,0x36,0x48,0xb0,0x92,0xed,0x28,0x1a,0xcf,0xa2,0x1f,0x62,0xa4,0xb5,0x0e,0xd1,0x11,0xb9,0x54,0xe5,0x34,0xa6,0x97},
+            {0xd6,0x0a,0x6b,0x48,0x46,0xf2,0x18,0xa8,0x36,0x9d,0xb8,0xde,0xb4,0x59,0x72,0x76,0x0a,0x1d,0xf3,0x3c,0x75,0x32,0xd0,0xef,0x1a,0xe6,0x79,0xba,0x02,0x94,0x21,0x6e},
+            {0x7a,0xa4,0x63,0x8b,0xe3,0x36,0xfb,0x77,0xbc,0x1a,0xc5,0xdf,0xcd,0x3f,0x5a,0xe0,0x02,0xae,0xed,0x8c,0x42,0xbb,0x46,0x47,0x5f,0x71,0x8e,0x3c,0x27,0x8f,0x00,0x97},
+            {0x06,0xa8,0x2a,0x57,0xd7,0x95,0x1a,0x56,0x29,0xa1,0x15,0x32,0x40,0xf6,0xb1,0xf0,0x9c,0x15,0x0f,0x0b,0x9b,0x77,0x7d,0x7c,0x64,0xa0,0xa6,0x28,0xe2,0x4a,0x0b,0xdc},
+            {0xd2,0x3d,0x2c,0xe7,0x3e,0x24,0xb4,0x34,0xf2,0xfe,0x5a,0x6e,0xef,0x2b,0x88,0xea,0xed,0x4e,0x57,0x84,0x8c,0xf3,0x57,0x05,0x5d,0xa6,0x91,0x4b,0xb2,0x34,0x85,0x1d},
+            {0x0d,0xfb,0xe7,0x91,0xdf,0xc8,0x65,0x70,0x00,0x45,0x38,0xc6,0x41,0x95,0xa7,0x70,0x2e,0x33,0xed,0x12,0x14,0x90,0xfe,0xe5,0x81,0x95,0x37,0x67,0x6a,0x02,0x19,0x32},
+            {0x8e,0x2a,0x51,0x0b,0xc8,0x4d,0x46,0x00,0xf2,0x58,0x12,0x99,0x4d,0xfd,0x5b,0x45,0x66,0xc2,0x81,0xa1,0x53,0xe4,0x59,0xcc,0x94,0x60,0xc0,0x06,0xab,0xab,0xd0,0x93},
+            {0xcf,0x73,0xa8,0xcd,0xab,0xec,0xf4,0x32,0x3a,0x19,0x4f,0x32,0x49,0xcb,0x5b,0x16,0x74,0x03,0x7f,0x77,0x9c,0x74,0x76,0x90,0xeb,0x0d,0x9c,0x9f,0x70,0x3f,0x7c,0x8c},
+            {0xa8,0x99,0x99,0x28,0x01,0x4d,0xb2,0x4e,0x80,0xa2,0x7c,0xfb,0x57,0x2e,0xac,0xf9,0x02,0xb5,0x0c,0xda,0xc2,0x59,0xb5,0xbe,0x80,0x22,0x9f,0xe7,0x32,0x60,0xce,0x08},
+            {0xf2,0xa1,0x3b,0x90,0xff,0xda,0x09,0xf9,0x99,0xca,0x5d,0x7f,0x9a,0x2c,0xd1,0x71,0xac,0x33,0xee,0x2a,0x9a,0x88,0x9c,0x70,0xa2,0xe2,0xd4,0x54,0xde,0xe0,0xdd,0xeb},
+            {0xa5,0xfa,0x03,0x77,0xe6,0x44,0xe7,0x43,0xa3,0x8f,0x0b,0x42,0x7a,0xde,0xfa,0xb9,0x0d,0x21,0x8b,0xa8,0xe9,0xe2,0x89,0x4f,0xc1,0xf1,0xf7,0x1c,0xd8,0x15,0xa9,0x2d},
+            {0x1a,0x27,0xdc,0x6f,0x45,0x23,0x62,0xec,0xa3,0x74,0x52,0x18,0x91,0x5d,0x24,0x72,0x6b,0x72,0xf5,0xd6,0x96,0x3a,0x9c,0x41,0xa3,0x4b,0x9b,0x7a,0x12,0xae,0xed,0xda},
+            {0x74,0x65,0x7a,0x8b,0x36,0x1a,0x7d,0x23,0x5d,0x94,0x87,0x8c,0xf2,0xac,0x2c,0xf3,0xe1,0x8d,0xbd,0x76,0xfa,0x1a,0x88,0x44,0x0e,0x3b,0xe7,0xac,0x7a,0x8d,0xc5,0x4a},
+            {0x15,0x05,0x94,0x99,0x24,0x8e,0x57,0x9d,0x66,0x82,0x7f,0xb6,0x70,0x0d,0x3c,0x31,0xab,0x3c,0x1e,0x82,0x4f,0xd0,0xb0,0xde,0x58,0x36,0x68,0x63,0x1f,0x31,0xab,0xe1},
+            {0x21,0xda,0xb2,0x69,0xf6,0x0f,0x67,0xbb,0xce,0x69,0x44,0x7b,0x7f,0xec,0x67,0x46,0x62,0xbb,0xfe,0x2b,0xf1,0xfb,0x99,0x8e,0x16,0x4d,0x44,0xe9,0x20,0x86,0xa8,0x9a},
+            {0xa2,0x66,0xbf,0xdd,0x44,0xa5,0x96,0x9f,0x46,0x98,0x53,0x37,0x35,0x9f,0xe5,0xeb,0xb6,0x08,0x3b,0x8a,0x21,0xcf,0x31,0x0e,0xbd,0xf4,0xa6,0x2a,0xa1,0x6d,0xcb,0x89},
+            {0x61,0x2e,0xbf,0x41,0x82,0x2f,0x25,0xab,0x63,0x88,0x67,0xc1,0x23,0x25,0x96,0xa8,0x3d,0xe6,0x0c,0x5b,0xc1,0xa6,0x2a,0xea,0x81,0x46,0x4c,0xd8,0x7c,0x50,0xa5,0x3e},
+            {0x7c,0x7e,0x85,0x06,0x94,0x61,0x18,0xe3,0xaf,0x1f,0x5c,0x36,0xf9,0x4f,0xc5,0xcd,0xdb,0x94,0x5e,0x63,0x46,0xa0,0x09,0xd2,0x19,0x34,0xea,0x0a,0x38,0x47,0x78,0xac},
+            {0x82,0xcc,0x3d,0xcf,0xa1,0x01,0x88,0xe9,0xce,0xe8,0xd8,0x4a,0x60,0xab,0x86,0xce,0xf7,0xb5,0x64,0x20,0x87,0x34,0xeb,0xe8,0xd1,0xc6,0xf4,0xfd,0x58,0x3e,0x54,0x66},
+            {0x7e,0xc2,0xdc,0xe8,0xc9,0x01,0xde,0x5c,0x5b,0x5d,0xa2,0x18,0xd4,0xca,0x6c,0x30,0x4c,0x4a,0x86,0x91,0x56,0x86,0x31,0xb1,0xd9,0xd6,0x25,0xde,0xab,0x02,0x5e,0x8a},
+            {0xba,0xf8,0x88,0x4a,0xec,0x75,0x6b,0xba,0x04,0xca,0xfe,0x11,0xf8,0x2e,0x84,0xd5,0x72,0x1b,0xc6,0x66,0x89,0xa5,0x94,0x18,0xe2,0x4d,0xba,0x04,0x71,0xe5,0xed,0x9c},
+            {0x20,0x33,0x10,0x9b,0x98,0xde,0xc8,0x80,0x46,0x39,0x06,0x19,0xd0,0x56,0xfb,0xa7,0xab,0x1e,0x20,0x75,0x91,0xb0,0x49,0xb5,0xca,0x4e,0x5c,0xa7,0x90,0x5a,0x07,0x36},
+            {0x04,0x33,0x7d,0x0b,0xc9,0x94,0x85,0x30,0xc0,0xf6,0xbd,0x54,0x14,0x42,0xa1,0x4c,0xb8,0xda,0x93,0x42,0xcb,0xaa,0xe8,0x4f,0xfd,0x21,0xf4,0x9a,0x3a,0x4f,0xf9,0xb5},
+            {0x95,0xa3,0x90,0xc9,0xff,0x01,0x59,0x2a,0xef,0xaa,0xb0,0x9d,0x64,0x09,0xdd,0x61,0x82,0x63,0xbd,0x59,0x6d,0x51,0x34,0xe0,0x24,0xd2,0xe0,0x4f,0xc0,0x80,0xf9,0xd2},
+            {0xc3,0x14,0xb1,0x1e,0x8a,0xb0,0x95,0x7c,0x8c,0x11,0x77,0x0b,0x6d,0xd3,0xbf,0x9b,0xa8,0xa2,0x81,0xc3,0x12,0xf0,0xc2,0x5d,0x0d,0xbd,0xb0,0xda,0xb2,0xbf,0x61,0x76},
+            {0x93,0x72,0xc5,0x73,0x1f,0x8e,0x38,0xca,0x30,0x84,0x5e,0x27,0x7b,0x49,0x9e,0x77,0xdd,0x3f,0x5f,0xa4,0x42,0xf5,0x49,0x6c,0x4b,0xdd,0xe0,0x51,0x2d,0xe1,0xe9,0x22},
+            {0x84,0xff,0x2e,0x4e,0x6c,0x23,0xf0,0x95,0x3a,0xec,0x51,0xc9,0xd8,0x64,0x2b,0x1d,0x71,0xc6,0x53,0x73,0x1d,0x75,0x85,0xfd,0xf0,0x21,0xe0,0x45,0xeb,0xaa,0x0c,0x11},
+            {0xc4,0x47,0x2b,0x40,0xa9,0xec,0x2b,0x01,0xde,0x30,0xd7,0x9b,0xaf,0xcf,0xf2,0xcd,0x48,0x53,0xed,0xb7,0x77,0x24,0xa5,0xae,0x02,0xf4,0x38,0x75,0x97,0xde,0xaf,0x53},
+            {0xde,0x59,0x78,0x5a,0xae,0xd4,0x98,0xde,0xb9,0x53,0xdc,0x23,0x9d,0x06,0x84,0x7b,0xae,0xd0,0x57,0x97,0xfe,0x3d,0xd2,0x42,0x0a,0x5c,0x6f,0x35,0xa4,0xdd,0xaa,0x1b},
+            {0x96,0x22,0x55,0x8b,0x5b,0x74,0x42,0x23,0x86,0x84,0x45,0xc3,0x2f,0xd9,0x2f,0xf2,0xba,0x0d,0x9c,0x56,0xf5,0xb3,0x4b,0xbf,0x9d,0xe7,0xf3,0xe2,0x62,0x06,0xa2,0x77},
+            {0x80,0x88,0x7a,0x10,0x4e,0xf0,0x50,0xb4,0x42,0x51,0x4f,0xf8,0x29,0x21,0x32,0xf0,0x50,0xbf,0xda,0x9b,0x64,0x0a,0x84,0x0c,0x32,0x58,0xf0,0x18,0x93,0xe7,0x5f,0x42},
+            {0xcb,0xfb,0x1b,0x0a,0xd1,0xdf,0x2f,0x84,0xe6,0xdd,0xfa,0x19,0x03,0x62,0x22,0x5f,0x93,0x06,0xeb,0x62,0xa9,0xf5,0x54,0x1c,0xc5,0xde,0xb5,0xda,0x78,0x1f,0xa2,0x13},
+            {0xb0,0x17,0x34,0x82,0x2f,0x15,0x98,0xf9,0xed,0xce,0xac,0xfe,0x3d,0x82,0x82,0x03,0xc6,0x29,0x31,0x3c,0x7e,0xa0,0xf5,0x11,0x11,0xf6,0xb1,0x04,0x74,0xe0,0x70,0xf9},
+            {0xa1,0x2c,0xab,0x7e,0xc7,0xe7,0x81,0xe9,0x0a,0x49,0xf8,0x37,0xe6,0xef,0xab,0x25,0x3d,0x89,0x6d,0xab,0x61,0x5a,0xba,0x3f,0x63,0x27,0xb2,0x64,0xdf,0x5b,0x91,0xbe},
+            {0xff,0x54,0xa2,0xa3,0xca,0xe5,0xac,0x50,0x53,0x47,0xc5,0x57,0x7e,0x01,0x0f,0x71,0x34,0x11,0xb5,0x40,0x1b,0xff,0x74,0x91,0xce,0xbc,0x18,0xb3,0x45,0x92,0x68,0x3c},
+            {0x99,0x52,0x9f,0xea,0x4b,0x50,0xb9,0xb8,0xbd,0x91,0xae,0xe8,0xf8,0xa2,0x5c,0xf8,0x8d,0xd3,0x61,0x2e,0xde,0x12,0x61,0x0a,0xcb,0x24,0xe7,0x3a,0x1f,0xda,0x35,0xae},
+            {0x67,0x9c,0x55,0xa7,0x53,0x49,0x5d,0x26,0xc5,0xff,0x8e,0xe7,0xe9,0xdd,0x2f,0x63,0x29,0xfe,0x76,0xbc,0x3b,0xba,0x13,0x24,0xf2,0x7f,0xf5,0xf3,0xec,0xb7,0xf8,0xc5},
+            {0xc8,0x05,0xe4,0xae,0x5d,0x23,0x58,0xaf,0x56,0x1c,0xce,0x2a,0xb0,0xae,0x13,0xa8,0x3b,0x68,0xa8,0x08,0x86,0xfd,0x11,0xce,0x5e,0x82,0x00,0xb0,0x19,0x4a,0x00,0x85},
+            {0x5f,0xbe,0xc4,0x7c,0x66,0xe6,0x2e,0xcc,0x3c,0x48,0x3c,0x44,0x0f,0x0e,0x39,0x71,0x1f,0x41,0x4d,0xcc,0x8c,0x0a,0xd7,0x2b,0x17,0x32,0x5b,0xed,0xb8,0xbc,0xe5,0x77},
+            {0xc8,0xe4,0x3b,0x97,0xb4,0xaa,0xe1,0x88,0xac,0x28,0x8e,0x16,0xf8,0x56,0xf1,0x6e,0x83,0x9e,0x67,0xee,0x14,0x9d,0x8b,0xc8,0xf8,0xbb,0x6a,0xa0,0x5a,0x18,0x67,0x04},
+            {0xff,0x47,0x48,0xfc,0xe9,0xa6,0x54,0xb3,0x87,0x69,0x05,0xae,0xf0,0x33,0xf1,0x90,0x30,0x93,0x88,0x80,0xda,0x46,0x1a,0xe9,0xe0,0x5b,0xfe,0x84,0x69,0x86,0x58,0xff},
+            {0xc6,0xe3,0x9d,0xa9,0x59,0x3a,0xb9,0x28,0x27,0xce,0x0e,0x81,0xd2,0x9f,0xd8,0x50,0x03,0xd1,0x10,0xbb,0x2e,0x85,0xd5,0x30,0x76,0x9e,0xae,0xb0,0xb3,0xfc,0xb1,0x22},
+            {0x0a,0x1c,0xd4,0x05,0xa5,0x3a,0xee,0xb8,0xc0,0x3e,0x69,0xed,0xa6,0x4a,0xca,0x2d,0xc6,0xdf,0x3d,0x59,0x9c,0x41,0x55,0x1e,0x0e,0x71,0x06,0x7c,0x2c,0x32,0x99,0xd2},
+            {0x41,0xa3,0xb0,0x88,0x35,0x41,0xb8,0xe2,0x8e,0x32,0x1b,0x9c,0xf3,0x26,0xc9,0x9f,0x07,0xfe,0x0b,0xf8,0x35,0x4e,0x08,0x05,0x39,0x51,0x1d,0xc2,0x7d,0x38,0x27,0x28},
+            {0x47,0xf3,0xee,0x76,0xee,0x3a,0x53,0xb8,0xb6,0xc8,0x4d,0xe4,0x8d,0xbf,0xe4,0x0d,0x44,0x87,0xc0,0xf1,0xe0,0x24,0xbe,0x7a,0xd7,0x35,0xb4,0xcb,0x01,0xb2,0x40,0xe3},
+            {0x46,0x05,0x54,0x1e,0x0a,0x8b,0x64,0xeb,0xfb,0x69,0x4d,0x09,0x24,0x56,0x45,0x5e,0x36,0x63,0x12,0xdf,0x0f,0xdb,0x6e,0xdb,0x97,0x5d,0x5d,0xf6,0x73,0x8d,0x5f,0x64},
+            {0xf1,0x40,0xf7,0x01,0xe7,0x34,0x03,0xc3,0x99,0x25,0xa8,0xec,0x3b,0xf6,0xfc,0x03,0x3d,0xf1,0xde,0x9c,0x5d,0x01,0x3a,0x0b,0x86,0x6b,0x71,0x80,0x8f,0x77,0xc3,0xb2},
+            {0x0a,0x9f,0x71,0xc5,0xea,0x36,0x56,0x60,0x00,0x32,0xd7,0x21,0x47,0xb1,0xfb,0x79,0x5f,0x1e,0xc5,0x15,0xeb,0x0c,0x0e,0x9b,0x14,0x2a,0x51,0xb6,0x3c,0xcd,0xd2,0x36},
+            {0x77,0x3a,0x79,0x7f,0xa4,0xbb,0x49,0xec,0x88,0x2c,0x2c,0x97,0x2b,0x71,0xe5,0x09,0xbc,0xc0,0x94,0xb8,0x90,0x83,0x34,0x0d,0xf1,0xeb,0xdd,0x64,0xa6,0x8f,0x60,0x45},
+            {0xbd,0x00,0x4a,0xc4,0xdc,0x73,0xdd,0x53,0x04,0xe3,0x3a,0xbe,0x88,0xde,0x5b,0x38,0x89,0xf2,0x33,0xd1,0xb2,0x73,0x27,0xb1,0x48,0x14,0xf2,0x94,0x1f,0x47,0x13,0x1e},
+            {0x5c,0x2b,0x63,0x60,0x57,0x90,0x4e,0x70,0x17,0x9e,0xfc,0x53,0x66,0xac,0xf5,0x6b,0x23,0x87,0x80,0xb1,0xbd,0x50,0xd5,0x73,0x3f,0x3c,0xfd,0x06,0xe4,0xa8,0x94,0xf8},
+            {0x30,0xcd,0x46,0x2a,0x2b,0x16,0x21,0x1e,0x36,0x57,0x28,0x80,0x8b,0x2d,0xea,0x55,0x91,0xfd,0xae,0x5f,0x8e,0x7f,0x81,0x63,0x00,0x44,0x0e,0x25,0x58,0x39,0xd9,0xaa},
+            {0x38,0x8c,0xd1,0xa3,0x7c,0x37,0xa2,0xe7,0xfc,0x75,0xda,0x63,0x63,0xe8,0x94,0x61,0x8c,0x7e,0x01,0x1f,0x6d,0xb2,0x75,0xcf,0x64,0x01,0x13,0x12,0xf3,0xd3,0x77,0xed},
+            {0xf8,0x8b,0xeb,0x13,0x24,0x12,0x10,0x72,0x50,0xf7,0x3b,0xab,0xe3,0x2b,0x82,0x0f,0xe6,0xb2,0x77,0xb2,0xcf,0x21,0x03,0x5b,0xb4,0xc3,0x6e,0x7b,0x60,0xa9,0x58,0x5a},
+            {0xc3,0x8e,0xb4,0x32,0x33,0x58,0xd7,0xae,0x5f,0x9a,0xa8,0xd4,0x59,0xde,0xe5,0x25,0x42,0x7a,0x9a,0x49,0x06,0x50,0x24,0x6a,0x2e,0x81,0x04,0xd1,0x34,0x65,0x99,0xdd},
+            {0x21,0x29,0x47,0xc0,0x8a,0x73,0x89,0x77,0x40,0x7b,0x76,0x97,0x56,0xf1,0xf4,0xd1,0x92,0xec,0xa9,0x56,0xb0,0x74,0x13,0xbb,0x3f,0x70,0x24,0x02,0xae,0xff,0x13,0x07},
+            {0xc6,0xbb,0x09,0x0f,0x1e,0xa6,0xe4,0x35,0x0d,0x6e,0x71,0xcb,0xa3,0xc0,0x96,0xad,0xca,0x35,0x6c,0xe1,0x6d,0x99,0x7f,0x48,0xdd,0x08,0x1e,0xae,0xea,0xc5,0x02,0x67},
+            {0x2d,0xa0,0xa6,0x1f,0x25,0x10,0xfe,0x2f,0xba,0xfb,0x40,0xb2,0x7b,0xa5,0xaa,0x8d,0x0f,0xac,0x82,0x54,0xd7,0xd6,0x9e,0x47,0x5f,0xdf,0xf6,0xf3,0x77,0x7b,0x4d,0x6a},
+            {0x78,0x5f,0xc1,0x9d,0xee,0x1f,0x3e,0x84,0x30,0x7d,0xc8,0x36,0x55,0x0f,0x5a,0xce,0x30,0xb6,0x72,0x46,0x02,0x67,0x75,0x1e,0x6f,0xcd,0x5e,0x33,0xac,0x46,0xc2,0x96},
+            {0x37,0x00,0x20,0xc8,0x0d,0x7e,0x1f,0x3f,0x53,0x56,0x6b,0x5f,0x51,0x93,0x1a,0x12,0x97,0xfa,0x1a,0x4e,0xfd,0xc8,0x1c,0xcf,0x7c,0x5a,0xb7,0x2e,0x25,0x77,0xae,0x40},
+            {0x25,0x9b,0xc6,0x12,0x9f,0x4c,0x13,0x60,0x73,0x17,0x3a,0x83,0xe0,0xd5,0xd5,0x95,0x42,0x03,0xbe,0xb9,0x97,0xce,0x14,0x0d,0x8f,0x69,0xd7,0xb9,0x50,0xe0,0x18,0x7c},
+            {0x11,0xcb,0x14,0x89,0x48,0xa9,0xc9,0x2a,0x2c,0x96,0x2f,0x6f,0x2d,0xa0,0xbc,0x9a,0x02,0x4c,0xe6,0x3c,0x12,0xe6,0x2a,0xab,0x3f,0x06,0x93,0x84,0x7c,0x23,0xad,0x0e},
+            {0xa0,0x9d,0xf0,0x31,0xdc,0x5d,0x36,0x2e,0x71,0xb7,0x30,0xb9,0x1a,0x0e,0x84,0x67,0x73,0x53,0x40,0x63,0x09,0xaa,0x06,0xfc,0xe9,0x6f,0x83,0xeb,0x77,0x67,0x1b,0x4c},
+            {0x04,0x6b,0xd7,0x2f,0x9b,0xed,0xc2,0x6c,0x0f,0xfa,0x2b,0xb7,0xbb,0x96,0x79,0xb7,0xb1,0xaf,0xc7,0xc9,0xcc,0x72,0xa0,0xde,0x2d,0xa2,0xfd,0x9e,0x9f,0x08,0x83,0x7e},
+            {0x9e,0xe8,0xb7,0xdf,0x88,0x98,0x71,0x1a,0x79,0x7f,0xd8,0x81,0x6a,0x32,0xc1,0x81,0xe6,0x41,0xae,0x77,0xf9,0xd0,0x4f,0x69,0xfb,0xcc,0xdc,0xf5,0x91,0x6c,0xb6,0x68},
+            {0x98,0x81,0x3c,0x88,0x70,0xbd,0x22,0x7c,0xb6,0x07,0xe9,0x7a,0x29,0x61,0x95,0xe6,0x73,0x82,0x9e,0x66,0xf6,0xc1,0x84,0x34,0xe8,0x52,0xf3,0x67,0x19,0xfe,0x82,0x3e},
+            {0x5f,0xf5,0xc1,0x3d,0x15,0x6c,0x6c,0x20,0xc0,0x01,0x88,0x48,0xeb,0x76,0x1c,0xc2,0x4a,0x17,0x39,0xb1,0xa2,0x96,0x4e,0x27,0x9e,0x18,0x41,0xd5,0x87,0xce,0x34,0x41},
+            {0x11,0xca,0xa7,0x77,0xf5,0x7c,0x82,0x40,0x55,0xe6,0xcf,0xec,0x22,0x81,0xde,0xec,0xce,0xa4,0xcc,0x6a,0x9a,0x0c,0xd9,0x71,0xec,0x1b,0x9e,0xa7,0xde,0x49,0xcb,0xca},
+            {0x3a,0x8e,0x12,0x65,0x22,0xf8,0x4b,0xb0,0x12,0x39,0xc8,0xd1,0xc5,0x1b,0xad,0xa7,0x7f,0xb0,0xe3,0xe7,0x6d,0x51,0xca,0x82,0x24,0x5c,0xbe,0xd0,0x4d,0xcb,0x77,0x39},
+            {0x86,0x0a,0x27,0xfe,0xf1,0xb6,0xb5,0x37,0xa6,0xbe,0x68,0x87,0x53,0x59,0x9f,0x84,0xf2,0x9a,0x26,0x00,0xf4,0x62,0xbd,0xdb,0x51,0x80,0xf0,0x57,0x5c,0xf1,0x0b,0xf7},
+            {0x0b,0xfb,0x82,0x95,0xa9,0x5d,0xa4,0xb0,0x8f,0x08,0x41,0x35,0xce,0x5b,0x22,0x1f,0x4e,0x5e,0xa4,0xcb,0x7e,0x63,0xd9,0x64,0x10,0xe1,0xb0,0x16,0x1f,0x0e,0xb5,0xec},
+            {0x68,0x4b,0x91,0x70,0x15,0x39,0x6f,0xe1,0x2a,0x0b,0x84,0x84,0x5c,0x80,0x5f,0x3e,0x07,0x53,0x40,0x70,0xe1,0xa0,0x41,0x0b,0xd6,0x31,0x9f,0x40,0x70,0x4f,0xe3,0x92},
+            {0x58,0x09,0xb9,0xf1,0x26,0xcc,0x43,0x32,0x90,0x50,0xde,0xc4,0x5c,0x6e,0xc7,0x21,0x5c,0x58,0x8a,0xe8,0x5a,0x06,0x47,0xa2,0x38,0x16,0xa7,0x3e,0x2e,0xee,0x7e,0x8b},
+            {0x21,0xce,0x00,0x14,0xba,0xe9,0x7d,0x45,0x99,0x23,0x0a,0xbc,0xf3,0x22,0xb0,0x31,0xd4,0x9f,0xee,0x0f,0x48,0xe5,0x78,0xf1,0x73,0xb3,0x17,0x47,0x8f,0x00,0x98,0xa2},
+            {0x79,0x19,0x2c,0x7d,0xec,0x85,0xac,0xe4,0xa9,0xcb,0xb6,0xda,0xa8,0x2e,0x76,0x10,0x5d,0x10,0xe9,0x88,0xff,0xab,0xf1,0x05,0x0a,0x0b,0x27,0xe1,0xed,0xdc,0x70,0x6b},
+            {0x9a,0x45,0x45,0xf7,0x70,0x55,0xb0,0x32,0x03,0x45,0xd7,0xf1,0x47,0xad,0xae,0x05,0x52,0x19,0x1e,0x0b,0x77,0xba,0x53,0xfc,0xd8,0x27,0x49,0xb5,0xef,0x45,0xe3,0x34},
+            {0xe1,0x54,0xaf,0xdc,0x57,0x5f,0xcf,0xec,0x7a,0xcc,0x74,0xe6,0x34,0xeb,0x76,0x7a,0x87,0x35,0x4b,0x7e,0x4c,0x92,0x77,0xd6,0x21,0x81,0x74,0x91,0x9f,0x21,0xfd,0x7e},
+            {0x12,0xc9,0x4a,0xd4,0xe5,0xfc,0xcd,0x6a,0x8a,0x24,0x22,0x92,0x98,0xb1,0xae,0xe2,0xef,0xa0,0xf2,0x31,0xfb,0x20,0x9a,0xaa,0x45,0x81,0xa5,0xae,0x97,0x0e,0x46,0x36},
+            {0xcd,0x08,0x93,0x47,0xc6,0x7b,0x34,0xab,0x0d,0x80,0xdb,0x56,0x92,0x33,0xb6,0xf4,0x27,0x92,0xd9,0xfb,0xb0,0x8e,0xdd,0xb7,0x69,0xc5,0xd2,0xc0,0x6c,0x03,0xb7,0x8f},
+            {0xc9,0x5d,0xe3,0xac,0x86,0x1c,0xb2,0x43,0x50,0x96,0xb1,0x7b,0x6a,0x6e,0x96,0x88,0x03,0x31,0xcc,0xfe,0x73,0x0b,0x15,0xfb,0x14,0x77,0x1c,0xe6,0x41,0x4f,0xbf,0x36},
+            {0xb3,0x55,0xcc,0x80,0x1f,0xd8,0x71,0x23,0x15,0xd0,0x24,0x75,0x17,0xeb,0x2f,0xf1,0xff,0xcf,0x90,0xce,0x66,0xe7,0x86,0xf6,0x6c,0x0b,0x70,0xb0,0x5c,0x3a,0xac,0x13},
+            {0xea,0xd6,0xb1,0xe3,0xc8,0xce,0x53,0x80,0x56,0x73,0x94,0x71,0x4a,0x8d,0x3e,0x71,0xb7,0x39,0xa1,0x28,0x87,0x2a,0x43,0x10,0xfd,0x52,0xcc,0xc0,0xcd,0x01,0x5b,0xca},
+            {0xb2,0xaa,0x10,0x09,0x9a,0x3d,0x80,0x6f,0x3b,0x5f,0xef,0xc4,0xcf,0x5a,0xad,0xe2,0xc9,0x1e,0x51,0x8a,0x93,0xa0,0x3e,0xff,0x4b,0x4b,0xfe,0xd3,0x7a,0xa9,0x8b,0xc1},
+            {0xba,0x72,0x7d,0x2b,0xe8,0x0b,0xdb,0x3b,0x47,0xb8,0x60,0xb7,0x58,0x8a,0x46,0xac,0x93,0x98,0x4d,0xb5,0xde,0x47,0xee,0x99,0x9a,0xd9,0x46,0xae,0xdc,0x41,0x1a,0x3b},
+            {0x5d,0xe5,0x01,0x64,0x68,0xe7,0xf8,0xb9,0x81,0xbd,0x5f,0x1b,0x04,0xb2,0x70,0xeb,0x7c,0x5b,0xa3,0x66,0x54,0x81,0xb9,0xf2,0x21,0x56,0x07,0x13,0x7c,0x5d,0x6e,0xcb},
+            {0x44,0xa3,0x83,0x31,0xd4,0xf0,0x1c,0x48,0xfd,0x89,0xcb,0x30,0x6b,0xe7,0xd4,0x09,0x10,0xf6,0x1e,0x85,0xc0,0x1e,0xfa,0x64,0xbe,0x56,0x00,0x7e,0x16,0x8e,0xb7,0x04},
+            {0x87,0x64,0x07,0xf1,0xf2,0x28,0x9e,0x22,0x12,0xc3,0xf0,0x9f,0xbd,0xdd,0xd4,0x0e,0x4d,0x99,0x33,0x1e,0x61,0x8f,0xe1,0xfe,0x76,0xe5,0x4c,0x00,0x07,0x14,0x6c,0xca},
+            {0x3c,0x12,0xbc,0x0d,0x8d,0x06,0x17,0x35,0xb0,0xb0,0x33,0x71,0xc4,0x86,0x9f,0x9e,0xbb,0x42,0x3e,0xb8,0x4b,0xa6,0xa8,0x0b,0xdd,0xdf,0x86,0x36,0x01,0x28,0x71,0x90},
+            {0x35,0x42,0x62,0x58,0xf7,0x4c,0x65,0x0a,0xac,0x3c,0xac,0xfe,0x52,0x94,0x87,0x1a,0x98,0x93,0x06,0xee,0xc1,0xf9,0x3c,0x85,0xf3,0x46,0x48,0xd3,0xe1,0xe6,0x4b,0x57},
+            {0x24,0xb0,0xf6,0x11,0x85,0x78,0xf5,0x57,0x27,0x8a,0xf2,0xde,0xae,0xa6,0xbc,0xff,0x73,0xb7,0xc1,0xfc,0x2c,0x03,0x4f,0x05,0x29,0xb8,0x04,0xb5,0xa3,0x66,0x7f,0x7c},
+            {0xa8,0x53,0x09,0x5e,0x6a,0xbb,0x3d,0xa3,0x6d,0xab,0x40,0xeb,0xa9,0x81,0x07,0x04,0x4c,0x9b,0xd7,0x06,0xa5,0x95,0x69,0xc2,0x7d,0xf4,0x95,0x6a,0xf6,0xa2,0x86,0x7a},
+            {0x7b,0xc7,0x5c,0x27,0x8a,0x52,0x2c,0x3f,0x2f,0xe3,0x2b,0x83,0xc4,0xe5,0xac,0x1f,0x00,0x2b,0x97,0x04,0x24,0xea,0x95,0x34,0xec,0xb7,0x05,0x19,0xe2,0xff,0xe1,0xf5},
+            {0x96,0x8a,0x9f,0xab,0xed,0x55,0xc4,0xff,0xe4,0xdf,0x25,0xe7,0xaa,0x61,0xda,0x56,0xe6,0x7b,0xb3,0x9f,0x40,0x7d,0x6c,0x13,0x8d,0x89,0x49,0xf0,0xeb,0xd2,0xd6,0x54},
+            {0xc0,0x1b,0x87,0x6b,0xfc,0xe2,0x42,0x25,0x4e,0xd9,0x8e,0xbe,0x89,0x99,0xd5,0xbc,0xe9,0xd6,0xaa,0x8a,0x0a,0xfc,0xd6,0x43,0xf1,0x92,0xc9,0xc5,0x8b,0xa0,0x56,0x97},
+            {0x0f,0x25,0xdd,0xf3,0x3a,0xf8,0x68,0x39,0x7a,0x40,0x58,0x6b,0x9b,0x29,0xc7,0x59,0xb5,0xf4,0x8c,0x5d,0x5e,0xcf,0xfd,0x65,0xc8,0x02,0x5e,0xae,0x40,0xcd,0x45,0x5c},
+            {0x9b,0x2a,0xa1,0x76,0xb8,0x97,0x8b,0x1a,0x6e,0xd7,0xc1,0xa7,0xea,0x23,0x8f,0xa5,0x94,0x14,0x08,0x57,0x97,0xfc,0xc9,0x1a,0x2f,0x0b,0xcd,0x4b,0xa2,0xa5,0x6b,0x17},
+            {0x45,0x48,0x07,0x43,0x71,0x82,0xe5,0xbd,0x11,0x26,0x54,0xfa,0x4d,0xd0,0x79,0xfa,0x0e,0xc3,0xd7,0x01,0xf6,0x10,0x75,0xd1,0x67,0x1c,0x63,0x00,0xe7,0x7c,0xc3,0xa2},
+            {0xdf,0xb4,0x3a,0x5c,0x2c,0x31,0x24,0x1a,0x80,0xa3,0x16,0x40,0x36,0x12,0xfc,0x16,0x00,0x7a,0x8b,0xb0,0x46,0x52,0xeb,0x33,0x16,0xbb,0xcf,0x1a,0x0f,0x87,0x83,0xef},
+            {0xf0,0xc2,0xb7,0x2b,0x9e,0x3f,0x3e,0x0d,0xda,0x04,0xe2,0xc9,0x4a,0xd8,0x26,0x89,0x0c,0xb8,0xfa,0x89,0x1b,0x51,0x9b,0x63,0xa1,0x64,0x6f,0xb0,0x06,0x90,0x77,0x2b},
+            {0x8f,0xc8,0xc2,0xfb,0x73,0x7c,0x13,0xee,0xe5,0x57,0x51,0xce,0x1d,0xc7,0x98,0xfa,0x29,0x1d,0x42,0x88,0x58,0xe1,0xcd,0x86,0x2e,0xab,0xd8,0x95,0x07,0xdd,0x0f,0x65},
+            {0xa8,0x44,0x81,0xa8,0x96,0x6b,0x29,0xdc,0xad,0xe6,0xa3,0xe5,0x86,0x92,0xad,0x88,0x68,0xa0,0xb7,0x29,0xee,0xef,0xfa,0x1e,0x25,0xcf,0xc9,0x5f,0x7b,0x39,0x12,0xdb},
+            {0x91,0xc8,0xe0,0xeb,0xbe,0xe6,0x01,0x82,0x87,0x19,0xaa,0x29,0xd7,0x66,0x4b,0x5d,0x94,0xe3,0x50,0x1f,0x37,0x78,0x99,0x9c,0x60,0xa9,0x75,0xea,0x74,0xbb,0x00,0xf8},
+            {0x86,0x86,0x20,0x70,0x93,0x3c,0x5b,0x4c,0xbe,0x7d,0x1b,0x29,0xe1,0x5c,0x72,0x87,0x66,0x07,0x91,0x09,0xda,0xda,0x7f,0x51,0xab,0x02,0xb0,0x37,0x96,0xff,0xea,0x61},
+            {0x2a,0xca,0x32,0xca,0x5d,0xa8,0x6a,0x14,0x87,0x8e,0x22,0x1d,0xd1,0x32,0xcf,0x11,0xe9,0xf8,0x58,0xa1,0x69,0x4e,0xb6,0x6c,0x29,0xcd,0x24,0x5e,0xd4,0x9a,0x81,0xc4},
+            {0x62,0x1a,0x41,0xb8,0x3f,0x8e,0x92,0x99,0xfa,0x89,0xf2,0xf5,0x24,0x5c,0xcb,0xe3,0x4d,0xdf,0x35,0x2e,0x12,0x70,0xc6,0xef,0x09,0x41,0x61,0x70,0x8f,0x86,0xed,0xcf},
+            {0x23,0x98,0x45,0x83,0xb0,0xab,0x93,0x21,0xf1,0x1a,0x5c,0x05,0x4c,0xa8,0x91,0xc1,0xb5,0x94,0x0c,0xa0,0xee,0x01,0x74,0xa7,0x01,0xed,0x91,0xd8,0xf7,0xc5,0x2d,0x33},
+            {0x69,0xdc,0x06,0xa8,0x5e,0xfe,0x0e,0x51,0x88,0x4b,0xb0,0xe8,0x21,0x5d,0x50,0xea,0x2d,0x2c,0xd5,0x9f,0xf9,0x70,0x80,0x79,0xe9,0x04,0x34,0xbb,0x24,0x12,0xb2,0x17},
+            {0x96,0xbd,0x0d,0x2f,0x1f,0xf8,0x36,0x0f,0x48,0x46,0xe7,0x9d,0x20,0xa3,0x1b,0x6e,0xab,0x37,0x05,0xf5,0x2f,0xd7,0x37,0x74,0x1b,0xda,0x05,0x68,0xe6,0x29,0xac,0xd0},
+            {0x7d,0xf4,0xdd,0x37,0x3b,0x3f,0xac,0x18,0xa0,0xec,0x77,0x5c,0x11,0x1b,0x47,0xf9,0x64,0x84,0xf3,0x27,0x0a,0x6d,0x5d,0x9b,0x14,0x55,0xd4,0x33,0x7c,0x03,0x1b,0x62},
+            {0x65,0xb5,0x85,0x50,0x0d,0x0e,0x4f,0x02,0x1b,0xf4,0xf6,0x25,0xc7,0xf4,0x8b,0xfb,0x02,0xd3,0x2e,0x9e,0x53,0x2e,0xc9,0xcb,0xc0,0xc2,0x64,0x24,0x7f,0x9c,0x94,0x46},
+            {0x28,0xe2,0xb1,0x12,0x30,0xc7,0x28,0x13,0x1c,0x23,0x12,0xf8,0x64,0x34,0xb9,0x34,0xb1,0xe3,0x4e,0x98,0x5c,0x16,0x01,0xfa,0x17,0x74,0x0b,0x78,0x20,0x77,0x5f,0xc1},
+            {0xf1,0xee,0xc6,0x72,0x2e,0x3a,0x8a,0x36,0x26,0xa3,0xb9,0xcb,0x45,0xce,0x9c,0x80,0xfd,0x08,0xbb,0x7e,0x71,0xc3,0x8d,0x7b,0x63,0x7a,0xa9,0x86,0xc6,0x20,0x62,0x73},
+            {0xcd,0x5c,0x00,0xf5,0xaa,0x13,0x87,0x60,0xef,0xd5,0x1f,0xab,0xfb,0xa8,0x3c,0x09,0x64,0xc4,0x7e,0xaa,0x2e,0x54,0xf9,0x5b,0x95,0x2b,0x43,0x7e,0xd6,0x6a,0x5a,0x80},
+            {0x16,0x55,0x7e,0x57,0xe3,0xb2,0x9f,0x12,0x0e,0x52,0xc5,0xd9,0xc0,0x8f,0x07,0xf9,0x33,0x40,0xbc,0x79,0x91,0x0a,0x29,0x95,0x3d,0xf8,0xa4,0xfc,0xda,0x6b,0x74,0x5e},
+            {0x68,0x3f,0xca,0x73,0xc7,0x07,0xae,0x66,0x2b,0x51,0x6a,0x2c,0x0e,0x27,0x93,0xe6,0xa7,0x64,0xb9,0x90,0xaf,0x2f,0x2c,0xe8,0xc3,0x15,0x1e,0xa7,0x5e,0x93,0x79,0xaf},
+            {0xb7,0x7d,0x4a,0x94,0xdb,0xc5,0xce,0x10,0x92,0x10,0x28,0x8a,0xa0,0xcd,0x3e,0xdc,0x83,0xf6,0x71,0xae,0x9a,0x91,0x72,0x49,0x5e,0x70,0x5e,0xa9,0x02,0xba,0x90,0xe7},
+            {0x55,0x06,0xfe,0x1e,0x61,0x26,0xca,0xbd,0xbf,0xde,0xb4,0xcb,0x59,0xbf,0x30,0xbf,0x21,0xed,0xc8,0x68,0x04,0x6b,0x26,0x3d,0x69,0x23,0x45,0x64,0x9b,0x3f,0xd6,0xc2},
+            {0xe9,0x4b,0x83,0xfb,0x44,0xf8,0x1d,0x60,0xf8,0x2a,0x98,0x44,0xed,0xb2,0x55,0x95,0x63,0xff,0xc8,0x76,0xbc,0x58,0x4f,0x4f,0xc4,0xe1,0x10,0x49,0x23,0x7a,0xc6,0x0e},
+            {0x39,0x5c,0xc5,0x8f,0x6d,0xc0,0x10,0x18,0xcd,0x33,0x4b,0xf6,0xac,0x29,0xb8,0xf5,0xec,0x33,0x85,0xec,0x32,0x54,0x70,0xb4,0x08,0xbc,0x2e,0x8d,0x9a,0xf1,0x17,0x55},
+            {0x34,0x63,0x44,0x2e,0x45,0xc1,0xc1,0xdf,0x95,0x2e,0x97,0x60,0xf9,0x1b,0x99,0xea,0x8a,0x0f,0xb6,0x04,0xb2,0x03,0xc2,0x7f,0x03,0xa9,0x55,0xfe,0xa0,0x38,0x1c,0xeb},
+            {0x41,0xf4,0xc0,0x41,0x58,0x6f,0x3e,0x74,0x68,0xfa,0x44,0xde,0x1e,0xa7,0x45,0xe3,0xd4,0x1b,0x99,0x42,0xdc,0x19,0xcf,0x35,0xb5,0x56,0x59,0x78,0x44,0x9a,0x78,0xdd},
+            {0x31,0xb3,0x1a,0x28,0x54,0x69,0xf5,0x16,0x01,0x5a,0x50,0x45,0xdd,0x84,0x34,0x64,0x2b,0x2f,0x55,0xf1,0x93,0x73,0xb9,0xe0,0xd5,0x53,0x0e,0x84,0x3d,0xee,0xcc,0xf7},
+            {0x94,0x3b,0x28,0x2f,0x0b,0xe5,0x7b,0xc8,0xc9,0xb5,0xad,0x4f,0x47,0xaa,0xdf,0xc0,0xa4,0x39,0xaf,0x58,0x52,0x2a,0x44,0x95,0xb7,0xcb,0x36,0xe0,0xad,0x43,0xa6,0xca},
+            {0xf1,0xd7,0xd6,0xd9,0xdc,0x97,0xdd,0x43,0xe3,0xb7,0x6b,0xc1,0x3c,0x69,0x73,0xe3,0x15,0x72,0xfa,0x17,0x92,0x33,0x5c,0xe0,0x38,0x7c,0xa1,0x71,0x23,0x68,0x38,0xb5},
+            {0x01,0xcc,0x0f,0xad,0xd0,0xcb,0xb9,0xe8,0xaa,0xa0,0xdd,0x49,0x29,0x1e,0x39,0xf3,0xf3,0x25,0x03,0x09,0x43,0xc8,0x04,0x11,0x78,0x73,0x8b,0xfb,0x66,0x2a,0x71,0x6a},
+            {0xd9,0x6e,0xc8,0x21,0xe2,0x9c,0xbe,0xeb,0x8b,0x9f,0x25,0xf7,0x12,0x3c,0x8d,0x5d,0x70,0x81,0x59,0xda,0xf8,0xac,0xd1,0x2e,0x7a,0x80,0x0c,0x72,0x52,0x1a,0x4e,0xfa},
+            {0xb5,0x39,0x5d,0xe9,0x09,0xf1,0xca,0xde,0x84,0x61,0x76,0x88,0x02,0x10,0xf4,0xa5,0x60,0xcc,0xd3,0x18,0x0f,0x8b,0x70,0xd2,0xd4,0xbf,0x15,0x32,0x5f,0x19,0x6d,0xdb},
+            {0xe4,0x47,0xd8,0xec,0xd5,0x44,0x43,0xd4,0x67,0x4c,0x84,0xcc,0x84,0x76,0x3a,0x18,0xb9,0x16,0x1c,0x76,0x39,0x9e,0xad,0xaa,0x82,0xdd,0x74,0xcf,0x31,0x53,0x50,0x64},
+            {0x8f,0x47,0xc2,0x3e,0x99,0x82,0x13,0x38,0x8a,0x6a,0xbc,0x7d,0x3b,0x57,0x54,0x33,0x6b,0xd0,0xea,0xcf,0x4e,0xb5,0x45,0xb0,0x82,0x5a,0xba,0xde,0x1a,0xe4,0x8f,0xeb},
+            {0xb2,0xb5,0x53,0xa0,0xaf,0x73,0x7c,0x39,0x12,0x20,0x70,0x71,0x46,0x95,0x17,0x22,0x2d,0x3d,0x37,0x04,0xc7,0xc4,0x5b,0xed,0x01,0xf3,0xca,0xe1,0xb5,0x0c,0x54,0xd4},
+            {0xeb,0xd2,0x71,0x1b,0x23,0x30,0x37,0x7b,0x5d,0x7f,0xd2,0xf3,0x9a,0x72,0x0b,0x89,0x6a,0x7e,0xef,0x7d,0x7f,0x0a,0xc2,0xa1,0xd0,0x73,0x90,0x02,0xa1,0x51,0x1a,0x00},
+            {0xd6,0x2a,0x31,0x42,0xe4,0xc4,0xa2,0xc8,0x7e,0x80,0x14,0x01,0x2b,0x80,0x48,0x05,0xdf,0xa6,0xf7,0xd5,0xda,0x1a,0x27,0x0f,0x7c,0x34,0x01,0x47,0x9a,0x3b,0x2f,0x51},
+            {0x01,0x42,0xc3,0x6f,0xee,0x83,0x9b,0x58,0x89,0x18,0xbd,0xad,0xaf,0x8c,0x73,0x7f,0x91,0xd6,0x1b,0x92,0x0d,0xfc,0x58,0x1e,0x05,0x33,0x5f,0x6f,0x2c,0xbc,0x33,0x10},
+            {0xe7,0x29,0xc4,0x20,0x28,0x46,0x0e,0xe3,0x3d,0x01,0xa1,0x5c,0x2e,0x36,0x90,0x48,0xbb,0x79,0xf8,0xdd,0xfd,0x70,0xa2,0x2d,0xcc,0xd4,0x3b,0x1c,0x58,0xd4,0x19,0x33},
+            {0x6f,0xd2,0x27,0xca,0x8a,0x63,0xcd,0x5a,0xae,0x1c,0xb5,0x90,0xc6,0xd3,0xba,0xcc,0xc3,0x51,0x83,0x06,0xe2,0x2d,0xb6,0x80,0x95,0xde,0x25,0xf0,0xcc,0xb4,0xb4,0x9f},
+            {0x80,0xec,0xe1,0x4b,0x16,0x4a,0xdb,0x41,0x81,0x70,0xba,0x9f,0xea,0xa4,0xd3,0x52,0xcf,0xc6,0xcb,0x1e,0x31,0xe4,0x7b,0x32,0x39,0x16,0x3d,0x2c,0xdb,0x54,0xea,0xf8},
+            {0x04,0x20,0x5a,0xc2,0x9b,0xee,0xa2,0xaa,0xd3,0x20,0x08,0xfe,0x47,0xc9,0xac,0xc0,0x2e,0x3e,0xbc,0x9f,0x66,0xc1,0x6d,0xb6,0x85,0xc8,0xf0,0x97,0x6f,0x35,0x62,0xaa},
+            {0x07,0x1d,0x3e,0x6a,0x46,0x59,0xc3,0x7f,0xec,0x52,0x60,0x1f,0xe9,0x9c,0xcb,0x4d,0x2a,0x24,0x80,0xf3,0xa4,0xa7,0xbc,0xd1,0x6f,0x12,0xff,0x21,0xfe,0x84,0xa6,0x66},
+            {0x57,0xf2,0xfc,0xe9,0xdc,0x52,0xbc,0xcd,0xec,0x3d,0xe4,0x76,0x3a,0x02,0xe3,0x70,0x0d,0x13,0x95,0x30,0x03,0x19,0x0d,0x56,0x0a,0x8a,0xb3,0x06,0xb8,0x1c,0x12,0x21},
+            {0x07,0x6c,0x6e,0xa3,0xb8,0x4d,0x7f,0x25,0x35,0xd0,0x34,0xe5,0x37,0x13,0x78,0xe9,0x34,0x5d,0xee,0x62,0x94,0x7f,0xfe,0x4d,0xe3,0x18,0x5d,0x02,0xa2,0x15,0x23,0x40},
+            {0x0e,0x38,0x6c,0xa6,0xf2,0x16,0x1a,0x1c,0x64,0xa4,0x07,0x2c,0xe7,0xa5,0x07,0xe1,0x13,0x1e,0xdb,0xd9,0x04,0x46,0x72,0x3d,0x84,0xa4,0x1d,0xcd,0xda,0xed,0x43,0x24},
+            {0x48,0x04,0x2f,0x94,0x5a,0x82,0x5b,0xc8,0xce,0xa4,0xe8,0xfe,0xf1,0xda,0x5c,0x85,0xb2,0x52,0x05,0x41,0x37,0xad,0xb5,0xe1,0x23,0xdb,0xef,0xbc,0xc1,0x89,0xdb,0x93},
+            {0x41,0x0d,0x27,0xdd,0xdb,0xea,0x61,0x0f,0xf9,0xc4,0xe6,0x35,0x4b,0x18,0x7f,0xe8,0xa2,0xf7,0xc5,0xb1,0x9c,0x55,0x63,0xe2,0xa1,0xbc,0xa1,0xa4,0xb4,0xb8,0xc6,0xf1},
+            {0x45,0x3c,0xe5,0xc1,0x0b,0x3d,0xe7,0xa4,0xfd,0x1b,0x0b,0xd5,0xf9,0x65,0x12,0xd0,0x5f,0xba,0x41,0x11,0x72,0x99,0xd5,0x88,0xa4,0x74,0x05,0x85,0xfc,0x29,0x55,0x90},
+            {0x67,0x7e,0x34,0x87,0x4e,0x3d,0xde,0x27,0xba,0x4a,0x98,0x77,0x78,0xde,0x7b,0x1a,0x64,0xb6,0xc6,0x30,0x51,0xf3,0xcf,0xc7,0x74,0xeb,0xd4,0xc3,0xfc,0x60,0x5b,0x7a},
+            {0xc9,0xbf,0xc4,0x0e,0x1b,0xe4,0xbe,0xfc,0x1b,0x44,0xe3,0x8b,0x47,0x11,0x67,0x66,0x7f,0x6b,0x12,0x45,0x7d,0x5c,0x82,0x66,0x2e,0xf3,0xa0,0xa0,0xe9,0xf6,0x6e,0x2e},
+            {0x4c,0xd1,0x69,0xe1,0x3f,0x4a,0xca,0x41,0xb1,0x58,0x92,0x4d,0x9f,0x1b,0x97,0x2a,0xa4,0xd1,0x67,0xd6,0xd9,0xc1,0x16,0xe7,0x09,0x4a,0x7a,0x06,0xd9,0x6e,0x63,0x87},
+            {0xaa,0xd5,0xa8,0x4a,0xc0,0x8d,0xcb,0xcd,0x06,0xb4,0xfd,0x5a,0x0c,0x5d,0x2c,0x1a,0xf8,0xeb,0x0d,0x65,0x68,0xf1,0x7b,0x3d,0x8c,0xc4,0x7d,0x06,0x4b,0x72,0xa3,0xde},
+            {0x4d,0x49,0x5f,0x70,0x90,0x7d,0x93,0xc7,0xc1,0x14,0x29,0x90,0x92,0x7f,0x1a,0x3d,0x59,0xe3,0x21,0x8a,0x34,0xdb,0x88,0x17,0x14,0x25,0x0e,0xa6,0xe9,0xae,0xa8,0x4b},
+            {0x8c,0x43,0xd6,0x6f,0x0d,0x23,0xb8,0x8c,0x17,0xd1,0x9a,0xa0,0x1c,0x64,0xab,0x1d,0x2a,0xf7,0xc4,0x37,0x04,0x95,0x23,0x26,0x12,0x9b,0x0d,0xab,0x44,0x53,0xcf,0xcc},
+            {0xc1,0x25,0x81,0xdc,0x70,0x7a,0x3a,0x6d,0xa4,0x78,0x86,0xac,0xa1,0xc2,0xaa,0xbb,0x5b,0xab,0xcc,0x0e,0x0f,0xb2,0x18,0x08,0xc2,0x7c,0x6d,0x5a,0x93,0x98,0x41,0xdb},
+            {0x2c,0x63,0xae,0xf8,0x4a,0x0c,0x81,0x2b,0x53,0xe3,0x76,0x56,0xcc,0x6d,0x5e,0x8f,0x64,0xf8,0xe4,0xf8,0x55,0x2e,0x4e,0x50,0x2d,0xbb,0x1a,0xa0,0x31,0x9e,0x13,0xc1},
+            {0x86,0x88,0x6a,0x41,0xf2,0x63,0x9a,0x79,0x10,0x85,0xb6,0xa2,0xbe,0x4f,0x2a,0xc4,0xf7,0x6d,0x95,0x18,0x80,0xef,0xf5,0xca,0xfc,0x72,0x27,0x85,0xab,0x4d,0x64,0xf7},
+            {0x73,0xbb,0x64,0x6c,0x63,0x63,0xf9,0x6e,0x1e,0xcc,0x19,0xf5,0xdd,0xf7,0xdf,0x41,0x73,0x27,0xb9,0x08,0x9c,0x1b,0x70,0xa8,0x67,0xf7,0x99,0xaf,0x03,0xcb,0x3d,0x66},
+            {0xeb,0xe5,0x18,0xfc,0xcb,0xdf,0x53,0xbf,0xed,0x56,0xfd,0x1f,0x8f,0x3b,0x11,0x4b,0x58,0x49,0xa8,0xfb,0x6e,0x14,0xad,0x7b,0xf3,0xf2,0xa2,0xba,0xf2,0x97,0x75,0xc2},
+            {0xdb,0x82,0x68,0x4a,0x4b,0x31,0x4c,0x55,0x4f,0xa6,0x13,0x9c,0x4c,0x7e,0xde,0x02,0x45,0xf6,0x8b,0x32,0xa8,0x85,0xc8,0x19,0xef,0xee,0x12,0xab,0x0c,0x02,0x74,0x14},
+            {0x5a,0x98,0x5f,0xf0,0xbe,0x58,0xaa,0x5a,0x46,0xa0,0xf4,0x12,0x2c,0xb7,0x0c,0x7e,0xbb,0x93,0x7f,0x78,0x02,0xa3,0x3a,0x32,0xd8,0x26,0x2e,0x63,0xb3,0x77,0x17,0x96},
+            {0x93,0x8f,0xfa,0x6e,0x22,0xfc,0xcd,0xc7,0x1d,0x6c,0xa1,0x54,0x4c,0xec,0xe5,0x45,0x18,0xb9,0xfb,0x75,0xca,0xc5,0x73,0x6a,0x04,0x68,0x42,0x0c,0xb9,0xf5,0x04,0xb3},
+            {0x47,0x26,0xef,0x07,0x28,0x88,0xe9,0xd5,0xad,0x65,0x34,0x27,0x90,0xb2,0x85,0xc7,0xff,0x02,0x4d,0x60,0xb0,0x84,0xc3,0x23,0x77,0xea,0xe6,0xfa,0xf6,0x7d,0xb5,0x36},
+            {0x57,0x29,0x2f,0x40,0x69,0x04,0x04,0x88,0x55,0x14,0x8e,0x3d,0xc0,0x4c,0xdb,0x08,0xce,0x05,0xa5,0x8f,0x17,0x48,0x67,0xde,0x68,0x8b,0x25,0x2e,0x44,0x80,0x96,0xf0},
+            {0xef,0x8e,0x25,0xe0,0x05,0xdd,0xa6,0xd6,0xca,0xc7,0x94,0x70,0x06,0xe1,0xf6,0x88,0xc7,0x43,0xef,0xac,0xb7,0x63,0x3c,0x34,0xeb,0xbe,0xd7,0xf8,0x77,0x07,0xa3,0xd7},
+            {0xb9,0x0e,0x5a,0xda,0x24,0x55,0x15,0xdc,0x90,0xc2,0xfe,0xc0,0x28,0xce,0x83,0x59,0x70,0x8a,0x61,0x09,0x27,0xc3,0xf9,0xcb,0x92,0xbd,0x93,0xef,0xf2,0xfb,0x59,0xde},
+            {0x32,0xde,0xd7,0xb1,0x74,0xc9,0x52,0x83,0x07,0xb8,0x04,0x26,0x92,0xbd,0x00,0x48,0x0d,0x31,0xdb,0x96,0x83,0xc9,0x47,0x6a,0x4f,0x50,0x08,0x5a,0xa6,0x81,0x08,0x93},
+            {0x53,0x2a,0x40,0xb4,0x90,0x48,0xd2,0x69,0x5a,0xb6,0xce,0x15,0x57,0x23,0x77,0xea,0x0b,0xef,0xb5,0x7b,0xf6,0x31,0x1e,0x5b,0xc8,0x9a,0x3b,0x57,0x95,0x61,0x83,0x7f},
+            {0x58,0x77,0x82,0xfd,0x39,0x13,0xfd,0xd0,0x1f,0x9f,0x47,0x5f,0x25,0xe0,0x70,0x4a,0xb8,0x34,0xd8,0x9f,0xac,0x46,0xa0,0xbe,0x1d,0x88,0xe5,0x4d,0xe6,0xb5,0x07,0x01},
+            {0xb9,0x13,0x89,0xa5,0xcf,0x8a,0x1c,0x10,0xe8,0x90,0xee,0x4c,0x74,0x0f,0xe9,0x99,0x4d,0x48,0xe9,0x99,0xb5,0x9a,0x2c,0x63,0x20,0x39,0x7a,0x38,0x9e,0xc7,0xa3,0x16},
+            {0x6e,0x73,0x70,0x36,0xb6,0xc0,0xc9,0xd7,0x2a,0x72,0xc8,0x54,0x5c,0xc8,0x35,0xd4,0xcf,0x7d,0xa7,0x0c,0x5e,0xa3,0x3f,0x6c,0x60,0x03,0xfb,0x84,0x45,0x65,0x35,0x4f},
+            {0x2f,0x23,0x9f,0x75,0xca,0xba,0x39,0x09,0xf2,0xb6,0xf0,0x59,0xa7,0x82,0xc2,0x62,0x4a,0x71,0xb5,0x91,0xa7,0xe1,0x32,0xef,0x72,0xb4,0xad,0xd3,0xc9,0xc2,0xd7,0x38},
+            {0x95,0xd4,0xdd,0x64,0xbc,0xc8,0x9d,0x80,0xef,0xe8,0x4c,0x9f,0xb5,0xd4,0xa1,0x7a,0xc7,0x11,0x5d,0x1b,0x38,0xa0,0xac,0x02,0x62,0xe7,0x68,0x79,0x05,0xeb,0x1c,0x4f},
+            {0x44,0x87,0xd6,0x12,0x26,0x0e,0x1a,0x6c,0x67,0x6d,0x29,0x67,0xce,0xdd,0x84,0xcc,0x5a,0xde,0xe2,0xac,0x84,0x5a,0xb2,0x90,0x0a,0xa1,0x93,0xa1,0xb8,0x6f,0xad,0xe2},
+            {0x97,0xed,0xff,0x35,0xd1,0x87,0x2b,0x6a,0x95,0xf4,0x36,0x06,0xf0,0x84,0xde,0x35,0xae,0xf0,0x29,0x2c,0xd4,0x11,0x54,0x12,0x43,0xbf,0x73,0x36,0xa9,0x05,0xa9,0x38},
+            {0x90,0x01,0xc5,0xd6,0x27,0xaf,0x96,0x8d,0x68,0xf1,0x22,0x00,0x66,0x25,0x85,0x92,0x1a,0xab,0x14,0x61,0x99,0x35,0xc8,0xbe,0x47,0x75,0xc4,0x57,0xe2,0xa4,0x08,0x67},
+            {0xba,0x95,0x92,0x23,0xc1,0x63,0x6c,0x7b,0x0d,0x10,0xb4,0x3b,0x78,0xc1,0x82,0x1e,0x7a,0xf6,0xf6,0xae,0xe1,0xf8,0x03,0x37,0xc5,0x55,0xa4,0x70,0x86,0x7c,0x5a,0xd8},
+            {0x9f,0x8b,0x49,0x37,0xdb,0x81,0x72,0xa5,0xe0,0x1b,0x31,0x31,0x0c,0xb3,0xb7,0x48,0x24,0x91,0x0f,0x9c,0x52,0xc3,0x56,0xc1,0x70,0x35,0xd7,0x01,0x73,0x79,0x40,0x89},
+            {0x17,0x50,0xc0,0x7b,0x09,0xdf,0xc5,0x2f,0x0c,0xb0,0xf0,0x9f,0x45,0x60,0x09,0x5d,0xb1,0x35,0x12,0x7c,0xab,0x4c,0x51,0x1c,0x52,0x5f,0x56,0x0c,0x42,0x02,0x5a,0xbd},
+            {0xa5,0x1e,0xe9,0x80,0x93,0xbf,0x11,0xeb,0x04,0x55,0xcf,0x10,0x6b,0x3a,0x4e,0x02,0x71,0x35,0xe8,0x70,0xe3,0xe5,0xfb,0x21,0x2c,0x42,0xd6,0x2e,0x19,0x0f,0x15,0x3f},
+            {0x35,0x50,0x1a,0x82,0xa4,0x78,0x04,0xcf,0x77,0x18,0xd6,0xbd,0x2e,0x4b,0xb6,0xfd,0x67,0xd7,0x63,0x99,0x84,0xea,0xde,0x0c,0x12,0x32,0xbc,0x2c,0x74,0x58,0x83,0x43},
+            {0x9c,0x31,0x92,0xc2,0x43,0x5a,0x9c,0xf8,0x15,0xb7,0x17,0xec,0xbc,0x6c,0x53,0x9c,0xac,0x03,0xc7,0xf5,0x82,0xdb,0xda,0x88,0x9b,0x39,0x48,0x58,0x95,0xf3,0xe1,0x74},
+            {0xdd,0xf0,0x4c,0xdf,0xd5,0x36,0x6d,0x08,0xb5,0x88,0x6e,0xf7,0x36,0xdb,0xf5,0x47,0xa4,0x03,0xf5,0x83,0xcd,0xd7,0xc0,0x89,0xf9,0xf3,0xc4,0x23,0x9e,0x55,0x42,0x10},
+            {0x26,0x75,0xb3,0x0b,0xcd,0xa3,0xda,0x6a,0x2c,0xb6,0x83,0x7e,0x61,0x4a,0xda,0x85,0x8c,0x1b,0xdd,0xbd,0x42,0xe6,0xc3,0x96,0x3e,0xb2,0x20,0xc2,0x90,0xfb,0xf9,0x67},
+            {0xdb,0xd9,0x13,0x4a,0xd3,0xf0,0x94,0x06,0xa7,0x6e,0xba,0x91,0x32,0x3a,0xb3,0xad,0x2a,0x4f,0xc0,0xbf,0xf4,0x97,0x5b,0x2c,0xc4,0x80,0xbd,0x44,0x03,0xac,0x75,0x60},
+            {0x29,0x29,0x52,0x0c,0x43,0xb1,0x4c,0xe2,0x4a,0x94,0xbf,0x56,0x87,0x05,0x20,0xdd,0xfe,0x4d,0x29,0xbb,0xcb,0xa0,0xd0,0xe1,0xc4,0x62,0x42,0x92,0xd8,0x71,0x98,0x32},
+            {0xf7,0x15,0x13,0xcd,0x36,0xec,0x05,0x74,0x35,0x88,0x15,0x87,0x01,0x3b,0x2f,0xea,0x18,0x1c,0xb5,0x7d,0xf1,0xcd,0x97,0x98,0xe9,0xb4,0xbc,0x2b,0x04,0x57,0xe7,0x78},
+            {0xb8,0x39,0x71,0xa9,0xcb,0xba,0x79,0x03,0x23,0x9a,0x1d,0x2a,0x59,0x07,0x35,0x1c,0x61,0x02,0x8b,0x95,0x2d,0x4d,0xd2,0x07,0xdd,0x49,0xf6,0xfc,0xc9,0xab,0xc1,0x3c},
+            {0xc3,0xb7,0xe6,0x79,0xbd,0x4d,0x0d,0xab,0x1a,0x2e,0x79,0x38,0xb0,0xd5,0xcd,0x8c,0x28,0x20,0x0c,0x5d,0xa9,0x53,0x4b,0xda,0x97,0xea,0x0f,0x1e,0xa8,0x1c,0x4a,0xaf},
+            {0x77,0xcc,0xae,0xb0,0x9a,0x35,0xc5,0xa1,0xdf,0x5b,0xec,0xe6,0x81,0x06,0x2f,0x6c,0xe9,0xfe,0xa0,0x8b,0xbc,0x2c,0x20,0x75,0xae,0x23,0x59,0x46,0xe8,0xe1,0xd9,0xd4},
+            {0x51,0x00,0x1f,0x07,0xd1,0x46,0x2c,0xd9,0x31,0x2b,0x07,0x7b,0xe9,0x15,0xdf,0xd5,0x22,0x5b,0x85,0xc3,0xba,0x76,0x0e,0x2a,0x41,0x42,0x75,0xab,0xa5,0xfe,0xe6,0x55},
+            {0xab,0x0f,0x6f,0x8f,0x5e,0x58,0x80,0x30,0x93,0xff,0xf1,0x68,0xc3,0x8d,0xe2,0x71,0x0c,0x2a,0xff,0x8b,0x47,0x66,0x1e,0xaa,0x3a,0xe2,0xa3,0x37,0xc0,0xe7,0x1e,0xcf},
+            {0x96,0xe9,0xce,0x51,0x8b,0xea,0x74,0x43,0x2b,0x7a,0xa4,0xc8,0x57,0xb2,0xe2,0x42,0x3a,0x4b,0x3f,0x48,0x27,0x5f,0xc4,0xb4,0x8f,0x87,0xca,0xec,0x87,0x80,0x0b,0x87},
+            {0x60,0xc0,0xb7,0xa0,0xcc,0xbe,0x77,0x92,0xb9,0x33,0x2a,0xd6,0x07,0x26,0x36,0xd9,0x79,0x0f,0xf7,0x36,0xe2,0xd8,0x3a,0x12,0xf5,0x0e,0x7d,0xfe,0xc6,0x5a,0x26,0x80},
+            {0x38,0x17,0x5a,0xba,0xe6,0x19,0x1a,0x78,0xd9,0x57,0xe3,0xc6,0x31,0x21,0x03,0x66,0x88,0xcb,0x6b,0x8c,0x46,0xd4,0x2d,0x02,0x65,0x51,0xad,0x37,0xa6,0xae,0xcc,0xb1},
+            {0x48,0xd8,0x2a,0x8c,0xe4,0x3a,0x65,0xf5,0x67,0x58,0x4b,0xfe,0x7f,0xb2,0x8c,0xf8,0xc8,0x4b,0xc7,0x25,0xc7,0x34,0x13,0xb8,0x76,0x8d,0x2e,0x66,0x88,0xae,0x77,0xf9},
+            {0x18,0x62,0x1d,0x94,0xf2,0x73,0x3b,0xf9,0x28,0x9e,0x03,0x53,0xf0,0x66,0xc5,0x3d,0x95,0xef,0x8d,0xde,0x44,0x9b,0x2e,0x16,0x0e,0x28,0x23,0x2c,0xaf,0x17,0xdf,0x74},
+            {0xe8,0x6c,0x65,0x44,0x9e,0x6b,0x87,0x1a,0xc6,0x88,0x65,0x26,0x10,0x7b,0x8d,0x7b,0xfa,0xca,0x46,0x8e,0xf2,0x70,0x17,0x25,0x76,0xbd,0x9f,0x39,0xfd,0x20,0x8a,0xad},
+            {0xc3,0x2b,0xde,0x20,0x8f,0x90,0x87,0x25,0x9f,0xab,0x6b,0x05,0x3d,0xb2,0x5b,0x1b,0x13,0x6b,0x38,0x27,0x69,0x42,0xe2,0x42,0x04,0x82,0x85,0x5a,0x5d,0x7a,0xd1,0x7a},
+            {0xdf,0xb5,0x5a,0x52,0x93,0xf9,0x34,0xd4,0x0f,0xf7,0xc0,0xa6,0x74,0x9a,0xad,0x57,0x80,0x6e,0x57,0x1d,0xf1,0x85,0xf5,0x92,0x04,0x4e,0x69,0xe6,0x80,0xe9,0x95,0xa2},
+            {0x8c,0x2a,0x1c,0x5e,0xea,0x4c,0x8d,0xad,0x31,0x3b,0xbc,0x6b,0xea,0xe0,0xc4,0xd9,0x48,0x28,0xfc,0xb2,0xa4,0x87,0x7b,0x19,0x76,0x1e,0x75,0xc7,0x4f,0xc1,0x01,0x64},
+            {0xee,0xd8,0xa7,0x0b,0xc0,0xd9,0x4f,0xdd,0x32,0x62,0x93,0x73,0xb5,0x0e,0xb9,0xef,0x83,0x02,0x82,0xb4,0x2d,0xcb,0x1d,0x8b,0x96,0xfd,0xb9,0xb8,0xa1,0x79,0x7d,0xf9},
+            {0x2c,0x47,0x35,0xa6,0x0c,0xfa,0xe0,0x27,0x3c,0x4f,0x30,0x9b,0xe5,0x79,0xa5,0x1c,0x6e,0xbb,0xed,0x02,0x00,0x71,0x5a,0x82,0x60,0x48,0xb1,0xee,0x56,0x8d,0x49,0x34},
+            {0xf7,0xe5,0x64,0x18,0x53,0x95,0x29,0x40,0x1d,0x07,0x80,0x87,0x9a,0xd1,0x26,0x6a,0xee,0x0f,0x03,0x54,0xda,0x07,0x48,0x6c,0xea,0xb8,0x20,0x11,0xa0,0x69,0xde,0xef},
+            {0xac,0xa8,0x6f,0xb3,0xd7,0xd9,0xfb,0x64,0xe9,0x20,0xee,0x5d,0xdc,0xcf,0xa7,0x82,0x27,0xa0,0xa3,0xa3,0xe4,0x0b,0xb3,0xb2,0x75,0xf1,0x14,0x18,0x6e,0x48,0x8c,0x78},
+            {0xbd,0x4b,0x2c,0x02,0xf0,0x73,0x05,0x16,0x40,0x10,0x35,0x33,0x83,0x41,0x5b,0x08,0xf5,0x70,0xfb,0xf3,0xfb,0x29,0x7d,0xf7,0x4a,0x38,0xd6,0xf6,0xe3,0xae,0x99,0xab},
+            {0x58,0x99,0x08,0xe2,0x64,0xb0,0xc9,0x1b,0x13,0x58,0xf1,0xa5,0x1f,0x02,0x0d,0xaf,0x47,0x3b,0x7e,0x4d,0x5f,0xaf,0x49,0x3b,0x36,0x25,0x78,0x28,0x66,0xb4,0x76,0xff},
+            {0x70,0x36,0x0b,0x52,0x0b,0x95,0x93,0x81,0x74,0xc5,0xb0,0xc2,0x40,0x0d,0xa3,0xb0,0x47,0x74,0x3e,0x60,0xd8,0x37,0xbf,0x56,0x77,0x67,0x73,0x2d,0x74,0x8e,0x99,0x1a},
+            {0xa5,0x4e,0xd8,0x74,0x56,0xed,0x36,0x1b,0x71,0x4d,0xa5,0xc5,0x6f,0xae,0x7c,0x4c,0xfd,0x92,0xf8,0xac,0x4a,0x6e,0x8e,0x90,0x1a,0x56,0x52,0x41,0xa3,0x95,0x69,0xdc},
+            {0x9d,0xf7,0xaf,0xdf,0x23,0x76,0x05,0x06,0x6f,0x98,0xcf,0x95,0x61,0x1f,0x49,0xf5,0xc5,0xf3,0x83,0xa0,0x80,0xc8,0x6d,0xc3,0x75,0x33,0x90,0xc5,0x62,0x7e,0xfc,0xa1},
+            {0x62,0x81,0x42,0x47,0x93,0xe1,0x44,0x59,0x0d,0xdb,0x68,0xa8,0x59,0x72,0xc4,0x52,0x72,0xa5,0xca,0x39,0x22,0x7f,0x9d,0x24,0xd0,0xbf,0xe7,0x8e,0x2b,0xb8,0x25,0x80},
+            {0x13,0x65,0x7e,0x27,0xb8,0x2c,0x76,0x89,0x42,0xfa,0xb4,0x07,0xde,0xeb,0x64,0x5e,0xcf,0xd9,0x58,0xf5,0x06,0xa6,0xe0,0x2c,0x95,0xd1,0x19,0x62,0x0c,0xac,0x86,0xec},
+            {0xcc,0x67,0x90,0x6e,0x35,0xcd,0xa0,0x00,0x74,0x0c,0x83,0xf5,0x0b,0x24,0xb9,0x2b,0xd0,0x4c,0x58,0xf2,0xa0,0xc4,0x55,0x80,0xe9,0xa1,0x34,0xc2,0x84,0x58,0x08,0x04},
+            {0x44,0xe9,0x2c,0xef,0xa2,0xc8,0x69,0x56,0x0d,0x18,0x5d,0x18,0xba,0xaf,0xa7,0x80,0xbf,0x16,0xf1,0x48,0xd1,0xa7,0xea,0x18,0x6f,0x05,0x59,0x7b,0x18,0x78,0x36,0x06},
+            {0x8a,0xe2,0x61,0xdd,0x18,0x67,0x9d,0x8e,0x20,0x3e,0x7b,0x4c,0x8d,0xd2,0x41,0xa5,0x16,0x34,0xa8,0x4f,0x83,0x85,0x5b,0x55,0x9f,0x7b,0xa5,0x57,0x28,0xd9,0xc9,0xde},
+            {0x02,0x69,0xbb,0x4c,0x30,0x79,0x70,0x9f,0xb8,0x0f,0x3a,0xa4,0x51,0xa8,0x95,0xb6,0x39,0xe3,0xb7,0xdb,0x83,0x36,0x0a,0x14,0xf0,0x78,0xf2,0x68,0x16,0x97,0x9d,0xae},
+            {0x2f,0xaf,0x07,0x9e,0x75,0xb3,0xe9,0xe0,0x29,0x8f,0xb1,0x5e,0xf8,0xc6,0xd5,0x37,0x15,0xcb,0xa4,0x27,0xc8,0xc5,0x51,0xe9,0x8d,0x44,0xa3,0xc4,0x6a,0x67,0x41,0x4e},
+            {0x74,0x5a,0x15,0xe4,0x0b,0xf0,0x64,0x83,0xcf,0x58,0x18,0x8b,0x9c,0x7d,0xf9,0x9e,0x79,0x67,0x54,0xdc,0x4b,0xf3,0xeb,0x05,0x47,0xb1,0x1f,0xd8,0x01,0x6c,0x5c,0x66},
+            {0x70,0xdb,0xd0,0x60,0x38,0xf2,0x69,0xea,0xd5,0x5d,0x56,0x0b,0x7f,0x96,0x0d,0x24,0xc7,0xcb,0x3a,0x9c,0x88,0x64,0xfe,0x68,0xc0,0xda,0xeb,0xf3,0x15,0xcf,0xcc,0x9e},
+            {0x1d,0xda,0x09,0x94,0xaf,0x01,0x42,0xdc,0x5f,0x71,0x64,0x67,0x35,0xed,0x3b,0xbd,0xb4,0xf6,0xeb,0x40,0x95,0x58,0x36,0xdb,0x16,0xfc,0x75,0x24,0xef,0xf2,0x2e,0xd7},
+            {0x49,0x2a,0xf1,0x27,0xff,0x75,0xfa,0x55,0xf9,0x4e,0xd9,0x19,0x38,0x69,0x17,0x77,0x8e,0xd9,0xc5,0x1e,0x4c,0xd1,0x93,0xb7,0x5d,0x82,0x52,0x4c,0x18,0x6a,0x1b,0x5d},
+            {0x50,0x31,0xae,0xc7,0x7b,0xa1,0x3f,0x73,0xb2,0x1e,0x5c,0xf9,0x27,0x08,0xf4,0x4c,0x0e,0xdf,0xd1,0x08,0x1c,0x89,0xb4,0x63,0x0a,0x0e,0xe3,0xa5,0x0b,0x91,0x79,0x4b},
+            {0x85,0x9b,0x71,0x97,0xbd,0x1a,0x5d,0x6b,0x8d,0xbc,0xa9,0xd6,0xc9,0x63,0x21,0xe7,0x06,0x70,0x8c,0xba,0x23,0x86,0x6d,0x44,0xbf,0x3f,0x01,0x4d,0xeb,0xa6,0xa4,0xbf},
+            {0x31,0x08,0xf9,0x98,0xd1,0x46,0x96,0xb3,0xe9,0x45,0x56,0x9c,0xa9,0xb4,0x73,0x46,0xb2,0x6f,0x8a,0x37,0x00,0xcd,0xd4,0x44,0xf5,0x45,0xfd,0x0a,0x03,0x96,0x88,0x91},
+            {0xb7,0xcd,0xe7,0xaf,0x47,0xf0,0xdf,0x23,0x41,0x9c,0xcb,0xa5,0x7d,0xa1,0x9a,0x5f,0xf7,0x64,0x5f,0xa1,0x60,0xe1,0x36,0xd4,0x3c,0x82,0x7f,0x41,0xb4,0x60,0xde,0xcc},
+            {0x18,0xcb,0x72,0x36,0x90,0x4f,0x97,0x84,0xd6,0x11,0xeb,0x67,0xb5,0x3d,0xaa,0x31,0xef,0xac,0x1a,0x8a,0x9a,0x7d,0x2f,0xf4,0x7d,0xc3,0x42,0x55,0xba,0x27,0x6a,0x57},
+            {0x16,0x70,0x70,0x3a,0xae,0xf6,0xd8,0xc7,0x22,0xbd,0xac,0xac,0xc3,0x1a,0x80,0xdc,0xba,0xc0,0x32,0x6d,0xce,0xe6,0x4b,0xec,0xba,0x13,0x39,0xbc,0xf6,0x30,0xe3,0x30},
+            {0x6a,0xe6,0x7b,0xdc,0x91,0x16,0x7c,0x7e,0xfd,0x00,0x5b,0xe6,0x88,0x1b,0x58,0xd2,0x4a,0xbd,0xe9,0xf8,0xc3,0xa7,0x1e,0x6a,0xec,0xdb,0x8e,0x67,0x38,0xf3,0xd1,0x69},
+            {0x3e,0xfd,0xad,0xf9,0xad,0x79,0xdd,0x00,0xee,0xee,0x1d,0x80,0xe4,0x0a,0x82,0x97,0x25,0x4f,0x24,0x9a,0x9d,0xde,0x4b,0x4d,0x94,0xb6,0x56,0xd5,0x83,0x38,0xfc,0x5f},
+            {0xd1,0x4a,0xd9,0x88,0x7a,0x66,0x06,0x76,0x58,0xaf,0xeb,0x25,0xa6,0x48,0x66,0xbf,0x90,0xde,0xbc,0xcb,0x49,0xcb,0x82,0x13,0x18,0x4b,0x80,0x7e,0x9f,0x12,0x84,0xaa},
+            {0x7f,0x2b,0xb0,0x55,0xf5,0xdd,0x83,0x4b,0xed,0xc5,0xba,0x9d,0x63,0xb3,0xc8,0x33,0x22,0xe4,0x32,0x5d,0xe7,0x86,0x6b,0x2a,0xf7,0xff,0x86,0x92,0xbb,0x2b,0x52,0xec},
+            {0x72,0x9e,0x0a,0xb2,0x7d,0x04,0xbf,0x1c,0x14,0xdc,0x28,0xc4,0x2e,0xa5,0x6c,0xd7,0xfc,0x1a,0x82,0x07,0xef,0x20,0x7a,0xc3,0x4e,0x67,0x65,0x77,0xfc,0x32,0x00,0x6e},
+            {0x3a,0xea,0x58,0x5e,0x17,0x2d,0xf0,0x36,0xa1,0x0a,0x0a,0x3c,0x26,0xeb,0xf4,0x70,0x59,0x72,0xeb,0x3e,0xfb,0x5b,0x61,0x60,0x22,0x31,0xb8,0xa2,0xb2,0x94,0x2b,0x19},
+            {0xa3,0xb0,0x17,0x53,0xe9,0x34,0xa1,0x6e,0xea,0x44,0xae,0xd4,0xa7,0x56,0xb7,0x58,0x2a,0xa1,0xb4,0x69,0xac,0x46,0x2c,0xcf,0xe4,0xc9,0x22,0x68,0x70,0x55,0x91,0xb4},
+            {0xd5,0xaf,0x66,0x8c,0xae,0xda,0x6f,0x6a,0xf2,0x7a,0x77,0x83,0x59,0xce,0x91,0x96,0xba,0x09,0x1c,0xc0,0x4d,0x9f,0x9b,0x39,0x28,0xf8,0xf5,0x20,0x3f,0xc3,0xfc,0x88},
+            {0xa6,0x31,0x9e,0xb5,0x45,0x25,0x7c,0xd4,0xc8,0x49,0xe2,0xcc,0xa4,0xc6,0xfa,0xab,0xea,0x94,0x90,0xea,0xfa,0x37,0x23,0x43,0x48,0x00,0x33,0x1f,0x22,0x2b,0x86,0xfb},
+            {0xa4,0xf0,0x01,0xd0,0x56,0x40,0x26,0x7e,0x07,0xca,0xac,0x4c,0xad,0x71,0x22,0x77,0x14,0x51,0xf3,0xf9,0x97,0xca,0xee,0x43,0x59,0x65,0xcb,0xd1,0x9e,0x64,0xa6,0x21},
+            {0xf8,0x52,0x57,0x7e,0xac,0xf9,0x26,0xa5,0xdb,0x69,0x21,0xda,0x93,0xb4,0xa7,0x8f,0x00,0xf5,0x7e,0x06,0xfc,0x06,0x4a,0xc0,0x26,0x33,0x97,0x6e,0x35,0xd9,0xe0,0x0a},
+            {0xc4,0x8d,0xa9,0xdb,0x46,0x19,0x3f,0xcd,0xa5,0x52,0x47,0x6b,0x8c,0x08,0xfe,0x35,0xa7,0x3f,0xf1,0xbc,0x19,0x50,0xa4,0x1f,0x3b,0x1e,0xc0,0x98,0xd2,0xf7,0x5a,0x47},
+            {0x7b,0x26,0xf8,0xd8,0x32,0xed,0xc5,0xd6,0xc0,0x25,0xbe,0x91,0x89,0x21,0x67,0x66,0xb5,0x8a,0xb2,0x7f,0x59,0xe7,0xb2,0x53,0xd0,0xec,0xe4,0xd2,0x8f,0x51,0xe2,0xd8},
+            {0xcc,0x5b,0x91,0x21,0xf7,0x49,0x88,0xf1,0xba,0xfb,0xe4,0xeb,0xdb,0x72,0x96,0xd2,0x25,0x5a,0x4a,0xf6,0xf0,0x1f,0x69,0x67,0xc7,0x39,0x15,0x68,0xc3,0x23,0x77,0xce},
+            {0x29,0xfe,0x88,0x93,0x33,0x91,0xce,0xdc,0x88,0x64,0x75,0xd8,0xaa,0x7b,0x68,0x41,0x5a,0x7f,0x3e,0x80,0xe1,0x53,0xd8,0x83,0x7c,0xac,0xba,0xec,0x3f,0x47,0xd8,0xc1},
+            {0x39,0x2c,0xf2,0xab,0x94,0x26,0x25,0xfa,0xd7,0x54,0xd7,0x38,0xf3,0x37,0x32,0xd3,0x17,0x2f,0x42,0x13,0xa8,0x60,0x63,0x68,0x33,0x0f,0x72,0x37,0x3e,0xc9,0x9c,0x64},
+            {0xb9,0xca,0x5c,0x8d,0x1d,0x64,0x33,0x4e,0x58,0x6b,0xa1,0xf0,0x30,0x3d,0x3f,0xe8,0x02,0xa0,0x3e,0xca,0x9c,0x2a,0xa1,0x2d,0x2f,0x57,0xe7,0x98,0x36,0xd0,0xb6,0x4a},
+            {0xc4,0x7d,0x0f,0x78,0xa1,0x4f,0x36,0xea,0x4a,0x9d,0x1f,0xdc,0xa7,0x45,0x96,0xa8,0x8f,0x93,0xdd,0x9a,0x0e,0x74,0x6d,0x97,0xc9,0x1a,0x79,0x76,0x24,0x20,0x39,0x0e},
+            {0x74,0xa1,0xf2,0x74,0xdd,0xa9,0x92,0x66,0x3e,0x03,0xa2,0xa1,0x0f,0x29,0xc8,0x4d,0x41,0xe2,0xe2,0x02,0xbf,0x56,0xe6,0x58,0xc1,0xa4,0x2e,0xbe,0xd4,0x6d,0xb2,0x02},
+            {0xdf,0xa9,0xdc,0xc1,0x32,0x70,0x1d,0x8b,0x1f,0x43,0x32,0xe2,0xa6,0xbc,0x7f,0xaa,0xe3,0xc7,0xcf,0x11,0xac,0x09,0x09,0xa8,0x3c,0x4c,0x7e,0x30,0xfc,0xbe,0x7d,0xcb},
+            {0x35,0xd4,0x39,0x51,0x90,0xd5,0x70,0xf8,0x28,0x8d,0x25,0x55,0x33,0xec,0xa2,0xfd,0x7b,0xb1,0x3e,0x72,0x0d,0x6e,0x8f,0x5a,0x71,0x13,0x09,0x4f,0x97,0x53,0x8c,0x5f},
+            {0x70,0xa1,0x62,0x44,0xe7,0x48,0x0d,0x09,0x2b,0x61,0x72,0x42,0x78,0x6d,0xee,0xe6,0x70,0x56,0xd0,0x7c,0xb1,0x53,0x65,0xfe,0x51,0xd0,0xe8,0xab,0x1e,0x89,0x32,0xa1},
+            {0xa2,0x68,0x43,0xf4,0x8f,0x4f,0x2a,0x21,0x8b,0x8f,0x5b,0x21,0x91,0x47,0x64,0x1c,0xa2,0x36,0xa1,0xab,0xd9,0x69,0x05,0xd8,0x53,0x43,0x50,0xe5,0x70,0xb1,0x64,0xe2},
+            {0x5d,0x9e,0xed,0x35,0x01,0x75,0xb4,0xd1,0x21,0x7b,0x25,0xe6,0x71,0xc2,0xf3,0xc9,0x86,0x8c,0x87,0x32,0xb6,0xdf,0xa8,0x0e,0x62,0xe4,0xa9,0xbc,0x70,0x10,0xdc,0xf6},
+            {0x72,0xdb,0x39,0x13,0xaa,0x06,0x6e,0x04,0x66,0x2c,0xc1,0x70,0xf3,0x36,0x35,0x78,0xfa,0x47,0x79,0x9b,0x64,0x56,0x1d,0x3b,0x9e,0x84,0x59,0x8b,0x43,0xee,0x8c,0x26},
+            {0xe4,0x06,0xdb,0x4d,0xeb,0x9c,0xc7,0x9c,0x8e,0xb7,0xd6,0x58,0xc3,0x82,0xc2,0x29,0x16,0x68,0xd7,0x91,0x7d,0x73,0xc6,0x52,0xc4,0x15,0xf3,0x7a,0x3f,0x71,0x3b,0x0f},
+            {0xa0,0xfa,0xec,0xe9,0x33,0x21,0x37,0x56,0xd2,0x22,0x39,0xd1,0xa0,0x66,0xc1,0x73,0x0f,0xe5,0x8b,0x3e,0x81,0x5d,0xf5,0x2c,0x2d,0xe1,0xfc,0xa1,0x02,0xb0,0x3c,0xaf},
+            {0x9d,0x6b,0xc1,0x04,0x78,0xd9,0x34,0x52,0x60,0xc5,0x3c,0x40,0xde,0x93,0xcc,0xd7,0xb1,0xf3,0x44,0xdc,0x25,0xe6,0xe4,0xcc,0x81,0x99,0xe1,0xed,0x9c,0x6d,0xc8,0x24},
+            {0xff,0x1a,0x79,0xb9,0xd9,0x54,0x94,0x31,0x47,0xa0,0xb2,0x9d,0x67,0xce,0x6f,0xca,0xe1,0xf9,0xf8,0xd5,0x47,0x6c,0x2b,0x8e,0xaf,0x78,0xac,0x57,0x5f,0x95,0x24,0x7c},
+            {0xba,0x31,0xc3,0x0e,0x4a,0x28,0xd5,0xad,0x22,0xa3,0x64,0x04,0x2b,0x71,0x55,0xe5,0xf4,0xee,0x00,0x89,0x29,0xf2,0x2e,0xce,0xb3,0xfb,0x73,0x71,0xd0,0xc1,0xc2,0xa0},
+            {0x79,0x7b,0xb5,0x53,0xef,0x79,0xe0,0x9e,0xb1,0xaa,0x54,0x00,0xa8,0x89,0xbc,0xaa,0x51,0x35,0x83,0x66,0x2c,0x37,0x08,0x61,0x4e,0x29,0xb2,0x02,0xcf,0xc3,0xb8,0x0d},
+            {0x3d,0xf0,0x7a,0xe6,0x89,0x0b,0x2c,0x33,0x25,0x56,0xc2,0x47,0xee,0x91,0xab,0xf3,0x41,0xc5,0xdc,0xe2,0x26,0xe3,0x8d,0xf0,0x9f,0x70,0x10,0xb1,0xc2,0x16,0x15,0xf6},
+            {0x30,0xde,0x20,0x51,0x72,0x5d,0x9f,0x0f,0xc3,0x71,0xcf,0xa5,0x5a,0xad,0xed,0x73,0xb1,0x2e,0x06,0x68,0xb1,0x62,0x47,0x75,0xb6,0x57,0xae,0x0f,0x41,0xed,0x8d,0xaf},
+            {0x03,0x5e,0x44,0x8a,0xfd,0xaf,0xd5,0x06,0x9a,0x78,0x3a,0xbc,0xd6,0xe2,0x68,0xa8,0x2f,0x43,0xa5,0x2d,0x9e,0xa8,0x05,0xc1,0x14,0x1d,0x32,0x95,0x57,0xd2,0x02,0x9f},
+            {0x1c,0xd5,0x9a,0x8a,0xc8,0xc6,0x1f,0x8f,0x97,0xcf,0xcd,0x1e,0x43,0xd6,0x33,0xf4,0x1f,0x0b,0x3b,0x37,0x82,0xe3,0xde,0xb3,0xd0,0xa9,0xd8,0x09,0x42,0xb5,0x20,0x77},
+            {0xb1,0xbd,0x93,0x8d,0x82,0x88,0x16,0x7f,0x4a,0x98,0x5a,0xbf,0x34,0x2f,0x97,0x7c,0xfd,0x1c,0x2f,0x1d,0xa7,0x0c,0x60,0x37,0xc9,0xbd,0xc4,0x29,0x5a,0x70,0x57,0x26},
+            {0x41,0x82,0x97,0xa2,0xf0,0xc0,0xe5,0xc3,0xd6,0xb2,0xc4,0xd8,0x08,0x24,0xe1,0xa9,0x09,0xa6,0x1f,0xce,0x6c,0x18,0xbc,0x93,0x77,0x20,0xee,0xcb,0x1c,0xe3,0x68,0x2f},
+            {0x06,0x03,0x1d,0xf9,0x0b,0x06,0xaa,0x84,0xd5,0x8d,0xa9,0xde,0x78,0x80,0x8f,0x7b,0x2c,0xd7,0xd5,0x63,0xf4,0x1d,0xbe,0xd6,0x83,0xe7,0x4b,0xcd,0x78,0x84,0x72,0x0d},
+            {0x28,0x96,0x15,0x17,0xd5,0x08,0xb8,0xe9,0x63,0xf9,0x82,0x72,0xdc,0xbe,0x63,0x6a,0xf5,0xf9,0x9e,0x6f,0xbf,0x43,0x6d,0x14,0xb9,0xb6,0x42,0x73,0xb1,0x78,0x57,0xa0},
+            {0xba,0xc1,0x13,0xe3,0xe3,0x57,0x2e,0x90,0xda,0xd3,0x8b,0x0c,0x2b,0x32,0xde,0xb7,0x8f,0x90,0x27,0xe5,0x9b,0x75,0xdb,0x03,0xd0,0xfb,0x86,0xc4,0x9c,0x2d,0x6d,0x9d},
+            {0x26,0xa5,0xe2,0xf8,0x17,0xb0,0x59,0x6d,0x95,0xc8,0xa8,0x2c,0xbb,0xfe,0xec,0x69,0x71,0xda,0x22,0x47,0xce,0x1c,0xfa,0x52,0xbc,0x50,0x98,0xeb,0xdf,0xd3,0xc0,0x84},
+            {0xba,0x7b,0xae,0x49,0xa5,0x77,0xe1,0x5e,0x14,0x56,0x8c,0xec,0x5f,0x77,0x9c,0x47,0x00,0xc8,0xec,0xbd,0x21,0xbc,0x8c,0xfb,0xd3,0xaa,0x56,0xeb,0x09,0x48,0xdd,0x27},
+            {0x90,0xbd,0xd5,0x04,0x83,0x66,0x27,0xc4,0x0d,0x4c,0x14,0xd5,0x4d,0xa1,0xb3,0xdc,0x5c,0xf5,0xb6,0xb1,0xca,0xcf,0xe2,0xe2,0x20,0xd1,0xaa,0x44,0x85,0x0f,0x6f,0xba},
+            {0x02,0xf1,0x55,0x3a,0xb9,0xb4,0xf4,0x48,0x6f,0xbe,0xe6,0xf5,0x73,0x5f,0xfe,0x0d,0x9b,0x30,0x5f,0xea,0xe9,0xa1,0x20,0xdf,0x2e,0xa3,0x11,0xfd,0xe4,0xcc,0x60,0x76},
+            {0x2a,0x9e,0xc4,0x6c,0xca,0x51,0x84,0x10,0x6d,0x4d,0xf2,0x25,0xde,0x39,0x42,0x21,0x36,0xc6,0xcc,0x99,0x5f,0xb9,0xd1,0x24,0xbd,0xd6,0x40,0xea,0x45,0x66,0x7a,0x13},
+            {0x28,0xa2,0x5b,0xb6,0x86,0x69,0x6f,0xcf,0xcd,0xee,0xd1,0xa9,0x96,0xff,0x4f,0x89,0x56,0xdd,0x4c,0x41,0x58,0x7d,0x59,0x9e,0xb7,0x8a,0x83,0xab,0x6b,0x13,0x58,0xc8},
+            {0x42,0x2b,0xb7,0x8c,0x51,0x07,0xf8,0xf0,0xa5,0xe1,0xa2,0x53,0x34,0x7a,0x72,0x89,0x47,0x04,0xcc,0x4d,0x8d,0x1f,0x60,0xa4,0x9a,0x49,0xf8,0xc5,0xdb,0xaa,0xf2,0x98},
+            {0x74,0xf3,0xc4,0x3f,0xcc,0x95,0xc2,0x63,0x54,0x12,0x9e,0x18,0x24,0x1a,0x1e,0x74,0x7c,0x78,0x97,0x5c,0x4b,0xfb,0xb0,0xb9,0x0a,0x2b,0x67,0xc1,0x17,0xdd,0x85,0xb5},
+            {0x8c,0x0f,0x5a,0x2a,0xeb,0x81,0xef,0x4e,0x58,0x05,0xc1,0x07,0x0b,0xfb,0x86,0x67,0xae,0x18,0x5b,0x59,0x70,0x5c,0x3c,0xab,0x2a,0xac,0x50,0x36,0x33,0x27,0xda,0xed},
+            {0x87,0xde,0xb9,0xc6,0xb6,0x2b,0x23,0x7a,0x5f,0x83,0xb7,0x33,0x37,0x76,0xba,0xee,0xbb,0x4e,0xaf,0x80,0x4e,0xf7,0x8b,0x9c,0xa2,0xc6,0x2a,0xb9,0x23,0x88,0xa6,0x97},
+            {0x42,0x89,0x7c,0xf0,0x80,0xc2,0xe4,0x05,0xa7,0x7f,0xd5,0x01,0x36,0x0a,0x7a,0x86,0xd0,0xa1,0xcb,0x7d,0x57,0x3f,0x5f,0xb0,0x7e,0x09,0x4b,0xb1,0x3a,0x94,0x2f,0x03},
+            {0x0d,0x3b,0x80,0xdf,0x67,0x85,0x1e,0xe6,0x40,0xb9,0x06,0xd7,0x61,0xfd,0x95,0xad,0x7e,0x47,0xd0,0x18,0x6c,0xdc,0xdd,0xc5,0x9a,0x10,0xa2,0x2e,0x01,0x18,0x16,0xed},
+            {0xdd,0x22,0x25,0x77,0xe6,0x3a,0x17,0x6e,0x68,0x8a,0x09,0x83,0x4b,0xa7,0xdf,0xbc,0x7d,0x25,0xaf,0x9c,0xec,0xda,0x7b,0x13,0x0e,0x48,0xa2,0x5f,0xec,0x55,0x8e,0x2c},
+            {0xf6,0xf7,0xbd,0x73,0x15,0x40,0x4b,0xee,0x4a,0x96,0x11,0xe6,0x9f,0xe5,0xd3,0x38,0x7d,0xe5,0xe4,0x57,0x7a,0xc2,0x82,0x67,0xd0,0x4d,0x69,0x94,0x6f,0x42,0xf1,0x8c},
+            {0x03,0xcc,0xe6,0x90,0xc8,0x8d,0x34,0x68,0x9a,0x3f,0xa6,0x6b,0x6f,0x8c,0x9d,0xa7,0x57,0x47,0xed,0x56,0x8e,0x63,0xfb,0x20,0x71,0x5d,0xef,0x88,0xe7,0x22,0x8b,0x38},
+            {0xd9,0xa4,0xec,0xed,0x46,0x46,0xf5,0x3c,0x78,0x40,0xf8,0x17,0xb4,0x29,0x6b,0x5b,0xf1,0x6e,0x7b,0x3d,0x5e,0x90,0x69,0x53,0xb6,0x30,0x2d,0x7b,0x8a,0x84,0x8d,0xd9},
+            {0x31,0x97,0x41,0x44,0x7a,0xa9,0xb6,0xc8,0x19,0xca,0xb1,0x33,0x68,0x12,0x5a,0x52,0xf3,0xc3,0x5d,0x26,0x42,0x49,0xd5,0xb4,0x06,0x8d,0x2f,0x37,0x90,0x10,0xf4,0xd6},
+            {0x0a,0x0f,0x3e,0xab,0x30,0xa5,0x38,0xa2,0x3a,0xc5,0x2e,0x4f,0x25,0x1d,0x38,0x3d,0x41,0x8b,0xcc,0xc9,0x6d,0x59,0x75,0x44,0x6e,0x09,0x3c,0xb4,0x24,0xe8,0xc2,0x47},
+            {0x55,0x09,0x42,0xf0,0x27,0x99,0xdc,0x99,0x85,0x61,0xd8,0x69,0x5f,0xda,0xfc,0x45,0x54,0xc5,0xa8,0x9f,0x12,0x33,0x34,0x03,0xcf,0xd7,0xc4,0xc9,0xcb,0x15,0xbb,0xec},
+            {0x1b,0x0d,0x75,0x36,0xd6,0x77,0x41,0x49,0xb4,0xed,0x8d,0xb5,0x77,0x26,0x8f,0x17,0x6e,0x4c,0x1f,0x76,0xe8,0x8c,0x9f,0x95,0x6d,0x51,0x57,0x7d,0x73,0x49,0xcf,0xa6},
+            {0x5d,0x27,0xbe,0xf5,0xa9,0x88,0xfb,0x67,0x8c,0x4e,0x17,0x8b,0x4b,0x10,0x63,0xc4,0x15,0x1c,0x5d,0x37,0x80,0xc1,0xdf,0xf1,0xec,0x2c,0xa8,0x98,0xf8,0xf8,0xcb,0x5a},
+            {0x6b,0xb4,0xb7,0x1c,0xe2,0xa7,0x2c,0x46,0x5e,0x83,0x58,0x6c,0x39,0xa2,0xc1,0xd2,0xf7,0x7a,0x47,0xec,0xfc,0xa1,0x4b,0x45,0xaf,0x36,0x5a,0x4e,0xc2,0x94,0x48,0xca},
+            {0x93,0x8e,0x0c,0x40,0x9a,0x83,0x72,0x60,0xa9,0xfc,0x27,0xad,0x58,0x78,0xf3,0xb8,0x93,0x6c,0xa0,0xe6,0x21,0x9e,0xcd,0x3f,0x9b,0xd4,0xbe,0xf6,0xc4,0x02,0xac,0xd2},
+            {0xd8,0xae,0xa1,0x40,0x4c,0x3d,0x5f,0xca,0x72,0x89,0xe2,0x51,0x29,0x82,0xbd,0xa8,0x73,0x43,0x7b,0x43,0xe7,0xb8,0xb2,0xa9,0x12,0xf3,0x83,0x34,0x0f,0x82,0x1c,0x8f},
+            {0x1f,0x4c,0xd3,0x86,0x95,0x00,0x35,0xca,0x3c,0xec,0x81,0xcb,0xa5,0xd6,0xa5,0x06,0x62,0x08,0x63,0x05,0x6d,0xa9,0x0c,0x7d,0xc9,0xa5,0xaf,0xe4,0x7d,0x0d,0x9d,0xd1},
+            {0xda,0xc0,0x66,0xc8,0x81,0xd4,0x58,0x34,0x1c,0x7d,0xb3,0x0f,0xde,0x7d,0x91,0x97,0xe4,0x98,0xee,0x57,0x7b,0xb4,0xf0,0xe0,0xe4,0x8f,0xb8,0x59,0xf3,0x79,0x01,0x43},
+            {0x09,0x38,0x1c,0xdc,0x27,0x89,0x6a,0xb6,0xc7,0x3c,0x34,0x16,0x73,0xa6,0x19,0x27,0x09,0x9e,0xaf,0x2d,0x30,0x0d,0x3e,0x00,0xea,0x37,0xea,0x6c,0xec,0xb2,0x62,0xb8},
+            {0x65,0xf6,0x55,0x98,0xa4,0x8e,0x7b,0x2e,0x38,0xef,0xa5,0x1d,0x45,0x4e,0xf1,0xf2,0x6b,0xe0,0x16,0xc6,0xa7,0x01,0x81,0xe2,0x6b,0xf3,0x59,0x21,0x99,0x86,0x71,0xea},
+            {0x98,0xd9,0x91,0xca,0xb4,0xe7,0x08,0xf9,0x28,0x1d,0x1f,0x56,0xb1,0xa5,0x07,0x02,0x6a,0x11,0x4a,0xb0,0x73,0x3e,0xc2,0xdd,0x57,0x2b,0xbe,0xaa,0x22,0xfa,0x48,0x87},
+            {0x1c,0x2a,0x4e,0x2b,0xf0,0xdc,0x9a,0x09,0xe5,0x11,0xba,0xff,0x42,0xc2,0x97,0xb3,0x21,0xcb,0x8d,0xa4,0x5c,0x18,0xec,0x50,0xe4,0xc3,0x9c,0xa2,0x46,0x5d,0x7c,0xd5},
+            {0x32,0x7c,0x7a,0x6d,0x05,0xd5,0x22,0x53,0x6e,0x61,0xaa,0x1f,0xbe,0x8f,0xa1,0x9f,0x78,0x1f,0x91,0x5e,0x20,0xa6,0x6a,0x64,0x7e,0xa9,0x0a,0xbe,0xd8,0x87,0x9f,0xb4},
+            {0xcb,0x46,0xcc,0x08,0xd3,0x2b,0x5b,0xc7,0xae,0x94,0x80,0xf3,0x08,0x84,0xc7,0x67,0x0b,0x8e,0x86,0x94,0xd6,0x6d,0x54,0x38,0xe5,0xf8,0xfe,0x81,0x78,0x5d,0xcd,0x1c},
+            {0x53,0x7f,0xa4,0xc4,0x16,0x90,0x90,0x3a,0x48,0xb7,0xa6,0x32,0x24,0x91,0x44,0xf1,0x54,0xc5,0xdc,0x46,0x86,0xf5,0x18,0x68,0xdf,0x01,0x59,0xa0,0x35,0x0a,0x4e,0xa5},
+            {0x75,0xa5,0xe4,0x32,0x25,0x82,0xd7,0xe2,0x40,0xde,0x8e,0x8b,0x0a,0xb9,0xad,0x73,0xb7,0xe2,0x83,0x42,0x85,0x37,0x33,0x8b,0x41,0xb3,0x51,0x07,0xdd,0x63,0xea,0x2c},
+            {0x1f,0x87,0x05,0x40,0x01,0xc0,0x68,0x63,0xb6,0x6f,0x55,0xb3,0xa8,0x97,0xac,0x0d,0x76,0xf3,0x61,0x90,0x89,0x00,0xb3,0x0e,0x1d,0x8f,0xfa,0x46,0x74,0x2b,0xfd,0x16},
+            {0x22,0x19,0x7f,0x47,0x35,0xd5,0x1a,0xa3,0x9e,0xf4,0x8c,0x88,0xc4,0xd6,0x08,0x18,0x24,0x5f,0xca,0x73,0xb9,0x8d,0xf8,0xb9,0x66,0x9d,0xc4,0x34,0xc6,0xac,0x87,0x96},
+            {0xa2,0xe1,0x4d,0xc3,0x73,0x62,0xb8,0x9a,0x5b,0x85,0xc5,0x7b,0x3b,0x48,0x16,0x9a,0xdb,0x2e,0x6d,0xd5,0x36,0x0b,0x80,0x30,0xde,0x7a,0x0e,0x02,0x8a,0x6d,0xb3,0xb2},
+            {0x67,0x6f,0x77,0x06,0xeb,0x7a,0x57,0x39,0x7f,0x6c,0x9f,0x69,0xde,0x04,0xcb,0x03,0x7d,0x3a,0x10,0x45,0x28,0x1b,0x8a,0xd8,0x39,0x02,0x44,0xb9,0xaf,0xc7,0xa2,0xd1},
+            {0x8d,0xef,0xc1,0x87,0xfb,0x1f,0x0d,0x7b,0xfe,0xa6,0x57,0x61,0x9f,0x9a,0x02,0x0f,0x30,0x3f,0x0c,0xed,0xe2,0x55,0xb4,0x73,0xd1,0x88,0x17,0xb5,0x00,0xb9,0x4b,0x75},
+            {0xbe,0x11,0x66,0x43,0x46,0x69,0x92,0x2a,0x76,0x45,0x41,0x78,0x97,0x05,0xf9,0xd8,0x6a,0xf0,0x58,0x72,0x41,0xcf,0x3d,0xa9,0xe3,0x3a,0x79,0x83,0xd0,0x48,0x17,0x7b},
+            {0xc5,0xad,0xb9,0x84,0x0c,0x2c,0xba,0x41,0xc6,0xe4,0x9f,0x9e,0x97,0xc3,0xb7,0x8d,0x8d,0x0a,0x1c,0x4a,0xf8,0x89,0x29,0xe8,0x9a,0xf2,0x05,0xf7,0x5f,0x61,0xce,0xbe},
+            {0xa8,0x3b,0x4a,0x5b,0x32,0x82,0xab,0x0a,0x2d,0xfa,0x4b,0x16,0x20,0xdd,0x0e,0x3e,0xce,0xfd,0x89,0xcd,0x43,0xfc,0xee,0x45,0xa1,0xa6,0xe4,0x76,0x04,0x53,0xe9,0xa8},
+            {0xae,0x21,0x17,0xb3,0xfa,0xda,0xbe,0x7e,0x3d,0x94,0x15,0x3d,0xa7,0xe6,0x8c,0x6d,0x7b,0x37,0x1e,0xfc,0x20,0x37,0x3a,0xa8,0xe1,0xd9,0x32,0x6e,0xd9,0xa3,0xb3,0x69},
+            {0xa0,0xb5,0x97,0x0a,0x81,0x57,0x0a,0x1b,0x2b,0x4d,0x05,0x8b,0x32,0xba,0x5f,0x20,0x72,0x73,0x76,0x5b,0xe3,0x98,0x98,0x64,0x90,0xed,0x5e,0x91,0x09,0xd0,0x78,0x63},
+            {0x9e,0xa2,0x21,0xfe,0x02,0xec,0xd3,0xc9,0x74,0x95,0x7e,0xc2,0x47,0x96,0xaf,0xb6,0x77,0x67,0x2f,0xd1,0xca,0x77,0x0a,0x13,0xec,0x9c,0x3a,0x94,0x13,0x5e,0xf0,0x6c},
+            {0xa8,0x31,0x6a,0xa7,0x41,0x16,0xd5,0x33,0x97,0x3b,0x74,0xf5,0x28,0xda,0xc5,0xbc,0x25,0x7a,0x3e,0x9c,0xfd,0xea,0xe3,0x9d,0xb7,0xd8,0xd3,0x2f,0x38,0x08,0x5f,0x4e},
+            {0xef,0xc5,0x25,0x0b,0xdf,0xe4,0x23,0x46,0xa1,0xd0,0x32,0xef,0x4c,0x71,0x89,0xcf,0xea,0xf3,0x03,0xaf,0x28,0xa1,0x2b,0x3b,0xe0,0x74,0xda,0xee,0xa8,0x10,0xb1,0x71},
+            {0x9a,0xa7,0x19,0x4f,0xdc,0x5f,0x39,0xe9,0xea,0x59,0xa1,0x3d,0x04,0x15,0x89,0x13,0xdf,0x4c,0x87,0xed,0x38,0x5b,0x32,0xa3,0x7f,0x21,0x6c,0x17,0xab,0xfc,0x69,0xc1},
+            {0xa1,0x7f,0x4c,0xce,0x7a,0x3a,0xa8,0x6d,0x9b,0xd5,0xd5,0x1f,0x3c,0x38,0xf2,0x35,0xfc,0xc4,0xb0,0x86,0xa7,0x46,0x03,0x0a,0xf9,0x39,0x99,0x7d,0x05,0xe5,0x4f,0xe5},
+            {0x98,0xb0,0x49,0x49,0x4b,0x46,0x8b,0x0c,0x6c,0xdb,0x3c,0xf3,0x82,0x28,0x31,0x10,0x66,0x8d,0x91,0x90,0x05,0x67,0x8e,0x4e,0x8a,0x55,0x50,0xa8,0x92,0xce,0x13,0x3b},
+            {0x1f,0xf2,0x64,0x90,0x5c,0x3f,0x04,0x0c,0x3f,0xca,0xa1,0x07,0xb7,0xdf,0x3c,0x38,0xec,0x0d,0xc7,0xd5,0x9d,0xdf,0x9f,0xf8,0x78,0x0d,0x6a,0xff,0x03,0x81,0xda,0x57},
+            {0xef,0x60,0x77,0xb9,0xe1,0x43,0xf0,0x1f,0x8b,0x50,0x0e,0x2e,0xb6,0xb6,0xff,0x02,0x04,0x3e,0xc0,0x0b,0xef,0xeb,0x78,0xee,0x44,0xdb,0x5f,0x00,0xd0,0x37,0xbb,0xf9},
+            {0xca,0x1a,0xf3,0x82,0x99,0x7f,0xd7,0x51,0xc7,0x0f,0xa1,0xfe,0xa1,0xcd,0xee,0x6e,0xe1,0xd2,0xa2,0x22,0x46,0x46,0x3e,0xd7,0x86,0x7d,0x56,0xe5,0x76,0x19,0xaa,0xa5},
+            {0xbe,0x80,0x45,0x32,0x4d,0xcb,0xd4,0x6d,0x31,0xa1,0xb2,0x4b,0xe3,0x14,0xd5,0xf0,0xed,0x7b,0xd1,0xd1,0xca,0x67,0xbf,0x71,0xba,0x5c,0xc4,0x30,0x43,0xd5,0xc9,0xe3},
+            {0x70,0x45,0x5e,0x4b,0x87,0xd4,0xb0,0x15,0x85,0x56,0x4a,0x77,0xa6,0xa4,0x14,0xa5,0x33,0x38,0xc0,0x5a,0x98,0x4d,0xe6,0xdc,0xd1,0x4d,0x71,0x26,0x30,0x6e,0x22,0xaf},
+            {0x5b,0xb2,0xbf,0xe0,0xbe,0x18,0xcf,0x76,0xe3,0xf7,0x0a,0xb3,0xc6,0xef,0x28,0x16,0xdd,0x98,0x80,0x74,0xd4,0x33,0x89,0xa3,0xc4,0x47,0x97,0x03,0xd1,0xa6,0x10,0x41},
+            {0x3c,0x95,0xb9,0x17,0xd6,0x40,0x9a,0x12,0x36,0x01,0x86,0xd7,0xc8,0x83,0x9b,0x33,0xd6,0xfb,0x9a,0x7f,0x66,0xf2,0xe0,0xe3,0xa8,0x87,0x60,0x19,0x27,0xd1,0x40,0x43},
+            {0x02,0x59,0xcb,0x83,0xd1,0x12,0x93,0x16,0xee,0x62,0x03,0x61,0x34,0x1d,0x08,0x3c,0x43,0x69,0x0a,0xe5,0x42,0xe5,0xfe,0xc0,0x1f,0x88,0x7a,0xca,0xf2,0xfb,0x04,0xb9},
+            {0x9a,0xa9,0xb6,0x7c,0x72,0x0b,0x3b,0x2f,0xe3,0xef,0xf8,0x73,0x2f,0xdc,0x35,0x9a,0xb1,0x5e,0xd4,0xfe,0x10,0x92,0xe2,0x89,0xfc,0x27,0xb7,0xe5,0x5a,0x9c,0x5b,0x50},
+            {0x11,0x51,0x15,0x5d,0x7b,0xe1,0x01,0x75,0x44,0xc0,0xc2,0xb7,0x43,0x2e,0xa1,0xf6,0x7c,0xf3,0x19,0x1b,0xae,0xe6,0x47,0x71,0xe9,0x36,0x4f,0x3b,0xd1,0xda,0x37,0x08},
+            {0x9c,0x45,0xb3,0x56,0x0c,0xe8,0x41,0x98,0x25,0xae,0x84,0xaf,0xfe,0xd5,0x22,0x36,0x83,0xfc,0xcc,0xfd,0x6e,0x35,0x24,0x7d,0x1c,0x03,0xf4,0xb9,0x88,0xe8,0xf4,0x8d},
+            {0xa3,0x24,0x2a,0xa0,0xa0,0x1b,0x82,0xc6,0xd5,0xfa,0xf7,0x48,0xc2,0x2a,0x61,0x6b,0x95,0x0e,0xcd,0x30,0xef,0x0f,0x72,0x68,0x5a,0xa5,0x86,0x0f,0x93,0x20,0x76,0x1c},
+            {0x0f,0x07,0x48,0x5d,0x78,0x01,0x8a,0x50,0x6a,0x69,0x02,0x10,0x80,0xb4,0x18,0x61,0xf8,0x01,0xdd,0xad,0x09,0x66,0x60,0x90,0xe5,0x3f,0xff,0x3b,0xff,0x0c,0xfa,0x92},
+            {0xe8,0x19,0xc8,0x61,0x15,0x00,0x99,0x43,0x8a,0x5e,0xf2,0x61,0x3b,0xbc,0x8e,0x4c,0x85,0x4c,0xb8,0x41,0x05,0x21,0xe9,0x69,0x9f,0xe9,0x05,0x00,0xa9,0x12,0x74,0x43},
+            {0x4e,0x78,0xcd,0x42,0x97,0x84,0x62,0xaa,0xed,0xb9,0x93,0xb6,0xa4,0x9a,0x5b,0xa1,0x31,0x55,0x19,0xdb,0x36,0x05,0x22,0xa2,0x6a,0xdd,0x6a,0x17,0xc8,0xad,0xac,0x8e},
+            {0xb2,0x1e,0xf6,0xdd,0x59,0x76,0xca,0x60,0xb6,0xe3,0x35,0xe7,0x8e,0x47,0x9a,0x65,0x54,0x09,0xda,0x18,0x4e,0x68,0xc1,0x0e,0x0b,0x40,0x10,0xff,0x9d,0x20,0x8c,0x64},
+            {0xe8,0xbd,0x4c,0x3f,0x3e,0x0a,0x83,0x45,0xae,0x5b,0x2b,0x57,0x48,0x06,0x0b,0x15,0xef,0x0c,0x75,0x29,0xfc,0x3e,0xff,0x08,0x0b,0xec,0x1a,0x9a,0x77,0x58,0x45,0x92},
+            {0x3c,0x8d,0x2c,0x54,0xc7,0xd5,0xd8,0x26,0x49,0x8d,0x73,0x0a,0x28,0x9d,0x36,0xf9,0x03,0x72,0x0b,0x7e,0x2c,0xe1,0xf6,0x99,0xcc,0xfa,0x15,0x29,0x99,0xb5,0xa0,0xfe},
+            {0xfb,0x6e,0x02,0x5e,0xec,0x36,0x7e,0x2b,0xf4,0xb4,0x4a,0xf6,0x7e,0xa6,0x74,0xd7,0x67,0xb7,0x73,0x97,0xd0,0x56,0x85,0x28,0xe7,0xfe,0x3a,0xa7,0x57,0x4a,0xe7,0x30},
+            {0x92,0x36,0xe9,0x20,0x10,0x42,0x1a,0x2c,0x16,0x74,0xeb,0x0a,0x80,0x44,0xac,0x2b,0x21,0x5b,0x60,0x5c,0x0b,0x94,0xb9,0x03,0xf3,0xa2,0x87,0x2d,0x0f,0xab,0xd3,0x44},
+            {0x9e,0xa2,0x5f,0x2f,0x94,0x72,0x29,0x2a,0xba,0x59,0x0e,0x29,0x8f,0xc5,0xff,0x15,0xc4,0xcb,0x22,0x60,0x8b,0x2f,0x0f,0x2c,0xe1,0xbf,0x26,0xe1,0x48,0x92,0x00,0x07},
+            {0xd4,0xd1,0x8a,0x3b,0x2d,0xb8,0x54,0x0a,0x7b,0xf7,0x2e,0x0c,0xb1,0x4b,0x17,0x69,0x19,0xf9,0x95,0xe7,0x0f,0x0d,0xf6,0x07,0x48,0x9d,0x5a,0xde,0xed,0xb0,0xa9,0x32},
+            {0xe6,0xf6,0xe2,0x72,0xb3,0x67,0x31,0x48,0x47,0x82,0xbc,0xd4,0x84,0x40,0x87,0xcf,0x45,0x67,0x8a,0x05,0xd8,0xb8,0x48,0x19,0xf9,0xd4,0x1f,0x53,0x76,0xf0,0xf8,0xca},
+            {0x50,0x88,0xa2,0xb8,0x78,0x33,0x6d,0xd3,0x3c,0x3a,0x7c,0x55,0xc0,0x9a,0xa7,0x0b,0xfb,0x1d,0x34,0x81,0x5f,0x03,0x1d,0x4b,0x3e,0x92,0x40,0x2c,0x76,0x33,0xb4,0x00},
+            {0x3d,0x12,0x74,0x3c,0x54,0x0c,0x79,0x8e,0xc2,0x58,0x73,0x01,0xa3,0xfb,0x2b,0x4f,0x0f,0x6e,0x12,0x78,0xe4,0xbb,0x15,0x28,0x0c,0x24,0x72,0x72,0xff,0xed,0x06,0x51},
+            {0x52,0xc1,0x7f,0x71,0x27,0x92,0x47,0x2c,0xa8,0x0d,0xf5,0x0f,0x7b,0x9f,0x96,0xf5,0x1a,0x6e,0xb1,0x55,0xc8,0x72,0xba,0x9e,0xf4,0x60,0xaa,0x6d,0x4e,0x10,0xfe,0x39},
+            {0xb9,0x7f,0x17,0xe9,0x0b,0x9f,0xc7,0x00,0x44,0xf8,0x78,0x93,0x79,0x63,0x9e,0x52,0xf9,0x77,0x07,0xea,0xc2,0x86,0x3a,0x35,0xe9,0xa1,0x93,0x76,0x55,0x5f,0x52,0xdc},
+            {0x19,0x70,0x1f,0x39,0x36,0x8b,0x26,0xbd,0x3c,0x71,0xa2,0xf0,0x63,0x0b,0x5e,0x89,0x58,0x6f,0x72,0x49,0x43,0x18,0x43,0xeb,0x6c,0x89,0x00,0x45,0xf7,0x78,0x92,0x80},
+            {0x49,0xea,0x12,0x3c,0xea,0x99,0x0f,0x6f,0xb2,0x02,0x9e,0x8c,0xbc,0x9f,0xf7,0xba,0x7e,0x04,0x9c,0x32,0xdb,0x1f,0x65,0x19,0x30,0x6a,0xb9,0x80,0xd7,0x4d,0x0d,0x38},
+            {0xfd,0x57,0x40,0x68,0xf0,0xc0,0xdf,0x88,0xfa,0xf7,0xb5,0x43,0x41,0xa3,0x10,0x44,0x6c,0x0e,0xc9,0x49,0x31,0xbc,0x45,0x97,0x48,0xe1,0x1c,0x58,0x43,0x5d,0x6e,0xa4},
+            {0xfd,0xd6,0xcc,0x2c,0x79,0x0b,0x22,0x47,0x1f,0x03,0xa3,0x2b,0x90,0x66,0x35,0xb4,0x02,0x8d,0xeb,0xfd,0x69,0x1a,0x0a,0x57,0xf8,0x47,0xe1,0x50,0x61,0xa2,0x90,0x4c},
+            {0xb7,0xa1,0x73,0x01,0x79,0x05,0xbf,0x55,0xdf,0xe0,0x3c,0x16,0x40,0xa4,0xe8,0x08,0xdd,0x6a,0x1d,0x6b,0xda,0xeb,0x27,0x72,0x2a,0x7c,0x83,0x97,0x66,0xb8,0x46,0x5e},
+            {0x74,0xb7,0x99,0xaa,0xe5,0x3d,0xaf,0xe2,0x13,0x1b,0x18,0x30,0x68,0xd8,0xcf,0x5f,0xa8,0xf2,0xa3,0x00,0x6c,0x9b,0xb9,0x94,0x4a,0xa4,0x93,0xc7,0x49,0x1b,0x94,0xcc},
+            {0xce,0xf9,0xc0,0x6a,0x87,0xad,0xa3,0x26,0xbb,0x03,0xe6,0xa3,0x01,0xf5,0x3f,0xe5,0xfe,0x6d,0x68,0xdf,0x01,0x5b,0x4d,0x72,0xf1,0x96,0x55,0x81,0x54,0x5c,0x7f,0xd8},
+            {0xdb,0x39,0x0f,0xef,0xfd,0x9c,0xdd,0x7f,0x8a,0x34,0xac,0xaf,0xa7,0x7d,0x80,0x88,0x9a,0x82,0x0c,0x92,0x75,0x09,0x5e,0x84,0xb4,0x39,0xff,0x5f,0x05,0x78,0x1c,0xeb},
+            {0x57,0xe1,0x7c,0x1b,0x71,0xa2,0x26,0xc7,0xbf,0x02,0x68,0x75,0x65,0xe9,0x26,0x89,0xe5,0xc9,0x66,0xf5,0xc8,0x64,0xe6,0x4d,0x9a,0x62,0x1b,0xb6,0x75,0x7f,0x4f,0x2f},
+            {0xb8,0xc8,0xdc,0x26,0x24,0xb8,0xaa,0x73,0x87,0x46,0x47,0xbb,0x89,0xbe,0x27,0x65,0xfd,0xa8,0x22,0x3f,0xa7,0x05,0x57,0x96,0xa5,0x9c,0x7f,0x4d,0x19,0x18,0xe8,0xff},
+            {0x08,0xa2,0x55,0x3e,0x30,0x04,0xa2,0x55,0xc9,0xa4,0x13,0x59,0x30,0xbd,0x9f,0x87,0x24,0x42,0x37,0x47,0x13,0x5c,0x0d,0xfe,0x45,0x74,0x72,0x85,0x54,0x9e,0x4e,0xa2},
+            {0x4d,0x49,0x66,0xd1,0x72,0xbd,0x8c,0x36,0x7d,0x82,0x8e,0xb8,0xa1,0x4f,0x85,0x39,0x99,0xdf,0x13,0x94,0xfd,0xa9,0x6f,0xdc,0xdf,0x5e,0x41,0xd7,0x07,0x25,0xba,0x21},
+            {0x23,0x88,0x80,0x52,0xd9,0x15,0x01,0x7c,0x4b,0x47,0xb5,0x30,0x7d,0x25,0x15,0x8f,0xd1,0x3d,0xaa,0x02,0xbe,0xf1,0xd4,0xa2,0xc1,0x1b,0xfe,0xf7,0x9a,0x85,0x14,0x70},
+            {0x52,0xa9,0x7f,0x2b,0x53,0x21,0x39,0x78,0x4f,0x4a,0x6a,0x62,0x50,0xb2,0xe6,0x1a,0x39,0x89,0xa2,0xc9,0x45,0x34,0xc2,0x43,0x40,0x41,0xae,0xfa,0x13,0xaf,0x28,0x71},
+            {0x73,0xc8,0x2b,0x46,0x9f,0xce,0x6c,0xe8,0xb6,0xb2,0x82,0x84,0x41,0xbd,0x31,0xb6,0x67,0x84,0xb0,0x99,0x4e,0x57,0xb8,0x2d,0x33,0x1b,0xe9,0xe0,0x3c,0xdc,0xcc,0xa8},
+            {0xcd,0xbb,0x2b,0xec,0x43,0xb8,0x64,0xec,0x0d,0x7c,0xaf,0x5d,0xef,0x12,0x22,0xc3,0xcb,0xe2,0x0c,0x79,0xd9,0x7c,0x76,0x42,0x35,0x0d,0xab,0x42,0xb5,0xd1,0xaf,0x3e},
+            {0xe0,0x47,0xc0,0x75,0xc0,0x48,0x46,0x74,0x00,0x80,0x6f,0x61,0x48,0x9c,0xc5,0x03,0xdf,0xcd,0xff,0xc7,0x3d,0x4b,0x9b,0x6b,0xfa,0x47,0x04,0x27,0xf9,0x51,0x27,0xf2},
+            {0x82,0xde,0x0f,0x38,0x6c,0x63,0x55,0x55,0x42,0xe8,0xa3,0x4e,0xce,0x6d,0xd4,0x2f,0x2a,0x46,0x71,0xd4,0x37,0xe0,0x0a,0xca,0x7d,0xa1,0x75,0xe7,0xd1,0x8b,0xbc,0x85},
+            {0xfe,0xe4,0x69,0x87,0x4c,0xa3,0xfb,0x72,0xf0,0x87,0x1a,0x24,0xf4,0x10,0x28,0x4c,0x04,0x31,0x14,0x46,0xf4,0xc5,0xf0,0x44,0x80,0xd7,0xb3,0xce,0xb4,0xe7,0x8e,0xfa},
+            {0x83,0x0d,0x8a,0xa0,0x8a,0xe2,0x9f,0xa0,0x94,0x1e,0xfc,0x57,0x6c,0xb5,0x99,0x75,0xd0,0x35,0x13,0x9c,0xc2,0x72,0x13,0xd0,0xa0,0x4a,0x01,0x53,0xe4,0x52,0x07,0xd4},
+            {0xf4,0x44,0xda,0x31,0x3f,0x6e,0x7b,0xd9,0xe2,0x73,0x96,0xf9,0xa9,0x51,0x29,0xc8,0x39,0x77,0xe1,0x46,0x2f,0x86,0xe7,0xa9,0xb5,0xad,0xdb,0x1a,0x7f,0xf3,0x05,0x80},
+            {0xfa,0x60,0x14,0x78,0xa4,0x12,0x74,0x3b,0xdf,0x29,0xbc,0xf4,0x4e,0xcd,0x5f,0xde,0xdc,0x09,0x79,0x2c,0x8e,0x46,0x9a,0x73,0x99,0xbc,0x17,0xc6,0x4e,0x13,0x45,0x85},
+            {0xce,0xc5,0xef,0x97,0xaa,0x6a,0x39,0xf3,0xc1,0x46,0xc5,0xe3,0xf9,0x55,0xbc,0x90,0x28,0x79,0x85,0x91,0xd4,0xe3,0x80,0x94,0xf3,0x8f,0x70,0xe9,0x81,0x56,0x6d,0x58},
+            {0x6b,0xbf,0x46,0xcb,0x35,0xbc,0x96,0x85,0x4a,0x8f,0xae,0x0e,0x20,0x93,0x5f,0x2e,0xd3,0x2a,0xb5,0xa9,0x40,0xe7,0x89,0x1f,0xa7,0xf2,0x68,0xd2,0x8c,0xe5,0xd5,0x49},
+            {0x95,0x5d,0x97,0x41,0x50,0x3c,0x2e,0x52,0x44,0xf5,0x13,0xe2,0xc2,0x43,0x0b,0xf8,0x14,0x20,0x1a,0x2d,0x7d,0xc7,0x4e,0x2e,0x5c,0x9c,0x9a,0xee,0xd4,0x01,0xeb,0xc5},
+            {0x9f,0x2e,0x65,0x90,0x99,0x1e,0x25,0xb4,0xfb,0xca,0xcb,0xee,0x5b,0xf7,0x38,0x10,0x92,0xcf,0xcd,0x7d,0x4f,0x3e,0x25,0x8b,0xf4,0xb4,0x1b,0x84,0x10,0x2f,0xc1,0x79},
+            {0x64,0x7c,0x65,0x7c,0x3c,0x93,0x05,0x37,0xbc,0x13,0x04,0x7c,0xf8,0x86,0x86,0x9f,0x5a,0x06,0x99,0xfc,0x52,0x49,0x6a,0xb3,0x0c,0x99,0x7e,0x5f,0xea,0x1b,0x3d,0xbd},
+            {0x98,0x02,0xaf,0xd3,0xdd,0xb4,0xd5,0x06,0x7f,0xd0,0xdb,0x7e,0xad,0x8c,0x66,0xff,0xb3,0xad,0x1c,0x29,0x39,0x1c,0xe5,0x63,0x21,0xc4,0xb8,0xf3,0x41,0x74,0xee,0xb5},
+            {0x60,0xf7,0x82,0xf1,0x78,0xf3,0x0f,0x3d,0x93,0x21,0x01,0x7b,0x2c,0x65,0x91,0xf2,0x5a,0x82,0xf9,0x57,0xef,0x1c,0x70,0x4c,0x69,0x01,0xfe,0x2f,0xc9,0x2e,0xd7,0x6f},
+            {0x10,0x99,0x92,0x58,0x9b,0x06,0xb8,0xee,0xba,0x15,0xfc,0x2f,0x61,0x04,0x14,0x0f,0xec,0x04,0x3b,0x20,0x31,0xc8,0xdf,0x3e,0x90,0x25,0xfb,0x09,0x49,0x78,0xdd,0xaf},
+            {0x09,0x1a,0xdb,0x2a,0x12,0x3d,0x0c,0xbe,0xae,0x7d,0xd3,0x99,0xa3,0x9f,0x4c,0xa4,0xa3,0xb6,0x80,0x86,0x41,0x0e,0x6c,0x7a,0xef,0x05,0x26,0xbb,0x2a,0xd2,0xfb,0x82},
+            {0x64,0x14,0x3c,0x36,0xd1,0x0d,0x8d,0x06,0x59,0xf9,0x43,0x1d,0xcf,0x30,0xce,0xc8,0x04,0xf4,0x48,0x74,0x52,0xd5,0x37,0x66,0x39,0x15,0x73,0x54,0xbb,0x7e,0xe6,0x37},
+            {0x96,0x02,0xec,0x03,0x8d,0x85,0xb2,0xcc,0x61,0x7d,0xbd,0xbb,0xff,0x0a,0x32,0x93,0xec,0x62,0x04,0x8f,0x70,0xb1,0x6a,0x6b,0x38,0x70,0x2e,0x26,0xb9,0x90,0x74,0xa6},
+            {0x1c,0x6b,0x65,0x08,0xf0,0xf0,0xc7,0x72,0x13,0x7e,0xd1,0xa5,0x3c,0xb5,0x59,0xfb,0x1a,0xa4,0xb3,0x69,0x0f,0x6e,0x1f,0x6f,0xd3,0xdd,0xbe,0x5b,0x74,0xda,0x76,0x76},
+            {0xa4,0xdf,0x5d,0x4c,0x39,0x3b,0x25,0x56,0x74,0xbf,0xd6,0x4a,0xea,0x4a,0xe8,0x2d,0xa5,0x17,0x57,0x32,0xd3,0x95,0x91,0xfa,0x67,0x1a,0x23,0x30,0x04,0xd2,0xd0,0xbf},
+            {0x92,0x8a,0x67,0xd9,0x56,0x42,0x2b,0x29,0x18,0x9d,0xf8,0xc6,0xe8,0x8e,0x34,0x5e,0xd2,0xcf,0xc8,0xac,0x94,0x1d,0x06,0xf1,0x5a,0x7c,0x24,0xcf,0x30,0xbc,0x52,0x96},
+            {0x79,0xab,0xad,0xba,0xcc,0x8e,0x8b,0xcf,0x89,0x30,0xe8,0x29,0x5d,0xbf,0x66,0x26,0xe3,0xc2,0xc7,0x1b,0x8c,0x4c,0x68,0x83,0x31,0x8d,0xd1,0xc7,0x2e,0x03,0xec,0xba},
+            {0xdd,0xfc,0x0d,0x44,0x5c,0xc0,0x13,0x73,0x49,0x47,0x27,0x9f,0xdf,0x7c,0x6f,0x0d,0x47,0x4a,0x62,0x2d,0xa6,0x5d,0xb4,0xab,0x1c,0x0c,0x9c,0xea,0x7f,0x60,0xd0,0xfd},
+            {0x61,0xce,0x62,0xf6,0x7c,0x35,0x26,0xd4,0x18,0x3f,0x74,0xef,0x0d,0x45,0x72,0x16,0xc7,0xba,0x99,0x13,0xc9,0xa0,0x24,0x39,0x44,0xc9,0x72,0xca,0xc6,0xdb,0xf4,0x2c},
+            {0x9c,0xbe,0x36,0x3f,0x9b,0xc6,0x96,0x39,0xef,0xc7,0x3b,0x9b,0xc0,0x22,0x64,0xe2,0x9f,0x7d,0x0f,0x8e,0xa3,0xb1,0xf3,0x5b,0xa1,0x66,0x40,0xa5,0x76,0x7c,0x5d,0xb2},
+            {0xd7,0xa2,0x5b,0xfd,0xc1,0xe8,0xbf,0xba,0x01,0x3b,0xbc,0xdc,0x8a,0xfe,0x41,0xd8,0x15,0x11,0xe1,0x5c,0xec,0xe1,0x55,0xe9,0xbe,0x7b,0xf1,0xce,0x81,0xaf,0x27,0xc3},
+            {0x93,0xf9,0x63,0x27,0x56,0xd3,0xb0,0xd8,0xbc,0x72,0xc4,0x71,0x8d,0xff,0xaa,0xc5,0xef,0x81,0x63,0x0d,0x6b,0xd7,0x93,0x64,0xb7,0xbb,0xcc,0x9f,0xfb,0xc3,0x02,0xd5},
+            {0x23,0x11,0x82,0x9f,0x98,0x42,0x40,0x4d,0x9c,0xc2,0x24,0x3d,0xd1,0x49,0xbd,0xb2,0x6d,0x21,0x00,0x31,0xea,0x78,0xdf,0xb0,0x66,0xe9,0x03,0x81,0xa3,0x92,0xe6,0x41},
+            {0xcd,0x08,0xa8,0xa1,0x53,0xde,0xd8,0xbe,0x5d,0x70,0x53,0x90,0xe3,0xbf,0x53,0xcb,0x56,0xd7,0xb8,0xc2,0x0e,0x0e,0x08,0xc3,0x9a,0xdb,0x36,0x89,0xa6,0x8b,0x96,0x02},
+            {0x8d,0x31,0x0a,0x90,0x01,0x76,0xad,0xe5,0x81,0xad,0x42,0x10,0x86,0x05,0xcc,0x6b,0xf8,0x67,0xf2,0x1c,0xc1,0x15,0xe6,0xab,0xbf,0x2a,0x5e,0x08,0x3c,0x2b,0xba,0xe5},
+            {0x43,0xc5,0xcb,0x40,0xe9,0x48,0x74,0xeb,0x80,0xec,0x26,0xb7,0xdf,0x73,0x2c,0xea,0x25,0x54,0x53,0xf5,0x11,0x99,0x2f,0xd6,0x1d,0xdb,0xf4,0xde,0x73,0x9f,0x3b,0x35},
+            {0xa2,0xa9,0xab,0xf1,0xc8,0x35,0xb8,0x24,0xa9,0xd3,0x11,0x10,0x5a,0x4c,0x92,0xb3,0xd6,0xca,0x8e,0xb2,0x76,0x1b,0x45,0xda,0x72,0x41,0xf5,0x87,0x9d,0x05,0xbc,0xab},
+            {0xec,0x48,0xaa,0xb6,0x45,0xd6,0x44,0x98,0x93,0x87,0x81,0x15,0x6b,0x6d,0xaf,0xfa,0xdc,0x0e,0xc9,0xf3,0x55,0x6b,0x7e,0x99,0x5c,0x8d,0xbd,0x63,0x29,0x9c,0x31,0x21},
+            {0x05,0xf6,0xc8,0x4d,0xd8,0xff,0x34,0x68,0xd8,0x99,0x2d,0x9d,0xfc,0xb4,0xe3,0x15,0x97,0xf7,0xa3,0x78,0x82,0x8c,0xc0,0x10,0x83,0x20,0xc0,0x09,0xef,0x16,0xce,0xaf},
+            {0xd4,0xd3,0x9f,0x9d,0x37,0x24,0xca,0xd9,0x8b,0xf1,0x46,0x65,0x77,0xb7,0x9c,0x4d,0xcd,0xca,0x10,0x4e,0xcb,0x48,0x9e,0x87,0x7f,0xa8,0xf4,0x4a,0xdb,0x1b,0x2b,0xa2},
+            {0xb2,0x3a,0x12,0x3b,0x0b,0xb6,0xc1,0x10,0x60,0x65,0x8f,0xd1,0x47,0x86,0xdd,0x34,0x5a,0xd2,0xa2,0xc6,0x99,0xe4,0xfd,0xc7,0xc8,0xde,0x79,0xb1,0xeb,0xa4,0x1f,0xc1},
+            {0xf2,0x7d,0x04,0x70,0x7f,0x4b,0x11,0x10,0xff,0xd9,0x78,0xf8,0x61,0x0b,0x2f,0x09,0x4a,0xc0,0xf2,0x4c,0x1d,0xc8,0x19,0xb5,0x9b,0x70,0xe1,0xf6,0x4c,0xd8,0x6a,0x99},
+            {0x42,0x89,0x5a,0xa8,0xdc,0x4c,0x0c,0xa5,0x0b,0x98,0xc7,0x15,0x7f,0xba,0xaf,0xa5,0x3f,0xc3,0xd8,0xa5,0x22,0x1b,0x66,0x0d,0xc8,0x68,0x37,0xee,0xd7,0xe6,0xd3,0x19},
+            {0xea,0x9f,0x13,0xa6,0xe1,0xcb,0xe9,0xc3,0x08,0xbf,0x85,0xb5,0x0d,0xdc,0x72,0x9a,0xbe,0x11,0x2c,0x46,0xd7,0x4b,0x50,0xef,0x53,0xd0,0xbd,0x7e,0xce,0x84,0x12,0x1d},
+            {0xe8,0xd2,0x50,0x85,0x8b,0x5d,0xe7,0x0d,0x13,0x82,0x13,0x34,0x2a,0x67,0x65,0x94,0x84,0x19,0xb8,0x1b,0x8e,0x8e,0xd6,0x5b,0x37,0x63,0xb2,0x0d,0xdf,0x00,0x9f,0xdf},
+            {0x82,0x7b,0x12,0x79,0xe3,0xea,0x50,0xb1,0xb7,0xae,0xda,0x4a,0x79,0x69,0xcd,0xf1,0x8b,0xed,0x45,0xfa,0x01,0x8e,0x55,0x21,0x90,0xe8,0x34,0x1d,0x2b,0x8b,0xe2,0xa1},
+            {0x35,0x84,0xa3,0x2e,0x4f,0xa9,0x8c,0xc7,0x2c,0x35,0xe0,0x05,0x0f,0xc0,0x0f,0x46,0x46,0x2b,0x72,0x86,0xe9,0xd6,0xad,0x67,0x5c,0x34,0x0a,0x8d,0x1e,0x56,0xfe,0xd2},
+            {0x19,0x64,0x35,0x30,0x4b,0x5e,0x92,0x92,0x2c,0x34,0x53,0xad,0x9f,0x31,0xa8,0xd1,0xb2,0x82,0x16,0x34,0xee,0x6a,0x29,0xc0,0x75,0x43,0xb0,0x5e,0xaf,0xd7,0xb0,0x61},
+            {0xa8,0x6b,0x72,0x71,0xd2,0x8b,0x01,0x1a,0x27,0x49,0xb3,0x02,0xfc,0xdb,0xbf,0x71,0x2f,0x89,0xd9,0xf3,0xef,0xa2,0x4b,0x9a,0x16,0x9e,0x97,0xe6,0x7a,0x57,0xe5,0x94},
+            {0xd4,0x0e,0xd1,0x34,0x2b,0xca,0x6c,0x53,0x6e,0x73,0x6f,0x1f,0xa1,0x5a,0xa5,0xf5,0xa0,0x12,0x74,0xb4,0x20,0x8a,0xc4,0x69,0x0a,0x4f,0x8c,0x29,0x3d,0xd4,0x0b,0x0c},
+            {0x51,0x32,0x56,0xa2,0xae,0x5c,0x50,0xaf,0x82,0x54,0x20,0x72,0x4f,0xad,0xd8,0x8a,0xa0,0xa7,0x7d,0x93,0xf6,0x4e,0x14,0x25,0xf7,0x68,0xf3,0x3b,0xc5,0x6b,0xf8,0x62},
+            {0x83,0x38,0x1a,0x3f,0xb9,0xec,0x95,0xf2,0xfc,0xcc,0x41,0x0a,0xe4,0x8e,0x05,0x81,0xee,0x4f,0x49,0x28,0x81,0xcd,0x0c,0x20,0xc9,0x0c,0xf1,0x98,0x23,0xff,0xca,0x7e},
+            {0x0d,0x51,0xb0,0x21,0x0f,0x52,0x7a,0xfd,0xe6,0x30,0x88,0x74,0x55,0xf5,0xd2,0x31,0x42,0x5f,0x8a,0x8a,0xab,0x5d,0x85,0x67,0xe5,0xcc,0xd4,0x94,0x41,0xf5,0xef,0xfb},
+            {0xc5,0x84,0xa6,0x8f,0x8f,0x6a,0x5d,0x88,0x41,0xd9,0xb5,0x1f,0xa9,0xcf,0xf1,0xa3,0xae,0xe7,0x3b,0x1b,0x4f,0x8c,0x8f,0x37,0x88,0x43,0xc7,0x9b,0xa5,0xce,0x59,0x02},
+            {0xb5,0x39,0x6e,0xf2,0x97,0x4c,0x2a,0x10,0x40,0xb8,0xe8,0xff,0x02,0x3a,0x82,0xed,0x4d,0xdb,0xff,0x2b,0x69,0xe5,0x56,0x92,0x49,0xd1,0x39,0xec,0x01,0xda,0xfa,0xef},
+            {0xe5,0x2c,0x0b,0x2f,0x5d,0xa5,0xc4,0xc5,0xf6,0x8f,0x4c,0x1b,0x7e,0x3d,0xc8,0x1e,0x95,0x72,0xbc,0xb6,0x29,0x9d,0x33,0x86,0xd5,0x4b,0xf8,0x81,0xc4,0x3d,0xce,0xc4},
+            {0xba,0x60,0x87,0x8a,0xb1,0xff,0xd5,0xe5,0xb8,0x5d,0x84,0x3b,0xa0,0x49,0xd6,0x69,0xec,0x4d,0x00,0x94,0x33,0x01,0x47,0xc3,0x94,0x2a,0x62,0xf0,0x39,0x4c,0x32,0xe5},
+            {0xe4,0x12,0xb7,0x97,0xb2,0x42,0xa5,0x61,0x98,0x23,0xb6,0xb3,0x30,0x08,0xf4,0x5b,0xb0,0xb1,0x1b,0xac,0x0f,0xf3,0x65,0xb4,0xf8,0xc7,0x3c,0x9f,0x3f,0xe6,0xe5,0x90},
+            {0x50,0x93,0x3f,0x53,0x88,0xc9,0x78,0x12,0xaf,0xf9,0xaa,0x52,0xdb,0x01,0x4d,0x71,0x55,0x63,0x83,0xc6,0x3c,0x6b,0x1b,0x7c,0xe2,0x94,0x19,0x5c,0x8e,0xfc,0xb5,0x40},
+            {0x64,0x3e,0xe4,0x63,0x8b,0x7d,0x9c,0x62,0x65,0x22,0xf9,0x17,0x8b,0xce,0x2a,0x53,0xa8,0x75,0x45,0x32,0x52,0xc4,0x6e,0xe3,0xed,0x4d,0x52,0x4a,0xd2,0x71,0x0a,0x4e},
+            {0xe7,0x2b,0x87,0x39,0xdb,0xff,0x60,0x18,0x5c,0xfe,0x3d,0xa8,0x78,0x3f,0xd9,0xaf,0x56,0xb7,0xda,0x99,0x74,0x61,0x04,0x28,0xa1,0x1a,0xda,0xf5,0xc4,0x33,0xb2,0xc7},
+            {0x48,0xc3,0xcb,0x8b,0x5c,0x7a,0x90,0x72,0x8f,0xbc,0x10,0x4f,0x8b,0x19,0x1a,0x98,0x11,0x9f,0x8a,0x27,0x77,0xc0,0x0f,0x8c,0x10,0x00,0x24,0x40,0x13,0x74,0x55,0x27},
+            {0x34,0x84,0x5f,0x23,0xb0,0xbc,0xf4,0xe5,0xe7,0xfa,0xc5,0xf8,0x2c,0x05,0x9c,0xd0,0x8d,0x9b,0xd7,0xca,0xbb,0x11,0xed,0xbd,0x62,0xfd,0xf1,0xb4,0x0d,0xf9,0x57,0x58},
+            {0x33,0xbc,0xac,0x68,0xcb,0x4a,0xe2,0x01,0xb3,0xd3,0xfd,0x35,0x6c,0x62,0xfe,0xac,0x88,0x8e,0xa3,0xf7,0xe0,0xf5,0x9f,0xf0,0xdf,0xa2,0xfe,0xf9,0x7f,0x1e,0xb5,0x58},
+            {0x77,0x8d,0x83,0x39,0x69,0xb2,0x8c,0xcd,0xa7,0x71,0x1e,0x0f,0x6e,0x37,0x34,0x5f,0xa5,0x98,0xac,0x1a,0x9f,0xd1,0xc6,0xa4,0x97,0xdc,0xfb,0xb0,0xd2,0xa9,0xd5,0x90},
+            {0x5f,0xca,0x36,0xd1,0x9c,0x65,0x6d,0x34,0x7e,0x71,0xc9,0xca,0x43,0xdf,0x0d,0x70,0x18,0x52,0xd9,0x81,0x1b,0x75,0x8d,0x63,0xb3,0xae,0x65,0x22,0xdd,0x4c,0x0b,0x68},
+            {0x74,0xf0,0xe0,0xb6,0x14,0x25,0x24,0x02,0x02,0x48,0x6e,0xb2,0x6a,0x74,0xe5,0x3b,0xdf,0x84,0x60,0x20,0x33,0x52,0xf1,0xc1,0xad,0xf6,0x98,0xbe,0x9c,0x01,0xdd,0xa5},
+            {0xd2,0xb4,0xe3,0x04,0xa0,0x65,0xb7,0x46,0x41,0xf4,0x29,0x66,0xa4,0x33,0x98,0xa9,0x6e,0x85,0xc1,0x4c,0xb2,0x09,0xff,0x06,0xd1,0x8e,0x6f,0xdd,0x8a,0x30,0xe1,0xbd},
+            {0xdf,0x64,0x01,0xc0,0x7b,0x51,0xc7,0x2f,0x6e,0xa2,0x65,0x4a,0xa3,0x06,0x9f,0xb6,0xbf,0x0d,0x8a,0x3a,0xdb,0xf0,0x0d,0x92,0x6d,0x53,0x44,0x00,0xd8,0x87,0x33,0xb0},
+            {0x38,0x50,0xac,0xc4,0x10,0xd2,0x1b,0x19,0x11,0x0d,0x9f,0x22,0x9c,0x63,0xd6,0x7e,0x36,0xe2,0x48,0x49,0x15,0x69,0x3f,0x21,0x56,0x9b,0x62,0x7b,0x0f,0x33,0x95,0xbb},
+            {0x61,0x43,0xef,0x6a,0x8f,0x8e,0xdf,0xb6,0xb4,0x0a,0xd2,0x31,0x4c,0x0f,0x95,0x95,0xfb,0xed,0x1f,0x55,0xfa,0xc3,0xb8,0xab,0xba,0xcd,0x72,0xf6,0x91,0xda,0x77,0x80},
+            {0xb1,0x4a,0xe3,0x96,0xd6,0xda,0x8e,0xe4,0x3a,0x3e,0xaf,0x5e,0x9a,0x06,0x33,0x3c,0xe6,0x51,0x5c,0xbf,0x18,0x19,0xbb,0x52,0x83,0xd7,0x3a,0x68,0xcd,0x39,0xd2,0xc2},
+            {0x2c,0xcb,0x17,0x21,0xe1,0xed,0x7a,0xdd,0x38,0x2c,0xf8,0x83,0x8f,0x7c,0xd8,0x21,0x06,0x23,0x2c,0x7b,0x0b,0xb7,0xfb,0xbc,0x5f,0x36,0x29,0x19,0x36,0xfc,0x8f,0x52},
+            {0xcb,0xde,0x7d,0xa6,0xd0,0xdb,0xf5,0x18,0xda,0x69,0x23,0xc7,0xd8,0x27,0x49,0xde,0xf1,0x26,0x0e,0xb6,0x63,0x2f,0x03,0xa7,0xe3,0xea,0xa6,0x2c,0xb3,0xa4,0xee,0xcf},
+            {0x9a,0x9d,0xf0,0x55,0x0f,0x16,0x29,0xc3,0xcc,0x3c,0x53,0x9e,0xc8,0x3c,0xa7,0xe8,0x15,0xab,0x8c,0x93,0x19,0xce,0xb9,0x1f,0x42,0xb6,0xb9,0xdf,0xc3,0x38,0x4e,0xde},
+            {0xf4,0x87,0x37,0x96,0x0c,0x6b,0xfd,0x1b,0x46,0x31,0xcd,0x39,0x04,0x8b,0x55,0xca,0xd3,0x3b,0xd0,0xfa,0x92,0x5a,0x8a,0xe0,0x94,0x45,0x64,0x66,0xe1,0x6b,0x77,0x91},
+            {0x25,0x14,0x86,0x9f,0xcc,0x6f,0xf5,0x07,0x36,0xda,0x7f,0x50,0x9d,0xcc,0x55,0xcf,0xe8,0x37,0x2f,0x82,0xbe,0xb4,0x65,0x29,0xd7,0x57,0xc0,0xad,0x98,0xfc,0xa1,0x0e},
+            {0xb2,0x11,0x24,0xfa,0x2a,0xb9,0x86,0x8f,0x3e,0x73,0x75,0xce,0xbd,0x5c,0xf9,0x5a,0x48,0xd0,0xd6,0x2e,0xd6,0xfb,0x62,0xef,0x0e,0x0f,0x08,0xf7,0x33,0x7b,0xb2,0x12},
+            {0x84,0x83,0x5f,0xd5,0x1e,0x9b,0xd4,0x62,0x4f,0x4b,0x6f,0xea,0xf2,0x38,0x7b,0xf3,0x65,0x2f,0x0b,0x03,0xef,0xd5,0x6c,0xde,0x08,0x60,0x79,0xf8,0x6b,0xcf,0x9c,0xc2},
+            {0x86,0x84,0x92,0xcf,0x49,0x41,0xbc,0x0f,0xd0,0xca,0x8c,0x37,0xa3,0x00,0x08,0xfa,0xbf,0x58,0xe5,0x6b,0xb3,0xb4,0x1f,0x7b,0xd9,0x1e,0x09,0xb4,0x39,0x14,0x61,0x8d},
+            {0x00,0xa8,0xba,0x1a,0x60,0x7b,0xe2,0x74,0x47,0xcf,0xd6,0xf6,0x04,0x47,0xa2,0x2f,0xf6,0xe6,0x03,0xe3,0x47,0xea,0xad,0x21,0x60,0x4b,0xf5,0x6c,0xfd,0x3b,0x14,0x34},
+            {0xe5,0x0a,0x1c,0x9a,0xb7,0x65,0x5b,0x55,0xcd,0xa7,0x5f,0xf8,0x2b,0xc1,0xd2,0x8e,0xa4,0x8c,0xc7,0xfd,0x29,0x2e,0x5f,0x7c,0x72,0xe0,0xf4,0x8a,0xce,0xe7,0x12,0xde},
+            {0x24,0x9d,0xf6,0x4d,0x68,0x36,0x97,0xb5,0x30,0xc6,0x01,0x36,0x92,0xfb,0xa9,0x66,0x65,0x5c,0x6d,0x4e,0x38,0xba,0x40,0xfd,0x05,0xa2,0x82,0xf6,0x05,0x70,0xee,0x67},
+            {0x1e,0x66,0xd4,0xf9,0xbf,0x24,0x72,0x4b,0x6e,0xbe,0xeb,0xa7,0xf2,0xcc,0xce,0x22,0xcc,0x03,0x9c,0xba,0x53,0xb7,0xe7,0xfa,0x76,0x72,0x3f,0x1d,0xbb,0x93,0x4e,0x34},
+            {0xdb,0x67,0x67,0x23,0x18,0x47,0x10,0x9e,0xe8,0xae,0x86,0xb4,0x59,0xf0,0x30,0x3e,0x08,0xe2,0xfc,0xf5,0xb4,0x16,0x5f,0xaf,0x7e,0xdc,0x33,0xc6,0x69,0x09,0x73,0x5a},
+            {0x40,0x6e,0xe3,0x77,0x18,0x00,0x93,0xd2,0x5c,0xc2,0x04,0x10,0x5a,0xaa,0x30,0x30,0x47,0x3a,0xb1,0x12,0xf2,0x09,0xae,0x1d,0xd6,0x08,0xeb,0xe1,0x15,0xa3,0xf9,0x5b},
+            {0x07,0x63,0xbf,0x2c,0x13,0xcd,0xd4,0x52,0x5a,0x95,0xf1,0x23,0xd5,0xa4,0x2d,0xdc,0xc9,0xb3,0xaa,0xd2,0x7c,0x90,0xdf,0xac,0x1f,0x19,0xfe,0x2c,0xc6,0x43,0xf6,0x36},
+            {0x3c,0xb4,0xc5,0x8f,0x65,0x97,0xa2,0xe9,0x37,0xc8,0xbc,0xc8,0x70,0xbb,0xef,0x98,0xfe,0x4a,0x2e,0xf1,0x60,0x89,0xc9,0x4a,0x0a,0xfc,0xd0,0xec,0xbb,0xca,0x14,0x0b},
+            {0x1a,0x44,0x80,0x36,0x68,0x91,0x15,0xf5,0xad,0x50,0xe0,0x58,0x7d,0x11,0x4c,0xd7,0x79,0x01,0xf2,0x3a,0x07,0x07,0x0b,0x4d,0x18,0xae,0x81,0x62,0x56,0xd8,0x81,0x1e},
+            {0x4b,0xc7,0x18,0xcc,0x25,0x24,0x2f,0xee,0xce,0xd0,0xc3,0xf0,0x7c,0x54,0x59,0xd3,0x0e,0x5e,0xcd,0x91,0x01,0x12,0x37,0xdd,0x86,0x9a,0x2b,0x1d,0x32,0xc3,0x90,0xb9},
+            {0x12,0x7d,0x42,0x82,0xb4,0x5b,0xe1,0x1f,0xe7,0x80,0xf2,0x0d,0xb6,0xc1,0x73,0x71,0x92,0x91,0x24,0x49,0xc0,0xba,0x6b,0x44,0xac,0x49,0x9d,0x9f,0xcf,0x54,0x6a,0x48},
+            {0x28,0x82,0xd8,0x64,0xf8,0xaa,0xde,0xc1,0xba,0xba,0xdf,0x7e,0xa3,0x12,0xca,0x37,0x74,0xfd,0x02,0x02,0xa4,0x70,0x27,0x79,0x41,0x5a,0x72,0x96,0x50,0x1e,0x58,0x28},
+            {0x2c,0x1a,0x8f,0xb6,0xd7,0x39,0xf4,0xeb,0xfd,0x01,0x04,0x4c,0x2c,0xa1,0x1b,0x48,0x4d,0xe6,0x93,0x3d,0x33,0xc6,0xd1,0x20,0xc5,0xbf,0x36,0x47,0x5a,0xb7,0xb4,0x57},
+            {0xd4,0x22,0x4f,0x53,0xe1,0x99,0xe3,0x15,0xff,0xba,0x0b,0xb3,0x17,0xdc,0xf7,0x74,0x3d,0x76,0x46,0x42,0xd9,0x37,0x70,0xe8,0xf6,0xef,0xf1,0x25,0x06,0xdf,0x88,0x8a},
+            {0xb8,0xd8,0xb2,0x60,0x45,0xf4,0x77,0xd5,0x8a,0xa2,0x1e,0x5b,0xd8,0x35,0x88,0x3a,0xe1,0xa7,0xbf,0x47,0xe4,0x16,0x03,0x20,0x80,0x75,0x0e,0x80,0xea,0x7b,0x00,0x8a},
+            {0xfa,0xd3,0xf5,0xf3,0xc9,0xd2,0x9a,0x21,0x65,0xef,0xdd,0x3e,0x33,0xf0,0xaa,0xe9,0xe5,0x83,0x65,0xb3,0x79,0xf0,0xac,0x61,0xf4,0x1f,0xf8,0x91,0x2f,0x7e,0x92,0x81},
+            {0xc0,0x5a,0xa5,0x28,0x0e,0x7b,0xb5,0xdc,0x66,0x26,0x5a,0x88,0x62,0x93,0x2a,0xeb,0x26,0x81,0x62,0xc2,0x5a,0xc2,0xbe,0x8f,0xca,0x44,0x94,0x9f,0x94,0xec,0x1e,0xe7},
+            {0xaf,0x2c,0x85,0xd7,0x08,0x5c,0xbd,0x5f,0xf2,0x76,0x0f,0x74,0x4d,0x22,0xe1,0xe5,0xbe,0x0b,0xb8,0xdb,0x88,0x17,0xde,0xaa,0x14,0xc0,0x6b,0xa9,0xe4,0xcd,0xf5,0x16},
+            {0x00,0x30,0x5a,0x93,0x8c,0x19,0xfe,0xb5,0x80,0xe7,0x94,0x5a,0xaf,0x55,0xf2,0x17,0xd5,0x08,0x91,0x85,0x17,0x65,0x61,0xc5,0x89,0x6d,0x36,0x43,0x55,0x1c,0x1a,0xa9},
+            {0x8a,0xc0,0x1d,0x95,0x08,0x62,0xd0,0x59,0x84,0x24,0xe3,0x48,0x8e,0xde,0x8e,0x9a,0x28,0x5d,0xd0,0x68,0xc1,0xd4,0x01,0x75,0x9e,0xcf,0xa3,0xc9,0x7f,0x9b,0xdc,0x85},
+            {0x33,0xf3,0xb9,0x15,0x95,0x41,0xa4,0x4f,0x21,0x98,0xe6,0xe7,0xbf,0xf5,0x91,0x60,0xbb,0x52,0xf8,0x1c,0x35,0xc9,0xf8,0x04,0x33,0x99,0x2e,0xdb,0x5e,0xd0,0xa3,0x40},
+            {0x31,0x24,0x4c,0x0e,0x5b,0x1f,0x7c,0x93,0x4f,0x92,0xae,0xfa,0xab,0x2e,0x06,0xb0,0xc2,0xb8,0x8c,0x98,0x57,0x67,0x77,0xd3,0xe5,0xc5,0x14,0xa6,0xb8,0xba,0x97,0xad},
+            {0x72,0xed,0x35,0x56,0xb3,0xa2,0x5c,0x22,0x9b,0xb4,0x36,0xb6,0xbf,0x80,0x91,0x73,0x54,0x03,0x68,0xbc,0xc4,0x34,0xc7,0x45,0x48,0x37,0x3c,0x04,0x3f,0x4f,0x86,0x02},
+            {0x00,0x94,0x76,0x70,0xa4,0x58,0xad,0xca,0xe6,0xc8,0x3f,0x22,0x3c,0xc0,0xb2,0xb0,0x5c,0xc1,0xde,0xbe,0xed,0x51,0x4e,0xa4,0x01,0x10,0x44,0xce,0x37,0x5c,0x8e,0xab},
+            {0x12,0x33,0x76,0xbf,0xe0,0x70,0x2b,0x06,0xb9,0x89,0x15,0xe3,0x8a,0xd3,0xc8,0xd3,0xd8,0xd2,0x70,0xf2,0xc8,0x1d,0xb5,0x95,0x92,0x2c,0x29,0x8d,0x98,0x0a,0x79,0x91},
+            {0xb9,0xea,0x63,0x7b,0xee,0x6f,0x3f,0x3b,0xee,0x40,0xfb,0x76,0xdd,0x37,0x5b,0x64,0x19,0xfc,0xce,0x5f,0xba,0xb8,0x52,0x37,0x85,0xd0,0x4b,0x1c,0x49,0x56,0x57,0x0f},
+            {0x60,0x1b,0x25,0xe3,0xe6,0x86,0xfc,0xc9,0xc3,0x47,0x0b,0xdb,0xf4,0xfd,0x2a,0xf9,0xd0,0x08,0xea,0x18,0x58,0xce,0xf0,0x28,0x18,0x0e,0x3f,0x62,0xdf,0x0f,0xca,0x7b},
+            {0x6d,0x5a,0x12,0x65,0xa9,0x5e,0xe0,0x4a,0xfd,0x7d,0xf5,0xc9,0xae,0xe4,0x34,0x1f,0x31,0xde,0x35,0xb9,0xe8,0x7f,0x2f,0xc9,0xe0,0x2d,0x2f,0xd7,0xe0,0xd5,0xfa,0x2d},
+            {0x77,0xbe,0xf4,0xf6,0xfd,0xe9,0xb9,0x4b,0x53,0x97,0xe6,0x3d,0x16,0x90,0xc6,0xbc,0xd5,0x53,0xca,0x53,0xb5,0x8c,0x2b,0xfc,0xdf,0x92,0x72,0x65,0x90,0x24,0x63,0x17},
+            {0x27,0xf1,0x10,0x88,0x24,0x79,0xc6,0xcf,0x64,0xc0,0xbb,0x38,0xd1,0x21,0xe3,0x89,0xd5,0xff,0x17,0xdb,0x4b,0x21,0x65,0x97,0xc7,0x51,0x51,0xb7,0x8b,0x24,0xb2,0xbe},
+            {0x3d,0x1d,0x9c,0xc9,0xb4,0x94,0xb2,0x2a,0xb1,0xdf,0x80,0x6d,0x7b,0x1e,0x97,0x45,0xd1,0x32,0xdd,0x6d,0x72,0xba,0x47,0x26,0xf5,0x5a,0xf9,0x21,0x0f,0x3d,0xf4,0xb7},
+            {0x84,0xd6,0x0c,0x1d,0x78,0x7b,0xc5,0xd1,0x5a,0x95,0x21,0x83,0xac,0xad,0x44,0x78,0x56,0xc0,0x50,0x1c,0x2b,0xd5,0x80,0x91,0x45,0xf8,0xd8,0x58,0x2c,0x97,0xde,0xcf},
+            {0xb7,0x9f,0xa1,0x34,0x59,0xe7,0xf8,0x75,0x48,0x8c,0xf3,0x0c,0xcd,0x2f,0x04,0x31,0xcb,0xe8,0xdf,0xfc,0x67,0x18,0x80,0xc1,0x0c,0xd7,0x2d,0x7e,0x2b,0xe7,0xe8,0xcd},
+            {0x06,0x1c,0x36,0xfb,0x31,0x02,0x10,0xab,0x07,0xb2,0x2f,0x39,0x17,0x8b,0x7f,0x45,0x1d,0x51,0x42,0xa3,0x95,0xec,0xec,0xa1,0xec,0x78,0x3a,0xf9,0xc5,0x2b,0x73,0x0b},
+            {0xfa,0x16,0x97,0x6c,0x19,0xbe,0xca,0xe3,0x12,0x48,0xc8,0x47,0x7f,0xf0,0xe7,0x46,0xc4,0xe2,0x8d,0xdc,0xea,0x5e,0xe3,0x64,0x08,0xc0,0x5b,0xe8,0x6a,0x14,0x24,0x71},
+            {0x82,0x23,0x58,0x91,0x57,0x79,0x86,0x89,0x8d,0xeb,0xf0,0xcc,0x0b,0xab,0x31,0xfa,0x76,0x5e,0x92,0x5d,0x01,0xa2,0x7c,0x27,0xec,0x69,0x41,0x03,0x32,0x0d,0x82,0xa3},
+            {0x39,0x98,0x94,0x31,0xd3,0xac,0x81,0xa6,0x1b,0x03,0x11,0x18,0x1d,0x49,0x90,0x18,0xfb,0x4c,0xdd,0xfb,0x74,0xb1,0xaf,0xe4,0xa9,0x26,0x0b,0x58,0x41,0x13,0x59,0x89},
+            {0xa8,0x46,0xac,0xdc,0x0c,0xf3,0x49,0xa8,0xd2,0xb3,0x52,0xd3,0xdf,0xa8,0x78,0x48,0x93,0xf5,0x03,0x8c,0x05,0x27,0x7d,0x32,0x73,0x41,0xd3,0xef,0x7d,0xe4,0x1b,0xce},
+            {0xf3,0xcd,0x88,0xff,0x10,0x1e,0x9d,0xca,0xa9,0xe0,0x59,0x98,0xdb,0x42,0x5b,0x59,0x0d,0xc4,0x5d,0xad,0xfc,0xd8,0xb8,0xa6,0xbc,0x0a,0xc7,0xe9,0x32,0x37,0x20,0x55},
+            {0xa1,0x59,0x44,0x36,0x48,0xd0,0x79,0x69,0x56,0xf9,0x2e,0xc4,0xef,0xc5,0xaa,0x44,0xaf,0x0c,0xc2,0xfb,0x7b,0xa9,0x7d,0xe7,0xe6,0xa8,0xe0,0xdd,0x16,0x63,0x85,0x30},
+            {0x9e,0x38,0x1c,0xa3,0xbd,0x94,0x88,0xa6,0x56,0xe9,0x65,0xde,0x17,0xa4,0x44,0x87,0xf8,0xc0,0xda,0x88,0x96,0xeb,0xf9,0xc0,0xaf,0x4c,0x01,0x46,0xce,0x03,0x49,0x51},
+            {0x4c,0xfa,0xfb,0x85,0xf2,0xfa,0xa8,0x8a,0x88,0x03,0x4c,0x4e,0x04,0xb7,0xa3,0x7b,0xe2,0x0e,0xff,0x7e,0x02,0xd3,0xe2,0x1b,0xdb,0x79,0xd5,0xaa,0x7d,0xe8,0x33,0xdf},
+            {0xee,0xae,0x10,0x1e,0xef,0xf0,0x5c,0xb6,0xa0,0xde,0xe3,0xbd,0x70,0xb7,0x99,0x98,0x58,0xb8,0x98,0xb8,0xc0,0xcc,0x7f,0xa9,0x6a,0x5e,0x92,0x35,0xd1,0x37,0x73,0x81},
+            {0x78,0x6a,0xd4,0x1e,0xa8,0x6e,0xda,0x55,0x1d,0x0b,0xfd,0x3e,0x70,0x26,0x22,0xe1,0x18,0xb2,0x1e,0x61,0x9c,0x60,0x47,0x72,0xbe,0xfe,0x54,0x6e,0x55,0xd4,0xce,0xdc},
+            {0x2c,0x2f,0x15,0x1a,0xd2,0xb9,0xd7,0xbb,0x8f,0x52,0xdc,0x4b,0x06,0x0d,0x19,0x4b,0xcc,0x63,0x84,0x87,0x54,0xd0,0xd2,0x98,0x3d,0xef,0x1e,0xb9,0x92,0xf1,0x94,0xdc},
+            {0x53,0x0b,0x50,0x35,0x47,0x3e,0x95,0xe2,0xbf,0x11,0x7e,0x3b,0xa2,0xd8,0x8d,0x6d,0xe1,0xe6,0x48,0xf8,0x67,0x2b,0xaa,0x0c,0x9d,0xcb,0x83,0xe8,0x0e,0xf4,0x75,0x80},
+            {0xb3,0x48,0x01,0x28,0x9f,0x8a,0x80,0x27,0x7b,0x7d,0x5f,0xdb,0x60,0x2e,0xd3,0xdf,0x30,0x5d,0x9e,0x91,0x51,0x38,0x76,0x1e,0xb2,0x0c,0xdd,0x42,0xb3,0x38,0x50,0x9f},
+            {0xef,0xf8,0x30,0x1c,0xcf,0x90,0x32,0xfb,0x13,0x98,0xc6,0x28,0x96,0xf8,0x50,0x2a,0x56,0x48,0x89,0x24,0x2c,0x9c,0xce,0x7c,0xfd,0xdf,0x1b,0x9b,0x87,0xdc,0x91,0x89},
+            {0x1b,0xab,0xe5,0x94,0xd5,0xc8,0x4b,0x3e,0x67,0x23,0x7b,0x6a,0xbc,0xf1,0x4b,0x9a,0x09,0x13,0x68,0xc5,0x87,0x95,0x8e,0xcc,0xed,0xd4,0xab,0x03,0x67,0x60,0x1a,0x6f},
+            {0xb2,0xe8,0xb5,0x6a,0x47,0x4d,0x41,0xac,0xb1,0xa5,0x36,0x46,0xd8,0x25,0xbe,0xc8,0x45,0xcb,0x12,0xc7,0xb9,0x6d,0xff,0x58,0x8d,0x6d,0x10,0x51,0x13,0x6d,0xae,0x11},
+            {0x7b,0x40,0x0a,0xd7,0xfa,0x14,0xaf,0x91,0x82,0x25,0x9b,0x51,0xe8,0x10,0xe1,0x60,0x29,0xc9,0x47,0xf2,0x50,0x9f,0xb1,0x29,0xeb,0xe1,0x11,0xfd,0xd9,0x77,0xaf,0x3a},
+            {0x84,0x2d,0x63,0xa7,0x01,0xa8,0x0a,0x97,0x99,0x35,0x7a,0xc7,0x04,0xf2,0x28,0x8a,0xb6,0x2a,0xf3,0xa6,0x2d,0x47,0x6f,0xd7,0x40,0xc0,0xf8,0xf5,0xc3,0x5a,0x46,0xb6},
+            {0xdd,0x14,0x66,0x53,0xc3,0xaa,0xbc,0x37,0x47,0xdf,0x89,0x1c,0x3a,0x66,0x85,0xd2,0x4e,0x9c,0xfe,0x4d,0x61,0xe5,0x2f,0x5c,0x7f,0xc7,0xdf,0x6f,0x07,0x9d,0x59,0xee},
+            {0x25,0x64,0xc5,0xff,0xb7,0x8c,0x4c,0x13,0x2c,0xf8,0xc6,0xdc,0x06,0x59,0x16,0x61,0xf2,0xd7,0xee,0x12,0x00,0x4a,0xf6,0xec,0x07,0x8a,0xf8,0xac,0xa0,0x4b,0x42,0xaa},
+            {0x8c,0x01,0xeb,0x1d,0xcc,0x1e,0x13,0x89,0x2a,0x78,0x2e,0x98,0x26,0x28,0x87,0x11,0xf2,0x8c,0xa7,0xc7,0x16,0xbb,0x97,0x56,0xe4,0x9b,0x41,0xc8,0xd9,0x94,0x66,0x94},
+            {0xf6,0x87,0x43,0xf2,0x90,0xc5,0x00,0x2b,0x74,0x6d,0x91,0x27,0x02,0xc1,0x08,0x4c,0xee,0x82,0xbd,0xd3,0xc3,0x23,0x20,0x0d,0xc0,0x71,0x03,0x81,0xd9,0x8a,0x41,0xc1},
+            {0x29,0x2a,0x63,0x83,0xfd,0x16,0xec,0x5a,0xfa,0x4c,0xff,0xbf,0x7a,0x6f,0xcc,0x8c,0x65,0x53,0xd4,0xcb,0xd2,0x57,0x48,0x86,0xf6,0x23,0xb0,0x0b,0xf1,0x2b,0x1e,0x4b},
+            {0x49,0x80,0xe0,0x74,0xba,0xa3,0x62,0x35,0x51,0xa5,0x62,0x63,0xd4,0x69,0x33,0xf5,0xfc,0xa5,0x46,0x56,0x15,0x46,0x7e,0xa9,0x14,0xfc,0xf6,0xe3,0x89,0xe5,0xeb,0x6b},
+            {0x4c,0xf4,0x61,0xbc,0x4b,0x7f,0x8e,0x11,0x04,0xcb,0x22,0x5b,0xae,0x1f,0x3b,0xe5,0xdc,0x70,0xea,0x47,0xa3,0x87,0x92,0x57,0xd6,0x65,0x2b,0x42,0xee,0x30,0x2a,0x6c},
+            {0x79,0xf6,0x26,0xc4,0x81,0xd6,0x2c,0x45,0x4a,0x9a,0x8e,0x5d,0x00,0x81,0x41,0xbe,0xfb,0x19,0x0c,0x0f,0x4e,0x78,0xc0,0xf9,0x79,0x6c,0xdf,0xd8,0xb4,0x90,0xc2,0xd0},
+            {0x8b,0x4a,0xb8,0xa4,0x59,0x64,0xbd,0xb5,0xab,0x23,0x7c,0x0e,0x01,0x4c,0x84,0x0e,0x22,0x4a,0xb1,0xef,0x50,0xcf,0x2a,0xfe,0x79,0xf8,0x81,0x06,0x13,0xde,0x8c,0x9d},
+            {0x6d,0xae,0xf9,0xec,0xc8,0x4a,0x1d,0x29,0x83,0x3c,0x0e,0xdb,0xfd,0x38,0x66,0x3b,0x0e,0x5b,0x76,0xf6,0xae,0x1d,0x5a,0x22,0xcb,0x08,0x19,0x84,0xbe,0x8a,0x1b,0xa1},
+            {0x7c,0xf7,0x62,0x01,0x17,0xfd,0xa4,0xba,0x2e,0x7e,0x13,0x92,0xa3,0x9c,0x2c,0x04,0x67,0xe3,0xb9,0x0e,0xf9,0x6a,0xb0,0x21,0xf9,0x07,0x08,0xe4,0x6d,0xf9,0x7e,0x94},
+            {0x44,0xf6,0x02,0x0c,0xe6,0xf1,0x83,0x1e,0xf6,0x0c,0xb2,0x93,0xf4,0x56,0xa5,0xed,0x77,0x0a,0xa9,0x2b,0x18,0x37,0xfb,0x57,0x1e,0xcb,0xf0,0x09,0x63,0xe7,0x72,0x49},
+            {0xb5,0x3b,0xc8,0xf1,0x9e,0x29,0x66,0x0d,0x7c,0x2c,0x96,0x22,0xfc,0x08,0x0e,0xb3,0x83,0x9e,0xee,0x4b,0x60,0x1d,0xf4,0x7e,0xb3,0xac,0x20,0xaf,0xf8,0xef,0x83,0x43},
+            {0x11,0x4f,0x88,0x84,0x78,0x5c,0xb1,0xea,0x54,0x08,0x7b,0xf3,0xd1,0x94,0x18,0x12,0x9f,0xba,0xc4,0x4f,0x8c,0x49,0x66,0x77,0x77,0x87,0x14,0x74,0x3e,0x67,0x8c,0x72},
+            {0x64,0x0e,0x38,0xab,0xc9,0x42,0xb3,0x5d,0x60,0x02,0x7a,0x7c,0xa1,0x67,0x1e,0xf9,0x6d,0xa9,0xdb,0xda,0x8d,0x3a,0xac,0x61,0x91,0x71,0x89,0xe0,0xf1,0x61,0x3a,0x1f},
+            {0x23,0xbc,0x1d,0xfe,0x86,0xd5,0xbe,0x14,0x81,0x55,0xbc,0xb7,0xae,0xa3,0x9b,0x8c,0xb6,0x8a,0x88,0x7a,0x07,0xc7,0x15,0x9a,0x88,0x32,0xd7,0xfa,0x8a,0xf8,0xd4,0x49},
+            {0x8a,0xd3,0xf2,0xe4,0x4a,0xc5,0x76,0xc4,0xa9,0xc3,0x64,0xfe,0x49,0x7b,0x84,0x0b,0xae,0x3a,0x56,0x73,0xa2,0x9e,0x69,0xf0,0x80,0x62,0x08,0x49,0x93,0x32,0xa0,0x01},
+            {0xba,0x11,0x73,0x1e,0x00,0x98,0x01,0x14,0x7b,0x11,0x77,0x0a,0x08,0x22,0xe2,0xf1,0xe6,0xca,0xb3,0x92,0x37,0x26,0xed,0x79,0xef,0xb3,0xed,0x56,0x75,0x28,0x9c,0x05},
+            {0x40,0x9e,0x70,0x0d,0x67,0xc2,0x54,0x1a,0xfa,0x30,0x1f,0x2c,0x09,0xa4,0xa9,0x8d,0xe1,0x50,0xff,0x30,0x66,0x2f,0x25,0xdc,0xce,0x0b,0xec,0x82,0xda,0x44,0xa1,0xbb},
+            {0x74,0xae,0xbd,0x98,0x23,0x14,0x6c,0x25,0xc6,0x15,0xaf,0xf0,0xca,0xc7,0xa2,0xa7,0xb4,0x3a,0x36,0x78,0xfd,0x4a,0xcd,0xba,0x42,0x8b,0xc8,0x74,0xc2,0xde,0x23,0x51},
+            {0x1a,0xb2,0x9e,0x97,0x94,0x5c,0x3e,0xad,0x55,0x08,0x46,0xae,0x8a,0xf7,0x7e,0x6f,0x02,0xd7,0x7d,0x24,0xfa,0x8d,0x6a,0xf4,0xa8,0x66,0xc4,0x55,0x68,0x05,0x5b,0xe2},
+            {0x72,0x99,0x44,0xaa,0x75,0x65,0xa6,0x97,0x54,0x8f,0x16,0x2e,0x0e,0xc9,0xf3,0x9a,0x63,0x4f,0xec,0x17,0x61,0x5a,0x4b,0x1b,0x65,0xc7,0xb6,0x8d,0x06,0xda,0x8e,0xc7},
+            {0xdb,0xff,0x2d,0x93,0xd0,0x89,0xc5,0xfc,0x36,0x6c,0xb8,0x9c,0x70,0x2f,0x99,0x02,0x2c,0xcc,0x53,0xce,0xb3,0x94,0x18,0xe2,0xa9,0x92,0x1b,0x1f,0x9d,0x89,0x5c,0x95},
+            {0x17,0x0f,0x01,0x77,0xe2,0xfd,0x6e,0x2a,0xd5,0xe9,0x6b,0xf1,0xc7,0xd5,0xfe,0x84,0x43,0xf8,0x24,0xca,0x80,0xc5,0x1c,0xb1,0x9f,0xe9,0x85,0x02,0x0b,0xac,0x4d,0xc6},
+            {0x44,0x32,0x1c,0x4c,0x2e,0x53,0xab,0x3f,0xaa,0x16,0x44,0x3e,0x0d,0xd5,0x6d,0x0b,0xb1,0x8a,0xd4,0x44,0x22,0x4c,0x09,0xa6,0x86,0x28,0x55,0x28,0xc0,0x43,0x33,0xfd},
+            {0x2a,0xf9,0x82,0x7f,0x95,0x31,0x29,0xf8,0xee,0xc5,0x20,0xd1,0x40,0x9b,0xe4,0xd9,0x74,0x7f,0xe2,0x21,0x3e,0x87,0x7c,0xcb,0x06,0xa8,0x2e,0x9b,0xfa,0xe7,0x61,0xbb},
+            {0x65,0x83,0x1a,0x1f,0x6d,0x27,0xec,0xf9,0x1d,0x45,0x21,0x40,0xbe,0x92,0x19,0xd0,0x10,0x69,0x5a,0xf0,0xfc,0xb2,0xef,0x3f,0x19,0x76,0x4a,0x4f,0x6b,0x3e,0x07,0xf9},
+            {0x10,0x3f,0x4a,0x32,0xf2,0x67,0x64,0x27,0x3b,0x7a,0xb1,0xab,0xed,0x25,0xb7,0x68,0xe7,0x99,0x4a,0x6b,0xcf,0xe4,0xc0,0x29,0xd2,0xeb,0x5a,0x30,0xc4,0xe5,0x06,0xed},
+            {0x54,0x5d,0x4f,0xd5,0xdc,0xc1,0x1f,0x7c,0x29,0xa6,0xba,0x55,0x25,0x62,0xcf,0x4d,0x23,0x89,0x07,0x61,0xc7,0x6f,0xf8,0x6d,0x69,0x40,0xdc,0x70,0x73,0x68,0xa0,0xad},
+            {0x4f,0xf9,0xf0,0x91,0xda,0x95,0xe9,0xe8,0x89,0x2b,0xbe,0x01,0x7a,0x8f,0xe2,0x9a,0x05,0x95,0x5c,0x5c,0x62,0x99,0x2a,0x78,0xe2,0x3d,0x3b,0xfa,0x4b,0x3c,0x7d,0x15},
+            {0x8e,0x82,0xf5,0xc6,0x06,0x22,0x04,0x96,0x6b,0xff,0xf0,0xf2,0x99,0xb2,0x6b,0x59,0x21,0x35,0x8e,0x22,0xe0,0x88,0x0a,0x51,0x30,0x00,0x42,0x80,0xc4,0x18,0x82,0x7f},
+            {0x1a,0x6d,0xf2,0xe8,0x4c,0x39,0x91,0x88,0x81,0xec,0x15,0x1d,0x62,0x0c,0xc7,0x40,0x07,0xc0,0xd1,0x22,0x02,0x0f,0x6c,0x50,0x1d,0xca,0xff,0x88,0x22,0xf4,0x68,0x91},
+            {0x01,0xff,0x67,0x4c,0x4d,0xc5,0xd4,0x0f,0x0a,0x53,0x31,0x8e,0x4a,0x21,0x0f,0x41,0x8d,0xd2,0xe5,0x04,0x07,0x7f,0x80,0xe6,0x40,0x36,0x0d,0xb4,0xd2,0x47,0x0b,0xe0},
+            {0xfb,0x4b,0x59,0x77,0x69,0x16,0x6e,0x58,0xa3,0xb2,0x8a,0x69,0x8f,0x18,0xad,0x0b,0xd4,0xc1,0xe2,0x4d,0x6c,0x0e,0x3c,0xf5,0x8c,0xb8,0x00,0xb1,0x31,0xf4,0xfe,0xa5},
+            {0xdb,0xef,0x36,0x58,0xdf,0x7c,0xe5,0x30,0x75,0x2c,0xa6,0x9e,0x52,0x48,0xcb,0xf2,0x83,0x2c,0x1c,0x45,0x8f,0x0b,0x85,0x91,0x8f,0x2a,0x4f,0x36,0x66,0xd7,0xb3,0x01},
+            {0x9b,0x65,0x1a,0xb0,0x34,0x63,0xdb,0xfb,0x3e,0x7d,0xff,0x41,0x0e,0x75,0x84,0x30,0xfe,0x53,0x5d,0x40,0x98,0x05,0x50,0x60,0x18,0xbb,0x3f,0x9b,0xa9,0x8d,0x72,0x6f},
+            {0x07,0x95,0x03,0x4b,0xae,0x75,0xb6,0x16,0xaa,0x3d,0x94,0xdf,0x00,0x4f,0x4b,0x80,0x71,0x7c,0x59,0x3a,0xae,0x42,0xe0,0xee,0xea,0x2b,0xda,0x50,0x8f,0xd0,0x91,0xc6},
+            {0x52,0xd8,0x99,0x8c,0x0c,0x3e,0xa0,0xa4,0x2e,0x62,0x71,0xa4,0x36,0x60,0xf2,0x4f,0x17,0xe6,0x20,0x1d,0xcb,0xe2,0x8a,0x4e,0x13,0x74,0xdd,0x20,0x75,0x83,0x27,0xb9},
+            {0xa0,0x41,0x59,0xad,0x9c,0xdb,0x94,0x3b,0x39,0x16,0x0a,0xf9,0xeb,0xa2,0x03,0xf3,0xae,0xff,0x9b,0xbf,0xd9,0x33,0x84,0x3b,0xf6,0xcc,0x32,0xf4,0x0b,0xbc,0x1f,0x54},
+            {0xcf,0x25,0x05,0x07,0xd4,0xd9,0xf0,0x66,0x22,0x1a,0x2c,0x5c,0xe1,0x90,0xda,0x42,0xe2,0xc8,0xe9,0xaf,0xce,0x5a,0x53,0x9f,0x09,0x30,0x5a,0xf5,0x07,0x4b,0x75,0x9f},
+            {0x5f,0xca,0x2b,0xf5,0xcb,0xda,0x42,0x84,0xeb,0x2a,0x9a,0xa2,0x6b,0x55,0xf5,0x4d,0x43,0xe2,0x8d,0x0e,0xfb,0x97,0xe4,0x29,0x48,0x2a,0x11,0xb6,0x6c,0xbc,0x7f,0x8f},
+            {0xa7,0x40,0xd8,0x65,0x74,0xc3,0x21,0xa0,0xd3,0xff,0xec,0x51,0x24,0x43,0x1c,0x9a,0x2e,0x52,0x88,0x2f,0x85,0x52,0x0f,0x29,0x6b,0xdb,0x23,0x07,0x78,0xe7,0x42,0x01},
+            {0x55,0x43,0x63,0x3b,0xa0,0x60,0x69,0xb4,0x59,0xf1,0x0a,0x91,0x74,0xdf,0xf4,0x88,0x57,0x58,0x30,0xc8,0x6b,0xd3,0x2c,0x1d,0xa6,0x72,0x48,0x47,0x79,0x1e,0xa0,0x55},
+            {0x8c,0xb6,0x84,0xf2,0x4f,0x0a,0x95,0xad,0x5f,0x43,0x76,0xaa,0x8f,0x0d,0x9b,0xdd,0xa6,0xe4,0x13,0xbf,0x04,0xa3,0xc8,0x82,0x1a,0x54,0x7f,0xdf,0x46,0xdd,0x19,0x38},
+            {0xb1,0x67,0x59,0x0a,0xd1,0x04,0x0d,0xef,0x21,0x61,0xbb,0x85,0x4d,0x08,0xfc,0x62,0xb8,0xe4,0xff,0x4a,0x2d,0x60,0x37,0x6c,0x16,0x92,0xc8,0x7c,0xb2,0x00,0x8e,0x7b},
+            {0xa0,0x0f,0x55,0xc7,0x0f,0x53,0x9a,0x98,0xa2,0x3b,0x51,0x88,0x8c,0x89,0x2f,0x2b,0x5a,0x9b,0x86,0x32,0x8e,0xc9,0x9c,0xd5,0x6a,0x11,0xf0,0xe5,0xd8,0xd4,0xd4,0x9c},
+            {0x73,0xdc,0x98,0xbc,0x6b,0x38,0x62,0xa5,0x13,0x32,0x0e,0x0e,0x4c,0xd6,0x1f,0x50,0x21,0xb3,0x01,0x70,0xa2,0xd0,0x54,0xab,0xbb,0x62,0xe8,0x70,0x36,0xf4,0xea,0x08},
+            {0xac,0x0f,0x7c,0xc6,0xfb,0xc9,0x4a,0x64,0xb5,0x05,0x65,0xa9,0x29,0xed,0x6a,0xeb,0xd4,0xc6,0xc3,0x60,0x00,0xdd,0x40,0xb4,0xf8,0x26,0x05,0x2b,0x60,0xe9,0x81,0x03},
+            {0xe2,0x4d,0x3e,0xdf,0x80,0xad,0x41,0x4a,0x6e,0x5f,0xfc,0xa9,0x04,0xa2,0x59,0xc6,0xa2,0x8f,0x10,0x58,0xc0,0x48,0x8a,0x52,0x49,0x08,0xd1,0xca,0x8a,0x2f,0xaa,0x26},
+            {0x38,0xd0,0x20,0xa5,0x13,0x20,0x0b,0x0a,0x6d,0x7b,0xad,0x5f,0xe1,0xe8,0x7e,0x39,0xef,0xc7,0xf8,0x0b,0x94,0x06,0x98,0xba,0x23,0xa7,0x8b,0xbe,0x2c,0xde,0x0f,0xda},
+            {0xff,0xb2,0xbd,0xb6,0x44,0x99,0x0f,0x47,0x51,0xb4,0x79,0x5b,0x94,0x78,0x4b,0x5e,0x3c,0x00,0xa5,0xd4,0x0a,0xfa,0x2b,0x11,0x08,0x22,0xeb,0x7d,0xd0,0xcf,0x2d,0x63},
+            {0x40,0xa6,0x54,0x3d,0x5f,0xae,0xcc,0x7f,0xd7,0x97,0xd8,0xaa,0xf0,0x91,0xd5,0xe4,0xdd,0xf5,0xf0,0x75,0xe7,0xf4,0x79,0x8b,0x36,0xb6,0xff,0x26,0x69,0xaf,0xbf,0xca},
+            {0x07,0xee,0x87,0xb5,0xc2,0x21,0xa2,0x11,0x04,0x88,0x1b,0x0a,0x62,0x55,0xc2,0x35,0x4a,0xbf,0xec,0xa8,0x0b,0xe6,0x35,0x80,0x3a,0x38,0x7a,0x3e,0xf9,0x03,0x2f,0x3b},
+            {0xd3,0xfe,0x1e,0xef,0xca,0xa0,0xd0,0x34,0x34,0xe6,0x75,0x9f,0x8b,0x48,0xfc,0x50,0xf4,0x22,0x3e,0xde,0xc5,0x47,0xc9,0x4b,0xf0,0x72,0xd4,0x94,0x27,0xe2,0xf4,0x18},
+            {0x0c,0xe4,0xd7,0xed,0x2e,0xb0,0x7f,0x79,0x85,0x88,0xdf,0x1d,0xf0,0x44,0xd9,0xe1,0x24,0x60,0x4f,0x01,0x78,0xca,0x89,0x41,0xe1,0x89,0x85,0x4d,0xaf,0x64,0xf2,0x6c},
+            {0x4e,0x56,0x57,0xff,0xde,0xb3,0xb8,0x8c,0xee,0x74,0x45,0x2c,0xd2,0x4a,0x8d,0x78,0xea,0x33,0x01,0x3f,0x60,0x0d,0x0a,0x6e,0x97,0xc5,0x6e,0xef,0x47,0xc3,0x68,0x19},
+            {0x8e,0x5a,0x2d,0x6f,0x8b,0x4d,0x08,0x78,0xa4,0x38,0xd7,0xb3,0x3e,0xd8,0xbb,0x7c,0x32,0x29,0x49,0x68,0xf7,0x1e,0xbf,0x45,0xab,0x51,0xba,0x45,0xbc,0x38,0x36,0xe3},
+            {0x0f,0x81,0xdc,0xd7,0xf6,0x49,0xbb,0xfd,0xd0,0xdb,0x6f,0xc6,0x9a,0xe5,0xf5,0xa7,0xd8,0x9b,0x99,0x38,0x8e,0x7d,0x20,0x31,0x27,0x05,0xba,0x07,0xd1,0x6a,0x4a,0xb8},
+            {0x1c,0xc3,0x48,0x60,0x05,0xfa,0x61,0x51,0xd9,0x57,0xd0,0xcb,0x6e,0x25,0x99,0xdf,0x26,0x80,0x05,0x59,0x49,0xb8,0x1d,0x4d,0xab,0x85,0x56,0x26,0x22,0xde,0xd0,0x7d},
+            {0x78,0xc8,0x02,0x19,0x36,0x52,0x77,0x68,0xd5,0xcd,0x7e,0x1d,0xcc,0x30,0xce,0x55,0xab,0x13,0xce,0xb6,0xa1,0x20,0x99,0x96,0xa8,0x29,0xe3,0xcf,0xf8,0xe7,0x23,0x9d},
+            {0xab,0x17,0x47,0x69,0x4e,0x6e,0x07,0x05,0x1b,0x67,0x39,0xe3,0xdf,0x29,0x16,0xe0,0x9d,0x7c,0xd8,0xa1,0x35,0x75,0x3c,0x91,0x36,0xa8,0xdb,0xba,0x04,0x49,0xe8,0x3a},
+            {0x25,0xd6,0xf0,0xd4,0x35,0x67,0x9e,0x7d,0x84,0x14,0x7d,0xa6,0x50,0x06,0xa4,0x8a,0x5a,0x0f,0x89,0x3e,0xd2,0xe9,0x56,0x51,0x8b,0xbc,0xd6,0xb9,0x8f,0x40,0xd3,0x68},
+            {0x35,0x54,0xc7,0x68,0x2f,0x56,0x5a,0x20,0xb3,0x36,0xc4,0x01,0x29,0xb5,0xf7,0x18,0x22,0x39,0xf2,0xb0,0xb1,0x16,0x9f,0x39,0xf8,0x42,0x1f,0x25,0xb9,0xad,0x52,0xcd},
+            {0x51,0xb2,0x63,0xe6,0x7a,0x44,0x21,0xf6,0xb8,0x58,0xeb,0x3c,0xaf,0xe3,0x03,0xaf,0x0b,0x33,0x39,0xe0,0xb0,0x50,0x9e,0xb0,0x68,0xfe,0x30,0x92,0xd3,0x94,0xf5,0x30},
+            {0x2b,0xdc,0xbc,0x0d,0xf0,0x1d,0xbd,0xab,0x2c,0x91,0xc4,0x65,0x8b,0xb9,0xb1,0x60,0xfe,0x3e,0xfb,0xb5,0xdf,0xec,0xdd,0x85,0xab,0x52,0x5d,0xc2,0x10,0x33,0xd9,0x0a},
+            {0xaa,0x01,0x05,0xf9,0x62,0x89,0x07,0xcd,0xee,0xba,0xa7,0x43,0xc4,0x5a,0x45,0x85,0x53,0x94,0x2c,0x3e,0x08,0x9d,0x64,0xa0,0x2b,0xdc,0xae,0xf2,0x93,0x58,0x13,0x37},
+            {0xd4,0x63,0x6a,0xe5,0x0f,0x90,0x8f,0xb1,0x1c,0xfa,0x1f,0x33,0x83,0x14,0x26,0x0f,0x58,0x7f,0x26,0xc2,0x9c,0x86,0xcd,0x68,0x2e,0x50,0x03,0xfc,0xcb,0x55,0x4e,0xfa},
+            {0x31,0xae,0x95,0x47,0x64,0x0c,0x8e,0xba,0xd2,0x80,0x19,0xe8,0xeb,0x66,0xcf,0x60,0x80,0x74,0xd5,0xc1,0xa9,0x5a,0xef,0xa0,0x65,0xdb,0x97,0xda,0x4c,0x1e,0x10,0x44},
+            {0xa2,0x28,0xc9,0x42,0x93,0xd0,0x58,0x74,0xa0,0x0c,0x3a,0xa4,0x6e,0xe1,0x28,0xa4,0x1d,0x10,0x40,0x5c,0x28,0xe5,0xbe,0xd3,0xf7,0xe7,0xf5,0x48,0x24,0x3f,0xaf,0xd2},
+            {0xa7,0xd5,0xf3,0xe4,0x63,0x0b,0xe4,0x8f,0x88,0xcf,0xe4,0x51,0x47,0xb9,0x4b,0x90,0x10,0x71,0x8e,0x55,0xd6,0xea,0xae,0x64,0x62,0xa4,0x1a,0xac,0x52,0xe8,0x66,0xc3},
+            {0x56,0xd4,0xa3,0x83,0xbe,0x9e,0xfe,0x86,0x94,0xa5,0x72,0xa1,0x43,0x64,0x9b,0xe7,0xbf,0x89,0xb1,0xeb,0x12,0x84,0x24,0x38,0x16,0x25,0x32,0x82,0x7f,0x7b,0xf1,0x01},
+            {0x79,0xf7,0x17,0x7c,0xf2,0x65,0x59,0x51,0xfe,0x0f,0xe7,0xc9,0x8c,0xd1,0xcc,0xa2,0x52,0xe7,0xea,0xfc,0x0b,0x81,0x06,0x6a,0xab,0x08,0x41,0xf7,0xcd,0x78,0x95,0xf5},
+            {0xab,0xc1,0x74,0x67,0x68,0x38,0x3a,0xd5,0x9c,0x64,0x78,0x46,0xb1,0x3d,0xbd,0xf5,0x1d,0x50,0xf9,0xa5,0xf2,0xc5,0x0f,0xac,0x9f,0x67,0x65,0x31,0xed,0x6d,0x08,0xa6},
+            {0xa1,0xad,0x8a,0x55,0xe1,0x4a,0xcf,0x37,0xcd,0x4e,0xb5,0x08,0x54,0x05,0xb6,0x2a,0x53,0x94,0x80,0x65,0xdc,0xd3,0xbb,0xf2,0x99,0x47,0x7d,0x03,0xb1,0xd8,0xcc,0x6f},
+            {0xc7,0x31,0x48,0x7e,0x90,0x86,0x64,0x2d,0x4e,0x92,0xec,0xba,0xda,0x3d,0xc3,0x1b,0x72,0x04,0x95,0x83,0xd4,0x46,0xd6,0x5b,0xda,0x3a,0x09,0xb4,0x37,0x0c,0xaf,0xdb},
+            {0x72,0x9c,0x91,0x41,0x90,0xc7,0x53,0xc6,0xab,0x1f,0x64,0x8e,0xd0,0x48,0x89,0xba,0xba,0x5a,0xdc,0x43,0xe0,0x51,0x02,0x58,0x76,0x72,0xa7,0xa0,0x05,0x1b,0x27,0x9d},
+            {0x3f,0xcb,0xf0,0x9c,0xd6,0x4d,0x40,0x70,0x06,0x2d,0xd2,0xea,0xf9,0xff,0x59,0x5d,0x3e,0x1f,0xef,0xae,0xa6,0x99,0x6a,0xb1,0x34,0xe9,0xf3,0x94,0xe0,0x81,0x4f,0x56},
+            {0x2e,0xfc,0x8b,0xdc,0x74,0xb4,0x11,0x38,0xf0,0x07,0x5e,0x26,0x03,0xec,0x22,0x7f,0x72,0x65,0xd3,0xeb,0x6e,0x7c,0xa1,0x6a,0x7e,0x16,0x96,0xaa,0x83,0xcc,0x36,0x35},
+            {0xcf,0x05,0xb4,0x70,0x68,0x3e,0x40,0x90,0x95,0x9a,0x5e,0x62,0x22,0xaa,0xbb,0x10,0x26,0xd6,0x09,0x07,0xf9,0xdf,0x98,0x25,0x6e,0xd0,0xdc,0x62,0x10,0x3e,0xff,0x79},
+            {0xca,0xe8,0xa9,0x8b,0x1c,0x42,0x1b,0xa3,0x4a,0xf4,0x66,0x10,0x13,0x4a,0x71,0x15,0x3d,0x52,0x56,0x36,0xc0,0x2c,0xcc,0xad,0x8e,0x03,0x62,0xb7,0x10,0x9d,0x74,0x10},
+            {0xcb,0xf0,0x05,0x26,0xae,0x88,0x58,0x99,0x74,0x7b,0xad,0x4c,0x39,0x5b,0x9f,0x2c,0x02,0xe6,0x2b,0xbf,0x39,0xfc,0xee,0x82,0x56,0x5f,0xec,0xb1,0x22,0x4b,0xc3,0x11},
+            {0xb6,0xdd,0xac,0x87,0x13,0x81,0x35,0x38,0x48,0xdb,0xb4,0x38,0xf0,0xb7,0xef,0x14,0xfc,0xa4,0xeb,0x39,0xfb,0xda,0x7b,0x4e,0xb1,0x74,0x7e,0xa4,0x54,0xb3,0x15,0x5a},
+            {0x37,0x5b,0x66,0xc1,0x66,0x68,0x30,0x8f,0x1e,0x76,0x8c,0x09,0xbc,0x2d,0xbb,0x0d,0xef,0x9d,0xd0,0x4d,0x2f,0x90,0xc4,0x2c,0x49,0x45,0x3f,0x55,0x82,0x20,0xa3,0x38},
+            {0xa2,0x38,0x7d,0xa7,0xbe,0x7e,0xc4,0xa0,0xce,0x7e,0xf0,0x3c,0xb1,0xbd,0x70,0x13,0x30,0xe5,0xe9,0x50,0xbe,0x12,0x08,0x54,0xef,0xac,0x13,0xd9,0x03,0x36,0x72,0x48},
+            {0x21,0xf4,0xef,0xbd,0x85,0x7d,0x83,0x86,0x26,0xa5,0xb6,0xeb,0x93,0x5c,0x1d,0x8d,0xc3,0xa0,0xa6,0xc8,0xde,0xfd,0x23,0x92,0x8c,0x80,0x18,0xc4,0x95,0x66,0x63,0xc1},
+            {0xac,0x96,0xb1,0x76,0x99,0x9b,0x37,0x71,0x9f,0xe3,0xa6,0x72,0x31,0xb8,0x11,0xa7,0xa4,0x35,0xee,0x7b,0x5e,0x80,0x7f,0xd1,0x43,0x08,0x03,0xa2,0x9c,0xab,0x70,0xff},
+            {0x9c,0x06,0xf3,0x2a,0x7f,0x01,0x6a,0x0e,0x70,0x2b,0x92,0x8f,0x7d,0xe9,0xa8,0x22,0x97,0x49,0x84,0x00,0x65,0x41,0x09,0xec,0x3a,0x17,0xa1,0xc2,0x53,0x1a,0x36,0xd0},
+            {0xfa,0x93,0x2d,0xe5,0x04,0xe5,0x47,0x76,0xe5,0xb8,0xfe,0x75,0xa2,0xaa,0x70,0x67,0xcf,0xf7,0x98,0x65,0xb7,0x66,0x88,0x25,0x42,0x60,0x8e,0xb3,0x1d,0xe1,0xf3,0xaf},
+            {0xd9,0x94,0xc1,0xc8,0x5a,0xb3,0x61,0x1a,0xd1,0x2f,0xbb,0xd4,0xee,0x7e,0x7a,0xfb,0x30,0xff,0x9c,0xe3,0xc6,0x7c,0xa6,0x19,0xd9,0x78,0x65,0x53,0xb0,0x38,0x36,0x68},
+            {0x2e,0x57,0x89,0xcc,0xd6,0x25,0xcf,0x20,0xf4,0x2a,0x72,0xde,0x7c,0xdc,0x24,0x6a,0xb9,0x2a,0x1c,0xd8,0x5e,0xe6,0x19,0x57,0x05,0x49,0xa8,0xef,0xfa,0x47,0x6f,0xf9},
+            {0xec,0x41,0x45,0xc4,0x29,0xfe,0xcc,0x6b,0x51,0x09,0xd5,0xa4,0xe1,0x43,0x4c,0x44,0x18,0x92,0x5f,0xc6,0x5f,0x53,0xbd,0xa6,0xcd,0x06,0x62,0x0d,0xbd,0x2d,0x1b,0x69},
+            {0x09,0x78,0x23,0x9a,0x7a,0x14,0xbb,0x76,0x8e,0x1c,0xa7,0x1e,0x1d,0x40,0xe3,0x7a,0x10,0x20,0x91,0xad,0x01,0xa7,0x5f,0x5f,0x92,0xc5,0xda,0x90,0x07,0x61,0xc7,0x9d},
+            {0x33,0x82,0x54,0x6a,0xef,0xe3,0x21,0xd6,0x44,0xbd,0x36,0x26,0xc7,0xb7,0x67,0xbb,0xf9,0x40,0xdf,0x0c,0xeb,0xfd,0x39,0x17,0xc0,0x5f,0x69,0xc7,0x97,0x31,0x36,0xcc},
+            {0x22,0x7e,0x8c,0x80,0x45,0x92,0x8a,0xf9,0x6e,0x79,0x45,0x85,0xa8,0x7d,0x68,0x69,0xc3,0xce,0xd7,0xda,0xb3,0x68,0x9c,0x55,0x65,0xce,0xc5,0x4e,0x16,0x86,0x41,0xa9},
+            {0xc0,0xa3,0xf1,0xb8,0xc2,0x7d,0x02,0x34,0xfc,0x64,0xfd,0x8d,0x1f,0xf9,0xf6,0xd3,0xca,0x15,0x7b,0x03,0x03,0x3e,0x50,0x5b,0xd4,0x43,0xf1,0xb7,0xbb,0xa6,0x2f,0x7e},
+            {0x2e,0x84,0x8b,0x33,0x46,0x5d,0xf0,0xfa,0x0a,0x2b,0x75,0xd2,0x3c,0x4d,0xf4,0xf0,0x28,0x24,0xf4,0x31,0xe7,0x8e,0x80,0xc0,0x22,0x1f,0xf5,0xaa,0x61,0x34,0x8a,0x91},
+            {0x14,0x65,0x6b,0x6d,0xa2,0x32,0xaf,0x33,0x4b,0xef,0xfd,0x02,0xff,0xb8,0x69,0x92,0x63,0x79,0x93,0xce,0x4a,0xa5,0x30,0xac,0xf8,0xbb,0xc2,0x08,0x1c,0x5d,0xd2,0xeb},
+            {0x16,0x97,0x56,0x7e,0xea,0x59,0x5c,0x83,0x53,0x10,0x63,0x86,0x72,0xcc,0x7f,0xf2,0x06,0x7a,0x56,0x81,0x98,0x73,0x11,0x28,0x28,0x0b,0xf4,0x16,0x7b,0x2e,0x45,0xee},
+            {0x74,0x9a,0x78,0x4a,0x54,0x40,0x85,0xed,0x3f,0xe5,0x6e,0x3c,0xe9,0x64,0x3d,0x0e,0x13,0xaa,0xb8,0xf3,0x48,0x0f,0x2f,0xdf,0xe7,0xc1,0x6e,0x15,0xef,0x08,0xd0,0xb3},
+            {0x0b,0x2b,0x27,0x57,0x9b,0x61,0x5e,0x08,0x69,0x59,0xfb,0x35,0xf7,0x74,0x17,0x91,0x61,0x5e,0x25,0xc6,0x11,0xf8,0xab,0x78,0x51,0xc8,0x3b,0xdf,0xed,0xa7,0xd7,0xc9},
+            {0xe4,0x44,0xde,0x3a,0x6f,0xc9,0x0b,0x1d,0x26,0x26,0x98,0x7f,0xe9,0x8c,0x95,0x6c,0x1e,0x0d,0xb2,0x00,0x8c,0xdb,0xe6,0xd8,0x63,0xad,0x41,0x0e,0x9f,0xe0,0xa8,0xa3},
+            {0x89,0xa7,0x57,0xea,0x85,0xe9,0xd2,0x4b,0x3e,0x58,0x45,0x38,0xcd,0xed,0x1e,0x5d,0xb3,0xa9,0x0b,0xb0,0x10,0x66,0xaf,0x60,0x9d,0x34,0x01,0xd1,0xbb,0x5b,0x20,0x5f},
+            {0xb0,0x0b,0x5a,0x1c,0xcb,0xc1,0xec,0x14,0x2c,0x5e,0xf0,0x63,0xda,0xa8,0x8a,0xaa,0xc1,0xd3,0xe5,0x2a,0xf1,0x22,0x56,0xcd,0x89,0x28,0x03,0xaa,0x34,0x8c,0x3f,0x30},
+            {0x0e,0xa2,0x2d,0xee,0x4f,0x62,0xac,0x35,0xe5,0xb4,0x5a,0x3b,0xee,0xff,0x82,0xc8,0xc3,0x22,0x31,0x19,0x3b,0xcc,0x33,0xba,0x75,0x75,0x91,0x6d,0xac,0xbd,0xeb,0xde},
+            {0x5c,0x42,0x87,0x62,0xfa,0x84,0x7e,0x9a,0x97,0xfc,0xe0,0xf3,0x06,0xc7,0xf0,0xd8,0xc4,0xb4,0xab,0xdf,0x9d,0xef,0xcb,0x0d,0xf0,0xda,0xfe,0xc4,0x15,0x90,0xeb,0xb8},
+            {0x8e,0xac,0xd0,0xd7,0xd0,0x86,0x45,0xad,0x83,0x66,0x80,0x7a,0x5c,0xc9,0xf9,0x1a,0x4b,0x22,0xfd,0x52,0xab,0x4d,0x8c,0x74,0xef,0xae,0xb9,0xfb,0xa3,0x98,0xf2,0x4d},
+            {0x64,0x8e,0xd1,0x41,0x93,0x6c,0x94,0x97,0x70,0x2b,0xe3,0x48,0xe2,0x60,0xb9,0xa4,0xaa,0x9f,0xf5,0xda,0xdc,0x6b,0x65,0x43,0x81,0xc9,0xe5,0x41,0x60,0xa0,0x7f,0x4b},
+            {0x68,0x2c,0xc4,0xae,0x34,0x10,0x1c,0x80,0xa9,0x8f,0xe4,0xa6,0x74,0xef,0x0b,0x16,0xd1,0x1c,0xe7,0x0b,0x56,0xb3,0xa7,0xfc,0x5b,0x19,0x1b,0x36,0x0d,0xee,0xae,0xcd},
+            {0x2b,0x82,0xb8,0xfa,0x93,0x0e,0x14,0xbc,0xc3,0x8f,0x1b,0x9b,0xf6,0xa9,0x9f,0x39,0x87,0xb3,0x2c,0x7e,0x74,0x36,0x3d,0x20,0xac,0xf6,0xbd,0x05,0x05,0x7c,0xfb,0x5e},
+            {0x1d,0x2c,0x04,0x13,0x6a,0xa4,0xce,0x34,0x04,0x0a,0x97,0x56,0xba,0x9f,0x16,0xaf,0x6a,0x3f,0xad,0x26,0xb7,0xa9,0x66,0x9a,0x62,0xc3,0x56,0x3d,0x66,0xa4,0xd4,0xa5},
+            {0x04,0xab,0x01,0x58,0x6e,0x7e,0x46,0x15,0x65,0x61,0x27,0xd9,0x5c,0xd5,0x58,0xe3,0x18,0x45,0x7e,0xd1,0x64,0x1c,0x22,0x29,0xb7,0x5e,0xd6,0x76,0xf2,0x1a,0xe1,0xd5},
+            {0xa7,0xa5,0xc8,0x47,0x06,0x28,0x4a,0x3c,0x98,0x12,0x1e,0x35,0xe8,0x9e,0x33,0x61,0xc3,0x9a,0xb8,0xb5,0xce,0x26,0xc3,0xe4,0x79,0xcd,0xb4,0xc2,0xf3,0x0a,0xae,0xa9},
+            {0xd1,0x2b,0x32,0x99,0xcd,0x33,0x4b,0x98,0x99,0xce,0x85,0x5a,0x08,0x85,0x77,0xd8,0xd7,0x57,0xdc,0x32,0x12,0x59,0x21,0xf2,0xee,0x56,0x1d,0xaa,0x94,0x81,0x4b,0x7b},
+            {0x48,0x71,0x4a,0x6b,0x92,0xc6,0xe9,0x8e,0x34,0x06,0xee,0x38,0x53,0x97,0x21,0xa3,0xba,0x60,0x25,0x4a,0xce,0x52,0xc7,0x41,0x92,0x52,0x22,0x95,0x5a,0x89,0xa8,0xbb},
+            {0x27,0x59,0x7f,0x71,0x9f,0x1a,0x11,0x52,0x27,0x33,0xa0,0xdb,0x69,0x46,0x2f,0xd7,0xd2,0x8f,0x0a,0x64,0xd6,0xcb,0x50,0x8a,0xf5,0xdb,0xfe,0xe2,0x91,0xb5,0x2f,0x81},
+            {0x44,0xc2,0xfc,0x25,0x55,0x1c,0x20,0x44,0x19,0xd7,0x98,0xaa,0xfa,0xcd,0xe9,0xe7,0x5b,0x4a,0xed,0x66,0x3d,0x47,0xc0,0xcc,0xa8,0xc5,0xc3,0x48,0x2b,0x76,0x60,0xac},
+            {0x9c,0xfc,0x7a,0x76,0xea,0xfe,0x71,0x7e,0xcd,0x56,0x50,0x1b,0xc1,0x6a,0xa6,0x44,0xba,0xc1,0x89,0xca,0xb5,0x8d,0xbb,0x90,0xbb,0xb0,0xcf,0x3a,0x4e,0x30,0x53,0xef},
+            {0x02,0x92,0x23,0xd3,0x00,0xc7,0x18,0x6a,0xb0,0xc8,0x23,0x47,0x4f,0x67,0x59,0x0a,0x86,0xe7,0xd0,0x8a,0x9d,0x1e,0xd3,0x95,0x88,0x30,0x7d,0xef,0x87,0x6a,0xd5,0x9b},
+            {0x53,0x30,0x54,0xcb,0x85,0x95,0x57,0x68,0xda,0xae,0xdd,0x98,0xcc,0xd7,0x94,0x95,0xe4,0x72,0x6b,0x2e,0x5e,0x7d,0x34,0x5a,0x3c,0xc7,0x0b,0xeb,0x19,0x53,0x8a,0x57},
+            {0x60,0xe7,0xf4,0x10,0xdd,0x3c,0x32,0xe1,0xc8,0x86,0x38,0xca,0x4e,0x75,0x8d,0xb9,0xa2,0xa8,0xf7,0xe5,0x2e,0x2f,0xae,0xe3,0x58,0xfd,0xbf,0x5d,0xd3,0xfc,0xe2,0x7e},
+            {0x3e,0xd8,0xf4,0x7b,0x67,0xc5,0xcc,0x36,0xb0,0xe6,0x74,0x5a,0x29,0x25,0x1d,0x04,0x70,0x79,0x5c,0xb1,0x4f,0x0a,0xd9,0xb3,0x01,0x70,0xc0,0xe5,0xc8,0xef,0xcb,0xe6},
+            {0x1f,0x88,0x9c,0x28,0xd6,0x8e,0x86,0x9b,0xf7,0x11,0xe2,0x14,0xdb,0xe7,0x39,0xac,0xc3,0x57,0x80,0xe8,0xb1,0x9e,0xf9,0x57,0x6d,0xed,0xe8,0xe2,0xe9,0x1b,0xdb,0x9d},
+            {0xdb,0xf0,0x0c,0x8b,0xd1,0x0f,0x5a,0xe1,0x2f,0x38,0xc6,0x25,0xc8,0xaf,0x80,0x89,0xcd,0x28,0xff,0x92,0xf3,0x4a,0x1d,0x94,0x9d,0xbd,0xc2,0x0d,0x7a,0x80,0xd7,0x97},
+            {0x96,0x0e,0xf9,0xda,0xa1,0xb2,0x46,0xbb,0x65,0x6a,0xed,0x81,0x9c,0xbe,0x89,0x8d,0xc1,0x4c,0xa8,0xe5,0x58,0x07,0x0c,0x94,0x68,0xf8,0x40,0x48,0x7c,0x05,0xdb,0x92},
+            {0xfe,0x1b,0x43,0xac,0x27,0x09,0x55,0x08,0x40,0xc6,0x82,0xec,0xc2,0x3d,0x26,0x99,0xe9,0xb3,0xfc,0xf5,0x58,0x51,0x99,0x9d,0x9f,0x09,0xb0,0x23,0x70,0xaa,0xd5,0x02},
+            {0x9f,0x58,0xad,0x99,0xbd,0xc0,0x49,0xa7,0xcc,0x29,0xf7,0xbc,0x48,0x26,0x29,0x30,0x2d,0x56,0xb3,0x2b,0xa3,0xb4,0xa7,0x03,0x22,0x39,0x45,0xc8,0xa6,0x1f,0x42,0x54},
+            {0xaf,0x61,0x38,0x3d,0x24,0x1f,0xa4,0xce,0xe9,0x5f,0x80,0x65,0x52,0x75,0x37,0xa2,0x37,0x91,0x4d,0x9b,0x14,0x94,0xac,0x8f,0xd3,0xed,0x47,0x6a,0x60,0x48,0x82,0xaf},
+            {0x50,0x3e,0x10,0xb0,0xbd,0x88,0x0b,0xeb,0x40,0x0e,0x91,0xfc,0xe6,0x9c,0x4f,0xc9,0xf3,0x6e,0x3c,0x81,0x6a,0xe8,0x6b,0x7b,0x8d,0x97,0x29,0xd0,0x0d,0x08,0xef,0xc7},
+            {0xbe,0xb9,0xc4,0x75,0xc0,0x20,0xf4,0xaf,0x86,0x59,0xaa,0x27,0xef,0x0d,0x1d,0xd1,0x43,0x47,0x90,0x29,0xa8,0xef,0x2f,0x60,0x5a,0xda,0xe6,0x1b,0xd6,0x93,0xc9,0xce},
+            {0x73,0xb9,0x3d,0xe4,0x84,0x3e,0x32,0x3d,0x7d,0xb0,0x72,0x6e,0x0b,0xc3,0x01,0xff,0x01,0x94,0xb9,0x65,0x6b,0xb4,0x0b,0xd3,0xba,0xae,0x07,0x3b,0x9a,0x4d,0xf9,0x6b},
+            {0x3f,0x3a,0x78,0x84,0x7d,0x99,0x64,0xca,0xe0,0xdf,0x94,0xac,0xbd,0x73,0xba,0x24,0xeb,0x04,0x2f,0x44,0xe5,0xa4,0x73,0xb1,0xdc,0x66,0x5a,0x4d,0xb5,0x18,0xdc,0xbd},
+            {0x24,0x0d,0x37,0xae,0xb8,0x28,0x15,0xe4,0xa6,0x1d,0xb5,0x72,0x9c,0xa1,0x0d,0x06,0x9d,0x95,0x54,0xe3,0xf2,0x09,0xee,0xcd,0x88,0x1d,0x12,0x71,0x9a,0x47,0xda,0xb6},
+            {0x87,0xf8,0x19,0x71,0x77,0x36,0x4e,0x5b,0x34,0x5a,0xbc,0x75,0x77,0x1b,0x04,0x18,0x89,0x0a,0xfa,0xa0,0xc1,0x09,0xe2,0xf6,0xda,0x58,0xdf,0x07,0x18,0x68,0xc7,0xde},
+            {0x9d,0x0f,0x1a,0x38,0x6a,0xb8,0xb2,0x19,0x2f,0x45,0x31,0x28,0x1d,0x50,0xdf,0x5d,0x35,0x4a,0x96,0xaf,0xca,0x98,0xb9,0x12,0x21,0x98,0x98,0x2e,0x01,0x20,0xd3,0x84},
+            {0x0b,0xd4,0x11,0xfc,0xcc,0xe0,0x89,0xfb,0xbd,0x2e,0xb0,0x4d,0xa0,0xce,0xcc,0x3f,0x03,0x0d,0x03,0x6a,0x44,0xb7,0x8f,0x37,0x35,0x28,0x16,0xbd,0x2b,0xec,0x9c,0x1d},
+            {0xa5,0x58,0x7e,0xb1,0xbb,0x90,0x7b,0x02,0x1e,0x20,0x6c,0xf1,0x7b,0xea,0xae,0xef,0xf2,0xc3,0x4c,0x22,0xa9,0x85,0x7c,0x0e,0xad,0x14,0xd6,0x8f,0x62,0xb1,0x81,0x8c},
+            {0xed,0x96,0xc8,0x09,0x7a,0x4f,0xa7,0xde,0xbe,0x2d,0xb8,0xb1,0xaf,0xf9,0xba,0xea,0x5e,0xba,0xd8,0x39,0xb6,0x0b,0x7a,0xc8,0x78,0xfc,0x93,0xdd,0x70,0x4f,0x96,0x33},
+            {0xc2,0x44,0x89,0x72,0x80,0xea,0x22,0xde,0x34,0x94,0x64,0x2c,0x6a,0x82,0x19,0x50,0x0b,0x88,0x4c,0xcc,0x77,0x80,0x2b,0x95,0x3f,0x71,0xcf,0x12,0xde,0x44,0x5e,0x28},
+            {0xe1,0x1b,0x64,0xf7,0x80,0xd2,0xe2,0x31,0x4f,0xe9,0x69,0xa7,0x4a,0x86,0x12,0x9b,0x8c,0xda,0xf4,0xd2,0x23,0x37,0x68,0x43,0xb9,0x4f,0x4e,0x64,0xe9,0xbe,0x7e,0xec},
+            {0x1a,0x77,0x71,0x43,0x2e,0x67,0x82,0xbf,0x9a,0x5e,0xf4,0x36,0x87,0x4b,0xb9,0xaa,0x44,0xa5,0xf4,0x6d,0x1a,0x5a,0x7a,0xa7,0x85,0xdd,0x1f,0xb2,0x31,0x1d,0x9d,0x58},
+            {0x21,0x5b,0xe4,0x2f,0xb8,0xc3,0x51,0x1d,0xbc,0xbc,0xcd,0x16,0x34,0x89,0x58,0x57,0xd4,0x8d,0x2f,0x26,0xde,0x9f,0x9f,0x16,0x7f,0xfa,0x86,0xf1,0x41,0x81,0x92,0x98},
+            {0x56,0x35,0x72,0x5b,0x8e,0x48,0x40,0x4b,0xe3,0x7a,0x8c,0x9d,0xb3,0x27,0x41,0x95,0xcd,0x7e,0x36,0xa6,0x51,0xc6,0x5d,0x09,0xee,0x84,0x19,0xc5,0x71,0xd1,0xd2,0x33},
+            {0x3b,0xbe,0x9d,0x51,0x05,0x74,0x07,0x3e,0x79,0x5b,0x4f,0x84,0x3f,0x27,0x2a,0x19,0x00,0xf3,0x15,0x10,0xf9,0xad,0x36,0xa5,0x22,0x52,0x58,0x45,0xc9,0x00,0x75,0xee},
+            {0x1b,0x19,0xa4,0x75,0x69,0xf1,0x80,0x3e,0xcc,0x66,0xd1,0xd5,0x16,0x3c,0x4c,0x6e,0x7a,0xb9,0xf7,0xe9,0x9a,0xbe,0x3e,0x8b,0xcf,0x55,0xf8,0xcd,0xbb,0x00,0xef,0x7a},
+            {0xc1,0x55,0x57,0x8d,0xb7,0x21,0xfb,0x20,0x4f,0x97,0x59,0x11,0x9f,0x8f,0xf0,0x04,0xd7,0x8b,0xa0,0x68,0x86,0x9c,0x93,0x8d,0x9c,0xe0,0xa5,0x7e,0x65,0x0e,0x08,0x5c},
+            {0x01,0x7d,0x7f,0x31,0x83,0x04,0x17,0xc7,0xa0,0xef,0x24,0x0d,0x78,0x37,0xef,0x9c,0xf0,0x47,0xed,0x0a,0x84,0x14,0xeb,0x08,0x5d,0xa3,0x7f,0xe2,0xcd,0xdb,0xdf,0x64},
+            {0x78,0xea,0x75,0x51,0xcf,0x28,0xcb,0x95,0x42,0x59,0xa2,0x8e,0xc1,0x34,0x0e,0xe6,0x6d,0x71,0x5f,0x02,0xc5,0xeb,0x7f,0xec,0x48,0x14,0x52,0x98,0x58,0x14,0x64,0xf1},
+            {0xb8,0x9e,0xe6,0x47,0x48,0x41,0x18,0x6f,0x5a,0xfa,0xb5,0x38,0xf9,0xca,0x17,0xb4,0x17,0x1c,0x30,0x3d,0x5d,0xcc,0x89,0x24,0x7b,0x79,0xce,0x38,0x38,0x9b,0xc0,0xda},
+            {0xf1,0x5c,0xea,0xf2,0xa1,0x9e,0x8e,0xb5,0x99,0xba,0xc5,0x95,0x9a,0xba,0x35,0x18,0x68,0x8d,0x47,0x91,0x32,0x1e,0x61,0x8b,0x5f,0xf4,0xaf,0x17,0x00,0xfc,0x96,0x9f},
+            {0x6c,0x0b,0xe8,0xea,0xc8,0xa4,0x73,0xb6,0x65,0xf8,0x9b,0xc3,0xa3,0x10,0xc0,0x33,0xc0,0x93,0xf5,0xb0,0x62,0x52,0x7a,0x22,0x79,0x21,0xb0,0x72,0xaa,0x31,0x23,0xbe},
+            {0x60,0x95,0x0a,0x25,0x41,0x5a,0xdd,0x06,0x2c,0x9b,0xd5,0x42,0x7c,0xf5,0xe0,0xeb,0x75,0xd6,0xfd,0x73,0x63,0xaf,0x9d,0x44,0x65,0x68,0x31,0xd0,0x4c,0xdc,0xf7,0xfe},
+            {0xc8,0xee,0x6f,0x1b,0x5c,0xaf,0xc1,0x45,0x71,0x64,0x29,0x46,0xe8,0xd8,0xe5,0x61,0x91,0xc3,0xa9,0xa0,0x20,0xe5,0x32,0x2e,0xc3,0x0a,0x69,0x82,0x58,0xc2,0x4a,0x17},
+            {0xfd,0x5a,0x24,0xfb,0x18,0x52,0x92,0xc8,0x45,0xfb,0x87,0x59,0xd9,0x24,0xa7,0x2f,0x24,0xc1,0x87,0x58,0xfe,0x9a,0xc5,0xe0,0xdf,0x99,0xd1,0x36,0x5e,0x06,0x57,0xa4},
+            {0x85,0xdb,0x13,0x8d,0xe6,0x94,0x0b,0xcd,0x58,0xf3,0x78,0x36,0xe4,0x31,0xc6,0xd0,0xdd,0xa1,0x72,0x2d,0x21,0xf7,0xfe,0x2e,0x51,0x9d,0x08,0xec,0x8d,0x99,0x0d,0x7b},
+            {0x13,0xa1,0x8f,0xb4,0xb0,0x2a,0x80,0x87,0x71,0xe8,0xa5,0xeb,0x2a,0x64,0x82,0x9b,0xf2,0x7c,0x7e,0x6f,0xb8,0x2b,0x2a,0xdf,0x8d,0x44,0xa9,0x20,0xfa,0x6a,0x59,0x00},
+            {0xcf,0x37,0x46,0x0c,0x8a,0xd1,0x9a,0x60,0x4c,0xd4,0xd1,0x47,0x5e,0x82,0x58,0xdd,0xbf,0x72,0xe3,0x16,0x3d,0x07,0xba,0xd6,0x76,0xa0,0xdb,0x39,0x24,0x8f,0x29,0x8d},
+            {0x16,0xaa,0xf7,0x85,0x46,0x29,0xa4,0x61,0x24,0x42,0xc7,0xc7,0xb6,0x78,0x36,0x99,0x0c,0xe6,0x0a,0x78,0xb9,0x5b,0xb0,0x22,0x16,0x46,0xcb,0x9d,0x27,0x45,0x4e,0x2a},
+            {0xf3,0xff,0x2a,0x33,0xd3,0x2d,0xaf,0xf5,0xa2,0x60,0x6a,0xd4,0x1d,0x8b,0x9f,0xa4,0x69,0xfe,0xd1,0x75,0xab,0x2d,0x12,0xcb,0xa2,0x43,0x2d,0x2c,0xec,0x32,0x0b,0xcd},
+            {0x3f,0x84,0xdc,0xab,0x75,0x82,0x37,0x60,0x89,0xe9,0x59,0xb4,0x2b,0x47,0xed,0x23,0x7a,0xd5,0x2f,0x5e,0x63,0x30,0x93,0xbf,0x7f,0xcb,0xff,0x61,0x64,0xb7,0x4c,0xbd},
+            {0x17,0x76,0xd3,0xf2,0xca,0x16,0x5c,0xc2,0x0e,0x07,0x36,0xe7,0xba,0x69,0xce,0x32,0x0b,0x1e,0x19,0x57,0x52,0x45,0xe0,0xe7,0x8b,0xf6,0x28,0xbf,0x8a,0x3b,0x4c,0x90},
+            {0x4b,0x81,0x52,0x73,0x38,0x57,0x85,0xfe,0x9e,0x57,0xdb,0xe6,0xbb,0xab,0x75,0x42,0x3b,0x63,0x02,0xf8,0xda,0xef,0x24,0x5c,0x12,0xbc,0x4b,0x85,0x72,0x69,0x68,0x93},
+            {0xf9,0xda,0xf1,0x48,0xd2,0xec,0xe9,0x98,0x69,0xe0,0x0e,0xd4,0x4f,0xfc,0x1a,0x74,0x07,0x92,0x56,0x9a,0x36,0xd6,0xdc,0x21,0xa9,0x43,0x88,0x45,0x3c,0x31,0xa0,0x8b},
+            {0x0a,0x7f,0x0c,0xc9,0xbc,0x54,0xb8,0x16,0xa2,0x17,0x85,0xf8,0x44,0x14,0xbd,0xb9,0x9f,0x34,0xa4,0x9a,0x3e,0x33,0xe5,0xfa,0x1d,0x10,0x5b,0xa0,0x26,0x54,0x06,0x27},
+            {0x05,0xec,0x34,0x9e,0xce,0x9f,0x47,0xe9,0x2e,0xc0,0xba,0xda,0x62,0xdc,0x00,0xa7,0x89,0x6a,0xbe,0x81,0x8b,0x21,0x39,0x14,0xb9,0x5d,0x3c,0xc3,0x01,0xaf,0xa0,0xcf},
+            {0x3f,0x65,0x2f,0x63,0x45,0x9a,0xba,0x46,0x84,0x39,0x0a,0x90,0x68,0x7e,0x11,0x7b,0xfd,0x79,0xe0,0x9b,0x42,0x54,0x27,0x33,0xac,0xb7,0x34,0xad,0xbb,0x0a,0x01,0xcf},
+            {0xd7,0xbe,0x18,0xe6,0x1d,0x11,0xc4,0xe5,0x75,0x7f,0x2a,0xd5,0xfb,0x6b,0x8e,0xb7,0x0a,0xb1,0xf6,0x21,0xf7,0x78,0x5d,0x04,0x8b,0xae,0xc8,0x7e,0x3c,0x81,0xdd,0xb7},
+            {0xcb,0x4e,0xf5,0xac,0x7f,0xf2,0xc3,0x48,0x08,0xe9,0x39,0x8f,0xf7,0xe3,0x13,0xcf,0xb5,0xb7,0x3e,0x8b,0x3c,0xf9,0xc0,0xc3,0xab,0x80,0x59,0x98,0x31,0x59,0x21,0x3c},
+            {0xc1,0xf6,0x6f,0x86,0xc3,0xdc,0x26,0xb2,0x21,0x2c,0xd7,0x53,0x6b,0xd4,0x0b,0xde,0x14,0x01,0x5a,0x19,0x10,0x8d,0x99,0x7e,0x24,0xd0,0xf5,0xb1,0x53,0x2c,0x52,0x01},
+            {0x2e,0x87,0x66,0xd4,0xdd,0x56,0x64,0x6f,0x8f,0xca,0x1c,0xc1,0x2f,0xe6,0x67,0x85,0xbd,0x90,0xf4,0x2d,0x27,0x07,0x4c,0x71,0xe3,0x38,0x07,0x32,0xf5,0x61,0x65,0x58},
+            {0xfe,0xb9,0x5b,0x15,0xd2,0x69,0x76,0xb6,0xb3,0x1b,0xd4,0x88,0x43,0x0d,0xa4,0x64,0xd8,0x71,0x02,0xd5,0xb3,0x5c,0xec,0x8b,0xb5,0x78,0xcf,0xfc,0x91,0xbc,0x79,0x33},
+            {0xbe,0xf9,0x56,0xf6,0xa7,0x85,0xe9,0x93,0x7e,0x4e,0x3b,0xad,0x0b,0x14,0x68,0xc4,0x28,0x53,0x4f,0xc0,0x66,0x58,0x73,0x8d,0x5e,0x02,0xc1,0xa6,0x04,0xc7,0x70,0x03},
+            {0xfb,0x47,0x1f,0x8b,0x76,0x2a,0xdd,0x49,0xe6,0xd9,0x1e,0xb4,0x6c,0xc0,0x18,0xa6,0x99,0x0c,0xa7,0xbf,0x1f,0xb1,0x5d,0x26,0xae,0xc9,0x0f,0x6b,0xa9,0x68,0xf6,0xcd},
+            {0xd4,0xf3,0x5e,0x4a,0x4e,0x00,0x65,0x46,0xaf,0x1b,0xf0,0x9f,0x5e,0x49,0xb5,0xdd,0xa6,0x0a,0xe5,0xdd,0x52,0x6b,0x85,0xba,0x92,0xd8,0x71,0xf4,0xf0,0x9d,0xf7,0x7b},
+            {0x79,0x5f,0xda,0x42,0xbe,0xce,0x1d,0x71,0x14,0x37,0xfe,0x50,0x4f,0x78,0xe9,0x40,0xf3,0x09,0xc8,0x98,0x30,0xbd,0xb5,0xe9,0xdd,0x46,0xaf,0xe3,0xfb,0xb1,0xb1,0x50},
+            {0xab,0xaf,0x0b,0xc8,0x79,0xb7,0x0a,0xce,0x0a,0x82,0xaf,0x4b,0x9d,0x4f,0x32,0x08,0x5d,0xdc,0x7c,0x5d,0x92,0x0a,0x67,0x3c,0x47,0xe8,0x31,0x99,0x95,0x9b,0x4d,0xe6},
+            {0xae,0x69,0xa7,0x84,0xb1,0x85,0x24,0xbf,0x95,0xe7,0xb2,0x34,0x9c,0xd1,0xc3,0x67,0x09,0xeb,0x81,0x0b,0x01,0x68,0xe7,0xe1,0x40,0xa7,0xa4,0x11,0x44,0x3a,0x02,0xdd},
+            {0x78,0x58,0xfa,0x7a,0xcf,0x40,0xbb,0xc2,0x16,0x8e,0xbf,0x05,0xe3,0x38,0x9a,0xe6,0x46,0xd1,0xfd,0x45,0x67,0xb1,0x74,0x70,0x50,0x65,0x96,0xba,0xa5,0xe0,0x0e,0xa9},
+            {0xd9,0xf1,0xd5,0xf5,0xba,0x2a,0x22,0x89,0x15,0x34,0x2e,0x41,0x51,0x0b,0xcd,0xaa,0xc5,0x33,0xe1,0x00,0x25,0x53,0x1e,0xb9,0xa1,0x96,0x0b,0x93,0xae,0x66,0x73,0x32},
+            {0x5a,0x0d,0xef,0x56,0x79,0x78,0xda,0xf9,0xe1,0x72,0x09,0xcf,0x27,0xf2,0x61,0x25,0x6f,0x11,0xd0,0xf8,0xcc,0x94,0x6c,0x88,0x8b,0xa3,0xbd,0x15,0xe5,0x6c,0x78,0x6a},
+            {0x58,0x9c,0x40,0xf1,0xe0,0xe4,0x42,0xe1,0xe2,0x27,0xc1,0xd4,0x5d,0xdb,0xd7,0x99,0xc4,0x1c,0xc3,0x8d,0x02,0x5a,0xe8,0x71,0xbb,0xba,0xd9,0x8e,0x0b,0x65,0xd2,0xc4},
+            {0xd2,0x5e,0x89,0x7e,0xd5,0x07,0xbc,0x4d,0xcb,0xbf,0x34,0x9c,0xc2,0xde,0x3d,0x22,0x40,0xad,0x6b,0xed,0xe4,0x9c,0x89,0xfb,0x07,0xc9,0xb5,0xdc,0xc1,0x38,0x36,0x3c},
+            {0xb4,0x80,0xa7,0x82,0x97,0x83,0xc5,0x02,0x49,0x0a,0xbe,0xc9,0x98,0xb2,0xd0,0x25,0x3a,0xee,0xee,0x68,0xe5,0x4b,0xc1,0x65,0xa5,0xf1,0xe9,0x8c,0xb6,0xa9,0xf4,0xc5},
+            {0xae,0x8c,0x6d,0x40,0x0c,0x2d,0x51,0x7e,0xb6,0x93,0x79,0xc4,0x86,0xe1,0xad,0x35,0x49,0x7e,0x69,0x22,0x92,0xbb,0xe4,0x95,0xf0,0xd0,0x1b,0x4d,0x4e,0x48,0xe2,0x65},
+            {0x27,0xfe,0x2f,0x66,0xe3,0x5f,0x87,0x3b,0x80,0x94,0xd7,0xe2,0xce,0xd4,0x6e,0x55,0x81,0x1f,0x5a,0x93,0x6f,0x90,0x19,0xe5,0xe2,0xdb,0x41,0xb7,0xae,0x5e,0x81,0x9b},
+            {0x1d,0x76,0x76,0x98,0xa7,0xe6,0xa1,0xd6,0xad,0xfb,0x55,0xc1,0x58,0x48,0x80,0x35,0x0f,0x2c,0x4e,0x80,0xf4,0x0e,0x51,0x77,0x6b,0xd3,0x3a,0x6a,0x2e,0x47,0xba,0x8a},
+            {0x70,0x11,0x44,0x81,0xa0,0x63,0x94,0xdb,0x7d,0xe4,0x56,0x73,0xff,0x70,0x2a,0x2c,0xa4,0x04,0x7d,0x27,0x15,0xd7,0x80,0x88,0x4f,0x3f,0x84,0x1a,0x49,0x37,0x90,0xb3},
+            {0x40,0x44,0x87,0xdd,0x89,0x05,0x66,0x58,0x52,0x91,0xdb,0xf1,0xa2,0x2c,0xbb,0xb7,0xfd,0x70,0xe4,0x87,0x0b,0x36,0xf3,0x9e,0xe7,0xc7,0x10,0x32,0x0a,0xa0,0xc2,0x70},
+            {0xb9,0x08,0xe1,0xa1,0x32,0xf7,0x3b,0xc7,0x05,0x59,0x4d,0xb6,0xe0,0x8b,0x82,0xfb,0x27,0x7a,0x87,0x45,0x61,0x42,0xf6,0xe6,0x14,0x5f,0xa4,0x70,0x1d,0x7d,0xe0,0x9c},
+            {0x7f,0x07,0x34,0xa0,0xc7,0x7f,0xbb,0x88,0xb5,0xa5,0xa4,0xd4,0x9f,0x99,0x5b,0xad,0x56,0x7f,0x0a,0x67,0x6c,0xc9,0x32,0x6c,0x32,0x67,0x21,0x1d,0x06,0xff,0xff,0xe7},
+            {0x20,0x4e,0x16,0x8e,0x47,0x17,0x7b,0xf4,0x1e,0x30,0x66,0xb1,0xff,0xa5,0xf0,0x77,0x9d,0x98,0xfd,0xc7,0xa0,0xff,0x8a,0xc5,0x39,0x9f,0x1c,0x3a,0xbd,0x69,0x98,0xcd},
+            {0xfa,0xe7,0x5f,0x8b,0x1c,0x03,0x02,0xa1,0x58,0x13,0xcd,0xac,0xc7,0x24,0xfb,0x9c,0x9d,0x06,0xd6,0xac,0x7c,0x6a,0x35,0x8b,0x1f,0x1c,0x33,0xa9,0xdf,0x3d,0xa5,0xc3},
+            {0xc1,0x8e,0x90,0xa5,0x7b,0xd2,0x73,0xf5,0xd2,0x77,0x51,0xfe,0x81,0xea,0x93,0x02,0xf5,0x60,0x4f,0x24,0xc2,0xa2,0xa9,0xd3,0x06,0xe2,0xb0,0xb2,0x6e,0xd6,0x5c,0xdc},
+            {0xdc,0x08,0x4d,0x1e,0xc5,0xc7,0x77,0xf8,0xcb,0x78,0xfa,0x95,0x59,0x03,0xad,0xb7,0xbc,0xc6,0x8b,0x0d,0x18,0xcd,0x2d,0xe6,0x6f,0x9c,0x32,0xac,0xfe,0x9e,0x99,0x48},
+            {0x4f,0xba,0xd6,0x9a,0x04,0x1e,0x89,0x83,0x3b,0x72,0xa2,0x19,0x07,0x45,0x9d,0x2a,0x99,0x85,0xbe,0xf8,0x2d,0x05,0xf7,0x0a,0x87,0x40,0xf4,0xd1,0xab,0xba,0xc4,0x71},
+            {0xf0,0xd7,0x52,0xca,0x16,0x04,0xef,0xdc,0x91,0x02,0x72,0x8c,0x70,0xfc,0x21,0x98,0xed,0x46,0x6b,0x21,0xac,0xda,0xfe,0x6a,0x23,0x4f,0x71,0x24,0xcd,0xc3,0xc5,0x31},
+            {0x96,0xa2,0x91,0xd0,0x8e,0x64,0xc2,0x1d,0x74,0xc9,0x49,0x82,0xa2,0xd1,0xa1,0x46,0xca,0x25,0xef,0x24,0xb4,0xc2,0xff,0xcd,0xb3,0xa8,0xbc,0xd7,0x72,0x88,0x07,0x2b},
+            {0xd8,0x4f,0x7a,0x14,0x04,0x61,0xdc,0x63,0xb7,0x2d,0x66,0xdc,0x97,0xaf,0x31,0x51,0x27,0xf8,0x26,0x0a,0x61,0x76,0x15,0x9f,0x71,0x20,0xad,0x15,0xe0,0xff,0xbb,0x42},
+            {0xe3,0x23,0xb0,0x2b,0x16,0x31,0x7a,0x13,0x3f,0x69,0x5b,0x89,0x29,0x00,0xcb,0xed,0x46,0x3c,0x14,0x63,0x10,0xf1,0x38,0x47,0xcf,0x52,0xf5,0xe8,0xa1,0x55,0x64,0x03},
+            {0x56,0xf9,0x98,0x6c,0x62,0x05,0x9e,0x09,0x1f,0x74,0x1f,0x5f,0xeb,0xd2,0x5c,0xd2,0x64,0x00,0xac,0xfd,0x51,0x30,0x2e,0x09,0xe8,0x53,0xc4,0x98,0x15,0x34,0x53,0x72},
+            {0x4a,0x91,0xc1,0x3e,0x08,0x44,0x82,0x37,0x50,0x9e,0xef,0xdc,0x09,0xed,0x41,0x47,0x0f,0x72,0x30,0x9a,0xeb,0x0f,0x35,0x77,0xbf,0xbd,0xaf,0x2f,0x45,0xb3,0x59,0xca},
+            {0x3f,0x12,0x14,0xf0,0x3f,0x2b,0xb5,0x3d,0x77,0x9d,0x05,0xf2,0xa3,0xa6,0x47,0xd0,0xbc,0x25,0x50,0xb5,0x54,0x0e,0xf1,0x59,0xc2,0x91,0x7c,0xba,0xb8,0xab,0xe0,0x06},
+            {0xc0,0x0d,0x7a,0x89,0x80,0x94,0xe8,0x6d,0x46,0x59,0xec,0xd1,0xeb,0xea,0xd9,0x56,0xc2,0xd7,0x49,0x69,0xa9,0xc7,0xea,0x05,0xb2,0xef,0x5d,0xaf,0x45,0x6c,0xbf,0xde},
+            {0xc9,0xf7,0xb7,0xbd,0x86,0x3e,0x12,0x13,0x36,0x88,0xf0,0x89,0xab,0xc3,0x84,0x65,0x78,0xa8,0xc5,0x0f,0x8f,0xe9,0x5d,0x33,0xff,0xae,0x14,0x72,0xcd,0x61,0xd3,0x96},
+            {0x9c,0x4c,0xb3,0x59,0x61,0x45,0x95,0xf1,0x6b,0xa7,0xa7,0x6a,0x3a,0x5f,0x7a,0x78,0x20,0x5c,0x32,0xa2,0x36,0x53,0xa9,0x35,0x40,0x0f,0x14,0x72,0x06,0xeb,0x4a,0x2e},
+            {0xf8,0x1f,0x1b,0x1b,0x6e,0xc3,0xaf,0x3a,0x09,0xc7,0x96,0x07,0xff,0x09,0xa0,0x25,0x16,0x2d,0xdf,0xc1,0x4c,0xf8,0x5d,0xda,0xf4,0xed,0x67,0x85,0x99,0x03,0x1b,0xcb},
+            {0x07,0x51,0x8a,0x7b,0x67,0x71,0xf2,0x76,0x78,0x76,0x1c,0x04,0xc5,0x84,0xda,0x64,0x75,0xaf,0x52,0x0f,0x23,0x58,0xb0,0x88,0x6a,0xc0,0xf7,0x92,0xe5,0xb0,0x7e,0x79},
+            {0x3d,0x8e,0xdf,0x9f,0xf3,0x6d,0x26,0xb1,0x2f,0x22,0xaf,0x02,0x68,0x5c,0x72,0xa8,0xf9,0x10,0x62,0x95,0xc7,0xcd,0x06,0xcf,0xe7,0x4f,0xd5,0x99,0x67,0x50,0x1e,0xf9},
+            {0x95,0x7a,0xfb,0x2e,0x2a,0xbd,0xa0,0x10,0xd4,0x4e,0xe4,0xed,0xa6,0x7a,0x2b,0x70,0xb6,0x1c,0x56,0x59,0x4a,0x31,0x96,0x4f,0x86,0x0b,0x26,0xa2,0x8c,0xb8,0x45,0x4f},
+            {0xf1,0x36,0xce,0x60,0x52,0x03,0x08,0x49,0x6e,0x18,0x02,0xb6,0xde,0x25,0x3f,0x49,0x11,0xaf,0xe6,0x1e,0x91,0x03,0x58,0xb2,0xea,0xd4,0x74,0xa9,0xcf,0x48,0xee,0x6c},
+            {0x7c,0x90,0xe7,0xfd,0x57,0xed,0xfe,0x1f,0xd3,0x50,0x41,0x53,0xc5,0xfc,0x31,0x34,0x2a,0x7b,0x35,0x4e,0x93,0x03,0x8b,0x45,0x14,0x0b,0x67,0xfb,0x6f,0xd1,0x8e,0x65},
+            {0x62,0x9c,0x3a,0x12,0x7f,0x09,0x1e,0xbe,0xe4,0x2b,0x4d,0x48,0x7d,0x02,0x9b,0xd4,0xc3,0xfa,0x2e,0xc7,0x2d,0xbe,0xcc,0x71,0x5e,0x6c,0x8c,0x9d,0x26,0x71,0xb7,0x36},
+            {0x41,0xe8,0x64,0x6e,0x02,0xf9,0xbb,0x05,0x37,0xb6,0x27,0xae,0x5f,0x26,0x91,0x54,0xb0,0x3d,0x91,0x6f,0xc4,0x90,0xd3,0x8a,0xbb,0xcf,0xc3,0xeb,0xf6,0xd9,0xdd,0xa4},
+            {0x72,0xd6,0x66,0x00,0xed,0x0c,0xc1,0xfa,0xa6,0xd9,0x1c,0x2a,0x0d,0xa8,0x1b,0xd9,0x0d,0x45,0x38,0xce,0xe8,0x93,0xaa,0xe4,0xbb,0x0c,0xc1,0x4e,0xeb,0x4d,0xc2,0x80},
+            {0x81,0x88,0x9e,0xf1,0xc6,0xd2,0xc8,0x10,0x67,0xe3,0x66,0xab,0x71,0x85,0xeb,0x21,0x99,0xbe,0x87,0x89,0xf1,0x14,0xdd,0xd6,0xa3,0xb6,0x93,0xef,0x78,0x21,0xbb,0xec},
+            {0x8a,0xdb,0x60,0x31,0x9e,0x32,0x6c,0xa0,0xaf,0xa7,0x0e,0x7f,0x8c,0xe7,0x20,0x9b,0xef,0x89,0xe1,0xec,0x82,0x0a,0x5d,0x70,0xf1,0x3d,0x60,0x6a,0xdd,0x53,0x4a,0xb6},
+            {0xdd,0xce,0xbf,0xd5,0x1a,0xfd,0x77,0xe7,0x8f,0x06,0xd5,0xa5,0xdc,0xcb,0xfb,0x4d,0x6d,0xc6,0x19,0x77,0xc4,0x7a,0xc9,0xb1,0xa2,0xf6,0x40,0x29,0x40,0xd9,0xa1,0x56},
+            {0xb4,0xcc,0x18,0x12,0x70,0x51,0xcf,0xd9,0x3b,0x1a,0x5e,0xb0,0x35,0x81,0x53,0xc0,0x3f,0x1d,0x44,0xb8,0x41,0xa4,0x1c,0xf3,0xc2,0xa7,0xa2,0x3a,0x14,0xde,0xc4,0xf4},
+            {0xa3,0xd4,0x4b,0x5e,0x13,0xa0,0xc0,0xe6,0xeb,0x22,0xda,0x6e,0x88,0x11,0xd4,0x99,0x5d,0x49,0x5d,0x4d,0x78,0x0e,0x84,0x0e,0xe8,0x5c,0x83,0xf2,0xb1,0x65,0x60,0x82},
+            {0xeb,0x69,0x26,0x9a,0xdf,0xc4,0x8c,0xad,0x82,0x00,0xb8,0xe3,0x18,0x07,0xe9,0x45,0x4e,0xc6,0x15,0xb8,0xd3,0x3b,0x67,0xe7,0x19,0x1c,0xea,0xd5,0x25,0x49,0x00,0x7a},
+            {0xcc,0x6b,0xed,0x8d,0xe6,0x5d,0xc9,0xb9,0x05,0xe2,0xaa,0x95,0xad,0x5f,0xd5,0x7b,0xb8,0x2e,0xe2,0x1c,0x49,0x96,0x8c,0xf3,0x0a,0x6c,0xb4,0xb0,0x02,0xbe,0x5f,0x6d},
+            {0x0e,0xe8,0x5d,0x0f,0x8f,0x0f,0x5b,0xfb,0x77,0xf9,0x57,0xde,0x73,0xfc,0xb2,0xda,0x0f,0xf2,0x69,0x1b,0x29,0x71,0xea,0x68,0x14,0x32,0xa6,0x7a,0xe5,0xc7,0xc3,0x78},
+            {0xd8,0xa2,0xaf,0x3e,0x7a,0x30,0x80,0x45,0x74,0xe7,0x4e,0xd9,0x72,0x75,0x80,0x4f,0xcc,0x22,0xc1,0x96,0x07,0xea,0x30,0x25,0x1f,0x7f,0xce,0xcf,0xc8,0x6c,0x8c,0xd4},
+            {0xbe,0x4f,0x45,0xe9,0x12,0xa7,0xcc,0x5a,0x17,0x4d,0x6c,0xd1,0xc0,0x58,0x41,0x20,0x42,0x30,0x83,0x81,0xf9,0x88,0x2d,0x2a,0x74,0xc4,0x3c,0xef,0x9a,0x93,0xe5,0x1c},
+            {0xb2,0x13,0x70,0x11,0xb2,0x20,0x6e,0x97,0x37,0x39,0x2b,0x73,0x57,0x87,0xc1,0x86,0x1d,0x5d,0xf4,0x76,0x90,0xb5,0x68,0x2c,0xbd,0x43,0x2f,0xca,0xc4,0xc0,0x51,0x98},
+            {0xf4,0xfc,0xc6,0x3e,0x7a,0x12,0x37,0x83,0xb6,0x43,0xad,0xbf,0x0b,0x97,0x58,0x0b,0x78,0x9d,0xef,0x70,0xd8,0xce,0x5a,0xf5,0x95,0x5b,0x35,0xb2,0x63,0xf4,0xa4,0xfe},
+            {0x1c,0xdf,0x85,0xf4,0x6a,0x7d,0xd1,0x93,0x7c,0xd4,0x3c,0x94,0x1f,0x1b,0x55,0x5d,0x58,0x2f,0x36,0xd3,0x09,0x10,0x97,0x23,0x1f,0x86,0x60,0x2c,0x73,0xc8,0x4c,0x7d},
+            {0x76,0xcd,0x77,0xe0,0x6f,0x94,0x6e,0xab,0x3f,0x59,0xcd,0xcc,0xd3,0xa3,0xe2,0x03,0x95,0xf0,0x4d,0x5e,0x61,0xeb,0xc5,0xae,0x6c,0xfe,0xbb,0xf7,0x2d,0x96,0x21,0x4a},
+            {0xf0,0x80,0xf2,0x32,0xfb,0xf7,0x4a,0x10,0x4a,0x25,0xff,0x2d,0xf6,0x95,0x8e,0x00,0x08,0x66,0x25,0x96,0xf8,0x1c,0xfb,0x84,0xcd,0x72,0xc2,0xa9,0x40,0xc9,0xb5,0xfd},
+            {0x70,0xa1,0x3b,0x34,0xf2,0x84,0x35,0x3e,0xca,0xe7,0x03,0x55,0x40,0x3e,0x62,0x97,0xfb,0xab,0x26,0x3f,0x20,0x77,0x07,0x86,0x0e,0xc2,0x2d,0xc8,0xa2,0xda,0x4c,0x94},
+            {0x2d,0x1b,0xce,0xb4,0x41,0x7e,0xab,0xef,0x50,0x0a,0xf9,0x78,0xc9,0x75,0xf1,0x8a,0xb1,0xb0,0x1b,0x12,0x94,0x6f,0xf4,0x11,0x83,0x2a,0xf2,0x67,0x65,0x2f,0x5d,0x49},
+            {0x74,0x84,0x7c,0xb2,0xb6,0x31,0x54,0x7a,0x13,0xdf,0x24,0x6f,0x10,0xf2,0x10,0x53,0xe1,0xd4,0x12,0xb4,0xbc,0xc8,0x3d,0x2a,0x28,0x28,0x50,0x33,0xc7,0x5a,0x28,0x39},
+            {0x0d,0xf6,0xe0,0xd4,0x2f,0x19,0xca,0x95,0xd3,0x1d,0x9b,0x76,0x2f,0xb5,0x8b,0x9e,0xe4,0xef,0x0a,0x20,0x37,0xca,0xb3,0x2e,0x49,0x50,0x9c,0x57,0x5c,0x6e,0xd1,0x9b},
+            {0xe9,0xb6,0xac,0xc8,0x4e,0x08,0x71,0x63,0xed,0x1e,0xa2,0x3f,0x7b,0x7a,0xa0,0xfa,0x4e,0xa3,0x7f,0x15,0x47,0x3a,0x47,0xaf,0x66,0x18,0xd7,0xf3,0x0e,0x8f,0x56,0xa7},
+            {0x35,0x78,0x38,0x4e,0xae,0x5e,0x7a,0x10,0x73,0x1d,0x6d,0xe0,0x97,0x20,0x72,0xf1,0xf5,0x68,0xa7,0x64,0xee,0x9a,0x2c,0x2c,0x61,0x52,0xee,0xe1,0x41,0xfd,0xd3,0xd7},
+            {0x69,0x65,0x3a,0xa6,0x63,0x2c,0x7f,0xb7,0xc6,0x9a,0x81,0x29,0x86,0x1e,0x9f,0x32,0x26,0xb7,0x26,0xa8,0x80,0x44,0x71,0x16,0x56,0x42,0x48,0x1b,0x59,0x8d,0xd0,0x99},
+            {0xa2,0x96,0xc0,0x5f,0xca,0x5e,0x44,0xaf,0xc5,0xc2,0xcd,0x58,0x3c,0xbd,0xe4,0xa1,0x79,0x1b,0xdb,0x7a,0x84,0x61,0xc6,0x67,0x6b,0x97,0xea,0x63,0xc1,0x1f,0xe3,0x93},
+            {0x07,0x79,0x00,0xcf,0x36,0x67,0x02,0xfe,0x8a,0xdd,0x4f,0x02,0x65,0xcc,0x52,0x27,0x3b,0x34,0x3a,0x14,0x21,0x8e,0xa5,0x9a,0xb2,0x6c,0xd6,0x28,0xa3,0x82,0x40,0xfa},
+            {0xa6,0x3d,0x69,0x4c,0x0e,0x67,0x28,0x16,0x6e,0x57,0x8d,0x90,0x06,0x1d,0x24,0x14,0x6d,0x56,0xcc,0xda,0x4e,0xf2,0x81,0xc4,0x1c,0xe6,0x07,0x6a,0xd5,0x17,0x27,0xbc},
+            {0x16,0x23,0xe5,0x3b,0xff,0x3a,0xf6,0x34,0x6b,0x27,0xb3,0x8c,0xfc,0x0d,0x98,0xf6,0xf2,0xec,0x80,0x83,0x07,0x89,0xf8,0x8b,0xbc,0xcf,0xbe,0xcb,0x4c,0xe1,0x16,0x2c},
+            {0xce,0x5c,0x3d,0xdd,0x18,0x52,0xbb,0x75,0x59,0x0b,0x6d,0x8d,0xb1,0x6b,0x4e,0x62,0x64,0xa8,0x99,0x3a,0x3a,0xad,0x89,0xf1,0x73,0x17,0x53,0x56,0x5d,0x5e,0x54,0xfb},
+            {0x3d,0xc8,0x7d,0x48,0xcd,0xdb,0xa8,0xc9,0xae,0xa7,0x1e,0x83,0x07,0xe9,0xd8,0x03,0x92,0x5c,0x9e,0x4c,0x4f,0x55,0xd7,0x73,0x0d,0x3e,0x65,0x1d,0xbf,0xc7,0xba,0x45},
+            {0x1c,0xd0,0x4f,0x32,0x0c,0xca,0x7f,0xe3,0x3c,0x2f,0x43,0xdd,0x9e,0x00,0x98,0xcd,0xa8,0x2e,0xdf,0x20,0x16,0x2a,0x67,0x32,0x0e,0x68,0xeb,0xaf,0x3f,0xd7,0x4f,0xe5},
+            {0x8d,0x63,0x27,0x4c,0x4a,0x44,0x17,0x0e,0x50,0x08,0xd2,0xd1,0xb7,0x90,0xd5,0xf4,0x68,0x26,0x9a,0xbf,0xa9,0x1a,0x54,0xc3,0x29,0x15,0x24,0x33,0xa3,0x06,0x65,0xb9},
+            {0x89,0xff,0x39,0x46,0xf2,0x11,0x14,0x36,0xaf,0xd2,0xb4,0x19,0x32,0xc4,0x75,0xa0,0xd0,0x92,0x23,0xe2,0x3b,0x6b,0x9e,0x9a,0x9c,0xcf,0x16,0x4d,0x3c,0xbe,0x0b,0x11},
+            {0xdb,0x63,0xca,0xf3,0xed,0xa1,0x22,0x2a,0x30,0x8d,0xeb,0x31,0x7a,0x0b,0xc8,0xf1,0xde,0xb9,0x5a,0x6b,0x3b,0x01,0x08,0xf7,0x1d,0x2d,0x16,0x69,0x12,0x44,0x92,0x7b},
+            {0x3d,0x1b,0xa0,0x36,0x34,0xff,0xae,0xb5,0xd9,0x06,0x03,0x22,0x73,0x19,0x1f,0xe2,0x59,0x5b,0xd6,0x55,0xa7,0x0d,0xd8,0xc2,0x26,0x80,0xfa,0x49,0x29,0x01,0x2c,0x6f},
+            {0x0d,0x35,0x55,0x63,0xea,0xc6,0x0a,0x85,0xc5,0x2b,0x4b,0x2a,0x54,0xc2,0x1e,0xe7,0x61,0x08,0x19,0xa9,0xa3,0xb3,0x0e,0x69,0xa9,0xa3,0x7b,0x56,0x55,0xb9,0xb5,0xdb},
+            {0x37,0x3a,0x44,0xab,0x39,0x36,0x10,0x4a,0x3d,0x9d,0x26,0xa2,0x46,0xd2,0x36,0x51,0x27,0xc1,0x72,0x6c,0x34,0xd2,0xf1,0xd7,0xe8,0x7d,0x7d,0x7f,0x60,0x58,0xf2,0x48},
+            {0x16,0x02,0x21,0x45,0xfe,0x05,0x57,0x69,0x43,0x3d,0x4c,0x3c,0xd9,0x63,0x9c,0xe0,0xf8,0xf6,0x68,0xe1,0x57,0xbf,0x97,0x11,0xe2,0xc7,0xbd,0x79,0x07,0x17,0x8d,0xf4},
+            {0x6b,0x34,0xe7,0xd7,0x76,0x49,0xa7,0x28,0x87,0xfa,0x46,0xcb,0x34,0x61,0x8d,0x81,0x3a,0x32,0xfb,0xb7,0x7e,0x4e,0xbd,0xd6,0x69,0x15,0x27,0xea,0xcf,0x5f,0xd8,0x4c},
+            {0xdf,0x91,0x5f,0xc7,0xca,0x49,0x22,0x5b,0x34,0xf2,0xd4,0x19,0x55,0x4d,0x25,0x94,0xc8,0xb2,0xff,0xd8,0x34,0xb2,0xbb,0x92,0xf4,0x93,0x97,0xfc,0xff,0x38,0x1e,0xac},
+            {0x60,0x02,0xc0,0xef,0x73,0xc7,0x81,0xb2,0x0d,0x7d,0x4d,0x9e,0x01,0x32,0x2f,0x8e,0xfa,0x8a,0xa7,0x8e,0x5e,0x97,0x92,0xbc,0xe2,0x9a,0x91,0x69,0xc7,0x03,0x2f,0x57},
+            {0x3a,0x0d,0xeb,0xbc,0x0e,0xe4,0x23,0x04,0xa9,0xed,0xb1,0x0d,0xb7,0x70,0xd0,0xb8,0x18,0x0c,0x40,0x39,0x71,0xf4,0x2d,0xad,0x88,0x32,0xcc,0x16,0xe3,0x95,0xc1,0x1c},
+            {0x6d,0x76,0xb2,0x3d,0x46,0xaa,0xe2,0xe5,0x74,0xec,0x29,0x47,0xc4,0x90,0xf2,0xea,0xd9,0xac,0xf9,0x59,0x2e,0x41,0x70,0x69,0xe7,0x20,0x50,0x72,0x12,0x24,0xfb,0xa4},
+            {0x59,0x36,0x02,0xee,0x28,0x03,0xbc,0xdd,0x74,0x3f,0xce,0x93,0x96,0x2f,0x67,0x2c,0xb8,0x77,0xed,0xc7,0xd0,0x09,0xbe,0x65,0xc0,0x2a,0x56,0x2b,0x86,0x04,0xa7,0x4c},
+            {0x64,0x75,0x9e,0x44,0xd4,0xe4,0x26,0xd1,0xc1,0x47,0xb4,0x05,0x33,0x0e,0x2f,0xe1,0xed,0x1a,0xfe,0x16,0x8b,0x8d,0xb6,0x0a,0x87,0xc9,0x35,0xcf,0x07,0xea,0x10,0xf6},
+            {0xd8,0xf1,0xee,0xa3,0xb2,0xc5,0x6c,0x9b,0xde,0xee,0xa5,0xcc,0x57,0xd5,0xfb,0x38,0xcd,0xa7,0xc2,0xdc,0xef,0x92,0x76,0xed,0x56,0x02,0xd2,0x7b,0x97,0x88,0xc1,0x94},
+            {0x0d,0xa1,0x32,0x8d,0xfa,0x5e,0xfb,0x29,0x03,0x42,0x15,0x27,0x9a,0x87,0xbf,0x02,0x6e,0x70,0xaa,0x7c,0xeb,0x27,0x93,0xe8,0xc0,0xba,0x93,0x54,0x58,0x0d,0x55,0x2b},
+            {0x8b,0xf6,0x31,0xc5,0x6e,0xcb,0x7a,0xb3,0x1c,0x0d,0x30,0xbf,0x31,0xdd,0x28,0xa6,0x28,0x77,0x40,0x2c,0xd6,0x82,0x5d,0x0e,0xcc,0x9c,0x71,0xe2,0x6f,0x4b,0xe6,0x43},
+            {0xae,0x29,0x94,0x1b,0x70,0xab,0xb7,0x9f,0x69,0x0d,0xe4,0x5e,0x32,0xc8,0xb5,0x5f,0x81,0x14,0xb3,0x0c,0xae,0x43,0x76,0xe9,0x91,0xb9,0x63,0xd4,0xe0,0x3d,0x97,0x0d},
+            {0x0b,0x87,0xec,0x54,0x62,0x59,0xa1,0x5a,0x8c,0x87,0x52,0x63,0x4c,0x3e,0xf2,0x19,0x45,0x9c,0x38,0x2d,0x38,0x3f,0x15,0x5f,0x21,0x9c,0x04,0xd9,0xd5,0xbd,0x7f,0x01},
+            {0x87,0x60,0x57,0x21,0xbb,0xed,0x02,0xe5,0xf2,0x79,0xa2,0x9d,0xbf,0x5f,0xb8,0x57,0xa5,0xe1,0xd4,0x1f,0xfb,0xc5,0x06,0x89,0xec,0x4e,0x1a,0xd1,0xed,0x3f,0x2b,0x76},
+            {0x64,0xd3,0x3c,0x16,0x96,0x62,0xad,0xb9,0xae,0x01,0xcc,0x1a,0x90,0x2b,0x87,0x25,0xea,0x84,0x16,0x22,0x26,0xd8,0x60,0xb0,0x5b,0x22,0xc1,0xcf,0x8b,0x71,0x6b,0x88},
+            {0xdd,0x3e,0x22,0xb9,0xaa,0xf9,0x8f,0x16,0x5f,0x20,0xc4,0x49,0x61,0x8e,0xbf,0x77,0x67,0x27,0x38,0x6d,0xaf,0x56,0x95,0xe6,0x88,0x47,0x46,0x2a,0x15,0x73,0xf1,0xfa},
+            {0x2e,0xed,0x68,0x7f,0xa8,0x2a,0x0d,0xf6,0x8f,0xb2,0xa1,0xcc,0xd9,0xc7,0xe0,0x67,0x9f,0x5a,0xda,0x28,0xb8,0x31,0xb1,0x05,0x71,0x8d,0xbd,0x05,0x80,0xc0,0xae,0xb6},
+            {0x37,0x48,0x43,0x7a,0x03,0xb2,0xe0,0x86,0x82,0x5a,0x1b,0x26,0xb9,0xa3,0x63,0x49,0x5c,0xb0,0x4e,0xe3,0xb5,0xc6,0x12,0x5f,0x16,0xfa,0x71,0x53,0xd3,0x88,0xb3,0x8d},
+            {0xd6,0xf6,0x9c,0xb9,0xff,0x23,0x88,0x17,0x5b,0x1e,0x54,0x9d,0xf2,0x31,0x71,0xea,0x6c,0xf0,0xf1,0x81,0xc5,0x29,0x02,0xe9,0x07,0x40,0xde,0xc0,0xfe,0xf9,0x41,0xb5},
+            {0x81,0xe1,0x73,0x03,0x3c,0x05,0x2c,0x2a,0x8b,0x6c,0x2c,0xe9,0x28,0xc7,0xd9,0xe7,0xf7,0xb9,0x56,0xe9,0x74,0x41,0x56,0xc8,0xb4,0x0c,0xf8,0x15,0xf0,0x93,0xde,0x69},
+            {0x62,0x70,0x27,0xe9,0x5f,0x07,0x8f,0x86,0xd7,0x0d,0xf8,0xb9,0x7d,0x50,0x9b,0xd5,0x56,0xc6,0x39,0x76,0x93,0x02,0x53,0x67,0xae,0x4b,0x43,0xed,0xc9,0xb6,0xfd,0xf2},
+            {0x9c,0x8b,0xee,0x1a,0xe5,0x80,0x91,0x34,0x2d,0xac,0x79,0x01,0xe5,0x84,0x6d,0xf4,0xac,0xbb,0xc4,0x09,0x65,0x64,0x57,0xb0,0x3e,0x17,0x02,0xee,0xab,0xbf,0xc8,0xf5},
+            {0xee,0x38,0x7d,0x8e,0x66,0xf5,0xbf,0x75,0xdf,0xdc,0xde,0xb9,0x7d,0x28,0xb4,0xdb,0xbc,0xb1,0x30,0x2b,0xf2,0x0d,0x6b,0xf8,0x46,0x5b,0x7b,0x41,0x83,0x25,0x50,0xad},
+            {0x68,0x1f,0x01,0x45,0xff,0x4d,0xd8,0xa8,0x4e,0x42,0xb0,0x2c,0xa5,0xbd,0xf4,0xbb,0xe8,0xad,0xfd,0xff,0x11,0xe3,0xae,0x57,0x67,0x37,0x40,0xa4,0xf9,0x8f,0x0c,0x67},
+            {0x9f,0x7d,0x29,0xa2,0x7a,0x80,0xe6,0x46,0x03,0xc9,0x81,0x25,0xd6,0xf7,0x7e,0x23,0xaf,0xac,0x3a,0xe8,0x5a,0xb0,0xfb,0xbe,0x91,0xe7,0x4e,0x49,0x8f,0xa6,0x9c,0x89},
+            {0xf2,0x3c,0x72,0xf3,0x98,0x10,0xdf,0xa1,0x96,0xdd,0xac,0x4a,0x2b,0x30,0xfc,0x97,0xf3,0xe0,0x5c,0xfd,0x67,0xd9,0x1e,0xf2,0xe6,0xab,0x06,0x3e,0xe2,0x94,0x83,0xa9},
+            {0xcb,0x02,0xc5,0x5c,0xbe,0x1a,0x20,0xd2,0x00,0xbd,0x53,0xe7,0x18,0xc7,0x8f,0x9f,0x23,0x07,0xd0,0x47,0x60,0x82,0xbb,0x42,0x5d,0x44,0x76,0xa7,0x0e,0xf4,0x71,0x72},
+            {0x2c,0x56,0xd7,0xa4,0x6e,0x2e,0x98,0x9c,0x71,0xd7,0x54,0xa9,0xed,0x2e,0xd2,0x22,0x85,0xad,0xb9,0xbc,0x7e,0xa0,0xce,0x85,0xe7,0xad,0x01,0x46,0x79,0x88,0x36,0xe0},
+            {0x16,0x1f,0x8e,0xde,0x48,0x32,0xa6,0x5d,0x9d,0x08,0x26,0x99,0xe9,0x32,0x99,0x18,0x99,0x16,0xa9,0xfe,0xae,0x06,0x70,0x3a,0xab,0xba,0x7a,0xa7,0x10,0x0c,0x80,0x78},
+            {0xc1,0x4f,0x24,0x84,0x55,0x30,0xdb,0xca,0x33,0x72,0xc7,0xd7,0x45,0x34,0x41,0x11,0x36,0x82,0xd7,0x6c,0xa7,0xc5,0xee,0x93,0xa8,0x6f,0x87,0x05,0xdf,0xa6,0x75,0x4b},
+            {0x98,0xe2,0x30,0x2a,0x8c,0x27,0xaf,0xf1,0x67,0x05,0xea,0xc3,0xc9,0xb4,0x86,0x1e,0x0d,0x67,0x05,0x71,0xca,0x49,0x3d,0xd0,0x07,0x72,0x80,0x78,0x5d,0x1d,0x32,0xa3},
+            {0x1a,0xf7,0x25,0x2b,0xf3,0x2d,0xe0,0x85,0x59,0xd4,0x7d,0xc9,0x27,0x3c,0x82,0xa7,0xe6,0xcf,0x89,0xc2,0xad,0x0d,0x75,0x50,0x84,0x11,0x6b,0xdc,0x30,0xe2,0xdc,0xb9},
+            {0xb6,0x62,0xf0,0x5d,0xa0,0x25,0x8a,0x72,0x18,0x65,0x9d,0xf1,0x09,0x26,0xcb,0x71,0x6f,0xc6,0xd0,0x92,0x65,0x4e,0xbd,0xf9,0xd8,0xa0,0xef,0xca,0xb7,0x2f,0x31,0x1e},
+            {0xad,0x88,0x07,0xbd,0xc9,0xc0,0xdb,0x6f,0xff,0x8b,0xa8,0x96,0x3a,0xf5,0x1f,0x14,0xed,0x80,0x9f,0xf5,0xcf,0xf5,0x94,0x4d,0x27,0xb1,0x92,0x3b,0xc5,0xce,0xc6,0x8e},
+            {0x45,0x02,0xbb,0xe7,0x6b,0xba,0x11,0xef,0xfb,0x1f,0x91,0xa8,0x22,0x73,0x2b,0xb4,0xd1,0xc6,0xcb,0xd2,0x0a,0x12,0x72,0x2c,0xf7,0xcf,0x22,0x76,0xbc,0xb2,0x24,0xef},
+            {0xbd,0x10,0x0d,0xa2,0xcd,0x60,0xb6,0x0a,0x29,0x23,0x29,0x9e,0x50,0x5c,0x6c,0x0f,0xd2,0x3c,0xfd,0xee,0xbe,0xfb,0xce,0xc8,0x11,0x95,0x67,0xfe,0xe2,0xb8,0xd5,0xac},
+            {0x27,0x25,0x06,0x0e,0x6d,0x94,0x4d,0xce,0xab,0x24,0x72,0x9b,0x82,0xd3,0xa6,0x42,0x75,0xeb,0xd8,0x2c,0xb4,0x2a,0xb3,0x30,0xaf,0x43,0xf5,0x3c,0xef,0xa2,0x78,0x93},
+            {0x9c,0xad,0x96,0xee,0x38,0x1a,0x6d,0x63,0xd8,0x41,0x56,0x9e,0x47,0x5e,0xef,0xf6,0xde,0xe6,0x78,0x36,0xe2,0xd0,0x51,0x13,0xa8,0xf1,0x8a,0xee,0x59,0x06,0x73,0xb2},
+            {0xc2,0x2c,0x8e,0x48,0xd8,0x46,0xad,0x43,0xfc,0x83,0x19,0xc4,0xd3,0xed,0x8c,0x4a,0xf3,0x1e,0xa7,0xc3,0xe0,0x79,0x59,0x5c,0xbb,0x55,0x7b,0x78,0xe5,0x0f,0x0a,0x60},
+            {0x24,0xa9,0xbc,0xf3,0x59,0xc2,0x34,0x5f,0xdc,0x35,0x81,0x2a,0x10,0xf9,0xf0,0x82,0x29,0xd1,0x1f,0x17,0xc5,0x95,0x11,0x20,0xcd,0xa1,0x26,0x4a,0xdb,0x2e,0x6d,0x71},
+            {0x54,0x65,0x87,0x22,0xa2,0xc3,0x1e,0x13,0x61,0x6e,0x4a,0x38,0xa8,0x17,0x92,0x7c,0x01,0xd2,0xdf,0x37,0x83,0x0d,0xab,0x7e,0x76,0xec,0x16,0xe7,0xec,0x93,0xe2,0x98},
+            {0xfd,0xf9,0xd5,0x82,0x0c,0xe6,0x7e,0x07,0x6d,0x78,0xdb,0x09,0x76,0x6a,0x58,0x27,0xc6,0xd1,0x46,0x78,0xd1,0x33,0x6c,0x8f,0x93,0x66,0x08,0xd8,0x0a,0xe8,0x3d,0x72},
+            {0xf3,0xc5,0x59,0x39,0xc4,0x75,0x63,0xae,0xcd,0x9a,0x0b,0xe2,0xfd,0x16,0xc8,0xd8,0x39,0x33,0x1c,0x81,0x14,0x03,0xea,0x22,0xd4,0x7a,0x8d,0xed,0xb6,0x36,0xf3,0x89},
+            {0x9a,0x62,0xce,0x2c,0x9a,0x32,0x38,0x37,0x0a,0xb9,0x83,0x85,0x7b,0x27,0xa6,0xeb,0xba,0x40,0x75,0x40,0xc6,0xa5,0x5b,0x8d,0x3e,0x62,0xfb,0x01,0x2b,0x91,0x77,0xd5},
+            {0x32,0xea,0x29,0xfa,0x72,0x1d,0x77,0x27,0xb0,0xad,0x77,0xf5,0x34,0xbb,0xa0,0xcc,0xd4,0xf0,0x8b,0x16,0xb1,0xc8,0x09,0xc6,0x0d,0xa2,0xe8,0x3c,0x37,0xcd,0x05,0x2f},
+            {0x0c,0x8e,0xab,0x2d,0x81,0x46,0x23,0x96,0x61,0x22,0xa8,0x3e,0x07,0x9a,0xe8,0x62,0x98,0x97,0xd4,0x05,0xfc,0x47,0x1f,0xe7,0x0e,0xb8,0xec,0xf6,0x3d,0x53,0xa6,0xa4},
+            {0xb5,0xf8,0x1d,0x6b,0xe6,0xc5,0xed,0x88,0x1d,0xb8,0xe1,0x95,0xb8,0x50,0xc3,0xeb,0xfa,0x2c,0xb4,0x55,0xd0,0xa1,0xd1,0x4d,0xf7,0x97,0x40,0xee,0xbe,0x5d,0x54,0x9e},
+            {0xff,0x39,0xac,0xb8,0x66,0x7a,0x42,0xfa,0xa2,0x65,0xd9,0x7a,0x90,0xfa,0x7d,0x58,0x02,0xc6,0xa5,0x81,0xdf,0xa6,0xbc,0x86,0x8f,0xc6,0xe9,0x53,0xb4,0xfe,0x3b,0x10},
+            {0xcd,0x1a,0x9a,0x93,0x28,0x59,0x37,0x0e,0x97,0x15,0x87,0xfa,0x26,0x25,0x57,0x82,0xa1,0xae,0xe9,0xa1,0xef,0xea,0xfd,0x17,0xba,0xdd,0x1a,0xca,0x3c,0x82,0x23,0x63},
+            {0x78,0x00,0x34,0xcf,0x73,0x8e,0x52,0x09,0x71,0x38,0x73,0x45,0xb7,0x3f,0x42,0xcd,0x13,0x77,0x0d,0xc8,0xcf,0x68,0x94,0x8e,0xc9,0xe8,0xe1,0xf6,0xa6,0x32,0x7f,0x61},
+            {0x0d,0x97,0xa7,0x0b,0x46,0x7f,0xbf,0x4a,0xf6,0x25,0xa6,0xb5,0x39,0x03,0x5b,0x19,0xe8,0x6d,0x01,0x17,0x82,0xbb,0x7a,0x9c,0xe5,0x38,0xbb,0x89,0xd8,0x14,0x38,0xf5},
+            {0xca,0x8d,0xcf,0x9e,0x34,0x54,0xd6,0xc2,0xa3,0x46,0xa0,0x13,0x72,0xc7,0x98,0xcf,0x2c,0xf8,0xc4,0x9c,0x38,0xf9,0x58,0x1d,0x70,0x5c,0x42,0xe4,0xf1,0xe7,0xc4,0xb4},
+            {0x0c,0x21,0x83,0x4c,0xdc,0xe6,0x37,0xa8,0x5f,0x93,0x1e,0x8d,0x2d,0x96,0x15,0x73,0xd1,0xdb,0xa0,0xab,0x7b,0xee,0x93,0x18,0x9f,0x74,0xc6,0x33,0x19,0x95,0xc9,0x14},
+            {0xc8,0xaa,0x25,0x16,0x01,0x17,0x2c,0x94,0x79,0xb4,0xab,0x2c,0x13,0x82,0xa2,0xd6,0x60,0x8b,0x54,0x7c,0xf6,0xb7,0xa4,0xa0,0x4a,0x75,0xa9,0x1f,0xde,0x4c,0x08,0xb3},
+            {0x14,0xd3,0x6f,0x3d,0xb5,0xb2,0xcf,0xac,0x7a,0x99,0xdf,0x06,0x60,0x16,0xeb,0xa5,0x9a,0x21,0xef,0x65,0x1e,0x99,0x1d,0x63,0x1c,0x04,0xac,0xb1,0x1d,0x1d,0x2b,0x51},
+            {0x89,0x00,0x6b,0x74,0xbc,0x61,0x63,0x7b,0x08,0x08,0xbf,0x78,0x6d,0xf1,0x60,0x39,0xd0,0xf5,0xa2,0x6d,0x1c,0xde,0x13,0x48,0xde,0x0f,0x33,0x71,0x8d,0x47,0xe7,0x5c},
+            {0x09,0x86,0x21,0xc3,0x03,0xcb,0x1b,0x9d,0xda,0x38,0x7a,0x0e,0xe6,0x6e,0xcd,0x26,0x71,0x72,0xa7,0x0d,0xef,0xc1,0xb4,0x03,0x88,0x7e,0xa7,0x4c,0x53,0xd5,0xb9,0x11},
+            {0xf9,0x42,0x8c,0x1d,0xc5,0x27,0x13,0x8b,0xe5,0xc9,0xdd,0xbf,0xee,0xd4,0x30,0x77,0xd0,0x6f,0x28,0x26,0xb7,0x5e,0xdf,0x92,0x18,0xe7,0xb9,0x0d,0xf8,0xb5,0xec,0x29},
+            {0x24,0x52,0x70,0xfc,0x34,0x42,0xe1,0x94,0x75,0x81,0x8c,0xa0,0xd5,0xcd,0x32,0xa4,0x72,0x8a,0x25,0xb5,0xc4,0xf2,0x23,0x1d,0x57,0x1e,0xaf,0xa2,0x81,0xe6,0x1e,0x18},
+            {0x75,0x3e,0x79,0xf5,0xb9,0xed,0xd2,0xe4,0x9c,0x30,0xc1,0x7d,0x3d,0x50,0x50,0xa2,0xc0,0x26,0x50,0x27,0xab,0xdf,0x8e,0x66,0x12,0x81,0xd2,0x2e,0x6c,0xac,0xb7,0x01},
+            {0x7a,0xc9,0xb5,0x23,0x9a,0x33,0xb2,0x68,0x9c,0x63,0x73,0x9d,0xe7,0x93,0xdf,0xbb,0xd0,0x95,0x5c,0x04,0x4f,0xe0,0x62,0xba,0xb2,0x8f,0x7b,0x9e,0x72,0xaf,0x47,0x55},
+            {0xba,0x6c,0x40,0x57,0x25,0xd6,0x9b,0x2c,0x74,0x66,0x1f,0x3e,0x42,0x59,0x24,0x2b,0x05,0x4d,0x13,0xf1,0x97,0xdb,0x57,0x00,0xd1,0xd7,0x72,0x81,0x10,0xe5,0x69,0x55},
+            {0xa7,0xff,0x33,0x09,0xd1,0x56,0xa8,0xd4,0xaf,0x88,0xc9,0x2e,0x59,0x59,0xc9,0x86,0x17,0xe0,0xc1,0xb9,0x5a,0x10,0xca,0xa5,0x44,0xfd,0x76,0x1f,0x93,0x71,0x5b,0x80},
+            {0x41,0x85,0xa1,0xfd,0x84,0xac,0x17,0x3a,0xc3,0x14,0x93,0xea,0x80,0xb4,0xa6,0xd3,0x8d,0x37,0x32,0x5e,0x8d,0x82,0xd0,0x7e,0xe3,0x1b,0xbd,0x7f,0x5c,0x66,0x1e,0x17},
+            {0x78,0x82,0x6f,0xde,0x40,0xd9,0xfe,0xd3,0x35,0x5c,0x37,0xbc,0xaa,0xf0,0x65,0x6a,0x42,0x36,0xd5,0x84,0x04,0xa8,0x92,0xd1,0xda,0x40,0x29,0x55,0x69,0x8e,0x29,0x04},
+            {0x9f,0x59,0x1f,0x6b,0xb8,0x53,0x60,0x1a,0x31,0x5d,0xe1,0xed,0xeb,0xc0,0x92,0x7b,0xde,0x20,0x2e,0x6c,0xda,0xca,0xca,0xce,0x8d,0xd3,0x2b,0xc8,0x24,0xa8,0xa0,0x94},
+            {0x3a,0xe9,0x50,0xaf,0xe6,0xce,0x59,0x73,0x7c,0x94,0x3c,0xd9,0x0d,0xc8,0xf1,0x00,0xde,0x10,0xde,0x1e,0xe9,0x52,0xb2,0xd2,0x95,0x51,0x4c,0x4f,0x71,0x0a,0xa7,0xd2},
+            {0xa7,0x50,0x89,0xfa,0x65,0x8b,0x12,0x06,0xf0,0x36,0x22,0x60,0x82,0x39,0xf2,0xde,0x62,0x8b,0x4a,0x46,0x93,0x54,0x8c,0x86,0x4d,0x60,0x96,0xe2,0xce,0xf7,0x64,0x90},
+            {0xef,0xa7,0xea,0x25,0x8d,0x70,0x6b,0x04,0x54,0x7b,0x8d,0x4a,0x79,0x1b,0x11,0x13,0xfc,0x77,0xa4,0xe5,0x54,0x7c,0x8a,0x30,0x8a,0x89,0xbc,0xbb,0xf8,0x16,0x1e,0x56},
+            {0xf0,0xc8,0xcd,0x99,0x1b,0x16,0x8f,0xa3,0x06,0x85,0xd9,0xad,0xb5,0x08,0xe9,0xae,0xb4,0xf2,0xb6,0x3d,0xc0,0x8a,0x15,0x3b,0x81,0x4b,0x0c,0xf1,0xf9,0x89,0x18,0x3b},
+            {0x6f,0x19,0x46,0xa9,0x4c,0x31,0x38,0x27,0x60,0x73,0xdc,0xfe,0x0d,0x0d,0x48,0xd3,0xcf,0xf0,0x45,0x29,0x93,0xb3,0x49,0x65,0xa8,0xfe,0xfe,0x90,0x16,0x1f,0x0f,0xcd},
+            {0x2b,0xc4,0x04,0x89,0x95,0x61,0x25,0xfa,0x47,0xc9,0xcf,0xf8,0x96,0x09,0x19,0x77,0xb8,0xdd,0x0b,0x7a,0x0e,0x01,0x50,0xf6,0x14,0x59,0x2b,0x11,0xa2,0xe4,0xd1,0xff},
+            {0xb2,0xf9,0x6f,0xc3,0x11,0x56,0x7d,0xdb,0xef,0x1b,0xf0,0xfc,0x48,0x7f,0x97,0x31,0x45,0xf7,0x17,0xf2,0x83,0x88,0x36,0x06,0xee,0x03,0xb4,0x38,0x4d,0xa7,0x40,0x03},
+            {0xaf,0xb5,0x71,0xe0,0xe1,0x40,0xdd,0xda,0x91,0x7b,0x23,0xd9,0x93,0x47,0x44,0x93,0xd6,0x1a,0x84,0x14,0xb0,0xbd,0x19,0x10,0x92,0xb6,0x78,0x0b,0xed,0x30,0x97,0x56},
+            {0x68,0x7a,0x64,0xc7,0x39,0xcc,0xc3,0x94,0x1a,0x0e,0xb7,0x45,0x54,0xbc,0xd0,0x13,0x5e,0x00,0x63,0x92,0x29,0x33,0xff,0x89,0x2c,0x7b,0x90,0xb8,0x8e,0x21,0xc7,0xb8},
+            {0x5d,0xdc,0x34,0x62,0x7e,0x55,0xa6,0x8c,0x4f,0xd8,0x2c,0x78,0x9c,0x10,0xd7,0xfe,0xcf,0x3e,0x38,0x0b,0x45,0x8e,0xcd,0x18,0xeb,0x8c,0x5a,0xe0,0x41,0xc0,0xb2,0x88},
+            {0xee,0x75,0x84,0xbb,0xd5,0x8e,0x27,0x9c,0x26,0x67,0xff,0xc0,0x7c,0x1c,0x49,0x77,0x65,0x4f,0xc9,0x48,0xa6,0x3e,0x33,0x63,0x3a,0x56,0x3c,0x75,0x7f,0x0d,0xd9,0xfd},
+            {0x3b,0x7f,0xb2,0xe6,0x68,0xfb,0xef,0x73,0x08,0x03,0xf1,0x0e,0xea,0x0e,0x6c,0xd9,0xa2,0x81,0x9e,0xee,0x7c,0x1c,0x14,0x18,0x43,0x1d,0x1d,0xc6,0x83,0xde,0xf7,0xf2},
+            {0xb4,0xe1,0x84,0x31,0xbf,0xed,0xbd,0x98,0xc9,0x24,0xa6,0x44,0x97,0xc6,0x0c,0xa9,0xe4,0xa8,0x2f,0x22,0x08,0x4f,0xa1,0xad,0x24,0xc0,0x9f,0x79,0xb2,0xea,0x6a,0x94},
+            {0xa5,0x07,0x3a,0x93,0x7e,0x8b,0x5c,0xbb,0xab,0xb8,0x91,0x5c,0xfd,0x2f,0x2f,0xe7,0x30,0x7e,0x4e,0x33,0x4d,0x5f,0x43,0x40,0x77,0x99,0x58,0x15,0x47,0x5f,0x0d,0xf2},
+            {0x45,0x5b,0x0d,0xe4,0x68,0x08,0xbf,0x01,0xd6,0x25,0xc2,0x2f,0x0c,0xea,0x27,0x12,0x07,0x80,0xc8,0xc6,0x9c,0x0c,0x11,0xcf,0x83,0x7e,0x98,0x82,0x3f,0xaf,0x58,0xff},
+            {0xa2,0xb2,0x66,0x81,0x84,0x7a,0xd3,0x48,0xda,0x10,0xf7,0xb5,0x78,0xca,0xe2,0x80,0x87,0xa3,0xf5,0xaa,0xbc,0x5f,0x84,0xde,0x18,0x8a,0xe7,0xba,0x9d,0xc7,0x54,0xf4},
+            {0xf0,0x36,0x94,0xa8,0x0d,0x8d,0xcf,0x0b,0x98,0xd4,0xc4,0xae,0x69,0xa7,0x97,0x21,0x8c,0xff,0x76,0x88,0xf8,0x0e,0xa9,0x7e,0x62,0x7e,0x81,0x7a,0xd3,0x6f,0x37,0x95},
+            {0x00,0x66,0x70,0x16,0x6e,0x38,0x2b,0x2b,0xf3,0x69,0x90,0x7c,0xb2,0xb4,0x83,0x4d,0x58,0xcc,0xdc,0x55,0xa4,0xbb,0xd6,0x49,0x4e,0x8f,0x9c,0x12,0x9f,0x51,0x40,0xe6},
+            {0xba,0x02,0xab,0x95,0xf8,0xcd,0xf7,0xe4,0x0f,0x03,0xa6,0x29,0xe4,0x7a,0x0f,0x7d,0x5b,0x77,0x09,0x65,0x49,0xf1,0x7a,0x15,0x8c,0x73,0xe2,0xb9,0x6c,0x6c,0xf0,0xed},
+            {0xe1,0x18,0x0c,0x4a,0xe2,0xe0,0x94,0xff,0x0e,0xf2,0xdd,0x81,0x07,0xe5,0xf2,0xb0,0x2b,0xeb,0xfa,0xd6,0x50,0x1b,0x18,0x96,0x5b,0x75,0xce,0x86,0x89,0xef,0xea,0x2a},
+            {0xa8,0x11,0x4d,0xb8,0x82,0x56,0x70,0x7a,0xfd,0xb0,0xf5,0x89,0xc4,0xe3,0x75,0xa7,0xb1,0x65,0x38,0x0a,0x0f,0x8c,0x27,0x95,0xc0,0xc0,0xdc,0x0d,0x02,0xf5,0x68,0x4c},
+            {0xa8,0xff,0x66,0xf4,0x7c,0x41,0x4f,0x56,0xd8,0x12,0x9e,0x33,0xa4,0x5a,0x0b,0xd9,0xb9,0xd1,0xa6,0x40,0xa3,0xa3,0x45,0x4d,0x34,0x96,0xba,0x3a,0x80,0x0b,0x2d,0x1f},
+            {0xf3,0x6c,0xa0,0xf9,0x5e,0x60,0x3f,0x80,0x63,0x80,0xdc,0xe5,0x2d,0x91,0x03,0x6d,0x8e,0x3a,0x55,0x45,0xe1,0xdd,0x76,0x20,0xa1,0x91,0x96,0x39,0x7b,0x91,0x35,0x9b},
+            {0x1c,0x20,0x7b,0x57,0x6a,0x1e,0x9e,0x76,0x52,0x09,0xac,0x67,0x56,0xc7,0x94,0x8f,0xa3,0xf2,0x52,0xa4,0x68,0x76,0x96,0xd0,0xf8,0xe8,0x31,0xf1,0x4c,0xa5,0x2b,0x92},
+            {0xcc,0x5e,0xb9,0x5f,0x77,0x59,0xdf,0xb6,0xcc,0x55,0x02,0x7d,0x49,0xa5,0xfe,0x9c,0x52,0xf3,0x00,0x65,0x68,0xcd,0x97,0xa0,0xc5,0x44,0x63,0x8b,0xe7,0xa8,0x87,0xee},
+            {0x4e,0x15,0xd5,0x88,0x58,0x37,0xd4,0xe5,0xe7,0x9b,0xff,0x21,0x93,0x0d,0xca,0xcb,0xa9,0x7d,0x2b,0xac,0x39,0xe5,0x06,0x89,0x6e,0x00,0x5f,0xd5,0x5a,0xad,0x7e,0x67},
+            {0x5e,0x2e,0x62,0x80,0x8f,0xbe,0x25,0x79,0x3a,0x69,0x17,0xdf,0xbf,0xd0,0x60,0x29,0xea,0x30,0xee,0xe0,0x89,0x21,0x16,0xfe,0x6e,0xa4,0x69,0x6f,0xcf,0x62,0xef,0x53},
+            {0x33,0x4d,0x57,0x5d,0xcf,0xb7,0xf6,0xb6,0x06,0x86,0x6a,0xf0,0x45,0xd0,0xa3,0x78,0xf5,0x34,0x47,0xef,0x51,0xd5,0xb3,0xd1,0xaf,0xd8,0x3d,0x78,0xc0,0xae,0xe1,0xeb},
+            {0x59,0x1c,0x6d,0xc9,0x85,0x41,0xb9,0xfa,0x04,0x4a,0xb8,0x9f,0x78,0x85,0x63,0x74,0xc3,0xf4,0x2c,0xa5,0xf8,0x02,0x1b,0xfa,0x0e,0x11,0x9d,0x8a,0x04,0xa2,0x86,0x46},
+            {0xc5,0x02,0xd6,0x85,0x3c,0x8e,0xb8,0xa2,0x65,0x7e,0x06,0x96,0x59,0xc1,0xf3,0xb0,0x68,0x78,0x49,0x8d,0x1b,0x1a,0x15,0xf7,0x71,0xff,0xfa,0xf8,0x86,0xa1,0xae,0x52},
+            {0x2d,0x4b,0x16,0xc2,0xb6,0xce,0xe6,0x06,0xaf,0x3c,0x02,0xae,0x8d,0x6a,0x86,0x56,0x0e,0x23,0x93,0x30,0x6f,0xed,0x2a,0xc0,0xb7,0x24,0x56,0xa8,0xe3,0x5e,0x24,0xb6},
+            {0xb2,0xee,0x8a,0xd1,0x1d,0xbd,0x4d,0xdb,0xca,0x24,0x5b,0x40,0x3a,0xda,0x57,0x35,0x4b,0x5d,0xf9,0x4a,0x9d,0xe5,0x4b,0xdf,0x57,0x4b,0xf0,0xeb,0x41,0x64,0x5c,0x89},
+            {0xa8,0x95,0xe7,0xd8,0xad,0xae,0xc8,0xc4,0x4b,0x60,0x36,0x48,0xf3,0x67,0x74,0x98,0x07,0x07,0xd3,0x0e,0xde,0x4f,0x5d,0xba,0xf2,0xbd,0x3d,0x2e,0x3d,0x4e,0x90,0xb4},
+            {0x1e,0x76,0xfe,0x8a,0x5a,0xa1,0xb5,0x16,0xdb,0x5d,0x04,0xf3,0x49,0x6e,0x69,0x17,0x0d,0x3a,0x69,0x10,0xae,0xa7,0x9a,0xd7,0x55,0x4e,0x25,0x27,0xb8,0x1b,0x6b,0x5a},
+            {0x15,0x76,0xd0,0xf0,0x8a,0x56,0x6b,0xc4,0x22,0x04,0x9e,0xfc,0xdd,0x94,0x2b,0xa4,0x55,0xe6,0x1a,0x1b,0xb2,0xd6,0xe1,0xad,0x47,0x0e,0x09,0x88,0x99,0x12,0x8f,0x75},
+            {0xff,0xc4,0x2c,0xbc,0xc8,0x2b,0x0b,0x23,0xc5,0x61,0x63,0x01,0xe9,0x0a,0xa6,0xed,0x76,0xf4,0x85,0xcd,0x63,0x50,0x6b,0xa5,0x20,0x97,0xa4,0x2b,0x5c,0x17,0x42,0x0e},
+            {0x27,0xfa,0x1e,0xdc,0x69,0x38,0xb7,0xd3,0x65,0x8c,0x5c,0x9d,0x89,0x41,0x36,0x85,0x7f,0xc0,0xbe,0x8f,0xa7,0x43,0x92,0x4a,0x86,0xee,0x4b,0xaf,0x58,0x35,0x99,0xbf},
+            {0x4c,0x8a,0x50,0x2f,0xb1,0x62,0xa9,0x58,0x05,0x02,0xf4,0xf2,0x61,0x8b,0xe8,0x30,0x41,0x78,0x2f,0x24,0x5c,0x60,0x23,0xe1,0xd6,0xc3,0xec,0xd7,0xbb,0xf2,0xcb,0xd2},
+            {0x5b,0x72,0x39,0x1f,0x63,0xf6,0x1b,0xa4,0x8f,0xbf,0x8f,0xd3,0x08,0xca,0x6a,0xfb,0x7d,0x72,0xb9,0x54,0x5d,0x18,0x12,0x53,0x8f,0x2e,0x4d,0x14,0x14,0xc6,0xfb,0x1d},
+            {0x19,0x68,0xaa,0xb0,0x95,0x60,0xc4,0x95,0x09,0xdc,0x7c,0xda,0xc8,0xc5,0xc9,0x19,0x62,0x9a,0x3d,0xa0,0xa3,0x9d,0x76,0x28,0xb1,0x72,0xd5,0xe7,0xbd,0xe9,0x9c,0x20},
+            {0x97,0x65,0x64,0x82,0xe3,0xf4,0xc9,0xdb,0xd0,0x1c,0xf1,0xfd,0x91,0xf0,0xde,0xb0,0xb3,0x19,0xc1,0x5a,0x89,0xb5,0xde,0xec,0x6a,0x57,0xfa,0xc6,0x47,0xa8,0x17,0x53},
+            {0xd1,0x39,0x2d,0x6f,0x39,0x25,0x2c,0x12,0xb7,0x6a,0xca,0x67,0x62,0xfd,0x95,0x08,0x67,0x85,0x43,0x39,0x13,0xe5,0x96,0x0b,0x3c,0x14,0xa7,0x08,0x40,0x1c,0x28,0x97},
+            {0xc1,0x12,0x44,0x43,0x9c,0x75,0x4d,0x91,0xaa,0x30,0xa2,0xfc,0xdd,0xee,0xf5,0xa0,0xbe,0x7e,0x30,0x0b,0x94,0xa5,0xc9,0x89,0x67,0x78,0x5f,0x11,0x2c,0xdb,0xcf,0xff},
+            {0x21,0xc5,0x29,0x76,0x5b,0x6a,0x10,0x48,0xc8,0xc9,0x46,0x57,0x8b,0xe1,0x4e,0x63,0x75,0x0e,0xea,0xe2,0x85,0x21,0xfd,0x84,0x5b,0xf7,0xa3,0xae,0x66,0x9f,0x20,0x3b},
+            {0xc2,0xf2,0x21,0x69,0x83,0x2b,0x5d,0xe1,0x85,0xaa,0xa5,0x64,0x2f,0x12,0x57,0x38,0xf1,0x64,0x00,0x10,0x83,0x43,0x83,0x28,0xd2,0x54,0x1c,0x15,0xa7,0xf9,0x86,0xaf},
+            {0x29,0x35,0x83,0xe0,0xb2,0xb8,0x6f,0x04,0x12,0x04,0xe4,0xdd,0xc9,0x54,0x6c,0xa7,0x44,0x31,0x40,0x7f,0x88,0xce,0x36,0x66,0x53,0x37,0xa5,0x60,0x2d,0xbe,0x3b,0xbd},
+            {0x1c,0x27,0x0b,0xcf,0xf1,0x84,0xb5,0xef,0xcd,0xec,0x7f,0x63,0x0e,0x70,0x7c,0x3e,0x7c,0x90,0xa5,0x19,0x30,0x22,0x33,0xfd,0xc0,0x8a,0xa7,0x44,0xd4,0xcc,0x0f,0x9f},
+            {0x88,0xa9,0xd5,0xa8,0x1d,0x35,0x8a,0x14,0xcd,0x92,0xc1,0x4d,0x66,0x99,0x03,0x03,0x2c,0x93,0x37,0x19,0x15,0x72,0x5d,0x76,0x4f,0xb0,0x1c,0x7c,0x16,0x73,0xd4,0xe0},
+            {0xc7,0x33,0xa5,0x4f,0xa8,0xd1,0xef,0x07,0x07,0x0c,0x52,0xce,0x77,0x89,0x8e,0xb9,0x3f,0x14,0x8b,0x13,0xcd,0xd1,0xb6,0xfa,0x69,0x88,0x4d,0xae,0x4b,0x62,0x14,0x4c},
+            {0xac,0xc7,0x54,0x6c,0xee,0x77,0xad,0x0a,0x64,0x1b,0xd3,0x32,0x53,0x86,0x9e,0x04,0x59,0x32,0x5d,0xb8,0xe6,0xe3,0xa9,0xc7,0xe3,0x81,0x29,0x16,0x93,0x9e,0x53,0x45},
+            {0xed,0xb6,0xa1,0x77,0xbe,0x83,0xd6,0x1f,0x8e,0x67,0xdb,0x1b,0x38,0x37,0xdb,0x03,0x16,0xd0,0x20,0x5c,0xc7,0x30,0x3c,0x24,0x2c,0x69,0x7f,0xb3,0xc2,0xa1,0xaf,0x25},
+            {0x8e,0x1e,0x00,0x2d,0x81,0x17,0x34,0xae,0x80,0x33,0x33,0x37,0x94,0xc2,0xbd,0xbe,0x82,0x6f,0x1c,0x69,0xf4,0xdd,0x61,0x97,0xe5,0x95,0xe7,0x58,0x37,0xa3,0xca,0x64},
+            {0x31,0x6f,0x26,0xc9,0xd7,0xb2,0xdc,0x52,0x38,0x38,0xfd,0x4d,0x8a,0x10,0x2e,0x7b,0x81,0x7a,0x44,0xd0,0x0a,0x4f,0x31,0xdc,0xd3,0x0b,0xd6,0x52,0x9c,0xa3,0x07,0x0b},
+            {0x0a,0xe3,0x4d,0x23,0x33,0x5c,0x31,0x38,0xe2,0xad,0x4a,0x28,0x2b,0x3b,0xdb,0x89,0x54,0x2b,0xdc,0x29,0xa4,0xdf,0x69,0xd2,0x02,0xac,0x41,0xf1,0x40,0xe1,0x5a,0xa9},
+            {0x6c,0x6d,0x48,0x77,0x6b,0xe2,0xe5,0xa3,0x0e,0x91,0xaf,0x97,0xbd,0x6b,0x0b,0xc5,0xa5,0xeb,0x76,0xa5,0xfd,0x71,0x3a,0xdc,0x39,0x9f,0x86,0x64,0x91,0x8c,0xee,0x9f},
+            {0xdf,0xd7,0xc3,0x71,0xee,0xf5,0x29,0x31,0x4f,0xa8,0x53,0x91,0x8e,0xd4,0xfa,0xc8,0x6e,0x47,0x3d,0x5b,0xfc,0xd9,0xdb,0xe2,0x61,0xe5,0x72,0x01,0xd7,0x0c,0x08,0x2f},
+            {0x00,0x46,0xae,0x85,0xe6,0x23,0x0a,0x07,0xef,0x27,0xa9,0xc7,0xc7,0x5d,0xc6,0xf6,0xcc,0xb7,0x74,0x24,0x33,0xcf,0x8b,0xe1,0x73,0x43,0xea,0x86,0x66,0x51,0x22,0x59},
+            {0xdd,0x9f,0xe8,0x3a,0x56,0x0f,0x08,0x97,0xbd,0x19,0xf2,0x34,0x74,0xfe,0x74,0x4c,0x8e,0xad,0xe0,0x26,0xcd,0xb1,0xf0,0x48,0xe8,0x4f,0x34,0x59,0xe0,0xf1,0x93,0x03},
+            {0x3e,0x6a,0x71,0xec,0x2a,0x65,0x2d,0xef,0xe8,0x11,0x27,0xe6,0x0e,0x22,0x72,0x8c,0x5c,0x2b,0x6b,0x7e,0xbd,0x3f,0x89,0x46,0xe3,0x47,0xd6,0x62,0xff,0x3a,0x86,0x8b},
+            {0xa4,0x22,0x9e,0xb0,0x78,0xf8,0x09,0x05,0xf0,0x12,0xa4,0x74,0x54,0x5e,0x0e,0x27,0x86,0xf9,0x8b,0xf7,0xfb,0x20,0x73,0xdc,0xea,0xd7,0xec,0x73,0xc6,0x5f,0xbe,0x9b},
+            {0x7d,0xca,0xd9,0x63,0x8f,0x54,0x73,0xae,0x40,0xaf,0x1a,0x5d,0x93,0x34,0xca,0x76,0x3a,0x09,0xc6,0x68,0x12,0x80,0x6f,0x67,0xe7,0x5b,0xb4,0x4e,0x45,0x7f,0x87,0xc3},
+            {0x37,0x4f,0xf6,0x18,0x77,0xeb,0x86,0x6e,0xe3,0x24,0xa8,0x70,0x77,0xeb,0x71,0xd0,0xa2,0x69,0xe9,0x84,0x58,0x47,0xe5,0x5a,0x5e,0x10,0xfe,0x5f,0x3c,0x77,0xaa,0xde},
+            {0xef,0x6f,0x39,0x3a,0x0d,0x14,0x02,0x50,0xe0,0x71,0xd3,0xb8,0x2f,0x50,0x86,0xc1,0x3b,0xb4,0x29,0x26,0x6c,0xf9,0x44,0xba,0xe8,0xcd,0xaa,0x28,0x83,0x4c,0xef,0x8b},
+            {0x96,0x51,0xad,0x41,0xb5,0x5c,0x6e,0x8d,0x6a,0xbb,0x34,0x5d,0x4e,0xa0,0x6e,0x43,0x99,0xcf,0x29,0x02,0xd2,0xc1,0xcf,0x13,0xeb,0xbf,0xba,0x0b,0x71,0x40,0xc8,0xbc},
+            {0x9d,0x05,0x40,0xe5,0x8a,0x64,0x45,0xfd,0x86,0x8e,0xa6,0x5c,0x40,0x18,0x5a,0x7d,0xa7,0x85,0x85,0x24,0xf4,0x19,0x79,0x70,0x84,0xa6,0x02,0x42,0x7a,0xce,0x74,0x77},
+            {0x5d,0x81,0x23,0x12,0xbf,0xa5,0x6d,0xce,0xd2,0xd0,0x10,0xdd,0xbd,0x98,0xb7,0x9e,0xc9,0x46,0xa4,0xc1,0x3f,0xc5,0x45,0x08,0x8c,0x80,0xd0,0x37,0xe4,0xdf,0x3c,0x3b},
+            {0xc7,0x5d,0x28,0xa3,0x3c,0x29,0x2a,0x50,0xe2,0x93,0xd4,0xe8,0x8f,0x25,0x42,0x1b,0xc0,0x3c,0x83,0xfd,0xba,0xfa,0xba,0x4f,0x52,0x6b,0x8c,0x6a,0x7e,0x5c,0x2e,0x2e},
+            {0x53,0xcc,0x98,0xe7,0xb4,0x1f,0xa8,0xcf,0x94,0xae,0x5d,0xdb,0x98,0x07,0xfc,0xf8,0xc7,0x3c,0x20,0x9d,0x91,0x0c,0x89,0x2f,0x26,0x66,0x21,0xfa,0x05,0x78,0x2e,0xce},
+            {0xf6,0xb5,0x89,0xde,0xcf,0xff,0xc6,0xc3,0x39,0x57,0xcd,0x06,0x14,0x04,0xde,0xa6,0x48,0x24,0x35,0xab,0xca,0xbb,0xad,0x34,0x85,0x26,0x6c,0xf4,0xa8,0xe7,0xfc,0x05},
+            {0xe4,0xe0,0x3d,0x0c,0x46,0x7c,0x24,0x20,0x92,0x38,0x15,0xfd,0xef,0x77,0x4f,0x53,0x0d,0x07,0xc0,0xc4,0x15,0xe9,0x97,0x5b,0xed,0x75,0xdb,0x2c,0xe4,0x22,0x7d,0xbf},
+            {0x71,0x78,0xa3,0xcf,0x86,0xb9,0xb2,0x70,0x23,0xe5,0x76,0xa0,0xf1,0x12,0xdd,0xbd,0x3e,0x24,0x02,0x89,0xbf,0x8c,0x42,0x56,0xec,0x38,0x49,0x62,0x20,0x7d,0x74,0x9d},
+            {0x58,0xc2,0x93,0x27,0x18,0x9a,0xcf,0x56,0x70,0xbf,0x36,0x4f,0x2c,0x90,0x23,0x43,0x9e,0xab,0x2d,0xff,0x64,0x3a,0x4f,0xf3,0x6f,0x3d,0x35,0xb4,0x32,0x63,0x11,0x1e},
+            {0xd9,0xb3,0x65,0xba,0xe9,0x02,0x82,0x7f,0x41,0x52,0x88,0xab,0x30,0xe5,0xe7,0x5d,0x93,0x03,0x8f,0xfc,0x14,0x66,0x35,0x6d,0x6f,0x52,0x80,0x86,0x3f,0x18,0xda,0xd2},
+            {0xff,0xd3,0x71,0xa7,0xa9,0x5b,0x47,0xd1,0x97,0xbc,0x94,0x7e,0x0e,0x1c,0x3c,0xd5,0x0a,0x96,0x65,0x7c,0xa1,0x41,0x16,0xfa,0xd6,0xfb,0x7e,0xc9,0x6a,0xec,0x3b,0xf1},
+            {0x10,0xab,0x51,0x3a,0x9a,0xa3,0x3c,0xe2,0xea,0x4c,0xf2,0x93,0xdd,0x0c,0x43,0x5b,0x5a,0xad,0x5a,0x1a,0xdf,0xf6,0x56,0x04,0xdd,0x3f,0x07,0xcf,0xa1,0xf3,0x40,0xee},
+            {0x40,0x86,0x3a,0xa4,0x3e,0x50,0xba,0x80,0xbd,0xaf,0xdb,0xa6,0x6a,0xe0,0x53,0x89,0x63,0x70,0x42,0x1d,0x48,0xf5,0x9c,0x2a,0xa9,0x62,0xec,0x5e,0x29,0x14,0xbd,0x96},
+            {0x03,0x63,0x49,0x8e,0xd6,0x51,0xcf,0x53,0xbd,0x46,0x9f,0xd0,0xdd,0x8f,0xfd,0xce,0xe6,0xc6,0xb4,0x64,0x1a,0x67,0xbf,0x52,0xfd,0x17,0x7e,0xe7,0xe9,0xe8,0x13,0x24},
+            {0x78,0x04,0xa9,0xcc,0xc7,0x8f,0xcc,0x0e,0x6b,0x65,0x83,0xe2,0xfe,0x28,0xa3,0x2d,0x3b,0x40,0x9a,0x08,0xdc,0x48,0x06,0x12,0x33,0xf8,0xfa,0xf8,0x8d,0xbc,0xfa,0x03},
+            {0x68,0xae,0x59,0x98,0x71,0x80,0xdf,0x70,0x89,0xfe,0x25,0x66,0xc5,0xd2,0xa6,0x1d,0x55,0x4b,0x26,0x73,0x32,0xa2,0x4d,0xc4,0x4f,0xfb,0xa9,0x7c,0x1a,0xb1,0xb5,0x96},
+            {0xf2,0xc2,0x9c,0xa8,0xdd,0x0b,0x04,0x29,0xdf,0x3f,0xe2,0x5f,0xe3,0xe3,0x6e,0x6f,0xde,0xf1,0x17,0x0d,0xbe,0xd8,0xba,0xa3,0x0c,0xde,0x80,0xf1,0x3c,0xd0,0x93,0xf5},
+            {0x06,0xd4,0x40,0x0c,0x68,0xd1,0x6c,0xe0,0xb1,0xb7,0x0f,0x8f,0xef,0x72,0x6f,0xdf,0x63,0x3a,0xf8,0x5e,0xac,0x4e,0x28,0x56,0x94,0xdb,0x95,0xc0,0xf8,0xe5,0x03,0xcd},
+            {0x8d,0xb9,0x48,0x1d,0x31,0xcd,0x20,0xf8,0xeb,0xf1,0x5b,0x2a,0xc5,0x59,0xee,0x46,0x79,0x6f,0x0d,0xa8,0x3b,0x8a,0x94,0x13,0x9a,0xb9,0x98,0xe2,0xbe,0x19,0xf0,0x35},
+            {0x4c,0x4a,0x93,0xfc,0xff,0x16,0x4e,0x07,0x0a,0x9e,0xac,0x32,0xc8,0xb7,0xa5,0x82,0xa0,0x0c,0x6d,0x32,0xf8,0xdd,0x14,0x6c,0xc6,0x03,0x52,0x0d,0x91,0xfb,0x11,0xdd},
+            {0x3d,0x70,0xcb,0x49,0x3f,0xee,0x1f,0x85,0x75,0xdc,0x7d,0xa9,0xc7,0x62,0x7d,0x31,0xeb,0xf4,0x2c,0x98,0x42,0x27,0x5f,0x77,0x2c,0xe6,0xf0,0xd4,0x2e,0x06,0xdb,0x0a},
+            {0x9f,0x28,0x53,0x7e,0xa9,0x16,0xce,0xeb,0xf7,0x6f,0x1a,0x42,0x54,0x4c,0x43,0xe1,0x3e,0x90,0x75,0x92,0x92,0x28,0xf3,0x21,0x90,0xd9,0xba,0x4f,0x5b,0xb5,0xc9,0xb0},
+            {0x67,0x3a,0xf6,0x9e,0xac,0xb5,0x83,0x12,0xc0,0x1c,0x9b,0x4e,0x93,0x16,0x7b,0xf8,0xe5,0xbe,0xc2,0xcc,0xb4,0x45,0x0a,0xb8,0x33,0xba,0xee,0x81,0xcd,0xbb,0xd9,0x5b},
+            {0x0d,0x0b,0x61,0xe1,0x2e,0x81,0xbe,0xd6,0x93,0x80,0xc9,0xb8,0xeb,0x23,0xa2,0x38,0x4a,0x48,0xbb,0x13,0xa4,0xb7,0x80,0x8a,0x21,0xeb,0xdb,0x00,0x96,0x0e,0x7e,0x4c},
+            {0x28,0x4b,0x4b,0x1d,0x0f,0x12,0x6c,0xc7,0x6b,0x74,0x3e,0xed,0x1d,0x25,0x5b,0x18,0x1a,0x4e,0xa4,0x58,0x39,0xef,0x0c,0x1d,0xd2,0x74,0x9c,0xe5,0xae,0x83,0x27,0x0c},
+            {0x70,0xcb,0xb1,0x99,0x8e,0xfc,0x52,0xd6,0xb6,0xae,0xcc,0xa6,0x75,0x51,0xe4,0x2b,0xb4,0x4e,0xb6,0xdd,0x6e,0x40,0x02,0x41,0xd2,0xe2,0xba,0xb3,0x4e,0xf9,0xc1,0xf5},
+            {0xa4,0x75,0x82,0x68,0x1a,0xc3,0x64,0xf0,0x31,0xf9,0xd1,0x9c,0x42,0xe0,0xb6,0x8e,0xdc,0x07,0x49,0xc5,0xb3,0xda,0x95,0x81,0x00,0x9b,0x51,0x87,0xb8,0xb5,0x03,0xf4},
+            {0x80,0x8c,0x8d,0x74,0x61,0x09,0xd7,0x4e,0xae,0x54,0xb9,0x7f,0x45,0xab,0x7b,0x9e,0xd2,0x4f,0x32,0x83,0x5c,0xf8,0xa1,0xec,0x9d,0x7d,0x46,0xc3,0xfa,0xe5,0x17,0x8b},
+            {0xab,0x0e,0x3e,0x55,0x0b,0x11,0xa9,0x5e,0xbe,0x15,0xed,0xb5,0x06,0xa5,0x34,0xd7,0x0e,0x4b,0xdf,0xbb,0xc9,0x17,0x2b,0x25,0x16,0x68,0xcb,0x8e,0xaf,0xfa,0x5c,0x7b},
+            {0x8d,0x24,0xd2,0x3e,0xc2,0x01,0x2f,0xf5,0x70,0x24,0xb1,0x24,0x1d,0xd4,0x01,0xee,0xa2,0xec,0x10,0x46,0x45,0xe5,0xdd,0x40,0x88,0xb3,0x25,0x46,0xfd,0x8f,0xf9,0x04},
+            {0x52,0x3f,0xc9,0x9d,0xa5,0xbd,0x88,0x1d,0xa3,0x26,0xc9,0x4b,0x30,0x3a,0x85,0x2c,0x07,0x96,0x79,0x2c,0x1f,0x3a,0xbf,0xc1,0xfd,0xc7,0x59,0x0c,0x9a,0x1a,0xd8,0x0a},
+            {0xbe,0xf0,0x23,0x15,0x8f,0x2d,0xff,0xf9,0xaf,0x92,0xf2,0xaa,0x64,0xe7,0xda,0x30,0x87,0xaf,0xe0,0x8b,0x2c,0xd5,0xbe,0xd4,0xd6,0xa0,0x93,0x3e,0x46,0xef,0xd4,0x11},
+            {0xbd,0xb0,0x56,0xbd,0x0a,0xe3,0x0d,0x8b,0x92,0x66,0x88,0xb5,0x6a,0x6e,0x06,0x02,0x99,0x05,0xec,0xb5,0xb2,0x59,0x22,0xfe,0x4f,0x6f,0x20,0x04,0xd4,0xad,0xfa,0x11},
+            {0x94,0xa6,0x5d,0xc8,0x80,0x5b,0xbe,0xe3,0x93,0xa4,0x9a,0x95,0xce,0x8c,0x95,0x57,0x4a,0xb2,0x80,0xd6,0xcf,0xcc,0x4a,0x14,0x90,0xce,0xc8,0x35,0x27,0x54,0xc6,0xa4},
+            {0x50,0x41,0x0f,0xb6,0x3b,0x97,0x59,0xe6,0x97,0xbb,0xb5,0xc6,0x2d,0x39,0x82,0x0c,0xe5,0xd1,0xf7,0x6a,0xe9,0x69,0x7e,0x06,0x45,0x78,0xa1,0x5e,0x06,0x21,0xb7,0x92},
+            {0x90,0xbc,0x57,0xb7,0x05,0x5d,0x84,0x74,0x1c,0x13,0xf3,0xa7,0x70,0x77,0x70,0xde,0x07,0xac,0x21,0x18,0x01,0x5e,0x3f,0x0d,0x08,0xac,0x9c,0xa3,0xa4,0xa6,0xe1,0x77},
+            {0x4b,0x70,0x3a,0xd6,0xaa,0xf1,0xcb,0xbd,0x6f,0x4f,0xca,0xeb,0x97,0x45,0xfa,0x82,0xf6,0xfb,0x05,0x56,0x11,0xd7,0x16,0x4c,0x57,0x28,0x92,0xb0,0xfb,0x78,0x61,0x14},
+            {0x0a,0xb8,0x36,0xaa,0x1a,0x9a,0xb4,0x46,0x77,0x08,0x65,0x2e,0x8d,0xbe,0xc2,0x88,0x51,0x19,0x35,0x8e,0x37,0xb3,0x2f,0x51,0xb4,0x6d,0x45,0xf3,0x3c,0x88,0x04,0x6c},
+            {0x1a,0x11,0x8c,0x7d,0x92,0x21,0x33,0xcc,0xd4,0x30,0xb9,0xf9,0x85,0x7b,0x62,0xf8,0xf2,0xce,0x4d,0xf7,0xd6,0x48,0xa1,0x97,0xf6,0xed,0xd3,0xfe,0xfc,0x07,0xce,0xcd},
+            {0x40,0xe8,0x46,0xcc,0x77,0x4d,0xdf,0x63,0x92,0xd6,0x73,0xf6,0x9c,0xe9,0x52,0x45,0x69,0x0f,0x25,0x78,0x67,0x70,0x05,0x1b,0xa5,0xad,0x49,0x46,0x13,0x10,0xb0,0xdf},
+            {0x5a,0xad,0xca,0xfb,0xcf,0x0b,0x1b,0x47,0x23,0xd3,0x9c,0x5d,0x40,0x48,0xa8,0xd9,0xf3,0x88,0x9a,0x3f,0x68,0xaa,0xb6,0x6c,0xac,0x0e,0xa4,0xf0,0xef,0x7d,0x54,0x9d},
+            {0xac,0xdd,0x2f,0x2a,0x54,0x8c,0xd3,0x25,0xfc,0x06,0xb4,0x9c,0x25,0x7b,0xfb,0xc9,0xb0,0x9c,0x01,0x6a,0xb0,0x85,0x9c,0xb9,0x47,0xaa,0xc6,0x4c,0x45,0x70,0xf6,0xe9},
+            {0x0b,0x3a,0xb5,0x37,0x04,0x4f,0x2e,0x61,0x42,0xff,0x42,0x50,0x79,0xd2,0x5f,0xcd,0x87,0xe0,0xdd,0x81,0x87,0xf0,0x3b,0xf0,0xdf,0xc4,0x79,0x14,0x2d,0x8b,0x9a,0xbd},
+            {0x49,0x7c,0x65,0x21,0xa3,0x01,0x86,0x58,0x63,0xf7,0xdf,0xcd,0x03,0x31,0x6a,0xe0,0xdb,0x69,0x0e,0x98,0x54,0x61,0x16,0xc1,0x4d,0xf0,0x5d,0x98,0xe8,0xcd,0xc8,0x93},
+            {0xcc,0xdf,0x59,0x49,0x45,0x7b,0x23,0x94,0xdf,0x19,0x3f,0x21,0xd8,0xca,0xcd,0x49,0x71,0x94,0x2e,0xa3,0xa1,0x46,0x7e,0x2a,0xb1,0x3f,0xc0,0xcf,0x38,0xa2,0xac,0xa6},
+            {0xb3,0x80,0x79,0xf3,0x5e,0x81,0xd6,0x2e,0x2e,0xc8,0x9a,0x55,0x11,0x53,0x7a,0xbd,0x02,0x0e,0x0d,0x49,0xf4,0x7c,0xfe,0xac,0xb1,0xfd,0xf0,0x00,0x0e,0x38,0x98,0xc3},
+            {0xb5,0x47,0x7b,0x70,0xb3,0xe6,0xf6,0x2f,0xc2,0x81,0xe3,0x49,0x30,0x3e,0x8e,0x16,0x0a,0x5c,0xbf,0x6a,0xf1,0x35,0xbf,0x3c,0x99,0x19,0x55,0xb3,0xcb,0x96,0x30,0x39},
+            {0x64,0xe8,0xbc,0xf3,0xfd,0xb1,0x82,0x48,0xea,0xd8,0xb6,0xc5,0xa2,0x3b,0x15,0x6d,0x76,0xcb,0xc6,0xab,0x57,0x89,0x81,0x5a,0x2b,0x45,0xc3,0x65,0xab,0x20,0xd3,0x53},
+            {0x86,0xc9,0x81,0xee,0xcb,0x0a,0xf6,0xe8,0xad,0xa8,0xe6,0x8a,0x9b,0xa9,0xa6,0xcb,0x93,0xd0,0xed,0x52,0x7a,0x36,0x61,0x21,0xab,0x0d,0xcf,0x9f,0x44,0xd2,0xa3,0x8d},
+            {0x93,0xff,0x8b,0xbd,0x4d,0xce,0xd9,0xf0,0x9d,0x34,0x3b,0x22,0x27,0x09,0x9d,0x63,0xa2,0x8c,0x12,0x13,0x89,0xdd,0xa3,0x86,0xc8,0xb5,0x8a,0xca,0xc7,0xe0,0x20,0xaa},
+            {0xb9,0xb7,0xcc,0x4a,0x4e,0x8b,0x9f,0x5a,0x1e,0xc1,0x11,0x6d,0x37,0x8e,0x3f,0x90,0xab,0x3e,0x8e,0x46,0x05,0xd4,0xcd,0xc9,0x5b,0x3e,0x4b,0x7d,0xf2,0x81,0x5a,0x1c},
+            {0xf2,0xf3,0x7e,0xaa,0xe0,0xce,0x72,0xd7,0x92,0xc6,0x5a,0x90,0x6b,0x6c,0x73,0x34,0xc2,0x37,0x7c,0x3c,0x31,0xe4,0x54,0x06,0x33,0x05,0xe7,0xe6,0x3e,0x53,0x29,0xe0},
+            {0xcd,0xfc,0xf7,0x1c,0x42,0xe3,0xd8,0xd0,0x56,0xca,0xb0,0xfb,0xf3,0x62,0x5c,0x1b,0x13,0x70,0x48,0x70,0x70,0x9a,0x4e,0x08,0x50,0x00,0x64,0x47,0xf1,0x28,0xef,0xc0},
+            {0x83,0x56,0x6f,0x6a,0xd1,0x53,0x6d,0x4a,0xa2,0x54,0x32,0x58,0xbd,0xee,0x98,0x98,0x98,0x07,0xff,0xa1,0x33,0xd3,0x6a,0xf3,0xa2,0x66,0x72,0x70,0x8e,0xad,0x84,0x10},
+            {0x68,0xb8,0x9c,0x27,0xa8,0x25,0x4d,0x5f,0xa3,0x90,0x96,0x94,0x3b,0xd9,0xbb,0x00,0x74,0xe9,0x50,0xfa,0xc7,0xe6,0x86,0x20,0x9c,0x01,0x13,0xdf,0x08,0x8a,0xe0,0x54},
+            {0x0e,0x8c,0x8d,0x00,0xc7,0xe7,0x19,0x68,0x37,0x1f,0x45,0x97,0xda,0x93,0x4a,0xea,0xed,0xc4,0x14,0x25,0x86,0xc6,0x45,0x47,0x90,0xff,0xf7,0xa4,0xe6,0x1a,0xf3,0x0e},
+            {0x0b,0xc7,0xe2,0xff,0x2a,0xf8,0x9d,0x45,0x81,0x23,0x49,0xf0,0x39,0x73,0x40,0x6f,0x27,0xa4,0x47,0x5c,0x44,0xe7,0x15,0x89,0xc4,0x12,0x1a,0x9c,0xae,0x9c,0xf3,0x7e},
+            {0x53,0x73,0x8b,0xeb,0xaf,0xb5,0xa0,0x6c,0xe8,0x14,0x0b,0x83,0xef,0x92,0x2a,0x31,0xa0,0x55,0x21,0xc0,0x7c,0x42,0xcb,0x09,0xfb,0xcf,0x66,0x19,0xbf,0x95,0x96,0x97},
+            {0x80,0x9f,0x6e,0x69,0x16,0x47,0x91,0x60,0x82,0xcd,0xe7,0x41,0xc8,0x2d,0xf0,0x20,0x25,0x4d,0xe1,0x01,0x48,0xb4,0xb7,0x12,0x74,0x4f,0x1d,0xb3,0x45,0xbc,0x26,0x94},
+            {0x82,0x23,0x8f,0x89,0x89,0x34,0x76,0x75,0x6a,0x48,0xea,0xa4,0x2c,0xff,0xb4,0xfc,0xf0,0x7c,0x8c,0xf4,0xcd,0xbe,0x12,0xa1,0xc4,0x31,0x45,0xd2,0xb6,0x7a,0xac,0x07},
+            {0xee,0x99,0x5f,0xdc,0x76,0x33,0xe8,0x03,0x74,0x1f,0xff,0xca,0xd7,0x12,0xa4,0x8a,0xea,0xfe,0xf1,0x6e,0x5a,0x91,0xab,0xa8,0x99,0xe4,0x29,0x5b,0xcf,0xa3,0xb5,0x77},
+            {0xb6,0x5b,0x04,0x89,0xec,0xfa,0x62,0xb9,0x72,0x5b,0x7a,0x4c,0x41,0x50,0xca,0xf0,0xf0,0x13,0x50,0xde,0x9c,0xfd,0x61,0x3c,0x90,0xc6,0x0d,0x0f,0xa4,0x87,0x5f,0xf2},
+            {0x79,0x88,0xa7,0x78,0x72,0xe5,0x93,0xe8,0x31,0x98,0x9c,0x6c,0xa5,0xe5,0xe6,0x86,0x1b,0x63,0xe1,0xc2,0xa4,0x20,0x30,0xd6,0x84,0xb5,0x1f,0xb8,0x8a,0xb7,0x30,0x04},
+            {0x91,0x4e,0xa3,0x7d,0xe5,0xdc,0x3b,0x2f,0x90,0x35,0xcd,0xb7,0xfb,0x80,0xe6,0xe6,0x92,0xa0,0xa5,0x93,0x47,0x56,0xbe,0xb6,0xd8,0xe2,0xea,0x8e,0xee,0x7a,0x38,0x95},
+            {0xd9,0xc2,0x8d,0xc8,0xbc,0x38,0x52,0x83,0x65,0x0f,0xb2,0xae,0xb1,0xef,0xe1,0x0c,0xaf,0x84,0x8c,0x39,0xde,0x37,0xa7,0x8d,0xbe,0x6f,0x47,0xb8,0xf3,0xbd,0x8b,0x51},
+            {0x49,0xa2,0x58,0x1f,0x6e,0xbc,0x75,0x3d,0x70,0xdc,0x30,0xd3,0xb0,0x93,0x88,0x21,0x53,0xfe,0xf2,0xd0,0x82,0x52,0x52,0x35,0x4e,0x5b,0xeb,0x1b,0x35,0xeb,0x90,0xaa},
+            {0x77,0x91,0xd3,0x74,0x75,0xe1,0xe1,0x5b,0xb9,0xb8,0x17,0xb1,0x80,0x81,0x1d,0x78,0x49,0x63,0xd2,0x39,0x8c,0x5e,0x73,0x6a,0x85,0x1a,0xf2,0xef,0x8e,0x62,0x2e,0x77},
+            {0x39,0x57,0xf1,0x79,0xaa,0x76,0x76,0xea,0xdd,0x2c,0x31,0x2c,0xd6,0x09,0x6f,0x84,0xb7,0xa0,0x42,0x4b,0xc9,0x9f,0x05,0xc8,0x99,0x7b,0xac,0x9f,0xed,0x05,0x7a,0xe5},
+            {0x9d,0x95,0x4a,0xb5,0x22,0x4f,0xfd,0x2e,0x03,0x01,0xff,0x9b,0x33,0xef,0x83,0x4d,0x01,0x95,0x96,0xa6,0xc3,0xf5,0x6f,0xb6,0x34,0xcc,0xc9,0x77,0x9b,0x9c,0x69,0x4f},
+            {0xe6,0x23,0x5e,0xda,0x52,0xb7,0x21,0xbc,0xc3,0xb9,0x97,0xbc,0x8d,0xa5,0x54,0xf1,0x99,0x8b,0x5c,0x7f,0xf4,0x3c,0xb8,0x6c,0x2d,0x7f,0x19,0x15,0x15,0x0c,0x4d,0xed},
+            {0xc0,0x68,0x4e,0x19,0x7a,0xce,0x1c,0xb5,0x7a,0xb5,0x53,0x20,0x3b,0x16,0xfb,0xcc,0xce,0x5c,0x99,0x3b,0x87,0x6b,0x90,0x49,0x9e,0x96,0xd9,0x4c,0xe3,0x08,0xb9,0x56},
+            {0x70,0xcb,0x7b,0xe7,0xca,0x2d,0x01,0xbb,0x41,0xc0,0x9c,0x06,0xfe,0xfc,0x04,0xe8,0xd6,0xdb,0xfc,0xdb,0xd9,0xb8,0xdf,0x4b,0xd3,0x8c,0xaa,0x3c,0x7f,0xbb,0x60,0x01},
+            {0x96,0x23,0x5a,0xc3,0x9c,0x39,0x75,0x50,0xe2,0x8b,0x63,0xf6,0x3a,0x4b,0xeb,0xf5,0x49,0x21,0x5c,0x5e,0x72,0xcc,0x78,0x48,0x8e,0xfe,0xef,0x13,0x1b,0x0c,0xdc,0xf8},
+            {0xf3,0xbc,0x29,0x94,0x74,0x5f,0xcb,0xbc,0x79,0x2d,0x90,0x5c,0xe1,0x85,0x89,0x78,0x81,0x4b,0xce,0xc9,0xa5,0xa0,0xa3,0xee,0xa4,0x91,0x3b,0xb8,0x79,0x39,0x37,0x8e},
+            {0xca,0xf6,0x34,0x5a,0x1b,0xc6,0x01,0x3c,0x42,0x89,0x33,0xfc,0xf1,0x51,0xee,0x36,0x6a,0x11,0xee,0x41,0x07,0x0c,0x3d,0xe2,0xa3,0xe5,0x03,0x6a,0x65,0x14,0x51,0x94},
+            {0xce,0x92,0xdd,0x81,0x70,0xfc,0x72,0x1b,0x8b,0xb6,0x9c,0x26,0x1c,0xd8,0x68,0xb8,0x2a,0x2d,0x1c,0xcc,0x55,0x6b,0xef,0x39,0x99,0x12,0x8a,0x3c,0x20,0xbd,0x7c,0x5a},
+            {0x45,0xe7,0x3d,0xf5,0x8d,0xe1,0xb2,0x6b,0xdc,0x1b,0x84,0x2b,0x5a,0x95,0x1d,0xa8,0x43,0x81,0x70,0x8c,0xd1,0x5b,0x40,0xea,0xb8,0x7a,0xd4,0x46,0x41,0x77,0x7c,0x6f},
+            {0x1a,0x57,0xc8,0xe0,0x1d,0x94,0xf7,0x45,0x57,0x19,0xc8,0x5c,0x66,0x2f,0x76,0x58,0x0b,0x9f,0x4f,0x53,0x0a,0xab,0xbe,0xce,0xe9,0xc5,0xab,0xe0,0x0f,0xd7,0xde,0xf4},
+            {0xc9,0x2b,0x46,0x79,0xc9,0x37,0x6d,0xf3,0xe4,0x1d,0x79,0x13,0x1f,0x42,0x96,0x1f,0xdd,0xcd,0xf9,0x9a,0xfd,0x2c,0x47,0x61,0x68,0xda,0xf9,0x65,0x7f,0x76,0x93,0x73},
+            {0x2a,0x28,0x93,0xa1,0x14,0xdf,0x26,0x30,0xe4,0xb3,0x2c,0x47,0xbd,0x60,0x61,0x2b,0x4f,0x3d,0x9b,0x04,0x89,0x1e,0x94,0x4a,0xf5,0x5f,0xd2,0x76,0x7d,0x26,0x03,0x14},
+            {0x98,0xdf,0xd8,0x6f,0x3b,0xb1,0xb5,0x6d,0x0e,0x5b,0x3d,0x0a,0x9b,0x32,0x27,0x64,0x2b,0x09,0xee,0x0a,0x2a,0xe7,0x8f,0x19,0xeb,0x50,0x4e,0xdd,0x1b,0xd9,0x1b,0xa1},
+            {0x2b,0xca,0x87,0x9a,0xd4,0x55,0x3c,0x14,0x06,0xe3,0x8a,0xb0,0x72,0xcd,0xa3,0x37,0x40,0xcf,0x16,0x81,0xf1,0x8e,0x7c,0xf5,0x48,0xce,0x04,0x05,0x28,0xfa,0x5d,0x05},
+            {0x5c,0x30,0x39,0x13,0x5e,0x50,0x30,0x9b,0xe3,0x29,0x25,0x59,0xfc,0x0f,0x0d,0x6a,0x5d,0xe7,0xab,0x28,0x03,0xc8,0x3f,0x20,0x6c,0x8c,0xfc,0xc0,0x66,0x83,0xb5,0x4e},
+            {0x7b,0x46,0xb2,0x3f,0x8c,0xa2,0xc4,0x5b,0xaf,0x61,0x24,0x16,0x50,0x30,0xa1,0xee,0x5f,0xc2,0x7f,0x1a,0xe3,0xd1,0x22,0x6d,0xef,0xb2,0x57,0x41,0x77,0xcf,0x72,0x8f},
+            {0xb3,0x7b,0x50,0x4c,0xcb,0xcc,0x5a,0xe9,0xf8,0xb7,0x87,0xfc,0xc8,0xda,0x19,0x4f,0xdd,0xa3,0xa2,0x5b,0x94,0xfb,0xf2,0x17,0x44,0x4c,0x13,0xfa,0x4a,0x08,0x63,0xd5},
+            {0x36,0xd5,0xd6,0x69,0xf4,0xaf,0xaf,0x60,0x3a,0x54,0x90,0x22,0x69,0x08,0x7a,0x0f,0x65,0xf8,0x99,0x62,0xf8,0x7b,0xa0,0x3b,0xe5,0x6b,0x55,0x2b,0xf0,0x4c,0xe8,0x1f},
+            {0xf5,0x7f,0x94,0xaf,0xfb,0xe4,0x64,0xd8,0x76,0x23,0x53,0x51,0xbd,0x20,0x66,0x0a,0xd5,0x89,0x6e,0x5f,0x5b,0xd3,0x89,0x78,0xd6,0x43,0x46,0x56,0x4a,0x08,0x97,0x54},
+            {0x46,0x37,0xea,0xce,0xc3,0x7d,0xc5,0x77,0xf7,0xd0,0xc7,0x80,0xce,0x46,0xa5,0x7d,0xe6,0xda,0x9b,0x51,0x73,0xf4,0xd0,0x62,0x69,0x63,0xaf,0x48,0x0b,0x95,0x21,0x3b},
+            {0xe2,0x22,0x95,0xa0,0x99,0x58,0x37,0xf7,0x30,0xcf,0x99,0xe9,0x46,0x5b,0x0e,0x5c,0x41,0xc1,0xf4,0xa9,0x94,0x56,0xf6,0xb2,0x7d,0x26,0xd6,0x6b,0x8e,0xf2,0xc4,0xbf},
+            {0x33,0xd0,0x1f,0xca,0x1b,0xb7,0x1c,0x53,0xd1,0x31,0xb7,0x57,0xaf,0xe6,0xd9,0x73,0x42,0x00,0x66,0x94,0xae,0x75,0x2c,0x17,0x74,0x7a,0x46,0x17,0x17,0xf4,0x2f,0x8d},
+            {0xed,0x23,0x9b,0x46,0xbc,0xf7,0xf8,0xa6,0x6b,0x92,0xc1,0x51,0x35,0x48,0x8e,0x12,0x49,0xf6,0x68,0x62,0x5c,0x6f,0xd0,0xa0,0x8a,0x0f,0x49,0xc7,0x33,0x80,0x6d,0xe0},
+            {0x32,0x4c,0x9a,0x8f,0xbc,0x52,0x7d,0x9e,0x93,0x57,0x59,0x5b,0x1b,0x35,0x09,0x84,0x78,0x47,0xf3,0x40,0xcd,0x55,0x7b,0x93,0x05,0xe7,0x8f,0xa2,0xba,0x96,0x3b,0xe4},
+            {0x2f,0xc5,0xf4,0x08,0x9b,0x8b,0x63,0x75,0xa4,0x1b,0xb7,0x02,0x57,0xbe,0x32,0x81,0xcd,0xd3,0x27,0x78,0xdb,0x05,0x66,0x3c,0x55,0xf9,0x6c,0xbe,0xb9,0x76,0xef,0x1c},
+            {0x69,0x1f,0xc9,0xf8,0xe0,0xe0,0xfd,0x9c,0x0a,0x0f,0x42,0xf1,0x7f,0x33,0xea,0x83,0xc3,0x46,0x2e,0x35,0xd7,0x77,0xdd,0x54,0x73,0x41,0x08,0xbf,0x27,0x3b,0x5a,0x4f},
+            {0xe2,0x1e,0x3a,0x56,0x56,0x55,0xf1,0xf5,0x8e,0xbd,0xb4,0x21,0xc9,0x41,0x10,0xe1,0x9a,0x55,0x03,0x07,0x77,0xdb,0xbe,0x45,0x5e,0x35,0x08,0x68,0x02,0x0a,0x57,0x4a},
+            {0x2c,0x3e,0x5c,0x57,0x91,0xcb,0x68,0xbb,0x21,0x77,0x33,0x2f,0x5b,0x79,0xc8,0xf7,0xd1,0xcf,0x4a,0x57,0x7a,0x90,0x3a,0xcf,0x22,0x5a,0x0d,0x11,0xe4,0x5a,0xa5,0xc5},
+            {0x57,0x07,0x10,0x0b,0xd5,0xa9,0x78,0xef,0x7f,0xe1,0xde,0xf6,0xba,0x89,0x5a,0xd3,0x88,0x46,0x6a,0x4d,0xb1,0x36,0x79,0xa8,0x99,0xc9,0x3b,0xcb,0x80,0x2d,0x3a,0x7f},
+            {0xfb,0x53,0x7a,0x7e,0x26,0x38,0x4e,0xa9,0x86,0x7a,0xd9,0xac,0x84,0x50,0x67,0x55,0x3c,0x14,0x61,0xf5,0xc7,0x5a,0x5b,0xd5,0x0d,0xf1,0xaf,0xe4,0x0b,0x06,0x3b,0x1c},
+            {0xaf,0xea,0x4f,0xc1,0x19,0x96,0xd2,0x55,0x2a,0x83,0xa4,0xb7,0xbe,0xc5,0x86,0xc9,0xdb,0xf3,0x34,0x6c,0xf2,0xb3,0xee,0x7a,0x86,0x2b,0x8f,0x6c,0xcf,0x16,0x35,0x22},
+            {0x67,0xa8,0x3e,0xb6,0x6b,0x43,0x85,0x19,0xcd,0x92,0xe6,0x96,0x25,0x66,0xf3,0xd1,0x27,0x73,0x95,0xd2,0xed,0xfc,0xec,0xdb,0x06,0x56,0x5e,0x33,0xb9,0xb4,0x20,0x0e},
+            {0xa7,0x63,0xa7,0x31,0xe9,0xfd,0x04,0xd5,0xef,0x02,0xae,0xf4,0xe7,0xcd,0xc1,0x72,0x6a,0x34,0xc7,0xa0,0x48,0xcd,0x78,0xc4,0x5d,0xdf,0x9f,0x05,0xc5,0x27,0x73,0xbe},
+            {0xc9,0x92,0xb2,0x6e,0x5d,0x9f,0x56,0xc3,0xf1,0x61,0x5f,0xe3,0x0f,0xd5,0xd4,0xa7,0x0d,0x63,0x9e,0x19,0x25,0x83,0xe5,0x79,0x29,0x09,0xba,0xad,0x86,0x95,0xe9,0x0f},
+            {0x5f,0x63,0xa2,0xab,0xf7,0xfd,0xe8,0x74,0xa2,0x60,0xf4,0x69,0xf5,0x6f,0x73,0x92,0xc7,0x15,0xf4,0x35,0x81,0xfa,0x0e,0x0a,0xd9,0x95,0x22,0xdd,0xe7,0xc0,0x47,0xda},
+            {0x2d,0x92,0xeb,0xb9,0x98,0xb2,0x64,0xb0,0xc7,0xfe,0x1d,0x9d,0xc9,0x4c,0x8f,0x3a,0xc1,0x71,0xf3,0x1a,0x38,0x86,0x7e,0xef,0xd8,0x68,0x72,0x16,0x34,0x2a,0xd4,0xac},
+            {0x36,0x75,0x8f,0xd2,0xcd,0xdf,0xa3,0xf6,0xc1,0x65,0x8a,0x64,0x95,0x08,0x72,0x7e,0xde,0x3d,0xb0,0x0c,0x36,0xb5,0xa6,0x19,0x26,0x02,0x12,0xb5,0x0b,0x3e,0x5d,0xa7},
+            {0x19,0x23,0x7f,0x81,0x84,0xa4,0x02,0x16,0x54,0x2e,0x1f,0x32,0x65,0x27,0xf7,0xe5,0x12,0xad,0xa4,0xff,0x99,0x23,0x38,0x0f,0x9a,0x7a,0x7e,0x73,0xa0,0xc4,0xab,0xa1},
+            {0x3f,0x2d,0x55,0x16,0x38,0xa0,0x7d,0x4c,0x6b,0x03,0x26,0x5f,0x13,0x1a,0xda,0xe2,0x63,0x9d,0x16,0x00,0xa9,0xf3,0x1a,0x33,0x7d,0x55,0x61,0xbc,0x22,0xc4,0x1a,0xf6},
+            {0x21,0x2a,0x38,0x41,0x88,0x5d,0x58,0x90,0xd5,0x3c,0x69,0x8b,0xfc,0x2e,0xe6,0x11,0x4c,0x13,0xed,0x46,0x36,0x48,0x3f,0x65,0xbf,0x9f,0x43,0xe2,0xa2,0x3c,0x2d,0xc7},
+            {0x30,0xc6,0xc4,0xfe,0xde,0x61,0xdd,0x96,0x45,0x88,0x58,0x63,0x38,0xca,0xce,0xe4,0xe0,0xef,0x89,0x77,0xb5,0x56,0xb4,0xfc,0x10,0x4f,0xcb,0x61,0x20,0xd4,0x5d,0x3e},
+            {0x41,0x39,0x81,0xcd,0xcd,0x84,0x28,0xb9,0xe7,0x6a,0x34,0x01,0x0c,0x95,0xf8,0x10,0xed,0x5f,0x39,0xee,0x66,0xed,0xfc,0xda,0x92,0xab,0x0a,0xd9,0x4f,0x03,0x08,0x71},
+            {0xc7,0x0a,0x24,0xba,0xd2,0x6c,0xd8,0x71,0xd8,0x2a,0xa4,0x56,0x31,0x99,0xce,0x82,0xef,0x8d,0x00,0xce,0xbc,0x48,0xa1,0xcd,0x69,0x8e,0xe1,0x93,0x3a,0xc8,0xb6,0xa1},
+            {0xd2,0x28,0x07,0x7b,0x8f,0x08,0x94,0x2f,0x4f,0x5c,0x44,0x5f,0x54,0x31,0xf6,0xa3,0x88,0xd8,0xde,0xc1,0x22,0x47,0x1f,0x8c,0x24,0xa5,0x6a,0xc1,0x58,0xc9,0x07,0x42},
+            {0x6d,0x25,0xf5,0x0e,0xe6,0x5f,0xc7,0xf4,0x6a,0x86,0xe1,0x74,0x2f,0x30,0xaf,0xc9,0xb9,0x53,0x6b,0x65,0x76,0x2f,0x75,0xd9,0xbf,0xd1,0xf9,0xca,0x30,0xdf,0x1d,0x75},
+            {0x2a,0x7a,0xc6,0xf4,0xb9,0x88,0x49,0xeb,0x4d,0x69,0x62,0xc4,0x24,0xe9,0x15,0x37,0x96,0x73,0x50,0xcc,0xb6,0x0c,0x5c,0xad,0x40,0x40,0x0d,0x46,0xfb,0x0d,0xc3,0xd6},
+            {0x00,0x27,0x21,0xd6,0xc4,0x30,0xad,0x95,0x3c,0x91,0x25,0xda,0xc7,0xb4,0x23,0x5a,0x3f,0x5e,0xdf,0x80,0x30,0x9b,0x23,0xfe,0x9e,0x19,0x7d,0x0e,0xf1,0x2a,0xb0,0xe2},
+            {0x54,0x64,0x57,0x3c,0x76,0xaa,0x26,0xe9,0x8b,0xa4,0x51,0x80,0xd7,0x78,0x3b,0xf8,0x3a,0x1e,0xc7,0x93,0x9c,0x8f,0xd8,0xa2,0x10,0xd6,0x35,0x22,0x5e,0xa1,0xef,0x42},
+            {0x18,0x39,0x5b,0x65,0xb1,0xa4,0x63,0x58,0xec,0x08,0x5b,0xaf,0xcc,0x87,0x37,0x06,0xfb,0x48,0x28,0x66,0xf5,0x4e,0x02,0xe0,0x42,0x52,0x2c,0xa0,0x9f,0xf0,0x45,0x2b},
+            {0xf4,0xff,0x00,0x49,0xdc,0x8e,0x5a,0x4f,0x06,0xc6,0x27,0x4a,0x1b,0xcd,0xbf,0x8b,0x5f,0x8b,0x84,0x1f,0x92,0x1a,0x26,0x4e,0xa5,0xbf,0xf3,0x29,0x37,0x8f,0xd6,0x20},
+            {0x19,0xbd,0xc0,0x9f,0x26,0x64,0x5d,0x82,0xea,0x05,0xcd,0x1f,0xa0,0xff,0xaa,0x68,0x88,0x5c,0x66,0x53,0x0b,0x3f,0x0e,0xb0,0x5c,0xaa,0x55,0xb8,0x8a,0xee,0x4e,0xfa},
+            {0x6e,0x74,0x90,0x13,0xac,0xa9,0x7a,0x5e,0xf3,0xb1,0x56,0xda,0x4d,0xc6,0x21,0xbf,0xef,0xa7,0xe0,0x18,0x6e,0x5e,0x47,0x80,0xc3,0x13,0x32,0xf9,0xc6,0x2a,0xc7,0xf7},
+            {0x83,0x80,0x0e,0xcc,0x69,0x22,0xe2,0xa6,0xec,0x0c,0x34,0xc1,0x73,0x6a,0x12,0xf2,0xdf,0xcd,0x94,0xeb,0x9f,0x27,0xc6,0x94,0x8a,0x5b,0x28,0xd9,0x61,0xbc,0x4a,0xe9},
+            {0x86,0xb6,0xfe,0x29,0x35,0xf0,0x20,0x60,0x83,0xc9,0x52,0xc0,0x7e,0xa3,0x8c,0x25,0x38,0x89,0x55,0xeb,0x8a,0x80,0x6c,0x10,0xb6,0x9d,0x3e,0x52,0xd6,0xec,0x26,0xe5},
+            {0xc7,0xdb,0x87,0x0f,0x8b,0x09,0xb9,0x49,0x8d,0x39,0xb2,0x2d,0x82,0x8b,0x60,0xa8,0x06,0xf7,0xa1,0xde,0x69,0x4c,0x43,0xd6,0xbd,0x29,0xf3,0xd7,0x6a,0x11,0x67,0x7d},
+            {0xb0,0xa5,0x80,0x97,0x35,0xc8,0x3a,0xf8,0xe2,0xa3,0xee,0xb9,0x3d,0xa6,0x82,0xbc,0xe9,0x5a,0x69,0x93,0x92,0xc0,0xc4,0xab,0xc8,0xd3,0x91,0x88,0x56,0x3e,0x38,0x1f},
+            {0x63,0xaf,0x21,0xf2,0xf1,0xf8,0x2d,0x31,0x20,0xe4,0xd8,0xd9,0x8e,0x7f,0xda,0x2d,0x9f,0x39,0xd1,0x02,0xc5,0x7d,0x9c,0x41,0x11,0xd0,0x70,0x79,0xa9,0xff,0xcd,0x47},
+            {0xad,0x65,0x4b,0x3e,0xd5,0xa1,0x1b,0x9a,0x2a,0x52,0xfb,0xb8,0xdd,0xa4,0x7e,0x91,0xa7,0x2e,0x4b,0x7b,0xac,0x3a,0x4a,0xd7,0x5c,0x07,0x47,0x86,0xf1,0x4c,0x04,0x6f},
+            {0x6d,0x9c,0x4a,0x44,0xbf,0x22,0x64,0x8c,0x07,0x88,0x1e,0x2e,0x92,0xa8,0x1f,0xfe,0x00,0x2c,0x01,0x77,0xd9,0xc7,0x89,0x24,0x16,0xce,0x01,0xed,0x1f,0x69,0x38,0x72},
+            {0x16,0xf2,0x79,0xdb,0xb7,0xb3,0xf6,0xc3,0xd4,0xf1,0x90,0xb3,0x6f,0xe2,0x28,0x3e,0xfd,0x5f,0xe4,0x66,0x9a,0x8f,0x70,0xd2,0x09,0xee,0xed,0x96,0xbf,0x55,0x90,0x7c},
+            {0xf7,0x9a,0x83,0x86,0x76,0x14,0xdc,0x4d,0x2e,0x47,0x35,0x3f,0x53,0xcb,0x5a,0x83,0x35,0x82,0x44,0x63,0x29,0xdb,0xe4,0xd5,0xe8,0xdf,0x94,0x1b,0x09,0x26,0xdc,0xb5},
+            {0x0c,0xeb,0xcc,0x9e,0xa3,0x72,0x94,0x87,0xc1,0xb2,0x0a,0xdb,0x8e,0xaf,0xc6,0xfb,0x13,0x98,0x71,0x0f,0xf6,0x17,0x9a,0x7f,0xda,0xfb,0x19,0x85,0xe5,0xf4,0xa8,0xe8},
+            {0x5a,0x53,0xe4,0x73,0xfd,0xa8,0x8a,0x9f,0xd8,0x18,0xde,0xfd,0xc2,0xc8,0xe6,0x8b,0xce,0xa0,0xc5,0xae,0xde,0xd0,0xc1,0x91,0x0d,0x60,0x04,0xb0,0xe7,0x7a,0xce,0x89},
+            {0xf9,0x79,0x65,0x89,0x4c,0x4a,0x29,0x6f,0xca,0x42,0x90,0x52,0x42,0xa2,0x72,0x28,0xe5,0xa9,0xa0,0x15,0x0d,0x31,0xa5,0x5e,0x65,0xd6,0x37,0xdc,0xb9,0xe6,0x0a,0xc1},
+            {0xec,0x72,0xe9,0xe2,0xfe,0x2f,0x4a,0xb9,0xdb,0x10,0xb7,0x07,0x50,0x12,0xc9,0xe7,0xcd,0x2a,0x4e,0xc0,0x2b,0x4c,0x3b,0x76,0xdf,0x17,0xf6,0xeb,0x27,0x34,0x8c,0xa2},
+            {0xa4,0xe9,0x29,0x00,0xf9,0xf5,0x49,0x0b,0x66,0xe2,0x1f,0xb6,0x6c,0x0a,0xe0,0x94,0xd1,0x06,0xee,0xd5,0x36,0x6a,0x85,0x41,0x8a,0x86,0xa8,0xa3,0xf8,0xf8,0x7a,0x28},
+            {0x22,0x5f,0x9b,0x50,0xf6,0x4a,0x97,0xb9,0xea,0xdb,0x62,0x56,0x62,0xb1,0xa3,0xe1,0xb4,0x00,0xeb,0x86,0xce,0xe5,0x0f,0xec,0x8c,0x62,0x26,0x00,0x27,0xb4,0xd3,0x90},
+            {0x7c,0xd4,0x97,0x1b,0x0e,0x54,0x53,0xd2,0x10,0xc0,0x97,0x90,0x44,0x80,0x40,0x3b,0xd5,0x3c,0x68,0x9c,0x19,0xd5,0x2e,0x4c,0x6a,0x37,0x92,0x5d,0x14,0xe4,0x27,0x2d},
+            {0x3e,0xda,0xf6,0x1b,0xe8,0xb6,0xcf,0xa0,0x6e,0x1d,0x42,0xd7,0xab,0xd2,0xdf,0x32,0x03,0x3b,0xf6,0x3c,0xd1,0x4d,0xf8,0xbb,0x3c,0xe3,0x37,0xe6,0x2a,0x82,0x2f,0x16},
+            {0x89,0xfd,0x8d,0x0e,0x59,0xd8,0xd7,0x57,0xb7,0xb8,0xa2,0xc3,0xa2,0xb8,0x26,0xe7,0x99,0xc0,0x28,0xdf,0x16,0x6b,0x68,0x97,0xa4,0x2f,0x08,0xf2,0x28,0x4d,0x3b,0xdd},
+            {0x0a,0xa2,0xfc,0xdd,0x4e,0x83,0xa4,0x39,0x5c,0xb5,0xf5,0x14,0xe1,0xef,0x61,0xad,0x4b,0xb5,0x17,0xd7,0xc6,0x0f,0x81,0xbe,0xa0,0x30,0xd5,0x19,0x1c,0x3c,0x79,0xb7},
+            {0x80,0xa2,0x75,0xdd,0xf6,0xca,0xa4,0xbe,0xf4,0x03,0x98,0x60,0xd4,0xc5,0xb0,0xc4,0xbd,0x10,0x09,0x95,0x3c,0x19,0xec,0x2c,0x63,0x29,0x4a,0xd2,0xc5,0xc5,0x6d,0x1d},
+            {0xe8,0x5d,0x45,0x08,0x59,0xd7,0x02,0xa0,0x47,0x33,0x63,0x07,0x0a,0x6e,0x56,0xd5,0x02,0x1e,0xbd,0x11,0x11,0x23,0x2f,0x2a,0xf2,0x8a,0x60,0x96,0x3a,0xcd,0xac,0x16},
+            {0x54,0xd4,0x80,0x12,0xbd,0x8a,0xf6,0x61,0xba,0xae,0x94,0x0f,0xb6,0xf0,0xd1,0x03,0x48,0x13,0x7c,0xbb,0x13,0xc6,0x50,0x62,0x6f,0x42,0x05,0x1e,0xde,0x55,0xec,0x8f},
+            {0xbd,0xb3,0xa9,0xbe,0xd2,0x44,0x20,0xaf,0xc6,0xeb,0x80,0x93,0x06,0x94,0xb4,0xaf,0xe0,0x99,0x23,0x18,0xe4,0x94,0x28,0x15,0x6a,0xcd,0xba,0x57,0x62,0xc6,0x9e,0x16},
+            {0xcd,0x27,0x79,0x85,0xe4,0xb4,0xc3,0x0a,0x19,0x99,0xe5,0xbf,0x7b,0xf7,0xd1,0xcc,0x90,0x36,0x40,0xa0,0x46,0x78,0xa9,0x3e,0xfa,0xac,0x1f,0x9b,0xb5,0x48,0x2d,0xea},
+            {0xd1,0x31,0x9c,0x68,0x62,0xfe,0xb7,0x6b,0xe1,0x1c,0x08,0x9c,0x75,0x3f,0x62,0x87,0x35,0x19,0xec,0x29,0xa0,0xc8,0x3b,0x18,0x6e,0xfe,0x57,0xf5,0x0c,0x4e,0x34,0x2b},
+            {0x16,0x62,0xd8,0xe6,0xdb,0x30,0x97,0x00,0x07,0x1a,0x80,0x1a,0x3d,0x06,0x6c,0xe9,0x7f,0x94,0x2a,0xbc,0xe2,0x41,0xc8,0x08,0x5f,0x3c,0x02,0x32,0x58,0x92,0x7e,0xb9},
+            {0xe1,0x79,0xe0,0x18,0x70,0x5e,0xb4,0xa4,0x9f,0xfa,0x4e,0x52,0x71,0xdd,0xaa,0x4f,0xe1,0x27,0x30,0x29,0xb5,0x21,0xae,0xa7,0xa6,0x9f,0x8f,0x3b,0x76,0x4a,0xe0,0x17},
+            {0x0e,0x73,0x47,0xcd,0xb1,0x54,0xf6,0xd9,0x6f,0xc8,0xf9,0xeb,0x89,0x91,0xd4,0x14,0x9f,0xbb,0x21,0xaa,0x32,0x70,0xc2,0x1f,0xa5,0xdf,0x61,0xca,0x14,0x0a,0x4f,0xe1},
+            {0x34,0xf1,0x82,0xc2,0xf4,0x4f,0xab,0x5a,0xc9,0x40,0x35,0x43,0x49,0x3b,0xe5,0x00,0x68,0x14,0xb2,0x37,0x9e,0x0e,0x6b,0x76,0x03,0xd9,0xe0,0xfe,0x76,0x39,0x03,0x67},
+            {0x5d,0x71,0x0a,0x97,0x0b,0xa0,0x07,0xbf,0xfb,0xec,0xdf,0x12,0xd1,0xc9,0x20,0xfb,0xda,0x1f,0x57,0x02,0x37,0x19,0xd5,0x06,0x82,0x5e,0x08,0x95,0xa2,0xaf,0xfc,0x49},
+            {0xb9,0x9e,0x0f,0x31,0x83,0x86,0xf9,0x0d,0xf9,0x6c,0x1d,0x1c,0xd4,0xdc,0x5b,0xbe,0x47,0x26,0x41,0x0f,0x32,0x7e,0xcc,0x10,0x81,0x08,0xad,0x89,0x8e,0x45,0x0e,0xb5},
+            {0x7e,0xb9,0xae,0x1f,0x66,0xa6,0xbd,0xc4,0x48,0x21,0x75,0xd0,0x31,0xbd,0x6a,0xf2,0x70,0xfe,0x4f,0xf8,0xed,0x11,0x38,0x20,0x0d,0x6e,0xb4,0x9e,0x13,0xc0,0xb8,0xe8},
+            {0xc5,0x08,0xf2,0x59,0x17,0x9f,0x67,0xbb,0x6e,0x05,0xf2,0xb9,0xc5,0xc5,0xea,0x75,0x1f,0x3a,0x01,0x3e,0xb9,0x25,0xc6,0xbf,0xcc,0x2a,0x26,0x24,0xb9,0x62,0xe0,0x59},
+            {0xf3,0xd0,0xda,0xb6,0xf1,0xd3,0x0c,0xe7,0x4c,0x97,0xb8,0x9f,0x55,0x1c,0xe0,0x82,0x0b,0xeb,0xad,0x2b,0xc1,0xcb,0xf4,0xa4,0x49,0xb1,0x1d,0x54,0x08,0xcb,0xc1,0x40},
+            {0xc1,0x16,0xf6,0xb0,0xa0,0x85,0x2a,0x30,0xc8,0xa9,0x13,0xf9,0xe0,0xf1,0x68,0x0f,0xf1,0xbe,0x06,0x16,0x5e,0x19,0xea,0xc4,0xd0,0x0c,0x4e,0x42,0x6c,0xa9,0xb6,0xb3},
+            {0x25,0xdf,0x12,0x2c,0xff,0xe5,0x3a,0xb8,0x8e,0xcb,0x94,0xab,0xae,0x69,0xe0,0xa1,0xd4,0x32,0x3e,0xad,0xb7,0x53,0x7c,0x5e,0x48,0x94,0xc0,0xe0,0x82,0xd5,0x85,0x29},
+            {0xa3,0x0d,0x97,0x48,0x5d,0x41,0x62,0xe9,0x10,0xb1,0x2e,0xff,0xc5,0x49,0x37,0x42,0x21,0x21,0x7c,0x21,0x6b,0x0a,0x94,0x87,0xe5,0xa0,0x7f,0xf1,0xfc,0xa8,0x35,0xb8},
+            {0x5d,0xff,0xc6,0x38,0x18,0x98,0x3f,0x6a,0x7d,0xb2,0xab,0x65,0xd6,0x21,0x81,0x9b,0xe9,0xf9,0xed,0xac,0x58,0xdf,0x38,0x57,0x18,0x87,0xcb,0xa2,0x2a,0xaa,0xf1,0xcf},
+            {0xf0,0x42,0xfb,0x4e,0xb0,0x1d,0xde,0x4b,0x28,0x5f,0x2d,0xf3,0x28,0xf1,0x91,0xd2,0x06,0x21,0xb6,0x6d,0x76,0x30,0xd7,0x69,0x1e,0x7c,0x69,0xd9,0xdc,0xc0,0x4a,0xaa},
+            {0xd4,0x19,0x0e,0x2b,0xf1,0x0a,0xa9,0x80,0x0a,0x1c,0x23,0x95,0xc0,0xc4,0xa3,0x87,0x37,0xc2,0x1f,0x8b,0xc4,0x2d,0xff,0xb2,0x3a,0xdd,0xf7,0x62,0xff,0x30,0x9a,0xa6},
+            {0x47,0x45,0xeb,0x0e,0x77,0x1c,0x9f,0x21,0x44,0xff,0xd4,0xab,0xf3,0x9e,0x63,0xcf,0x6d,0x0e,0xbe,0x12,0x2d,0xf5,0xf3,0x2a,0xe3,0x99,0xcc,0x15,0xfe,0x3f,0x70,0x11},
+            {0x80,0x6c,0x6f,0xab,0xb4,0x05,0x9c,0x51,0x86,0x5f,0x72,0x3a,0xe6,0x19,0xe0,0xc5,0x57,0x18,0xf9,0x73,0x68,0x0c,0xe7,0xeb,0x84,0xc4,0x9b,0x93,0x5f,0x59,0xff,0x02},
+            {0x33,0x52,0xad,0xd4,0x92,0xd3,0xa7,0xfa,0x9e,0xe0,0x46,0x04,0x0a,0x3f,0x77,0x95,0xec,0x37,0x5a,0xf8,0x75,0xc8,0x7e,0xdf,0xdb,0x0b,0xc8,0x76,0xba,0x14,0xfb,0x3b},
+            {0x27,0xda,0xca,0xc0,0x35,0x94,0xca,0xe3,0xdb,0x57,0x55,0x04,0x10,0xbd,0x0f,0x8d,0x16,0x68,0x63,0x99,0x28,0x95,0x54,0x8f,0x6a,0xb7,0x82,0xa8,0x33,0x24,0x62,0xc6},
+            {0x17,0x08,0x39,0x6a,0x07,0x92,0xc2,0xa3,0x3b,0x81,0x74,0xdd,0x95,0x0c,0x4a,0x59,0xff,0x06,0xe9,0x69,0xdb,0x87,0x3e,0xaf,0x2a,0x7d,0x82,0x45,0x3e,0x23,0x3b,0x99},
+            {0x56,0x80,0x17,0x4e,0x17,0x2d,0xdb,0xe6,0x94,0x3c,0xed,0xe9,0x8f,0x8d,0x85,0x4d,0xab,0xb6,0x6b,0xa6,0x5e,0x33,0x49,0x88,0x9c,0xd6,0x26,0x2c,0xdf,0x46,0x2a,0x80},
+            {0x49,0x60,0xf0,0xa4,0xc4,0x62,0x86,0xd6,0x2e,0x5b,0xae,0x02,0x1d,0xa9,0x23,0x6e,0xd0,0x25,0x8f,0x6c,0x4c,0x77,0x9e,0x17,0x97,0xa9,0xe6,0x6a,0x47,0x80,0x3f,0x0a},
+            {0x06,0xaf,0x18,0x49,0x93,0x15,0xd7,0xdd,0x1c,0x8d,0x16,0x53,0x3f,0x0e,0x13,0x46,0x5d,0x60,0x6f,0xea,0x29,0x46,0x11,0x5f,0x23,0x73,0x5f,0x3f,0xe2,0xf6,0xd8,0x82},
+            {0x73,0xb0,0xee,0x02,0xde,0x1c,0x3c,0x8a,0x9b,0x2b,0xb8,0xa9,0xc4,0x87,0x05,0xc9,0x4d,0xf7,0x6c,0x9c,0x2d,0x68,0xa2,0x22,0xc8,0x49,0x38,0x48,0xc7,0x53,0x27,0xad},
+            {0x42,0x04,0x4a,0x69,0xf9,0x1d,0x56,0xcf,0x8b,0x99,0x31,0x66,0xdc,0x1c,0x72,0x4e,0xc7,0xd3,0x11,0xef,0xf0,0x1c,0x82,0x55,0x98,0x7c,0xf5,0x63,0xd5,0x8f,0xa5,0xa2},
+            {0x18,0x73,0x82,0x20,0x9c,0xf9,0xb4,0x5c,0x1d,0xf5,0x65,0x58,0x01,0xa6,0x51,0x46,0x38,0x54,0xa6,0x49,0x5a,0x7a,0xa3,0x03,0x88,0x7d,0x65,0xad,0x0e,0x5b,0x91,0x5f},
+            {0x3e,0x44,0xb6,0x09,0xa8,0xf9,0x7e,0xa0,0xb4,0x12,0xab,0xf8,0x8d,0x77,0x48,0xed,0xfa,0x62,0xb7,0xce,0xaa,0x17,0x4b,0xae,0x00,0x8e,0x50,0x8b,0x1b,0x13,0x3e,0x7e},
+            {0xd7,0xb1,0xc0,0xb1,0xbb,0x02,0xa6,0x41,0x1e,0xeb,0x88,0x8a,0xe2,0x6b,0xef,0x44,0xc2,0x03,0x64,0x11,0x3b,0xcf,0xc1,0xa4,0xa3,0x41,0x03,0x96,0xcb,0x52,0xb9,0x50},
+            {0x55,0x34,0xba,0xfc,0xac,0x19,0x9f,0x54,0xa4,0x8f,0xa7,0x13,0xc6,0xf7,0xce,0x05,0x68,0xab,0xb1,0x1b,0x34,0x1e,0x38,0xb4,0xa9,0x68,0xbd,0xdb,0xff,0xff,0xa5,0x07},
+            {0x84,0x04,0x47,0x86,0xd9,0xf2,0x86,0xe2,0x41,0x17,0x47,0x96,0x07,0x3f,0xa4,0x7c,0xe2,0x5c,0x15,0x46,0x16,0xba,0x27,0xbc,0xca,0x69,0xfe,0xe1,0x48,0x29,0x42,0xe1},
+            {0x45,0xeb,0x47,0x56,0xd3,0x89,0x5f,0xff,0xeb,0x91,0x3b,0xfe,0x14,0x97,0x46,0xf5,0x6e,0x18,0x4f,0x4c,0x33,0x6d,0xad,0x29,0xf6,0xf8,0x1f,0xc2,0xa3,0xc0,0x16,0x8f},
+            {0xb5,0x83,0x37,0x4f,0xc4,0x76,0x29,0xa3,0xf1,0x74,0x76,0xf4,0xc9,0xc7,0x51,0xe8,0x51,0xb7,0xc4,0x88,0x1e,0xda,0x50,0xe4,0xbe,0xad,0x35,0xaf,0xb7,0x78,0x08,0xb5},
+            {0x4a,0x99,0xc3,0x2e,0x81,0xaa,0x36,0xe8,0x24,0xbc,0x4b,0xe7,0x84,0x95,0x45,0x80,0x20,0xb1,0xfa,0xa4,0x7d,0x55,0x8e,0x72,0x63,0xf2,0xc0,0x47,0x7a,0x16,0xe6,0xd8},
+            {0x88,0x8b,0x7d,0x3a,0x32,0xf4,0x56,0x6f,0x21,0x40,0x7c,0x25,0x1b,0x75,0x3b,0x38,0x90,0x60,0x40,0x01,0xdb,0x91,0xf8,0x8d,0x45,0x77,0x3b,0xd8,0xa5,0x3b,0x25,0x41},
+            {0x53,0xeb,0x65,0xe5,0xb4,0x25,0xe7,0xac,0xd5,0x6e,0xe6,0x23,0x4e,0xbf,0x3d,0x40,0xd8,0xfc,0x45,0xa3,0xda,0xb9,0x96,0x8e,0xf4,0x27,0x3c,0xee,0x30,0x7c,0x38,0xa9},
+            {0x4b,0xec,0x26,0x59,0xf8,0x65,0xdf,0xae,0x69,0x86,0x2e,0x12,0x8e,0x71,0x06,0x80,0xf6,0x11,0x48,0x66,0xb3,0x47,0x8d,0xe2,0x57,0xaa,0x5a,0xc5,0x96,0xa6,0x65,0x55},
+            {0x54,0x3c,0xbc,0x31,0xd2,0x71,0xc1,0x0c,0xab,0xc9,0x41,0x7a,0x4d,0x4b,0x6d,0xce,0x2d,0xac,0x73,0xc2,0x0f,0xf2,0x9b,0xff,0xfb,0xbe,0x55,0x58,0x4e,0x53,0x29,0xa1},
+            {0x49,0x70,0xe6,0x46,0x9f,0x1a,0xce,0x57,0x97,0x11,0x03,0xd1,0xcb,0x23,0x24,0xb5,0x95,0xff,0x12,0xe3,0x45,0x04,0xef,0x82,0x49,0x97,0x1c,0x76,0x29,0x6b,0xf5,0x78},
+            {0x01,0x08,0x10,0xa2,0x12,0x05,0x38,0x47,0x41,0x81,0x2f,0xe9,0x84,0x89,0xcd,0x73,0x69,0xd9,0xf6,0xfd,0x9e,0x68,0x18,0xb1,0x1d,0xea,0x07,0xc7,0x8a,0x90,0x73,0xb1},
+            {0x61,0x14,0xe3,0x2f,0xef,0xd5,0x4c,0x1c,0x23,0x52,0xdd,0xf9,0x32,0x77,0x27,0xbb,0x6a,0x34,0xa9,0xd8,0xb3,0xb7,0xd0,0x1c,0xe5,0x9c,0x6e,0x0d,0x32,0x70,0x0c,0x7f},
+            {0xec,0xc7,0x24,0x8b,0x70,0x93,0x67,0x8e,0x7e,0x0a,0xe5,0x83,0x33,0xdc,0xef,0x0e,0xaa,0x18,0xe3,0xaf,0x26,0x1b,0x2d,0x17,0x22,0xd2,0x9a,0xca,0xcc,0xe2,0xb8,0xf5},
+            {0x0d,0xc7,0x4b,0x6f,0x19,0xb2,0xbb,0xf2,0xf0,0xe7,0xf5,0x11,0x44,0x0d,0x4d,0xbb,0xc6,0x79,0x52,0x05,0x0b,0xd1,0xd9,0x62,0x51,0x6b,0x68,0x3f,0xf6,0xf9,0xec,0x9b},
+            {0xfb,0x84,0x47,0xff,0x1d,0x52,0x00,0xc3,0xac,0xc7,0x68,0x99,0x27,0x05,0xd2,0x10,0x8c,0x37,0xd6,0x1b,0x04,0x51,0xc7,0x47,0x43,0x04,0x80,0x3e,0x76,0xcc,0x09,0xe2},
+            {0xf7,0xf2,0x22,0xb4,0x4c,0x49,0xd2,0xd9,0x27,0xfc,0x2e,0x34,0x5d,0x64,0xe2,0xf0,0xed,0x5f,0x9a,0x60,0x27,0x58,0xfc,0x5f,0x5c,0xcc,0x73,0xd3,0xb0,0x87,0xf8,0xbc},
+            {0x29,0x5f,0xcc,0x7e,0x7f,0xcb,0x60,0x1b,0x3e,0x79,0xc1,0xfe,0x40,0x3f,0x92,0x0b,0x62,0x2b,0xde,0x0f,0x49,0x75,0x41,0x9c,0x36,0x41,0xc4,0xd4,0x32,0xde,0x8f,0x50},
+            {0xe0,0x16,0xf0,0x42,0xfe,0xa1,0xd9,0x3f,0xcd,0x4b,0x23,0x26,0xb3,0xef,0x60,0x51,0xe2,0x93,0xb4,0xab,0xd0,0x66,0xb3,0xfa,0x5c,0x43,0x0e,0xe7,0x77,0x3e,0x44,0x3c},
+            {0x7c,0x83,0x47,0xfa,0xa1,0xad,0x96,0x16,0x9f,0x56,0x50,0xa1,0xd1,0x38,0xcb,0x10,0xbf,0xb6,0x0d,0xcf,0x86,0x1d,0x5e,0x2d,0xfc,0xe6,0xa9,0x86,0x99,0x7d,0x2d,0xab},
+            {0x06,0x09,0x28,0x46,0x76,0x11,0xf2,0x8b,0x99,0xea,0xf2,0x84,0xbc,0x6c,0x09,0xd6,0x76,0x09,0x04,0xab,0x5a,0x6f,0x9e,0x07,0x2a,0x44,0x91,0x5a,0x64,0x6e,0x3e,0xc8},
+            {0xba,0x58,0x2c,0x64,0xb1,0x72,0x21,0xc4,0x6d,0x27,0xaa,0xf6,0xce,0x1e,0x28,0x18,0x56,0x26,0x39,0xb3,0x21,0x66,0x6c,0x95,0x13,0xc1,0xe8,0x57,0x27,0xa6,0x23,0xe6},
+            {0xe7,0x37,0x93,0xb5,0xe2,0xf3,0x3f,0x60,0x88,0x7c,0x6a,0xb4,0x28,0x33,0x9d,0x40,0xd2,0x1f,0xcf,0x75,0x53,0x06,0x40,0x97,0x72,0x15,0xa1,0x8d,0xb3,0x4f,0xd7,0xb4},
+            {0x0e,0xa3,0x23,0x80,0x00,0x9a,0x63,0x9b,0x70,0x5f,0xda,0x94,0xd9,0x3f,0xf0,0x32,0xd8,0x8c,0x31,0x26,0x50,0x3c,0x0d,0x15,0x3b,0xd0,0xf1,0x04,0xb0,0x39,0xbf,0x60},
+            {0x13,0xbc,0x02,0xf7,0xf9,0x71,0x91,0x02,0x99,0xb8,0xc6,0x1d,0x1a,0x16,0x78,0x27,0x26,0xf2,0x2f,0x63,0xb3,0x1b,0x2c,0x0c,0x34,0xfa,0xec,0xe8,0x73,0xf4,0x41,0x8e},
+            {0xa9,0x9b,0x3f,0xf6,0x41,0x32,0x62,0xf4,0x6c,0xf9,0xa4,0x4c,0x3f,0xd5,0xd0,0x42,0x41,0x09,0xa6,0x37,0x3e,0x25,0x80,0xfe,0x97,0x93,0x8c,0x3d,0xc0,0x4e,0x60,0xdf},
+            {0x72,0xb1,0x49,0xe7,0xff,0x67,0x2e,0xc6,0xb2,0x33,0x52,0x49,0x3c,0xbc,0xac,0x16,0x60,0x62,0x28,0x29,0x11,0xe4,0x6d,0x2b,0x7a,0xe5,0x22,0x8d,0x58,0x14,0xb7,0x20},
+            {0x58,0xd6,0x70,0x77,0xa2,0xb7,0xc8,0x36,0xdb,0xc1,0x94,0x57,0xee,0xf1,0xb1,0xe1,0xf7,0x34,0x37,0x0a,0x80,0x03,0x88,0xbd,0xfb,0x10,0x12,0x84,0x0f,0xb7,0xa2,0x40},
+            {0x32,0xbe,0xef,0xd4,0x85,0x38,0xab,0xe6,0xee,0xd6,0xae,0x13,0x71,0x99,0xe0,0x3e,0x05,0x22,0x9d,0x12,0x46,0x28,0x20,0x5c,0xce,0x7d,0xeb,0x53,0xf1,0x6f,0x8f,0x16},
+            {0x3e,0x46,0x6f,0xb1,0x8e,0x2a,0x43,0x72,0x92,0xf0,0x0a,0xcf,0x9f,0x6e,0x66,0x2f,0xdc,0x6e,0x0b,0x7c,0xb9,0xc0,0x60,0x6e,0x61,0x3f,0x81,0xde,0xa3,0x39,0x3e,0x39},
+            {0x9e,0x53,0x7b,0x50,0x49,0x16,0xeb,0x6e,0x98,0x38,0xf1,0x3e,0xcc,0xf0,0xc7,0x53,0x86,0x93,0x51,0x77,0x82,0x01,0xc0,0x81,0x3e,0xe3,0x5c,0xc1,0x92,0x05,0x40,0x9c},
+            {0x40,0x4c,0x05,0x60,0xdb,0xcd,0x46,0xd1,0xaa,0x9c,0xd7,0x62,0x46,0x65,0x4b,0xd0,0x1f,0x62,0xec,0xaf,0xd4,0x0a,0xd2,0xb3,0x64,0xc4,0x26,0xf8,0x49,0x94,0x1c,0x5e},
+            {0x89,0xe5,0xcb,0xab,0x66,0x7b,0x81,0xf0,0x8e,0xee,0xe6,0x20,0x3b,0xe0,0xaf,0x9c,0xbe,0x9d,0xc0,0x65,0x5a,0xf3,0x27,0x2b,0x0c,0xb3,0xfa,0x72,0x21,0x16,0xc2,0x00},
+            {0x2f,0xac,0x93,0x3a,0x1b,0x98,0x0b,0xa7,0x53,0x39,0x70,0x3b,0xd0,0x2f,0x05,0x51,0x99,0xd0,0x57,0x35,0x5a,0x8d,0xbe,0x94,0xed,0xa7,0x24,0xb7,0x9c,0x2a,0xc5,0x34},
+            {0xc0,0x20,0x0b,0x54,0x42,0xf4,0x17,0x79,0x31,0x6e,0x0e,0x25,0x0b,0x7b,0xd0,0x11,0xe1,0x25,0x51,0xb2,0xba,0xbc,0x96,0xc9,0x22,0x8f,0x31,0x87,0xfb,0xd1,0x7e,0xb3},
+            {0xf3,0x26,0x9d,0x2e,0x80,0xbf,0xa7,0xe8,0x03,0x97,0xa8,0xd3,0x28,0x15,0xf8,0xfb,0x8f,0xc0,0xf8,0xdc,0x01,0xdd,0x1c,0x75,0xcd,0x57,0x02,0x8a,0x23,0xe5,0xd4,0x62},
+            {0xd6,0xbe,0x86,0x12,0x90,0x42,0x59,0xaa,0x6f,0xf4,0x3f,0xf3,0x0a,0x2b,0xbe,0xba,0x9d,0x58,0xe0,0x2f,0x47,0x9f,0x56,0x48,0x0a,0x8a,0xff,0xc2,0xcc,0x9b,0xee,0x64},
+            {0xa6,0x7a,0x26,0xfd,0xd9,0x0d,0x62,0x4f,0xff,0x7e,0x50,0x1a,0x2a,0x94,0x66,0x81,0x13,0x4e,0x32,0xe3,0xaf,0xe3,0x09,0x4a,0x0c,0x37,0x76,0x22,0x9e,0x7d,0xb1,0x23},
+            {0x43,0x23,0x4e,0xef,0x33,0xf6,0xba,0xd4,0x53,0x58,0x37,0x4d,0x23,0xde,0xd2,0x73,0x1a,0x35,0xc1,0x2f,0x47,0x2c,0xce,0x58,0xd0,0x5e,0x6d,0x9e,0xe5,0x6c,0x95,0x35},
+            {0xf0,0x21,0x7e,0xe0,0x50,0x7b,0x13,0xf5,0x6f,0x84,0x17,0xd0,0xc9,0x2e,0x3c,0x76,0x02,0x6d,0xa4,0x61,0xc2,0x2d,0xbb,0x7f,0xdb,0x65,0x34,0x42,0xdc,0xf6,0x5e,0xf5},
+            {0xd9,0x57,0x21,0x35,0xcd,0xc5,0xba,0x7a,0xfb,0xf9,0x87,0x1d,0xe3,0xff,0xb6,0x8a,0x1c,0xa9,0x33,0xe7,0x1b,0x80,0xe8,0x76,0x6e,0x67,0x8b,0xde,0x59,0xad,0x2b,0x52},
+            {0x9d,0x32,0xd8,0xb8,0x59,0x18,0x88,0x27,0xa4,0x8f,0xbb,0xc7,0x66,0x09,0x00,0xfa,0x51,0xbd,0xb1,0xbb,0xf3,0xdc,0xa2,0xec,0xac,0x13,0x92,0xa1,0xcb,0xbf,0x47,0x57},
+            {0xda,0xed,0xaf,0x79,0xfd,0xe7,0xf4,0xe4,0x9a,0x73,0x6f,0x5b,0x81,0xf8,0xb6,0xf5,0x05,0x88,0x4a,0x07,0x3c,0x5a,0xad,0x83,0x99,0x7b,0x93,0xbb,0x96,0x85,0xee,0x52},
+            {0xfe,0x7b,0x3a,0xc5,0x08,0x41,0x77,0x8d,0x12,0x83,0xfd,0x83,0x69,0x96,0xb1,0x86,0x5f,0x45,0x39,0x2d,0x53,0xb9,0x5f,0x3b,0xef,0x90,0xff,0x65,0x7a,0x49,0xc4,0x98},
+            {0xb8,0x9b,0x62,0xe4,0x13,0x0f,0xe4,0xd4,0x02,0x32,0x74,0x4f,0xb0,0x18,0x2d,0x47,0x70,0x47,0xac,0xd4,0x0d,0x32,0xbc,0xd1,0x5f,0xb6,0x18,0x1d,0xdc,0x89,0x0a,0x6a},
+            {0x0a,0xe8,0x78,0x6d,0xcd,0x5b,0xff,0xb8,0x24,0xb8,0x1f,0xa0,0x38,0xb1,0x0c,0x91,0x27,0xb8,0x11,0x66,0x4e,0x0d,0x96,0x55,0xd5,0x37,0xd9,0x53,0x77,0xd6,0xd9,0x3c},
+            {0x86,0x08,0x66,0x18,0x59,0xb8,0x38,0xa7,0xe8,0xec,0x16,0xe1,0x5d,0xb1,0x11,0x4a,0xa9,0xdb,0x6b,0x14,0x18,0x77,0x85,0x1e,0x09,0x43,0x9c,0x59,0x1b,0x46,0xd8,0x30},
+            {0xf5,0x35,0x1c,0x6f,0x97,0x8f,0x60,0x0b,0xe1,0xa7,0x1c,0x95,0xab,0xb6,0x38,0xbd,0xda,0x6a,0x7f,0x65,0x87,0xe3,0xf6,0x6d,0x53,0xbd,0xa6,0x82,0xc7,0xaa,0x63,0x1f},
+            {0xb6,0xbc,0xd5,0x91,0xaf,0x74,0xca,0xa9,0x97,0x0d,0x39,0xe0,0x74,0x7b,0xf2,0x0b,0x56,0x59,0x08,0x78,0xcc,0x5b,0x76,0xda,0x41,0x15,0x25,0xfd,0x34,0xb7,0x1c,0xab},
+            {0xbf,0xf9,0x12,0x00,0xc3,0x2a,0xd8,0x62,0xbf,0xee,0x68,0xac,0x1f,0xac,0x4b,0x85,0xa5,0xe6,0xdb,0xba,0x4f,0xd0,0x0a,0x7d,0x09,0xe2,0x17,0xcd,0x22,0x6c,0xe7,0x77},
+            {0x40,0xe5,0xeb,0xfa,0xbd,0x30,0x9b,0xa2,0x28,0x26,0x24,0x31,0x31,0x7a,0x2f,0xfa,0x26,0x80,0x74,0xcd,0xf8,0x35,0x56,0x68,0x2d,0x5f,0x5e,0x8c,0x77,0x66,0x0c,0x5f},
+            {0xc3,0x79,0xde,0xdb,0x96,0x0b,0x32,0x7f,0x68,0x4e,0x79,0x4e,0xc2,0x12,0xb1,0x1f,0xd1,0xeb,0x8f,0x20,0xa6,0x84,0x76,0x76,0x55,0x4b,0xe8,0x5a,0xa4,0x52,0x7d,0xd2},
+            {0xe4,0x05,0xb5,0xbe,0x58,0x23,0x45,0xae,0xc0,0x59,0x5f,0x1a,0x8a,0x4a,0xac,0x6f,0x93,0x8b,0x53,0x94,0x26,0xfc,0x79,0x10,0xd1,0x27,0x1f,0x3e,0x2d,0x1b,0xa8,0x1d},
+            {0xe2,0x7a,0x84,0xe9,0x7d,0xeb,0x54,0x50,0xa3,0x8b,0xff,0xa6,0x85,0xd0,0x46,0x1d,0xd9,0x0e,0x2f,0xc9,0xc4,0x2a,0xa1,0x26,0x1d,0xa9,0xd3,0xb9,0xfc,0x8f,0xa0,0xb0},
+            {0xc8,0xb7,0xe2,0x50,0x6c,0x4a,0x06,0x7b,0xac,0xda,0x36,0xed,0x1b,0xba,0x81,0x32,0x7b,0x18,0xa0,0x8d,0xf3,0xfd,0x37,0x3b,0xe2,0x56,0x90,0x75,0x4b,0x9d,0x84,0x39},
+            {0x5b,0x8d,0x01,0x1d,0x04,0x93,0xa5,0x21,0x7b,0x74,0xd0,0x86,0xf4,0xb8,0xdb,0x0b,0xb3,0x8c,0xb3,0x57,0xc7,0x6b,0x1d,0x59,0x44,0x1a,0xf3,0x68,0x06,0xea,0xd1,0xf5},
+            {0x4a,0xd6,0x76,0x54,0x18,0x8a,0x9c,0x92,0x0b,0xf0,0xbf,0xe2,0x5d,0x22,0xc4,0x33,0x03,0x5d,0x87,0x6e,0x28,0xf7,0x9a,0x7c,0x09,0xc5,0x64,0x9a,0xe7,0xb9,0x70,0xeb},
+            {0x2a,0x0a,0xbc,0xd0,0x54,0xb3,0x03,0xb2,0x07,0x7b,0xa7,0x2f,0x26,0x81,0xa7,0x83,0x27,0x12,0xb5,0x26,0xb1,0x45,0xb6,0x2c,0x60,0x17,0x41,0xef,0xec,0xb3,0x60,0xdb},
+            {0xbf,0xf8,0x8f,0x3f,0x33,0x65,0x02,0x51,0xf8,0xb9,0x24,0x0b,0x1b,0xd9,0x46,0x21,0x46,0x0b,0xaf,0x5d,0x7b,0x22,0x40,0x30,0xff,0x96,0x19,0xa6,0xc7,0x08,0xc5,0x6a},
+            {0xd8,0x84,0x6d,0x0b,0x02,0x5e,0x2e,0xb7,0xeb,0x52,0x8e,0xab,0xb4,0x78,0x90,0x2a,0xd5,0x99,0x0d,0x50,0x78,0x37,0xcf,0xf5,0xc9,0x0b,0x11,0x13,0xad,0xdf,0x4c,0x75},
+            {0xe5,0x77,0x28,0x78,0x8d,0xee,0x91,0x91,0xe5,0x5c,0x55,0x88,0x23,0x66,0x80,0xbe,0xc3,0xf0,0xd2,0xcb,0x87,0x91,0xda,0x18,0x06,0x4a,0x6c,0xb3,0x41,0xb5,0xb7,0xa5},
+            {0xf2,0x91,0xbf,0xd6,0x64,0x41,0x03,0xb6,0x6a,0xaa,0x52,0x08,0xec,0xfb,0x53,0x6a,0x28,0xd6,0x20,0x94,0x62,0xf9,0x84,0x93,0x84,0x7b,0xa6,0x45,0x48,0x96,0xa3,0x69},
+            {0x8b,0x0a,0x1b,0x5d,0x29,0x0d,0x10,0x69,0xf7,0x71,0xd5,0x03,0x69,0xe6,0x62,0xc5,0xf3,0xc7,0x77,0xc2,0xec,0x3e,0xfe,0xe7,0x22,0xd1,0xa0,0xea,0x58,0xc6,0xd9,0xf8},
+            {0xcd,0xc2,0x55,0xd8,0x03,0x43,0xd5,0x96,0x7d,0x74,0x18,0xad,0x4e,0xdb,0x8d,0xc9,0x9a,0xc7,0x13,0x8c,0x16,0x21,0xbb,0x8b,0xeb,0x08,0x69,0xda,0xfc,0xe4,0x4c,0xb3},
+            {0xcf,0x36,0x39,0x23,0xe1,0x23,0x40,0xb2,0xe9,0x5d,0x73,0x97,0xdf,0x77,0x75,0xe3,0xd6,0xd9,0x85,0x39,0x00,0x1d,0x82,0x62,0x04,0x8c,0x67,0x53,0x9b,0xe6,0xa7,0xc4},
+            {0xaa,0x8e,0x17,0xf4,0x65,0x7e,0x2a,0xa0,0x10,0x25,0xd8,0xc9,0x91,0x12,0xd7,0x00,0x2f,0xdb,0x1a,0xbb,0x08,0x6c,0xec,0xb2,0x3d,0x42,0x80,0x81,0xc8,0x7d,0xe6,0xdc},
+            {0x59,0xfa,0xa9,0xc9,0x53,0xbf,0xd7,0xf7,0xd5,0xbb,0xfd,0x36,0x3c,0x25,0xed,0x40,0x89,0xfb,0xcc,0xe4,0x64,0xb2,0x95,0x8c,0x9a,0xed,0xcd,0x57,0x29,0xd4,0x88,0x3b},
+            {0xfd,0x0e,0x1b,0xdf,0x4b,0x51,0x30,0xbf,0xaf,0xf2,0x44,0xeb,0xd4,0x65,0x4e,0x4e,0x0d,0xf2,0x88,0xab,0xf7,0x67,0x3d,0xf0,0x10,0xbb,0x90,0x92,0x86,0xf9,0x3c,0xe2},
+            {0xf3,0x54,0x94,0x63,0x64,0xf1,0x44,0x9f,0x4c,0xb9,0x38,0x47,0x74,0x2a,0xd2,0xc2,0xec,0x82,0x16,0x3c,0xcd,0x7f,0xb4,0xe0,0xd5,0x68,0x7f,0xcc,0xf1,0xa2,0xa0,0x18},
+            {0x8b,0xe1,0x51,0x37,0x5a,0xbc,0xa5,0x7a,0x5d,0xf2,0xd5,0x24,0x28,0x06,0x8e,0xff,0x6f,0x82,0xda,0xd1,0x4d,0x5b,0xfd,0x08,0xa6,0x99,0xf8,0xe7,0x47,0xdd,0xcf,0x99},
+            {0x14,0xa1,0xcb,0x09,0xf1,0x1e,0x64,0x01,0xca,0x5b,0x11,0x98,0x08,0xa3,0x17,0x6f,0x89,0x3d,0xb8,0x3a,0x0c,0x23,0xfd,0xf9,0xc3,0x93,0xac,0x78,0x13,0x9b,0xa4,0x29},
+            {0x10,0x43,0xa8,0x49,0x2b,0x8a,0x8b,0x6a,0x8b,0x93,0x55,0x66,0x9a,0x29,0xfc,0x3f,0x2e,0x1e,0x01,0xdf,0x59,0x74,0x14,0x58,0xbf,0xd3,0x01,0x44,0x20,0xdf,0x60,0xc8},
+            {0x33,0x8c,0xaa,0xe1,0xb0,0xd3,0x6e,0x70,0xfb,0x8b,0xbf,0xb3,0xe2,0x30,0xa2,0x5f,0xc9,0xea,0xb8,0xa1,0xc5,0xb7,0x27,0xe1,0x31,0x3d,0x61,0x17,0x4c,0x87,0x84,0x11},
+            {0x8e,0x15,0x09,0xbd,0x3f,0x53,0x6a,0x9e,0x26,0x3d,0x5b,0xbd,0x5c,0xb5,0xd8,0x92,0xaa,0x0a,0x86,0x0c,0x10,0x4f,0x0a,0xc7,0xaf,0x74,0x49,0x3b,0x9d,0x16,0x4b,0xd6},
+            {0xde,0x5f,0x3b,0x69,0xcd,0x11,0xa4,0x53,0xb4,0x1b,0x15,0x95,0xee,0x91,0x9d,0xc2,0x17,0x5e,0xf8,0x67,0x54,0x1c,0x66,0x57,0x1e,0x6e,0x71,0xab,0xba,0x26,0x61,0xe4},
+            {0x65,0x39,0x34,0xf9,0x35,0xd0,0x80,0x10,0x54,0x95,0x89,0x1b,0x18,0x89,0xaa,0xf0,0x40,0x32,0x23,0x07,0x7a,0xf6,0x87,0xfe,0xab,0x15,0x70,0xd0,0x3c,0xc0,0x8d,0x29},
+            {0x0c,0xfc,0x8f,0x47,0x2e,0xb4,0xc7,0xe3,0x0b,0x17,0xec,0xf9,0x1b,0xa3,0x35,0xac,0x1b,0x47,0x9a,0x01,0x15,0x4e,0x44,0x2d,0x33,0xfd,0x0e,0xf3,0xc0,0xe5,0xdc,0x4d},
+            {0xfb,0xc1,0x0b,0x32,0xbe,0x63,0x28,0x8c,0x09,0x6a,0x64,0xa7,0x0c,0x75,0xdf,0xc7,0x6f,0x16,0x27,0x07,0xbe,0x9f,0x3b,0x09,0x67,0x5e,0xeb,0x08,0xd9,0x8a,0x4f,0x52},
+            {0xd7,0x6b,0xf8,0x59,0xe6,0x47,0xec,0x2d,0x77,0xa7,0xe5,0xb5,0xf7,0x26,0xe8,0xee,0xef,0x59,0xc6,0xab,0x7f,0xc1,0xbb,0x01,0xc9,0x81,0xb5,0xcd,0xe2,0x6f,0x3e,0xb3},
+            {0x64,0xfe,0x37,0x6e,0x3d,0xef,0xce,0xb8,0x14,0x94,0x11,0xcc,0x4c,0xdf,0xfd,0xf3,0xda,0xc1,0x5a,0xed,0xb2,0xae,0x45,0x26,0x3a,0x0b,0x94,0x87,0x7c,0x8b,0x9a,0xc4},
+            {0x3f,0xaa,0xca,0xf4,0x1e,0x61,0x75,0x0a,0xf0,0xac,0x6d,0xf1,0xb5,0xa7,0x99,0x27,0xdb,0xa5,0x09,0xd2,0x93,0xa7,0xfa,0x2f,0xa9,0xe7,0x6b,0xd3,0xa5,0x74,0xfd,0x3c},
+            {0xa7,0xa8,0x0a,0x4c,0xd4,0x6d,0xb9,0x01,0x0c,0xfe,0x1f,0xa8,0x85,0x9d,0x65,0x8d,0x7b,0x45,0x34,0x83,0x2e,0x7b,0x44,0xfd,0xde,0xe5,0x1c,0x53,0xd6,0xbe,0x64,0x08},
+            {0xc0,0x26,0x88,0x12,0xc0,0xe6,0xca,0xd6,0x94,0xd5,0x63,0x2f,0x81,0x9b,0x56,0x23,0x38,0x3f,0xbc,0x3e,0x55,0x11,0x22,0xca,0xd3,0x3b,0x82,0x53,0x6f,0x73,0x37,0x91},
+            {0xa5,0xa2,0xa3,0x9a,0x43,0x31,0x31,0x75,0x9b,0xe0,0xf1,0xf6,0x33,0x9c,0x47,0x30,0xde,0x3d,0x40,0x1c,0x54,0xc7,0x18,0x13,0x06,0x6d,0xef,0x40,0xe6,0xcf,0xb0,0x46},
+            {0x61,0xf4,0xea,0x19,0x98,0x59,0x37,0x7d,0xd6,0x81,0xfd,0x26,0x61,0x00,0x68,0xf8,0x7e,0x99,0x08,0x18,0x66,0xcb,0xf9,0xae,0xaa,0xaa,0x11,0x63,0xe6,0x8f,0xd9,0x50},
+            {0x65,0xe2,0xe5,0xe7,0x7b,0x37,0xbe,0x17,0x85,0x05,0xf7,0xf4,0x0d,0xe4,0xe6,0x4f,0xd4,0xe8,0x6a,0xcb,0x9c,0x62,0x36,0xff,0xec,0x62,0x39,0x2e,0x81,0x84,0x69,0x2f},
+            {0xbc,0x82,0x89,0x2f,0xc9,0xc6,0xdc,0x5d,0x7b,0xbf,0x16,0xba,0x4b,0x2b,0xea,0x2c,0xb9,0x66,0x68,0x15,0xbf,0x3f,0x68,0x0f,0x72,0xbe,0x39,0x53,0x84,0xa2,0x99,0xe7},
+            {0xdb,0x51,0x39,0xac,0xcc,0xf8,0xdc,0x12,0x94,0xee,0xb5,0x6f,0xae,0x06,0x39,0x7f,0x17,0xa0,0x40,0xe0,0x93,0xd3,0x07,0xa9,0xe7,0xb0,0xd6,0x2a,0xd6,0xb4,0x2a,0xe2},
+            {0x43,0xe6,0x3e,0xa9,0x67,0x2a,0x65,0x43,0x2e,0x1b,0x1c,0x21,0xba,0xac,0x77,0x41,0xc9,0xa5,0xf1,0xd6,0xc4,0xe6,0x0a,0xe0,0xb4,0x61,0x85,0x87,0x41,0x5c,0x5a,0x9f},
+            {0x75,0xe8,0xad,0x07,0x12,0xbf,0x9f,0x27,0x9d,0x89,0xb2,0x52,0xe7,0xfc,0x17,0xee,0x0a,0xdd,0x15,0x87,0xdf,0x3f,0x35,0x55,0x68,0x99,0x9f,0xda,0x4d,0xfb,0x0a,0x2a},
+            {0x83,0x49,0x11,0x96,0xe6,0xdf,0xde,0xc6,0xdc,0x2d,0x09,0xe1,0x23,0x80,0xcf,0x55,0xfc,0xa8,0xac,0xd4,0xed,0x8a,0xf1,0x20,0x12,0xe4,0x1f,0x3a,0xc2,0x27,0x09,0x78},
+            {0xb3,0x1d,0x65,0x92,0xa4,0xbe,0xdf,0xc5,0xe5,0xd9,0x35,0x65,0xa4,0x82,0x4f,0x29,0x17,0x32,0x65,0x66,0x07,0x0e,0xa9,0x81,0xe4,0x5b,0xda,0xad,0xaf,0x30,0x22,0xba},
+            {0xad,0x3b,0x86,0xde,0xac,0x69,0x98,0x14,0x1a,0xaa,0xf3,0x72,0xf2,0x99,0xbc,0x1c,0x39,0xe8,0xbb,0xee,0x48,0x07,0xcb,0x2b,0x6c,0xab,0x7c,0xff,0x32,0x74,0x98,0x15},
+            {0xe2,0xea,0x5f,0x55,0x7f,0xea,0x88,0xd0,0x02,0x75,0x6c,0x08,0x0d,0xff,0x03,0x50,0xe2,0xae,0x9c,0x15,0xdb,0xbd,0x42,0x3a,0x2b,0xe4,0x5d,0x66,0x01,0x07,0x81,0x3b},
+            {0x77,0x50,0xf2,0x57,0x5c,0xf3,0x47,0xfc,0x1b,0x24,0xfd,0xd5,0xb1,0x49,0xeb,0xa7,0x6a,0x43,0x81,0x09,0xf7,0xae,0x02,0xa5,0x15,0xe2,0x45,0x11,0x79,0xb2,0xc9,0x8e},
+            {0xc3,0x4c,0xaf,0xe9,0x36,0x9b,0x18,0xed,0x88,0xc2,0x93,0x6c,0xd7,0xcf,0xaa,0x2d,0xad,0x9f,0xf1,0x05,0xa9,0xc3,0xa5,0x3e,0x49,0xda,0x5e,0x7a,0xd4,0xae,0x4b,0x4d},
+            {0xc7,0x54,0x2b,0x4b,0x36,0xda,0xb5,0x08,0xea,0x0d,0xe2,0xe1,0x95,0x7d,0x45,0x11,0x60,0xfb,0x36,0x16,0xc4,0xc8,0x1a,0xb9,0x67,0xd2,0xaa,0xa9,0x7c,0xc0,0xd8,0xc8},
+            {0x9d,0xa5,0xcd,0x36,0x7d,0x3d,0xc4,0x50,0xb2,0xc7,0x6d,0xfa,0x1e,0xa0,0xad,0x1e,0x52,0xdb,0x56,0xeb,0x74,0x26,0xfa,0x03,0x1f,0x2d,0x08,0xd9,0x19,0xeb,0x39,0xd6},
+            {0x34,0x0a,0x3d,0x85,0x42,0x62,0xaa,0xf7,0xa8,0xa6,0xbf,0x00,0x5c,0x21,0xae,0x7e,0xf6,0x2d,0x58,0xd0,0x52,0xc1,0xd1,0x08,0xe7,0xe0,0x9e,0x70,0x8a,0xc3,0xf0,0xd1},
+            {0xdc,0x2b,0xaa,0xd9,0x4c,0x21,0xcf,0x7e,0x37,0xa4,0x20,0x8a,0x6d,0xdd,0xd7,0x4b,0xcc,0x84,0xae,0xc8,0x52,0xeb,0x30,0x8a,0x39,0xce,0x9f,0x81,0xf6,0xfb,0x88,0x3c},
+            {0xd2,0x1c,0xb6,0xa6,0xf3,0x4d,0x9a,0x66,0xc1,0x67,0xc4,0x93,0x96,0x19,0xa8,0x82,0x3b,0xe2,0x13,0xce,0xac,0x2b,0xf4,0x01,0x72,0x14,0x95,0x62,0x8d,0x2e,0xa3,0xff},
+            {0x55,0xf3,0x14,0x48,0x38,0x49,0x60,0x89,0xeb,0x2a,0xf6,0x7a,0xdc,0xcd,0x4b,0x27,0x34,0x01,0x55,0xcf,0x2b,0x1c,0xc8,0x85,0x42,0x7f,0x4c,0x7d,0x4e,0x7a,0x86,0x66},
+            {0x86,0xac,0x6e,0x18,0xb9,0x93,0x1b,0xd4,0x35,0xb3,0x8f,0x96,0xd9,0x7a,0xed,0x09,0x2e,0x1f,0xa8,0xbe,0x47,0x08,0x9f,0x00,0xbc,0x44,0xb6,0xf7,0x89,0x7e,0x64,0xff},
+            {0xb4,0x04,0x4a,0x88,0x3d,0xfb,0x2e,0xb9,0xf4,0xba,0xa4,0x2d,0x25,0x9f,0x87,0xd5,0xab,0x39,0x82,0x14,0x70,0xf9,0x77,0x54,0x8a,0x43,0x5c,0xc6,0x58,0x97,0xa1,0x62},
+            {0xd7,0x5f,0x0f,0xca,0x38,0x71,0x34,0x16,0x2a,0x37,0xb5,0x03,0x7c,0x50,0x06,0xc3,0xe2,0x5c,0x99,0x1f,0xd5,0xc0,0xd3,0xee,0xca,0xed,0x3e,0x75,0xdf,0x90,0xb3,0x0a},
+            {0x4e,0xf8,0xfd,0x94,0x1e,0xcc,0x62,0x4d,0x1f,0x13,0xec,0x8c,0x00,0x04,0x74,0x4c,0xf9,0x07,0xbf,0x91,0xf0,0xa2,0x5e,0xa0,0x98,0x62,0x94,0xb8,0x1d,0x5e,0x45,0xea},
+            {0x01,0x5e,0x53,0x22,0xf9,0xf2,0x15,0x30,0x91,0xb7,0x0b,0x03,0x41,0x91,0x2e,0xa3,0x7a,0x0d,0xa3,0xed,0x20,0xcf,0xe9,0xb8,0x35,0x6c,0x1c,0xe8,0x82,0xc0,0x09,0x00},
+            {0x65,0xf0,0xff,0xa6,0x46,0xfd,0xd7,0xa9,0x8f,0x1d,0xde,0x84,0x96,0x11,0xf1,0x9b,0x2f,0x44,0x37,0x03,0xa1,0x1f,0xf5,0xa6,0x15,0x68,0xb0,0xba,0x7f,0x85,0xb0,0xef},
+            {0xd9,0x51,0x56,0x17,0xba,0x3f,0xdd,0xf4,0x59,0x5e,0x39,0x5e,0x0e,0x03,0x3e,0x9e,0xae,0x48,0x48,0x10,0xa4,0x78,0xbe,0x85,0xbb,0x0e,0xb3,0x85,0x10,0x00,0x45,0x9b},
+            {0xe3,0x85,0x8e,0x03,0x1f,0xe4,0x7a,0x5e,0xdc,0x3e,0xc5,0x72,0x17,0x3d,0xe5,0xea,0x77,0xe9,0xed,0x29,0x29,0x68,0xaf,0x2c,0x6f,0xf2,0xfb,0xd9,0x8e,0x5d,0x79,0x96},
+            {0x4f,0xca,0xaf,0x27,0x94,0x11,0xaa,0x84,0xd9,0x2f,0x54,0x8b,0x1d,0xfc,0x05,0x45,0x8a,0xf2,0xaf,0xe9,0xff,0x57,0x72,0x21,0xe4,0xb1,0xd8,0x2a,0x2e,0x37,0x36,0x8b},
+            {0x26,0x9b,0x84,0x39,0x3f,0x62,0xde,0x52,0xb6,0x12,0xe2,0xf9,0x92,0x2a,0x67,0xd0,0x6e,0x52,0x3e,0x27,0xd4,0xd2,0xfe,0x6d,0x3a,0xa6,0x8c,0xae,0xd7,0xa2,0xa1,0x90},
+            {0x4d,0x17,0x9d,0xb7,0xaf,0x1e,0xc1,0xb6,0x09,0x4d,0xd5,0x5c,0xe2,0x1d,0x26,0xa5,0x4e,0x39,0x5f,0x23,0xcc,0x34,0x28,0xc0,0xde,0x6e,0xf1,0x71,0xd6,0xb0,0x15,0xea},
+            {0x1a,0x50,0x85,0x33,0x18,0x6b,0x12,0x79,0x9e,0x41,0x8a,0xe4,0x69,0x78,0xc8,0xbb,0x8b,0xc8,0x8f,0xbd,0x8a,0x47,0x8f,0xbe,0xa3,0x8b,0x86,0x98,0x7d,0x19,0x7c,0xe1},
+            {0xca,0x4e,0x59,0x90,0xf8,0xa5,0x9d,0xda,0xa6,0x1e,0xa3,0x19,0xc9,0xec,0xba,0x88,0xcf,0x32,0x15,0x58,0xb8,0x73,0x5f,0xc2,0x62,0xaa,0xa1,0x72,0x18,0x58,0x01,0xb1},
+            {0x0d,0x48,0xac,0x9f,0x64,0xfd,0x82,0xbf,0x2e,0x95,0xff,0xb1,0xeb,0x9f,0x1f,0x73,0xa8,0xdc,0x77,0x84,0x17,0x67,0x2f,0xbd,0xff,0x37,0x4e,0x50,0x93,0xa3,0x5f,0x23},
+            {0xc2,0xb8,0x8c,0x4f,0x59,0xce,0xa3,0xfd,0x60,0x36,0x9f,0xc3,0x86,0xac,0x89,0xd2,0x2f,0x69,0x98,0xa6,0x9b,0x24,0xf4,0xc8,0xab,0x7f,0xee,0x63,0x24,0x78,0x51,0xa9},
+            {0x75,0xfa,0x24,0x1c,0x04,0xb7,0x86,0xf0,0xf2,0x67,0x0e,0x0b,0x1e,0x45,0x13,0x4a,0xa7,0x64,0x45,0xef,0xb2,0x62,0x80,0xcf,0x6d,0xfd,0x92,0x6f,0x0e,0x77,0x44,0x6a},
+            {0xb6,0xb8,0x0a,0x7e,0xd9,0xaa,0x4d,0x50,0xec,0x56,0x81,0x2c,0xd5,0xa0,0x4f,0xa2,0x90,0x59,0x19,0x76,0xb0,0xad,0xce,0x14,0xe6,0x65,0x78,0x15,0x76,0x4d,0x16,0x45},
+            {0xc2,0x9d,0x8b,0x54,0xa2,0x65,0xd5,0x9b,0xa2,0xe8,0xeb,0x1b,0xed,0x27,0x45,0x0e,0x41,0x1e,0xe3,0x4c,0xcf,0xda,0x85,0x3d,0x3a,0x83,0xc1,0xda,0x2f,0xb7,0x5b,0x3c},
+            {0x18,0x06,0x81,0xa9,0x0f,0xdd,0xc1,0x3a,0x6f,0x21,0x6b,0x87,0x12,0x80,0x55,0xa0,0x94,0x77,0x36,0x24,0x8d,0x96,0x7a,0x51,0x70,0x14,0x9a,0x50,0xec,0x80,0x20,0xf8},
+            {0xf6,0x5b,0x08,0xdc,0x2c,0x49,0x8a,0x0f,0x01,0xad,0xf7,0x0e,0x45,0xc5,0xba,0x21,0x20,0x5e,0x25,0x91,0x86,0xf9,0x28,0x30,0x59,0x61,0x71,0x8f,0xd0,0x86,0xe0,0x8b},
+            {0x43,0xe8,0xf5,0x56,0x21,0x9e,0x8e,0x6a,0x75,0x08,0xa2,0xc5,0xae,0x19,0xd6,0xde,0x0c,0xda,0x7b,0x9f,0x6e,0x89,0x3b,0xc1,0x9b,0xb6,0x8e,0x36,0x1c,0x37,0xc7,0x86},
+            {0x36,0x77,0x09,0xaf,0x13,0xa8,0x57,0xbd,0x2b,0x97,0x70,0x1b,0x27,0xc8,0x8a,0x7c,0x43,0x0a,0x0e,0x79,0x1a,0x76,0xc7,0x28,0x96,0xb5,0x75,0xe0,0x17,0xd8,0xd9,0xd6},
+            {0xc9,0x20,0x7c,0x31,0xbf,0x45,0x17,0xe1,0x85,0x13,0x60,0x28,0x01,0xa0,0x78,0x02,0x42,0xfd,0xb9,0x1c,0x1e,0xf8,0x59,0x24,0xc2,0xad,0x4d,0xed,0x7b,0xbf,0x1a,0xda},
+            {0x9e,0x48,0xf7,0xbd,0x1d,0x77,0xdc,0x72,0x69,0xd1,0x21,0x58,0x4e,0xb9,0x14,0x30,0x3a,0xac,0xf2,0x5a,0x33,0x6d,0x42,0x91,0x43,0x00,0x65,0x9e,0x0f,0x67,0x87,0x1a},
+            {0x8a,0x2b,0x8b,0x72,0x87,0x56,0xfe,0xef,0x55,0xe9,0xc9,0xba,0xcc,0x13,0x8e,0xac,0xf6,0x09,0x58,0x9a,0xfb,0x44,0x22,0xba,0x2e,0xc2,0xbf,0x9a,0xaa,0xa6,0xb0,0xfb},
+            {0x54,0x40,0xc6,0x8b,0xcf,0xe6,0xa8,0x04,0xc5,0x86,0x5c,0x3b,0xbf,0x03,0x30,0x33,0xbc,0xab,0xe2,0x9e,0x20,0xdb,0xd9,0xf3,0x6f,0x59,0x68,0xe2,0xeb,0x0b,0xef,0x02},
+            {0x43,0x2a,0xf6,0xa4,0x5d,0x6f,0x2a,0x44,0xd5,0xd6,0xde,0x8c,0x82,0xc4,0xb4,0x3e,0xbf,0xc8,0xb2,0x89,0xb0,0x88,0x66,0xd0,0xc4,0xb4,0xdb,0xfe,0x73,0x37,0xb3,0x1f},
+            {0x4f,0xb7,0x7a,0xc9,0x8b,0x54,0x9e,0xbd,0xa2,0xba,0x41,0xcf,0x0e,0xe9,0x9b,0x55,0xc2,0x33,0x86,0xdd,0xe4,0xcb,0x50,0x5c,0xcc,0x49,0x7c,0x43,0x37,0xb2,0x43,0xbe},
+            {0x3f,0x1a,0xf9,0x16,0xee,0x39,0x82,0xbb,0x79,0xc3,0x19,0x21,0xda,0x5c,0x90,0xa3,0x15,0xc9,0x71,0x9e,0xf9,0x3d,0x87,0xbe,0x32,0x3b,0xdf,0xb1,0x3c,0x6e,0x27,0x70},
+            {0x42,0x68,0x88,0x9b,0x97,0x76,0x50,0x2d,0x94,0x83,0x82,0xbc,0x1c,0x9e,0x06,0x57,0x93,0x10,0x4a,0x2e,0xd0,0xe8,0xaa,0x75,0xb2,0x15,0x3b,0x62,0xb4,0xcc,0xc0,0x97},
+            {0xe1,0x47,0x19,0xc9,0x97,0x70,0xcf,0x50,0x75,0x52,0xd3,0xd6,0x4e,0xb8,0x22,0xc8,0xc7,0xa6,0xc4,0xd1,0x2c,0x76,0x9d,0x6c,0xec,0xb6,0xe6,0xe0,0x5d,0xb8,0x5e,0x47},
+            {0x70,0xad,0xec,0xdd,0x90,0xfc,0xca,0xbd,0x0f,0x39,0xe9,0xd4,0x1d,0xc1,0x9c,0x6b,0xa9,0xaf,0xd1,0x1d,0xdb,0x7f,0x09,0xc6,0xca,0x9c,0x3e,0x56,0x8b,0x9e,0x71,0x94},
+            {0xc9,0xa9,0x4d,0x17,0x0b,0xbc,0xb0,0x6d,0x91,0x70,0xba,0xdf,0x89,0xf2,0xf3,0x53,0x3d,0xaf,0x8e,0x15,0xb6,0x33,0xdb,0xe7,0xea,0x1d,0x02,0xc6,0x2f,0xd2,0xd8,0x47},
+            {0x53,0x8c,0x3c,0xff,0x92,0x4d,0xf2,0x31,0x05,0xe5,0x1c,0xb1,0x00,0xc8,0x44,0xf3,0x56,0xd0,0xd0,0x5d,0x06,0xe3,0xaa,0xcb,0x7c,0x30,0xf9,0x8c,0x91,0x29,0x2f,0x72},
+            {0xbe,0xe2,0xc3,0x2f,0xb7,0x20,0x04,0xce,0xb2,0x4d,0x20,0x7b,0xd8,0x90,0xba,0x8f,0xb4,0x12,0x68,0x48,0xd2,0xa7,0xbb,0x02,0xba,0x58,0x0c,0x26,0x69,0xf7,0xd2,0x7d},
+            {0x98,0xdb,0x2d,0xb8,0x6a,0x3d,0xa5,0x6f,0x16,0x41,0x1b,0xf6,0xc2,0xe2,0x7f,0x27,0x55,0xaf,0xd3,0x86,0x73,0xbc,0xcc,0x15,0xaf,0x89,0x91,0xfc,0xa2,0x83,0xcd,0x8b},
+            {0xfd,0x8f,0x89,0xcf,0xc4,0x12,0x00,0x8e,0xc0,0x75,0x2f,0xab,0xae,0xc3,0xac,0x72,0xd6,0xc8,0x9a,0xd8,0x12,0x86,0x98,0x0e,0x81,0x38,0xed,0xf6,0xff,0x4c,0xd9,0x92},
+            {0x00,0x97,0x04,0xc8,0x4f,0x09,0x54,0xd4,0x50,0x36,0x96,0x9f,0xd1,0x5c,0x72,0x93,0x04,0x81,0x56,0xff,0x97,0xa7,0x6d,0x9c,0x72,0xa0,0x82,0x48,0xa4,0xdc,0xd7,0x25},
+            {0x59,0x3b,0x8d,0x1e,0x74,0xc2,0x99,0xda,0x61,0x95,0x0d,0xb5,0x2f,0xd3,0xb0,0x8f,0x44,0xd6,0xcf,0x97,0x2e,0xc0,0x5a,0x5c,0x59,0x14,0xda,0x9f,0x23,0x0c,0xac,0xc5},
+            {0xe8,0xa6,0xd9,0xcf,0xf9,0x00,0x56,0x7a,0xef,0x29,0x0b,0x62,0xa5,0x7d,0x8d,0x55,0x28,0xb7,0x46,0x8a,0xdb,0xe2,0xee,0x0b,0xce,0xf8,0xac,0x47,0xe2,0xdc,0x1d,0x7c},
+            {0x9f,0xbb,0xa3,0xe6,0x6b,0x12,0xc7,0xc9,0x26,0xb8,0x8a,0xfb,0x5b,0x4a,0x9e,0xb0,0x3d,0x1a,0xfa,0xac,0x94,0xf6,0x73,0xd4,0x56,0x39,0xce,0x9d,0x4d,0xd5,0x14,0x16},
+            {0xb7,0xf9,0xc8,0x33,0x20,0xd1,0xb0,0x4e,0xcb,0x9b,0x4f,0x71,0x4d,0xa4,0x62,0xb7,0xbb,0x4e,0x4a,0xb7,0xcf,0x36,0x25,0xa5,0xf0,0xbb,0x49,0x7f,0x54,0x05,0xa0,0x38},
+            {0x4d,0xa2,0x8a,0x82,0x8a,0xb7,0x93,0x36,0xff,0x2e,0x76,0x6d,0x3f,0x32,0xe3,0xa5,0xad,0x11,0xaf,0x82,0x03,0xc4,0x42,0x8d,0x97,0xce,0x5c,0x00,0x54,0xaa,0xec,0xa6},
+            {0xd1,0xd9,0xee,0x68,0x35,0x89,0xc1,0x6d,0x6d,0x04,0x3f,0x38,0x3e,0xc2,0x02,0x39,0x53,0xc4,0x82,0xf9,0xc3,0x27,0x04,0xfe,0x1a,0x46,0x1b,0xa1,0x7d,0xa0,0x5e,0xa2},
+            {0x07,0x06,0xb6,0x34,0x96,0x13,0x20,0x1f,0x5b,0xbb,0x9c,0x61,0x25,0xc4,0x83,0x06,0xff,0x53,0xd4,0x68,0x8f,0x64,0xdd,0x99,0x44,0x05,0xab,0xad,0x18,0x72,0xd4,0x50},
+            {0xb2,0x25,0x80,0xd4,0xae,0xda,0x8e,0xd6,0xd7,0x3c,0x59,0xbf,0x74,0xef,0xd2,0x6c,0x3e,0xdb,0xde,0xb0,0x86,0x5c,0x0c,0x4b,0x6c,0xa6,0x1d,0xb3,0x9f,0xc6,0xfc,0xdd},
+            {0x97,0x8e,0x4a,0xbd,0x23,0xea,0xd6,0x79,0x62,0xbb,0x22,0x3e,0x37,0x2c,0x88,0x73,0xf2,0x83,0xf2,0xd6,0xbc,0x3b,0x0b,0x0e,0xf6,0xa2,0x1f,0xde,0xdb,0xf4,0x84,0x20},
+            {0xd3,0x7e,0x20,0x94,0x28,0xac,0xd6,0x07,0x97,0xe1,0xe7,0x76,0x36,0xbd,0xda,0x52,0x04,0xc5,0x6a,0xf2,0x62,0xd4,0x87,0x46,0x9b,0x6e,0xb0,0x69,0xdc,0x5b,0xa0,0xd9},
+            {0x44,0x62,0x2d,0x43,0x88,0x23,0x09,0x1e,0x08,0x23,0x69,0x5e,0x5c,0x08,0xb6,0x33,0xb3,0xf0,0xc4,0x6a,0xf0,0x28,0x69,0x89,0x79,0x8e,0x27,0x53,0x0a,0x20,0x27,0x3a},
+            {0x89,0x02,0xb5,0x1c,0x80,0x8d,0x51,0x43,0xcf,0x6e,0x36,0x8f,0xaa,0x11,0xe4,0xe8,0x6f,0xf0,0xd3,0x73,0xce,0xf0,0x41,0x55,0x36,0x62,0xda,0x37,0x33,0x76,0xff,0x59},
+            {0x82,0x50,0xfa,0xa8,0xbe,0x69,0xd0,0xcc,0xbc,0x2d,0xf6,0x6b,0x10,0x46,0xd1,0xcc,0xd6,0x75,0x05,0x03,0x85,0x59,0x43,0x54,0x2b,0x66,0x10,0xa9,0xa6,0xe9,0xcf,0xc2},
+            {0xe7,0x5d,0x7f,0x19,0x82,0x47,0x8d,0xa0,0x37,0x9f,0x97,0x5f,0x96,0x44,0x10,0xf4,0xe5,0x64,0x5f,0x95,0x4a,0xce,0x65,0xf0,0xba,0x0e,0xeb,0x1b,0xa7,0xd7,0xb1,0x90},
+            {0x58,0x36,0xda,0x56,0x1d,0x17,0xe3,0x0f,0xaa,0xc4,0x34,0x2f,0xc5,0x55,0x87,0x8d,0x14,0x4b,0x11,0x08,0xf2,0x71,0x12,0xaf,0x7f,0x42,0x5a,0xaf,0x90,0xf4,0x2e,0xfb},
+            {0xb0,0xd0,0x67,0x39,0x42,0x0b,0xc6,0xd9,0x6c,0xcb,0xae,0x83,0x36,0xbb,0x9b,0x6a,0x28,0xad,0xca,0xc6,0x1f,0x1f,0x57,0x12,0x91,0x5e,0xf4,0x24,0x56,0x22,0x23,0x32},
+            {0xc8,0x83,0x9d,0xee,0xb3,0x9b,0xf4,0xe9,0x74,0x3d,0x61,0x7c,0xf5,0xef,0xc2,0x9e,0x9a,0x59,0xf3,0x9d,0x68,0x11,0x28,0xba,0xa4,0xe9,0x00,0x20,0x3a,0xca,0xb6,0xbc},
+            {0x9f,0xca,0x90,0xcc,0xfc,0x4d,0x10,0x2c,0xb6,0x0b,0x2a,0x6d,0x99,0x2c,0x90,0x86,0xa7,0x1b,0x1f,0x74,0x2d,0xd8,0x05,0xcb,0x40,0xb9,0x45,0xe5,0x98,0xbd,0x25,0x5f},
+            {0xb0,0x86,0x51,0xed,0x30,0x17,0x28,0x74,0xbd,0xb6,0x37,0x11,0xd3,0x2e,0xf5,0x49,0xb4,0x38,0x61,0xba,0xe4,0xce,0xe5,0x30,0xda,0x74,0xb7,0x87,0x4d,0x0d,0xef,0xfb},
+            {0xf5,0x9d,0x39,0x38,0xa1,0x82,0x49,0xd4,0x7e,0xae,0x4b,0xe5,0x68,0xd3,0x09,0x86,0x88,0xdf,0x1c,0x5e,0xee,0x39,0x3a,0x91,0x32,0x03,0xaf,0x87,0xf9,0x2a,0xb8,0x71},
+            {0x68,0xb3,0x0e,0x55,0xa6,0x56,0x42,0x2b,0x4f,0x77,0x57,0xe8,0x87,0xa7,0x35,0x67,0x81,0xf1,0x7e,0xc9,0x1a,0xcd,0x25,0xd2,0xf0,0x62,0xbb,0x90,0x12,0x74,0x14,0x23},
+            {0xba,0x79,0xb0,0x9d,0xde,0xa8,0xbb,0xdb,0xe7,0x72,0x3a,0x90,0x6c,0x36,0x7b,0x4a,0x51,0xcd,0x8a,0xa4,0x7f,0xbe,0x28,0x36,0xc1,0x69,0xec,0x28,0xb4,0xe5,0x1a,0xf4},
+            {0x51,0xb2,0x80,0x3f,0xc4,0xd0,0x1e,0xb5,0xe9,0xf0,0x11,0xc7,0x4c,0x5e,0x6b,0x29,0x43,0x27,0xf4,0x40,0x52,0xe9,0xe5,0x6f,0xd0,0xb7,0x54,0x75,0xb3,0xf2,0x16,0x7b},
+            {0x2a,0x40,0xad,0x80,0x7c,0x8e,0xc2,0x27,0x52,0xfd,0x48,0x86,0x57,0x00,0x08,0xb6,0x27,0x62,0xd2,0x08,0xa5,0xea,0x24,0x14,0x08,0x13,0x80,0x8b,0x64,0x79,0x2c,0x48},
+            {0xf2,0xab,0xe0,0x5e,0x84,0x09,0x9e,0x99,0x6c,0x1f,0x9a,0x2b,0xe7,0x89,0xb7,0x72,0x59,0x32,0x2c,0x5b,0x28,0xa1,0xa2,0x4e,0xc4,0x18,0x03,0x8e,0x77,0xa7,0xc2,0x52},
+            {0xe3,0x99,0x96,0xb2,0x2b,0x17,0x1c,0x30,0xc0,0xd9,0xd7,0xf3,0xf9,0xb8,0x9c,0x8c,0xdd,0xe6,0x06,0xaf,0x69,0xdb,0xf6,0x93,0x6a,0xb5,0x0d,0x4a,0x85,0x40,0xa4,0x3c},
+            {0x67,0x82,0xc6,0x7e,0x38,0x49,0xc9,0xce,0x43,0x96,0x7e,0xe3,0x03,0xd2,0x9b,0x12,0x54,0x5a,0xf8,0x4f,0xea,0x12,0xc5,0xcc,0x4c,0xf1,0xf9,0x73,0x21,0x4e,0xb2,0xd1},
+            {0x34,0x77,0xe6,0x2c,0x94,0x7a,0xb1,0x34,0xc3,0x24,0x25,0x22,0x42,0x5c,0x23,0x43,0x18,0xe2,0x29,0x98,0xb4,0xf6,0xd7,0xb0,0x84,0x22,0x42,0x7e,0x36,0xd0,0x10,0x04},
+            {0xc2,0x02,0x03,0x58,0xb7,0x1b,0x1f,0x04,0x3b,0xff,0x47,0xe1,0x17,0x02,0x7b,0xc8,0x11,0x2d,0x4d,0xd0,0xd6,0x51,0x31,0x06,0x3e,0x66,0x7d,0xa9,0xe0,0x97,0x43,0x57},
+            {0x5e,0x3c,0x95,0x24,0x7d,0x73,0x5f,0x46,0xb4,0x59,0x40,0x28,0x8d,0x0e,0x8c,0x00,0x16,0xee,0x55,0x3c,0x49,0x39,0xaa,0x41,0x92,0xba,0x7e,0x52,0xcb,0xe6,0x3b,0x63},
+            {0xf3,0xef,0x51,0x79,0x68,0x04,0x00,0xa2,0xa8,0x3f,0xa5,0xb0,0x1d,0x82,0x3b,0xc3,0x90,0x6d,0x68,0xff,0xd2,0x9e,0xf1,0x89,0x23,0x26,0x24,0x72,0xaf,0xb8,0xc6,0x85},
+            {0x5a,0x2f,0x1f,0x9b,0xe0,0x5c,0xe5,0x40,0x2f,0xc0,0x72,0x86,0x14,0xf9,0x8e,0x6c,0x5d,0x8a,0x30,0xa7,0x00,0x8f,0xd7,0x11,0x4d,0x2e,0x32,0xf1,0x28,0xb9,0x94,0x68},
+            {0x80,0x48,0x9b,0xe6,0x2c,0xf1,0x3a,0x2e,0xfe,0x0f,0x72,0xae,0x08,0x42,0x2e,0xb8,0xb9,0xa0,0x33,0xbb,0x24,0x78,0x3b,0xb0,0x75,0xe5,0xa0,0x30,0xb1,0x2f,0x4d,0x12},
+            {0x01,0xaa,0x37,0x65,0x14,0xbe,0x84,0x13,0x1d,0xe2,0x56,0xc9,0xfd,0x1f,0x3c,0xfa,0x05,0xed,0xd4,0x40,0x8a,0x33,0x2e,0x69,0x9c,0x2f,0x05,0x12,0xe8,0x65,0x32,0x03},
+            {0x6a,0x59,0xeb,0x72,0xf2,0x91,0xd9,0x20,0x9a,0xa9,0xee,0x25,0x80,0xa9,0x77,0x70,0x7b,0x28,0xe3,0x71,0x4d,0x04,0x85,0x93,0x52,0x82,0x6b,0x70,0x03,0x75,0x9f,0x1a},
+            {0x1e,0xd1,0x69,0x9d,0x9c,0x8a,0xf2,0x55,0x71,0xa1,0x28,0x0b,0x6f,0x52,0x51,0xcf,0x69,0x0d,0x00,0x05,0xbb,0xc2,0x22,0x82,0x9e,0xd1,0xb5,0xc8,0x36,0x8f,0xb7,0xd0},
+            {0x2b,0x89,0x66,0xe5,0xea,0xfc,0x87,0x5e,0x7d,0xf9,0xb8,0x28,0x67,0x4d,0x7a,0xdf,0xca,0x22,0x25,0xa5,0xc5,0x45,0x8e,0xfe,0x5d,0x34,0x90,0x93,0x2c,0x00,0x11,0xbe},
+            {0xd0,0xf3,0x0d,0xb6,0xd5,0xb9,0x2d,0x76,0x3a,0xa3,0x9c,0x91,0x0b,0xfd,0x00,0x7d,0x8c,0xe0,0x8f,0x58,0xca,0xbd,0xfd,0xb6,0x7e,0x38,0xb1,0x24,0x78,0x85,0x1a,0x81},
+            {0x2b,0x53,0x70,0xd6,0xab,0xbb,0x3e,0x0c,0x0c,0xf3,0xd9,0x18,0x7e,0x51,0x73,0xd7,0x78,0x46,0x22,0xb7,0x70,0xdf,0xba,0x6c,0x33,0xb8,0xd6,0x72,0xe2,0x2e,0x12,0xc9},
+            {0x7a,0x87,0x4c,0xc8,0x98,0x1a,0xfc,0x43,0x94,0x3b,0x02,0xbe,0x34,0x28,0xc2,0x15,0x0c,0xa2,0xd9,0x4d,0xc2,0x73,0x59,0x04,0xbe,0x47,0x58,0x72,0xfd,0x48,0xbf,0x4b},
+            {0xab,0x8b,0xc7,0x40,0x76,0x27,0x87,0xa9,0x07,0x16,0xc3,0xf1,0xfe,0xe0,0x72,0xe5,0x70,0x31,0xa1,0x52,0x5d,0x52,0xce,0x20,0x21,0x4a,0x98,0x4e,0x79,0x33,0x07,0xb1},
+            {0x40,0x98,0x3e,0x94,0xcc,0x32,0x4c,0x14,0x1b,0xa3,0x3a,0x7c,0xc5,0x68,0x2f,0x3f,0x18,0x7d,0x83,0x2d,0xd6,0x65,0xa2,0x50,0x3c,0x41,0x01,0xce,0x37,0x10,0xb2,0xd1},
+            {0xea,0x73,0x15,0x37,0x25,0xb2,0xef,0x43,0xb2,0xe1,0x0a,0x05,0xb7,0x42,0x6a,0xa8,0xe2,0x41,0x28,0x4b,0x17,0x02,0x21,0x4e,0x8d,0xd9,0xcd,0x04,0xb3,0x8d,0xf6,0x8d},
+            {0x4a,0xb7,0x24,0xb8,0xef,0xa9,0xa3,0x25,0xdf,0x30,0x69,0x5d,0xae,0xa6,0x89,0x4d,0x5d,0xa0,0x8a,0xae,0xf7,0x39,0xf2,0x0e,0x71,0x66,0x19,0xf4,0xe5,0x95,0x88,0x5e},
+            {0xcc,0xeb,0x8b,0xbf,0x3b,0x3b,0xbe,0xf9,0x0d,0xa4,0xb2,0x19,0xfe,0x54,0x7a,0xd6,0xa3,0xed,0xd9,0xdc,0xd2,0xae,0x48,0x06,0x6f,0x25,0x11,0xa8,0x76,0x9e,0x28,0x6b},
+            {0xb8,0xc4,0x42,0x59,0x6d,0x32,0xa4,0x09,0xe8,0xfa,0x7b,0x44,0x01,0xd5,0x2c,0xc8,0xcd,0x2e,0x82,0xac,0x21,0x6d,0x37,0x49,0x33,0xdd,0x90,0x13,0x53,0x5b,0x44,0x3b},
+            {0x0a,0x7d,0x2a,0xaf,0xf8,0x43,0x45,0x64,0x37,0x2a,0xd3,0x39,0xe2,0xed,0x31,0x66,0x50,0xf4,0x90,0xf9,0x93,0x2a,0xfb,0xc9,0xcf,0xb5,0xf9,0x72,0x6e,0xdd,0x22,0x7d},
+            {0x11,0x7e,0x01,0x8a,0xb5,0x73,0x19,0x44,0x0c,0xa4,0x76,0xa5,0x79,0x9a,0x3e,0xb8,0x7e,0xb7,0x73,0x8a,0x79,0x3f,0xde,0x1b,0x95,0xc3,0x4d,0x32,0xcb,0xeb,0x45,0x22},
+            {0x7c,0x84,0x15,0x2e,0x37,0x65,0x9e,0x4b,0xe0,0xe0,0x80,0x6e,0x11,0xfa,0x7a,0xb1,0x54,0xe5,0xdd,0xe6,0xbb,0xa5,0x04,0x09,0xc8,0xc4,0x75,0xf4,0x80,0x01,0x61,0x20},
+            {0x44,0x08,0xec,0xe1,0x08,0x77,0xa6,0xac,0x3f,0x43,0x20,0x94,0x16,0x17,0xb7,0x2c,0x27,0xfe,0x12,0x2b,0xf0,0xa0,0xb9,0x49,0x32,0xbe,0xc6,0xf7,0xf6,0xc5,0x95,0x3f},
+            {0x5b,0x42,0x5b,0x6d,0x0c,0x9b,0xdb,0x4f,0xe9,0x3f,0xdc,0xb1,0x31,0x4b,0x2e,0xcf,0x3c,0xaf,0xb7,0x7c,0xad,0xea,0x5a,0x3f,0xbc,0x1a,0x37,0x7c,0x04,0xc7,0x7a,0xa3},
+            {0x23,0x52,0xdf,0xf4,0x40,0x0a,0xea,0xef,0xaa,0xaa,0x61,0xcf,0x37,0x51,0x2d,0x20,0x76,0xe3,0xf5,0xbe,0xa9,0x2d,0x2a,0xd5,0x1a,0xa9,0x9f,0x63,0x0e,0xf2,0x5a,0x67},
+            {0x08,0xc9,0xdb,0x75,0x36,0x34,0xd9,0x9a,0x25,0x26,0x41,0x04,0xc5,0xb8,0x16,0xeb,0xc1,0x5b,0x95,0xe0,0xd2,0xf8,0x48,0x55,0xd3,0x2e,0x52,0xaa,0x90,0xaa,0x5a,0xa7},
+            {0x91,0xd5,0x57,0x1d,0x7b,0x2e,0x05,0x66,0x42,0x6c,0xef,0x24,0x98,0xa5,0x69,0x0d,0x32,0xe3,0x02,0x68,0xc0,0xa3,0xfc,0x17,0xd8,0x1e,0x4d,0x3a,0xcd,0xaf,0x65,0xf4},
+            {0x71,0xb4,0x08,0xac,0xc8,0x16,0x43,0x8a,0x0a,0xcf,0x05,0x52,0x60,0xa4,0x33,0xb5,0xb0,0xfc,0xa4,0xa7,0x1e,0x62,0x7e,0x54,0xed,0x7d,0xc9,0x60,0x79,0x84,0x6c,0x44},
+            {0x4c,0x92,0x5a,0x3c,0x7a,0x5c,0x74,0xd7,0xdd,0xc2,0x09,0x5f,0xd3,0xc3,0x03,0xfe,0x9a,0xf7,0x08,0xcc,0x54,0xec,0x19,0x92,0xf8,0x97,0x19,0xa4,0x5d,0xd2,0xe9,0x8e},
+            {0x60,0xf5,0x6a,0x73,0x5c,0x8f,0x2f,0x31,0xef,0xd7,0x58,0x0c,0x90,0x23,0x4e,0x9f,0xc6,0x22,0xef,0xca,0xe3,0x66,0x84,0x9c,0x63,0xa7,0x96,0xbf,0x80,0x00,0x6a,0x12},
+            {0x43,0x96,0x1c,0x4f,0x81,0x30,0xc5,0x4f,0x32,0xb4,0x5f,0x9e,0xe3,0x9f,0xe8,0x8f,0xaa,0xb9,0x57,0xa7,0x34,0x50,0x1e,0x7b,0x49,0xe7,0xd7,0xac,0x8f,0x81,0xba,0x91},
+            {0x5a,0x50,0x3c,0xee,0x0a,0x81,0x5b,0x1f,0xcc,0x4e,0xe6,0x00,0x0b,0x8d,0x88,0xe7,0xfa,0x17,0x6f,0x7f,0xff,0x7e,0xbf,0x9a,0xbe,0x82,0x37,0x9a,0x9b,0x87,0x03,0x7c},
+            {0xb1,0x9e,0x6f,0x32,0x3d,0x3c,0xe9,0x64,0x02,0xd8,0xce,0xd8,0x32,0x94,0x4a,0x02,0x72,0x8d,0x9d,0xf0,0x67,0x4a,0x9a,0x7b,0xd8,0xe1,0x8d,0xc8,0x89,0x6d,0xe9,0x4c},
+            {0xa7,0x43,0xc9,0x55,0xa7,0xb5,0x59,0xa3,0x4c,0xd8,0x90,0x7b,0x9e,0xb7,0xa4,0x0d,0x86,0xf8,0xf1,0x5a,0x58,0xe9,0x0b,0x91,0xc9,0xfd,0x87,0x41,0x4a,0x91,0xb3,0xef},
+            {0xb4,0x0c,0xb0,0x0e,0xaa,0x80,0x5c,0x0d,0x27,0xe8,0x6c,0xc2,0x89,0xe3,0x4d,0xd3,0x54,0xd8,0x20,0x45,0x33,0x82,0x95,0x4e,0xd2,0xac,0x24,0xb2,0x7d,0x38,0xc2,0xd4},
+            {0xe6,0x01,0x6c,0x78,0x52,0x3c,0xe7,0x14,0xa3,0x60,0xf7,0x7a,0xd9,0x5b,0x39,0xbb,0x8a,0x72,0x42,0x77,0x43,0x0e,0x6d,0x2e,0xa5,0xa2,0x13,0x03,0x34,0x01,0x17,0x27},
+            {0xe8,0xb4,0x48,0xa8,0x0c,0x19,0x78,0x09,0xe5,0x59,0xb3,0x0f,0xbf,0xf6,0xa7,0xa9,0x9d,0x1b,0xae,0x74,0x09,0xec,0x00,0xc7,0x66,0xa1,0x29,0xab,0x70,0xe4,0x7f,0x5f},
+            {0x4b,0x42,0xf9,0xbb,0x88,0x18,0x55,0x04,0xe2,0x00,0x70,0x3c,0x9f,0xa8,0xdf,0xba,0xf8,0x50,0x97,0x8a,0x60,0x82,0x7c,0xfe,0x76,0x88,0xc4,0x34,0xc5,0x02,0xde,0x0f},
+            {0xd4,0x8a,0x1a,0xaa,0x1f,0x36,0x22,0x2f,0x4a,0xcb,0xaa,0xa8,0x21,0x8e,0x24,0x9d,0x57,0x74,0xac,0xf8,0xab,0xea,0x08,0x7c,0x9e,0x2e,0xe9,0xe2,0x1d,0xfb,0x2a,0xb1},
+            {0xcd,0x11,0xb4,0xf4,0x41,0xf8,0x34,0x86,0x3a,0x99,0x98,0x8f,0xbe,0xcd,0xf8,0xb1,0x9b,0xe6,0x65,0xed,0xfd,0x19,0xad,0x4d,0xb6,0x2e,0x9d,0x29,0x0a,0x98,0xbd,0x02},
+            {0x2d,0x61,0x52,0xc0,0x03,0xc4,0x8f,0x8f,0x6a,0x1c,0x26,0x93,0xdb,0xb5,0xcc,0x55,0x28,0xe7,0xe1,0x64,0xa1,0x6b,0xeb,0x79,0x8c,0x77,0x2d,0xc8,0x5b,0xf2,0xee,0x21},
+            {0x0f,0x9a,0xf4,0x3e,0xaa,0xea,0xdb,0x71,0x18,0x49,0x8e,0x56,0x2e,0x45,0xbe,0x1e,0xe1,0xe9,0xb7,0xf3,0x78,0x7c,0xbe,0xc3,0xae,0xad,0xf6,0x71,0xa2,0xc3,0x13,0x8b},
+            {0xe8,0x7a,0x2d,0xab,0x8e,0x49,0x45,0xb8,0xad,0x5f,0xb7,0x86,0x6e,0xfc,0x8d,0xc7,0x6a,0x99,0x06,0x38,0x82,0x25,0x42,0x05,0x05,0x06,0xd1,0xd0,0xce,0x78,0xfc,0xb9},
+            {0x19,0x0a,0x2c,0xb2,0xea,0x8d,0x06,0xd9,0x89,0xd2,0x3f,0xf0,0x75,0xbc,0xf6,0x1b,0x23,0x68,0x41,0xa2,0x79,0x75,0xf8,0x9b,0xdc,0x08,0x5c,0xff,0x82,0x3e,0x55,0xb5},
+            {0x9b,0x09,0xd9,0xad,0x2f,0x3a,0x06,0x9a,0x4c,0x9b,0x33,0xe7,0x7a,0x83,0x3f,0xdd,0x66,0x05,0xa2,0x09,0x5e,0x80,0x62,0xf8,0xb7,0x9a,0x5f,0xe1,0x97,0xdd,0xa4,0x66},
+            {0x06,0xdd,0x4f,0x3d,0xa3,0x27,0x3b,0xd8,0xfe,0x86,0x9a,0x97,0x60,0x06,0x74,0x52,0x35,0x34,0x7a,0xb5,0x36,0x12,0x24,0x7d,0x3e,0x04,0x28,0xfe,0x15,0x27,0x87,0xa6},
+            {0x8d,0xd9,0xa7,0xdc,0xd8,0x63,0xf7,0xa8,0xfe,0x98,0xed,0x2f,0x45,0x26,0x15,0xa7,0x45,0x60,0xab,0x7a,0xb9,0x64,0xff,0x16,0x18,0x34,0xa6,0xa6,0xd5,0xb2,0x1b,0x4e},
+            {0xf6,0x8b,0xdb,0xcc,0xd9,0x95,0x5c,0x40,0x84,0x8c,0xd3,0xac,0xd5,0x13,0x3f,0x99,0x1b,0xec,0xbc,0xfb,0xcf,0x16,0x7e,0x5d,0x20,0x18,0x63,0x32,0x29,0xd1,0xc0,0xee},
+            {0xd1,0x99,0x0e,0xe3,0x83,0x45,0xd5,0x28,0xf0,0x11,0x5a,0x99,0xaa,0xd4,0x5c,0xf4,0x1d,0x3a,0x57,0x9e,0xe1,0xbe,0x60,0x1b,0xee,0x38,0x20,0xf1,0x81,0x81,0x9f,0x4a},
+            {0xb0,0x93,0x39,0x81,0x8a,0xa6,0xb2,0xbd,0x5b,0xf9,0x55,0x10,0x99,0x69,0xd4,0xed,0x43,0x83,0x0a,0x67,0x2c,0x47,0x9c,0xf3,0x4b,0xca,0x16,0x61,0xe3,0x1e,0xac,0xf1},
+            {0xc5,0xdc,0x68,0x71,0x1d,0x6a,0x27,0x09,0x2e,0xe6,0xdb,0x8a,0x77,0x9f,0xb1,0x97,0x2d,0x76,0x9a,0x4d,0x57,0x1b,0x75,0x9e,0x6b,0xca,0x25,0x74,0x93,0xb1,0x03,0x1e},
+            {0x6f,0x7e,0x4d,0x57,0x05,0x19,0x49,0xb2,0xab,0xee,0x3b,0x32,0x9b,0x29,0x9d,0x5a,0x6f,0x55,0x5d,0x06,0xcd,0xd8,0x38,0x11,0xfd,0xc7,0xd4,0x75,0x31,0xff,0x71,0x79},
+            {0x45,0x86,0x2a,0xce,0x8f,0x36,0xc0,0xa3,0xa6,0xd4,0x32,0x68,0x17,0xf0,0xf8,0x0f,0x30,0x41,0x62,0x2e,0x85,0xe0,0x55,0xe2,0xeb,0x89,0xdb,0xd2,0x0d,0x0d,0xf3,0x24},
+            {0xb5,0x78,0x41,0x32,0x7c,0x49,0xf6,0xc4,0x75,0x53,0x4d,0x0c,0xd1,0x8f,0xf5,0x78,0x95,0x87,0x90,0xec,0x3c,0x81,0x9f,0xa5,0xb9,0x7d,0x89,0x71,0x25,0x21,0x38,0xe6},
+            {0xe8,0x36,0x15,0xf0,0x77,0x96,0x83,0xae,0x32,0xd0,0xf0,0x19,0xb2,0x0c,0xbf,0x2d,0xa9,0x35,0x40,0x3f,0x50,0x9b,0xbb,0x9d,0x28,0x56,0xdc,0x62,0x01,0xb6,0x13,0xbb},
+            {0xbe,0x52,0x4d,0x28,0x63,0xd4,0x1b,0xaa,0x17,0x15,0x61,0x32,0x8c,0x94,0x35,0x16,0x3e,0xca,0x92,0xd6,0xe0,0x85,0xeb,0xbc,0x29,0xa4,0xe1,0xe3,0xcc,0x67,0x53,0xca},
+            {0x9d,0xd3,0xc0,0x20,0xae,0x3e,0x8b,0xe0,0xf6,0xfc,0xc9,0x7e,0x6f,0xb0,0xe8,0xc7,0x6c,0xe9,0x69,0x4d,0xd5,0xca,0x8a,0x2e,0x8a,0x12,0x28,0x62,0xf5,0x52,0xa4,0x21},
+            {0xa7,0xe5,0xca,0x5d,0x0b,0xe1,0xd2,0x4c,0x69,0xf4,0x99,0x2a,0x3c,0x1a,0x8f,0x6a,0xce,0xe7,0x92,0x9a,0xfb,0x25,0x38,0x04,0x5c,0xf7,0x37,0xa5,0xda,0x62,0x89,0x8b},
+            {0x0c,0xdd,0xa6,0x8b,0x16,0xcf,0x1e,0x43,0xb4,0x1e,0x2d,0x2e,0xed,0xd6,0x54,0x79,0x72,0xee,0xb5,0x49,0x19,0x30,0xf9,0x05,0x7a,0x3c,0x07,0x74,0x32,0x19,0xc1,0xdb},
+            {0x5c,0x83,0xbb,0x52,0x2e,0x9a,0x09,0xd6,0xc8,0x1a,0xf1,0x9b,0x78,0x02,0xea,0x30,0xad,0x22,0x48,0x4b,0x2e,0xf0,0xc6,0x09,0xad,0xe9,0x20,0x89,0xe7,0xcc,0x72,0x48},
+            {0x07,0x8a,0x6e,0xa5,0xa4,0xb2,0xbe,0x65,0xc7,0xc4,0x23,0xf7,0xad,0x5e,0x4a,0xd9,0x09,0x24,0x87,0x29,0xb0,0x82,0x64,0xb8,0xf8,0x80,0xac,0x5d,0x90,0xf0,0x09,0xf3},
+            {0x47,0xa7,0x3b,0x39,0xd4,0xc6,0xc6,0x31,0xd1,0x48,0xb9,0xcc,0x31,0xdd,0x43,0x31,0x1d,0x20,0xd9,0x15,0x92,0xa9,0xed,0x38,0xd8,0x75,0x79,0x49,0x1c,0xd9,0xd8,0x55},
+            {0x7c,0x62,0x5f,0x9d,0x16,0xa2,0x7b,0xd3,0x00,0x64,0x68,0x2f,0xc8,0x96,0xa1,0x5c,0x4b,0x50,0x48,0x19,0x23,0x36,0x10,0xfc,0x4a,0x88,0xcc,0xcd,0x27,0x10,0x59,0xa4},
+            {0x5f,0x4c,0x8d,0x2c,0xc5,0xc6,0x7a,0x0c,0x39,0x34,0x93,0x47,0x4e,0x74,0xf7,0x70,0xf8,0xc0,0x97,0x51,0xcf,0x4d,0x71,0x2f,0x0c,0x90,0x6d,0x9d,0x39,0x03,0xfc,0xc0},
+            {0x60,0xa6,0x28,0xf0,0x34,0x79,0x32,0xc8,0x67,0x94,0x36,0xa3,0x99,0x0f,0xe3,0xdc,0xf4,0xd0,0x2f,0xb9,0xc2,0x4f,0xe4,0xfa,0x97,0x54,0x71,0x7c,0x17,0x65,0x91,0xe0},
+            {0x2f,0xb1,0x27,0x65,0xc5,0xe1,0xeb,0x87,0x7c,0x55,0xf5,0x74,0xc7,0xdc,0x61,0xa4,0x12,0x3e,0xbf,0x7c,0x7e,0x72,0xce,0xc7,0xd7,0xe8,0x34,0x20,0xfa,0x57,0x88,0x53},
+            {0x2e,0xf3,0xb7,0xfb,0x03,0x47,0x2c,0x1f,0x5a,0x85,0x0b,0x40,0xe9,0xb3,0x5d,0x9a,0x35,0xd8,0x7f,0x05,0x29,0x2c,0x1d,0x0d,0x43,0xe8,0x63,0xd7,0xe7,0xec,0x6b,0x4d},
+            {0x16,0xc5,0x4f,0xff,0x31,0xb4,0xda,0x39,0x31,0x30,0xf6,0xeb,0x18,0x11,0x13,0x92,0xa9,0x6e,0x85,0x42,0x1f,0xcd,0x1e,0x92,0x8e,0x17,0xae,0x63,0x59,0x17,0x22,0x21},
+            {0x56,0xba,0x9c,0x54,0x4d,0x0c,0xa5,0xde,0x80,0x68,0x03,0xa3,0x6a,0x1a,0x19,0xf5,0x3b,0xa9,0x14,0xf2,0x86,0xd9,0x2b,0xce,0x30,0x7f,0x91,0xec,0xa1,0xbf,0x56,0x52},
+            {0xe8,0xdf,0x51,0xa4,0x9a,0xb4,0x71,0x30,0xdb,0x53,0x32,0xe1,0xdd,0x3f,0x1d,0xda,0xfc,0xc2,0xce,0x80,0x15,0x0a,0xe3,0xc3,0x7e,0xb1,0x00,0xf5,0x62,0x7b,0x6b,0xf7},
+            {0x3d,0xf4,0xf7,0xf1,0x4f,0x87,0xf1,0xea,0x6d,0xf3,0x1b,0x9b,0x82,0x69,0xcb,0xdc,0xac,0x2d,0x85,0x90,0xa8,0x9a,0x27,0x53,0xd7,0xbb,0x11,0xfb,0x8e,0xc5,0x76,0xce},
+            {0xed,0x25,0x60,0xa2,0x00,0x88,0xfa,0x40,0x57,0x28,0x37,0xba,0x32,0x13,0x94,0xfb,0x36,0x65,0xcc,0x60,0xc1,0x5b,0x19,0xa2,0xfd,0x07,0x33,0x31,0x01,0x63,0x69,0x53},
+            {0xa5,0xec,0xff,0x54,0x34,0xcd,0x0a,0xaa,0x83,0x50,0x73,0x06,0x6a,0xbb,0x2b,0x9f,0x9e,0x49,0x3d,0xc4,0xcb,0x7b,0x26,0x98,0x3f,0x93,0xc9,0x40,0x16,0xc0,0x92,0x97},
+            {0xaf,0x3e,0xf0,0x59,0xdd,0x49,0x49,0x0d,0x48,0x3b,0x8b,0x9a,0x99,0xb2,0x45,0x69,0x54,0x83,0xaa,0xed,0xbb,0xab,0x25,0xbd,0x1a,0x54,0x85,0x2a,0x26,0xb2,0x88,0x02},
+            {0x39,0xd2,0xd8,0xd4,0xda,0x53,0xe0,0xc3,0x73,0xa1,0xe3,0x9b,0x48,0x47,0x82,0x13,0x17,0xf1,0x0d,0x9f,0xff,0x8b,0x7a,0xc5,0x98,0xb5,0x9b,0x7e,0x79,0xe2,0xbe,0x6f},
+            {0xb1,0xb6,0x81,0x56,0x84,0xcc,0x27,0x52,0x78,0xa6,0xa3,0xb0,0xa7,0xde,0x9d,0x0c,0x7d,0x42,0x16,0xf8,0xf1,0xb8,0xc8,0xf1,0xd0,0x75,0xbe,0x64,0xf7,0x0b,0x79,0xf4},
+            {0xfb,0x2a,0xbc,0x84,0x0c,0xe8,0x86,0x65,0x37,0xfe,0xb1,0x25,0x31,0xf4,0x20,0xdc,0x89,0xca,0x9d,0xe1,0x2b,0x4e,0x19,0x2e,0x1e,0xf7,0xcb,0xe7,0x65,0xcc,0x48,0x16},
+            {0xc7,0xb6,0xc8,0xd3,0xd4,0xec,0x94,0x57,0xb4,0xca,0xf2,0x9f,0x6a,0x61,0x98,0xf8,0x93,0xc5,0x12,0x63,0xd7,0x3d,0x0b,0x12,0xe8,0xbc,0xf5,0x63,0x0f,0xea,0x1e,0x7f},
+            {0xaa,0x5a,0xe0,0xd3,0x5b,0xbb,0xa9,0x24,0x16,0x5a,0xbc,0xcb,0x82,0x66,0x04,0xc8,0x0f,0x6a,0xd5,0x57,0x81,0xc4,0x9e,0x60,0x16,0xbd,0x82,0x07,0x19,0x6f,0x66,0xbf},
+            {0x65,0x0d,0x0e,0xed,0xab,0x56,0xb6,0x49,0x27,0x43,0xe7,0xc5,0x69,0x26,0x51,0xe8,0xaa,0xd3,0x7d,0x1a,0x99,0x39,0x96,0x31,0x41,0xa6,0x74,0x82,0xa6,0x86,0xe9,0xc3},
+            {0x22,0xd0,0xb3,0x45,0x1a,0x44,0xad,0xb8,0xef,0x87,0xa1,0x16,0x09,0x7e,0x3a,0xc4,0x6b,0x5f,0x83,0x45,0xeb,0xf0,0xe5,0xdc,0xec,0x96,0x0d,0x2d,0x55,0xa7,0x2d,0x93},
+            {0xe3,0x11,0x0b,0xee,0x29,0xe6,0x16,0x2f,0x43,0x1a,0xa6,0x8c,0x17,0x0d,0x62,0x2f,0x81,0x9b,0xc4,0xe2,0x89,0xf6,0xc3,0xe1,0xd6,0x95,0xcc,0x44,0x4c,0x8d,0xc1,0x71},
+            {0x92,0xfc,0x6a,0xe9,0x1c,0xaf,0xfe,0xef,0xc1,0xe1,0x6e,0x81,0x6a,0x0e,0xf2,0x99,0xe1,0x7c,0x63,0xa9,0x68,0xd4,0x1b,0xb9,0x1b,0x7a,0x6f,0x58,0x7d,0x34,0xf8,0xf2},
+            {0x76,0xd9,0x86,0xdb,0xb1,0x66,0x8f,0x00,0x69,0x86,0x7d,0xf2,0x52,0x51,0x32,0x8e,0x1a,0xa1,0x5e,0x6f,0x31,0x23,0x3e,0xac,0xc8,0x56,0xe6,0x1b,0x5d,0x32,0x8e,0x6c},
+            {0x56,0x0b,0x82,0x14,0x28,0x96,0x8d,0x63,0x04,0xaa,0x51,0x7c,0x6b,0x0d,0xf4,0x46,0x90,0x59,0xa0,0x97,0x17,0x1e,0x71,0x80,0xc0,0xbd,0xc1,0xde,0x4c,0x8c,0x2d,0xfb},
+            {0x19,0x9d,0xb2,0x47,0xcd,0x1e,0x61,0x52,0x6d,0x67,0x82,0x3a,0xa8,0x9c,0x7d,0x3e,0x9a,0x84,0x9a,0x1c,0x48,0x98,0x39,0x02,0xf4,0xe7,0x32,0xd3,0x74,0x91,0xac,0x95},
+            {0xf3,0x00,0x0d,0xe6,0xfb,0xdf,0x59,0x97,0xbc,0xd5,0x06,0x7b,0xdd,0xbe,0xbd,0x4c,0x10,0x57,0x34,0x6a,0x69,0x16,0x44,0x46,0xe4,0xa2,0xfd,0x0f,0xe5,0x75,0x46,0x1d},
+            {0xa3,0x6d,0x62,0x77,0x5f,0x7a,0xba,0xc5,0x18,0x34,0xf2,0x55,0x72,0xe0,0x5a,0x02,0x38,0xde,0x20,0x39,0x4f,0x0b,0x8a,0x5c,0xc1,0xf3,0x3b,0x47,0x98,0x4c,0x4a,0x02},
+            {0xb6,0xdf,0x53,0x0d,0xed,0x76,0xcd,0x3c,0xac,0x5e,0xb5,0xf6,0x51,0x6b,0x7b,0x5a,0xad,0x5e,0xe4,0x3b,0xeb,0x08,0x76,0xc8,0xf1,0xed,0xdc,0x38,0xf4,0xe1,0x73,0xaf},
+            {0xa9,0x39,0x75,0x3b,0x3d,0x57,0x09,0x27,0xcc,0x8d,0x90,0xe5,0x12,0x23,0x9c,0xfb,0x6e,0x52,0xd8,0x1b,0x5d,0x56,0xea,0x80,0xeb,0x4d,0x0c,0x46,0x57,0x2d,0x9f,0xfb},
+            {0x91,0x5c,0xf3,0xba,0xb3,0x86,0x06,0xe7,0x26,0x6a,0x5f,0x7c,0x21,0x79,0xad,0x46,0x9b,0x07,0xb1,0x34,0x76,0x59,0x00,0xff,0x6c,0xa2,0xa5,0xab,0x83,0xfb,0xe8,0x0c},
+            {0xc0,0x84,0x07,0x6c,0x1d,0x75,0x86,0x19,0x28,0xf6,0xa2,0x8f,0x56,0x65,0x27,0xad,0x29,0x13,0xa2,0xbf,0x82,0x94,0x89,0xf5,0x7d,0xfc,0x89,0x47,0xc3,0x68,0xc5,0x0c},
+            {0xb7,0x1e,0x57,0x4b,0xfd,0x98,0x0b,0xe2,0x4d,0x08,0x39,0x5d,0x32,0x43,0x0a,0x00,0x09,0x53,0xa0,0x21,0x55,0x6f,0xfc,0x4d,0x76,0x93,0x19,0x0c,0x00,0xe7,0x4e,0x77},
+            {0x4c,0xb8,0xe2,0x12,0x26,0x1c,0x1e,0xc6,0xfb,0xc5,0x2d,0xf8,0xca,0xc3,0x37,0xd6,0xf5,0xd1,0x89,0x53,0x76,0x45,0xf7,0xd5,0xa7,0xf9,0x11,0xdb,0x88,0x2d,0xb7,0x16},
+            {0x53,0x3a,0xbc,0xd8,0x78,0x0f,0x59,0x04,0x9a,0x84,0x62,0xab,0x7e,0xf5,0x05,0xf5,0xcc,0xf1,0xd3,0x42,0x15,0x0c,0x30,0xdb,0xab,0x59,0x49,0xfb,0x08,0x4c,0xdf,0x21},
+            {0xdb,0x53,0x3c,0x39,0x13,0x04,0x4c,0x03,0x97,0x7b,0xaf,0x09,0x2f,0x01,0x56,0x07,0x1c,0x26,0x28,0x20,0x8d,0x14,0xd8,0x18,0x72,0x16,0x24,0x36,0xb8,0x71,0x23,0xfa},
+            {0xca,0x8a,0xc0,0xdb,0xf1,0x5b,0xef,0x99,0x42,0x21,0xf7,0x8c,0x02,0x48,0xb9,0xa6,0x40,0x8e,0xad,0x11,0x66,0xe6,0x23,0xc6,0xdb,0x76,0x52,0xa1,0x6c,0x01,0x6c,0x06},
+            {0x09,0x90,0xb3,0xa3,0x17,0xa9,0x5d,0x36,0xb6,0xb6,0xff,0x1f,0xc6,0x73,0x6f,0xea,0x01,0x52,0x9a,0x39,0xc0,0xfe,0x06,0xe4,0x9b,0x7f,0xd5,0x64,0x08,0x0b,0x6d,0xf4},
+            {0x78,0x74,0x69,0x29,0x8f,0x13,0x8d,0x1c,0x49,0x02,0x51,0x89,0x5a,0x85,0xd6,0x08,0x0e,0x52,0xaa,0x1d,0xf3,0x75,0x64,0x3d,0x19,0x5d,0xbe,0x7e,0x87,0x84,0x79,0x49},
+            {0x68,0xa3,0x71,0x37,0x2b,0xa0,0xf4,0x89,0xc8,0xab,0x86,0x72,0xe2,0x57,0xf2,0x65,0xa4,0x18,0xe5,0x0c,0x6c,0x96,0x9b,0xbe,0xc4,0xb2,0x41,0x05,0x85,0x0c,0x37,0x1b},
+            {0xf8,0xba,0x30,0x58,0x1f,0x3c,0xf3,0x10,0x50,0xdb,0x47,0xb7,0xa4,0x3a,0x55,0x51,0xd1,0x3b,0x9c,0xe7,0x00,0x1c,0x89,0x6b,0xb7,0x94,0x09,0xf4,0xf1,0xd0,0xa3,0x1f},
+            {0x23,0xa5,0xc2,0x11,0x51,0x80,0x8a,0xd6,0x00,0xe9,0x71,0x39,0x09,0x9b,0x79,0xc3,0xe1,0xce,0x23,0xac,0x12,0x52,0xdb,0x87,0xb2,0xd4,0xcb,0x88,0x35,0x9c,0xde,0x4a},
+            {0x98,0x86,0xc1,0x2c,0x93,0xec,0x0e,0xa5,0xd1,0x44,0x78,0xfa,0x4a,0x9a,0x38,0xc4,0xa1,0x02,0x5f,0x8b,0x9d,0x59,0x5d,0xeb,0x37,0x1d,0x6a,0xff,0x79,0xf9,0x3b,0x04},
+            {0x4e,0x4f,0x81,0xcf,0x16,0x28,0xb6,0xf4,0x3d,0xb1,0xdb,0x21,0x87,0x73,0xdb,0x5f,0x7a,0x40,0x53,0x11,0xaa,0x7e,0xe5,0xae,0x20,0x72,0x14,0x8a,0x86,0x7a,0x14,0x37},
+            {0xa0,0x19,0x55,0x63,0x36,0x36,0x4c,0xf6,0xa3,0x85,0x01,0xbe,0x26,0xe9,0x17,0xb0,0xaa,0x2c,0xc2,0xc3,0x7c,0x13,0x7f,0xc2,0x69,0x65,0x9a,0xa4,0x4a,0x3e,0x5e,0xe8},
+            {0x7c,0x6b,0x6a,0x13,0x24,0xfc,0x40,0xc2,0x37,0x3c,0x62,0x15,0xad,0x69,0x9f,0x72,0x3b,0x82,0x6f,0x02,0x39,0x7e,0xb6,0xf6,0x32,0x6c,0x1a,0x5e,0xd5,0x58,0xa1,0x15},
+            {0xbd,0x21,0x00,0x19,0x34,0xe5,0x0a,0x47,0xad,0xe3,0xd7,0x13,0xce,0xc8,0xde,0xc0,0x36,0xd5,0x4d,0xa0,0xa9,0x76,0xed,0x3b,0x69,0x0a,0xc0,0x80,0xa7,0xbc,0x9a,0xc4},
+            {0x4d,0xb0,0x29,0x27,0x58,0xde,0xb6,0xab,0x35,0xaa,0xc1,0x2f,0xd6,0x38,0x72,0x76,0xb2,0xf3,0x2c,0xdc,0x85,0x9a,0x15,0x64,0x2f,0x01,0x93,0x1c,0x84,0x5f,0xb0,0xef},
+            {0x54,0x31,0xa8,0x7a,0x0c,0xd3,0x2b,0x11,0xdb,0x5c,0xed,0x54,0x5e,0xff,0xb2,0x2f,0x22,0x0f,0xfc,0x69,0xa6,0x0a,0xc5,0x52,0x84,0x4d,0xb8,0x6b,0xc7,0x99,0x8e,0x84},
+            {0xc6,0xf3,0x43,0x78,0x2a,0xf6,0xf6,0xad,0x78,0x4f,0x9f,0x85,0xc1,0x12,0x3f,0xba,0x0b,0x82,0xac,0x07,0x11,0x9a,0x61,0xac,0x39,0xed,0x2f,0xbd,0x92,0xfc,0x0a,0x90},
+            {0xc4,0x12,0xd2,0xde,0xa3,0x4e,0xbb,0xda,0x96,0x4b,0x17,0xcc,0x12,0xc1,0xda,0x70,0xe7,0xdc,0x42,0x8c,0x92,0xea,0xf4,0x94,0xe1,0x71,0x00,0xe9,0xac,0x65,0xff,0xa4},
+            {0xe9,0xb9,0x47,0xab,0xa6,0x75,0x5d,0xe5,0x2a,0x67,0x72,0x5b,0xe3,0x84,0x9e,0x33,0x83,0xe1,0x87,0x09,0x9a,0xeb,0x1b,0xef,0x53,0x15,0xd2,0x26,0x09,0x36,0x8b,0x23},
+            {0x0b,0x2d,0x19,0x49,0xbe,0xad,0x9e,0x99,0x95,0xb7,0x17,0xa8,0x21,0xf6,0xe5,0xdc,0x31,0x36,0x85,0x7b,0x17,0x86,0x38,0x35,0x0a,0x16,0xc1,0xa3,0x21,0x49,0xc6,0xff},
+            {0xdf,0xfb,0x51,0xc4,0xbc,0x98,0xc9,0xf0,0xc0,0x7c,0xe1,0x8a,0x88,0x87,0x7d,0x48,0x94,0x77,0x06,0xcf,0x57,0xf5,0x6c,0xc6,0xa2,0x9c,0xe8,0x2c,0xf2,0xf7,0x4c,0x07},
+            {0x97,0xdb,0xf9,0xa4,0x8f,0x3c,0x92,0xfd,0x46,0x74,0xb2,0x0e,0xd6,0xf6,0x35,0xbb,0xd9,0x2a,0xf0,0x03,0xde,0x52,0x3f,0xeb,0x5e,0xcc,0x47,0x58,0x16,0x9e,0x58,0x57},
+            {0xcf,0x70,0x1b,0xe3,0x3d,0x1b,0x3a,0xbd,0x33,0x57,0xa7,0x4a,0xb2,0xf7,0xf0,0x3f,0xa7,0x8f,0x7e,0xbe,0x03,0x62,0x99,0x42,0x56,0x02,0x0f,0xb1,0xfa,0xd7,0x52,0x51},
+            {0xfb,0x26,0x93,0x0b,0xfd,0xbb,0xdd,0x6f,0x69,0xbe,0x65,0xc3,0xc0,0x15,0x36,0xe0,0x9a,0x30,0xce,0xdb,0x74,0x7b,0x69,0x71,0x90,0x35,0xe3,0x16,0x36,0xe4,0x79,0x37},
+            {0x57,0x25,0xb8,0xeb,0xf2,0x34,0x5f,0xe7,0xe6,0x60,0x57,0x9a,0xe9,0x4b,0x84,0xe2,0x51,0x25,0x94,0x87,0xda,0x44,0x28,0xa5,0xf1,0xf0,0xcf,0xec,0x19,0xdb,0x06,0x39},
+            {0x61,0xb9,0x2f,0x80,0x43,0xe5,0xa0,0x35,0xb2,0x14,0x4f,0xad,0x7b,0x1d,0xf3,0xca,0x71,0x30,0xc5,0x6c,0xab,0xbe,0x0d,0xd2,0x75,0x7d,0xd7,0x37,0x71,0x97,0x19,0xfc},
+            {0x35,0xa2,0xf8,0x5a,0xdb,0xd0,0xb6,0xa8,0x18,0xd8,0x4a,0x16,0xd8,0xcc,0xbc,0x09,0x47,0xbd,0xa3,0x89,0xb6,0xcf,0x43,0xce,0x6e,0xe9,0xaa,0x9b,0x4a,0xea,0x19,0xf2},
+            {0x69,0xdb,0xaa,0x6d,0x8a,0x1d,0x44,0x25,0x9b,0xf0,0x95,0xb5,0x53,0x11,0xdd,0x39,0xce,0x02,0x8a,0xb2,0x0d,0xe3,0x0c,0xa4,0x9b,0x1a,0x17,0x3d,0x61,0x71,0x10,0x9e},
+            {0x3b,0x68,0x20,0x3e,0xfd,0xa0,0x22,0xbe,0x69,0x14,0x80,0x95,0x2c,0x51,0x32,0x12,0x9d,0x51,0x4b,0x2c,0xdc,0xeb,0x0d,0x3a,0x8f,0x13,0x75,0x95,0xbe,0x7f,0x1c,0x25},
+            {0x38,0x8d,0x3d,0xd8,0x2e,0xec,0xf3,0x69,0x79,0x41,0x86,0xb4,0x2c,0x96,0x48,0x71,0x57,0x5c,0x03,0xfa,0x97,0x72,0xd5,0x7d,0x31,0x28,0x0d,0x67,0x8f,0x87,0xa6,0x36},
+            {0x6b,0x49,0x3f,0x04,0x9d,0x19,0xb3,0xd1,0xe2,0x68,0xba,0xbf,0x02,0x11,0xd4,0x8a,0xbd,0x01,0x8c,0x91,0x27,0x87,0xa9,0x13,0xff,0x71,0x45,0x7d,0x54,0xac,0x36,0x06},
+            {0x53,0x26,0x13,0x40,0x60,0x5f,0x5e,0x63,0xec,0xea,0x85,0xea,0xbc,0x57,0x16,0xf3,0x1b,0xe1,0xd1,0x6d,0x1c,0x91,0xc0,0x4f,0x3a,0x09,0x07,0x73,0xb2,0x88,0xe6,0x2f},
+            {0x7b,0xc9,0xe1,0xa6,0xb3,0x63,0x20,0xbf,0x97,0xe6,0x0d,0xa9,0x10,0x91,0xc0,0xea,0x84,0x86,0x53,0xa5,0x6c,0xfd,0xa1,0x3f,0x12,0x9e,0x42,0x71,0x96,0x23,0xc5,0x00},
+            {0x73,0x47,0xad,0x26,0x3d,0x90,0xe2,0x06,0x35,0xec,0xa6,0xfe,0x1b,0xc8,0x9d,0xf0,0x6a,0x4e,0xc2,0x73,0xad,0x50,0xe1,0xef,0x78,0xa2,0x7f,0xb9,0xfc,0xff,0xca,0x13},
+            {0xfd,0x28,0x6c,0x0a,0x1d,0x9e,0x4a,0x0e,0x0a,0xaf,0x97,0xb7,0xf2,0xda,0x4b,0x21,0x9e,0x38,0x5d,0x7a,0x9a,0xfc,0x49,0x82,0x69,0x85,0x74,0xd7,0x2a,0xe4,0x9d,0xaf},
+            {0x0f,0x42,0xf9,0xf3,0x7b,0xf7,0x7f,0xc4,0x7e,0x1c,0x75,0xe0,0x20,0x66,0x54,0xe0,0x05,0x97,0x03,0xf2,0xb7,0xdd,0x26,0x1f,0x91,0x71,0x9e,0x49,0xe5,0x86,0xe7,0xad},
+            {0x5c,0x1e,0xb8,0xef,0xa7,0xc2,0x6e,0xbb,0x6a,0x3e,0x2c,0xb1,0x91,0x48,0x78,0x3d,0xf0,0xb7,0xd5,0xda,0xc0,0xe8,0x0b,0x3c,0x79,0x3e,0xcb,0x55,0x61,0x66,0xa8,0x8a},
+            {0x0f,0xd0,0xac,0xe6,0xdf,0x8a,0x7b,0xa0,0x3a,0xa6,0xd5,0x2f,0x78,0xc3,0xe5,0x8a,0x47,0x20,0xa3,0x85,0x2a,0xd9,0x36,0xbb,0xa8,0x0e,0x08,0xbf,0x7c,0x61,0xa2,0x87},
+            {0x02,0x0d,0x47,0x3e,0x1c,0x95,0x04,0x36,0x6a,0x22,0x04,0xd5,0x66,0xb1,0xca,0x6c,0x96,0x83,0x20,0xe3,0x03,0x82,0x12,0x9f,0x95,0xa4,0x0c,0x73,0x9c,0xba,0x7f,0x19},
+            {0xff,0x70,0x51,0x69,0x8e,0xaa,0x84,0xa3,0xff,0xc2,0x5d,0x5d,0xbc,0xf9,0x23,0x93,0x3a,0x1a,0x59,0x73,0x0d,0xb3,0x3e,0x81,0x61,0x69,0x81,0x60,0xa0,0x90,0xa4,0x5d},
+            {0xdf,0x0b,0x1d,0x01,0x5c,0xf7,0x7e,0x47,0x51,0x2c,0xda,0x3d,0x49,0xbe,0x66,0x27,0x82,0xe5,0x27,0x15,0xfb,0x74,0x7c,0xd0,0xf7,0x39,0x34,0x10,0x9a,0x06,0x6f,0xf1},
+            {0x93,0x0e,0xda,0xe2,0xfb,0x34,0x1f,0x18,0x84,0x9c,0x9b,0x8a,0xac,0xe0,0x1d,0x5e,0xd2,0xcf,0xaa,0x01,0x3f,0x59,0x64,0x7c,0xb5,0x42,0xda,0xf3,0x3e,0xe6,0x0d,0xb6},
+            {0xac,0xd5,0xd0,0x21,0x2d,0x8d,0x1b,0xed,0x17,0x25,0x30,0x50,0x03,0x8a,0x48,0x1d,0x96,0x8c,0xbb,0x80,0x07,0xc5,0xc6,0x9f,0x35,0xd3,0x28,0xcc,0x88,0x77,0x23,0xc1},
+            {0x17,0xf7,0x6b,0xa6,0xaf,0x39,0xc2,0xd6,0x4b,0x95,0x55,0x4b,0xa2,0x7b,0x12,0x81,0x8e,0x60,0x28,0x4d,0x16,0x6a,0x9d,0xa6,0x0a,0x31,0x10,0x09,0x1c,0x1d,0xc3,0xec},
+            {0xe0,0x39,0x14,0x82,0x1b,0x7b,0x61,0x85,0xe2,0x39,0xea,0xe4,0x55,0x98,0xd5,0x04,0x55,0x81,0x75,0x44,0x3c,0x4f,0x34,0xb7,0x00,0xc2,0xb3,0x29,0xbe,0xaf,0x14,0xcc},
+            {0xcb,0xde,0x6c,0xf0,0x38,0x18,0xfa,0xf1,0x9d,0x93,0xa0,0x82,0xa5,0x09,0xc3,0x60,0x1a,0x6b,0x04,0x3a,0x66,0xa2,0x22,0xd3,0x89,0xcd,0x44,0xd4,0xa9,0x1d,0x38,0xcc},
+            {0xc4,0x2a,0xbe,0x41,0xdf,0xa7,0x93,0xe6,0x0e,0x2a,0xb7,0x97,0xe6,0x26,0xbd,0x8a,0x59,0x04,0xe0,0x36,0x33,0xb6,0x1c,0x51,0x3c,0x9f,0x80,0xc2,0xbe,0x9e,0xf0,0xd0},
+            {0xb4,0x7f,0x90,0x40,0xa5,0x56,0x1c,0x94,0xbb,0x5c,0x11,0xac,0x80,0x42,0xf3,0x4d,0x80,0xe1,0x44,0xa3,0xf5,0xa8,0xb7,0xc0,0xe4,0x7d,0x7a,0xa3,0xc1,0x08,0x12,0xec},
+            {0x07,0xf4,0x48,0x25,0xdb,0xef,0x5d,0x2c,0x5f,0xb0,0x89,0x41,0x1e,0x2e,0xb2,0xd4,0xf7,0xe7,0xee,0xef,0x66,0x97,0x85,0x20,0x84,0xac,0xc7,0xb1,0xf4,0x8a,0xa7,0x7e},
+            {0xab,0x14,0x33,0x16,0x52,0x2b,0xe7,0xe1,0x1b,0x26,0x7b,0x89,0x67,0x72,0x51,0xa5,0xa1,0xd4,0x8c,0xe7,0xc9,0x0e,0xe2,0x7a,0x6c,0x66,0xe1,0x85,0x7d,0x71,0xe5,0x76},
+            {0x3e,0x03,0xc4,0x2e,0xbf,0xf1,0x0f,0xdd,0xf1,0x13,0xe7,0x31,0xd9,0x1c,0x96,0xcb,0xa5,0x9d,0x8d,0x29,0xac,0xb8,0xf6,0xe6,0x3e,0x0f,0xd1,0x71,0x65,0x74,0x14,0xd2},
+            {0x12,0xa0,0x73,0xe1,0x54,0x8b,0xd7,0x55,0x1d,0x47,0x7f,0x3f,0xfa,0xa7,0x90,0xd4,0x21,0x05,0x59,0x6f,0x7c,0x16,0x1a,0x62,0x36,0x50,0xf1,0xa0,0x53,0xc6,0xf0,0x53},
+            {0x48,0x82,0xfb,0x1b,0x19,0x2f,0xe8,0x17,0xb8,0x36,0xff,0xf3,0xba,0xf7,0x88,0xd8,0x94,0x42,0xf7,0x5d,0x3a,0xe7,0xa5,0x29,0x29,0x7f,0xeb,0xc3,0xea,0x89,0x67,0x79},
+            {0xa3,0xb5,0xc6,0x4e,0xb6,0xd7,0x06,0x63,0xce,0x13,0xba,0xd2,0x7c,0x28,0xcf,0xe4,0x6e,0xcb,0xf7,0x21,0xaa,0x12,0xd6,0x67,0xf3,0x90,0x3e,0x15,0x5f,0x37,0x47,0x1f},
+            {0x19,0x28,0x3c,0xea,0xfa,0x4e,0x91,0x73,0x19,0x09,0x81,0x7f,0x26,0x4f,0x99,0x78,0x36,0xd5,0x29,0xc5,0x23,0x88,0x19,0x13,0xfe,0xf9,0x9c,0x04,0xc2,0x3f,0x63,0x6a},
+            {0x2c,0x9e,0xbd,0xe5,0x1c,0x78,0x34,0x78,0x61,0x6c,0x53,0x4f,0x8c,0xf3,0x0c,0x1d,0x9b,0xcb,0xa6,0x27,0xe8,0x28,0x73,0x67,0x80,0x54,0xf8,0xc0,0x5f,0x72,0xcd,0x20},
+            {0x6a,0xdd,0xba,0xcf,0x17,0x79,0x16,0x67,0x78,0xa4,0x72,0xea,0xfa,0x53,0x88,0xde,0x1e,0x51,0x76,0x5c,0x92,0x64,0xdb,0x7f,0x44,0x29,0x78,0x08,0xf3,0x0c,0xc9,0x40},
+            {0x33,0xc3,0x9d,0x4c,0xf8,0x0e,0xdd,0xc5,0xb9,0x3c,0xbf,0x11,0xf5,0xcf,0x6d,0xe0,0x20,0x23,0x70,0x9b,0x71,0xc3,0x38,0x8d,0xff,0xfd,0x48,0x5b,0xec,0xf9,0x3d,0xe5},
+            {0x73,0xd7,0x85,0x6e,0xb0,0x0d,0x8f,0x0e,0xef,0x1c,0xc6,0xeb,0xab,0x29,0x93,0x84,0xab,0xa6,0x8e,0x5e,0x7c,0x90,0xe4,0x52,0x6c,0x4a,0x33,0xa3,0xf7,0xb9,0x72,0x5b},
+            {0xf4,0x59,0x68,0x30,0x4c,0xd3,0xea,0xaf,0x43,0x0b,0x77,0x44,0xda,0xc3,0xbd,0x2c,0x28,0x7c,0x51,0xab,0x14,0x18,0xe0,0x29,0x73,0xfb,0x2f,0x6b,0xfd,0x3d,0x78,0x47},
+            {0x1e,0x18,0xa7,0x97,0xff,0x5a,0x58,0xa2,0xa3,0x25,0x13,0x58,0xd7,0xea,0x2e,0x84,0x89,0x5a,0x93,0x9d,0xd6,0x3f,0xb5,0xa3,0xc7,0x77,0x53,0xf3,0x24,0xb9,0xc8,0x6e},
+            {0x3f,0xf5,0x31,0x91,0x93,0x76,0xe2,0xad,0x06,0x04,0x36,0xf9,0xd2,0x71,0x29,0xb7,0xef,0x17,0xfb,0x8f,0xf2,0x9c,0xfc,0xe1,0xef,0x37,0x26,0x83,0x3a,0xed,0x96,0xdd},
+            {0x92,0xa1,0x62,0x65,0x88,0xc0,0x6d,0x5a,0x3d,0x74,0xa5,0x9f,0x23,0xe5,0x06,0x46,0x0f,0x99,0x32,0x3c,0x09,0xd3,0x5b,0xf5,0xd4,0x9b,0xd7,0x34,0x50,0x80,0x3f,0x50},
+            {0xbe,0x28,0x8f,0x4c,0xfe,0x34,0xbc,0x80,0x52,0x18,0x60,0x94,0x0d,0x76,0xe5,0xa4,0x2c,0x85,0xf6,0x8c,0xa1,0x90,0xa4,0xad,0x71,0xdc,0xdc,0x18,0xc4,0x19,0x81,0x03},
+            {0x93,0x39,0xb6,0x78,0x6b,0xf2,0xc8,0xc1,0xdd,0x48,0x30,0xc3,0x84,0xe0,0x3d,0xed,0xac,0x22,0xe9,0x2b,0xc1,0xaa,0x9c,0xdc,0x34,0x49,0xc6,0x74,0xbe,0xf7,0x2c,0xa6},
+            {0x1b,0x22,0xa0,0xe5,0x78,0xc6,0x41,0x61,0x3e,0x36,0x02,0x76,0x41,0x29,0xe0,0x27,0xe1,0x01,0xe2,0xd4,0x23,0xd9,0xfd,0xe2,0xa6,0x71,0x8a,0x7d,0xbd,0x72,0x6e,0xb7},
+            {0xc6,0xbe,0x93,0x8d,0x80,0x86,0x0b,0x8c,0xcc,0x96,0xba,0x08,0x7f,0xdb,0x2a,0x00,0xd9,0x80,0x80,0x8a,0x61,0xdc,0x79,0x48,0x37,0x10,0xba,0x87,0xf1,0x52,0x9d,0xde},
+            {0x4b,0xbb,0x24,0x1f,0xdc,0x1f,0xec,0xcd,0x15,0x5a,0xc9,0xfe,0xb2,0xab,0x91,0xcb,0xe7,0x14,0x03,0x0c,0xab,0x20,0xdf,0xbf,0x34,0x31,0x8a,0xe7,0x2e,0xcd,0x4a,0x6c},
+            {0x70,0x6c,0x4c,0x52,0x15,0xf5,0x4d,0xf3,0xc0,0xc2,0x56,0xe9,0xd6,0xc5,0x4d,0xe8,0x97,0x71,0x66,0x18,0x82,0x4d,0x1f,0xc6,0x30,0xd0,0x0d,0x3a,0xf0,0x59,0x35,0x2c},
+            {0x93,0xe8,0x83,0x28,0x4f,0xa2,0x63,0xb4,0x42,0xa0,0x33,0x25,0x2e,0x84,0xdd,0x63,0x7a,0x69,0x43,0xf4,0x9f,0x9d,0xb2,0x24,0x85,0x53,0x27,0x13,0x9d,0xc8,0x41,0x7c},
+            {0x68,0x9d,0xc1,0x22,0xcf,0x1c,0x3b,0x55,0x0a,0xc1,0x1e,0x00,0x41,0xb4,0x58,0x44,0xb7,0x94,0xa4,0x5c,0x31,0xa2,0x89,0x6a,0x42,0x38,0x24,0x24,0x22,0xb2,0x38,0x19},
+            {0x1a,0xee,0xd9,0x64,0x14,0x64,0x1b,0xbf,0x27,0xa3,0x2c,0x1a,0x94,0xb5,0xbc,0x22,0x49,0x47,0xf8,0x7b,0xb9,0x15,0xa5,0x3d,0xd2,0x36,0x2a,0x5b,0xaa,0xac,0x9b,0xa0},
+            {0x0c,0x0f,0x53,0x76,0x1b,0x2c,0x3f,0x16,0x8b,0x01,0xcb,0x9c,0xc0,0x58,0x94,0xcb,0x86,0xee,0x53,0xa0,0x2f,0xf0,0xc5,0xfd,0x5f,0x16,0x0a,0x8d,0x0d,0x15,0xae,0x76},
+            {0xda,0x8b,0x72,0xcf,0xb9,0x14,0x6b,0x49,0x6d,0xa6,0x71,0x9d,0x87,0xda,0x1c,0x52,0xf2,0x95,0x08,0x69,0x35,0xe1,0xf1,0x5d,0xa6,0x0a,0x86,0xb2,0x4b,0xf2,0x9b,0x97},
+            {0x23,0x89,0x05,0x8f,0xa5,0xe0,0x17,0x4f,0x21,0x72,0x60,0x52,0x2f,0x49,0xd0,0x7b,0x76,0xc7,0x75,0x8b,0x0d,0x3f,0x72,0x96,0x80,0x91,0x04,0xcf,0x78,0x56,0x1b,0x40},
+            {0x0a,0x59,0x43,0x9d,0xf4,0x3c,0xeb,0x69,0x1a,0x13,0x03,0x8b,0x87,0xb7,0xed,0x5e,0xd2,0xd0,0x5f,0x7a,0xcd,0xde,0xb2,0xcc,0x50,0x2d,0x6d,0xf5,0x37,0xb7,0x13,0x11},
+            {0xad,0x99,0x89,0xdc,0x2e,0x5e,0x4d,0x1a,0x47,0x3e,0x2f,0x30,0xf9,0x58,0x1a,0xd5,0xdd,0x16,0x1f,0x68,0x76,0x5a,0xdb,0x6d,0x2e,0x70,0xc8,0xef,0xfb,0x23,0xf3,0xff},
+            {0x46,0x63,0x09,0xe2,0x1f,0xe5,0xc8,0x55,0x5a,0x23,0x1e,0x52,0x14,0x59,0x6e,0x19,0x6a,0xd4,0x46,0x83,0xa8,0xe8,0x37,0x6e,0x45,0x3d,0xaf,0x42,0xb8,0x08,0x5d,0x9c},
+            {0xa6,0xce,0xea,0x7c,0x56,0x05,0x56,0xcd,0xba,0x4d,0x7b,0x43,0x34,0x00,0x68,0x8f,0xfe,0xff,0xcb,0xf2,0x7b,0xc7,0xd0,0x5e,0xa5,0x07,0xdd,0x2d,0x4c,0xe9,0x48,0xc2},
+            {0xb7,0x7e,0x4e,0xd4,0xbe,0xe9,0x31,0xd4,0x35,0x71,0xd6,0xf2,0x2f,0x0a,0xe2,0x53,0xae,0x2d,0xc6,0x38,0x71,0xc5,0xe4,0x84,0x5c,0x66,0x76,0xc7,0xdd,0x3f,0x0e,0xb7},
+            {0x7e,0xbe,0xf1,0x85,0x85,0x6f,0xed,0x82,0x4e,0xbc,0x3f,0x38,0xb7,0x9f,0x82,0x74,0x6b,0x29,0x83,0xf8,0x10,0x6c,0x2c,0xa6,0xa8,0xb6,0x4e,0x41,0x00,0x40,0xde,0x10},
+            {0xe9,0xa0,0x45,0x87,0x03,0x17,0x5d,0x02,0xb8,0xfc,0xe2,0xb8,0xca,0x87,0xd2,0xa6,0x06,0x22,0x70,0xe9,0x74,0x99,0x13,0x0a,0xa8,0x1a,0xea,0x62,0x1b,0x42,0x56,0x7d},
+            {0xae,0x17,0xcd,0x0f,0xa9,0x46,0x0c,0x9c,0xaf,0x2c,0x15,0x8e,0x1a,0xc8,0x09,0xd0,0xba,0xa5,0x10,0x93,0x3a,0xca,0x24,0x13,0xc3,0x16,0x84,0x0c,0xa4,0x2d,0x69,0xdd},
+            {0x0d,0x48,0x5a,0x3d,0xdf,0x32,0x9e,0x8b,0x8d,0xd4,0x7b,0x56,0x9c,0x7b,0xa6,0xfa,0xf1,0x7d,0x4d,0xbe,0x28,0x05,0x21,0xa5,0x20,0xec,0xe5,0x61,0x36,0xec,0xc2,0x18},
+            {0x20,0x24,0x1e,0x5f,0x5b,0xea,0x83,0xa9,0xef,0xe5,0x45,0x20,0xcb,0x4e,0x18,0xb2,0xbb,0xda,0x3e,0xb8,0x3b,0x08,0x75,0xf4,0x4c,0x62,0x99,0x4c,0xc2,0xf4,0xa4,0x81},
+            {0xec,0xd7,0x06,0xd3,0xf4,0x83,0x60,0x0f,0x37,0xf3,0xb2,0xb2,0x68,0xcf,0x38,0x03,0x3d,0xb1,0x29,0x0e,0x03,0x59,0xa0,0x89,0xe7,0xdd,0x44,0xd3,0x53,0x00,0xeb,0x39},
+            {0x32,0x6a,0x9e,0xce,0x99,0x55,0xf2,0xf8,0x72,0xf0,0xf6,0xe4,0x01,0xff,0x42,0x81,0xf1,0x99,0x2d,0x9f,0x22,0xf2,0x47,0xec,0xaf,0x25,0xa4,0x4f,0x56,0x61,0xc7,0x32},
+            {0x36,0xf0,0xd6,0x08,0xc8,0x31,0xea,0x73,0x65,0xb0,0xab,0x0f,0x2d,0x78,0xd4,0x4f,0x9b,0x6c,0xf0,0xa3,0xed,0xda,0x62,0x5d,0x02,0xa0,0xe8,0xdb,0x12,0x50,0xc6,0x44},
+            {0xfb,0x47,0x6c,0xab,0x05,0x54,0xcc,0xbd,0x17,0xef,0x87,0xab,0x08,0x6f,0xb7,0x03,0x10,0xf1,0xb4,0x68,0xe6,0x10,0x50,0xe4,0xc4,0x7a,0x9c,0x00,0x3f,0x71,0xa8,0x8f},
+            {0xea,0xe0,0xd5,0x2b,0xc6,0x0c,0x95,0x9f,0x73,0xcb,0xf3,0xff,0x7a,0x84,0xf1,0x00,0x5b,0x93,0x5e,0x3d,0x71,0xb6,0x4d,0xd0,0x76,0xf2,0x38,0x51,0xb6,0x1e,0x19,0xdf},
+            {0xc8,0x32,0x0f,0x58,0x62,0xf6,0xc9,0x73,0x50,0x57,0x0d,0x41,0xac,0x31,0x8a,0xb7,0x29,0xaa,0xc1,0x37,0x04,0x3d,0x0c,0xa7,0x3f,0x46,0x7e,0xca,0x67,0x0f,0xd2,0xcd},
+            {0xad,0x83,0xf8,0x44,0xf8,0x0d,0x1b,0xdc,0x54,0x55,0x93,0x99,0xd5,0x5f,0x09,0x16,0x0e,0x30,0x41,0xf6,0x3b,0xd8,0x5f,0x94,0x82,0xef,0x0e,0x01,0x59,0xe5,0x76,0xeb},
+            {0xfa,0xca,0x90,0x22,0x5e,0x0b,0x75,0xe9,0xec,0xdb,0x38,0x0a,0x4f,0x45,0x93,0x70,0x16,0xf8,0x43,0xf1,0x88,0xf4,0x8a,0x95,0x6b,0x24,0x60,0x1d,0xbe,0x2e,0x7e,0xeb},
+            {0xda,0x4e,0x04,0xa0,0x0f,0x8b,0x7a,0x27,0x24,0xc6,0x0b,0x78,0xa8,0xdf,0x4c,0xaf,0x6d,0x3f,0x65,0xa8,0xf5,0xb8,0xa8,0x65,0x61,0xce,0xb9,0x93,0x3e,0xb8,0x7a,0x72},
+            {0xc1,0x79,0x75,0xd1,0x89,0x3a,0x8b,0x62,0x91,0x5a,0x08,0x5e,0x71,0x4f,0x9c,0x6f,0x85,0xd9,0x44,0x2f,0x79,0x16,0xdd,0xec,0x6a,0x82,0x20,0x90,0xc8,0xdc,0x65,0x5b},
+            {0x7b,0x7f,0x3c,0xb7,0xbf,0x35,0x47,0x8e,0x8d,0xab,0x8f,0x33,0xac,0xc8,0x74,0x6a,0xa6,0xed,0x70,0x18,0x9e,0x0d,0xaa,0x8e,0x89,0x37,0x83,0xde,0xb5,0x5f,0xc5,0x0d},
+            {0xd0,0x31,0x1b,0x9d,0x76,0x27,0x8b,0x80,0xd7,0xf5,0x5b,0x8c,0x4b,0xac,0xaa,0x8d,0xca,0x29,0x3c,0xcc,0xea,0x20,0xa7,0x84,0xea,0x9f,0xe2,0x54,0xab,0xe9,0x3b,0x5a},
+            {0x91,0xd9,0x98,0x63,0x52,0x8e,0x63,0xd0,0x1f,0xd3,0x53,0x45,0x7a,0x91,0x0a,0xd6,0x83,0xd1,0x16,0x14,0x45,0x87,0x08,0xb3,0x1f,0xae,0x24,0x54,0xfa,0x22,0x4b,0x5b},
+            {0xb0,0xae,0x1e,0x07,0xf6,0x5c,0x9d,0xd7,0x64,0xdb,0x15,0x3a,0xa4,0x6c,0xf4,0x2f,0x68,0xd7,0x80,0xe4,0xb2,0x8e,0x64,0x2a,0x45,0x59,0xec,0x90,0xe8,0xe3,0xcc,0x39},
+            {0x43,0xfe,0xa8,0x48,0xab,0x8e,0xa3,0x4e,0x59,0x1a,0xc9,0xc9,0xf9,0x87,0x83,0xb3,0xf8,0x3a,0x81,0x2a,0x9b,0xef,0x63,0x39,0xe8,0x1b,0xd3,0x80,0xd4,0xd0,0xb0,0xd9},
+            {0x80,0x69,0x5f,0xc2,0x24,0xbc,0x3d,0x9f,0x16,0xe1,0xbe,0x90,0x78,0xe6,0x2d,0x91,0xb1,0x76,0x9c,0x41,0x47,0xdc,0x44,0x42,0x15,0x31,0xa2,0x13,0xb4,0xa6,0x94,0x60},
+            {0xeb,0xb6,0xcf,0xe7,0xe3,0x9f,0x66,0x6e,0xfb,0x4e,0x25,0x6a,0xf9,0x4b,0x5b,0x21,0xaa,0xc1,0x49,0x02,0xef,0x3c,0x23,0xe6,0x78,0x8f,0xfb,0x32,0xd1,0x6d,0xa2,0x4c},
+            {0xef,0x5b,0x6b,0xee,0xb6,0xcf,0x57,0xad,0x29,0x0d,0x3b,0xe9,0xfe,0x67,0x90,0x22,0x1f,0xe4,0x68,0x5d,0x99,0xce,0xd8,0x50,0x82,0xf6,0x6c,0xea,0x6b,0x2e,0x2d,0x96},
+            {0xa4,0x55,0x66,0x71,0xf3,0x93,0x54,0x4c,0x11,0x88,0x80,0xd5,0xe2,0xb6,0xe0,0xb6,0xa9,0xd5,0x71,0x32,0x5e,0x35,0x97,0x2c,0x8b,0xfa,0x5a,0xe7,0x0a,0x9a,0xec,0x8a},
+            {0x0d,0xf5,0x51,0x65,0xd1,0xeb,0x0f,0xdd,0x4b,0x62,0xa2,0x52,0x22,0xe0,0x60,0xb2,0x1a,0x4e,0x5b,0xe7,0xb8,0x38,0x8e,0x29,0x38,0x0b,0x86,0xb2,0x94,0x0e,0xfd,0xad},
+            {0x19,0xb6,0x0e,0xc4,0x13,0xd4,0x7f,0x58,0xa6,0x21,0x73,0x09,0x8d,0x15,0x91,0x60,0x92,0x81,0xe7,0x01,0xdd,0x07,0x96,0x56,0xa0,0x95,0x12,0xe8,0x68,0x4b,0xad,0xaf},
+            {0x52,0xe4,0x28,0x4b,0x52,0x76,0x71,0x36,0x9b,0xe8,0x6b,0x4b,0x20,0x54,0x52,0x17,0x25,0x4f,0x85,0xfa,0xaa,0x8a,0xbe,0x39,0x95,0x3b,0x59,0xfa,0x15,0x57,0x44,0x2d},
+            {0x8e,0xb1,0xa4,0x32,0x5c,0x57,0x83,0xa0,0x9e,0x0f,0xeb,0xbc,0x36,0x53,0x13,0xf3,0xc4,0xd3,0x5a,0x2c,0x16,0x18,0xee,0x65,0x32,0x57,0x2a,0xb2,0xef,0x11,0x24,0xe3},
+            {0x48,0xa2,0x51,0xc0,0x51,0xcc,0x0c,0x8b,0x05,0x1b,0x80,0x66,0x00,0xf0,0x03,0x42,0xab,0x81,0xe3,0xaa,0x11,0x1e,0x06,0x6e,0x74,0xad,0xc0,0x44,0x50,0x23,0x79,0xf9},
+            {0x97,0xfe,0xfa,0xe9,0x1a,0x85,0x83,0x8a,0x8b,0x93,0xa4,0xa8,0xcc,0x0e,0xda,0xdc,0x2e,0x50,0xb4,0x3c,0x1a,0xc0,0xe3,0x6a,0x25,0x9a,0x40,0xfd,0xf8,0xa4,0xe2,0x13},
+            {0xaa,0x13,0x42,0xbf,0xc9,0x05,0xf3,0xf2,0x55,0xc4,0x4a,0xa0,0x9d,0xf4,0x77,0x22,0x8c,0x41,0x97,0x7c,0x06,0x0f,0xb5,0xf9,0x36,0xfc,0x6b,0x48,0x38,0xc5,0xbe,0x7a},
+            {0xb9,0xe6,0x59,0x4d,0x64,0x49,0x28,0x99,0x96,0x23,0x52,0xee,0x5c,0x91,0x8c,0x3a,0xde,0x3e,0xfd,0xf9,0x2e,0x16,0xbd,0x43,0x20,0xe0,0xda,0x27,0xab,0x3c,0xe2,0xae},
+            {0x1a,0x5d,0xb6,0xb7,0xd6,0xda,0x53,0x86,0xf7,0x6e,0xf7,0x7c,0xd6,0xdd,0xc9,0x9f,0xf6,0x7d,0xe9,0x17,0x81,0x9a,0xfa,0x74,0x6d,0xc3,0xc5,0x37,0x8a,0x95,0xf3,0x0c},
+            {0xbf,0x64,0xbc,0x33,0x7a,0x88,0x6d,0x5d,0x79,0x9d,0x83,0x9f,0x03,0xee,0xe2,0x10,0xac,0xab,0x95,0xf6,0x13,0xa1,0x7d,0xb3,0x01,0x65,0xd3,0xe2,0x49,0xd0,0x7e,0x87},
+            {0x37,0xb7,0x94,0xfd,0xf5,0x6c,0x4a,0xb8,0xd2,0xb4,0xd0,0x05,0x06,0xae,0x67,0xf0,0x20,0x60,0x62,0x5d,0x55,0xad,0xf6,0xc2,0x08,0xcd,0x2f,0x53,0xb6,0x78,0x7c,0xb8},
+            {0x7d,0xf4,0x1b,0x91,0x9a,0xbd,0x69,0xe7,0xac,0xee,0x85,0xa5,0x52,0xed,0x81,0x02,0x3a,0xad,0x7a,0x4f,0x17,0x73,0xb3,0x5f,0x10,0x4a,0xf8,0xd2,0x53,0xe9,0x02,0x0e},
+            {0x71,0xbe,0x61,0x14,0xd2,0xcd,0x31,0xbe,0xa0,0x0b,0xaa,0x69,0x98,0x1e,0xdc,0x59,0xbf,0xaa,0x78,0x91,0xed,0x58,0x49,0x17,0x8f,0x37,0x11,0xf3,0x7e,0x5a,0x92,0x23},
+            {0x7e,0x89,0x08,0xc6,0xf9,0xe1,0x43,0x00,0xd4,0x4c,0x22,0x54,0xd0,0x22,0x57,0x8f,0x68,0x9d,0x8c,0x0c,0xab,0x56,0xad,0x73,0xab,0x97,0xc7,0x48,0xa7,0x1e,0x73,0x71},
+            {0x06,0xa7,0x0f,0xc0,0xc9,0xe0,0xe0,0xa3,0xa6,0x7d,0xfe,0xc2,0x6e,0xb5,0x36,0x78,0x36,0xdc,0x93,0x2f,0x20,0xf6,0x57,0x70,0xcd,0x27,0x51,0x1f,0x76,0xa4,0xef,0x7f},
+            {0x5f,0x90,0x2e,0xd0,0x69,0xca,0xc1,0x94,0xa1,0x2c,0x90,0x3f,0xd9,0x23,0x1b,0x3b,0x9b,0x73,0xae,0x49,0x9e,0x47,0x20,0x61,0x79,0xa5,0xdb,0x78,0x05,0x3b,0x7d,0x48},
+            {0xc4,0x58,0x7b,0x59,0x00,0x6d,0x17,0x7e,0xcb,0x76,0xf6,0x4a,0x08,0x3c,0x8b,0xaf,0xc9,0x26,0xb2,0x43,0xa6,0xe9,0xee,0x6e,0xf1,0x2b,0xf0,0xf3,0xfa,0xe3,0x67,0xff},
+            {0xee,0xff,0x57,0x36,0x4b,0x4c,0xee,0x2e,0x43,0xed,0x78,0x11,0x72,0x8c,0x6e,0x0d,0xc1,0x55,0xc9,0x4b,0xd8,0x63,0x05,0x67,0x98,0x1c,0x00,0xe7,0x98,0x3c,0x20,0x2f},
+            {0xd9,0xed,0x39,0xb2,0x7f,0xc2,0xcd,0x3e,0x1c,0x3b,0xdd,0xa3,0x17,0xc8,0x56,0x55,0x77,0x95,0x36,0x3b,0xac,0x22,0xe5,0x47,0x5f,0x58,0x61,0x4b,0xe9,0xda,0x5f,0x0a},
+            {0x5f,0xe8,0x29,0x56,0x50,0xa3,0xca,0x6d,0xce,0xb6,0xad,0xda,0x98,0xa9,0xb2,0xa5,0x2c,0x8f,0xf5,0xaa,0x2b,0x87,0x9d,0xbe,0x74,0xdc,0x47,0x9c,0x14,0xdf,0x78,0x3e},
+            {0xbb,0x74,0xa5,0x39,0x6c,0xa5,0x05,0x9a,0xee,0x5f,0x69,0x73,0xf7,0x60,0x28,0x58,0x58,0xdc,0x7e,0xe8,0x4f,0x34,0x63,0x11,0x00,0xb6,0x41,0xd8,0xf4,0x8b,0x89,0xb3},
+            {0xbc,0x35,0x7b,0x63,0xfb,0x90,0xba,0xaf,0xf8,0x08,0x48,0x2e,0xb6,0x45,0xd5,0x52,0x33,0x23,0xbf,0x52,0xd9,0x8c,0x3f,0xe4,0x93,0xac,0x8e,0xaa,0xa4,0x77,0x36,0x77},
+            {0x2d,0x05,0x2d,0x15,0xac,0x1c,0xe4,0xea,0xe8,0xe7,0x98,0x8c,0x58,0x67,0x79,0xca,0x83,0xb7,0xf2,0x01,0x34,0x89,0x9d,0x1a,0x72,0xbc,0x05,0xbc,0x94,0xc0,0xb3,0x5c},
+            {0xec,0x20,0xf7,0x2f,0x98,0x1e,0xf2,0xd1,0x39,0x7d,0x3f,0x05,0xc0,0xcd,0xb3,0x21,0x10,0xe4,0xc7,0xbb,0x9b,0x87,0x6a,0x9a,0xa8,0x29,0x6f,0x5d,0xae,0xee,0x6c,0xc4},
+            {0x03,0x9c,0xb4,0x33,0xd2,0x31,0x5a,0xb0,0x01,0x1d,0x4f,0x1b,0x3d,0x04,0x0e,0xc7,0xe1,0xf1,0x00,0x6f,0xc3,0x27,0x8b,0x96,0xe9,0xa8,0xe0,0x49,0x1d,0x1a,0x9d,0x60},
+            {0x2d,0xcd,0xb4,0x80,0x04,0x62,0xa1,0xc1,0x1c,0x0e,0x83,0x2d,0x04,0xa1,0xc4,0x9d,0x9f,0x62,0x10,0x3f,0x2d,0xa3,0x32,0x28,0x6c,0x48,0xfe,0x94,0xb4,0x56,0xb9,0x2e},
+            {0x4a,0x8b,0x6e,0x22,0x79,0xa7,0x39,0x2c,0xef,0xb1,0xe7,0xda,0x03,0xb4,0x23,0x71,0xa6,0x78,0xf8,0x4c,0x85,0x6d,0xe7,0x7c,0xf1,0x3f,0xf9,0xc0,0x89,0x1d,0x9b,0x00},
+            {0x57,0xbc,0xdc,0xfc,0x0d,0xed,0x16,0xc3,0x0a,0x50,0x20,0x4f,0x40,0x9d,0xfc,0x81,0xdf,0x4a,0xd4,0xb1,0xfe,0x67,0x3d,0x99,0x92,0x0d,0x9f,0x79,0xa3,0x97,0xd8,0xb7},
+            {0x02,0x61,0xb6,0xd4,0xb9,0xc1,0xc5,0xa5,0x85,0xab,0x93,0x95,0x17,0x61,0xc0,0x5a,0xe9,0xcd,0x62,0xc5,0x63,0x59,0xdd,0x82,0x14,0x86,0xd2,0xb1,0xfb,0xbb,0x31,0x77},
+            {0x2a,0x71,0xc8,0xea,0x51,0x08,0xd9,0xa4,0x59,0xc6,0xcc,0xb1,0xa6,0x14,0xcc,0x25,0x46,0xdd,0xbd,0x85,0xef,0xa1,0xeb,0x39,0xab,0x3c,0xe0,0xa5,0x04,0xcd,0xb9,0x16},
+            {0x25,0x16,0x98,0x40,0x97,0x86,0xd1,0x37,0xdb,0xce,0x1f,0x44,0x90,0xf8,0x3f,0xec,0xed,0xaf,0x38,0x48,0x09,0xea,0xea,0x79,0x3c,0x3e,0x68,0x8b,0xbf,0x61,0x81,0x1f},
+            {0x2a,0xce,0x86,0x89,0xde,0x6c,0x19,0xba,0x00,0xaf,0xdd,0xca,0x95,0xb6,0xc4,0xd3,0x2b,0x99,0x29,0x39,0x0c,0x62,0x8b,0x93,0x39,0xa7,0x7e,0xd2,0x1d,0xd9,0xec,0x97},
+            {0x10,0xe8,0x12,0x39,0xfd,0x71,0xcd,0x6f,0xc6,0xa7,0xb8,0x58,0x98,0x6c,0x7c,0x4e,0x1d,0x06,0x48,0x11,0xff,0xa0,0xce,0xdf,0xf9,0x6e,0xc3,0x4e,0x3f,0xa9,0xf4,0x54},
+            {0x19,0x81,0x91,0x6f,0x52,0x8c,0xcb,0xc3,0x54,0x7b,0xd0,0xda,0xed,0x09,0x20,0x31,0xc4,0x04,0x5e,0x1d,0x14,0x26,0x39,0x8f,0x88,0x29,0x8f,0x7d,0x29,0xe6,0x1f,0x8b},
+            {0x27,0x1c,0xf2,0xca,0xfb,0x0c,0x86,0xc1,0x05,0x8d,0x12,0x47,0x77,0x1c,0xf9,0x0c,0xd3,0x98,0x91,0x6e,0xe1,0xeb,0x49,0x88,0xb1,0x97,0x65,0x67,0x3a,0x2c,0x03,0xe6},
+            {0x9d,0x08,0x6a,0xfd,0x05,0xab,0xd5,0xed,0x8e,0x55,0x48,0x91,0x22,0x97,0x52,0xb2,0xbd,0x98,0xbb,0x12,0x4d,0x83,0xe5,0xc5,0x17,0xc7,0x27,0xa6,0xe4,0x17,0x50,0xfa},
+            {0x5f,0x2c,0x7e,0xa2,0x40,0x40,0xa7,0x4f,0x3b,0xad,0xd9,0x41,0xfc,0x60,0x2b,0xb8,0xba,0x2c,0x2f,0x3d,0xc8,0xa6,0xf1,0x2b,0xf3,0x56,0x55,0x79,0x58,0x7b,0x5a,0xc9},
+            {0x0c,0xd1,0x4f,0xf3,0xe2,0x6e,0xb0,0x25,0x35,0x03,0x59,0x2d,0x3c,0x22,0x31,0xf0,0x67,0xc0,0xd3,0x4c,0x9a,0x08,0x47,0x8b,0x3c,0xcb,0x6f,0x97,0x08,0xe6,0x3b,0xb3},
+            {0x7d,0x8c,0x41,0xeb,0x7c,0x10,0x6d,0x34,0x67,0x9f,0xda,0x95,0x9f,0x40,0x53,0x8e,0x26,0x84,0x41,0x21,0x45,0x61,0x48,0x89,0x88,0x38,0x4d,0x52,0xbc,0x49,0x59,0xbb},
+            {0xad,0x84,0x4d,0x29,0x2e,0xe3,0x14,0xdc,0xfe,0x7b,0x96,0x73,0x49,0x3a,0xa4,0x6f,0xc0,0x94,0x37,0xa3,0x21,0x59,0x84,0x51,0x4f,0x7d,0x6e,0x25,0x51,0x6d,0x82,0xe1},
+            {0x1a,0x2a,0x86,0xd0,0xc4,0x60,0x10,0x63,0x2d,0x2c,0xc4,0x22,0x25,0xc2,0x8e,0x81,0xd3,0x38,0x31,0xa7,0x62,0x90,0x4c,0x07,0xfc,0x16,0x56,0x96,0xe0,0xb2,0x1f,0x56},
+            {0xdd,0x55,0x49,0x88,0x1d,0xea,0x36,0xdc,0x21,0xd7,0x9a,0xf4,0xfe,0x8f,0xd5,0x23,0xea,0x71,0x98,0x35,0x4b,0x09,0xf1,0x1d,0x45,0xcd,0xbc,0x16,0xf2,0xf1,0xa5,0x93},
+            {0xf1,0x63,0xf1,0x90,0xfa,0x26,0x03,0xda,0x18,0xb5,0xc4,0xd6,0xa8,0xce,0x38,0x13,0x50,0x27,0xe1,0xe2,0x77,0x65,0x78,0x6d,0xda,0x3d,0x4a,0xea,0x2a,0x9c,0xb8,0x0b},
+            {0x6e,0x09,0xfa,0xfb,0x8b,0x6e,0x87,0xd6,0x18,0x9f,0x46,0xe2,0x44,0xbf,0xac,0x72,0xac,0x09,0x7f,0x88,0x1f,0xd3,0xe2,0x05,0x48,0xbc,0x9b,0x2b,0x77,0xa0,0x64,0x94},
+            {0x05,0x0e,0x25,0x82,0x75,0x79,0x54,0x4b,0x11,0xa0,0x65,0x9b,0x33,0x77,0x9e,0x36,0x09,0x1a,0x93,0x86,0xe1,0x05,0x29,0xde,0x15,0x66,0x14,0x76,0xf6,0x21,0xb4,0xbe},
+            {0x2e,0x10,0x6b,0x4e,0xe4,0x21,0x44,0x43,0xa3,0x2a,0x62,0x5a,0x80,0x50,0xbf,0xbe,0x23,0xc9,0x94,0xd5,0xd1,0x1f,0x7c,0x06,0x60,0x4d,0x67,0x44,0x9d,0xc4,0xb6,0x5c},
+            {0xf4,0x6f,0x7d,0xc3,0xed,0x00,0x45,0xf9,0x45,0x84,0xf0,0x63,0x8f,0xed,0x6b,0x4a,0x14,0x28,0xe7,0x57,0xd0,0x28,0x6e,0x64,0xa7,0xd0,0x9b,0x90,0xbd,0x37,0x9f,0x44},
+            {0x4a,0x2c,0x43,0xaa,0x7f,0xa2,0x28,0x12,0x39,0x3b,0x64,0xef,0x47,0x35,0xc4,0xce,0x9d,0xad,0x96,0xb2,0x32,0x4d,0x06,0x20,0x4d,0x17,0xcd,0x48,0x9d,0x7c,0xe4,0x12},
+            {0x98,0x86,0x2e,0x2f,0x2f,0xba,0xfa,0xf0,0x07,0x55,0xc9,0x9a,0x60,0xaa,0x04,0x76,0xcb,0x44,0x90,0x41,0xee,0x71,0x55,0x6e,0x1e,0x7c,0x64,0x42,0xe1,0x49,0xe5,0x1b},
+            {0x4c,0x11,0x83,0x75,0xe7,0xaa,0xc9,0xcd,0x50,0x40,0x42,0xc8,0x1c,0x94,0xf5,0x8f,0x12,0x39,0x24,0xbc,0xc2,0xdb,0xdd,0x07,0xef,0xdf,0x3a,0xc2,0x83,0xbd,0x06,0xec},
+            {0xbe,0xbd,0xde,0xc9,0x42,0x8e,0x78,0x02,0x42,0x3a,0xcb,0x00,0xe5,0x8d,0x99,0x8f,0x5d,0xaa,0x5a,0x26,0xbf,0xda,0xe5,0x76,0x97,0xde,0xb4,0x63,0xe9,0xe8,0x6f,0xeb},
+            {0x53,0xb0,0x3c,0x24,0xb8,0xc7,0xb3,0xc5,0x6e,0x56,0xee,0x1e,0x70,0x8d,0xf3,0xee,0xb0,0x32,0xbf,0x38,0x3d,0x7c,0xb1,0xb2,0xd3,0xfd,0x0b,0xb1,0x1c,0xb9,0x84,0xb2},
+            {0x78,0x4b,0xad,0xbf,0x46,0x47,0x65,0x20,0xb5,0xc6,0x63,0x54,0x01,0xf7,0x4e,0x99,0xef,0x7c,0x7a,0x00,0x3a,0x39,0x3a,0xa1,0xfd,0x57,0x86,0x7f,0x18,0x5d,0xd7,0x21},
+            {0x2f,0x3c,0xaa,0xeb,0x46,0xd1,0x82,0xb6,0x13,0x60,0x5b,0xcb,0x8b,0xed,0xd3,0x83,0x1b,0xfd,0x1e,0xa4,0xe7,0xa0,0x41,0xc4,0xf7,0x6e,0x0d,0x47,0x18,0xaa,0x9e,0xef},
+            {0x1b,0x3a,0xa9,0x20,0x4c,0x47,0xe2,0xd2,0xba,0x26,0x57,0xe1,0x33,0x82,0x92,0x6d,0x2e,0xad,0x35,0xd8,0x68,0x35,0x35,0x51,0xea,0xf9,0xa6,0x6a,0x70,0xc6,0x69,0xec},
+            {0xc9,0xf2,0xa7,0xd8,0x78,0xc3,0xf8,0x0d,0x76,0x27,0xae,0x2b,0x83,0x20,0x07,0xda,0xba,0xbd,0x27,0xfd,0x2f,0xc1,0x37,0x09,0x90,0x1f,0xae,0xbc,0xb1,0x4b,0x29,0x32},
+            {0x5a,0x39,0xdc,0x81,0xcb,0x0b,0x65,0x18,0xf0,0x0f,0x5c,0x66,0xac,0x65,0x9d,0xbd,0x72,0xf8,0x81,0xa7,0x8e,0x0c,0x0b,0x13,0xdc,0x88,0xad,0xe4,0x30,0xab,0xb9,0x0f},
+            {0x2f,0x0e,0xe5,0xfe,0xdf,0xa5,0x5f,0x94,0x83,0x2f,0xb2,0x74,0x4a,0x80,0xaf,0x32,0xbd,0xbf,0x77,0x08,0xba,0x65,0xa3,0xe0,0xd0,0x8b,0x44,0x63,0x58,0xda,0x14,0x99},
+            {0x1d,0x07,0xc7,0xdd,0xa8,0x60,0x7f,0xe8,0xe0,0x6c,0xef,0xe3,0x01,0x23,0xfb,0x4a,0x38,0x30,0x2c,0xa4,0xe0,0x91,0xf5,0xee,0x9d,0xf4,0x01,0x37,0x78,0xe1,0x3f,0xb3},
+            {0x3f,0xab,0xeb,0x2e,0x7e,0x8c,0xb2,0x21,0xb6,0x2d,0x4e,0x11,0xde,0xd6,0xd5,0xea,0xa1,0xdb,0x13,0x80,0xb7,0x63,0x9c,0x94,0x3f,0x60,0xa1,0xc5,0xc3,0x0c,0xad,0x09},
+            {0x51,0xa1,0xfd,0x08,0x46,0x6d,0x6b,0x37,0xcb,0xe7,0xa6,0xba,0xb1,0x84,0xc2,0x1c,0xa5,0x0c,0x9f,0xeb,0x59,0x38,0x28,0x3d,0x58,0xd8,0x9f,0xdc,0x10,0x35,0xfc,0x9f},
+            {0x07,0x08,0xc2,0xdc,0x87,0xf7,0xff,0xae,0xcd,0x46,0xd3,0xc7,0xda,0xc9,0x10,0x70,0x0b,0xbd,0xd5,0xf9,0x33,0x1f,0x26,0x28,0x19,0xec,0x9f,0xc9,0x05,0x45,0xd3,0xc8},
+            {0x2d,0x8f,0x59,0xf2,0x7f,0xbf,0x13,0x06,0xba,0x84,0x53,0xc0,0x32,0xa2,0xd8,0xbc,0x6a,0x18,0xad,0x2d,0x8f,0x3f,0xec,0x4e,0xc2,0x60,0xaf,0x16,0xf6,0x21,0x3d,0xde},
+            {0x3a,0x74,0x55,0xc9,0x0f,0x21,0x6f,0x26,0x92,0xb1,0x08,0xf4,0xc9,0x07,0xcd,0xe0,0xf6,0x48,0x72,0xed,0x13,0xe6,0xf7,0x5b,0x44,0xe5,0xf8,0x57,0x69,0x5a,0xd8,0x24},
+            {0x5f,0x1f,0xe5,0x05,0xad,0x82,0xe5,0xde,0x86,0xf1,0x69,0x77,0xbe,0x61,0x91,0x03,0xb5,0x11,0xb0,0xca,0x09,0x39,0x3d,0xae,0xd9,0x64,0xec,0x61,0x96,0x2c,0xb9,0x42},
+            {0x3d,0xec,0xaf,0x99,0x07,0xed,0xa9,0x34,0xc1,0x24,0xf6,0x03,0xd3,0x25,0x29,0x29,0xcc,0xb9,0xb9,0x9a,0xea,0xcf,0x74,0x50,0x18,0xf2,0xcd,0x61,0x2b,0xa3,0xdc,0xdb},
+            {0x4d,0x23,0x2f,0xa8,0xd8,0x1c,0xb6,0xab,0xd1,0xfb,0x68,0x06,0xb4,0x5c,0x06,0x9b,0x7f,0xa7,0x01,0x12,0x48,0xf5,0x5d,0x18,0x73,0xda,0xa3,0x35,0x31,0x2d,0xdd,0xab},
+            {0x55,0x00,0x0d,0x6b,0x9f,0xd4,0x13,0x2b,0xe5,0x8f,0xdf,0xcc,0x87,0xb5,0x5b,0x28,0xdb,0xb2,0xbc,0x25,0x9c,0x33,0xd5,0x0e,0x03,0xa9,0xd4,0x70,0xe5,0x03,0x55,0x3a},
+            {0x22,0x5d,0x9a,0x9f,0x99,0x1b,0x12,0xfa,0xb8,0x90,0xcc,0xf0,0x6e,0xe6,0x54,0xaf,0xad,0x48,0x78,0xa3,0xa8,0xc0,0xbb,0x3d,0xdf,0xdd,0x54,0xaf,0x3b,0xa7,0x4e,0xe3},
+            {0x40,0xdf,0x7f,0x28,0x5d,0xcc,0xf9,0x66,0x03,0x1f,0x1e,0x88,0x15,0xbe,0xc7,0x47,0x3a,0x74,0x8f,0x37,0xc9,0x40,0x5a,0xd9,0x8b,0x0c,0xcd,0x40,0xc8,0x7f,0x98,0x6d},
+            {0xc4,0x15,0x6b,0x96,0x59,0x80,0x19,0x13,0x90,0x9a,0xa5,0x95,0x55,0x48,0x72,0x5e,0xd2,0xa2,0x51,0xe9,0xd3,0xb3,0xa5,0x87,0x78,0x60,0x94,0xdc,0x29,0x9a,0x8f,0x61},
+            {0x5d,0xc3,0xa9,0x5d,0x6f,0x96,0xb9,0x46,0x23,0x7a,0x99,0x77,0xb4,0xc1,0xe0,0x5b,0x24,0x79,0x97,0x29,0xf0,0x3c,0x19,0x1b,0x08,0x4c,0x61,0x18,0x10,0x6f,0xd7,0x12},
+            {0x11,0x8b,0xf0,0xb7,0x86,0x8f,0x02,0xb1,0x15,0x41,0x98,0x10,0x7b,0x4a,0x86,0x87,0x3e,0xf4,0x71,0x15,0x39,0x67,0xec,0x7b,0xb1,0x13,0x41,0xca,0xf7,0x0c,0x43,0x55},
+            {0x1a,0xd3,0xa5,0x31,0x07,0x30,0xb0,0xb6,0x98,0x51,0x2c,0x8c,0x7d,0x3e,0x7a,0x85,0x52,0xf7,0x5b,0x5c,0x7e,0xec,0x45,0x46,0x86,0x0b,0xfd,0xc6,0x22,0xf7,0x5e,0x7d},
+            {0xfb,0x74,0xa1,0xc1,0x3b,0x1e,0xb1,0x94,0x23,0xdd,0x80,0x5a,0x4d,0x85,0xee,0x77,0x1e,0xcf,0x52,0xe3,0x95,0x6b,0x51,0xb0,0x40,0x9c,0xc5,0xbb,0xee,0xc3,0x45,0x69},
+            {0x74,0x05,0xd1,0x58,0xd5,0x1c,0x83,0xcf,0xb8,0xda,0xbb,0x32,0x01,0xf6,0x92,0xe3,0xbc,0x08,0x9f,0x02,0x0c,0xae,0x6b,0x62,0xa2,0xaf,0x2c,0x88,0xdd,0x8f,0x03,0xed},
+            {0x08,0xf2,0x0e,0x5a,0x8d,0xea,0x1f,0x32,0x17,0xc9,0x90,0xbc,0x11,0x2f,0xe5,0x10,0xca,0x5a,0xac,0xde,0xfa,0xbd,0x5a,0x2a,0x69,0x58,0x33,0x9a,0xbb,0x88,0xad,0x7a},
+            {0xde,0xc3,0xf7,0xbb,0xee,0x14,0x1e,0x55,0xa6,0x8d,0x1d,0x16,0x4e,0x89,0x1d,0x9b,0xf8,0x32,0xca,0xb1,0x48,0x06,0x1a,0x15,0x51,0x47,0x5f,0xe3,0x3c,0x1b,0xc8,0x68},
+            {0x0a,0x31,0x16,0x78,0xa6,0x26,0x6d,0xe6,0x2c,0xeb,0x20,0x15,0x4e,0x6b,0xa5,0xba,0x55,0x60,0x50,0x7d,0x58,0xd8,0xc5,0x79,0x84,0x74,0x96,0x7b,0x49,0x24,0x65,0x1c},
+            {0xb4,0xf4,0x8f,0xd1,0x7a,0x7c,0xd9,0xe0,0xb2,0x6e,0x90,0xa8,0xad,0xfa,0x2f,0x9a,0x15,0x0d,0x47,0xe9,0xa2,0x03,0xcb,0x89,0xdf,0x11,0x45,0x85,0x64,0x5c,0x87,0xb6},
+            {0x26,0xa5,0xc7,0x6a,0x25,0xd0,0x2b,0x0f,0xeb,0x4b,0x22,0xe5,0x49,0xac,0x88,0x44,0x7a,0xbb,0x8f,0xe7,0xc8,0x61,0x96,0xa7,0x32,0x92,0xf1,0x3d,0x8e,0xea,0x61,0xaa},
+            {0x2f,0x41,0xb5,0x89,0x11,0xb0,0x4c,0x34,0x18,0xbc,0xf7,0x6d,0xfc,0xc5,0x00,0xd0,0x3a,0x55,0xfb,0xf1,0x74,0x9e,0xe8,0x3a,0x4e,0x98,0x1f,0xce,0x4e,0x32,0xeb,0x4a},
+            {0x41,0x1a,0x18,0xb6,0x78,0x5d,0x5c,0xab,0xf9,0xb6,0x66,0xa9,0xa7,0x0c,0xdf,0xc5,0xa1,0xe2,0x92,0x28,0xf9,0x2f,0x80,0xb9,0xf8,0xd6,0x13,0xfa,0xce,0x01,0x95,0xf1},
+            {0xb1,0x7d,0x0a,0x2c,0xb4,0x6d,0xcc,0x36,0x5e,0x06,0x52,0x67,0xbb,0xc2,0xcc,0x36,0xe9,0x2e,0x20,0xbc,0x0c,0xe2,0x4d,0x14,0x40,0x89,0xd6,0x92,0x82,0xe6,0xfa,0x19},
+            {0x30,0xed,0xe2,0x6b,0x25,0xbc,0xc2,0xe6,0xcc,0x42,0xf2,0x48,0x38,0x6c,0x61,0x49,0x9a,0xe4,0x77,0xd4,0xfb,0x39,0x2e,0xe2,0x89,0x23,0x8c,0x40,0xc8,0x8a,0xb5,0xab},
+            {0xf1,0xbb,0xaa,0xfd,0xc5,0xf0,0xe0,0x0a,0x5d,0xad,0x95,0xc9,0xdd,0xf6,0x59,0x74,0x7c,0x74,0xd0,0x93,0xe1,0xcb,0xa8,0xa0,0xe7,0x2f,0x1d,0xb1,0xd5,0xcd,0x90,0x4e},
+            {0x09,0xe4,0x11,0xef,0x14,0x0d,0xab,0xa6,0x9c,0xfd,0xc2,0xc3,0xc3,0x2f,0xd8,0x4c,0xd5,0x72,0xa8,0x42,0xf5,0x33,0x88,0x12,0x4b,0x51,0xaa,0x2e,0xb1,0xe4,0x0f,0xa5},
+            {0x2c,0x40,0x8b,0x68,0x5a,0xfb,0x25,0x74,0xe9,0xfe,0x2a,0x21,0x2e,0x92,0xc6,0x38,0x09,0x0e,0x85,0x10,0x26,0xac,0x80,0xc9,0xa6,0x39,0xda,0xf2,0x34,0xfd,0xb9,0x84},
+            {0xa3,0x42,0xb5,0x4e,0xd7,0x09,0x22,0x64,0x59,0x55,0x69,0xa3,0x7a,0x5e,0x51,0x40,0xa4,0x8d,0x51,0x17,0xf6,0x28,0x33,0xde,0x3d,0xc1,0x92,0x35,0x16,0xd5,0xb9,0x17},
+            {0xb9,0x0a,0xf8,0x46,0xef,0x17,0xcb,0xdf,0xdc,0x06,0x39,0x9f,0x2d,0x67,0x90,0x19,0x4f,0xd2,0xd7,0x81,0xba,0xbb,0xcb,0x2c,0x3b,0xa0,0x05,0x03,0x1a,0x27,0x86,0x50},
+            {0x16,0xc6,0x5a,0x80,0x54,0xf7,0xc7,0xc6,0xbe,0xed,0xb1,0x72,0x49,0x89,0x72,0xf2,0xc3,0xdc,0xf0,0xe8,0xda,0x24,0x0c,0xc8,0xf1,0x20,0xdc,0xee,0x74,0x39,0xc9,0x5f},
+            {0x89,0x79,0xda,0x94,0x95,0x93,0xc8,0x0f,0x91,0x64,0x82,0x81,0x07,0xf0,0x46,0x02,0xd7,0x0c,0xa4,0x94,0x94,0x7d,0x6c,0xa7,0x72,0x21,0x80,0xca,0x85,0xc8,0xc0,0xd2},
+            {0xeb,0x4e,0xf6,0x4a,0x1e,0xb1,0x38,0xe6,0xec,0x74,0x14,0xb3,0xd8,0x41,0xd2,0x4e,0x61,0xd6,0xac,0xa9,0x4a,0x87,0x0d,0x35,0x68,0xf8,0x9b,0xfe,0xec,0x28,0xce,0x5b},
+            {0x8d,0xb8,0x28,0x05,0x5c,0xa1,0x15,0x4a,0x1c,0x1b,0x60,0xb9,0x92,0x29,0x9b,0x2a,0x3c,0xc9,0xf9,0xff,0x21,0x7e,0x15,0xa3,0x29,0xb6,0x42,0xc8,0xd5,0x51,0x53,0x44},
+            {0x58,0x13,0xff,0x09,0xa7,0x9c,0xd7,0x4b,0x6f,0xb3,0x30,0x7c,0x27,0x7c,0xaf,0x7e,0x80,0xf3,0x50,0x6a,0xfb,0x67,0x7e,0xee,0xc6,0x55,0x55,0xb7,0xfd,0xb8,0xbc,0xcb},
+            {0xe1,0x58,0x83,0x83,0x17,0x14,0xac,0xb3,0xd5,0xc0,0x8a,0x38,0x98,0xdd,0xc6,0x28,0x01,0x14,0xf1,0xb4,0x1c,0x45,0x0f,0x6e,0x93,0xa2,0x7b,0xb3,0x6e,0x7c,0x67,0x66},
+            {0x95,0xee,0x3e,0x0a,0xcc,0x20,0x4a,0x6b,0xd5,0xf5,0xb4,0x84,0xe9,0x07,0x05,0x66,0x95,0xcf,0x5a,0xce,0x25,0x44,0x9f,0xab,0xe8,0x7f,0x25,0xd6,0x1b,0x12,0x62,0xf1},
+            {0x8e,0xb0,0xd5,0xda,0x9c,0x24,0x7c,0x96,0x2e,0xba,0x90,0x81,0xb9,0xb5,0x84,0x13,0xb8,0xf7,0xaa,0xec,0x03,0xdf,0x28,0x13,0xc7,0x7c,0xe4,0x45,0x73,0xa3,0xab,0x1f},
+            {0xaf,0xb8,0x41,0xdb,0x4f,0x6c,0x64,0xfc,0xfd,0xa6,0x54,0xcf,0x05,0x8f,0x0a,0x88,0x31,0x66,0xb4,0x06,0x6f,0xba,0x6b,0xe6,0xdf,0x5d,0xad,0x56,0x4d,0xa3,0x05,0x15},
+            {0x68,0xfc,0xe2,0x67,0x89,0x4f,0xfd,0x76,0xf5,0x51,0xa1,0x69,0xc9,0x50,0x8e,0x53,0x81,0x0b,0xb1,0x2e,0x77,0x30,0x15,0xaa,0x4c,0x54,0x7a,0x56,0xa5,0x80,0x6f,0xee},
+            {0x6e,0x61,0x4d,0x1a,0xfb,0x78,0x3e,0x6b,0x45,0x30,0x1b,0x2f,0xa0,0x37,0x88,0xa1,0xfe,0x27,0xf2,0x80,0x8c,0xd2,0xb5,0x13,0xea,0xbe,0xb1,0x22,0x6e,0x62,0x41,0xdd},
+            {0x6b,0xb0,0xcd,0xb7,0xd8,0x68,0x6d,0x79,0xab,0xb5,0x45,0x3c,0x3f,0x50,0x45,0xc1,0xac,0xc2,0xe2,0x68,0xb3,0xf2,0xb3,0x24,0x44,0xe6,0x07,0x96,0xa1,0x8d,0x4c,0x12},
+            {0x9b,0x99,0xc8,0x63,0x06,0x8f,0x24,0x29,0x7d,0xf3,0x43,0x10,0x25,0xec,0x65,0x64,0xb6,0x6f,0x2b,0x9f,0x64,0xc1,0x67,0x8b,0x52,0x8a,0x1d,0xbc,0x4b,0xf7,0x1b,0x16},
+            {0x20,0x4b,0x6f,0x2f,0x3e,0xc5,0xbd,0x0f,0x19,0x07,0xfd,0xb4,0x60,0xe4,0xed,0x6f,0xb0,0xd2,0x5d,0xe5,0xcc,0x12,0xf7,0x77,0xa1,0xce,0x10,0xaa,0xcb,0xed,0x40,0xc4},
+            {0x61,0x5f,0xba,0x5e,0x47,0xab,0x0d,0x95,0x9f,0xbc,0xef,0x39,0x99,0x69,0x36,0xda,0x65,0x6e,0x26,0x15,0xb9,0x54,0xf0,0x3b,0x61,0xfb,0xfa,0xa8,0xe1,0xa4,0xf5,0x00},
+            {0x52,0x98,0x95,0xa7,0xde,0x06,0x3c,0xf6,0xe2,0x49,0x7d,0x30,0xd8,0x49,0xa8,0xdf,0x3c,0x4f,0x73,0x39,0xe2,0x2a,0x48,0x60,0x44,0xcb,0xb3,0xe7,0x49,0x6f,0xec,0x22},
+            {0xb7,0xfd,0x2e,0x4c,0x0b,0x84,0x58,0x50,0xf0,0x44,0xf3,0x2c,0x5d,0x51,0x23,0xaf,0x9d,0x5e,0xaa,0xa6,0x93,0xd4,0x35,0x0c,0x4c,0xa8,0x75,0x8b,0xfb,0x85,0x7b,0x19},
+            {0x05,0x9e,0x01,0x5c,0xff,0x4b,0x33,0xf0,0x19,0x92,0x1f,0x92,0x42,0x53,0x3c,0xb4,0x5c,0xd6,0x5e,0x50,0x7e,0xd8,0x82,0x20,0x53,0x67,0xb7,0x46,0xb2,0x7f,0x44,0x42},
+            {0x1b,0x79,0x15,0x3a,0x3a,0x25,0xbc,0x82,0xc7,0xf5,0x2a,0x57,0x7c,0x14,0x0d,0x85,0x85,0x4d,0x76,0xb3,0x26,0x8e,0x33,0x2b,0x58,0x71,0xa4,0xde,0x4e,0xaa,0xa4,0x7e},
+            {0xb9,0x73,0x0c,0x36,0xbf,0x74,0x02,0xa5,0xd0,0x6c,0x82,0x26,0xdc,0x11,0xeb,0xec,0x9c,0x0a,0x4b,0xd6,0xa2,0x37,0x62,0xa6,0xe9,0xe7,0x8d,0x1b,0x99,0x6a,0x46,0x30},
+            {0xd2,0x24,0x27,0xbf,0x91,0xdc,0xcf,0xac,0xba,0x55,0x35,0x7d,0x4a,0x80,0x38,0xf7,0x97,0xee,0xff,0x2c,0x4d,0xab,0x56,0x22,0x0c,0xb0,0x0d,0x9a,0xe8,0x97,0xb7,0x83},
+            {0xda,0x19,0xf4,0x2f,0x6d,0xc6,0x0f,0xcc,0x3d,0x07,0x5d,0x6f,0x38,0x67,0x19,0x49,0xce,0x2d,0xad,0x31,0xb3,0x74,0x96,0xa6,0x38,0xd3,0x41,0x75,0x78,0x22,0xe9,0x2d},
+            {0x78,0x13,0x25,0x89,0xeb,0x98,0xac,0x63,0xe5,0x3a,0x32,0x9f,0x7c,0xee,0x32,0x58,0x4d,0xd4,0x47,0xbb,0x9f,0xbb,0xbc,0x01,0xe2,0x72,0x45,0xca,0x29,0xc2,0x3a,0x23},
+            {0xe4,0x67,0xea,0x63,0xa7,0x27,0xb9,0xc3,0x6e,0x66,0x6d,0x43,0x56,0x64,0x87,0x5c,0x82,0x2f,0x94,0xf0,0x47,0xf6,0x0a,0xc0,0xd8,0x9f,0x27,0x33,0xbd,0x4d,0x1f,0x01},
+            {0xf4,0xf8,0x91,0x49,0xb1,0xa5,0x77,0x9d,0xfd,0xfa,0x3a,0x9b,0x7d,0xc5,0xb8,0x87,0x91,0xde,0xb3,0x2c,0x20,0xdb,0x6d,0x61,0x1f,0xa0,0x13,0xb9,0xa2,0xea,0xde,0x6b},
+            {0x7b,0x40,0xc1,0x96,0xae,0xf9,0x7a,0xa0,0x32,0xf8,0xa1,0xba,0x0b,0x88,0xae,0xd1,0x2b,0xaf,0x43,0x31,0xac,0xac,0xae,0x65,0x13,0xe8,0xf4,0xfb,0xb1,0x02,0xdc,0x98},
+            {0xdc,0x87,0xf4,0x20,0x69,0x41,0xdf,0xd0,0x43,0x1d,0xba,0xe6,0x06,0x35,0x8b,0x03,0x74,0x1e,0x52,0xc9,0xc9,0x83,0x00,0x17,0x84,0x70,0x42,0xf9,0x9c,0xaa,0x1a,0x89},
+            {0x29,0x3c,0x65,0x0a,0x8f,0x2b,0x44,0x2d,0xa1,0x99,0xba,0x6d,0xc3,0x1c,0xbc,0x76,0x16,0xc0,0x9b,0xdf,0xcb,0x68,0x5d,0x21,0x6f,0xe5,0xf6,0x96,0x4e,0xbd,0xcc,0x19},
+            {0xcf,0x37,0x36,0x73,0x9c,0x87,0x08,0x2a,0x71,0x65,0x35,0x40,0xbe,0x25,0x4c,0xad,0x9d,0xd2,0xb8,0x0c,0x78,0x89,0x10,0xff,0x51,0x83,0x30,0x53,0xde,0x0f,0x68,0x33},
+            {0xb7,0x90,0x4a,0x9d,0x28,0x2e,0xe1,0x47,0xc4,0x1a,0x87,0xab,0x1d,0xe0,0xc6,0x8f,0x6f,0xe6,0xe8,0x68,0x1b,0x72,0x8a,0x50,0xb0,0x7d,0xbf,0x82,0xab,0x61,0x99,0x0f},
+            {0xff,0x43,0x76,0x0b,0xac,0xfb,0xd8,0xa8,0x6b,0x77,0xee,0x50,0x52,0x4d,0xf7,0x29,0xbf,0xc3,0x22,0xd2,0x21,0xbf,0x39,0xd7,0x3f,0xbd,0xcc,0x51,0x72,0xbe,0x25,0xcf},
+            {0x94,0xb1,0x95,0x11,0xa9,0x01,0xd6,0xc9,0x86,0x3b,0x4e,0x69,0x8b,0xd3,0x20,0x3b,0xb4,0x5f,0x45,0x9a,0x70,0x6f,0x17,0xd5,0xfd,0x02,0x17,0xb7,0xd4,0xd2,0xe8,0x80},
+            {0x5f,0xb4,0x2d,0x90,0x12,0x3e,0x7d,0x17,0xbd,0xf8,0x47,0x17,0xdb,0xa1,0x7f,0x8d,0x6e,0x2e,0x4c,0xb9,0x85,0x6e,0xbc,0xb5,0xdb,0xf6,0x89,0x2f,0xd2,0x27,0xd4,0xf8},
+            {0xd4,0x03,0xda,0x45,0x25,0x41,0xaf,0xc9,0x8e,0xa4,0x56,0x71,0x52,0x2d,0xb8,0x60,0x5d,0x28,0xa1,0x37,0x3b,0xaa,0x96,0x27,0x91,0x49,0xd7,0x0f,0xec,0x56,0xe8,0xdb},
+            {0xc5,0x15,0xc1,0xf3,0x13,0x2d,0x71,0x24,0x54,0x6c,0x21,0x49,0xd2,0xf9,0x6b,0xf8,0x89,0x99,0x54,0xed,0x28,0xdb,0x73,0x7d,0x81,0x14,0x9c,0xbd,0x9f,0x84,0xba,0x87},
+            {0x75,0x59,0xf5,0x06,0xa7,0xdf,0xdd,0x3a,0xc7,0xf1,0x3d,0xbc,0x61,0x66,0x29,0xb5,0x6b,0x88,0xf8,0xe4,0x3e,0x60,0x39,0x20,0x51,0x82,0xb1,0x71,0x36,0xe4,0x5e,0x6d},
+            {0x6b,0x3f,0x15,0x3c,0x83,0xca,0xaa,0x5f,0x7b,0xff,0x60,0x8f,0x4f,0xbc,0x51,0x4f,0xee,0xe1,0xad,0x49,0x65,0x26,0x91,0x39,0x3b,0x26,0xe6,0x0a,0x38,0x60,0xac,0x49},
+            {0xb2,0x5d,0xc9,0x60,0x44,0x3d,0x80,0x0d,0x10,0x74,0x91,0xed,0x43,0xa2,0x24,0xdb,0x6d,0xf6,0x6c,0x12,0xb0,0x2b,0x7d,0xbd,0x34,0x15,0xad,0x4c,0xf3,0x8c,0x1f,0x25},
+            {0xa7,0x0e,0x10,0xb5,0xd4,0x57,0xc0,0xc1,0x0a,0xe7,0x65,0xd7,0x69,0x6e,0x96,0xd1,0x72,0x1b,0xbd,0x05,0x57,0x38,0x6c,0xd0,0x0d,0xb2,0x7f,0x7d,0xd6,0x1c,0x80,0x39},
+            {0xc1,0x2d,0xf3,0x55,0xcf,0xaa,0x94,0xc9,0x15,0x4a,0x29,0x84,0x8e,0x53,0xdf,0xb2,0xd1,0xbc,0xc7,0xb6,0x8c,0xb1,0x50,0x6d,0x06,0x7f,0x5f,0xee,0xbe,0xca,0x21,0x34},
+            {0xc9,0xa6,0x97,0xb7,0x43,0x43,0x05,0x77,0x7c,0x80,0x68,0xaf,0x8b,0x5b,0xfd,0x65,0x4d,0x74,0xbc,0x5a,0xd8,0x22,0x20,0xf8,0x4f,0xe1,0x6e,0x1c,0xc9,0xcb,0x21,0x73},
+            {0x26,0x1d,0xab,0x49,0x4a,0x2e,0x8a,0xdc,0xbd,0xfa,0x76,0xb1,0x71,0xa1,0xdf,0xea,0xe0,0xa7,0x0c,0xfe,0xe5,0x28,0xd7,0x81,0x88,0x35,0x37,0xc3,0x5a,0xd3,0x75,0x46},
+            {0xdf,0x2a,0xab,0xab,0xde,0x59,0xee,0xc1,0xb7,0xb4,0x99,0x85,0x89,0x84,0xc1,0x20,0x45,0x57,0xf5,0x99,0x65,0x9f,0x05,0xf6,0x67,0x1d,0x1d,0x66,0xd2,0x27,0x3d,0x68},
+            {0x36,0xbb,0xad,0xcd,0xdf,0xe8,0x07,0x58,0xe7,0xb9,0x1d,0xc8,0xbb,0xd2,0xd2,0xcf,0xca,0x89,0xaa,0x1c,0x50,0xad,0x41,0xa7,0x06,0xc9,0x9b,0xd1,0x92,0xc1,0x04,0x2f},
+            {0xbb,0xbd,0x1e,0x0d,0x04,0x1c,0xf1,0xb3,0x40,0xf9,0xb0,0x87,0x3d,0x87,0x6e,0xad,0x1b,0x76,0xc6,0x0f,0x59,0x3e,0x8b,0xa8,0x2e,0x2d,0x70,0x03,0x09,0xea,0x5b,0x4c},
+            {0x07,0x70,0x8b,0xd4,0x11,0x3b,0x5e,0x27,0x73,0xac,0x0d,0x65,0x32,0x3a,0x79,0x3e,0x5d,0xcc,0x36,0x6b,0x12,0x60,0xeb,0x55,0xf6,0xed,0x80,0xf6,0xfb,0x3e,0xec,0xe5},
+            {0xb7,0xfd,0x39,0xd2,0x1a,0xf1,0xc3,0xff,0x30,0x22,0x52,0x30,0xa8,0x6c,0xb3,0x82,0x68,0x0b,0xab,0x72,0xcd,0x83,0xc0,0x81,0x49,0x5d,0xf2,0x52,0xbb,0xd3,0x1d,0xca},
+            {0xa0,0x1f,0x73,0x48,0xd2,0x3c,0xfc,0x9c,0x72,0xd4,0xc6,0xc8,0xd4,0x1d,0x00,0xf2,0x53,0x31,0xa9,0xf6,0xb2,0x8f,0x70,0x4e,0x31,0x4f,0x46,0xb9,0xa5,0xfe,0x88,0x36},
+            {0xe1,0x4b,0x68,0x69,0x72,0x5e,0x9f,0x7c,0x8b,0x4d,0x0f,0xbd,0x88,0xd1,0xcb,0xf9,0xa9,0x69,0xe8,0x00,0xbd,0xde,0xb3,0xb4,0x26,0xab,0x13,0xa9,0xe1,0xc6,0x87,0x3f},
+            {0xad,0x16,0xff,0x69,0xba,0xf5,0x69,0x07,0x83,0xab,0xa8,0xde,0x17,0xd0,0x9a,0x92,0xaf,0x4f,0xe6,0x2a,0x98,0x5e,0x33,0xc0,0x96,0x9e,0xd7,0x34,0xd0,0x9b,0xed,0xe2},
+            {0xd3,0xed,0xfb,0x7f,0x2e,0xe7,0xcd,0x65,0x47,0x93,0xfc,0xe2,0x45,0x66,0x6e,0xfe,0x24,0x65,0x50,0x95,0xb9,0x09,0x81,0x52,0x09,0x3b,0x3e,0x5a,0x12,0xcc,0x41,0xf7},
+            {0x50,0xcd,0xf9,0x81,0x02,0x5f,0x02,0x19,0x0a,0xef,0x3c,0x09,0xb5,0xad,0xed,0x26,0x47,0x2f,0xe5,0xb1,0x55,0xc6,0x89,0xac,0xd1,0x60,0x0b,0x6f,0x16,0x3b,0x0a,0xef},
+            {0xd9,0x44,0xee,0xe4,0x76,0xfc,0xd3,0x2e,0xcf,0x4d,0x85,0xd5,0x79,0x6e,0x17,0xec,0x2a,0xdc,0xa8,0xf9,0xf6,0xce,0x1c,0x1f,0x66,0x68,0x7e,0x2d,0x99,0xa2,0x9f,0x2c},
+            {0x6e,0xae,0x57,0xda,0x95,0x14,0xdd,0x54,0xa3,0xf5,0x92,0x0e,0x18,0x91,0x52,0x99,0x82,0xd8,0x8c,0x17,0xe7,0xad,0x6f,0x6d,0x8d,0x24,0xc7,0x31,0xe1,0x50,0x79,0x92},
+            {0xba,0x0b,0x8b,0xdb,0xa0,0x72,0x11,0x87,0x8e,0x29,0xc7,0x1e,0x21,0xbb,0x5a,0xba,0x51,0x86,0xe5,0x0f,0xd4,0x5b,0x43,0x03,0xf8,0x46,0x89,0x7b,0x8c,0x40,0x9a,0xe5},
+            {0x16,0x82,0x8f,0x8c,0x42,0x55,0x52,0x36,0x6c,0xed,0xc4,0x1a,0x7c,0xa7,0xf0,0xdf,0x1c,0x5e,0x5a,0x9d,0xc5,0x43,0xbf,0xd9,0xb0,0xdf,0x65,0x02,0x1d,0x08,0x7a,0x48},
+            {0x33,0x82,0x22,0xd8,0xae,0x91,0x83,0x3d,0xe9,0x00,0x8c,0x65,0xcf,0x51,0x9b,0x1d,0x02,0x1c,0x60,0x72,0xd0,0x9c,0xfc,0x08,0xf7,0x8d,0x00,0x23,0x00,0xb6,0xdb,0xf3},
+            {0xc0,0xa2,0x48,0x05,0xf9,0x80,0xcb,0xf6,0x08,0x92,0xcd,0x89,0xaf,0x24,0x9f,0xb0,0x6c,0x07,0x9c,0x69,0x4e,0x3c,0xd8,0x4f,0x0c,0xba,0x7f,0x21,0xf9,0xe6,0xfc,0x9b},
+            {0xfb,0xdd,0xe5,0x3f,0x55,0x41,0xec,0x1f,0xee,0xc1,0xa3,0x81,0x40,0x9d,0x5e,0xc9,0xc6,0xba,0xff,0xe9,0x7c,0xa0,0xc7,0xe0,0x6f,0x24,0xe8,0x41,0xd2,0xb1,0x16,0x1a},
+            {0x17,0x52,0xa7,0x3a,0x37,0xc1,0x4d,0x50,0x80,0xef,0xc1,0xec,0x13,0xbb,0x1d,0xcc,0xb9,0xbc,0xc0,0x28,0x1a,0x4d,0x95,0xcc,0x2e,0xf4,0xb8,0x53,0xec,0xfa,0x6c,0x31},
+            {0xfd,0x2e,0x0c,0x2b,0x50,0xb4,0x72,0xb9,0x0d,0x7f,0x4b,0xd1,0x19,0x08,0x52,0x24,0x21,0x9e,0xe5,0x33,0xa9,0x99,0x22,0xeb,0xd8,0xcb,0x0f,0x2c,0xbe,0xe9,0xcd,0x7e},
+            {0x3a,0x1d,0x28,0xfe,0x96,0xaf,0x22,0x2b,0x8b,0xcb,0xbd,0x2e,0x93,0x7a,0xd0,0xd1,0xf4,0x12,0x8c,0x7d,0xe8,0xc7,0xae,0x4d,0xdf,0x70,0x15,0xb0,0x7a,0x1f,0x6b,0xc8},
+            {0x79,0x19,0xfe,0x4c,0x12,0x65,0xbc,0x19,0x42,0x72,0xf2,0xd3,0xe0,0xa0,0xa0,0xdd,0x48,0x53,0xb9,0xf3,0x18,0xba,0xf6,0x28,0x74,0x84,0x54,0x9b,0x01,0x40,0x4b,0x68},
+            {0x10,0xf6,0xbf,0x39,0xd6,0x32,0x9a,0xf3,0x91,0x6a,0x57,0x1e,0xa4,0xae,0x1d,0xe7,0x0c,0xc2,0x3a,0x98,0x18,0xa8,0x66,0xbe,0x45,0xc2,0x67,0x28,0x4d,0x3a,0xbf,0xd5},
+            {0xcb,0x0c,0x69,0x1d,0x72,0x66,0x46,0x0c,0x4a,0xf2,0x83,0x86,0x19,0x19,0xc3,0xee,0x42,0x7c,0x09,0x83,0x1e,0x70,0x16,0x1c,0x0b,0x74,0x85,0xb3,0xf4,0x20,0xc0,0x51},
+            {0x69,0xd7,0x91,0x6a,0x16,0x18,0xb9,0x4a,0x97,0x94,0xdb,0xff,0xfb,0xda,0xfe,0x15,0x5f,0x92,0x1b,0x57,0xb4,0x0c,0x6a,0x55,0xe8,0xca,0x17,0x40,0x5d,0x11,0x83,0xb0},
+            {0x0c,0x59,0xdc,0x8c,0x3c,0xaf,0x16,0xb4,0x80,0x84,0x7e,0x08,0x6c,0xc5,0x3f,0x4b,0xcc,0x55,0xc0,0xad,0x0b,0x2d,0x69,0x54,0xf9,0x43,0xee,0xda,0xb4,0x57,0xc8,0x6b},
+            {0x8a,0xcc,0xbc,0x6c,0x5c,0x4a,0xbd,0x38,0xdd,0x25,0x74,0xcf,0x0a,0x84,0x28,0x67,0x09,0xbb,0x37,0x7a,0xea,0xe9,0xd5,0x06,0x68,0xb2,0x14,0x51,0x90,0xff,0x94,0xeb},
+            {0x66,0x21,0x3a,0x6b,0xb4,0x46,0x95,0x87,0x37,0x9b,0x20,0x42,0x33,0xf5,0xc4,0xcb,0x92,0x13,0xc9,0x44,0x3c,0x6a,0xc8,0xa8,0xf5,0x74,0x8f,0x33,0x92,0x23,0xbc,0xf8},
+            {0x15,0x12,0x29,0x4a,0x5b,0xac,0xf0,0xe0,0x3d,0xd0,0x13,0xbd,0x22,0xc0,0x46,0x9b,0x02,0xc6,0xa5,0x6a,0xe6,0xab,0x03,0xd0,0x89,0xd1,0xb5,0x9f,0x9b,0xf4,0x7b,0xa9},
+            {0xa5,0xed,0x32,0x7b,0x13,0x92,0xf5,0x14,0xa7,0xca,0x39,0x36,0x57,0x19,0x4e,0x0c,0xc1,0xf5,0xf4,0x54,0xae,0xfd,0xba,0x63,0xe8,0x67,0xa3,0x90,0x5c,0x9f,0x3b,0xa6},
+            {0xaf,0x21,0xc0,0x21,0x5b,0x6b,0x80,0x16,0x17,0xc9,0xb5,0x90,0xa5,0xbb,0xca,0x48,0x74,0xf5,0xa2,0x3e,0x7f,0xff,0x46,0xe2,0xfc,0x38,0x0b,0x4e,0x50,0x1b,0x1b,0x42},
+            {0x48,0xd9,0x7a,0x31,0x0c,0xff,0xb3,0xc3,0xf5,0x76,0xb5,0x61,0x5c,0xa7,0xd3,0x04,0x91,0x46,0x19,0x80,0xe9,0xe6,0xdd,0xba,0x01,0xe9,0xab,0x8b,0x69,0xc6,0xfb,0x87},
+            {0xc2,0x3b,0x5d,0xb2,0x45,0xf1,0xcc,0x47,0x91,0xa6,0xa7,0xf5,0x7d,0xcb,0xd3,0xa7,0x27,0x50,0x43,0x1e,0x1a,0x67,0xf5,0xf7,0x83,0x66,0x8c,0x8a,0x28,0x25,0xa0,0xea},
+            {0xea,0x2c,0x2b,0x91,0x90,0xa3,0xa2,0xe7,0xbc,0xa5,0x5d,0x33,0xbd,0xd1,0x56,0x68,0x63,0x28,0x45,0x87,0xcb,0xcf,0xcd,0xad,0x74,0xa6,0x17,0xa5,0x71,0xd0,0x06,0xda},
+            {0xf0,0x0c,0x70,0x1d,0x6e,0x9e,0xb1,0x0e,0x8e,0xf7,0x92,0x76,0xcd,0xc1,0x54,0xe8,0xba,0x8c,0x44,0x22,0xf1,0xd0,0x8f,0xf3,0x30,0xef,0x3f,0x55,0xd0,0x54,0xd3,0x37},
+            {0x43,0xa9,0xd6,0xc9,0xab,0x48,0xdc,0x22,0xca,0x3c,0x9c,0xf8,0x25,0x0d,0xb0,0x69,0xe7,0x51,0x35,0x37,0xe5,0x3c,0xd6,0x32,0x42,0x40,0x35,0xf9,0x63,0x71,0xb5,0x2a},
+            {0x96,0x68,0x81,0x1e,0x88,0x84,0x9f,0xe8,0x0a,0x78,0xb7,0x9f,0xe3,0x3a,0x05,0x25,0x2e,0xc3,0x27,0x4a,0x8c,0x4c,0x92,0x46,0x09,0xb8,0xc8,0x52,0x81,0xcc,0xd4,0x6b},
+            {0xf2,0xf9,0x34,0x49,0xbf,0x57,0xbb,0xd7,0x9c,0x85,0x2a,0x41,0x2d,0xc5,0x59,0x22,0x80,0x20,0x44,0xe4,0x0a,0x10,0xd5,0xb7,0x0b,0x94,0x0a,0x58,0x5e,0xe7,0x20,0xee},
+            {0xd2,0x0b,0xda,0x52,0xea,0x5a,0x7e,0x78,0x5a,0xb9,0x41,0x77,0xf1,0xd9,0x0f,0x56,0x88,0xd2,0x1b,0x39,0x68,0x32,0x6e,0x99,0x09,0xc8,0xd2,0x6c,0xfe,0x16,0x0b,0x6c},
+            {0x1e,0xee,0x37,0xe5,0x41,0x71,0xbe,0x9e,0x11,0xfd,0xae,0x18,0x8b,0x2e,0xdf,0xb0,0xbc,0x02,0x4b,0x5f,0x94,0xde,0x55,0xdd,0xa4,0xb1,0x75,0x59,0x6d,0x44,0x9b,0xde},
+            {0x0a,0xf1,0x1c,0x74,0x5a,0x8c,0x48,0x91,0xe8,0x88,0xee,0xd3,0x03,0x09,0xed,0xc3,0x77,0x48,0xd7,0x12,0xe1,0x54,0xa0,0x78,0xd4,0xbd,0xd5,0xb1,0x3c,0xf2,0x20,0xb1},
+            {0x15,0x98,0x2d,0xed,0x9a,0x62,0xa5,0x48,0x2a,0x3a,0xcc,0x1a,0xd4,0xc3,0x31,0x59,0xfe,0x6c,0x42,0xf0,0x9a,0xa1,0x43,0x65,0xa2,0x92,0xd1,0xf8,0xe4,0x43,0x48,0x61},
+            {0x42,0x9e,0x21,0xc2,0x8b,0x9f,0x0e,0x41,0x5e,0x22,0x11,0xff,0x95,0x3a,0x01,0xb4,0x08,0xb9,0x39,0x9d,0xd2,0xb6,0x7d,0x0c,0xbf,0x21,0x26,0x53,0xaa,0x9e,0x3d,0xe5},
+            {0x9b,0x21,0xc3,0x11,0x8e,0xa6,0xbd,0x77,0x8b,0xeb,0x58,0x72,0x8a,0x3e,0x31,0x9c,0x2b,0xdc,0x18,0xfe,0x9b,0xb2,0x21,0x80,0x24,0xe4,0xd7,0xd5,0x37,0x75,0x89,0x88},
+            {0x73,0x0d,0x81,0x9c,0x74,0xa9,0x68,0xd9,0x5a,0x74,0x96,0x64,0xb6,0x59,0xfe,0xce,0x7f,0x28,0xf8,0x5e,0xbb,0x9e,0x86,0x05,0x42,0x96,0x9b,0x1f,0x83,0xf7,0x13,0x5c},
+            {0x07,0x73,0x4c,0xbf,0xaf,0x9d,0xe0,0x0a,0xa8,0xbf,0xdd,0xa5,0xf2,0x05,0xdd,0x88,0x7f,0xd7,0xdf,0x72,0x53,0x5a,0xb7,0x29,0xd8,0x73,0xa5,0xea,0x23,0x08,0x0c,0x8c},
+            {0x47,0x2f,0x6c,0x62,0x61,0x4c,0x64,0xe3,0x0f,0xa6,0x42,0xfe,0x83,0x70,0xb2,0x10,0x8f,0xc6,0xc6,0x24,0xbf,0xc3,0x65,0x2d,0xdc,0xab,0xdc,0x94,0x3b,0x93,0xd1,0x2e},
+            {0x41,0x16,0x1a,0xea,0x39,0x99,0x5a,0xfa,0xc0,0x88,0xfa,0x51,0x4c,0x8d,0xf9,0x90,0x5a,0x21,0x98,0x49,0x20,0xab,0x7e,0xd9,0xf5,0xef,0x52,0xf6,0x03,0x93,0x2f,0x4a},
+            {0xff,0x0a,0xc1,0x9b,0x15,0xcf,0x71,0x02,0x1b,0xa2,0x55,0xbb,0x88,0xb9,0xb4,0x8b,0x8d,0x81,0x34,0x46,0x36,0x4d,0xef,0xcb,0xd3,0x64,0x87,0x19,0xc0,0xab,0x4a,0x4c},
+            {0xd9,0x83,0x6a,0x32,0x68,0x98,0x1b,0xfe,0x94,0xad,0x1f,0x77,0xf2,0xb3,0xce,0xd2,0x0b,0x70,0x79,0xf0,0x90,0x25,0x39,0x13,0x57,0xde,0x90,0x6d,0x03,0xc4,0x0e,0x83},
+            {0x7e,0x55,0xb9,0x91,0xf5,0xf3,0x4a,0xc4,0x38,0x9f,0x55,0x74,0xbb,0x49,0x3f,0xe4,0x34,0x93,0xe6,0x56,0x68,0x91,0x83,0x29,0x48,0x9f,0xcd,0x9e,0x47,0x3e,0xad,0xad},
+            {0xd3,0x2b,0xc7,0x0e,0x62,0x46,0xbb,0x93,0x45,0xbb,0x5e,0xfb,0x2f,0xfb,0x68,0xf6,0x17,0x3a,0x0b,0x67,0x5a,0x8c,0xd4,0xc7,0xca,0x74,0xb3,0x54,0xad,0xaa,0x29,0x09},
+            {0xb9,0xd8,0xbb,0xf6,0x71,0xe7,0x94,0xda,0x22,0xb3,0xd2,0x31,0x8c,0x9b,0xa6,0x90,0x44,0x8e,0x3a,0x41,0xf4,0x06,0xb9,0x03,0xf6,0x38,0xb5,0x02,0x5f,0x75,0x64,0xd8},
+            {0xb2,0x8a,0x58,0x16,0xf4,0x69,0x42,0xf4,0x27,0x0b,0xc6,0x25,0xec,0x87,0x66,0x59,0xd3,0x7c,0x5e,0x40,0xaa,0xa9,0x13,0xa6,0x22,0x3e,0x49,0xe7,0x57,0x62,0x35,0xd2},
+            {0x43,0x78,0x1b,0xb2,0x01,0x4f,0xa5,0x1a,0x94,0xbb,0x34,0x98,0xc9,0x96,0x23,0xb7,0x6e,0xb9,0x63,0xf4,0x82,0x38,0xf9,0xb1,0xdf,0x9b,0x6f,0x31,0x32,0x2c,0x09,0x70},
+            {0x8d,0xc8,0x7e,0x8f,0x4d,0xf3,0xae,0x43,0x6f,0xae,0x06,0xc1,0x70,0x90,0x9b,0x87,0x54,0x23,0x52,0xd3,0x49,0x38,0x4b,0x9c,0x70,0x27,0xe9,0x50,0xb4,0x02,0xf6,0x5a},
+            {0x33,0x9c,0xbb,0x45,0xbe,0x7f,0x44,0xb7,0x2f,0x31,0xf9,0x65,0x03,0x86,0x0c,0x5a,0x25,0xc5,0xf2,0xab,0xde,0x49,0x8a,0x93,0x56,0x1f,0xb5,0x9b,0x43,0x3f,0x29,0x3f},
+            {0xf2,0xe6,0xd4,0x76,0xa7,0xd4,0x7a,0xcc,0x13,0xd2,0xea,0xbd,0x4d,0x30,0x93,0x98,0x68,0x4c,0xa7,0x39,0xf8,0xbc,0xe5,0x7e,0xb5,0x5b,0x1e,0x79,0xf3,0xd1,0xe5,0x19},
+            {0x56,0xaf,0x01,0x98,0x84,0x7a,0xa0,0x27,0xbe,0xeb,0x25,0x86,0x7b,0x66,0xc2,0x11,0xc7,0x8f,0xdd,0xbf,0x74,0xd3,0x2c,0x1d,0x83,0x3d,0x87,0xc7,0x78,0x12,0x0f,0xac},
+            {0x9a,0xc6,0xf6,0x0c,0x77,0x64,0x59,0x54,0x1e,0xc6,0xbc,0x88,0x01,0xfb,0x2f,0xd0,0x2e,0x36,0x58,0x5d,0xeb,0xfc,0xf3,0x21,0x2f,0xb0,0xb1,0x61,0x4a,0xe2,0xf6,0xcd},
+            {0xe1,0x79,0x2f,0x3d,0x1d,0x3d,0x16,0x1a,0xdf,0x76,0x17,0x20,0x88,0x96,0x12,0xdd,0x3c,0xc9,0x6e,0xed,0xbb,0xe2,0xa4,0x32,0xa0,0x3f,0x75,0x39,0xb0,0xcf,0x40,0x5b},
+            {0x06,0x18,0xcc,0xea,0xaf,0xb6,0xf8,0xe9,0x1a,0x6c,0x59,0x21,0x27,0xea,0x2b,0x5b,0x0c,0xb1,0x19,0x4c,0x32,0x10,0xc3,0xd6,0x43,0xcb,0xd2,0x5e,0x04,0x7a,0x2c,0x5c},
+            {0xc7,0xde,0xb3,0x98,0xd0,0x9d,0xe0,0xde,0x32,0xc1,0x14,0x87,0x0e,0x08,0x43,0xd7,0x70,0x02,0x52,0x91,0x7e,0xb6,0x9f,0xb0,0x54,0x68,0x30,0x43,0x73,0x08,0xe9,0x70},
+            {0xe0,0xac,0x7e,0xb0,0xb8,0x44,0x39,0x9d,0x04,0xbd,0xf6,0x5c,0x93,0x45,0x9a,0x19,0xb0,0x0c,0x9a,0x23,0xbf,0xbe,0xe0,0x5b,0x3d,0xec,0xa4,0x0a,0x05,0xb9,0xd3,0x89},
+            {0x23,0xa1,0x6f,0x8f,0x60,0x4e,0x45,0xd0,0x67,0xae,0x5a,0x3b,0x94,0x75,0x5f,0xd3,0x27,0x50,0x5b,0x4a,0x09,0x59,0x84,0x4a,0xab,0x30,0xff,0x58,0x08,0xf7,0x9b,0x46},
+            {0x48,0x8b,0x65,0x89,0xb5,0x06,0xe1,0xa4,0x50,0x1b,0x24,0x85,0x09,0x1e,0x71,0x74,0x11,0x86,0x79,0x00,0x78,0x38,0x07,0xaf,0x78,0xf8,0x7d,0xff,0x7a,0x46,0xcf,0x0c},
+            {0x56,0xc9,0x65,0x12,0x4e,0x66,0xae,0x2c,0x71,0x6b,0xf6,0x70,0x50,0xbd,0xb3,0x20,0xf3,0x83,0x85,0x28,0x0e,0x7a,0x7c,0x6c,0xd5,0x1b,0xd7,0xf7,0xce,0x43,0xd3,0x2b},
+            {0x19,0xed,0xef,0x6e,0x3e,0x69,0x99,0x0e,0xc2,0x22,0x87,0x79,0x13,0x34,0x06,0x28,0x04,0x9d,0xa3,0x94,0x09,0xaa,0xb7,0x9c,0x93,0xaf,0x2b,0x69,0x48,0xa9,0x3d,0x58},
+            {0x12,0x8e,0xab,0x2b,0x73,0xe6,0xa6,0xe9,0xc5,0x35,0xe1,0x5b,0x22,0x55,0x98,0x26,0xc3,0xe9,0xd6,0x78,0x85,0x9d,0x92,0x65,0x3a,0x5b,0x06,0x11,0xac,0xd1,0x2d,0x52},
+            {0xb6,0x05,0x04,0xa4,0xe6,0xfb,0x68,0x5f,0xef,0xeb,0x70,0x53,0xd0,0x2d,0x89,0xbf,0xf2,0xc4,0x1c,0x86,0x79,0x5c,0x40,0x61,0xa8,0x9d,0x0c,0x36,0x85,0xda,0x8e,0x84},
+            {0x60,0x38,0xbf,0x6c,0x77,0x28,0xe0,0x92,0x79,0x50,0xe6,0x86,0x51,0x13,0xa3,0x4a,0x66,0x46,0xcf,0x0e,0xc0,0xa2,0xd1,0x5e,0x1f,0x10,0x15,0xb8,0x7e,0xd6,0xb0,0x91},
+            {0x1b,0xc4,0x43,0xa0,0x13,0xd9,0x8a,0x82,0x94,0x3a,0xdb,0xa3,0xb8,0x9c,0xbd,0xbb,0xb3,0x8d,0x8a,0xab,0xbc,0x0d,0x4d,0xf5,0x7d,0x21,0x87,0x17,0xd5,0x0f,0x50,0xc1},
+            {0x97,0x65,0xae,0x2f,0x7b,0xd5,0x1d,0x26,0x31,0x47,0x0a,0x84,0xf4,0xac,0xb6,0xd9,0x66,0x9f,0x3e,0x21,0x1b,0xa7,0xb3,0xd1,0x48,0x0b,0x80,0xa0,0xcb,0x53,0xde,0xa5},
+            {0xcd,0xbb,0x6c,0x30,0x70,0x84,0x18,0x3b,0xaa,0x8b,0x44,0xcd,0x6a,0x93,0xf0,0x14,0x68,0x7b,0x2e,0x8f,0x6a,0xaa,0xe0,0x63,0xfe,0xc6,0xeb,0x2c,0x61,0xd3,0xa3,0x31},
+            {0xd3,0x86,0x01,0x25,0x78,0xfa,0x5b,0x91,0xe7,0x61,0xa7,0x14,0x20,0x9d,0x38,0x30,0x11,0x29,0xc8,0xca,0x4d,0x1d,0x39,0x35,0x49,0xa4,0x80,0x1a,0x9b,0x1e,0x00,0x94},
+            {0x05,0x38,0x7d,0xe7,0xdb,0x27,0xa6,0x28,0x10,0x11,0x47,0xc5,0xe0,0x1c,0xf4,0x81,0xa6,0x88,0x66,0xc5,0xf4,0xbe,0x57,0x0f,0x35,0xa5,0x0e,0x5a,0x96,0xdd,0x89,0x76},
+            {0xad,0x27,0x75,0x26,0x1f,0x5a,0x12,0xd7,0xfc,0xae,0xa9,0x66,0x6b,0x48,0xda,0xc6,0xff,0xec,0x09,0x6d,0x64,0x3d,0xf0,0xbd,0xb5,0x3d,0xab,0x40,0x0a,0xbc,0x9f,0xa9},
+            {0xc9,0x5a,0xda,0xff,0xc2,0x99,0x85,0x6b,0xa5,0xbd,0xce,0xb3,0x76,0x86,0x0a,0x43,0xc0,0xa5,0x53,0x83,0xcc,0xda,0x16,0x66,0x14,0xaf,0x93,0x33,0x98,0x6f,0x18,0xb5},
+            {0x2d,0xb3,0x4f,0xa4,0x2a,0xb7,0xe9,0x97,0x08,0x83,0xaa,0x57,0x44,0xfd,0x4a,0xe9,0x26,0x46,0x3a,0x3a,0xcb,0xd3,0x5e,0xca,0xbd,0x58,0x54,0xf3,0x69,0xbf,0x3f,0x5e},
+            {0x06,0x88,0x81,0xad,0xab,0xd8,0x7a,0x5d,0x56,0x8f,0x27,0x06,0x42,0x12,0xab,0x1b,0xb3,0x62,0x58,0x3a,0xb9,0xfc,0xae,0x18,0xfd,0xb0,0x3d,0xbc,0x0f,0x31,0x85,0xaa},
+            {0x9e,0xf7,0xcd,0x94,0xeb,0xb5,0xf2,0xb7,0x4d,0xb7,0x93,0x3a,0x06,0x45,0x9a,0xd9,0x72,0xf4,0x3f,0x21,0x26,0x0c,0xe8,0x4b,0xaf,0x26,0x90,0x4e,0xae,0x90,0x90,0xa6},
+            {0x99,0xaf,0xd6,0x10,0xf6,0x08,0x7a,0x27,0xdf,0x4c,0x16,0xd1,0xfa,0xa3,0xe8,0x0a,0xf5,0xdb,0xa4,0x19,0x4e,0x7a,0xad,0x13,0x47,0xdc,0x28,0x2f,0x49,0x39,0x51,0xd8},
+            {0xd0,0x36,0xa9,0xa8,0x6f,0x34,0xc9,0xed,0xa2,0xf4,0xd5,0x4a,0x8f,0x9d,0xf4,0xc4,0x70,0xc0,0xf9,0x76,0x95,0xc4,0xe5,0xdc,0x9d,0xe6,0x0e,0x85,0xaf,0x56,0xa1,0xe2},
+            {0x7f,0x01,0x37,0x29,0x0a,0x2f,0x6b,0x51,0x63,0x8f,0x1a,0x43,0x90,0x91,0xc2,0x6c,0x66,0xdd,0xd7,0xaf,0xc9,0xa8,0x52,0x5c,0x86,0xd0,0x49,0x09,0x52,0x95,0x7f,0x5e},
+            {0xa7,0x55,0xf2,0xfa,0x40,0xc8,0x75,0xc9,0x59,0x23,0x13,0xdf,0xad,0x65,0xfb,0xe5,0x8d,0x17,0x94,0x0d,0xd1,0xfd,0x5f,0xfc,0x38,0xf9,0x52,0x0f,0x91,0xb8,0xfa,0x63},
+            {0x66,0x90,0x69,0x71,0x31,0xf9,0xae,0xea,0x3f,0x3a,0x74,0xf8,0x3c,0x6e,0x34,0x47,0x5c,0xf3,0xc1,0xd6,0xc6,0x3e,0x15,0x55,0x17,0x4a,0xd8,0x75,0xa9,0x08,0xec,0xe5},
+            {0x26,0xf8,0x3c,0x08,0x40,0x41,0x83,0x7e,0xaf,0xe3,0x64,0x7c,0xe3,0x84,0x04,0xa2,0xe2,0x4b,0x2c,0x3f,0x5a,0x87,0x0f,0xbc,0x57,0xee,0x2f,0x75,0xfe,0x86,0x31,0x56},
+            {0xaa,0x90,0x25,0x5d,0x43,0x2e,0x68,0xbe,0x31,0x9e,0x26,0xab,0x5b,0x14,0x23,0x40,0x0d,0x20,0x13,0x11,0x71,0x21,0x63,0x6c,0xb2,0x7e,0xc4,0x94,0xa8,0x87,0xce,0x49},
+            {0x72,0xa7,0xf0,0x9a,0xcd,0x5a,0xb6,0x28,0x3d,0xf4,0x0b,0xd9,0x28,0x02,0xa6,0x7c,0x66,0xc5,0x30,0x8f,0x66,0x1e,0x98,0xf3,0xc1,0x2b,0x2d,0xd3,0xc2,0x68,0x17,0xce},
+            {0xde,0x85,0xe7,0x57,0x41,0x17,0xc4,0xc7,0x73,0xbe,0xc4,0x42,0x12,0x1a,0xc0,0x1c,0xdc,0xde,0xcd,0x53,0x39,0x46,0x62,0x4f,0x59,0x56,0x25,0x86,0x44,0xee,0xd4,0x40},
+            {0x51,0xe4,0x50,0x0d,0xcd,0x44,0x77,0xc4,0x25,0xcf,0x92,0x76,0xa5,0x56,0x04,0x11,0x62,0xc6,0xd9,0x97,0x8d,0x56,0xf3,0x94,0xd3,0x2a,0x10,0xc9,0x63,0xf3,0x04,0x9e},
+            {0x7a,0x37,0xec,0x2c,0x99,0xe0,0x82,0xda,0xc2,0x60,0xc8,0x9e,0x7f,0xb7,0x2c,0x23,0xa1,0xf9,0x58,0xc3,0x1e,0x50,0x62,0x42,0x17,0x39,0x1c,0xb3,0x1b,0x71,0x5e,0xf4},
+            {0x16,0x11,0xfa,0x27,0x86,0xe9,0x7a,0x78,0x6d,0x6f,0x0a,0x9e,0xed,0x8b,0xf4,0xb9,0xa3,0x0a,0x21,0x58,0xc6,0xb9,0x72,0x2e,0xba,0x15,0x0b,0x4d,0x53,0x39,0x8e,0x1e},
+            {0x0c,0xe0,0x7e,0x0b,0xa1,0x71,0x68,0x1a,0xfa,0xa5,0x0f,0x91,0xd3,0xba,0x9e,0x1c,0x18,0x01,0xf6,0xc9,0xd4,0x9d,0x7d,0x69,0x5d,0x2b,0xee,0x3c,0xa5,0x63,0xda,0xb2},
+            {0x4a,0x9c,0xfe,0xba,0x79,0x38,0xb7,0xc6,0x4c,0xd1,0x7a,0x04,0xe6,0x19,0x1e,0x9e,0xe3,0xb0,0x7e,0xb3,0x97,0x20,0xf7,0x67,0x94,0x51,0x8b,0x26,0x48,0x17,0xea,0xed},
+            {0xba,0x2e,0x9a,0x35,0xc9,0x33,0x05,0x7f,0x77,0x75,0x20,0x2d,0xa7,0x66,0xbd,0x36,0x86,0xc4,0x26,0x8f,0x32,0xd9,0x28,0x7d,0x8c,0xd3,0xe0,0xa3,0x71,0x00,0x2d,0x76},
+            {0x41,0xe9,0x2e,0x37,0xed,0x27,0x17,0xca,0xc0,0x94,0x61,0x0c,0x3d,0xa3,0xc6,0x40,0x79,0xd8,0x1b,0x0f,0x18,0xad,0xfb,0xfb,0xcd,0xc4,0x68,0x60,0x08,0x2d,0x05,0xba},
+            {0x1d,0xd6,0xa4,0x44,0x6b,0x86,0x15,0xea,0x23,0x59,0x7f,0x2f,0x1f,0xb4,0xf0,0x1e,0x8b,0xb9,0x99,0xc5,0xcd,0x09,0x80,0x99,0x69,0x4d,0xd2,0xd9,0xfb,0xa0,0x9e,0x71},
+            {0xa3,0x25,0x52,0xda,0xcc,0xda,0x15,0x29,0x9c,0xf3,0x11,0xe0,0xbb,0x4c,0x7e,0xf3,0x37,0x8f,0x30,0x39,0x97,0xe5,0xb2,0xf3,0x89,0x2c,0xf3,0x26,0x5c,0x9a,0xaf,0xd0},
+            {0x4a,0x17,0x19,0x44,0x13,0x57,0x7d,0x14,0xd2,0x6f,0x1c,0x1f,0xce,0x77,0x80,0x81,0xc7,0xce,0xde,0xe9,0x04,0xaf,0x0e,0xd3,0xa2,0x5a,0xbb,0xde,0x34,0x77,0x48,0x85},
+            {0x2d,0x5b,0x0e,0xd9,0x55,0x02,0xba,0xe6,0xf4,0xbd,0x67,0x38,0xde,0xf6,0xed,0xf4,0xe7,0xe3,0x51,0xf8,0x79,0xb8,0xc0,0x34,0x64,0x6f,0xa7,0x42,0x1d,0x0b,0xf6,0x75},
+            {0x0c,0x32,0x67,0x65,0x76,0xaa,0x68,0x62,0xd2,0x24,0xcb,0xc3,0x13,0xee,0x65,0x76,0xfd,0xcf,0xb7,0x1c,0x80,0x41,0xe8,0x3a,0x78,0x93,0x80,0xc5,0x84,0x13,0x35,0x4e},
+            {0xf1,0xc5,0x3b,0x8e,0x69,0x89,0xc4,0xf0,0xd5,0x5a,0x5a,0x08,0x23,0x93,0x93,0xa9,0xb8,0xa5,0x51,0x72,0x44,0xd8,0xf0,0x45,0x77,0x30,0x00,0x48,0xf9,0xe2,0x1e,0x87},
+            {0x4c,0x6e,0x47,0x9e,0x82,0x8f,0xbd,0x26,0x11,0x69,0x08,0x33,0x8c,0xf7,0x27,0x58,0x55,0x7d,0x52,0x3d,0x19,0x0b,0x7c,0xbe,0x3c,0x33,0xcd,0xb0,0x0f,0x91,0xf2,0x81},
+            {0xfc,0xba,0xb6,0xfa,0xe7,0xd8,0xba,0xce,0xe7,0x1d,0x82,0xf2,0xc1,0xab,0x67,0x9c,0x48,0xa8,0x5e,0xa7,0x50,0x24,0x7f,0x93,0x47,0x8b,0xaa,0xfe,0x4d,0x86,0x82,0xf9},
+            {0xf7,0x9f,0xce,0xd8,0x98,0xdf,0xdd,0x08,0xf1,0x81,0x78,0x82,0x54,0x90,0x80,0x3c,0x42,0x03,0xa0,0x29,0xfa,0xf2,0x9c,0xbf,0x08,0xd8,0xf1,0x60,0x2f,0x03,0x24,0x30},
+            {0xd2,0xf0,0x73,0x1c,0x4f,0xf1,0x1f,0x4c,0xb6,0x23,0x4e,0x6f,0x22,0x71,0x7d,0x0a,0x2a,0xe3,0x95,0x40,0x93,0x29,0xca,0xc5,0x37,0x85,0x26,0x9a,0x7c,0x26,0xec,0x3a},
+            {0x53,0x5b,0x30,0x30,0x17,0x1d,0xa4,0xc4,0x61,0x76,0x3c,0x48,0x8d,0x7d,0xa9,0xe8,0x9c,0x8c,0xfd,0x7c,0x1c,0x2d,0xad,0xbd,0x36,0x0b,0xb9,0x9e,0xde,0xb9,0xb0,0xaa},
+            {0x9f,0x5e,0x86,0x1a,0x83,0x76,0xf9,0x2b,0xe1,0x91,0x7f,0x31,0x57,0x18,0x0c,0x11,0x9f,0x5b,0x2b,0xea,0x66,0xef,0x40,0xbd,0xfa,0x77,0xec,0x8f,0x61,0x36,0xdf,0x7b},
+            {0x9a,0x7f,0x91,0xc1,0xa0,0x56,0x12,0xdd,0xc8,0x15,0x67,0xd6,0x63,0x7a,0x62,0x79,0xb6,0x14,0xdc,0x9f,0xba,0x3c,0xd0,0x32,0x27,0x77,0xf4,0x37,0xf6,0xcf,0x11,0xee},
+            {0x3e,0x14,0x74,0x06,0x1b,0x17,0x40,0x3e,0x96,0xe7,0x50,0xb3,0xad,0x72,0x5b,0x57,0x0d,0x4c,0xa9,0x6f,0x98,0xf5,0x83,0xe0,0xcd,0x5d,0xd2,0x6b,0x84,0x87,0x7c,0xbe},
+            {0xc0,0x46,0xe9,0x9c,0x6c,0xeb,0x99,0xa1,0xee,0x02,0xf9,0x2b,0xf5,0x09,0x9e,0x2c,0x44,0xa5,0xad,0xeb,0xd5,0x29,0x0d,0xee,0x74,0x2c,0xc5,0xae,0x9d,0xa7,0x07,0x6f},
+            {0x07,0x36,0xd3,0xd6,0xb4,0x2c,0x0b,0x68,0xce,0xa5,0xa9,0xc7,0x74,0x18,0x3d,0xb0,0xd7,0xac,0x13,0x8e,0x63,0x03,0x03,0x6e,0x46,0xda,0x24,0x5d,0xda,0x40,0x5f,0x44},
+            {0x26,0x77,0x86,0x2a,0x92,0x72,0x66,0xee,0xdf,0x5f,0x92,0x6a,0x18,0x44,0x49,0x5e,0xd7,0xf3,0x1f,0x67,0x1d,0xac,0x9f,0x58,0x99,0x6a,0xe1,0x7c,0x63,0x7c,0xa1,0x40},
+            {0xdf,0x62,0x2d,0xa8,0x69,0x3d,0xb1,0xd4,0x24,0x54,0x00,0xe8,0xbd,0xf8,0xa2,0x81,0x90,0xc1,0xd2,0x9c,0x27,0xd3,0x00,0x46,0xf9,0xfd,0x11,0x78,0xa7,0x55,0x4c,0x67},
+            {0xb0,0xad,0xea,0x93,0x2e,0x62,0x8a,0x97,0x72,0x82,0x82,0x50,0x83,0xc9,0x6a,0x26,0xa2,0x76,0xdc,0x13,0xe6,0x23,0x38,0x0a,0x45,0xa5,0x90,0xfc,0xcd,0x54,0x3b,0xe1},
+            {0x1c,0x54,0xee,0x5a,0x29,0xb8,0xed,0x80,0x13,0xb0,0x0c,0xdc,0xbd,0xd6,0x54,0x27,0x29,0x65,0xce,0x4b,0xe0,0xe3,0x8d,0x7a,0xfb,0x41,0x3e,0x65,0xcc,0x85,0x25,0xe3},
+            {0x62,0xb6,0x05,0x56,0x5c,0xc8,0x5a,0xbf,0xa0,0x86,0x1d,0xae,0xbb,0xdb,0x0b,0x13,0xd5,0x87,0x32,0xe5,0x9b,0xc1,0x16,0x3d,0x9e,0xe5,0xb4,0x11,0xfc,0x6f,0x7a,0xf3},
+            {0x7b,0x72,0x26,0xd4,0x9d,0x68,0x7f,0xd4,0x71,0xe0,0xea,0xe0,0xf5,0x4d,0x95,0x29,0xf3,0x30,0xd5,0x8b,0x40,0xa2,0x55,0xaa,0x87,0x1c,0xcd,0x36,0xc8,0xb0,0x48,0xc4},
+            {0x9e,0xa1,0x75,0x10,0x96,0x78,0x09,0x59,0x77,0x39,0x5a,0x23,0x37,0x78,0x1a,0x4b,0x7a,0x0b,0xad,0x39,0x84,0xd0,0x30,0xb6,0xbb,0x02,0x23,0x77,0x24,0x87,0xd2,0x7e},
+            {0x94,0x98,0x62,0x06,0x2b,0x71,0x28,0x7f,0xb7,0xeb,0xa6,0xeb,0x72,0xef,0xed,0x9a,0x06,0x40,0x2d,0x43,0x72,0xe8,0xd4,0xc3,0x2d,0xe1,0x59,0x61,0x29,0x8b,0x94,0x55},
+            {0x42,0x00,0xd4,0x86,0x2a,0xb8,0x9d,0x7e,0x11,0xf4,0x65,0xdb,0xb1,0x5e,0x72,0x2e,0xea,0x2e,0xad,0x1b,0x6e,0xad,0xcf,0x55,0xeb,0x76,0xcd,0xee,0x2d,0xca,0xae,0xb2},
+            {0xda,0xeb,0x4b,0x3a,0xe4,0x1e,0xab,0x84,0xdb,0x5c,0x30,0xd4,0x03,0x25,0x41,0x87,0x2b,0xd9,0x91,0x0f,0x36,0xc2,0xf3,0x70,0x84,0x67,0xb6,0x40,0xf3,0xd5,0x62,0x17},
+            {0x83,0x40,0xac,0x58,0xb1,0xea,0x52,0x9e,0x8f,0x4f,0x0b,0xcf,0x29,0x7d,0xc4,0x02,0xd8,0x9f,0x41,0x22,0x52,0xde,0xb8,0x30,0xd9,0xe6,0xea,0x62,0x6e,0xc2,0x22,0x1b},
+            {0xb1,0xa0,0x9a,0xb8,0x96,0xbc,0xcb,0x3a,0x2b,0x2d,0xd4,0x87,0xd9,0x73,0x92,0xe5,0xa3,0xde,0x1f,0x2a,0x89,0x37,0xcb,0x30,0x09,0x1a,0x5b,0xe8,0x32,0x0e,0x43,0xd6},
+            {0x77,0x28,0x12,0x82,0x1e,0x24,0x09,0xab,0x4b,0x66,0x85,0x07,0xb3,0xcf,0x42,0xfe,0x3b,0xef,0x22,0x0d,0x49,0x70,0x08,0x1d,0xb6,0x9c,0xfb,0xb9,0x92,0xc5,0x4a,0x0b},
+            {0xaf,0x59,0xff,0x44,0xfe,0x60,0x84,0xdc,0xb0,0xf1,0x48,0xdd,0x58,0x42,0x9a,0x66,0x98,0x5c,0x8f,0x44,0x5d,0x58,0xbf,0x7d,0x73,0x4e,0xe5,0xd6,0xcf,0x80,0x00,0x2c},
+            {0x30,0x8d,0xef,0x2d,0x53,0x1c,0xbe,0x67,0x4b,0x75,0xdc,0xc4,0x21,0xbc,0x3a,0x5e,0xf9,0xd1,0xab,0x5c,0x8d,0xf7,0x37,0x24,0x36,0x43,0xb2,0x69,0x2a,0x72,0x80,0xa6},
+            {0xe2,0x07,0x87,0x7f,0xa8,0x8d,0xeb,0x5f,0xfa,0xe9,0xb1,0x9e,0xbc,0x61,0xd0,0xee,0x64,0x53,0xd6,0xc7,0xbf,0x91,0x1a,0xa0,0x12,0x63,0x03,0x0c,0xfa,0x64,0xf8,0xa2},
+            {0xee,0xa9,0xb3,0x87,0x57,0x7c,0xe6,0xc7,0x6e,0xae,0x8f,0x5d,0x2d,0x4f,0xac,0x9d,0xe6,0x1d,0xbf,0xe4,0xb0,0x33,0x82,0x02,0x4a,0x75,0x2c,0x7f,0x90,0xa8,0xe3,0x66},
+            {0xeb,0xd0,0xfa,0x6d,0x63,0x8b,0xbf,0x5e,0xf8,0x94,0x80,0x54,0xb2,0xc2,0x42,0x4d,0x49,0x0b,0x16,0xdc,0xf1,0x9b,0xa3,0x58,0x01,0xc2,0x5c,0xb3,0x88,0xa4,0x00,0x4f},
+            {0x0f,0x41,0xea,0x73,0xa5,0xde,0xbb,0x48,0x05,0x85,0xaf,0x13,0x2f,0x39,0x10,0xf3,0xc7,0xb9,0x8a,0x57,0x7f,0xd5,0x95,0x88,0x21,0x21,0x63,0x14,0x31,0xaf,0x47,0x0a},
+            {0x4d,0xd1,0x13,0x03,0xbe,0x6e,0xd6,0xaf,0xbd,0xc8,0xa9,0x01,0x78,0x27,0xc6,0xfb,0xf2,0xfa,0x8e,0xa2,0x63,0x11,0x7a,0x9f,0x08,0xf0,0x92,0x84,0x55,0x9b,0xd3,0xa2},
+            {0x77,0xdc,0xe6,0x08,0x33,0x9c,0x3e,0x49,0x33,0xeb,0xda,0x49,0xd9,0x9d,0x52,0xc3,0xeb,0xa9,0xe5,0x85,0xf8,0x1b,0xb6,0xb9,0x4d,0xe1,0xee,0xb6,0xc4,0xf1,0x9a,0xff},
+            {0xe6,0xbc,0xa4,0x93,0x41,0x34,0x98,0xac,0x5b,0x2e,0xcb,0x08,0x3c,0xd1,0x76,0x87,0xe0,0x2f,0x2f,0xbf,0xad,0x5d,0xa9,0x3d,0x4c,0x31,0xa0,0x2c,0x9e,0xb7,0x2c,0x81},
+            {0x4b,0x7e,0xae,0xf4,0xba,0x75,0x78,0xf4,0x34,0x22,0x61,0x8c,0x72,0x9c,0xe5,0xb1,0xd3,0x62,0xa1,0x1c,0x43,0x7f,0x4d,0x96,0x93,0xda,0x8e,0xee,0x9b,0xbe,0x6b,0x01},
+            {0x0f,0xff,0xe2,0xe6,0x0e,0x03,0x4e,0xe0,0x09,0x2d,0xa0,0xc2,0x2f,0x56,0x0b,0xcd,0xce,0x55,0x53,0xfc,0x95,0xea,0xf8,0x47,0x8c,0x3a,0xed,0x2d,0x97,0x13,0xdc,0xf1},
+            {0xd7,0xdc,0x0f,0x79,0xe6,0x07,0x77,0x11,0xfb,0xd1,0x1b,0xe2,0xc4,0x9a,0x57,0xd9,0x84,0xdf,0xe4,0x3e,0x23,0x57,0xde,0x90,0x2f,0x69,0x4f,0x56,0x1c,0xce,0x66,0x91},
+            {0x51,0xcf,0xd0,0xc3,0xaa,0x1b,0x96,0xda,0x6b,0xe9,0x2c,0x65,0xef,0x7d,0xc2,0x5a,0xc5,0xf1,0x02,0x36,0xb5,0x15,0x40,0x3c,0xb7,0xf8,0x49,0x27,0x91,0xf3,0xbb,0xc3},
+            {0x30,0x9d,0x74,0xe8,0x9f,0xfd,0x04,0xcc,0x8f,0x05,0x0d,0xfc,0x4b,0xe5,0x00,0x85,0xf1,0x97,0xf6,0xc2,0x3a,0xc5,0xf8,0x4c,0x22,0xf7,0x9a,0x27,0x29,0xca,0x62,0xb1},
+            {0xa1,0x39,0xb0,0x28,0x83,0x8d,0x48,0x9d,0xce,0x5f,0xa0,0x8d,0xa1,0x8b,0xa5,0xea,0x10,0x96,0x98,0x60,0xdd,0x81,0x3e,0xb6,0x4c,0x75,0x5f,0x9f,0x8a,0x0c,0x85,0x6e},
+            {0x29,0x87,0xcd,0x38,0x5a,0xc6,0xee,0x4a,0x84,0xb0,0xc2,0xc4,0x72,0xfe,0xa3,0x82,0x83,0x06,0xb7,0xad,0xdd,0x11,0xcd,0xd2,0x8a,0xa4,0x16,0xad,0x99,0x50,0xa9,0xf2},
+            {0x97,0xe9,0x19,0x98,0x55,0xdf,0xed,0x3d,0x4f,0xc6,0xa8,0x74,0x6e,0xd9,0xde,0xe3,0x25,0x86,0xd7,0x30,0x66,0xe0,0x24,0xe8,0xa9,0x6b,0xb1,0x24,0xa1,0x87,0xb3,0xc6},
+            {0xd5,0xac,0xa4,0xfc,0xa7,0x52,0x9a,0x79,0x17,0xcd,0x26,0xc7,0x71,0x0c,0x20,0xee,0xfa,0xd9,0x4a,0xb1,0x18,0xb5,0x92,0xdb,0x8f,0xa2,0x2a,0x4c,0x25,0x8e,0x99,0xff},
+            {0x08,0xa6,0x7a,0x8a,0x0f,0x26,0x2f,0x70,0xe4,0x03,0x9e,0x10,0x09,0x1a,0x29,0x6f,0xcc,0x19,0x6e,0x95,0x20,0xd5,0xac,0x37,0xf8,0x36,0xab,0x10,0x92,0x05,0x18,0x1c},
+            {0xe7,0x15,0x86,0xf3,0xb6,0x3c,0x70,0xb6,0xd6,0x56,0x72,0xa7,0xd8,0x47,0x81,0xaa,0x67,0xce,0x0d,0x70,0xf4,0x1e,0x42,0x40,0xf5,0x60,0x66,0xab,0x67,0xd1,0xba,0xeb},
+            {0xf2,0xbf,0xba,0x19,0xad,0x85,0x73,0xd2,0xc7,0xd4,0x85,0x27,0xab,0x2c,0xc2,0x75,0xf9,0x1f,0xe0,0x8d,0x82,0x82,0x99,0x08,0x01,0x3f,0x53,0xda,0xcb,0x94,0x78,0xe1},
+            {0x8a,0xf2,0x72,0xab,0x08,0xb9,0x36,0x79,0x11,0xa9,0x73,0x94,0xa5,0x80,0xc5,0x9d,0x6e,0x6f,0xfe,0x76,0x3a,0xad,0xc6,0x19,0xed,0xef,0x7c,0x3b,0x82,0x7b,0xc9,0x27},
+            {0x89,0x80,0xfd,0x48,0x36,0xc9,0xff,0x27,0xcf,0xd5,0xa9,0x99,0xfa,0x5a,0x53,0x5c,0xa5,0x57,0xe3,0x2a,0xdc,0xe8,0x54,0x75,0x2a,0xdd,0xef,0x70,0xc4,0x14,0x4a,0xa3},
+            {0x5d,0x97,0x6c,0x72,0x96,0x25,0x7e,0x3a,0x0b,0x84,0x11,0xbf,0xba,0x3f,0x37,0x2f,0x8d,0x35,0xbd,0x7e,0x73,0xed,0x92,0xbc,0x26,0xaf,0x88,0xe3,0x22,0x17,0x71,0x78},
+            {0xa0,0x15,0x65,0xd4,0x91,0x5e,0x7f,0xb6,0x68,0x9d,0xb3,0xf1,0xfb,0x7f,0xbd,0xdf,0xc9,0xe8,0x64,0x73,0x81,0xc1,0x15,0xe1,0xc0,0xa7,0xb1,0x49,0x0e,0x8f,0x75,0x5b},
+            {0xa8,0xfc,0xed,0xb1,0xc3,0xed,0x35,0x8f,0xc5,0x30,0x5b,0xdc,0x8b,0x61,0x8b,0xc0,0xf3,0x54,0x78,0x14,0x72,0xec,0xcb,0xb8,0x96,0x0c,0x8c,0xa3,0xa0,0xf3,0x23,0x3c},
+            {0x09,0x4a,0xc7,0xa8,0x3a,0x42,0x7b,0xfa,0xb8,0xef,0xf1,0x0e,0xcb,0xce,0x65,0xc2,0x66,0x70,0xba,0xcd,0x70,0xc9,0x41,0xf6,0x23,0xff,0x02,0x98,0xd3,0x54,0xed,0xc3},
+            {0xd7,0xb2,0xb2,0x23,0x15,0xb3,0xee,0x15,0xe1,0x24,0xdc,0xf4,0x56,0x0d,0x3b,0xea,0x58,0x58,0x42,0xf4,0x16,0x3d,0xaf,0x0b,0x87,0x9a,0x8b,0x0c,0x55,0x39,0x06,0x37},
+            {0xe6,0xe8,0x07,0x2a,0x24,0xab,0x7b,0xff,0xa9,0xce,0x6e,0x9a,0x35,0x9c,0x33,0xb2,0x10,0xe8,0xb6,0x61,0x72,0xe1,0xd3,0x5a,0x5c,0x8e,0xd2,0x88,0x71,0xc4,0x00,0x29},
+            {0x39,0xc1,0xbc,0xab,0xe1,0xc3,0x0d,0x07,0x98,0xd8,0xbb,0xc2,0x75,0xd8,0x3a,0x50,0x32,0x99,0xb0,0x8f,0xa2,0x93,0x55,0x52,0x89,0x2c,0xe0,0x3b,0xad,0x2c,0x0b,0xc9},
+            {0x2c,0xe0,0x57,0x41,0x0a,0x13,0xbb,0x15,0x2f,0x27,0x6a,0xfa,0x30,0x5e,0xb9,0x4e,0x0e,0x31,0xc5,0xdd,0x82,0xa2,0xeb,0x82,0x8d,0x0a,0x01,0x71,0x0a,0x27,0x67,0x56},
+            {0x86,0xb8,0xf9,0x9e,0xd5,0x24,0x0d,0xf5,0x48,0xdc,0xd8,0x5f,0xd8,0x7f,0xb2,0xdb,0xc7,0x8e,0x21,0xe1,0x17,0x52,0x4e,0xac,0xeb,0xe7,0xed,0x88,0xd7,0x34,0x0a,0x8f},
+            {0x0a,0xce,0x53,0xd3,0x68,0x85,0x2d,0x27,0xda,0xea,0x0e,0xc5,0x9b,0xef,0x8f,0x1d,0x50,0x88,0xce,0xda,0x03,0x71,0x9a,0xdd,0x6a,0x02,0xbc,0x70,0xe3,0xaa,0xc7,0x85},
+            {0x48,0xc7,0xe8,0x9b,0x19,0x63,0x6c,0x77,0xe1,0x86,0xa0,0x93,0xb1,0xf2,0x94,0x6d,0xdd,0x69,0x2f,0x96,0x4b,0xa6,0xf2,0xd2,0xed,0x13,0x6b,0x8c,0x2f,0x49,0x05,0x66},
+            {0x6d,0x9e,0x0d,0xcb,0xe4,0x6d,0xa4,0x67,0x50,0x9a,0x5a,0x8a,0x2a,0xa7,0x09,0xa3,0x1d,0x47,0x79,0x5f,0x9f,0x3b,0xdb,0x3a,0x01,0x81,0x2c,0xed,0x98,0xdd,0xdd,0x5c},
+            {0x15,0x26,0x56,0x4d,0xfc,0xf5,0xb6,0xae,0x52,0x84,0x44,0xee,0x7a,0x26,0x07,0x71,0xbb,0xf3,0x0a,0xa8,0x46,0xda,0x37,0xd0,0x7d,0xaf,0xb1,0xd7,0x43,0xc9,0xf6,0x8f},
+            {0x29,0x87,0xae,0xf1,0xd8,0x75,0x72,0x2e,0xa6,0xf1,0x68,0x48,0x83,0xee,0xfb,0x0a,0xd5,0x66,0xfd,0x00,0x17,0xb7,0xef,0x60,0x94,0xa1,0x75,0x2e,0x2b,0xa6,0x85,0x50},
+            {0x22,0xbc,0x33,0xee,0xa0,0xb2,0xfd,0xfd,0x44,0x70,0x21,0xa9,0x0c,0x90,0xd1,0x0d,0x24,0x65,0x2a,0xdd,0x14,0x29,0x91,0x67,0x64,0x18,0xa7,0x2e,0x81,0x51,0x68,0x2c},
+            {0x0d,0x72,0x14,0x8b,0x5f,0x75,0xfe,0x9f,0x6e,0x36,0xc5,0xf0,0x42,0x24,0x4b,0xb5,0xe3,0x5a,0x27,0xb6,0x27,0x77,0xdb,0x7c,0xa1,0xe1,0x07,0x2e,0xee,0x9a,0x8e,0x48},
+            {0xef,0x71,0x13,0x7c,0x51,0x4c,0xfa,0x65,0xfa,0x5f,0xda,0x9b,0x51,0x7e,0x3c,0x26,0x7a,0x9c,0x7a,0x7a,0x7f,0xcd,0x4b,0x91,0x77,0xda,0xd5,0x7d,0x0f,0xc2,0xad,0xd5},
+            {0x11,0xef,0xa0,0xf3,0xf8,0x4c,0xd4,0x7c,0x1c,0xb0,0xc2,0xd4,0x63,0x4f,0x31,0x72,0x02,0xce,0x00,0xe5,0x2f,0xa1,0x84,0x68,0x91,0x0a,0x68,0xcb,0x31,0x73,0x26,0xfa},
+            {0x75,0x07,0x11,0xec,0x22,0x11,0x78,0xfb,0x1e,0xe7,0x54,0x93,0x33,0xd5,0xdf,0xa0,0x60,0x28,0x32,0x26,0x95,0x3f,0x90,0x96,0x78,0x2c,0x24,0xcf,0x78,0x77,0x13,0x45},
+            {0x9d,0x62,0x1c,0xbe,0xb4,0x94,0x23,0xa4,0x6c,0x56,0x58,0x1d,0xd6,0x21,0x24,0x67,0x66,0xd6,0xc1,0xd2,0xe8,0x85,0xf3,0x8c,0xd3,0x6c,0xa1,0x8f,0x88,0xc6,0x96,0x6e},
+            {0xe4,0x59,0xb2,0x9d,0x49,0xa3,0x94,0xe8,0x40,0x00,0x90,0x3c,0xca,0xd0,0xed,0xde,0x2b,0x83,0x09,0x6f,0x73,0xe9,0x3d,0x14,0x4c,0xf8,0xa4,0xfd,0x04,0x1d,0x37,0xbc},
+            {0x90,0x2e,0x39,0xfc,0x44,0xa6,0xa9,0xa7,0x12,0xc9,0xd4,0x2e,0x0b,0x98,0xa0,0x8f,0x79,0x3f,0x9e,0xb4,0x68,0xab,0x13,0xc1,0x20,0xc8,0x7b,0xf6,0x30,0x9b,0x68,0xf6},
+            {0x5f,0xd3,0xdd,0x56,0x2f,0xb5,0xd0,0xc9,0x7a,0x66,0xfc,0x5d,0x6f,0x2d,0x04,0x7b,0x7c,0x12,0xe9,0x51,0x8b,0x95,0xd6,0xd4,0xb9,0x6d,0x3c,0xc6,0x49,0xe8,0x93,0xc4},
+            {0xae,0x5a,0x35,0x20,0x3a,0xf7,0x6d,0x78,0xf8,0xd4,0xc5,0x06,0xb1,0x8f,0xb4,0xe1,0xc6,0x7e,0x57,0x98,0x70,0x6d,0x7a,0x1b,0x98,0x91,0x2e,0x9f,0xbf,0x66,0x69,0xed},
+            {0x88,0x06,0xe9,0x40,0xbc,0x22,0x74,0x29,0x62,0x17,0xb3,0x92,0xb6,0x99,0x87,0xb4,0x77,0x2b,0xac,0x5a,0xa5,0xa9,0x69,0x80,0xa8,0x48,0xc1,0xec,0x76,0x9b,0xb8,0xd5},
+            {0xba,0xd1,0x55,0xb7,0xd4,0x54,0x04,0xed,0xe0,0xf0,0x73,0x82,0xe8,0xd7,0x4d,0x34,0x4d,0xbb,0xfe,0x46,0x2c,0x8b,0x36,0x58,0xdc,0x6e,0xad,0x10,0x6d,0x41,0x8e,0x9a},
+            {0xfc,0xf3,0x01,0x2d,0x4e,0x10,0x1f,0xd7,0xaf,0xfd,0x97,0x2b,0x17,0x68,0xea,0x82,0x00,0xfd,0xdc,0xe6,0xe0,0xfb,0x7e,0x40,0x3e,0x4f,0xd9,0xba,0x3f,0x01,0xba,0xc0},
+            {0x8c,0xe6,0x8b,0x64,0xc7,0xb5,0x67,0x5e,0x06,0x63,0xe8,0x1e,0x61,0xc4,0xb4,0x37,0x9c,0xc5,0xf8,0x84,0x5d,0xbd,0xf1,0x91,0x03,0x1b,0x59,0x1a,0x0e,0x10,0x91,0x4e},
+            {0xec,0x22,0x53,0xaa,0xba,0xa2,0x73,0x15,0x00,0xb9,0x4c,0xa5,0xb6,0x0c,0x82,0x26,0xe4,0x05,0xea,0x23,0x83,0x1e,0x87,0x88,0x2f,0xa1,0x27,0xca,0xcb,0xed,0x1e,0x70},
+            {0x83,0x33,0xc7,0x7c,0xd6,0xb6,0x3b,0x5e,0x53,0x8d,0xde,0x44,0xa5,0xf1,0xc3,0x78,0x22,0xc5,0xe1,0x25,0x9d,0x7c,0x66,0x74,0xeb,0xc9,0x8d,0x17,0x43,0x17,0x20,0xaf},
+            {0xab,0xec,0xc9,0xa6,0x8c,0x65,0x8a,0x5c,0x31,0x00,0x8c,0x6c,0x59,0x4d,0x58,0x1d,0x36,0xfe,0xe3,0x13,0xf8,0xec,0x2a,0xaa,0xc4,0x69,0xf2,0xfd,0xf4,0x52,0x55,0x69},
+            {0xe4,0xb4,0x93,0xbf,0xae,0xeb,0x85,0xf3,0x5f,0x83,0xe8,0x4a,0x31,0x8b,0x3a,0x1d,0xf7,0xdf,0x14,0x97,0xba,0x1b,0x03,0xb4,0x98,0x09,0x9e,0x74,0x79,0x56,0xef,0x52},
+            {0x8d,0xda,0x47,0x9f,0x52,0x1d,0x6d,0xfe,0xe1,0x06,0xe8,0x61,0x38,0x08,0x24,0xd6,0xd0,0x6c,0x77,0x0d,0x14,0x72,0xa1,0x89,0xbc,0xf2,0x51,0xa1,0xbf,0x0a,0x0f,0x55},
+            {0xe3,0x8a,0x65,0x4a,0x52,0xe2,0x16,0xff,0x4a,0x20,0x0a,0xf1,0x42,0xe4,0xa8,0xb9,0xc3,0x8c,0x44,0x88,0x76,0xb7,0x0b,0x84,0xdf,0xc9,0xde,0x52,0x11,0xca,0x70,0x24},
+            {0x12,0xb0,0xbf,0x02,0x88,0xad,0x6e,0xaa,0xd0,0x39,0x21,0x92,0x14,0x3f,0x57,0x65,0xbd,0xdc,0x84,0xd7,0xc9,0x9c,0x3c,0xe7,0xe3,0x37,0x11,0x08,0x32,0x51,0xe8,0x78},
+            {0x98,0x05,0x5e,0x28,0xa5,0xaf,0x0d,0xbe,0x2c,0xdc,0x67,0x48,0x20,0xe1,0x8c,0x92,0xa3,0x8a,0xc8,0x9c,0xd2,0xb6,0xd3,0xe2,0xf8,0x7a,0x58,0x9e,0x1f,0x05,0x4e,0xab},
+            {0x8e,0x05,0xd0,0x3f,0xef,0x5e,0x1e,0x2f,0x69,0xf9,0xd4,0xfa,0xc6,0x74,0xd8,0x2e,0x35,0x1e,0x34,0x10,0x6a,0xd2,0x90,0x73,0xae,0x94,0x90,0xe9,0xff,0xc1,0x5b,0x25},
+            {0xbc,0xbb,0x67,0x53,0x10,0xf1,0x33,0x82,0x4c,0xe3,0x36,0xa3,0xc4,0x3f,0x36,0xf8,0xf6,0xbc,0x1d,0xc9,0xbe,0x8e,0xfb,0xfe,0x3e,0x72,0x70,0xfa,0x0e,0x7e,0xb5,0xaf},
+            {0x20,0xaf,0x38,0x52,0xb4,0xae,0xf5,0xea,0x3f,0xab,0xd3,0x84,0x7c,0xd0,0x3c,0x06,0x4c,0xd8,0x22,0xb3,0x0b,0x5c,0x16,0x52,0xb9,0x1b,0x41,0x4d,0x08,0x70,0x4f,0xb8},
+            {0xcc,0x18,0xa3,0x36,0x20,0x23,0x96,0x61,0x93,0xc0,0x72,0x63,0x0d,0xa0,0xaf,0xe7,0x4c,0xc0,0x8d,0x9e,0xb7,0x67,0x86,0x6d,0x85,0xc5,0x57,0xe6,0xa6,0xf2,0x63,0x87},
+            {0x95,0x0e,0x60,0x39,0x15,0xe7,0xfc,0xed,0xf0,0xdc,0x15,0x8d,0xaf,0xf8,0x22,0xdb,0x03,0x4c,0x0a,0x24,0x0f,0x7c,0xdc,0x50,0x63,0xbb,0xb4,0x28,0xd1,0x40,0x84,0x14},
+            {0x12,0x65,0x8f,0xe8,0xbe,0xbc,0xd8,0x57,0xc2,0x2f,0x58,0x4c,0x8e,0x31,0xd6,0x17,0x2a,0x87,0xf0,0x89,0xe1,0xd8,0x83,0x13,0x0b,0x7d,0xcb,0x4c,0x16,0x00,0x51,0x8b},
+            {0x66,0x1d,0x8c,0x02,0xf8,0x6e,0x16,0x35,0x56,0x81,0xf3,0xa6,0x82,0xaa,0x0e,0xfe,0xa8,0x6a,0x98,0x5a,0xd2,0x9e,0x2b,0x64,0xb3,0x43,0xf5,0x31,0x5a,0x92,0x68,0xb2},
+            {0x61,0x7a,0x33,0x3e,0x2c,0xd2,0x48,0x2f,0x83,0x71,0x58,0x45,0x42,0x1a,0x1e,0x25,0x50,0x67,0x24,0xd4,0x73,0x7f,0x7b,0xf8,0xdb,0xe9,0xf3,0xfa,0xa5,0xa9,0x4a,0xa9},
+            {0x1c,0xf2,0x08,0xa9,0xab,0xaf,0xf9,0x84,0xc2,0x59,0x30,0x0f,0x93,0x45,0xc9,0x26,0x83,0xea,0xdd,0x83,0xd1,0x1a,0x6a,0x40,0x24,0xee,0x47,0xb3,0xb4,0xd1,0xd0,0x45},
+            {0xdb,0x15,0xcc,0xc9,0x32,0x75,0xa3,0x4f,0x27,0x28,0xc9,0x20,0x76,0x08,0x6f,0x0f,0x4c,0x7b,0x20,0x68,0xfa,0xb2,0xb0,0x09,0xad,0xf7,0xf0,0xd4,0x8b,0xdb,0x88,0x8a},
+            {0xbe,0xfb,0x08,0xa1,0xda,0x6b,0x7c,0x31,0x36,0xdc,0xa3,0xd2,0x9c,0x7c,0x0c,0x85,0x3c,0x2d,0x91,0x64,0x4e,0x55,0xe4,0x30,0x3c,0xfc,0x8b,0xe6,0x4f,0x69,0x95,0x38},
+            {0xca,0x37,0x55,0xa1,0xd6,0x2e,0x3b,0x4a,0x74,0xfc,0x45,0x8d,0xaa,0x9a,0x7f,0xaa,0x33,0x16,0xfe,0x7f,0x6f,0xb4,0x0a,0x62,0x28,0x2e,0x91,0x28,0x88,0x2d,0x46,0x75},
+            {0x4f,0xe1,0x23,0xbb,0xaa,0x5d,0x87,0x41,0x95,0xf6,0x3e,0x85,0xae,0xa0,0x6a,0xb0,0x83,0x55,0xe0,0xe5,0x7f,0x22,0x04,0x30,0x84,0x39,0x91,0x7f,0xfb,0x08,0x0a,0x92},
+            {0xca,0xe1,0x0b,0x89,0x38,0xdd,0x58,0x06,0xcf,0xe5,0xea,0x19,0x44,0xb3,0x92,0x96,0xa0,0xa7,0x3b,0x59,0x57,0xa8,0x2f,0x30,0x8d,0x91,0x41,0x55,0x8b,0x21,0xc6,0xeb},
+            {0x12,0x4d,0xfe,0xb7,0x7b,0x60,0xb2,0x1d,0x78,0x2a,0xeb,0x2e,0x49,0x98,0xef,0x15,0xca,0x87,0x55,0xa3,0x80,0x9f,0xc3,0x42,0x0b,0x1f,0x4a,0x71,0x25,0xa1,0xf4,0xf5},
+            {0x40,0x6e,0x04,0x41,0x40,0xce,0x58,0xe8,0xcd,0xf3,0x6d,0x57,0xa4,0x18,0x92,0xfe,0x4b,0x15,0xa1,0x68,0x71,0xf8,0x31,0x8a,0xfb,0x4b,0xa0,0xce,0x43,0x36,0x5b,0x5a},
+            {0x59,0xf6,0x2a,0xf4,0xc1,0x97,0xb3,0xab,0x5b,0x58,0x99,0x86,0x77,0xa3,0x9f,0x42,0xae,0x62,0x73,0x8f,0xb9,0x62,0xf7,0x75,0x52,0x98,0x89,0xcd,0x7d,0xb1,0x09,0x25},
+            {0x7e,0xaa,0x28,0x67,0xfa,0x01,0xe7,0x9b,0x9e,0x64,0xe1,0x7f,0x41,0xdf,0x24,0x6f,0x09,0x9a,0x3f,0x1e,0xc0,0x5f,0x9f,0xee,0xf6,0x90,0x27,0x4f,0x55,0xb0,0x01,0x82},
+            {0x3c,0x01,0x25,0xbf,0x28,0x7e,0xc0,0xef,0xa2,0x50,0xf7,0xdf,0xdc,0x4f,0x78,0x4a,0x4b,0x11,0x47,0x5e,0x7b,0xdc,0x5e,0xcc,0xcb,0xf7,0xc6,0xdc,0x59,0x1d,0x02,0x84},
+            {0x06,0xb9,0x70,0x15,0x60,0xe8,0x7f,0xca,0xd9,0xf9,0xf9,0xeb,0x76,0x1b,0x9b,0x78,0xbe,0xd1,0xeb,0x97,0x9b,0xcb,0xc2,0x52,0xb9,0xeb,0xaa,0xa4,0x65,0x31,0x9a,0x2b},
+            {0x64,0xbf,0x40,0x9c,0x31,0x57,0x8e,0xfb,0x27,0x17,0xdf,0x97,0xff,0x81,0x25,0xc2,0x18,0xe5,0xb2,0x74,0x0c,0xce,0x77,0x11,0x86,0x28,0x8d,0xe4,0x18,0x11,0x0e,0x2c},
+            {0x91,0xad,0xc1,0xe2,0xec,0xab,0xaa,0x94,0x98,0x83,0x34,0xb1,0x07,0xb2,0x3a,0x78,0xaf,0x49,0xd6,0xcd,0x6a,0x8a,0x7f,0xa4,0x5d,0xd0,0xa3,0xde,0x7e,0x7a,0x5b,0xb5},
+            {0x99,0xae,0x7e,0x7c,0xbf,0x97,0x3d,0x9e,0xee,0x35,0x90,0x1a,0x95,0x21,0x2c,0xed,0x0c,0xac,0xcc,0xde,0xa0,0x7e,0xac,0x0d,0x88,0xb5,0xcd,0x29,0xe9,0x80,0xb9,0x56},
+            {0x56,0x3e,0x70,0x18,0x3d,0x98,0xc8,0x99,0xd0,0xf0,0xfc,0xa9,0x66,0x34,0xf7,0x7e,0xc8,0x9a,0xd4,0xba,0xcb,0x3f,0x52,0xed,0x2f,0x73,0x65,0x55,0x14,0x97,0x79,0xe0},
+            {0x7f,0x01,0xf9,0x80,0xbf,0xd6,0xc3,0xc6,0x0f,0x36,0x28,0xd6,0x1a,0xfd,0x9b,0xc5,0xc9,0x2f,0x50,0x99,0x8b,0x3e,0xbb,0x08,0x13,0xdb,0x04,0x87,0xd2,0xc2,0x3f,0x56},
+            {0xaa,0xa5,0xcf,0xc4,0x02,0x8f,0xa4,0xa0,0xb2,0xf1,0x30,0x33,0x72,0xab,0x35,0xe5,0xc4,0xe4,0xa6,0xd5,0x81,0x6b,0xd6,0xb8,0x19,0x92,0x6e,0x89,0x49,0xa4,0xbd,0x73},
+            {0x52,0x96,0x8b,0x2e,0xfd,0x49,0x6a,0x5d,0xe2,0xdc,0xf2,0x6a,0x65,0x02,0xe8,0xc6,0xc7,0x4d,0xd1,0x24,0x9a,0x40,0x72,0x3a,0x17,0xe8,0x4b,0xd3,0x31,0xda,0xe9,0xb6},
+            {0x91,0x37,0xb4,0xda,0x30,0x41,0xa7,0xe4,0xa3,0xb8,0x8d,0xef,0xfe,0x35,0xf3,0x71,0xc0,0xd8,0xf7,0x46,0x86,0x7c,0x99,0x59,0xec,0xa9,0x86,0xd4,0xa2,0x40,0x34,0xeb},
+            {0x1d,0x81,0xa4,0xbe,0x4a,0xb4,0x9d,0x3b,0xaa,0x09,0xa9,0x47,0x94,0x06,0x1d,0x77,0x0b,0xd2,0x24,0xd3,0x70,0x1f,0xe0,0x0b,0x76,0x68,0x02,0x97,0xca,0x81,0x9b,0xee},
+            {0x62,0x8c,0xc2,0xeb,0x26,0xc7,0x27,0x88,0x94,0xed,0x8e,0xc3,0x17,0xb4,0xc6,0x0a,0xfe,0x8a,0xd5,0xfd,0xa3,0x59,0xf1,0x51,0x30,0x0e,0x15,0x01,0xd6,0xb2,0x70,0x91},
+            {0xcc,0x93,0x78,0xc9,0x9c,0x54,0xdb,0x8e,0xa7,0xcf,0xa4,0x26,0x1e,0x74,0x34,0x9b,0x30,0xe5,0x3f,0xea,0x02,0x32,0xdf,0xc6,0x5e,0x59,0x54,0x19,0xb7,0x31,0x1c,0x78},
+            {0x3f,0x3a,0x95,0x9e,0xd7,0xbd,0x37,0x8b,0x9e,0xa2,0x82,0x2b,0x16,0x67,0x60,0xec,0xec,0xc9,0x9f,0xf6,0x5c,0x34,0x0e,0x9a,0x99,0xb5,0x50,0xb4,0xe2,0x33,0xbc,0x38},
+            {0x23,0x4a,0xea,0xb4,0xff,0xf8,0x50,0xbd,0xd0,0x13,0x57,0x48,0x28,0xde,0xf8,0x4a,0x96,0xeb,0xf5,0x3a,0x59,0x18,0x7f,0xae,0x76,0x4d,0x69,0x1c,0x1e,0x16,0xfc,0x9b},
+            {0xb0,0x65,0xe4,0xe7,0xd2,0x95,0x30,0x02,0x8f,0xe9,0x2e,0x1f,0x48,0xfd,0x49,0x44,0xcf,0xbc,0xd4,0xa4,0xbb,0x1a,0xee,0xda,0xb4,0x38,0x66,0xb6,0x94,0xf0,0xfb,0xa5},
+            {0x5d,0xf3,0x9f,0xea,0x0e,0x23,0x5a,0x74,0x74,0x76,0x25,0x9f,0x34,0xf8,0xb6,0x6d,0x73,0x9f,0x9d,0x7b,0xf4,0x7f,0x50,0xc1,0x98,0x91,0x22,0x2f,0xb6,0x6e,0xd6,0xf3},
+            {0x67,0xfe,0xf3,0x4b,0xec,0xf3,0xa8,0x91,0x91,0x22,0x08,0x19,0xe9,0x85,0x76,0x16,0x82,0x58,0x3e,0x9e,0x2f,0xac,0x7f,0xcc,0xe2,0x18,0x18,0x43,0xe5,0x67,0xb1,0x3c},
+            {0x58,0x72,0x93,0xd7,0x43,0x05,0xaf,0x4a,0xd1,0xbc,0xc2,0xd8,0x8f,0x6a,0xc1,0x6c,0x47,0xba,0x26,0x5e,0x3a,0xc5,0xff,0xa5,0xf0,0xf6,0x23,0x5e,0xa8,0xca,0xc9,0x52},
+            {0x36,0xa9,0xa0,0x3e,0x9f,0xbc,0x02,0x37,0xbd,0x52,0xec,0xf7,0xfa,0x23,0x62,0x6d,0x8a,0xc8,0x3e,0x91,0xd5,0x4c,0xc0,0x47,0x1c,0xc9,0x27,0x79,0x29,0x58,0x28,0x79},
+            {0x78,0xa6,0x73,0x15,0x2a,0xe8,0x75,0x40,0xf2,0xb3,0xa3,0x8b,0xa4,0x7e,0xc5,0xbd,0x5c,0xf0,0x47,0xda,0x62,0xcd,0x6b,0xe3,0x68,0x2a,0x72,0x3b,0xc8,0x7e,0xe1,0xa9},
+            {0x8b,0x48,0xaf,0xe5,0x35,0x02,0x4d,0x84,0x51,0x4d,0x81,0xfd,0xea,0x58,0x93,0x4c,0xa0,0xf2,0x3e,0x03,0x15,0x65,0xd7,0xf7,0x4d,0x05,0xec,0x7a,0x7d,0x94,0x68,0x01},
+            {0xd8,0x1e,0xe7,0xe4,0x07,0xad,0x13,0x11,0xd6,0x8f,0x0b,0x53,0x99,0x4e,0x6f,0xb6,0x81,0x31,0xc5,0x96,0x73,0x53,0x29,0xf7,0x6c,0xb4,0xd1,0x8c,0x4d,0xdb,0xfb,0x77},
+            {0x16,0xbe,0x46,0x07,0xf8,0xbe,0xe1,0xe1,0x91,0x85,0x73,0x72,0xb0,0x26,0x3e,0xd4,0x01,0xbf,0xa1,0x73,0xf2,0x75,0x27,0x36,0xfb,0xe5,0x0a,0xbb,0x7e,0x58,0xda,0x98},
+            {0xd0,0x50,0x83,0xdd,0x5e,0x6d,0x5e,0x0a,0x2c,0x32,0x0a,0x17,0x52,0xc7,0x24,0xd3,0xa1,0x34,0x28,0xb9,0xdb,0xd2,0x83,0x3f,0xc6,0x7c,0x86,0x62,0x8f,0x6e,0xb1,0xc3},
+            {0x0b,0x2f,0x63,0x70,0x27,0x1a,0x17,0x24,0x2d,0x09,0xd0,0x29,0x2a,0x1e,0x03,0x44,0xd2,0x80,0x6c,0xc8,0x9e,0x8e,0x6e,0x12,0x5c,0x72,0xed,0x47,0x31,0x71,0x71,0xc9},
+            {0xaa,0x13,0x32,0x22,0x9c,0x78,0x54,0x4a,0xda,0x66,0x6a,0x1e,0x7c,0xc5,0x4f,0xb5,0xfa,0x31,0xc5,0x86,0x37,0x0d,0xe5,0x38,0x8b,0xfa,0xdd,0x86,0x17,0x6b,0x22,0x50},
+            {0xd6,0x05,0xe3,0xd0,0xca,0x62,0xce,0x11,0x1f,0x73,0xd2,0xea,0x48,0xc5,0xfb,0xb5,0x6c,0x5d,0x47,0xc2,0xbc,0x28,0xeb,0x68,0xc3,0x98,0x51,0x57,0x03,0x11,0x90,0x72},
+            {0x9e,0x05,0x49,0xf0,0x39,0xe6,0xc5,0x30,0xdc,0x14,0x32,0xad,0xca,0xa4,0x0a,0x3e,0xe2,0xd6,0x93,0x29,0xfe,0x1a,0x22,0x45,0xc6,0xc0,0x46,0x1c,0x16,0x93,0x1e,0xaa},
+            {0xcb,0x2f,0x37,0x89,0xae,0x09,0xd7,0x24,0xf9,0xed,0xdb,0x3f,0x10,0x4e,0x75,0x5e,0xd2,0xdd,0xc3,0xf5,0xba,0xc8,0x7a,0xeb,0x91,0xf7,0x6f,0xa5,0x37,0x84,0xe8,0x81},
+            {0x6e,0x3b,0x38,0x35,0xf9,0x89,0xde,0xcf,0x54,0x41,0xe8,0xc5,0x24,0xaa,0x95,0xb6,0xb3,0x12,0xd5,0x73,0x2d,0x61,0x4f,0xe2,0x4d,0x80,0xf9,0xdd,0x39,0xba,0xd1,0xc5},
+            {0x31,0x84,0x40,0xcf,0xef,0x57,0x05,0x3d,0x80,0x6d,0x6f,0x9c,0x03,0xc1,0x33,0x19,0x47,0x01,0x8c,0xf2,0xf4,0x79,0xb7,0x1d,0x9f,0x5f,0xf4,0xd1,0xbf,0x94,0x0a,0xe9},
+            {0x51,0x05,0x0b,0x25,0x69,0x88,0x5e,0x0a,0x61,0xfc,0x24,0x87,0xc8,0x42,0x8e,0x6f,0xdb,0x88,0x61,0x72,0x7d,0xe7,0xe8,0xd9,0x7f,0x79,0x01,0xe6,0xf5,0x83,0xac,0xc7},
+            {0x02,0xe3,0x74,0x62,0xd0,0x82,0xa0,0x33,0xc3,0x82,0xc0,0x4e,0xc6,0xd9,0x0c,0x62,0x9b,0xd9,0x6c,0xd0,0x37,0x9e,0xac,0x63,0x99,0xa7,0x18,0xd9,0x98,0x8b,0xf3,0xb9},
+            {0x35,0x15,0xea,0xa5,0x53,0xcf,0x9f,0x35,0xd8,0x5f,0xde,0xb3,0x67,0xeb,0x3e,0xb9,0x30,0xa7,0x9d,0xcd,0xef,0xcd,0xaf,0x2e,0x6e,0xb0,0x0c,0x55,0x0d,0xee,0xa9,0xf5},
+            {0x13,0x21,0xc4,0x7c,0x06,0x0f,0x37,0x15,0x89,0xbf,0x9a,0x1d,0xc6,0x55,0x7b,0x9b,0x49,0x43,0x4a,0x4a,0xd6,0xad,0x15,0xf6,0x74,0x9a,0x2b,0xf7,0x1e,0x26,0xce,0x14},
+            {0x62,0x7c,0xf5,0x26,0xb8,0xc3,0x36,0xe3,0xa3,0xd8,0xc3,0xe8,0x2e,0x55,0x03,0xfe,0xa6,0x33,0x8f,0x14,0xa4,0x38,0xe8,0xde,0x6b,0xb3,0xdc,0x56,0x74,0xa1,0x0d,0xa6},
+            {0x7c,0xd3,0xb2,0x28,0x9d,0xc1,0x19,0x0b,0x6e,0xa2,0x1b,0x9d,0x01,0x1e,0xc5,0x57,0x4f,0xa2,0x51,0xd2,0x22,0xaf,0x63,0xa5,0x2b,0xeb,0xef,0xec,0xbd,0x89,0xd7,0xc1},
+            {0x9b,0xb3,0xad,0x4e,0xfd,0x34,0xc6,0x83,0x9b,0xf4,0xb6,0x41,0xd1,0xf7,0x45,0xd8,0xce,0x60,0xc8,0x29,0xf2,0x2b,0x77,0x3d,0xe0,0xfe,0xdd,0x56,0x6c,0x3c,0xa6,0x0d},
+            {0x67,0x9c,0x47,0x7e,0x99,0x9a,0xe7,0x8b,0xde,0x65,0xce,0x99,0xac,0xb6,0xc2,0xba,0xcb,0xce,0xa8,0x21,0x4b,0xa4,0xb7,0xfd,0x47,0x7a,0xe9,0x1b,0x1d,0x21,0x79,0x2d},
+            {0xbd,0x3e,0xc9,0x0f,0x50,0xcd,0xbf,0xa7,0x43,0x72,0xcf,0xce,0xe0,0xf0,0x17,0xfe,0x73,0x42,0x93,0x5e,0xb9,0x3d,0x93,0x67,0xca,0x27,0x7d,0xff,0x7b,0x02,0xea,0xff},
+            {0x6a,0x73,0xb3,0xac,0x5c,0x74,0xdb,0x3e,0x94,0x0d,0xf1,0x3e,0xa5,0xe0,0x49,0x43,0x2e,0x24,0x88,0xb3,0x99,0x77,0x67,0xdf,0xd7,0x00,0xe9,0xae,0xb3,0x4f,0x9c,0xfa},
+            {0xa6,0x42,0xe0,0xef,0x2b,0x4c,0x17,0xcb,0xac,0xb8,0x68,0xec,0x0c,0xa7,0xd4,0x3a,0xe9,0xce,0xfe,0xe5,0xe0,0xdc,0x29,0xe5,0x9e,0x56,0x1b,0x44,0xaf,0xf0,0x56,0x15},
+            {0x1a,0x77,0x39,0x8f,0x0d,0x86,0x73,0xa9,0xfc,0xcd,0x33,0x42,0x33,0x8f,0x6e,0x5f,0xc1,0xe9,0x68,0x00,0xbe,0xeb,0xe0,0x4f,0x4a,0xba,0x48,0xaf,0xdd,0x41,0xf6,0xa3},
+            {0xd2,0xbf,0x9e,0x00,0xbf,0x60,0x50,0xad,0x68,0xe7,0xa3,0xea,0x12,0x61,0xb3,0xc9,0xf9,0xb6,0x39,0x4d,0x53,0xda,0x2f,0x9f,0x17,0x12,0x19,0x9f,0xf5,0xfa,0x96,0xac},
+            {0xd1,0x7c,0x02,0x76,0x25,0x08,0x25,0xf6,0xc8,0xab,0x12,0x1c,0x99,0x9c,0x61,0xcc,0x89,0x28,0x74,0x48,0x8a,0x4b,0xc9,0x5a,0x10,0x4d,0xc0,0x38,0x2e,0x51,0x1a,0xaa},
+            {0x7b,0xe2,0xcb,0x47,0x8a,0x85,0x7b,0x81,0x95,0x7d,0x71,0x69,0xa0,0x1c,0x66,0x92,0xa2,0x54,0xe7,0xb0,0x29,0xb4,0x29,0x95,0xb6,0xc2,0x62,0xe6,0xd3,0x0f,0x00,0x38},
+            {0x2a,0xf5,0x4e,0x9f,0x62,0x19,0x31,0x95,0xb0,0xb9,0x27,0x46,0x2e,0x63,0xa6,0x61,0xc5,0xab,0xe6,0x9f,0xff,0x22,0x03,0x7e,0x04,0x72,0x57,0xdd,0x41,0x08,0x96,0x46},
+            {0x12,0x08,0x49,0xc1,0x55,0x43,0x7b,0xbe,0xc3,0x9e,0x71,0x26,0x7d,0x33,0x20,0xea,0xe4,0x64,0xe9,0x49,0xc7,0xed,0x1e,0x81,0x2c,0x91,0xf3,0xc5,0xea,0xd6,0xba,0x1d},
+            {0x4d,0x77,0x30,0x9e,0xd2,0x52,0x2e,0xc8,0x9b,0x7e,0x8e,0x0f,0x01,0x89,0xcf,0xe9,0x12,0x4b,0xab,0xae,0x46,0x50,0x07,0xab,0x5c,0x90,0x5a,0x95,0x41,0xd6,0x3a,0x4b},
+            {0x4e,0xeb,0xf5,0xa0,0xcc,0xa4,0x48,0x83,0x2d,0x9a,0x52,0x24,0xa3,0x92,0x50,0xec,0xac,0x4a,0x18,0xc6,0x50,0xba,0xaf,0xe2,0xd8,0x80,0x42,0x41,0xc2,0x74,0xdf,0xc1},
+            {0x5d,0x29,0xb8,0xc1,0x4a,0xc8,0x3e,0x53,0x1b,0x87,0x53,0x4e,0xf1,0x75,0x31,0xcf,0xec,0x84,0xf4,0x9c,0x76,0x4e,0x64,0x10,0xc8,0xd5,0x68,0x2f,0xd8,0x02,0x04,0xa7},
+            {0x62,0x5d,0x9a,0x10,0xf1,0x36,0xb1,0x03,0xe8,0x5f,0x0e,0x78,0x63,0xdf,0x74,0xdb,0x80,0x49,0xf7,0x7a,0x75,0xe5,0x23,0x61,0x74,0x88,0x73,0xfb,0xdb,0x2a,0x3f,0x73},
+            {0xeb,0x21,0xa9,0xd3,0x3e,0x58,0xda,0xa0,0xea,0xd2,0xda,0xd3,0xa7,0x1d,0x4e,0x5e,0xaa,0x7b,0x03,0x21,0xc6,0xcc,0x2d,0x4e,0x86,0x46,0x4c,0x70,0xcf,0x36,0x66,0x34},
+            {0x6b,0x90,0x66,0xc0,0xd9,0x04,0x9b,0x06,0x34,0xed,0xf9,0x2b,0x34,0x14,0x0d,0x02,0xa4,0x9e,0x7a,0x6d,0x76,0x48,0x3d,0x14,0xc3,0x21,0x25,0xf3,0xea,0x41,0xd8,0xf4},
+            {0xb6,0x8f,0x5e,0xbb,0x20,0x55,0x4b,0xdd,0xbc,0xbd,0x92,0x37,0x1c,0x4e,0x53,0x62,0x10,0xa0,0x67,0x4e,0x61,0x57,0x7d,0x55,0x2b,0x6b,0x40,0x59,0x39,0xac,0xdd,0xfc},
+            {0x2f,0x8f,0xc9,0x83,0x73,0x42,0x2a,0x6d,0xce,0x98,0xf1,0x83,0xf2,0x54,0x88,0x52,0x07,0x94,0xb4,0x5b,0x94,0x7c,0x18,0xab,0x0e,0x1b,0x92,0x4d,0xee,0x35,0x3b,0x61},
+            {0x64,0x64,0x33,0x40,0x08,0x69,0x27,0xf7,0x89,0x05,0xc5,0x27,0x84,0x69,0x25,0x57,0x86,0x9b,0xcf,0x72,0x3b,0x2a,0xd1,0x9b,0x69,0xfd,0x03,0x49,0x60,0x1a,0xa7,0xe5},
+            {0x39,0xc7,0x2e,0x17,0x87,0x4b,0xa3,0xa3,0x85,0x02,0x31,0xad,0x77,0x31,0x9c,0x56,0x4e,0x5f,0xc1,0xf2,0x34,0x14,0xc8,0x0d,0x05,0x31,0xf8,0xe6,0x18,0x89,0x5a,0xc6},
+            {0x9e,0x2a,0xfd,0x30,0xde,0x5b,0xfa,0x30,0xe2,0x37,0xd9,0xf2,0xf7,0x73,0x76,0x6a,0x82,0xe2,0x0d,0x1a,0x7e,0xfa,0x10,0xd3,0x4e,0x37,0x04,0x8b,0x17,0x2d,0x2e,0x91},
+            {0xc0,0x88,0x8a,0x46,0x37,0x7f,0xe1,0x19,0x4a,0x84,0x31,0x3d,0x3e,0x9f,0x64,0xe9,0x0c,0xb9,0x46,0x48,0xcb,0xad,0xc9,0x3c,0xa1,0xc0,0x77,0x96,0x0b,0x29,0x46,0xbf},
+            {0xc7,0xa5,0x48,0x36,0xaa,0x91,0x4f,0x27,0xdf,0x84,0x24,0xe4,0x0d,0x4c,0x42,0x18,0x3c,0x7d,0xce,0x32,0x79,0x8f,0x79,0x64,0xfa,0xde,0x25,0x87,0x68,0xbe,0xaa,0x4d},
+            {0x48,0x58,0x65,0xc1,0x69,0xe3,0xe6,0x0c,0x2b,0x0c,0xd9,0x7f,0xe7,0xca,0xf0,0x4b,0xb5,0x59,0x2a,0x9a,0x08,0xc5,0xab,0xf5,0x3d,0xe9,0x2f,0x5f,0xa7,0x45,0x84,0x5a},
+            {0x77,0x03,0x81,0x85,0xb0,0x02,0x4d,0x9e,0x2e,0x08,0x81,0xb8,0xd5,0x7e,0x4d,0xea,0x0b,0x59,0xfc,0xbd,0x2b,0xc2,0xa7,0x76,0xc8,0xd7,0xb2,0x9b,0x53,0x56,0xa2,0x40},
+            {0x19,0xbe,0x08,0x0d,0x3f,0x5d,0x82,0x8b,0x28,0x26,0xc2,0x21,0xf3,0x5a,0x07,0x20,0x05,0x40,0xc4,0x7c,0x5b,0xd5,0xc3,0x74,0x17,0x5f,0x8d,0x1b,0x55,0xdc,0xc8,0xe9},
+            {0x32,0xd5,0xa7,0x74,0x33,0x13,0x00,0x85,0x01,0x4c,0xfa,0x02,0xeb,0x0b,0x0f,0xf3,0x6b,0xe9,0x67,0x63,0xb8,0xf1,0x00,0x50,0x2e,0xe0,0x9a,0x93,0xfa,0x4a,0x62,0xbd},
+            {0x95,0x72,0xc9,0x5c,0xac,0xa0,0x53,0x68,0x8f,0x8c,0xde,0x14,0x36,0xa7,0xd5,0x65,0x2f,0x1b,0xb5,0xbb,0x4d,0xa9,0x2d,0xd2,0x00,0xdf,0x11,0xd2,0xa2,0x7d,0xa3,0x78},
+            {0xb3,0xdb,0x61,0x8f,0x9e,0x76,0x80,0xbe,0x0c,0x48,0x53,0x77,0xb1,0xf9,0xe8,0x74,0x79,0x8b,0x5b,0x9c,0xb2,0x80,0x0a,0x09,0x80,0x53,0xb0,0x25,0xc4,0x7e,0x70,0xf6},
+            {0x67,0xa7,0x7a,0x0c,0xdf,0x10,0x1d,0x5f,0xca,0x5d,0x17,0xbf,0x2b,0x49,0xf3,0xc0,0x06,0x32,0xbb,0x4a,0x53,0xc4,0xef,0x06,0x61,0x77,0x62,0xf3,0x6c,0x8c,0x8e,0x07},
+            {0x1f,0xff,0x38,0x05,0xbe,0x77,0x79,0x01,0x48,0x68,0xc9,0x14,0x62,0x83,0x8d,0xb4,0xe8,0xf8,0x8e,0x77,0x59,0x17,0x9f,0x14,0x40,0x08,0x53,0x4a,0x17,0x24,0xfc,0xda},
+            {0xef,0xd4,0x53,0xc2,0x49,0xb8,0x98,0x71,0x18,0x74,0xf6,0x43,0xc4,0xb6,0x6e,0xfd,0x58,0xe9,0x1a,0xd5,0xb3,0xae,0xe1,0xaa,0x6a,0xd7,0xa4,0x77,0xb7,0x24,0x8a,0x94},
+            {0xbf,0x94,0xe5,0xf1,0xc7,0xb5,0xc8,0x48,0x32,0x85,0xa8,0xde,0xa4,0x34,0x5e,0x75,0x19,0x58,0x1d,0x48,0x6f,0xcb,0x27,0xa8,0xda,0x43,0xa2,0xb4,0x8b,0xe2,0x23,0x46},
+            {0x7c,0xcb,0x34,0x27,0x93,0x95,0xa2,0x88,0xbc,0x3c,0xe1,0x00,0x24,0x5c,0x6d,0xe7,0x7f,0xd9,0xfc,0x35,0x95,0x6f,0x9e,0xce,0x35,0xe6,0x47,0x5b,0xbd,0x6f,0x6e,0xf8},
+            {0x81,0x0c,0xe5,0x36,0xaa,0x75,0x0b,0x60,0xcf,0xc6,0xac,0xff,0x3f,0xf6,0x5b,0x36,0x51,0x5f,0x60,0xc1,0xab,0xe5,0x81,0x6a,0xa5,0xe3,0x85,0x49,0xb0,0xcf,0x21,0xad},
+            {0xbe,0x1c,0x27,0x75,0x73,0x0a,0xe5,0x24,0xf4,0x4e,0x05,0xfc,0x98,0x9e,0xa3,0x3b,0x24,0xd2,0x62,0xdb,0x5c,0xb6,0x30,0xcd,0x13,0xd5,0x6a,0x23,0x24,0xf8,0xfe,0x37},
+            {0x7b,0x8b,0xf8,0x5e,0x45,0x28,0x5f,0xa4,0xb8,0x00,0xe5,0x44,0xda,0x00,0x2c,0x0c,0x43,0xc2,0xb8,0x76,0x44,0xdf,0xb6,0x2c,0x42,0x09,0x06,0x31,0xc5,0xab,0xd1,0xd5},
+            {0x96,0xe2,0x86,0xdd,0xeb,0x65,0xc5,0xe5,0x4b,0x4a,0x83,0x25,0xcd,0x69,0x5b,0x53,0xf4,0xaf,0xf1,0xfd,0xa6,0x35,0xce,0x72,0xc7,0xb1,0x4c,0xe1,0xe9,0x26,0xc7,0xd4},
+            {0x12,0xe0,0x31,0x0e,0xdc,0xa5,0x2b,0x08,0xcb,0x8a,0x18,0xdd,0x2e,0x38,0x2d,0xa6,0x29,0x08,0xb4,0x76,0xf1,0x4b,0x1a,0x8e,0x0a,0xa9,0x93,0xa9,0x45,0xe8,0x43,0x99},
+            {0xe8,0xce,0xee,0x44,0xab,0x42,0x41,0xcb,0x19,0xd5,0xda,0x58,0x2a,0xbc,0x8b,0x9c,0x7e,0xc4,0xd7,0x1b,0xbf,0xa4,0x56,0xbb,0xda,0x2d,0x3d,0xfb,0x12,0x0c,0x1e,0x82},
+            {0xe3,0x95,0x1d,0x26,0x37,0xdf,0x7a,0x24,0xc3,0xfb,0x48,0x36,0x0d,0xa8,0x72,0x47,0xd9,0x98,0xc9,0xf0,0x92,0xd7,0xeb,0xe3,0x49,0xbf,0x5b,0x49,0x3c,0xf8,0x90,0x34},
+            {0x26,0x57,0xc9,0x28,0xcb,0x13,0x9a,0xc3,0x0c,0xb4,0x95,0xa7,0x90,0xe8,0xa1,0x25,0xd4,0x52,0xa5,0x41,0x26,0x7e,0x71,0xca,0x16,0x35,0xcb,0x69,0xd8,0x30,0xc3,0x49},
+            {0x4d,0x0f,0xab,0x36,0x85,0xc9,0xe1,0x4d,0x83,0x82,0x25,0x36,0x70,0xd0,0x45,0x34,0x30,0x01,0x0f,0xdb,0x95,0xda,0x9a,0x0c,0xf5,0x42,0x77,0x60,0xff,0x8f,0x4b,0xf5},
+            {0x85,0xa6,0x5d,0x69,0x08,0x1d,0xc8,0x87,0x43,0x06,0x7a,0x1a,0xe0,0xf5,0xab,0xef,0x0a,0xdf,0x79,0xba,0x23,0x50,0x09,0x54,0x21,0x7f,0x99,0x0b,0xdd,0x17,0x24,0x6d},
+            {0xb3,0xd6,0xe8,0x33,0x86,0xb1,0x1a,0x0d,0x73,0x6d,0x43,0xf1,0xeb,0x32,0x35,0x38,0x8a,0xbd,0xfa,0xf2,0xc9,0x0e,0x94,0xba,0x02,0xd4,0xc5,0x0a,0x3c,0x83,0x0a,0x66},
+            {0xf1,0xf2,0x07,0xe7,0x02,0xa0,0x23,0x18,0x63,0x5f,0x35,0xa7,0x01,0x41,0xff,0x96,0xd5,0x0b,0x10,0x58,0xf5,0x7c,0x01,0xf8,0x4f,0xd5,0x97,0x31,0x12,0xee,0xc5,0xbd},
+            {0x10,0xe4,0x12,0xa4,0xf7,0xc3,0x7f,0x47,0xb6,0x3d,0x39,0xcb,0xde,0x47,0x21,0xf6,0x56,0x70,0xbc,0x20,0x85,0xec,0x8d,0xb8,0xa6,0xeb,0xd2,0xdb,0x0f,0x19,0x53,0x1c},
+            {0xa7,0x67,0x9d,0x3b,0x0d,0x86,0xf7,0xd1,0x9b,0x86,0x5f,0x9c,0x25,0xaa,0x91,0xc1,0xbb,0xcf,0xcc,0x89,0xca,0xc3,0x41,0x51,0x38,0x39,0x3f,0x68,0x95,0x86,0x99,0xf2},
+            {0x9b,0xe5,0xb6,0x95,0x45,0x81,0x3b,0x36,0x8c,0xb6,0xfd,0x8e,0x8e,0x2f,0x08,0x43,0xa3,0x29,0x9c,0x26,0x8f,0x3c,0x78,0x69,0x1d,0x62,0xf1,0x4c,0xc0,0x8e,0x1f,0xd5},
+            {0xc7,0xef,0x25,0x94,0xea,0xd7,0x5d,0xd5,0x6e,0x8e,0xff,0xb1,0x51,0xe7,0x2c,0x72,0xef,0xd2,0xe3,0x15,0x1c,0x22,0xf1,0x13,0xa9,0x95,0x2c,0x2d,0x2a,0x09,0x4e,0xf8},
+            {0x43,0x40,0x6f,0xa3,0x08,0x13,0xbf,0x11,0x4a,0xd7,0x91,0xf1,0x9f,0x91,0x78,0x3e,0xe6,0x23,0xdb,0xf5,0x88,0x2e,0x93,0x61,0xdb,0xb9,0xdd,0x42,0xdc,0xc1,0x24,0xa9},
+            {0xf4,0x5c,0x26,0x18,0xd6,0x39,0xe2,0x5d,0x60,0xa6,0xff,0x4e,0x3d,0x3c,0x54,0xac,0xa3,0xaf,0xda,0x88,0x87,0xfe,0xed,0xa4,0x8b,0x39,0x31,0xd5,0xfb,0x3a,0x89,0x0d},
+            {0x02,0x1d,0x36,0xf9,0xb6,0x3a,0xe9,0x50,0x9a,0x13,0x9f,0x59,0x19,0xa2,0xc7,0xc6,0xda,0xaa,0x8b,0x77,0x5b,0x67,0xd1,0x75,0xd9,0xfd,0xc2,0xca,0xf1,0x54,0x52,0x47},
+            {0x22,0x16,0x62,0xe3,0x38,0x4a,0xcf,0xda,0x6b,0x41,0x9a,0xca,0x64,0x19,0x4a,0x7e,0x2b,0x51,0x5c,0x47,0x0e,0xb5,0x15,0x64,0x1a,0x43,0xad,0x28,0x0f,0x5d,0x8c,0x64},
+            {0x93,0xa2,0x28,0x0c,0x52,0x12,0x33,0x49,0xf7,0x14,0x3d,0x8f,0x90,0xb8,0x86,0x29,0x85,0xea,0xb8,0x85,0x6c,0xe0,0x1c,0x1e,0x65,0x84,0x7f,0x74,0xe8,0x2f,0x35,0x85},
+            {0x97,0x59,0x5d,0x2f,0x3e,0x15,0x49,0x26,0x23,0xc1,0x18,0x0c,0x34,0x48,0xd9,0x1e,0x27,0xe8,0xca,0xa9,0x1a,0x22,0x86,0xff,0xdd,0xe6,0xe0,0xe0,0x1d,0x73,0x48,0x7c},
+            {0x55,0x4e,0x51,0xf4,0xe4,0x22,0xd0,0x07,0x65,0x36,0x97,0x12,0xa7,0x3d,0xbe,0x5e,0x18,0xc4,0xf5,0x9a,0xa5,0x55,0x46,0xb9,0xaf,0xf3,0xf1,0xb9,0x4c,0x8f,0x75,0xee},
+            {0x37,0x3c,0x9b,0x4a,0x6f,0xa3,0xfc,0x74,0x78,0x81,0x12,0x3d,0x34,0x2a,0xd6,0xfd,0x4b,0xfe,0x28,0x0c,0x15,0x50,0x51,0x7f,0x32,0x9e,0x7b,0x5f,0xd9,0xc9,0x08,0x24},
+            {0x54,0x66,0xa2,0x9f,0xb4,0x2e,0xfa,0x17,0xc0,0x90,0xee,0xdb,0x46,0xbb,0x21,0x39,0x88,0xef,0x76,0x56,0x63,0x4e,0xff,0x61,0xd3,0x99,0xc4,0x54,0x0b,0xf1,0x85,0xd4},
+            {0x68,0x88,0x2d,0xb3,0x23,0x87,0x22,0x9d,0x3c,0x09,0x6e,0x4f,0x07,0x5c,0x90,0x75,0xd1,0x12,0x87,0x59,0xc3,0xfd,0xf5,0xe5,0xd8,0xbc,0xdf,0xe2,0x40,0x72,0xd5,0x59},
+            {0xf7,0x03,0xf9,0x8c,0x5b,0x75,0x38,0x0e,0x73,0xf8,0x61,0xb3,0xce,0xb6,0x85,0x09,0x4a,0xee,0x63,0x41,0x30,0x9d,0x51,0x61,0xb7,0x61,0xfc,0xca,0x78,0xac,0xda,0x0e},
+            {0x59,0xf9,0x3b,0x2d,0x63,0xf4,0x64,0x3f,0x56,0x61,0x99,0xa9,0x2d,0x95,0x5b,0xd7,0x8c,0xaa,0xf7,0xec,0x7e,0x30,0x78,0xfd,0x52,0x64,0xf5,0xb4,0x78,0xac,0x09,0xb2},
+            {0x63,0x97,0x31,0xcf,0xd7,0xab,0x58,0x2b,0xe0,0x92,0xda,0x8e,0xc8,0xda,0x53,0x71,0x8c,0x20,0x6b,0x8f,0x0f,0xa5,0xc7,0x59,0x53,0xfc,0xff,0x3c,0xb1,0x16,0xa1,0x72},
+            {0x2b,0xfe,0x2a,0x09,0x7a,0x07,0x4f,0xdf,0xf1,0x40,0xfe,0xf5,0x4c,0x10,0x49,0x53,0x99,0x6a,0x03,0x2d,0xc1,0x62,0xed,0xf3,0x2d,0xc3,0x57,0xe0,0x9a,0xbb,0x3f,0xcc},
+            {0x46,0x6d,0xd6,0x4b,0xfa,0x54,0x68,0xa0,0x71,0x70,0x5d,0x8b,0x3f,0x86,0x20,0x6a,0x48,0x16,0x73,0xce,0xd1,0x0e,0x0a,0x4f,0x17,0x2d,0x74,0x86,0xcd,0x29,0xe8,0xce},
+            {0xa4,0x0e,0x51,0x1b,0x71,0x9b,0x62,0x75,0xde,0xdb,0x1b,0x46,0xf2,0xc5,0xf8,0xb0,0xcd,0x72,0x53,0x12,0xab,0x23,0x91,0x32,0xc5,0xb9,0xb2,0x95,0x47,0xf6,0xf7,0x64},
+            {0x65,0x83,0xf4,0x50,0xfd,0x90,0x01,0xe5,0x35,0x55,0x51,0xac,0xb5,0x8a,0x3c,0x95,0xac,0x66,0x3f,0x8f,0x58,0xa8,0x2c,0xc3,0xf9,0xf3,0x11,0x35,0xfe,0x49,0x24,0x42},
+            {0x2a,0x81,0x8d,0x06,0x9c,0x34,0xb0,0x5b,0xe5,0x27,0x69,0x43,0x7d,0xba,0x30,0x51,0xf9,0x31,0xaa,0xe1,0xb1,0x45,0x3e,0x95,0x0c,0x59,0x1b,0x39,0x20,0xc3,0xb3,0xee},
+            {0x0b,0x26,0xd3,0x2e,0x1e,0x31,0x40,0x0f,0x4c,0x3a,0x5e,0x27,0x50,0xfe,0xe5,0x22,0x39,0xb2,0xdc,0x37,0x28,0xf9,0x27,0xec,0x45,0x5b,0xa4,0x9f,0xcc,0x16,0xbb,0xbd},
+            {0x7d,0x90,0x70,0x55,0x56,0xfd,0x11,0x24,0x8b,0xe8,0xe5,0x3c,0x04,0xba,0xfe,0xb3,0x95,0xb1,0x23,0xc3,0xb4,0x2d,0x3e,0x0e,0x07,0xf0,0x2a,0xe5,0xbb,0xa7,0x46,0x81},
+            {0x79,0xad,0x23,0x29,0xc4,0x0c,0x96,0xcd,0x2e,0x4d,0x69,0x4d,0x51,0xd2,0x61,0x0b,0x8a,0x28,0x97,0x1d,0x6b,0x25,0x3f,0x5a,0x54,0xc2,0x23,0x01,0xaf,0xdb,0x29,0x3d},
+            {0x14,0x7e,0xed,0x7b,0x0f,0xf2,0x13,0xc3,0xba,0x36,0xf6,0x79,0xba,0x86,0x4c,0xb2,0xb0,0x50,0xde,0x96,0x8f,0xde,0xdc,0xdc,0xb4,0x8e,0x69,0x16,0xbc,0x26,0x45,0x74},
+            {0xd0,0x27,0xdf,0xca,0xaf,0x6e,0x04,0xf6,0x76,0xc6,0x19,0x24,0x45,0x15,0xb8,0x23,0xe7,0xad,0xff,0x3d,0xd0,0x1d,0xa6,0x73,0x03,0x42,0x42,0x11,0x68,0xa6,0x1c,0x45},
+            {0xe2,0x19,0x9d,0xbc,0x29,0x26,0x4d,0xdf,0x0e,0xdc,0x44,0x67,0x06,0xd6,0x84,0xcc,0x19,0xab,0x7c,0x81,0xfd,0x19,0xf2,0xc2,0x5a,0x6a,0xed,0xfa,0xf3,0x8b,0xff,0x61},
+            {0x74,0x21,0x96,0x56,0xde,0xbd,0x84,0xf5,0x72,0x50,0x81,0x35,0xfb,0x03,0xc4,0xdd,0xb8,0x0a,0x99,0x2c,0x62,0x9a,0x14,0x83,0xa4,0xb3,0x25,0x35,0x15,0x6e,0xe1,0xb7},
+            {0xcc,0x6b,0x74,0xe9,0x61,0x6a,0x1f,0xac,0xb8,0x2a,0x48,0x3e,0x19,0x03,0x93,0x48,0xcc,0xbc,0x6a,0x38,0x7a,0x3c,0x69,0x91,0xf5,0x01,0x33,0xca,0x84,0x4b,0xb4,0x99},
+            {0x30,0x84,0xb5,0x41,0x10,0x5f,0xe8,0x92,0xdd,0xfa,0xd7,0xef,0xe4,0xd4,0x28,0xa8,0xcf,0xb5,0x89,0x0c,0x69,0x70,0xd4,0xc4,0xd0,0x5b,0xc1,0xb1,0xe7,0xea,0x38,0xef},
+            {0xa0,0xb5,0xc6,0x9b,0xf8,0x83,0x14,0x74,0x18,0x96,0x9f,0xfc,0xa6,0xcd,0x45,0xe9,0xf7,0x10,0x22,0x3b,0x8d,0xa9,0xbd,0x93,0xd7,0x7c,0xe8,0xae,0xc7,0x6d,0x4b,0xea},
+            {0xe0,0x8c,0x7e,0x84,0x4d,0x6f,0xa6,0xcd,0xca,0xbb,0x04,0x97,0x5f,0xb6,0xc6,0x6c,0xed,0xa4,0xca,0xde,0xf3,0xb1,0xe4,0xfa,0xd7,0x36,0x72,0x07,0xd6,0x74,0xe9,0x73},
+            {0x60,0x33,0xe2,0x34,0x2b,0x47,0x0e,0x18,0xa4,0x42,0xcc,0x73,0xee,0xbf,0xc5,0xe7,0x73,0x03,0xcd,0x4e,0xcb,0x35,0x07,0x93,0x0f,0x77,0x7c,0xd2,0xfb,0x74,0x0a,0x15},
+            {0x3c,0x20,0xd1,0x32,0xea,0x8e,0x82,0x9f,0xd8,0xfb,0x7b,0x18,0xcf,0x5f,0x9a,0x5a,0x71,0xdd,0x88,0xbf,0x35,0xbc,0x81,0xf7,0xcf,0x37,0xb4,0xab,0x4c,0xc7,0xb9,0x61},
+            {0x0e,0xe9,0x8d,0xb4,0xb0,0x1b,0xea,0x14,0x7b,0xbc,0xb1,0xbd,0x49,0x2a,0x66,0xc8,0x5a,0xbe,0x9e,0x20,0x98,0x57,0x38,0xbb,0x5a,0x03,0x5d,0x58,0x7b,0xad,0xff,0x8d},
+            {0xbd,0x78,0x40,0x0e,0xe7,0x97,0xab,0xa1,0x9c,0x82,0xc3,0xbf,0x06,0x0a,0x13,0xd7,0x20,0xbe,0x4c,0xab,0x63,0x58,0xa3,0x90,0x75,0xe1,0xad,0x72,0x1c,0xfd,0x0b,0x99},
+            {0x91,0xc0,0xf7,0xef,0xc5,0xe4,0x3e,0xef,0xa3,0xe5,0x87,0xd1,0xe2,0x68,0x5b,0xbb,0xf6,0x8a,0x7b,0x06,0x4c,0x06,0xda,0x9b,0x21,0xf3,0xe3,0x8b,0xe2,0xf8,0x91,0x5e},
+            {0xf0,0xc2,0xff,0x1a,0xbe,0x61,0xe4,0xc0,0xc3,0x09,0x2a,0xfb,0xa4,0x82,0xe7,0xee,0xf6,0xf0,0x74,0x4c,0x26,0x7b,0x53,0x34,0xe0,0x60,0x48,0x5d,0x01,0x97,0x4b,0x18},
+            {0xdd,0x4d,0x83,0x0b,0xd2,0x48,0x06,0x68,0x32,0x62,0x4a,0x2a,0x5c,0xec,0xa1,0x33,0xb9,0xf5,0xb9,0xfa,0x66,0xc1,0xd3,0xa4,0x1e,0xb4,0xcc,0x29,0x16,0x9f,0x95,0x5d},
+            {0x04,0x17,0x5c,0x02,0xb4,0x38,0x83,0xfa,0x4b,0x3c,0x4b,0x99,0x03,0x34,0xe2,0xc3,0xe2,0x3e,0x85,0xdd,0xc3,0x6e,0xdc,0xf0,0x4b,0xee,0x9f,0x86,0xe8,0xa1,0x16,0xaf},
+            {0x2e,0xaf,0xcb,0xc1,0xdb,0x50,0x05,0xdb,0xf7,0x4c,0x90,0xa5,0x65,0x54,0xba,0x71,0x20,0x1e,0x21,0xd2,0x1e,0xf4,0xa7,0x70,0x94,0xf4,0xb1,0xc6,0xc6,0xd1,0x04,0x97},
+            {0xf6,0xc8,0x26,0xa6,0x59,0xee,0xf7,0xec,0xa7,0x68,0x5c,0xe1,0xe5,0x74,0x06,0x6a,0x00,0x79,0x06,0x16,0x30,0x41,0xaa,0xba,0x2a,0xc9,0x0a,0x12,0xf0,0x31,0x56,0x60},
+            {0x2d,0xc4,0xd5,0xde,0x79,0x4e,0x83,0x2b,0x49,0x9f,0x49,0x3c,0x99,0xfa,0x94,0x8e,0x10,0x07,0x9f,0x74,0x55,0x2f,0x23,0xfc,0x5d,0x37,0x00,0x72,0x2e,0x8d,0x0f,0x8d},
+            {0xc0,0x2e,0x49,0x05,0xc3,0x87,0x6a,0x3f,0xa3,0x82,0xc1,0xa7,0xf9,0x0c,0xf9,0x14,0x96,0xd6,0x6d,0xa1,0xb2,0x49,0x5c,0xb3,0xf5,0xa3,0x45,0x99,0x33,0x60,0x28,0x0a},
+            {0x5a,0x37,0x5b,0xe2,0x71,0x8a,0xc3,0x7a,0x38,0xee,0x1c,0x84,0xb8,0x44,0x76,0x69,0x5a,0x38,0x4e,0x2a,0x2f,0xf4,0x30,0x68,0xc8,0xd7,0x98,0x9b,0x4f,0xd3,0xce,0xa5},
+            {0xb7,0x0b,0x2e,0x6d,0x66,0x7b,0xe6,0x06,0xbd,0x1c,0x51,0x1f,0x7e,0x2c,0xf6,0x31,0xf5,0x33,0x94,0x8c,0xbb,0x5a,0xf2,0x6d,0xb8,0x65,0x0d,0x41,0x01,0x25,0x3f,0x63},
+            {0x35,0xa4,0x9d,0x20,0xab,0x27,0x7a,0xc8,0xc0,0x92,0x98,0x5c,0x9f,0xaa,0xd5,0x83,0x20,0xd1,0xaf,0x74,0x27,0x12,0x4c,0x48,0x28,0x88,0x8f,0x4b,0xd7,0x49,0x1b,0x36},
+            {0x2a,0x67,0xdf,0x5c,0xdd,0x3e,0x8c,0x2a,0x12,0x41,0xdf,0xd2,0x45,0x54,0xaf,0x46,0xfe,0xee,0x6b,0x13,0x8b,0x48,0x09,0x66,0x3f,0x86,0xe9,0x01,0x2e,0xc4,0x7b,0x27},
+            {0xb5,0x0c,0x7e,0x29,0x38,0x69,0x70,0xd3,0x92,0x58,0xf3,0x95,0xe0,0x5f,0x3c,0xae,0xb8,0x64,0x8d,0x9a,0x40,0xa0,0xc1,0x4a,0x60,0x3b,0xa1,0xe7,0x29,0xc1,0x78,0x2e},
+            {0x0d,0xb1,0xd7,0x9f,0xc1,0x68,0x6e,0x03,0x88,0xb8,0x43,0x9f,0xe7,0x33,0x18,0x62,0x31,0x4b,0x77,0xce,0xd5,0x06,0xdf,0xda,0xcc,0xc2,0xa2,0x1f,0xaf,0x74,0xf4,0x4f},
+            {0x6b,0x33,0x93,0xea,0xcd,0xa7,0xdc,0x18,0xa2,0xce,0x45,0x1f,0x25,0x41,0x68,0x1f,0x5d,0xd4,0xe9,0xaf,0x21,0xa2,0x62,0x49,0x56,0x54,0x2b,0x60,0x26,0x8a,0x94,0x05},
+            {0x8e,0x17,0xed,0x5e,0x69,0x02,0x77,0xe1,0x15,0x62,0x94,0xc6,0x90,0x4f,0x68,0x99,0xde,0x14,0x97,0xd1,0x5d,0x88,0x62,0xa9,0x8c,0xfe,0x34,0x9c,0x52,0x96,0xec,0x13},
+            {0xe4,0x4b,0x9e,0xb1,0x41,0xe8,0xff,0x07,0xac,0xd5,0xbc,0x5a,0x2f,0xdd,0x6d,0x33,0x41,0x92,0xe2,0x7b,0x27,0xb5,0xf4,0xc2,0x6a,0x22,0x5a,0xd2,0x8c,0xd9,0xab,0x9a},
+            {0x02,0xb6,0xfe,0x45,0xac,0xb7,0xaf,0x83,0x93,0x26,0x40,0xc8,0x15,0x19,0xa7,0xcf,0x4d,0x33,0xaf,0x40,0xe8,0xc6,0x65,0x10,0x85,0x52,0x86,0xf1,0xb8,0x69,0xdf,0x7f},
+            {0xc8,0xaf,0xf4,0xd8,0x67,0x04,0x56,0xd4,0xe6,0x40,0x51,0xe6,0x5f,0x01,0x82,0x26,0xf7,0xab,0xcb,0x40,0xdc,0x77,0xb7,0xa3,0x6a,0x93,0x4f,0x4a,0xfe,0xb4,0x28,0x88},
+            {0xaa,0x4a,0x4d,0xab,0xb9,0x03,0x8b,0xb1,0xbc,0x8d,0xaf,0xa9,0x33,0x97,0xb7,0x7b,0x81,0xe2,0x63,0xfc,0xff,0xf5,0x9e,0xb8,0x6c,0x07,0x92,0x0e,0x6c,0x8c,0x21,0x8f},
+            {0x3b,0x82,0x03,0xb9,0xed,0x70,0x80,0x44,0x72,0x03,0x13,0xb6,0x7f,0x9b,0x98,0xcf,0x9e,0x96,0x54,0x4e,0x95,0xad,0xa0,0x20,0x0b,0xc4,0xea,0x0e,0x54,0xa3,0xc6,0x33},
+            {0x52,0x4a,0xce,0xd0,0x16,0x5d,0xa7,0xaa,0x4a,0xed,0x8d,0x02,0x72,0x02,0x76,0xc3,0x89,0x5a,0x37,0xfc,0xfd,0x8d,0xb9,0xcf,0xfb,0xc9,0xd3,0x53,0xcc,0xc9,0x60,0xc4},
+            {0x55,0x3f,0xcf,0x8e,0x9e,0x53,0xd3,0x7d,0xa1,0x53,0xa4,0xf8,0xbf,0xd1,0x6a,0x2c,0x53,0x79,0xda,0x04,0x72,0x07,0x67,0x19,0xb0,0x5a,0x26,0xd1,0x01,0x00,0x80,0x1b},
+            {0xfb,0xb7,0xb3,0xe3,0x1f,0x1d,0x0d,0x16,0x06,0xdc,0x34,0xbf,0x1c,0x62,0x4d,0xb7,0xc6,0x21,0x33,0xe1,0x73,0x20,0x3d,0xad,0x5c,0xf4,0xc3,0x79,0x23,0x51,0xfb,0xbb},
+            {0xe6,0x2e,0xdd,0xd4,0xa8,0x15,0xb3,0x5b,0xf6,0x91,0x6c,0x61,0x5a,0x52,0xf1,0x85,0x39,0x5b,0xac,0xea,0xa5,0x2c,0xee,0x8a,0x83,0x6d,0xe3,0xa4,0xdb,0x0c,0x53,0x81},
+            {0x9e,0xa2,0x85,0xec,0xbb,0x3c,0xc9,0x18,0x95,0x11,0xd2,0x14,0x8e,0x3d,0x73,0x2b,0xd9,0x85,0x82,0x32,0x4d,0x2a,0x59,0x7c,0xcb,0x94,0x2e,0x8b,0x01,0x58,0x54,0x8c},
+            {0x6c,0x9e,0xcf,0x00,0xa9,0xf6,0x05,0xbd,0x50,0x37,0x5d,0x07,0x93,0xe8,0xeb,0xad,0x38,0x20,0x60,0xda,0xeb,0xbb,0xad,0x0e,0xc1,0x42,0x7d,0x55,0x01,0xb9,0x51,0x86},
+            {0x00,0xa5,0x39,0x2f,0x9b,0xf5,0x11,0x46,0x94,0x59,0x66,0x52,0xd3,0xf4,0x7d,0xeb,0xb7,0x58,0xa1,0xef,0x4a,0x40,0x84,0x90,0x68,0x8a,0x8b,0x3b,0x6f,0x4d,0x07,0x6d},
+            {0xc9,0xd5,0xbf,0x16,0xc0,0x17,0xb1,0x2a,0x95,0xd6,0x2a,0x92,0xb2,0x70,0xc9,0xc1,0x00,0xfe,0xe7,0x8f,0xc8,0x5c,0x91,0xf8,0x30,0xc5,0x6b,0xe0,0x02,0x35,0xce,0x7f},
+            {0x68,0xea,0x43,0xf0,0x29,0xfa,0x91,0x5a,0xaf,0xc1,0x4b,0xfa,0x5e,0xb8,0xab,0x1a,0xb1,0xe6,0xe2,0x0c,0x46,0x7c,0x09,0x85,0xdf,0xee,0xb7,0x2a,0xf1,0x85,0x96,0x59},
+            {0x17,0x2c,0x4f,0xad,0xa5,0x90,0xae,0xdd,0x1e,0xb4,0x5a,0x16,0xca,0x2a,0xc6,0x69,0xcc,0x03,0x71,0xf1,0x2a,0xce,0xec,0xf1,0x46,0x7e,0x0d,0xd6,0xe2,0xaf,0x38,0x7c},
+            {0x0e,0x8c,0x60,0x66,0x9d,0x5b,0x50,0x5f,0xf9,0xf6,0xfb,0x94,0x1f,0x32,0x47,0xbe,0xe6,0x45,0x8f,0xa1,0xd6,0xf1,0x82,0x9c,0x14,0x44,0x13,0x5c,0x55,0xb5,0xb5,0x8a},
+            {0x83,0xe1,0x74,0xc9,0x6b,0xa9,0x72,0xdd,0x05,0xb1,0x4f,0x9e,0x7d,0x8d,0xc0,0x92,0x3a,0xd9,0x6c,0xdf,0x6b,0x29,0x26,0xc8,0x1b,0xae,0xce,0x8c,0x7c,0x3c,0xcb,0xc0},
+            {0x55,0x69,0x92,0x32,0xa0,0xc9,0x6b,0xd4,0x5c,0xf5,0xbb,0xb8,0x1a,0xe2,0xe0,0x33,0xd2,0x2b,0x53,0x4b,0x2f,0xce,0xc3,0xb7,0x0a,0xb6,0x61,0xd2,0x2b,0xc2,0x5b,0x0f},
+            {0x9d,0x4b,0xa8,0xd5,0xcb,0x74,0x04,0xae,0x25,0x35,0x87,0xe6,0xa5,0x83,0xc5,0x95,0x21,0x44,0x07,0x00,0x7c,0x04,0x99,0x88,0xa0,0x8b,0x51,0xe8,0xc0,0x5a,0x67,0xef},
+            {0x1d,0x63,0x97,0x8b,0x71,0x8b,0x86,0xd8,0xd8,0x4b,0xd1,0xf6,0xe7,0xcd,0x05,0x3f,0xec,0x76,0xdb,0xc9,0x22,0xc5,0x97,0xab,0xee,0xee,0x64,0x06,0x6d,0x02,0xb5,0x7a},
+            {0x6d,0x03,0xe1,0x0f,0x07,0x87,0xdd,0x16,0x29,0x62,0x66,0x41,0x4c,0xb6,0xba,0xcb,0x96,0x13,0x87,0xfb,0xec,0x68,0x63,0x48,0xf5,0x86,0xa4,0xd0,0x53,0x71,0x8f,0x02},
+            {0xe4,0xae,0x92,0x03,0xd1,0xb6,0x1a,0x37,0xa9,0x8b,0x21,0x76,0x9f,0x11,0x0e,0x46,0xde,0x7a,0xb6,0x77,0x2d,0x15,0xb4,0xaf,0x93,0xa9,0xf3,0x9c,0xb2,0xd0,0x96,0xa8},
+            {0xa5,0xde,0x66,0xa7,0xfa,0x96,0x66,0xe0,0x3e,0x6d,0xd9,0xe1,0x14,0xd3,0xcb,0xed,0x11,0xe1,0x44,0x54,0x75,0x8f,0xb2,0x0f,0x42,0x58,0x66,0x85,0x50,0x9f,0x31,0x5e},
+            {0xf0,0xac,0xcb,0xa5,0x86,0x11,0x44,0x4a,0x9e,0xb7,0xc3,0xd4,0x12,0x18,0x74,0x0f,0xfe,0xd8,0x55,0x56,0x76,0x2d,0x52,0x45,0xf4,0xd1,0xbb,0xd6,0xd9,0x58,0xd4,0x88},
+            {0x95,0xde,0x4a,0x73,0x2e,0xae,0xe2,0x99,0x67,0x86,0xc2,0x8c,0x3a,0xe8,0x0a,0x7b,0xbf,0xd3,0x4a,0xd2,0x76,0x69,0x4c,0xdd,0x64,0x19,0x4e,0x7d,0x45,0xd6,0xb1,0xb8},
+            {0x59,0xb0,0x3b,0xd9,0x78,0xa4,0xa5,0xed,0x21,0x2f,0xd0,0x94,0xe9,0x00,0x48,0xac,0xa4,0x06,0xd1,0x6c,0x19,0x64,0x10,0xeb,0x8b,0xe8,0x12,0x2f,0x28,0x56,0xd1,0xd0},
+            {0x2b,0x6c,0x30,0x18,0xcf,0xd7,0xcc,0x55,0x74,0x68,0x64,0x43,0x4c,0x9b,0x2c,0x61,0x0a,0x49,0x71,0xe6,0x0d,0x91,0x28,0xa3,0x38,0x45,0x1d,0x46,0xc7,0x8b,0xfc,0x86},
+            {0x24,0x28,0xda,0x7b,0x24,0x36,0x4b,0xe8,0xaa,0x93,0xc6,0xa2,0x55,0x54,0x3d,0x7d,0xa2,0x7f,0x4c,0xbe,0x57,0xdd,0xe5,0xf1,0x4a,0x85,0x12,0xfa,0x5f,0xfb,0x98,0x1d},
+            {0xbc,0xe2,0x6d,0x65,0x5a,0x0e,0xfb,0x6f,0x28,0x7b,0xe4,0x9d,0xa0,0x73,0x93,0xf3,0x0f,0xee,0xe6,0xbb,0x6c,0x23,0x06,0xbb,0xad,0x88,0xe0,0x4c,0x89,0x84,0xe7,0xd0},
+            {0x0f,0xe2,0xad,0x6d,0xba,0xdc,0xd9,0xc4,0x23,0xb5,0xee,0xbd,0xe1,0x2b,0x78,0x36,0x5f,0xf1,0xc4,0xfb,0xc8,0x5e,0x93,0x32,0x06,0x52,0x3a,0xfc,0x2a,0x2f,0x8a,0x48},
+            {0x67,0x48,0x2d,0xec,0xfd,0x58,0xbd,0xc4,0x9d,0xe9,0xec,0x5a,0x81,0x47,0x94,0x51,0x30,0xa9,0x28,0xb9,0x82,0x02,0x45,0x76,0x47,0xc6,0x68,0x65,0xca,0x33,0x6c,0x71},
+            {0x7d,0x22,0x13,0x0b,0x39,0x8f,0x40,0x85,0x76,0x6f,0x49,0x09,0xa6,0x8b,0x4f,0x7f,0xa2,0xc4,0xb2,0x6d,0xb1,0xe1,0x07,0xf3,0xa2,0xef,0x29,0x41,0x7e,0xe5,0xcf,0xae},
+            {0x98,0x77,0x86,0x12,0xb5,0x12,0x4e,0x3d,0x7d,0x45,0x5f,0x72,0x5f,0x4f,0x24,0x62,0xef,0x78,0x0f,0x03,0x23,0xe0,0xc3,0x6c,0xb9,0xbc,0x81,0x81,0x1c,0x00,0xa0,0x45},
+            {0x51,0xe7,0x51,0x1c,0x0f,0x2e,0xf6,0xbf,0xc7,0xe1,0x7c,0x79,0x06,0xfd,0x60,0x4e,0x42,0xe8,0x62,0xf3,0xf4,0x47,0x5d,0x50,0xd8,0x6b,0xfc,0x14,0x01,0x09,0x9d,0x0d},
+            {0xf1,0x20,0xfe,0x5e,0x0e,0xf2,0xb2,0x23,0x97,0x7b,0x45,0x19,0x06,0x9c,0xac,0x7e,0x4e,0x77,0xc5,0x87,0xc5,0xb0,0x11,0x66,0x3d,0x06,0xaa,0x08,0xf8,0x0f,0xd4,0x77},
+            {0x9d,0x00,0xac,0xe9,0x43,0x76,0x5b,0xa7,0xf2,0xa3,0xa4,0x14,0xf5,0x34,0xd8,0xe7,0x51,0xaf,0x83,0xfe,0xd0,0xf8,0xe8,0x72,0xc3,0x6b,0x31,0x1a,0x15,0xae,0x21,0xbf},
+            {0x93,0xcc,0x26,0x6f,0xd1,0x3a,0xaa,0x34,0x1f,0x03,0xd2,0x01,0x15,0xf0,0x66,0xcb,0x12,0x64,0x97,0xbc,0x0d,0x6d,0x5d,0xe7,0x19,0xc9,0xf8,0x06,0x04,0xa2,0xe5,0x7c},
+            {0xdd,0xdd,0xd5,0xd3,0x63,0x6a,0xb2,0x7b,0xe5,0x31,0xf0,0x9a,0x9a,0x93,0xe5,0xd8,0xb3,0x9f,0xb2,0xc0,0x3a,0x79,0xd4,0xb7,0x90,0x8f,0x2b,0x40,0xb5,0x2b,0xd1,0xf2},
+            {0x62,0x6c,0x9f,0x4c,0x4e,0x3b,0xad,0x8d,0x65,0x52,0x3b,0x0f,0x4b,0x82,0x0f,0x4e,0x59,0xa7,0x20,0x00,0x7f,0xc3,0x5a,0xa9,0x25,0xbc,0x99,0xd9,0xde,0xae,0x3e,0x00},
+            {0xaf,0x9d,0x90,0x60,0xc2,0x0e,0x16,0xbb,0x1f,0x94,0xb3,0xda,0x86,0xb8,0xf4,0xc0,0x74,0xc4,0x72,0xf2,0xd4,0x02,0xeb,0xca,0xdb,0x87,0x9d,0x9d,0x58,0x53,0xdc,0x78},
+            {0x30,0x9d,0xb5,0xe7,0x2e,0xed,0x85,0xd7,0x0f,0xb5,0x6c,0xaf,0xfd,0x8b,0xfc,0x1d,0xff,0xb7,0x9f,0xb9,0xb5,0x99,0x91,0x64,0x68,0xa6,0x89,0x82,0xc9,0x75,0xdc,0xa9},
+            {0x07,0x38,0xd6,0x77,0xaf,0x32,0x28,0xb9,0x5c,0xf4,0x44,0xba,0xba,0x34,0x69,0xdd,0x67,0xaa,0xeb,0xa5,0x4a,0x93,0xc9,0x1a,0xe6,0x28,0x45,0xd2,0xab,0x12,0xbb,0x3b},
+            {0x72,0x06,0x66,0xa5,0xe2,0x13,0x83,0xc6,0x54,0x6a,0x87,0xb8,0xcc,0x93,0xbe,0x70,0x44,0xc8,0x7c,0x01,0x5e,0xe2,0x99,0x5f,0x87,0xb5,0x5b,0xb2,0x91,0xe9,0x92,0x4b},
+            {0x21,0xd9,0x1e,0xcc,0x99,0x46,0x96,0x2e,0x60,0xae,0x11,0x19,0xf4,0x56,0x87,0xa6,0x70,0xeb,0x72,0x5a,0x39,0x24,0x25,0xe3,0xdc,0xa0,0x5d,0x10,0x88,0x08,0xa3,0x14},
+            {0x25,0x3c,0x1b,0xa5,0x25,0xd5,0x4f,0x40,0x75,0xc8,0xaa,0x01,0xee,0x53,0x83,0xd0,0xea,0x6a,0x41,0xb6,0x2d,0x24,0x3f,0xb0,0x6d,0x4f,0x90,0x98,0x7e,0x55,0x75,0x78},
+            {0x73,0x42,0x9a,0x7a,0x59,0x81,0xf2,0x56,0x24,0xa1,0xea,0x52,0x1c,0x95,0xc1,0xaa,0x4e,0x74,0x4b,0xca,0x69,0xc6,0xb6,0x3f,0x49,0x5e,0x3c,0x72,0x57,0x1d,0x40,0x3f},
+            {0xe9,0x21,0x00,0xe5,0x82,0x5a,0x11,0xd0,0x6c,0x55,0xa5,0x44,0xf8,0x3e,0x71,0xa1,0xcb,0x86,0x51,0x68,0x05,0x54,0x9d,0x0d,0x16,0xc0,0x85,0xa6,0x90,0x64,0x56,0x82},
+            {0x39,0x69,0xb8,0xd7,0x16,0x99,0x94,0x3c,0xd0,0x1e,0x41,0x0f,0xb2,0xb0,0x72,0x63,0x8f,0xfd,0xc5,0x9d,0x10,0xeb,0x33,0x16,0xee,0x12,0xa9,0x87,0x83,0xc0,0x91,0x81},
+            {0x3d,0xd6,0xb9,0xd7,0x20,0xaf,0x72,0x4e,0x3b,0xba,0x14,0xe7,0xfc,0x41,0x21,0x3a,0x0c,0x6b,0x7f,0xd5,0xc4,0xa6,0xd6,0x08,0x1c,0xdd,0xe8,0xb0,0x59,0x41,0x02,0x3e},
+            {0xa8,0xc6,0xb9,0x24,0x81,0xb9,0xb5,0x2f,0x50,0xfc,0x99,0x6f,0x3f,0xc0,0x23,0xf7,0x20,0xb8,0x32,0xf7,0x9f,0x30,0x6a,0xeb,0xe9,0xe1,0xdb,0x5d,0x5d,0x68,0x0f,0x33},
+            {0x84,0xbd,0xe2,0x7c,0xda,0x62,0xdb,0x77,0xfa,0xc2,0x12,0xcc,0x9a,0x39,0x94,0x67,0xcf,0x46,0x6e,0x0d,0x5a,0xf3,0x29,0x84,0xb0,0x4f,0x38,0x9c,0x28,0xe6,0xb0,0xb6},
+            {0xd4,0x16,0xc5,0x34,0xce,0xaa,0x07,0xce,0x85,0x6d,0x3f,0xe9,0xfb,0x6d,0x8c,0xae,0x21,0xf2,0x8a,0xa4,0x5e,0xad,0xd4,0xfe,0xe2,0x7b,0x79,0x1e,0x69,0xc8,0xf0,0x45},
+            {0x0b,0x37,0x0f,0xe3,0x36,0x9b,0x09,0xd2,0x2d,0xdd,0x43,0xf8,0x70,0xa4,0x28,0xc4,0xb6,0x59,0x74,0x43,0x0a,0x18,0x26,0x1c,0x59,0x78,0x1a,0xe7,0x7d,0x94,0x14,0x80},
+            {0x90,0x6a,0xd7,0x53,0x51,0x14,0x40,0x66,0xd6,0xd0,0xd9,0x14,0xc5,0x14,0x56,0x64,0x82,0x5d,0x20,0x04,0xd7,0x78,0xae,0xb4,0x1a,0xec,0x56,0x64,0x4f,0x81,0xba,0x25},
+            {0x3c,0x57,0x22,0x1b,0x78,0x6a,0x6d,0xe6,0x8d,0x8d,0x8d,0xb9,0xdb,0x8e,0xd3,0x92,0x8a,0x20,0xef,0xf9,0xe6,0x88,0xad,0x11,0x21,0xd7,0x30,0x85,0xa0,0xfe,0x9d,0x75},
+            {0xe1,0xc2,0x62,0x99,0x27,0x28,0xe3,0xed,0xe6,0x84,0xe7,0x7f,0x4a,0x06,0xef,0xde,0x3e,0x2e,0xeb,0xf8,0xf1,0x2a,0x04,0x06,0xdc,0xed,0xe1,0xaa,0xfe,0x29,0x96,0x48},
+            {0xc6,0x08,0x19,0xa0,0x50,0xb2,0xd4,0xe6,0xac,0x4d,0x72,0xea,0x66,0x83,0xfd,0xe0,0x4d,0xba,0xf6,0xb6,0x6b,0xd7,0x4f,0xf9,0x88,0xfb,0xc7,0xd2,0xb2,0x9b,0x9b,0xf2},
+            {0xe8,0x46,0x88,0x96,0xb3,0xf9,0x73,0x4c,0xd0,0xf7,0xc7,0x21,0xee,0x08,0x96,0xad,0x15,0x48,0x90,0x23,0x40,0x24,0x2b,0x7f,0xdd,0x16,0xe3,0x9b,0x36,0x1c,0x4a,0xc5},
+            {0x6a,0x8f,0x24,0xb1,0x2c,0x66,0xad,0xc9,0xe7,0x71,0xcc,0x6b,0x52,0x39,0x26,0x88,0xbb,0x85,0x35,0xc1,0xba,0x02,0x6c,0xa7,0xf7,0x9d,0x26,0xce,0x2c,0x7e,0xd9,0xa2},
+            {0xf5,0xd6,0x07,0xb7,0xd7,0x74,0xd7,0xc5,0xd8,0x1d,0x6c,0x8d,0x58,0xb4,0xa7,0xed,0x57,0x64,0x03,0xa4,0xdf,0xce,0x8f,0x2e,0x63,0xe1,0xb7,0xce,0x9c,0x7f,0x8a,0x02},
+            {0x01,0x1d,0x43,0x9d,0x08,0x9f,0xcb,0x3c,0x7d,0x44,0xc2,0xd5,0xa6,0x42,0x0c,0xf6,0x0c,0xf1,0xb8,0x71,0x6d,0xb3,0x12,0x86,0xf7,0xc9,0xce,0x39,0x0a,0x0f,0x2f,0xa6},
+            {0xd6,0xfe,0x9c,0x60,0x9a,0xef,0xad,0xab,0xb0,0xef,0xff,0x44,0xe5,0x37,0x5e,0xa4,0xea,0xcc,0x52,0x37,0xc2,0x1b,0x58,0xa2,0xe1,0x99,0xcc,0x28,0x99,0xdb,0xfb,0xb0},
+            {0x3a,0x0b,0x54,0xbd,0x93,0xd3,0x30,0x53,0x54,0xb0,0x7b,0x6b,0xb7,0x80,0x7b,0xac,0xe5,0x04,0x76,0xc4,0xe1,0x20,0xa0,0xb3,0x27,0xde,0x1c,0xdb,0x93,0x61,0x70,0x79},
+            {0x41,0xe5,0x54,0x04,0xa5,0x99,0x8f,0x71,0x57,0x1a,0x20,0x0c,0x03,0x21,0x27,0xa6,0x24,0x1b,0x2e,0x7b,0x23,0x2e,0x82,0x14,0x7f,0xb6,0x76,0x9d,0x82,0x56,0xbd,0x29},
+            {0x57,0x56,0xac,0x43,0xc1,0xdf,0x14,0x92,0x7d,0x3a,0xf8,0xef,0x16,0x1c,0x40,0x3e,0xe1,0xf9,0x2b,0x1e,0xd2,0x96,0xd0,0xad,0xc7,0x2e,0x2c,0xb4,0x5d,0x98,0xd7,0xde},
+            {0xf8,0x2c,0xf2,0xb7,0x89,0x5b,0xa7,0x80,0x2d,0x04,0x78,0xd2,0xb2,0x0b,0x06,0x9d,0x3c,0x85,0x00,0x63,0x7f,0xe9,0x8d,0x41,0x94,0xda,0x02,0xc8,0x84,0xcf,0x9d,0x17},
+            {0x3a,0x10,0xb6,0xcc,0x7c,0xc3,0xbb,0x24,0x4f,0xbd,0x0d,0x49,0x91,0x0e,0x58,0x8a,0xbe,0x7d,0xba,0xf7,0x59,0xd4,0xcf,0x44,0x78,0x3a,0x71,0x39,0xaf,0x06,0x48,0x24},
+            {0x5a,0x9b,0x9b,0x31,0xea,0xed,0xbb,0x65,0x1f,0x42,0xd2,0x07,0xa1,0x4b,0x50,0x2b,0x4b,0x73,0x88,0x53,0x30,0xc3,0x7f,0x8e,0x61,0x5a,0xd8,0x9e,0x3e,0x61,0x21,0x3b},
+            {0xe6,0x16,0x88,0x57,0x8b,0x28,0xb9,0x99,0xd9,0x06,0x79,0x85,0x25,0x73,0x6d,0x64,0xa5,0xaa,0xc1,0xb5,0x54,0x4b,0x75,0x07,0xba,0xdb,0x20,0xb3,0x4b,0x55,0x6d,0x8c},
+            {0x45,0xb2,0x7a,0x6e,0xf0,0x63,0x40,0xc3,0xed,0x81,0x43,0x30,0x83,0xac,0x81,0xce,0x99,0xab,0xcc,0x95,0x1f,0x5e,0x33,0x49,0x19,0xf3,0xff,0x56,0xcd,0x1c,0x75,0xd6},
+            {0xfc,0xeb,0x7a,0x9b,0xd7,0x27,0xf1,0xe8,0x43,0x8f,0x61,0x7d,0x02,0x67,0x40,0x39,0x90,0x2f,0x19,0x5d,0xcb,0xbf,0xb0,0x1b,0x43,0xd5,0xf7,0x2e,0xde,0xa0,0x28,0x31},
+            {0xd1,0x9c,0x5e,0x3b,0x8a,0xeb,0x8f,0x8b,0x4c,0x08,0xee,0x8b,0x61,0xf3,0x42,0x77,0xbf,0xe5,0x79,0x39,0x8a,0x76,0xe2,0x8e,0x58,0xb9,0x72,0xcd,0x69,0x08,0x9b,0x61},
+            {0xa3,0x2c,0x7a,0xb7,0x7a,0xf3,0x34,0xe2,0xd5,0xc4,0xeb,0x3c,0xaf,0x95,0xd3,0xaa,0xad,0x68,0x9f,0x28,0xa2,0xdc,0x3a,0x75,0x57,0xf2,0x52,0x8b,0xe4,0x02,0x40,0x7e},
+            {0xb6,0xc1,0x7c,0x21,0xce,0xcc,0xa5,0xac,0x92,0xa1,0xfd,0xc1,0x03,0x23,0x69,0xe4,0xc6,0xd9,0xcf,0x2f,0xd4,0xf1,0xd5,0xb4,0x40,0x6e,0x1d,0x7e,0x76,0x06,0xb2,0xac},
+            {0xbe,0x1b,0x81,0x27,0x6a,0xde,0xe2,0xc0,0xf4,0xdf,0x4c,0xdc,0x6d,0x1b,0x82,0xdf,0x87,0xdc,0xea,0xf5,0x16,0xb7,0xe4,0xd9,0x94,0xe0,0x23,0xa9,0x37,0x47,0x9f,0x9f},
+            {0x43,0x92,0x51,0xab,0x04,0xc2,0x31,0xc4,0x8b,0x89,0x17,0x02,0xa2,0x06,0x19,0x21,0xfa,0x88,0xcf,0xef,0x44,0x74,0x1e,0xe1,0x73,0x85,0x3b,0x6b,0xf8,0x49,0x04,0x30},
+            {0x26,0xb7,0x06,0x8c,0x72,0x72,0xd9,0xfe,0xaa,0xb0,0x3f,0xef,0x30,0x83,0xe5,0x0d,0x49,0x88,0x5e,0x37,0x5f,0x77,0x79,0x2d,0x59,0xff,0x0c,0xd5,0x02,0xc0,0x3d,0xf1},
+            {0x85,0xdc,0xe2,0xeb,0xa1,0xa9,0xae,0x5a,0x41,0xd0,0x68,0x54,0xf4,0xdb,0x88,0xdd,0x7f,0xe0,0x22,0x72,0x7b,0xe3,0x5a,0xd6,0xb1,0x8e,0x60,0x87,0xc8,0xb9,0x1f,0x1b},
+            {0xe4,0xf7,0x17,0x8d,0x36,0x42,0x90,0x96,0x57,0x75,0x18,0xbf,0x47,0xe2,0xd2,0x96,0xc0,0x21,0xae,0x73,0x49,0xac,0xa7,0x8e,0x2c,0x0a,0x4c,0x60,0x6a,0xcc,0xa5,0xa8},
+            {0xe8,0xd8,0x8f,0x54,0x71,0x87,0xb2,0x78,0x27,0x5c,0x79,0x9b,0x25,0xa9,0x4d,0x81,0x4f,0x31,0x74,0xba,0xc4,0x60,0x77,0xdf,0x98,0x20,0xa3,0x38,0xb4,0xd9,0xc2,0x67},
+            {0xac,0x8f,0x48,0x38,0x5b,0x06,0xe1,0xc4,0x3d,0xa7,0xfb,0x74,0xe5,0x22,0xd3,0x47,0x60,0x3b,0x7b,0x97,0x3a,0xc3,0xc3,0xd0,0x64,0x12,0xad,0x72,0xf5,0x76,0x2f,0xd6},
+            {0x22,0xf3,0x9a,0x93,0x6e,0x8e,0x40,0x1a,0x40,0x44,0x57,0xcb,0xbe,0xf9,0x21,0xc3,0x56,0x8c,0xe0,0x16,0xa5,0xc7,0x5d,0xe9,0x25,0x60,0x11,0xb9,0x88,0xc2,0x52,0xc6},
+            {0x77,0xfa,0x70,0x38,0xe7,0xde,0xd0,0x15,0x77,0xa2,0xae,0x59,0x2c,0xdc,0x96,0x63,0x31,0x1b,0x5e,0x1e,0x42,0xf5,0xf8,0x7a,0xd8,0xa6,0x6a,0xe0,0xe9,0xa5,0x4c,0x28},
+            {0x87,0xf6,0xe5,0xae,0x2a,0xdc,0x65,0xa7,0x36,0xc9,0xb1,0x74,0x6e,0xc1,0xf1,0x83,0x40,0xbb,0xee,0x45,0x48,0x1d,0x7c,0x1f,0x55,0x09,0xad,0x71,0xd5,0xf3,0xc9,0xc2},
+            {0x18,0x0e,0x9e,0xe8,0xa3,0x21,0xa1,0xe9,0x1c,0x49,0x0c,0xd9,0x0a,0xfd,0x74,0xd5,0x56,0xae,0x2a,0x9b,0xae,0x22,0x3e,0xc6,0xc0,0x94,0x58,0x7f,0x35,0x98,0x70,0xb0},
+            {0xf6,0xc8,0x73,0x66,0xcd,0xd0,0xbe,0x05,0x8e,0xbf,0x92,0x95,0xd8,0xb6,0xb4,0x27,0x29,0xbe,0x58,0xa0,0xf7,0xf0,0x57,0xfe,0x32,0x43,0xf9,0xb2,0x94,0x9a,0xda,0x26},
+            {0xd4,0x5c,0x27,0x21,0x1e,0x8a,0x4b,0x77,0xa9,0xe7,0x6c,0x12,0xdb,0x25,0xe6,0xe9,0xba,0x9d,0x03,0x64,0x7f,0x36,0x91,0xd1,0x58,0xed,0xbd,0x8b,0x7c,0x38,0xab,0x69},
+            {0x8e,0xba,0xc1,0x5b,0x55,0xc4,0xa2,0xc5,0xd3,0xf4,0x86,0x68,0x58,0xfe,0x3a,0xb9,0x32,0x4b,0xd7,0x85,0x03,0x6d,0xc0,0xce,0x8a,0xba,0xba,0x39,0x64,0x19,0xeb,0x35},
+            {0x6a,0x80,0xd8,0x6e,0x69,0x69,0x4e,0xbe,0xec,0x5f,0x6f,0x5a,0x5d,0x37,0xd1,0x2c,0x2f,0x81,0x31,0x47,0xc1,0x11,0x6d,0x5d,0x26,0x53,0x8d,0x25,0xf8,0x88,0x27,0x29},
+            {0x2c,0xf7,0xe4,0xc3,0x3c,0x2a,0x63,0xef,0x54,0xc4,0x44,0x02,0x0b,0xac,0x36,0x48,0x73,0x8b,0xee,0x48,0x77,0x9d,0xb4,0xa3,0xa0,0xf9,0xe7,0x2c,0xa5,0xb4,0xe3,0x80},
+            {0x9d,0x10,0x1a,0xfc,0xd8,0x5b,0x73,0x31,0xd4,0x00,0x82,0x30,0xf2,0x9b,0x76,0x1b,0x9f,0x79,0x8e,0x88,0x14,0xd1,0x23,0x14,0x0e,0x8b,0x64,0x8b,0x23,0x02,0x61,0xf9},
+            {0xc6,0xee,0x0a,0xde,0x26,0x67,0x85,0xf9,0xda,0xdc,0xf6,0x89,0x2b,0xf4,0xb9,0x8d,0x7b,0xbc,0x29,0x2a,0xaf,0x2b,0xfe,0x5b,0x7d,0xd4,0x84,0x78,0x57,0x60,0x37,0x5b},
+            {0x94,0xd2,0x39,0xb7,0x87,0x81,0x09,0x6e,0x3e,0x8e,0x7e,0x6a,0x7d,0x9a,0xd7,0x0d,0x08,0x04,0xad,0xeb,0x6a,0x66,0x75,0xfc,0x5d,0xa4,0xf0,0x5d,0x11,0x52,0xc1,0x9d},
+            {0x55,0xca,0x49,0xe0,0xe3,0x13,0xf1,0x4a,0xe0,0xf2,0x14,0xac,0x0a,0x51,0x84,0x31,0x58,0xee,0x07,0xaa,0x5f,0x38,0x1c,0xb9,0xd5,0x96,0xb8,0x61,0x2d,0xbd,0x3f,0x36},
+            {0xe3,0xe3,0x67,0x21,0x31,0xfe,0x9a,0x71,0xf5,0x4a,0x41,0xb0,0xe8,0x14,0x3c,0x63,0xbc,0x0a,0xeb,0x82,0x32,0x88,0x52,0x7b,0xda,0x06,0x9a,0x16,0x16,0xa4,0x15,0x29},
+            {0xad,0x1b,0x38,0x6b,0x66,0x8b,0x79,0xc7,0xca,0xda,0x25,0x1a,0x6c,0x2b,0xd1,0x9c,0x53,0xe5,0x10,0x45,0xe4,0xa4,0x56,0x2b,0x4b,0x92,0x12,0x85,0x2d,0x33,0x45,0x56},
+            {0xbd,0x08,0xa3,0xba,0x2d,0x86,0x03,0x33,0x2b,0x31,0xb2,0x39,0x4a,0x55,0x6e,0xdf,0x6e,0xf9,0x49,0xec,0x8d,0x49,0xe5,0xd5,0x4a,0x13,0x31,0x82,0x13,0xa0,0xda,0x65},
+            {0xb3,0x47,0x31,0xe8,0x55,0xce,0x7f,0xc8,0x34,0xaa,0x08,0x46,0xc7,0x2c,0xe7,0xf4,0x55,0xf4,0x05,0x64,0xb1,0x11,0x81,0xb3,0x40,0xec,0x07,0xa0,0x03,0x78,0x7e,0x88},
+            {0xae,0x29,0x2c,0x8d,0x03,0xde,0x63,0xaf,0x64,0x25,0x39,0xe6,0x55,0x99,0x60,0x77,0x0d,0x80,0xdc,0x4e,0x95,0x90,0xc4,0x6f,0x54,0xab,0x8a,0x74,0xb6,0x8f,0x14,0x5c},
+            {0x10,0xa2,0x8c,0x04,0xe9,0x00,0x16,0xbc,0x74,0x49,0x86,0xe5,0x0d,0x2a,0x24,0x0f,0xf5,0x53,0xce,0xa3,0x2c,0x8c,0xcb,0xfc,0x21,0x84,0x45,0xd6,0xf9,0xe3,0x22,0x71},
+            {0x18,0x2d,0xf7,0x63,0xc8,0xb4,0xdc,0x2c,0x16,0x98,0x56,0x75,0x46,0xda,0xc9,0x0e,0xd5,0xde,0x00,0xc0,0x33,0x32,0x2c,0x9f,0x73,0x1a,0x64,0xf0,0x8c,0xf7,0xae,0x61},
+            {0xea,0xad,0x2e,0x6f,0x6d,0xbc,0x00,0x0f,0xe3,0xb8,0xf6,0x0f,0xc7,0xce,0x70,0x11,0xc2,0x2c,0x4d,0x06,0x2a,0xe2,0xc3,0x3a,0x36,0x21,0x09,0x81,0x90,0x02,0x73,0x81},
+            {0x1e,0x7d,0x63,0x0f,0x59,0xf8,0xc9,0x68,0xc5,0x4a,0x80,0x3f,0x8c,0x70,0xe1,0x5d,0x85,0xa1,0x21,0x4b,0xe4,0xe0,0xf8,0xe8,0x2c,0xab,0x9b,0x20,0x56,0xdf,0x4e,0xf6},
+            {0xaf,0x48,0x5e,0x09,0x90,0x35,0x0c,0x98,0x14,0xbf,0x8a,0x8b,0x3d,0xb9,0x1f,0x44,0xd4,0xd4,0x59,0xf5,0x13,0xf9,0xe0,0x63,0x5f,0xf5,0x4a,0x44,0x4a,0x45,0x05,0x5e},
+            {0xc5,0x33,0x9e,0xd1,0x14,0x20,0xef,0x44,0xaf,0x6d,0x7e,0xec,0x08,0x5a,0x74,0x95,0xac,0x1f,0x59,0x26,0x41,0x19,0x18,0x4d,0x31,0x83,0xa9,0x37,0xd7,0x01,0x22,0x95},
+            {0xee,0x4c,0x98,0xe7,0xb5,0xe1,0xb5,0xfc,0x19,0xc8,0xe5,0xe7,0x5b,0x9b,0xe3,0x96,0x90,0xeb,0xf1,0x5b,0xc9,0xb1,0xe5,0xfb,0xb3,0xec,0xb7,0x5a,0x2e,0xc8,0x9d,0x3a},
+            {0xc8,0x8b,0x24,0x68,0x94,0x38,0xc8,0xf0,0x97,0xce,0xc8,0x1f,0x21,0x78,0xfd,0x16,0x2d,0x4c,0x53,0xba,0x51,0xf1,0xb8,0x35,0xc9,0xb7,0xd1,0xf3,0x3f,0x3b,0xfe,0xd4},
+            {0xb3,0xf1,0x2e,0xe0,0x6f,0x77,0x35,0x36,0xbc,0x48,0x82,0x44,0x1d,0x7b,0x40,0x15,0x3f,0xd0,0x2f,0xf4,0xab,0xd9,0x7a,0x56,0x86,0xbc,0x8e,0xc2,0x94,0xde,0x53,0x03},
+            {0x74,0xb6,0x9c,0x91,0xd7,0xb2,0x4c,0xbc,0x73,0x4d,0x5b,0xbf,0xcc,0xf3,0x44,0x2b,0x10,0xaa,0x94,0xf8,0x35,0xdd,0x49,0xe8,0x4a,0xeb,0x9f,0xb9,0x3d,0x48,0xf9,0x84},
+            {0x72,0x49,0xaf,0x9e,0xed,0xd2,0xff,0x19,0x8a,0x93,0xc9,0xfd,0x96,0xd3,0x84,0x7d,0x05,0xfd,0x24,0xe4,0xa2,0xde,0xe3,0x21,0x3f,0x8b,0x01,0x57,0x02,0x8a,0x7a,0x1e},
+            {0x4c,0x66,0x3e,0x23,0x61,0x6d,0x31,0x13,0x5c,0xf9,0xb4,0xc3,0x3a,0x89,0x55,0x6d,0x99,0x73,0xb2,0xdf,0x0f,0xe8,0xb5,0xa8,0x51,0x16,0x3c,0xe3,0xe7,0x70,0xdf,0x33},
+            {0x4a,0xfe,0xde,0x39,0x4d,0xff,0x0a,0x2b,0x6f,0x0b,0x1b,0x3d,0xed,0xf8,0x26,0x14,0xca,0x51,0x33,0x81,0x4c,0x94,0x66,0xe7,0x85,0x6a,0x53,0xcf,0x33,0xa8,0x33,0x59},
+            {0xb7,0xf3,0xd5,0x96,0xf8,0x70,0x80,0xe6,0xfe,0x4b,0x0c,0x5e,0x17,0x36,0x4d,0xc8,0x7b,0xa2,0x69,0xca,0x56,0x16,0x89,0xd2,0x00,0x85,0xc9,0x89,0x02,0x70,0x14,0x5a},
+            {0xa9,0x1c,0x66,0x63,0x26,0xb9,0x19,0x8e,0x99,0x54,0xc4,0x46,0x1d,0xa9,0xe1,0x73,0xc2,0x10,0x42,0xed,0xbc,0x8e,0x63,0xe6,0x52,0x7f,0x69,0xaa,0x06,0x14,0x4a,0xd5},
+            {0xc1,0x13,0x75,0xb5,0xba,0x44,0xd9,0xbe,0x64,0xcf,0x8c,0xcc,0x8e,0xab,0xa4,0x68,0x9c,0xe8,0xd0,0xa1,0xd7,0x5f,0x4b,0x93,0x2d,0x14,0xb4,0xe2,0x6b,0x96,0x2b,0xa8},
+            {0xc7,0x37,0xcd,0xdd,0x05,0x1a,0xf9,0x63,0xd4,0x10,0x90,0x63,0xa7,0xc9,0x8b,0xfb,0xbe,0x50,0x0a,0xbd,0xf2,0x76,0x15,0x45,0xfb,0x2e,0x3f,0x59,0x2f,0x1c,0x31,0x83},
+            {0x9b,0x09,0xf0,0x37,0x42,0xdb,0x74,0x91,0xa7,0xa9,0x6f,0x20,0xd2,0x73,0x5d,0x66,0x93,0x83,0xb5,0x95,0x70,0xc9,0x19,0xc5,0xf8,0xf4,0xd8,0x04,0xcc,0xf5,0x52,0xaf},
+            {0x11,0x2b,0xa2,0x78,0xae,0x78,0x12,0x5b,0x0e,0xe2,0xa9,0xae,0x9d,0x4c,0x85,0x7d,0x7b,0x09,0xd3,0x63,0x6d,0x8a,0xfd,0x9e,0x17,0x5a,0x35,0x57,0x91,0x74,0x09,0xf2},
+            {0x3e,0xc2,0x36,0x6b,0xdb,0x15,0x1b,0xc0,0x48,0x38,0xad,0x44,0x59,0x79,0x0d,0x21,0x7d,0x7e,0x70,0x10,0x4d,0xbb,0x6a,0x13,0xde,0x48,0xc8,0xe9,0x78,0x73,0xc8,0x74},
+            {0xe5,0x92,0xd0,0x21,0x80,0x7b,0xc7,0x68,0xbc,0x2e,0xb1,0xb6,0xb7,0x83,0x2d,0x73,0x26,0x56,0x5c,0x39,0xb8,0x26,0x58,0xce,0x9c,0x34,0x0e,0xe5,0x0a,0x44,0x36,0x26},
+            {0x44,0x6d,0xe5,0x4c,0x9e,0x31,0x26,0x44,0xe2,0xfd,0x20,0xf4,0x9b,0x8d,0x99,0x26,0xed,0xeb,0x2c,0x99,0x5e,0x62,0x74,0x14,0xda,0x25,0xb6,0x64,0xf1,0x4e,0x4f,0xb2},
+            {0xc0,0xe6,0xc9,0x70,0xfb,0x25,0xf5,0xec,0x11,0xf0,0xc7,0x63,0x16,0xe7,0xef,0xf5,0xbb,0x18,0x0a,0xcd,0x21,0xbc,0x77,0x76,0x16,0xad,0x32,0x12,0xed,0xf5,0xcb,0x3c},
+            {0x32,0xc3,0xa1,0xe9,0x54,0x26,0x23,0x61,0xdf,0xea,0x8d,0xcd,0x6d,0x4e,0x74,0xc4,0x36,0xd5,0x3e,0x65,0x18,0xa2,0xbf,0xd0,0x80,0x30,0x21,0x87,0xe4,0x54,0xef,0x3d},
+            {0xaf,0x6c,0x5f,0x72,0xdb,0xd6,0x5e,0x75,0xa9,0x1a,0x40,0xba,0x9c,0x6a,0xba,0xd5,0x75,0xf1,0x2b,0x7f,0xd8,0xb6,0x6c,0x41,0xd8,0x89,0x48,0xfa,0x8e,0x02,0x6f,0x3d},
+            {0x2f,0x85,0x81,0x94,0xe1,0xda,0x08,0x2a,0xc8,0xba,0x94,0x37,0x37,0x68,0xde,0x9f,0xa1,0x84,0x2a,0x1a,0xdb,0xa1,0x3b,0x2b,0xf6,0xc6,0x74,0x74,0xd0,0xa2,0x33,0xc8},
+            {0x74,0xb1,0x9f,0x64,0x56,0xe3,0x45,0x82,0xf9,0x63,0xdb,0xa6,0xd7,0xfa,0xeb,0xb6,0x28,0x90,0x50,0x22,0x7f,0x55,0xd5,0xbe,0xad,0x6a,0xed,0x9f,0x63,0x94,0xeb,0x41},
+            {0xe2,0x49,0xaa,0x1c,0xc5,0x73,0xb7,0x22,0xbf,0xb4,0xe6,0x61,0x3d,0xfc,0x70,0xe2,0xa5,0xd6,0xcb,0x7d,0xf9,0x4b,0xa1,0x00,0x2e,0x7f,0x54,0x9f,0x57,0xae,0xdc,0xef},
+            {0x0a,0xd8,0x0c,0x6b,0xbe,0xa3,0x62,0xb8,0xbd,0xb9,0x66,0xcb,0xc5,0x01,0x35,0xbf,0xa3,0x21,0xbb,0x8c,0xbb,0x01,0x79,0xf7,0x6f,0x44,0x5d,0xde,0x3d,0x15,0x6c,0x8b},
+            {0x89,0x8f,0x69,0x9a,0x5c,0x52,0xbd,0xad,0xa6,0xa6,0x2d,0x24,0xac,0x05,0xec,0x8c,0xb0,0x43,0xf5,0x67,0x9b,0x55,0x4a,0xe5,0xa9,0xb4,0xd6,0x66,0xa4,0x40,0xfb,0x76},
+            {0x30,0x5c,0xf5,0x36,0xa2,0x2f,0xcb,0xde,0xe3,0x35,0x3c,0xdf,0x59,0xdd,0xbd,0x42,0xe2,0x4e,0xa1,0xa8,0xb9,0x19,0x67,0xd5,0x03,0x8c,0xa3,0xf9,0x09,0x48,0x68,0xc5},
+            {0x28,0x47,0xf3,0x39,0x5f,0x90,0x2b,0x01,0x1e,0x2e,0xb0,0xce,0x5e,0x99,0x5c,0xd9,0x7a,0xf8,0x61,0xc9,0x25,0xe0,0x40,0x21,0xa5,0xbd,0x89,0x34,0x47,0x02,0x50,0x60},
+            {0x91,0xf0,0x99,0x53,0xdd,0xa1,0x35,0xdb,0x57,0x1d,0x5e,0x15,0x9e,0x07,0xa4,0x95,0xb0,0xca,0x9d,0x2e,0xb6,0xba,0x58,0x4b,0x6b,0xff,0x01,0x9a,0xe5,0x69,0x36,0x24},
+            {0x64,0x81,0x26,0xd6,0x26,0x6a,0x94,0xfd,0x56,0x70,0x40,0xda,0x2a,0x9b,0xec,0xb5,0xe6,0xbe,0x40,0x55,0xf9,0xf4,0x17,0x6d,0x25,0x2e,0xa8,0xb2,0x99,0x15,0xb8,0xa1},
+            {0x46,0x45,0x1d,0xb7,0xb8,0x57,0x6c,0x09,0x4f,0xa5,0x61,0xa8,0x1e,0x6d,0x13,0x00,0x22,0x0b,0x42,0xb8,0x86,0xe3,0xe3,0xb5,0xfa,0xeb,0x95,0xc7,0x80,0x90,0xe6,0xe0},
+            {0x97,0x81,0x74,0x65,0xe9,0x21,0x97,0x42,0xea,0xf8,0x12,0x1d,0x0d,0x05,0x32,0x24,0x79,0x30,0x83,0x99,0x13,0x13,0xa7,0xb3,0x76,0x09,0x3f,0x5c,0xdf,0x73,0x29,0xb2},
+            {0x4e,0x5c,0x52,0xde,0x7f,0x2d,0x11,0x09,0x10,0xf1,0x21,0x26,0xb3,0x6f,0x9e,0xe7,0x12,0xf4,0xa7,0x0e,0xc4,0x8a,0x86,0xef,0x10,0xb2,0x17,0x67,0xb8,0x76,0x39,0x6f},
+            {0x65,0x10,0x07,0x8a,0x15,0x22,0xe2,0xf1,0x37,0x60,0x0f,0x91,0x83,0x80,0x2c,0x15,0x81,0xf8,0x82,0xbd,0x9f,0xa0,0xf8,0xf1,0x39,0x14,0x84,0xf8,0x4c,0xf0,0xfb,0x43},
+            {0x2b,0x68,0x7e,0xa5,0xa7,0x40,0x86,0x5b,0x89,0xab,0xc5,0x65,0x75,0x46,0xa5,0x5b,0x7d,0x5f,0x7f,0xe4,0xe4,0x79,0x63,0x54,0xb4,0xb4,0x26,0x6f,0x0c,0x0e,0xc1,0x0c},
+            {0x87,0x9d,0x69,0x60,0x61,0x3b,0x31,0x38,0xe2,0xa9,0x2c,0x82,0x10,0x26,0xf5,0x85,0x8a,0x99,0x33,0x8d,0xb1,0xf7,0x69,0x92,0x3c,0xcb,0x7f,0x32,0xec,0x4a,0xfc,0xd6},
+            {0x6c,0x37,0xcd,0x02,0x2e,0x74,0x5b,0x66,0x66,0xc0,0x38,0x8b,0x81,0x29,0x6b,0xe9,0x0d,0xce,0x44,0x29,0x72,0xde,0x52,0x40,0x0f,0xa3,0xad,0xb8,0xe7,0x34,0xd2,0xee},
+            {0xe5,0x8f,0x22,0x31,0x0f,0x59,0xfd,0xdd,0xb9,0x04,0x79,0xcc,0x36,0xc7,0x63,0xc1,0xfc,0xf6,0x0d,0x6e,0x09,0x50,0x1d,0x51,0xc4,0x95,0xdc,0xb9,0x5c,0x03,0x3d,0x05},
+            {0x70,0xac,0x02,0x94,0x41,0x06,0xda,0xdd,0xc9,0x7b,0x53,0xdb,0x0a,0x0f,0x9b,0xdc,0x1c,0xdf,0x7e,0x78,0x9b,0x69,0x8b,0x42,0x34,0xa8,0x8d,0x8a,0xcb,0x94,0x52,0x33},
+            {0xe7,0x97,0xd5,0x0c,0x46,0x1e,0xd0,0x6e,0x25,0x5f,0x81,0x06,0x69,0x4f,0x1e,0x3c,0x3d,0xff,0x45,0xca,0x34,0x2b,0x63,0x1c,0x9d,0x93,0xfd,0x68,0x68,0xee,0x78,0x62},
+            {0xd6,0x45,0xd1,0xce,0x9d,0x36,0x5a,0x5e,0xa7,0x9c,0xca,0xa9,0xb2,0x4e,0xc5,0x97,0xa0,0x29,0xe0,0x7e,0x66,0x7b,0xdd,0x54,0x61,0xa7,0xce,0xc8,0x33,0x44,0xf8,0x3a},
+            {0x2f,0xdc,0x7e,0x98,0xea,0xa0,0x91,0x0f,0xd0,0x49,0x14,0xe2,0xac,0x4c,0x12,0x16,0xe2,0xa4,0xd3,0x76,0x21,0xe2,0x3c,0x69,0xda,0xa7,0x53,0x9b,0x6d,0x40,0x3a,0xd6},
+            {0x3e,0xa0,0x0f,0x49,0x79,0x80,0x19,0x3d,0xac,0x32,0x61,0xc3,0xe1,0x2d,0x75,0x93,0xb1,0x66,0x84,0x65,0x22,0x77,0x75,0xc5,0x3b,0x01,0xe0,0x02,0x9a,0x3d,0xba,0xee},
+            {0xef,0xf0,0x7e,0x9c,0x0a,0xa7,0xf8,0x89,0xf7,0x4b,0xd0,0xda,0xab,0xfa,0x20,0x01,0x7a,0xea,0xc1,0x05,0xfb,0x09,0xd1,0x16,0x47,0x05,0x9f,0x37,0xeb,0x10,0x27,0xeb},
+            {0x69,0xd3,0xcc,0xe3,0x3b,0xa2,0xf6,0x0e,0x89,0x52,0x01,0xdd,0x8d,0x0a,0x92,0xdb,0x55,0xe4,0xdb,0x99,0xb0,0x4d,0xe5,0x49,0x76,0xd3,0xf1,0x1c,0xa2,0x80,0xdf,0xe4},
+            {0x64,0xae,0xf3,0x72,0x68,0xe7,0x7b,0xcb,0xbd,0xa8,0x3c,0xb5,0x68,0xba,0x36,0x5a,0xa6,0x50,0xc4,0x36,0x3e,0x22,0xf0,0x8e,0xbd,0x9e,0xa8,0xdd,0x4c,0x5e,0xc3,0xba},
+            {0x83,0x7f,0x82,0xd3,0xbe,0xd0,0x34,0x13,0x35,0xbd,0x5a,0xb9,0xd6,0x33,0xbb,0x5b,0x11,0x17,0xa0,0xb7,0x16,0x64,0x31,0x56,0x43,0xf7,0x10,0x32,0x14,0x51,0xb0,0x8d},
+            {0x52,0xb1,0x67,0x7f,0x38,0x98,0x0e,0x1b,0xa9,0xee,0xe3,0x3f,0xaf,0x8a,0x60,0xf5,0x0d,0x76,0xa9,0x02,0x0f,0xc1,0x8a,0xad,0xad,0x44,0xef,0x12,0xd1,0x02,0xc6,0x30},
+            {0xc5,0x72,0x7a,0x2a,0x22,0x17,0x0e,0xd9,0xa4,0x0b,0x4e,0x00,0x3e,0x70,0x39,0xbb,0x6f,0x51,0xef,0x71,0x9f,0xaa,0x10,0x31,0x59,0x86,0x9f,0x71,0x5c,0xd7,0x9d,0x64},
+            {0x2b,0xd8,0x37,0x60,0x08,0xef,0x33,0x39,0xad,0x49,0x38,0x3a,0x12,0x75,0x4f,0x63,0x71,0x0a,0xb0,0x16,0x57,0xcf,0x71,0x7a,0xa9,0x45,0xf8,0xeb,0xeb,0x35,0x1d,0x26},
+            {0x61,0x7d,0x5e,0x37,0x34,0xa1,0x76,0xc6,0xaa,0xa9,0x70,0xe7,0x8f,0x41,0x25,0x32,0x26,0x33,0x98,0x02,0x3f,0x92,0x26,0x04,0xd6,0x9d,0x73,0xa3,0x4d,0x7c,0x96,0x00},
+            {0xb5,0x08,0xb6,0xf3,0x23,0x86,0x2d,0x13,0x93,0x52,0x2c,0xe6,0x7c,0x9f,0x26,0x7f,0x8f,0x7a,0x08,0xc4,0xf1,0x7e,0xc2,0xd7,0xe9,0x23,0x0d,0xf6,0xa7,0xdc,0xc8,0x3d},
+            {0x00,0x3b,0x1c,0x88,0x57,0xc2,0x36,0x6b,0x41,0x5d,0x5b,0x1e,0xb2,0x3a,0xb8,0xc0,0x70,0x50,0x65,0xbd,0x87,0xfe,0x08,0xe7,0xc2,0x51,0x14,0x09,0x8b,0xc2,0xd0,0x20},
+            {0x9c,0x18,0xe7,0x17,0x50,0xab,0x5a,0x52,0x52,0x0f,0xa5,0xc6,0xf4,0xb4,0x80,0x47,0xd3,0x4a,0xf4,0x2b,0x9f,0xee,0xdf,0xcf,0xa9,0x6a,0x9b,0x9c,0xf6,0xc2,0x23,0x1d},
+            {0xc3,0xd6,0x92,0x20,0x99,0x4c,0xaf,0x49,0x0d,0x6d,0x8f,0x4c,0x7f,0x76,0x89,0xda,0x6e,0x53,0x3b,0xdb,0xf7,0x75,0x30,0x9a,0xf7,0xb1,0x3b,0x25,0x35,0x9c,0x15,0xdb},
+            {0x64,0x94,0x5a,0x07,0x4f,0xe5,0xd5,0x93,0x41,0x3f,0x74,0x0f,0xbb,0x0f,0xb0,0x36,0xef,0xc1,0x58,0x50,0x73,0xa5,0xc7,0x69,0xe6,0xb7,0xbb,0xa5,0x08,0x3b,0xff,0x67},
+            {0xda,0x64,0x24,0x0f,0xb5,0xae,0xfe,0x99,0x4b,0x80,0xdc,0xbf,0x86,0xc6,0x77,0x5e,0x1d,0x8b,0x98,0x27,0xc9,0x0e,0xa9,0x14,0xdc,0x89,0xed,0x96,0x99,0x4c,0x1b,0x06},
+            {0xf3,0xdc,0xce,0xeb,0xeb,0xff,0x82,0x17,0x1d,0x50,0x0a,0xa5,0xbf,0xa4,0x2d,0x92,0x3a,0xf4,0x7f,0xd9,0xd9,0x35,0xff,0x3b,0x24,0xe4,0x24,0x6c,0x2c,0x24,0x0b,0xb0},
+            {0x5e,0x9c,0x33,0xd7,0x8c,0xdd,0x3d,0x5f,0x71,0xa7,0x49,0x81,0xae,0xe5,0x40,0xc1,0x99,0xf9,0x92,0x8c,0x13,0x2f,0x04,0x7f,0xf9,0x75,0xf9,0xc4,0x52,0x89,0x29,0xed},
+            {0xe8,0x3e,0x08,0xca,0x01,0x87,0x47,0x33,0x4d,0x5b,0xef,0x54,0xef,0xf1,0x52,0x7d,0x03,0xfc,0x47,0x8a,0x9a,0x2c,0xe3,0xbc,0x1d,0x08,0xeb,0x74,0xb1,0xe0,0x5c,0x5a},
+            {0x2b,0x44,0x04,0xce,0xb2,0x08,0xa4,0xcb,0xcc,0xa4,0xec,0xa5,0x97,0xcc,0x25,0xe5,0x0c,0x15,0x6d,0x1d,0x43,0x20,0xb9,0x37,0x79,0x5c,0x20,0x1b,0xf6,0x2e,0x8e,0x27},
+            {0x6c,0xf6,0xe5,0x47,0x42,0xa3,0xe3,0xa2,0x46,0x92,0x96,0xb5,0x18,0x63,0x12,0x3d,0x69,0x39,0xa3,0xe4,0xf1,0x89,0x73,0xbe,0xd3,0x35,0x0f,0x36,0x1a,0x0a,0x7f,0xa1},
+            {0x17,0x36,0x48,0xce,0x3c,0x3f,0xae,0xbf,0x66,0xb1,0xb4,0x00,0xe2,0xba,0x1d,0x09,0xa6,0xf7,0xa0,0xe9,0x0c,0x4f,0x6e,0xb2,0x59,0xcf,0x14,0x1c,0xf2,0x70,0x28,0x68},
+            {0x16,0x02,0xf8,0x4c,0xd0,0x80,0x34,0x83,0x3d,0x4d,0x6b,0x6f,0x0a,0x63,0x01,0x78,0x40,0xb0,0x51,0x7f,0xcd,0x71,0x6d,0xc5,0xbb,0x82,0x07,0x1f,0x81,0xca,0xcf,0x22},
+            {0x5c,0x9a,0x5a,0x89,0xdb,0x7c,0xe1,0x03,0x78,0x4c,0xd0,0xa1,0x85,0xef,0x58,0x99,0x67,0x93,0x0f,0xa6,0xe9,0x2a,0xa9,0x0f,0xb8,0xc0,0x20,0x31,0x69,0x4a,0x94,0x04},
+            {0xa9,0x9a,0x83,0xbe,0x39,0xbe,0x7d,0x0d,0x24,0x7f,0x38,0x05,0xd7,0xc7,0x8f,0x47,0xbf,0x16,0xa3,0xba,0xbf,0x9d,0x63,0xcb,0x68,0xe2,0x8c,0x0f,0x63,0x0e,0x15,0xc2},
+            {0x9a,0x92,0xa0,0x18,0x99,0xa6,0x49,0x67,0x6a,0xc7,0x92,0xb2,0xa2,0xbe,0x8d,0xb3,0xab,0x24,0xf1,0xf4,0x64,0xa1,0xaf,0x6b,0x3c,0x03,0xb7,0xf6,0x7e,0x57,0x25,0x10},
+            {0xe0,0x44,0x8a,0xf4,0xbf,0xda,0xbe,0x13,0xa0,0x44,0x36,0x2a,0xb1,0x33,0xa5,0x56,0x0a,0x77,0xe8,0xe6,0x60,0x5d,0xf7,0xd9,0xb3,0x6f,0x22,0xa9,0xcc,0xdd,0x80,0x6f},
+            {0x8f,0x67,0x56,0x62,0xf9,0x8a,0x99,0x61,0xe9,0xa6,0x71,0x14,0xa9,0x8f,0x44,0x23,0x59,0xb8,0x79,0x7f,0x72,0x9c,0x94,0xc5,0xa0,0x41,0xeb,0xdb,0x93,0x7e,0x0b,0x57},
+            {0x6d,0xd8,0x43,0x73,0x15,0xfb,0x9b,0xe0,0x6f,0xcb,0xb2,0x2e,0xbc,0x82,0x10,0x36,0x48,0xda,0x5b,0x14,0x26,0x22,0x85,0x71,0x75,0xdd,0x75,0xa0,0xf7,0x8c,0x7a,0x8f},
+            {0x6c,0x4a,0x96,0xd4,0x40,0xdb,0xfc,0x0f,0x26,0xf1,0xbd,0xf1,0xe1,0xc0,0xac,0x27,0x3b,0x57,0x3c,0x36,0xf1,0x4e,0x55,0x34,0x2f,0xd9,0x84,0x35,0xe8,0x06,0xb6,0x76},
+            {0x70,0x07,0x25,0x44,0x90,0x99,0xdc,0x98,0x93,0x3e,0xa1,0xc8,0xf1,0xb9,0xfd,0xaf,0x21,0xcc,0xb7,0xf7,0x43,0x94,0x51,0xcb,0xdc,0xf7,0x63,0xe7,0xb6,0x33,0xe5,0x2d},
+            {0x22,0xc9,0x86,0xa2,0x9a,0x24,0xc0,0x27,0x03,0xa8,0xbe,0x6f,0xc3,0xa1,0x7f,0x00,0x97,0x5f,0xe6,0xf3,0x23,0x36,0x6d,0xa8,0x28,0x4a,0x4c,0x10,0x70,0xb1,0x81,0x60},
+            {0x03,0x70,0x36,0xf8,0x5d,0xe4,0x9e,0x61,0x36,0xd1,0xf5,0x4c,0x2b,0x1f,0x75,0x4d,0x61,0xc2,0x62,0xbb,0x88,0xc8,0x06,0xb7,0x2a,0x15,0x6e,0x27,0x2d,0x60,0xc5,0x35},
+            {0x88,0x13,0x01,0x7f,0x38,0x78,0xa9,0x7b,0x15,0xc2,0x72,0x98,0x2b,0x95,0xb3,0x53,0x4a,0x44,0x75,0xdb,0xc3,0xa6,0xf4,0x0a,0xae,0xe3,0xeb,0x9d,0xd5,0x93,0xeb,0x2a},
+            {0x40,0x3a,0x7a,0x97,0xd3,0xc4,0x7c,0x57,0xe8,0x99,0x82,0x08,0x6d,0xe4,0x58,0xcc,0x1c,0x62,0xd0,0x14,0x49,0x94,0x5e,0x9a,0xde,0xb1,0x60,0xbd,0xb4,0x87,0xe7,0xc8},
+            {0xe1,0xae,0x2a,0x3c,0xa0,0xa1,0x02,0xd9,0xd7,0xb8,0x04,0x62,0xc5,0xc7,0x5c,0xe1,0xfd,0x49,0xa3,0x41,0xa3,0xae,0x60,0xa4,0x97,0xa9,0x8c,0x9e,0x84,0xdc,0x4d,0x2c},
+            {0x7d,0x3c,0xf5,0xfd,0xda,0x05,0x16,0xc2,0x00,0xa2,0xa5,0xd6,0x22,0xc2,0x56,0xd4,0x81,0xf9,0x76,0x4d,0x6a,0x72,0x79,0x99,0x95,0xe0,0x1b,0x31,0xc9,0x7f,0x4f,0x26},
+            {0xa0,0x80,0xf0,0xe1,0xbf,0x33,0xdc,0x81,0x90,0xc8,0x44,0xc3,0xb1,0x3c,0x56,0xc0,0x58,0xea,0x08,0xaf,0x44,0xe1,0xc7,0x36,0x3d,0x55,0xe8,0xfd,0x8a,0x7a,0x3a,0xfc},
+            {0xa6,0x11,0xf4,0x39,0x17,0xfd,0x4c,0x23,0xe5,0xbb,0x65,0xba,0x8d,0xcb,0xde,0x6d,0xb5,0x10,0x14,0x23,0x46,0xca,0xd2,0xb9,0xab,0x59,0x6f,0xa7,0x56,0x35,0xd9,0xe3},
+            {0xba,0x06,0x8f,0x56,0x41,0x83,0x56,0xe2,0xc0,0xee,0x98,0x11,0x9c,0xc3,0x03,0x0f,0xa7,0xa9,0xb8,0xc2,0x7d,0x55,0x30,0xc9,0x3f,0x13,0x4e,0x89,0x9a,0xfe,0xdc,0x02},
+            {0x81,0xa7,0xd2,0x7f,0xa4,0xe8,0xd9,0x11,0x41,0x0a,0x73,0x32,0x48,0xf1,0x02,0xe5,0xa9,0xef,0xf4,0xd8,0xf5,0x61,0x71,0x14,0xe9,0x7c,0x12,0x67,0xcb,0xf3,0xd3,0x48},
+            {0xea,0x71,0x1e,0xc0,0xf6,0x6c,0xec,0x18,0xc1,0x7b,0x3b,0xfa,0x39,0x96,0x7b,0x00,0x48,0x0a,0x0d,0xf0,0x57,0x54,0x12,0xc0,0xe8,0xa7,0xaa,0x88,0x69,0xab,0x93,0xac},
+            {0xdc,0x2e,0xfe,0x41,0x2c,0x0c,0x7c,0xf5,0xd7,0xe8,0x38,0x64,0x1b,0xdb,0xe2,0xd5,0x98,0x77,0xca,0x74,0x35,0x75,0x36,0xda,0x58,0xaa,0xa0,0xfd,0x1b,0x71,0x1a,0xc0},
+            {0x93,0xe3,0x21,0xc3,0x37,0x1d,0x69,0xfa,0xde,0x14,0x51,0xf2,0xf5,0x37,0x57,0x9c,0x54,0x93,0x4a,0xba,0x52,0x71,0xa0,0x18,0x54,0x0f,0x70,0xd4,0xac,0x91,0xa7,0x8e},
+            {0x8f,0x13,0x68,0xdf,0xc9,0x96,0x18,0xf3,0xe1,0xb2,0x30,0x2e,0xbe,0xe8,0x83,0x19,0x37,0x11,0x06,0xbe,0xf7,0x84,0x71,0xb0,0xeb,0x87,0x6f,0x2f,0x06,0xa3,0xa8,0x18},
+            {0x5f,0xff,0xc4,0x15,0x58,0x7f,0x81,0x5b,0xf9,0x64,0x5a,0xcd,0xd4,0x81,0x29,0x4f,0xc4,0xd8,0x3a,0xc5,0xb9,0xa3,0x72,0x75,0xe8,0x72,0x59,0x21,0xea,0xee,0xd7,0xf7},
+            {0x3f,0x29,0xe0,0x67,0xde,0x0e,0x03,0x6e,0xfd,0x26,0x84,0xb9,0xc5,0x4e,0x0e,0x6b,0x27,0x87,0xfb,0x9d,0x83,0x50,0x4c,0x12,0x01,0xc4,0xd0,0xa0,0x17,0xa0,0x78,0x5f},
+            {0x07,0xf4,0xa0,0x00,0x17,0x8a,0x78,0xa4,0xa8,0xfa,0xa3,0x70,0xd5,0xae,0xa0,0xaa,0x56,0x28,0xff,0x66,0x95,0x22,0xfb,0xf6,0xee,0x0d,0x01,0x6c,0xe0,0x16,0xf8,0xdc},
+            {0x77,0x3a,0xc8,0xe9,0x36,0xb1,0x61,0x82,0x43,0x40,0x7a,0x82,0xd1,0xec,0x9a,0x6f,0xea,0xa5,0xeb,0xd9,0xcb,0xd8,0x26,0x19,0xd1,0x9b,0x5b,0xd7,0xf0,0x29,0x75,0x36},
+            {0xaf,0x56,0x20,0x3c,0xef,0x3a,0x91,0x26,0xc3,0x44,0x2d,0x96,0x4f,0xe0,0x9b,0xfe,0xba,0x50,0xd9,0x24,0x3f,0xd9,0xbb,0x87,0xec,0x38,0xa9,0x61,0xc5,0x9b,0x59,0x60},
+            {0xfb,0xbd,0xfc,0x94,0xf3,0x8b,0x51,0x44,0x70,0xde,0x42,0x90,0xbb,0xa2,0xeb,0xdf,0xf7,0xaa,0xc5,0x52,0x3d,0x97,0xa0,0xab,0xbb,0x20,0x85,0x9e,0xbc,0x82,0x06,0x5a},
+            {0x47,0x1a,0xb6,0xbe,0xa6,0xf7,0xca,0xe8,0x37,0xa9,0xfc,0x60,0x1f,0x70,0xc7,0xc8,0xe5,0x3e,0x84,0xa5,0x44,0xe4,0x30,0x08,0xd9,0x45,0x87,0x5d,0x61,0xdf,0x04,0xad},
+            {0xe2,0x0f,0xa6,0xfa,0x46,0xcd,0x4d,0x80,0xd5,0x4d,0x39,0x3c,0x86,0xe4,0x9b,0x28,0x2e,0xa1,0x52,0x6c,0x5f,0x33,0x9e,0x57,0x9b,0xad,0x5b,0x39,0x30,0x44,0x98,0xb8},
+            {0xca,0xc6,0x29,0xd3,0x71,0x26,0x68,0x47,0x10,0xd0,0xbb,0x74,0xfb,0x52,0xd5,0x29,0xf2,0xd1,0x6c,0x73,0x73,0x4f,0x20,0x05,0xde,0x6d,0xe9,0xa5,0x04,0xad,0x84,0xff},
+            {0xa9,0x53,0x03,0x2f,0xfb,0xa6,0x59,0xa8,0x09,0xd5,0xf7,0x33,0xda,0xa9,0xdb,0x68,0x10,0x82,0xaa,0x65,0xdd,0x08,0xc0,0xb0,0x56,0x64,0xdb,0xef,0xd8,0x77,0x07,0xba},
+            {0x5b,0xab,0x22,0x44,0x23,0x3e,0x9f,0x9f,0x2d,0x71,0x91,0xdf,0xbe,0x1a,0xc9,0x68,0x65,0x2e,0xa1,0xbc,0x0f,0xac,0x48,0xa5,0x55,0x7b,0x01,0xc4,0x0d,0x26,0x0f,0x4a},
+            {0x9d,0x09,0xdc,0x82,0x81,0x29,0x44,0x23,0xfd,0x51,0x68,0x35,0xab,0x30,0xf1,0x54,0x16,0xcf,0xd0,0x11,0xe7,0x4d,0xff,0x4b,0xf5,0xe0,0x5f,0x87,0x41,0x6f,0x0c,0xf6},
+            {0x89,0x37,0x76,0xd2,0xcc,0xcd,0xa1,0xf8,0x6b,0x0e,0x40,0x5d,0x13,0xa7,0x5a,0x11,0xa9,0x65,0x28,0xa4,0x5e,0x08,0x72,0xe4,0xff,0xc0,0xb8,0x75,0x13,0x59,0x41,0x00},
+            {0x75,0x8a,0x1e,0x64,0x61,0xae,0xb3,0xff,0xb5,0x5c,0x23,0x1c,0xaa,0xcc,0xe8,0xf6,0x63,0xd8,0x3e,0xef,0x4d,0x12,0xf8,0xcf,0x94,0xd6,0x9b,0x09,0x25,0x2b,0x6e,0x06},
+            {0x0d,0xee,0x49,0x7d,0xd3,0xa7,0xbb,0xc2,0x6c,0x1b,0x2b,0x2f,0x80,0x7e,0x55,0xbc,0x62,0x76,0x5b,0x35,0x57,0xcd,0x50,0x96,0x0e,0x8b,0x91,0x3a,0x2e,0x3a,0xcd,0xba},
+            {0x35,0xa0,0x8c,0xc3,0x2b,0xdc,0xe9,0x7e,0x91,0xba,0x27,0x4b,0xde,0x6d,0x6f,0x19,0xc7,0x4a,0xe3,0xfd,0x35,0x66,0xcf,0x1c,0x40,0x00,0x2a,0x07,0x75,0x87,0x25,0x05},
+            {0x68,0x91,0x04,0xa1,0x37,0x15,0xe4,0xe8,0x81,0xa4,0x64,0x0f,0xd5,0xe4,0xbc,0xd4,0x66,0x87,0xc6,0x7f,0x53,0xc9,0x1d,0xb4,0xb8,0xca,0xe8,0xd2,0x1c,0xf9,0x07,0x22},
+            {0xe4,0x8d,0x19,0xe8,0xa8,0xa2,0x11,0x35,0x8e,0x7e,0x7f,0xfe,0x96,0x4e,0x98,0x1d,0x3a,0x1d,0x11,0xae,0x76,0xa2,0xb4,0x4a,0x44,0xfa,0xa8,0x56,0x56,0x6a,0xbc,0x5b},
+            {0x28,0xd7,0xc2,0x49,0x87,0x74,0xbe,0x75,0x40,0xd3,0xb8,0x5c,0xd6,0x7e,0x87,0x3d,0xb1,0x98,0x26,0x7e,0xbd,0x59,0xce,0xfb,0x11,0x64,0x96,0x9d,0x56,0x54,0x49,0x40},
+            {0x84,0x40,0xcb,0xb1,0x6a,0xcf,0x41,0x86,0x89,0xac,0x4f,0xe6,0xd2,0xb6,0x5d,0xdd,0x94,0x9e,0x96,0x45,0x85,0x42,0x53,0x9d,0x30,0xbf,0xe2,0x12,0x5e,0x3a,0x88,0xca},
+            {0x6f,0x83,0x7c,0x7e,0x4a,0x9f,0x4c,0x4c,0x1b,0x17,0xfb,0x20,0x2a,0x5b,0xc7,0x47,0x9a,0xdd,0x8c,0xc0,0xd2,0x65,0x64,0x76,0x63,0x28,0xf7,0x74,0x55,0x62,0x79,0x61},
+            {0xfb,0x78,0x6f,0x9d,0xc1,0x25,0x14,0x1f,0x04,0x85,0x7f,0xd1,0x39,0x3a,0xbe,0x91,0x72,0xad,0x9c,0x3a,0xad,0xe7,0x82,0xbd,0x4d,0x8d,0xc2,0x30,0x18,0xc6,0x62,0xbb},
+            {0xbe,0x10,0x1e,0x32,0x78,0x74,0x00,0x14,0x28,0x7a,0x57,0x2b,0x2b,0x27,0xfe,0x3e,0x20,0x71,0x2b,0xf5,0x89,0xdb,0x35,0x6e,0x80,0x0f,0xad,0x1e,0x63,0x3d,0x34,0xb6},
+            {0x02,0x77,0x0f,0xf5,0x02,0x83,0xc2,0x0a,0x9a,0x9d,0xe2,0x91,0xde,0x39,0x1f,0xe7,0xeb,0xb4,0x74,0x4d,0xa6,0x07,0xa7,0x78,0x0b,0x10,0xa2,0x0c,0x49,0xa7,0x53,0xc2},
+            {0x84,0x80,0x1d,0x62,0x6b,0x59,0x98,0x74,0x6e,0x08,0x65,0xae,0xc4,0xfc,0xd1,0x37,0x8b,0xb3,0x76,0xed,0xcc,0x76,0x3a,0x80,0xee,0x96,0x37,0x3b,0x01,0xcb,0xf7,0x2c},
+            {0x1d,0xa1,0xdd,0x3a,0xa7,0x7a,0x4e,0x2d,0x8a,0xa0,0x85,0x7c,0xcd,0x85,0x7d,0x49,0x52,0xe5,0x8a,0xb4,0x9c,0x26,0xa1,0xf0,0xcb,0x60,0x27,0x50,0x30,0xf6,0x60,0x7e},
+            {0x04,0xfe,0xfb,0xda,0x5e,0xc9,0xf1,0x82,0xc2,0xa2,0x2a,0xd6,0xbb,0xbc,0x42,0xff,0xa3,0x22,0x33,0x8e,0x35,0x62,0x97,0x6b,0x8d,0x32,0xb3,0x40,0x6c,0x2e,0x38,0xc9},
+            {0xe8,0xcc,0xdc,0xb2,0x48,0x07,0x8a,0x48,0x23,0x59,0xf4,0xf7,0x97,0x3d,0x3b,0x20,0x69,0x79,0x4b,0x97,0x77,0xc4,0xe2,0xac,0x21,0x55,0x8f,0xbf,0xfe,0xe5,0x9c,0x8c},
+            {0x51,0x50,0x7a,0x05,0xfb,0xdf,0xcc,0x52,0x2a,0x1f,0x29,0x09,0x9c,0xc0,0x64,0x58,0x59,0x1b,0xcd,0x58,0x09,0xd2,0xb2,0x10,0x90,0x1e,0x27,0x5d,0xc1,0xda,0xed,0x7d},
+            {0x05,0xe6,0xb3,0x11,0xd3,0xa3,0x24,0x10,0x22,0xb0,0x15,0x29,0x24,0x62,0x77,0x06,0xed,0xf8,0x57,0x16,0x10,0x04,0xdc,0x78,0x59,0x83,0xc5,0xc8,0xe4,0x05,0x9b,0x19},
+            {0x98,0x6c,0xcd,0x7e,0xf4,0x3c,0x80,0x85,0xb7,0x38,0xa0,0xe2,0xeb,0x84,0xb9,0x8a,0xa9,0x20,0xfd,0x19,0xf3,0x72,0xc3,0x4c,0x37,0x56,0x9a,0x5c,0x73,0x54,0xd6,0xdf},
+            {0x37,0xc4,0x37,0x02,0x97,0x13,0x1f,0xce,0xf6,0x10,0x1b,0xb4,0x3e,0x37,0xad,0xa6,0x3e,0xe4,0xc6,0x3e,0xad,0xd5,0x3c,0x68,0x3c,0xdf,0xfd,0xa2,0xc2,0x2b,0x6a,0x5f},
+            {0xc8,0xa7,0x36,0x66,0x9a,0x5a,0x1c,0x69,0xc6,0x08,0x87,0x35,0x30,0x6b,0x2a,0xa6,0xda,0x1f,0xa6,0x85,0x58,0x44,0x46,0xb2,0x7c,0x53,0x61,0x23,0x44,0xa2,0x8d,0x39},
+            {0x0c,0x82,0x9d,0x4a,0x74,0xa4,0x0e,0x43,0x38,0xa4,0x06,0xa2,0x68,0xde,0x64,0xa9,0xac,0x1b,0x58,0xad,0x2f,0x06,0x55,0xcf,0x14,0x12,0xcf,0xe1,0x0a,0x81,0xf1,0x28},
+            {0xea,0x8a,0xee,0xeb,0x0f,0xcf,0xa6,0x63,0x19,0xb5,0xd1,0x56,0x0c,0x1c,0x7e,0x80,0x5c,0xb4,0x45,0xb6,0x78,0xf6,0x07,0x35,0xa5,0x45,0x02,0x33,0xa0,0x8f,0x51,0x46},
+            {0x0c,0x03,0xe2,0x90,0x2e,0x43,0x74,0xdc,0x2a,0xe6,0xe9,0xd4,0x6b,0x27,0x02,0x8a,0xf8,0x6c,0x46,0x1e,0xc6,0x5b,0x97,0x08,0x82,0x9f,0x6e,0x34,0x1c,0x5d,0xfa,0x86},
+            {0x42,0x76,0x23,0xb7,0xf2,0x1f,0x13,0x21,0x6b,0x47,0xd6,0x4b,0x3c,0xce,0x69,0xd8,0x69,0x5a,0x12,0xa8,0xb7,0x6c,0xed,0xa9,0x09,0x03,0x8e,0x8e,0xd1,0xad,0x7a,0xd6},
+            {0x30,0x9b,0xd0,0xbf,0x85,0xe4,0xb9,0xbb,0x13,0x0a,0x17,0xdf,0x03,0x2a,0x6d,0x05,0x7d,0x2f,0x47,0x74,0xab,0xca,0x3a,0x8a,0xf6,0xfd,0xbf,0x25,0xde,0x91,0x82,0xd9},
+            {0x7f,0x3d,0xa6,0x40,0x2d,0xa4,0x1b,0x66,0xb0,0xe5,0xe9,0x57,0xa4,0x0a,0x78,0x7c,0x53,0xa3,0xa3,0x12,0x28,0xf0,0x6d,0x45,0xf6,0xdd,0xfc,0x27,0x5c,0x06,0xe8,0x15},
+            {0x94,0x53,0x35,0x2b,0x0b,0x65,0x41,0xe2,0x8b,0x5c,0x36,0xd1,0xef,0x83,0x3b,0x7f,0x49,0xda,0xd4,0x72,0xac,0x7b,0xc0,0x17,0x12,0xf0,0x4a,0x1d,0x0b,0xd8,0xcb,0x3d},
+            {0x35,0xb6,0xa0,0x24,0xcb,0x36,0x4e,0xe9,0xe7,0xac,0x55,0xb3,0xee,0x07,0xe1,0x37,0xb7,0xdc,0x77,0x56,0xc6,0xe7,0x13,0x1d,0x02,0xd6,0x03,0x61,0x3f,0x87,0x65,0x78},
+            {0x6c,0xe8,0xb2,0x0b,0xf0,0x19,0x33,0x59,0x03,0x74,0xff,0x85,0xf4,0xa2,0xfc,0xab,0x43,0xcd,0xe2,0xbb,0xf9,0xbf,0x7b,0x56,0xc7,0xe4,0xc2,0x1a,0xcc,0xe0,0x2a,0xf1},
+            {0xf0,0x2a,0xcb,0x1e,0x0f,0x78,0x6b,0x78,0xb0,0x42,0xe5,0xd5,0xe4,0xd2,0x5f,0xe7,0x11,0xec,0xc0,0x5b,0x2c,0xbd,0xc3,0x70,0x77,0xa4,0xa1,0xb6,0x6d,0x92,0x58,0x08},
+            {0xb5,0x69,0x7a,0xcf,0xcc,0x9d,0x3d,0x4b,0x58,0xbf,0x01,0xee,0x95,0x9b,0xb5,0x19,0xb1,0x65,0xd6,0xe2,0xb3,0xff,0x79,0x9d,0xcd,0x85,0x81,0xf2,0xe4,0xec,0xc4,0xb4},
+            {0xe5,0xdc,0xd8,0x65,0x53,0x00,0x85,0x84,0xde,0x8d,0x4e,0x67,0xed,0xb1,0x04,0x91,0x98,0x92,0x29,0x00,0x80,0x1b,0xf5,0x1d,0xa5,0x5e,0xfc,0xb7,0xde,0x45,0xc3,0x7b},
+            {0xe0,0xc3,0xe5,0x99,0x7b,0xd1,0x14,0xdb,0x9c,0x09,0x72,0x8c,0x21,0xb8,0xb3,0x57,0x48,0xee,0xe6,0x8f,0x8e,0xb3,0x05,0xb5,0xcc,0x09,0x9b,0xe3,0xc2,0x65,0xd3,0x27},
+            {0x6c,0x1e,0x0e,0xf8,0x49,0x6d,0x1c,0x39,0xfc,0xde,0x03,0x02,0x39,0x77,0x2d,0xdf,0x11,0x82,0x80,0x7d,0xde,0x25,0xd5,0x4f,0xea,0x68,0x08,0x54,0x34,0xa0,0x8b,0x02},
+            {0x4f,0xbd,0x6b,0xcb,0x31,0xa6,0x07,0xf7,0x92,0xcc,0xa7,0xf5,0x14,0xd8,0x25,0x9a,0x05,0xf6,0x84,0x09,0x2b,0xe8,0xac,0x91,0xb2,0x42,0xbc,0x90,0x16,0x9a,0x70,0x42},
+            {0x9d,0xbd,0x18,0xa5,0x09,0x71,0x6c,0x53,0x03,0x7d,0x87,0x13,0xd0,0x35,0x30,0x94,0xd5,0x5b,0x48,0x25,0x3c,0xb0,0xd3,0x8c,0xd7,0xbc,0x08,0x95,0x9d,0x7f,0xf0,0x14},
+            {0xa4,0x44,0xe2,0xb8,0x23,0x33,0xcb,0xd5,0xdf,0xe2,0x50,0xe3,0x93,0xe2,0x45,0xd5,0xdb,0x8b,0x78,0xf9,0x1b,0xbb,0x6a,0x57,0x27,0x61,0xa0,0xa4,0x3e,0xd5,0x6b,0x38},
+            {0xb1,0x63,0xcb,0xa8,0xc2,0xd0,0x44,0x1a,0xc5,0x90,0x33,0xf7,0x74,0x27,0x33,0xcb,0x77,0x81,0x2b,0xd7,0x4d,0xe1,0x14,0x7a,0xe8,0x17,0x3f,0xaa,0xe4,0xf9,0x26,0x9b},
+            {0x0a,0xc9,0xc6,0xfc,0x35,0x72,0x8d,0x13,0x17,0x49,0x0b,0x51,0xb3,0x62,0x77,0xe8,0x25,0xa4,0x9b,0xa9,0x5b,0xe2,0xa6,0x78,0x3e,0xf7,0xaf,0x99,0xe4,0x92,0x28,0xf7},
+            {0xab,0xe4,0x4c,0xdb,0xc6,0xae,0xa6,0x87,0x6b,0x8f,0x00,0x9d,0x62,0x79,0x47,0x9d,0xca,0x2c,0x4f,0x17,0xc6,0x50,0xc5,0x1b,0xd7,0xde,0x41,0x0b,0xbf,0x23,0xcd,0x24},
+            {0x4b,0x93,0x70,0xd4,0xae,0x2f,0xe0,0x8d,0xb3,0x3f,0x46,0x8f,0xfc,0xec,0xa5,0xd9,0xfe,0x6b,0x02,0x73,0xef,0x28,0x87,0xa4,0xea,0x85,0x22,0x29,0x38,0x70,0xe0,0xa1},
+            {0x98,0xb3,0xb2,0x99,0x96,0xfa,0xf5,0x48,0xb8,0x08,0xef,0xa1,0xfd,0x4c,0xa7,0x79,0x88,0x2b,0xb7,0x5c,0xc2,0xab,0x33,0x04,0xf0,0x49,0xb4,0x29,0xa3,0x63,0x8a,0x97},
+            {0xdf,0xb5,0x7e,0x8a,0x34,0xf4,0x91,0x17,0x73,0x13,0x35,0x29,0xe0,0xe2,0x22,0xf6,0xa5,0xcf,0x69,0x1b,0x25,0xa6,0x5c,0x28,0x8f,0x8d,0x6b,0xaa,0x68,0xb5,0xf4,0x06},
+            {0xd1,0xe3,0x5d,0x54,0xb3,0xdf,0x21,0x19,0x31,0x02,0xe9,0xdc,0xbb,0x19,0x4a,0x29,0x43,0x23,0x52,0x2a,0xe3,0x5c,0x68,0x59,0x7b,0x4b,0x08,0xf5,0x3c,0xbf,0x36,0xec},
+            {0x53,0xe8,0xbb,0x24,0x4f,0x3c,0x2c,0x90,0xfc,0xc8,0xce,0xb1,0x66,0x2e,0x03,0xaa,0xb3,0xe1,0xa7,0x81,0xfa,0x16,0x97,0xf7,0x38,0x3e,0x0b,0xdc,0x59,0x83,0x11,0x95},
+            {0x25,0x58,0x74,0xe4,0xce,0xd5,0x32,0x48,0x57,0x77,0xb8,0x78,0xf2,0xd7,0x79,0xc6,0x28,0x53,0xbd,0x8d,0x4d,0x05,0xdd,0xad,0xfa,0x61,0x63,0x46,0x57,0x03,0xdc,0x8c},
+            {0x6b,0x61,0xc1,0x76,0xda,0x93,0xe5,0x62,0x26,0xcb,0x6f,0xb7,0xa4,0xf8,0xac,0xf1,0xdf,0x87,0xd0,0x2b,0xe8,0x1f,0x82,0x3d,0xc8,0x51,0x68,0x0a,0xe6,0x4f,0x80,0xb6},
+            {0xf0,0x35,0xaf,0x0a,0x10,0x9e,0x46,0x7f,0xd4,0xec,0xd7,0xc4,0x5b,0xed,0x04,0x3d,0xd1,0xba,0x0d,0x02,0x16,0x4c,0x2b,0x2a,0xa0,0xab,0x19,0x89,0xd8,0xea,0xef,0xf7},
+            {0x81,0xb2,0x39,0xe1,0x21,0x38,0x41,0x93,0x4e,0x98,0x90,0x34,0x95,0x9c,0x9c,0xa0,0x44,0x8a,0xd6,0x4a,0xc3,0xab,0x91,0x97,0x51,0xc2,0x28,0x96,0x00,0xa2,0x07,0x23},
+            {0x25,0x1b,0x4f,0x78,0x23,0xc8,0x44,0x9e,0x2e,0x15,0x4c,0xba,0xb4,0xaa,0x72,0xfb,0x2c,0xc5,0x54,0x95,0xda,0x5f,0xdc,0x2d,0x31,0x07,0x5a,0xa5,0x64,0x7b,0xa4,0xcd},
+            {0x07,0x69,0xa1,0x1a,0x88,0x1b,0xfd,0x2f,0x02,0xa0,0x87,0x80,0x32,0x35,0xd3,0x44,0xad,0x2f,0x00,0x50,0x10,0xe4,0x0e,0xcd,0x7a,0xf5,0xdb,0x96,0x24,0x5d,0xd7,0x19},
+            {0xf4,0x96,0x3f,0x67,0x5e,0xef,0xac,0xf4,0xcd,0xd1,0x4f,0xf7,0xb7,0x59,0xd5,0x75,0x2a,0xec,0xee,0x4c,0xd7,0x04,0x74,0x4e,0x58,0xb9,0xbb,0xbe,0x07,0x8e,0x0f,0xaa},
+            {0x28,0x91,0x6a,0x97,0xe5,0x57,0x90,0xf8,0xe0,0xa9,0x5c,0x12,0x03,0xc1,0xf8,0xf1,0xea,0xc9,0x9b,0x86,0x6a,0xac,0x58,0x00,0x44,0x5e,0xf2,0xd8,0x88,0xb4,0xbe,0x87},
+            {0x57,0x5a,0x46,0xec,0xc4,0xc7,0x75,0x76,0x56,0xb9,0x37,0x1e,0x9b,0x8d,0xc0,0x58,0xf9,0x9f,0x9d,0x9a,0xd2,0x0a,0x3e,0x6d,0xe2,0xd4,0xe6,0xcb,0xc1,0x93,0x71,0x1c},
+            {0x93,0x59,0x94,0xc1,0xdf,0x93,0x23,0xd2,0xbd,0xcb,0xab,0x87,0x62,0x90,0x4e,0x48,0xed,0xf6,0x29,0x89,0x04,0xf3,0xae,0x7e,0x23,0x45,0x99,0x36,0x6b,0xfd,0x86,0xef},
+            {0xde,0xc5,0xba,0xc6,0x2e,0x0e,0xf6,0x4d,0xb4,0x93,0x6f,0x81,0x8e,0x32,0x5e,0x12,0xae,0xd2,0x9e,0xe0,0x93,0x32,0x77,0x25,0x91,0x85,0xda,0x12,0x98,0xdd,0x0a,0x28},
+            {0x3b,0xa0,0x63,0xcb,0xea,0x96,0x7f,0xc0,0xb7,0xbb,0x9a,0x25,0xc5,0xa1,0x2e,0xe8,0x01,0xea,0xa9,0x2f,0x55,0x70,0xd1,0xd1,0xa9,0x77,0xa2,0x29,0x83,0x4f,0xd0,0xa0},
+            {0x33,0x27,0xcc,0x41,0xeb,0xeb,0xc9,0xe8,0x2f,0x06,0xf8,0x36,0xd5,0x86,0x8f,0x9c,0x50,0x23,0xb0,0x54,0x98,0xbd,0x73,0xd8,0x36,0xf0,0x41,0x79,0xd2,0x4f,0xc7,0xb9},
+            {0x8d,0x70,0xf4,0x49,0xbd,0xa2,0x22,0x3d,0x0d,0x64,0x7d,0x75,0x43,0xbc,0x3a,0x2c,0x29,0xfe,0xdf,0xfa,0xef,0x78,0x9d,0xc5,0xbd,0x73,0xd2,0x5a,0x6f,0x0a,0xfd,0x38},
+            {0x99,0x02,0x82,0x6a,0x10,0xb2,0x26,0x26,0x5f,0x35,0x75,0x62,0xbb,0x20,0x77,0x43,0x58,0xdb,0xc6,0x36,0xe7,0x90,0x25,0x7a,0x57,0xaf,0x7f,0x79,0x1b,0x60,0x0a,0xcf},
+            {0xc5,0x82,0x1a,0x34,0x72,0x32,0x86,0x54,0x96,0x58,0x0d,0xe7,0xf3,0x04,0x38,0x22,0xca,0x56,0xee,0xa4,0xf8,0x26,0x6c,0x51,0xe3,0xbe,0x4a,0x16,0x01,0x6c,0xde,0xed},
+            {0x28,0x17,0xd6,0xde,0xe3,0xe6,0x70,0x6b,0x92,0x98,0x9f,0x2d,0xce,0xf7,0xcd,0x0f,0xef,0x5d,0x22,0x63,0xed,0x3d,0x1c,0x5d,0xab,0x8b,0xa9,0x95,0x50,0xb1,0xe5,0xd5},
+            {0xb9,0x18,0xf2,0xce,0x20,0x67,0x01,0xdf,0xe6,0x0e,0xee,0x1d,0x40,0xfa,0xd1,0x19,0x54,0x0e,0x92,0x8b,0x8d,0xa8,0x13,0xfe,0x29,0xd7,0x7a,0x2e,0x26,0xc2,0x73,0x8b},
+            {0x7f,0x83,0x64,0x79,0xec,0xd2,0xc4,0xae,0xc3,0x1c,0x96,0x93,0x5e,0x2c,0xe9,0x32,0x13,0x52,0x49,0xc6,0x07,0x71,0x84,0xb8,0x37,0xf7,0x24,0xfb,0xdd,0x42,0x54,0x08},
+            {0x13,0x81,0xc3,0x9f,0xb5,0xa6,0x8c,0x13,0x4b,0x94,0x8a,0xac,0xf7,0x2b,0x51,0x27,0xa7,0xb0,0xd5,0xa7,0x21,0xed,0x20,0x91,0xda,0x25,0xa3,0x85,0x6b,0x9a,0x9a,0xf8},
+            {0x80,0xe6,0xab,0x57,0x56,0xde,0x5e,0xba,0x85,0x51,0xf6,0x2d,0x89,0x43,0xe5,0xf6,0x50,0xf4,0xae,0x88,0x64,0xea,0x6b,0xdf,0xfc,0x32,0x57,0xef,0x10,0x72,0x67,0x9a},
+            {0xae,0x7d,0xd5,0xfc,0xf4,0x68,0x88,0x44,0xf5,0xef,0x72,0x47,0x1c,0xc0,0x27,0x3e,0x0e,0x2f,0x8f,0x43,0xba,0x4f,0xc3,0xdd,0x41,0x20,0x8f,0x70,0xb8,0x80,0xe5,0xd4},
+            {0xe0,0xf1,0xd8,0xc1,0xa7,0x45,0xed,0xe1,0x19,0x8f,0xef,0xbd,0x05,0x55,0xbc,0x11,0x8f,0x7c,0xcb,0xd9,0xee,0x78,0x3d,0x8e,0xd7,0xa1,0x48,0xf5,0x4f,0xb1,0x90,0x3f},
+            {0x33,0xc8,0xa7,0x5f,0xad,0x49,0xfd,0x3b,0x3b,0xb1,0xe0,0x31,0xfb,0x28,0x38,0x58,0xf7,0x9b,0x05,0xa8,0xb4,0x61,0xeb,0x1f,0x8f,0x0e,0x9d,0x41,0xc5,0x34,0x74,0xbc},
+            {0x38,0x64,0xe9,0x7c,0xd6,0xf4,0x7c,0x2e,0xaf,0x3f,0xdc,0xbb,0x10,0x5e,0x01,0x4a,0xcc,0xb4,0xeb,0x90,0x2b,0xe8,0xa4,0x3d,0xfc,0xa7,0x7d,0xfe,0x0d,0x92,0x76,0x1e},
+            {0xe5,0x24,0xe7,0xc4,0x00,0x53,0xd3,0xd1,0xda,0x35,0xac,0x8a,0x58,0x4a,0xd7,0x03,0x4c,0xd3,0x0d,0xe0,0xe9,0x51,0x3b,0xf7,0x73,0x1f,0x8e,0x5f,0x51,0xf7,0x17,0x8e},
+            {0x12,0xe1,0x21,0xad,0x8a,0x9b,0xe2,0x31,0x65,0x9d,0x08,0x74,0x6b,0x1a,0x8b,0x2b,0x92,0x47,0x30,0x4d,0xdd,0xc6,0x9c,0xec,0x07,0x47,0x11,0x97,0x09,0x86,0xcc,0x6d},
+            {0x14,0x9a,0x0d,0x19,0x7a,0x6c,0x2d,0xba,0x30,0x44,0xe4,0x3f,0x5f,0xac,0x90,0xf6,0xa7,0x97,0xe0,0xd4,0xc8,0xd9,0x1e,0x24,0x17,0x25,0xe9,0x63,0x08,0x3b,0xb4,0x72},
+            {0x6a,0x06,0x2b,0xa0,0x2e,0x79,0xd2,0xb2,0xc0,0x01,0xe1,0x68,0x9d,0xaa,0x1b,0x3a,0xde,0x7c,0x91,0x7e,0xf2,0x6b,0x30,0x98,0x77,0x98,0x12,0x38,0x18,0xb2,0x02,0xbd},
+            {0x99,0xe4,0x7c,0x12,0x4d,0x12,0x8f,0x74,0x1f,0x30,0xe7,0xc5,0xbc,0x75,0x75,0xf1,0x1a,0x00,0x5b,0xef,0xaa,0x26,0xab,0x60,0xb5,0x60,0xfe,0x4a,0x65,0x71,0x7a,0xa0},
+            {0x14,0x79,0x61,0xe3,0xd2,0x85,0x73,0x54,0x05,0x82,0xcb,0x4a,0x6e,0x26,0x6f,0x3a,0x67,0x7d,0x9e,0x5b,0x24,0xda,0x19,0xc2,0x9f,0xa6,0x11,0xd3,0xf8,0xfb,0xa8,0xa9},
+            {0x59,0x26,0x1c,0x94,0xc9,0x00,0x0f,0xe2,0x6b,0x3b,0x05,0x0c,0x4c,0xf7,0xab,0x06,0x34,0x3d,0x4f,0xfc,0xbe,0x39,0x34,0xda,0x65,0xf1,0x2d,0x8a,0x7b,0x0c,0x68,0x62},
+            {0x74,0x28,0xbc,0x17,0x4e,0xf7,0xfd,0x68,0x91,0x1d,0x46,0xb3,0x5d,0xa3,0x0b,0xbf,0x8a,0x29,0x2b,0xb6,0xb9,0xea,0x99,0x48,0x9b,0x0c,0x28,0xbb,0x55,0x87,0x6e,0x54},
+            {0x6f,0xbf,0xf7,0x1f,0x71,0x87,0xe6,0x7e,0x5c,0xc1,0x1f,0x85,0xec,0xc7,0xd0,0x63,0x28,0x4c,0x68,0x29,0xff,0xc2,0xb6,0x47,0xd9,0x43,0x9c,0xf6,0xd8,0x0c,0x71,0xb3},
+            {0xd4,0x9d,0xb1,0x7a,0xa1,0xe5,0x45,0x96,0x33,0x3d,0x19,0x62,0xdb,0x00,0x50,0xb5,0x4a,0x96,0xab,0xc6,0x18,0x4f,0x28,0xb4,0x67,0x78,0xac,0x3e,0xb9,0xbc,0x22,0x90},
+            {0x08,0x24,0x36,0xca,0x15,0x37,0x67,0x50,0x58,0x78,0x83,0x05,0x6c,0x2b,0x5f,0xce,0xaf,0xd2,0x32,0xf6,0xfd,0x91,0xd8,0x39,0xdc,0xf7,0xf1,0x38,0x58,0x35,0x65,0xd0},
+            {0x2d,0x6c,0x76,0x14,0xdd,0xf1,0x21,0xce,0xdd,0x9d,0xb9,0x89,0xf7,0x3d,0xa6,0x1c,0x3e,0x5d,0x5d,0x7a,0x87,0x61,0x39,0xd2,0xd4,0x41,0xd8,0xdc,0x28,0xbe,0xf0,0xab},
+            {0x10,0xb5,0xeb,0x9d,0xb4,0xb2,0x2b,0x90,0x47,0xb2,0xc9,0xa2,0xb4,0x0a,0xbe,0xfc,0x97,0x86,0xd8,0xf0,0xb3,0x35,0x14,0xbc,0xef,0x81,0xc4,0x62,0xf2,0x41,0xca,0x60},
+        },
+        /* labels */
+        1, {0, 0xffffffff, 0xffffffff, 0xffffffff, },
+        0, /* full check? */
+        /* expected number of outputs */
+        2323,
+        {
+            "",
+        },
+        {
+            "",
+        },
+        {
+            "",
+        },
+        },
+        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */
+        },
+    },
+
+};
diff --git a/depend/bitcoin/src/secp256k1/src/scalar.h b/depend/bitcoin/src/secp256k1/src/scalar.h
index 40d67191..2a5842b4 100644
--- a/depend/bitcoin/src/secp256k1/src/scalar.h
+++ b/depend/bitcoin/src/secp256k1/src/scalar.h
@@ -22,10 +22,10 @@
 /** Clear a scalar to prevent the leak of sensitive data. */
 static void secp256k1_scalar_clear(secp256k1_scalar *r);
 
-/** Access bits (1 < count <= 32) from a scalar. All requested bits must belong to the same 32-bit limb. */
+/** Access bits (1 <= count <= 32) from a scalar. All requested bits must belong to the same 32-bit limb. */
 static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k1_scalar *a, unsigned int offset, unsigned int count);
 
-/** Access bits (1 < count <= 32) from a scalar. offset + count must be < 256. Not constant time in offset and count. */
+/** Access bits (1 <= count <= 32) from a scalar. offset + count must be <= 256. Not constant time in offset and count. */
 static uint32_t secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count);
 
 /** Set a scalar from a big endian byte array. The scalar will be reduced modulo group order `n`.
diff --git a/depend/bitcoin/src/secp256k1/src/scalar_4x64_impl.h b/depend/bitcoin/src/secp256k1/src/scalar_4x64_impl.h
index a5bf18fe..b914136d 100644
--- a/depend/bitcoin/src/secp256k1/src/scalar_4x64_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/scalar_4x64_impl.h
@@ -41,7 +41,8 @@ SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsig
 SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
     SECP256K1_SCALAR_VERIFY(a);
     VERIFY_CHECK(count > 0 && count <= 32);
-    VERIFY_CHECK((offset + count - 1) >> 6 == offset >> 6);
+    VERIFY_CHECK(offset <= 256 - count);
+    VERIFY_CHECK((offset + count - 1) >> 5 == offset >> 5);
 
     return (a->d[offset >> 6] >> (offset & 0x3F)) & (0xFFFFFFFF >> (32 - count));
 }
@@ -49,12 +50,13 @@ SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k
 SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
     SECP256K1_SCALAR_VERIFY(a);
     VERIFY_CHECK(count > 0 && count <= 32);
-    VERIFY_CHECK(offset + count <= 256);
+    VERIFY_CHECK(offset <= 256 - count);
 
     if ((offset + count - 1) >> 6 == offset >> 6) {
-        return secp256k1_scalar_get_bits_limb32(a, offset, count);
+        return (a->d[offset >> 6] >> (offset & 0x3F)) & (0xFFFFFFFF >> (32 - count));
     } else {
         VERIFY_CHECK((offset >> 6) + 1 < 4);
+        VERIFY_CHECK((offset & 0x3F) > 0);
         return ((a->d[offset >> 6] >> (offset & 0x3F)) | (a->d[(offset >> 6) + 1] << (64 - (offset & 0x3F)))) & (0xFFFFFFFF >> (32 - count));
     }
 }
diff --git a/depend/bitcoin/src/secp256k1/src/scalar_8x32_impl.h b/depend/bitcoin/src/secp256k1/src/scalar_8x32_impl.h
index aa87b1d3..055918ca 100644
--- a/depend/bitcoin/src/secp256k1/src/scalar_8x32_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/scalar_8x32_impl.h
@@ -54,6 +54,7 @@ SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsig
 SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
     SECP256K1_SCALAR_VERIFY(a);
     VERIFY_CHECK(count > 0 && count <= 32);
+    VERIFY_CHECK(offset <= 256 - count);
     VERIFY_CHECK((offset + count - 1) >> 5 == offset >> 5);
 
     return (a->d[offset >> 5] >> (offset & 0x1F)) & (0xFFFFFFFF >> (32 - count));
@@ -62,7 +63,7 @@ SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k
 SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
     SECP256K1_SCALAR_VERIFY(a);
     VERIFY_CHECK(count > 0 && count <= 32);
-    VERIFY_CHECK(offset + count <= 256);
+    VERIFY_CHECK(offset <= 256 - count);
 
     if ((offset + count - 1) >> 5 == offset >> 5) {
         return secp256k1_scalar_get_bits_limb32(a, offset, count);
diff --git a/depend/bitcoin/src/secp256k1/src/scalar_low_impl.h b/depend/bitcoin/src/secp256k1/src/scalar_low_impl.h
index 628bfd33..164cda44 100644
--- a/depend/bitcoin/src/secp256k1/src/scalar_low_impl.h
+++ b/depend/bitcoin/src/secp256k1/src/scalar_low_impl.h
@@ -27,8 +27,10 @@ SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsig
 
 SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
     SECP256K1_SCALAR_VERIFY(a);
-
     VERIFY_CHECK(count > 0 && count <= 32);
+    VERIFY_CHECK(offset <= 256 - count);
+    VERIFY_CHECK((offset + count - 1) >> 5 == offset >> 5);
+
     if (offset < 32) {
         return (*a >> offset) & (0xFFFFFFFF >> (32 - count));
     } else {
@@ -38,8 +40,14 @@ SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_limb32(const secp256k
 
 SECP256K1_INLINE static uint32_t secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
     SECP256K1_SCALAR_VERIFY(a);
+    VERIFY_CHECK(count > 0 && count <= 32);
+    VERIFY_CHECK(offset <= 256 - count);
 
-    return secp256k1_scalar_get_bits_limb32(a, offset, count);
+    if (offset < 32) {
+        return (*a >> offset) & (0xFFFFFFFF >> (32 - count));
+    } else {
+        return 0;
+    }
 }
 
 SECP256K1_INLINE static int secp256k1_scalar_check_overflow(const secp256k1_scalar *a) { return *a >= EXHAUSTIVE_TEST_ORDER; }
diff --git a/depend/bitcoin/src/secp256k1/src/secp256k1.c b/depend/bitcoin/src/secp256k1/src/secp256k1.c
index e4b80fff..4b28bc51 100644
--- a/depend/bitcoin/src/secp256k1/src/secp256k1.c
+++ b/depend/bitcoin/src/secp256k1/src/secp256k1.c
@@ -74,7 +74,6 @@ static const secp256k1_context secp256k1_context_static_ = {
     0
 };
 const secp256k1_context * const secp256k1_context_static = &secp256k1_context_static_;
-const secp256k1_context * const secp256k1_context_no_precomp = &secp256k1_context_static_;
 
 /* Helper function that determines if a context is proper, i.e., is not the static context or a copy thereof.
  *
@@ -521,8 +520,9 @@ static int nonce_function_rfc6979_impl(const secp256k1_hash_ctx *hash_ctx, unsig
        buffer_append(keydata, &offset, algo16, 16);
    }
    secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, keydata, offset);
-   for (i = 0; i <= counter; i++) {
+   for (i = 0; ; i++) {
        secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, nonce32, 32);
+       if (i == counter) break;
    }
    secp256k1_rfc6979_hmac_sha256_finalize(&rng);
 
@@ -558,7 +558,7 @@ static int secp256k1_ecdsa_sign_inner(const secp256k1_context* ctx, secp256k1_sc
     while (1) {
         int is_nonce_valid;
 
-        if (noncefp == NULL) {
+        if (noncefp == NULL || noncefp == secp256k1_nonce_function_rfc6979) {
             /* Use ctx-aware function by default */
             ret = nonce_function_rfc6979_impl(secp256k1_get_hash_context(ctx), nonce32, msg32, seckey, NULL, (void*)noncedata, count);
         } else {
@@ -624,15 +624,12 @@ int secp256k1_ec_seckey_verify(const secp256k1_context* ctx, const unsigned char
 }
 
 static int secp256k1_ec_pubkey_create_helper(const secp256k1_ecmult_gen_context *ecmult_gen_ctx, secp256k1_scalar *seckey_scalar, secp256k1_ge *p, const unsigned char *seckey) {
-    secp256k1_gej pj;
     int ret;
 
     ret = secp256k1_scalar_set_b32_seckey(seckey_scalar, seckey);
     secp256k1_scalar_cmov(seckey_scalar, &secp256k1_scalar_one, !ret);
 
-    secp256k1_ecmult_gen(ecmult_gen_ctx, &pj, seckey_scalar);
-    secp256k1_ge_set_gej(p, &pj);
-    secp256k1_gej_clear(&pj);
+    secp256k1_ecmult_gen_ge(ecmult_gen_ctx, p, seckey_scalar);
     return ret;
 }
 
@@ -852,3 +849,7 @@ int secp256k1_tagged_sha256(const secp256k1_context* ctx, unsigned char *hash32,
 #ifdef ENABLE_MODULE_ELLSWIFT
 # include "modules/ellswift/main_impl.h"
 #endif
+
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+# include "modules/silentpayments/main_impl.h"
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/selftest.h b/depend/bitcoin/src/secp256k1/src/selftest.h
index de0e0597..08b2a9b7 100644
--- a/depend/bitcoin/src/secp256k1/src/selftest.h
+++ b/depend/bitcoin/src/secp256k1/src/selftest.h
@@ -24,7 +24,13 @@ static int secp256k1_selftest_sha256(secp256k1_sha256_compression_function fn_co
     hash_ctx.fn_sha256_compression = fn_compression;
     secp256k1_sha256_write(&hash_ctx, &hasher, (const unsigned char*)input63, 63);
     secp256k1_sha256_finalize(&hash_ctx, &hasher, out);
-    return secp256k1_memcmp_var(out, output32, 32) == 0;
+    if (secp256k1_memcmp_var(out, output32, 32) != 0) {
+        return 0;
+    }
+    if (fn_compression != secp256k1_sha256_transform && !secp256k1_sha256_smoke_test(fn_compression)) {
+        return 0;
+    }
+    return 1;
 }
 
 static int secp256k1_selftest_passes(void) {
diff --git a/depend/bitcoin/src/secp256k1/src/tests.c b/depend/bitcoin/src/secp256k1/src/tests.c
index 862bef61..1a4987bd 100644
--- a/depend/bitcoin/src/secp256k1/src/tests.c
+++ b/depend/bitcoin/src/secp256k1/src/tests.c
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 
 #include <time.h>
@@ -37,6 +38,11 @@
 #include "int128_impl.h"
 #endif
 
+#if defined(__GNUC__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic warning "-Wunused-function"
+#endif
+
 #define CONDITIONAL_TEST(cnt, nam) if (COUNT < (cnt)) { printf("Skipping %s (iteration count too low)\n", nam); } else
 
 static secp256k1_context *CTX = NULL;
@@ -189,9 +195,6 @@ static void run_ec_illegal_argument_tests(void) {
 }
 
 static void run_static_context_tests(int use_prealloc) {
-    /* Check that deprecated secp256k1_context_no_precomp is an alias to secp256k1_context_static. */
-    CHECK(secp256k1_context_no_precomp == secp256k1_context_static);
-
     {
         unsigned char seed[32] = {0x17};
 
@@ -241,7 +244,6 @@ static void run_proper_context_tests(int use_prealloc) {
     void *my_ctx_prealloc = NULL;
     unsigned char seed[32] = {0x17};
 
-    secp256k1_gej pubj;
     secp256k1_ge pub;
     secp256k1_scalar msg, key, nonce;
     secp256k1_scalar sigr, sigs;
@@ -329,8 +331,7 @@ static void run_proper_context_tests(int use_prealloc) {
     /*** attempt to use them ***/
     testutil_random_scalar_order_test(&msg);
     testutil_random_scalar_order_test(&key);
-    secp256k1_ecmult_gen(&my_ctx->ecmult_gen_ctx, &pubj, &key);
-    secp256k1_ge_set_gej(&pub, &pubj);
+    secp256k1_ecmult_gen_ge(&my_ctx->ecmult_gen_ctx, &pub, &key);
 
     /* obtain a working nonce */
     do {
@@ -369,7 +370,6 @@ static void run_scratch_tests(void) {
     size_t checkpoint;
     size_t checkpoint_2;
     secp256k1_scratch_space *scratch;
-    secp256k1_scratch_space local_scratch;
 
     /* Test public API */
     scratch = secp256k1_scratch_space_create(CTX, 1000);
@@ -409,16 +409,7 @@ static void run_scratch_tests(void) {
     CHECK_ERROR_VOID(CTX, secp256k1_scratch_apply_checkpoint(&CTX->error_callback, scratch, checkpoint_2)); /* checkpoint_2 is after checkpoint */
     CHECK_ERROR_VOID(CTX, secp256k1_scratch_apply_checkpoint(&CTX->error_callback, scratch, (size_t) -1)); /* this is just wildly invalid */
 
-    /* try to use badly initialized scratch space */
-    secp256k1_scratch_space_destroy(CTX, scratch);
-    memset(&local_scratch, 0, sizeof(local_scratch));
-    scratch = &local_scratch;
-    CHECK_ERROR(CTX, secp256k1_scratch_max_allocation(&CTX->error_callback, scratch, 0));
-    CHECK_ERROR(CTX, secp256k1_scratch_alloc(&CTX->error_callback, scratch, 500));
-    CHECK_ERROR_VOID(CTX, secp256k1_scratch_space_destroy(CTX, scratch));
-
     /* Test that large integers do not wrap around in a bad way */
-    scratch = secp256k1_scratch_space_create(CTX, 1000);
     /* Try max allocation with a large number of objects. Only makes sense if
      * ALIGNMENT is greater than 1 because otherwise the objects take no extra
      * space. */
@@ -433,6 +424,21 @@ static void run_scratch_tests(void) {
     secp256k1_scratch_space_destroy(CTX, NULL); /* no-op */
 }
 
+/* try to use badly initialized scratch space */
+static void run_invalid_scratch_space_tests(void) {
+    secp256k1_scratch_space* scratch = checked_malloc(&CTX->error_callback, sizeof(*scratch));
+    size_t magic_size = sizeof(scratch->magic);
+    memset(scratch, 0, sizeof(*scratch));
+    /* catch accesses beyond the magic */
+    SECP256K1_CHECKMEM_UNDEFINE((unsigned char*)scratch + magic_size, sizeof(*scratch) - magic_size);
+
+    CHECK_ERROR(CTX, secp256k1_scratch_max_allocation(&CTX->error_callback, scratch, 0));
+    CHECK_ERROR(CTX, secp256k1_scratch_alloc(&CTX->error_callback, scratch, 500));
+    CHECK_ERROR_VOID(CTX, secp256k1_scratch_space_destroy(CTX, scratch));
+
+    free(scratch);
+}
+
 /* A compression function that does nothing */
 static void invalid_sha256_compression(uint32_t *s, const unsigned char *msg, size_t rounds) {
     (void)s; (void)msg; (void)rounds;
@@ -480,6 +486,79 @@ static void run_plug_sha256_compression_tests(void) {
     secp256k1_context_destroy(ctx_cloned);
 }
 
+/* Hashes the first block over and over instead of moving on. */
+static void sha256_transform_noadvance(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    size_t i;
+    for (i = 0; i < blocks; i++) {
+        secp256k1_sha256_transform(s, chunk, 1);
+    }
+}
+
+/* Drops the last block of a multi-block call. */
+static void sha256_transform_short(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    secp256k1_sha256_transform(s, chunk, blocks > 0 ? blocks - 1 : 0);
+}
+
+/* Starts from the IV instead of the state it was given. */
+static void sha256_transform_ivreset(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    secp256k1_sha256 h;
+    secp256k1_sha256_initialize(&h);
+    memcpy(s, h.s, sizeof(h.s));
+    secp256k1_sha256_transform(s, chunk, blocks);
+}
+
+/* Correct only on multiples of four blocks. */
+static void sha256_transform_batch4(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    secp256k1_sha256_transform(s, chunk, blocks - (blocks & 3));
+}
+
+/* Right digest, one bit off. */
+static void sha256_transform_corrupt(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    secp256k1_sha256_transform(s, chunk, blocks);
+    s[0] ^= 1;
+}
+
+#ifdef UINTPTR_MAX
+
+/* Wrong when input is 64-byte aligned, like a broken SIMD fast path. */
+static void sha256_transform_align64_fail(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    int aligned = ((uintptr_t)chunk % 64) == 0;
+    secp256k1_sha256_transform(s, chunk, blocks);
+    if (aligned) s[0] ^= 1;
+}
+
+/* Wrong when input is 32-byte aligned but not 64 */
+static void sha256_transform_align32_fail(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    int align32_not64 = (((uintptr_t)chunk % 32) == 0) && (((uintptr_t)chunk % 64) != 0);
+    secp256k1_sha256_transform(s, chunk, blocks);
+    if (align32_not64) {
+        s[0] ^= 1;
+    }
+}
+
+/* Wrong on any unaligned input. */
+static void sha256_transform_unaligned_fail(uint32_t *s, const unsigned char *chunk, size_t blocks) {
+    int aligned = ((uintptr_t)chunk % 64) == 0;
+    secp256k1_sha256_transform(s, chunk, blocks);
+    if (!aligned) s[0] ^= 1;
+}
+
+#endif /* UINTPTR_MAX */
+
+static void run_sha256_compression_smoke_test_tests(void) {
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_noadvance) == 0);
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_short) == 0);
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_ivreset) == 0);
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_batch4) == 0);
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_corrupt) == 0);
+#ifdef UINTPTR_MAX
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_align64_fail) == 0);
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_align32_fail) == 0);
+    CHECK(secp256k1_sha256_smoke_test(sha256_transform_unaligned_fail) == 0);
+#endif
+    CHECK(secp256k1_sha256_smoke_test(good_sha256_compression) == 1);
+}
+
 static void run_sha256_multi_block_compression_tests(void) {
     secp256k1_hash_ctx hash_ctx;
     secp256k1_sha256 sha256_one;
@@ -3056,6 +3135,18 @@ static int fe_equal(const secp256k1_fe *a, const secp256k1_fe *b) {
     return secp256k1_fe_equal(&an, &bn);
 }
 
+static void run_fe_equal_magnitude_boundaries(void) {
+    int i;
+    secp256k1_fe a, b;
+    for (i = 0; i < 100 * COUNT; ++i) {
+        testutil_random_fe(&a);
+        b = a;
+        testutil_random_fe_magnitude(&a, 1);
+        testutil_random_fe_magnitude(&b, 30);
+        CHECK(secp256k1_fe_equal(&a, &b));
+    }
+}
+
 static void run_field_convert(void) {
     static const unsigned char b32[32] = {
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -4304,19 +4395,16 @@ static void test_ec_combine(void) {
     const secp256k1_pubkey* d[6];
     secp256k1_pubkey sd;
     secp256k1_pubkey sd2;
-    secp256k1_gej Qj;
     secp256k1_ge Q;
     int i;
     for (i = 1; i <= 6; i++) {
         secp256k1_scalar s;
         testutil_random_scalar_order_test(&s);
         secp256k1_scalar_add(&sum, &sum, &s);
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &Qj, &s);
-        secp256k1_ge_set_gej(&Q, &Qj);
+        secp256k1_ecmult_gen_ge(&CTX->ecmult_gen_ctx, &Q, &s);
         secp256k1_pubkey_save(&data[i - 1], &Q);
         d[i - 1] = &data[i - 1];
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &Qj, &sum);
-        secp256k1_ge_set_gej(&Q, &Qj);
+        secp256k1_ecmult_gen_ge(&CTX->ecmult_gen_ctx, &Q, &sum);
         secp256k1_pubkey_save(&sd, &Q);
         CHECK(secp256k1_ec_pubkey_combine(CTX, &sd2, d, i) == 1);
         CHECK(secp256k1_memcmp_var(&sd, &sd2, sizeof(sd)) == 0);
@@ -4593,9 +4681,9 @@ static void test_ecmult_target(const secp256k1_scalar* target, int mode) {
 
     /* EC multiplications */
     if (mode == 0) {
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &p1j, &n1);
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &p2j, &n2);
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &ptj, target);
+        secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &p1j, &n1);
+        secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &p2j, &n2);
+        secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &ptj, target);
     } else if (mode == 1) {
         secp256k1_ecmult(&p1j, &pj, &n1, &secp256k1_scalar_zero);
         secp256k1_ecmult(&p2j, &pj, &n2, &secp256k1_scalar_zero);
@@ -5162,7 +5250,7 @@ static int test_ecmult_multi_random(secp256k1_scratch *scratch) {
             secp256k1_scalar_mul(&scalars[filled], &sc_tmp, &g_scalar);
             secp256k1_scalar_inverse_var(&sc_tmp, &sc_tmp);
             secp256k1_scalar_negate(&sc_tmp, &sc_tmp);
-            secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &gejs[filled], &sc_tmp);
+            secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &gejs[filled], &sc_tmp);
             ++filled;
             ++mults;
         }
@@ -5642,7 +5730,7 @@ static void test_ecmult_accumulate(secp256k1_sha256* acc, const secp256k1_scalar
     size_t i;
     secp256k1_gej_set_ge(&gj, &secp256k1_ge_const_g);
     secp256k1_gej_set_infinity(&infj);
-    secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &rj[0], x);
+    secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &rj[0], x);
     secp256k1_ecmult(&rj[1], &gj, x, NULL);
     secp256k1_ecmult(&rj[2], &gj, x, &secp256k1_scalar_zero);
     secp256k1_ecmult(&rj[3], &infj, &secp256k1_scalar_zero, x);
@@ -5786,6 +5874,25 @@ static void run_ecmult_constants(void) {
     }
 }
 
+static void run_ecmult_gen_ge(void) {
+    /* Test that secp256k1_ecmult_gen_ge result matches secp256k1_ecmult_gen_gej with
+     * manual Jacobian-to-affine conversion (secp256k1_ge_set_gej) over random scalars */
+    int i;
+
+    for (i = 0; i < COUNT; i++) {
+        secp256k1_scalar scalar;
+        secp256k1_gej result_gej;
+        secp256k1_ge result_ge, expected_ge;
+
+        testutil_random_scalar_order_test(&scalar);
+        secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &result_gej, &scalar);
+        secp256k1_ge_set_gej(&expected_ge, &result_gej);
+        secp256k1_ecmult_gen_ge(&CTX->ecmult_gen_ctx, &result_ge, &scalar);
+
+        CHECK(secp256k1_ge_eq_var(&result_ge, &expected_ge));
+    }
+}
+
 static void test_ecmult_gen_blind(void) {
     /* Test ecmult_gen() blinding and confirm that the blinding changes, the affine points match, and the z's don't match. */
     secp256k1_scalar key;
@@ -5796,13 +5903,13 @@ static void test_ecmult_gen_blind(void) {
     secp256k1_ge p;
     secp256k1_ge pge;
     testutil_random_scalar_order_test(&key);
-    secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &pgej, &key);
+    secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &pgej, &key);
     testrand256(seed32);
     b = CTX->ecmult_gen_ctx.scalar_offset;
     p = CTX->ecmult_gen_ctx.ge_offset;
     secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, secp256k1_get_hash_context(CTX), seed32);
     CHECK(!secp256k1_scalar_eq(&b, &CTX->ecmult_gen_ctx.scalar_offset));
-    secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &pgej2, &key);
+    secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &pgej2, &key);
     CHECK(!gej_xyz_equals_gej(&pgej, &pgej2));
     CHECK(!secp256k1_ge_eq_var(&p, &CTX->ecmult_gen_ctx.ge_offset));
     secp256k1_ge_set_gej(&pge, &pgej);
@@ -5832,7 +5939,7 @@ static void test_ecmult_gen_edge_cases(void) {
 
     for (i = -1; i < 2; ++i) {
         /* Run test with gn = i - scalar_offset (so that the ecmult_gen recoded value represents i). */
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &res1, &gn);
+        secp256k1_ecmult_gen_gej(&CTX->ecmult_gen_ctx, &res1, &gn);
         secp256k1_ecmult(&res2, NULL, &secp256k1_scalar_zero, &gn);
         secp256k1_ecmult_const(&res3, &secp256k1_ge_const_g, &gn);
         CHECK(secp256k1_gej_eq_var(&res1, &res2));
@@ -6515,7 +6622,6 @@ static void random_sign(secp256k1_scalar *sigr, secp256k1_scalar *sigs, const se
 }
 
 static void test_ecdsa_sign_verify(void) {
-    secp256k1_gej pubj;
     secp256k1_ge pub;
     secp256k1_scalar one;
     secp256k1_scalar msg, key;
@@ -6524,8 +6630,7 @@ static void test_ecdsa_sign_verify(void) {
     int recid;
     testutil_random_scalar_order_test(&msg);
     testutil_random_scalar_order_test(&key);
-    secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &pubj, &key);
-    secp256k1_ge_set_gej(&pub, &pubj);
+    secp256k1_ecmult_gen_ge(&CTX->ecmult_gen_ctx, &pub, &key);
     getrec = testrand_bits(1);
     /* The specific way in which this conditional is written sidesteps a potential bug in clang.
        See the commit messages of the commit that introduced this comment for details. */
@@ -6839,7 +6944,7 @@ static void test_sort_helper(secp256k1_pubkey *pk, size_t *pk_order, size_t n_pk
     for (i = 0; i < n_pk; i++) {
         pk_test[i] = &pk[pk_order[i]];
     }
-    secp256k1_ec_pubkey_sort(CTX, pk_test, n_pk);
+    CHECK(secp256k1_ec_pubkey_sort(CTX, pk_test, n_pk) == 1);
     for (i = 0; i < n_pk; i++) {
         CHECK(secp256k1_memcmp_var(pk_test[i], &pk[i], sizeof(*pk_test[i])) == 0);
     }
@@ -6928,7 +7033,7 @@ static void test_sort(void) {
             testutil_random_pubkey_test(&pk[j]);
             pk_ptr[j] = &pk[j];
         }
-        secp256k1_ec_pubkey_sort(CTX, pk_ptr, 5);
+        CHECK(secp256k1_ec_pubkey_sort(CTX, pk_ptr, 5) == 1);
         for (j = 1; j < 5; j++) {
             CHECK(secp256k1_ec_pubkey_sort_cmp(&pk_ptr[j - 1], &pk_ptr[j], CTX) <= 0);
         }
@@ -7284,7 +7389,6 @@ static void run_ecdsa_edge_cases(void) {
 
     /* Test the case where ECDSA recomputes a point that is infinity. */
     {
-        secp256k1_gej keyj;
         secp256k1_ge key;
         secp256k1_scalar msg;
         secp256k1_scalar sr, ss;
@@ -7292,8 +7396,7 @@ static void run_ecdsa_edge_cases(void) {
         secp256k1_scalar_negate(&ss, &ss);
         secp256k1_scalar_inverse(&ss, &ss);
         secp256k1_scalar_set_int(&sr, 1);
-        secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &keyj, &sr);
-        secp256k1_ge_set_gej(&key, &keyj);
+        secp256k1_ecmult_gen_ge(&CTX->ecmult_gen_ctx, &key, &sr);
         msg = ss;
         CHECK(secp256k1_ecdsa_sig_verify(&sr, &ss, &key, &msg) == 0);
     }
@@ -7695,6 +7798,10 @@ static void run_ecdsa_wycheproof(void) {
 # include "modules/ellswift/tests_impl.h"
 #endif
 
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+# include "modules/silentpayments/tests_impl.h"
+#endif
+
 static void run_secp256k1_memczero_test(void) {
     unsigned char buf1[6] = {1, 2, 3, 4, 5, 6};
     unsigned char buf2[sizeof(buf1)];
@@ -7920,7 +8027,9 @@ static const struct tf_test_entry tests_general[] = {
     CASE(all_static_context_tests),
     CASE(deprecated_context_flags_test),
     CASE(scratch_tests),
+    CASE(invalid_scratch_space_tests),
     CASE(plug_sha256_compression_tests),
+    CASE(sha256_compression_smoke_test_tests),
     CASE(sha256_multi_block_compression_tests),
 };
 
@@ -7949,6 +8058,7 @@ static const struct tf_test_entry tests_scalar[] = {
 static const struct tf_test_entry tests_field[] = {
     CASE(field_half),
     CASE(field_misc),
+    CASE(fe_equal_magnitude_boundaries),
     CASE(field_convert),
     CASE(field_be32_overflow),
     CASE(fe_mul),
@@ -7969,6 +8079,7 @@ static const struct tf_test_entry tests_ecmult[] = {
     CASE(ecmult_near_split_bound),
     CASE(ecmult_chain),
     CASE(ecmult_constants),
+    CASE(ecmult_gen_ge),
     CASE(ecmult_gen_blind),
     CASE(ecmult_const_tests),
     CASE(ecmult_multi_tests),
@@ -8032,6 +8143,9 @@ static const struct tf_test_module registry_modules[] = {
 #endif
 #ifdef ENABLE_MODULE_ELLSWIFT
     MAKE_TEST_MODULE(ellswift),
+#endif
+#ifdef ENABLE_MODULE_SILENTPAYMENTS
+    MAKE_TEST_MODULE(silentpayments),
 #endif
     MAKE_TEST_MODULE(utils),
 };
@@ -8080,3 +8194,7 @@ int main(int argc, char **argv) {
     if (tf_init(&tf, argc, argv) != 0) return EXIT_FAILURE;
     return tf_run(&tf);
 }
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic pop
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/tests_exhaustive.c b/depend/bitcoin/src/secp256k1/src/tests_exhaustive.c
index 68d4bec3..d7300f7e 100644
--- a/depend/bitcoin/src/secp256k1/src/tests_exhaustive.c
+++ b/depend/bitcoin/src/secp256k1/src/tests_exhaustive.c
@@ -31,6 +31,11 @@
 #include "testutil.h"
 #include "util.h"
 
+#if defined(__GNUC__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic warning "-Wunused-function"
+#endif
+
 static int count = 2;
 
 static uint32_t num_cores = 1;
@@ -215,7 +220,7 @@ static void test_exhaustive_ecmult_multi(const secp256k1_context *ctx, const sec
                         data.pt[0] = group[x];
                         data.pt[1] = group[y];
 
-                        secp256k1_ecmult_multi_var(&ctx->error_callback, scratch, &tmp, &g_sc, ecmult_multi_callback, &data, 2);
+                        CHECK(secp256k1_ecmult_multi_var(&ctx->error_callback, scratch, &tmp, &g_sc, ecmult_multi_callback, &data, 2) == 1);
                         CHECK(secp256k1_gej_eq_ge_var(&tmp, &group[(i * x + j * y + k) % EXHAUSTIVE_TEST_ORDER]));
                     }
                 }
@@ -337,6 +342,10 @@ static void test_exhaustive_sign(const secp256k1_context *ctx, const secp256k1_g
      */
 }
 
+#ifdef ENABLE_MODULE_ECDH
+#include "modules/ecdh/tests_exhaustive_impl.h"
+#endif
+
 #ifdef ENABLE_MODULE_RECOVERY
 #include "modules/recovery/tests_exhaustive_impl.h"
 #endif
@@ -417,12 +426,10 @@ int main(int argc, char** argv) {
             /* Verify against ecmult_gen */
             {
                 secp256k1_scalar scalar_i;
-                secp256k1_gej generatedj;
                 secp256k1_ge generated;
 
                 secp256k1_scalar_set_int(&scalar_i, i);
-                secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &generatedj, &scalar_i);
-                secp256k1_ge_set_gej(&generated, &generatedj);
+                secp256k1_ecmult_gen_ge(&ctx->ecmult_gen_ctx, &generated, &scalar_i);
 
                 CHECK(!secp256k1_ge_is_infinity(&group[i]));
                 CHECK(secp256k1_ge_eq_var(&group[i], &generated));
@@ -437,6 +444,9 @@ int main(int argc, char** argv) {
         test_exhaustive_sign(ctx, group);
         test_exhaustive_verify(ctx, group);
 
+#ifdef ENABLE_MODULE_ECDH
+        test_exhaustive_ecdh(ctx, group);
+#endif
 #ifdef ENABLE_MODULE_RECOVERY
         test_exhaustive_recovery(ctx, group);
 #endif
@@ -462,3 +472,7 @@ int main(int argc, char** argv) {
     printf("no problems found\n");
     return EXIT_SUCCESS;
 }
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic pop
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/unit_test.c b/depend/bitcoin/src/secp256k1/src/unit_test.c
index a1858a11..2ac709cc 100644
--- a/depend/bitcoin/src/secp256k1/src/unit_test.c
+++ b/depend/bitcoin/src/secp256k1/src/unit_test.c
@@ -17,6 +17,11 @@
 #include "testrand.h"
 #include "tests_common.h"
 
+#if defined(__GNUC__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic warning "-Wunused-function"
+#endif
+
 #define UNUSED(x) (void)(x)
 
 /* Number of times certain tests will run */
@@ -477,3 +482,7 @@ static int tf_run(struct tf_framework* tf) {
 
     return status;
 }
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic pop
+#endif
diff --git a/depend/bitcoin/src/secp256k1/src/util.h b/depend/bitcoin/src/secp256k1/src/util.h
index 5d03e4c7..13e26e02 100644
--- a/depend/bitcoin/src/secp256k1/src/util.h
+++ b/depend/bitcoin/src/secp256k1/src/util.h
@@ -7,7 +7,6 @@
 #ifndef SECP256K1_UTIL_H
 #define SECP256K1_UTIL_H
 
-#include "../include/secp256k1.h"
 #include "checkmem.h"
 
 #include <string.h>
@@ -46,7 +45,7 @@ static void print_buf_plain(const unsigned char *buf, size_t len) {
 }
 
 # if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-#  if SECP256K1_GNUC_PREREQ(2,7)
+#  if defined(__GNUC__)
 #   define SECP256K1_INLINE __inline__
 #  elif (defined(_MSC_VER))
 #   define SECP256K1_INLINE __inline
@@ -57,6 +56,17 @@ static void print_buf_plain(const unsigned char *buf, size_t len) {
 #  define SECP256K1_INLINE inline
 # endif
 
+# if !defined(_DEBUG) && !defined(__NO_INLINE__) && !defined(__OPTIMIZE_SIZE__)
+#  if defined(__OPTIMIZE__) && defined(__GNUC__)
+#   define SECP256K1_FORCE_INLINE SECP256K1_INLINE __attribute__((always_inline))
+#  elif defined(_MSC_VER)
+#   define SECP256K1_FORCE_INLINE __forceinline
+#  endif
+# endif
+# ifndef SECP256K1_FORCE_INLINE
+#  define SECP256K1_FORCE_INLINE SECP256K1_INLINE
+# endif
+
 /** Assert statically that expr is true.
  *
  * This is a statement-like macro and can only be used inside functions.
@@ -132,7 +142,7 @@ static const secp256k1_callback default_error_callback = {
 } while(0)
 #endif
 
-#if SECP256K1_GNUC_PREREQ(3, 0)
+#if defined(__GNUC__)
 #define EXPECT(x,c) __builtin_expect((x),(c))
 #else
 #define EXPECT(x,c) (x)
@@ -188,7 +198,7 @@ static SECP256K1_INLINE void *checked_malloc(const secp256k1_callback* cb, size_
 # define SECP256K1_RESTRICT
 #else
 # if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-#  if SECP256K1_GNUC_PREREQ(3,0)
+#  if defined(__GNUC__)
 #   define SECP256K1_RESTRICT __restrict__
 #  elif (defined(_MSC_VER) && _MSC_VER >= 1400)
 #   define SECP256K1_RESTRICT __restrict
@@ -381,13 +391,13 @@ static SECP256K1_INLINE int secp256k1_ctz64_var_debruijn(uint64_t x) {
 /* Determine the number of trailing zero bits in a (non-zero) 32-bit x. */
 static SECP256K1_INLINE int secp256k1_ctz32_var(uint32_t x) {
     VERIFY_CHECK(x != 0);
-#if (__has_builtin(__builtin_ctz) || SECP256K1_GNUC_PREREQ(3,4))
+#if (__has_builtin(__builtin_ctz) || defined(__GNUC__))
     /* If the unsigned type is sufficient to represent the largest uint32_t, consider __builtin_ctz. */
     if (((unsigned)UINT32_MAX) == UINT32_MAX) {
         return __builtin_ctz(x);
     }
 #endif
-#if (__has_builtin(__builtin_ctzl) || SECP256K1_GNUC_PREREQ(3,4))
+#if (__has_builtin(__builtin_ctzl) || defined(__GNUC__))
     /* Otherwise consider __builtin_ctzl (the unsigned long type is always at least 32 bits). */
     return __builtin_ctzl(x);
 #else
@@ -399,13 +409,13 @@ static SECP256K1_INLINE int secp256k1_ctz32_var(uint32_t x) {
 /* Determine the number of trailing zero bits in a (non-zero) 64-bit x. */
 static SECP256K1_INLINE int secp256k1_ctz64_var(uint64_t x) {
     VERIFY_CHECK(x != 0);
-#if (__has_builtin(__builtin_ctzl) || SECP256K1_GNUC_PREREQ(3,4))
+#if (__has_builtin(__builtin_ctzl) || defined(__GNUC__))
     /* If the unsigned long type is sufficient to represent the largest uint64_t, consider __builtin_ctzl. */
     if (((unsigned long)UINT64_MAX) == UINT64_MAX) {
         return __builtin_ctzl(x);
     }
 #endif
-#if (__has_builtin(__builtin_ctzll) || SECP256K1_GNUC_PREREQ(3,4))
+#if (__has_builtin(__builtin_ctzll) || defined(__GNUC__))
     /* Otherwise consider __builtin_ctzll (the unsigned long long type is always at least 64 bits). */
     return __builtin_ctzll(x);
 #else
diff --git a/depend/bitcoin/src/secp256k1/tools/tests_silentpayments_generate.py b/depend/bitcoin/src/secp256k1/tools/tests_silentpayments_generate.py
new file mode 100755
index 00000000..c1219c01
--- /dev/null
+++ b/depend/bitcoin/src/secp256k1/tools/tests_silentpayments_generate.py
@@ -0,0 +1,324 @@
+#!/usr/bin/env python3
+
+"""
+A script to convert BIP352 test vectors from JSON to a C header.
+
+Usage:
+
+    ./tools/tests_silentpayments_generate.py src/modules/silentpayments/bip352_send_and_receive_test_vectors.json  > ./src/modules/silentpayments/vectors.h
+"""
+
+import hashlib
+import json
+import sys
+
+NUMS_H = bytes.fromhex("50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0")
+MAX_INPUTS_PER_TEST_CASE = 3
+MAX_OUTPUTS_PER_TEST_CASE = 2324  # K_max + 1
+MAX_RECIPIENT_ENTRIES_PER_TEST_CASE = 4
+MAX_LABELS_PER_TEST_CASE = 4
+MAX_PERMUTATIONS_PER_SENDING_TEST_CASE = 12
+MAX_RECEIVE_SUBTESTS = 2
+
+def sha256(s):
+    return hashlib.sha256(s).digest()
+
+def smallest_outpoint(outpoints):
+    serialized_outpoints = [bytes.fromhex(txid)[::-1] + n.to_bytes(4, 'little') for txid, n in outpoints]
+    return sorted(serialized_outpoints)[0]
+
+def is_p2tr(s):  # OP_1 OP_PUSHBYTES_32 <32 bytes>
+    return (len(s) == 34) and (s[0] == 0x51) and (s[1] == 0x20)
+
+def get_pubkey_from_input(input_data, pubkey_hex):
+    """Extract the correct pubkey for an input, handling NUMS_H filtering and format conversion"""
+    spk = bytes.fromhex(input_data['prevout']['scriptPubKey']['hex'])
+    pubkey = bytes.fromhex(pubkey_hex)
+
+    if is_p2tr(spk):  # taproot input
+        # Check for NUMS_H in witness (should be skipped)
+        witness = bytes.fromhex(input_data.get('txinwitness', ''))
+        # Parse witness stack
+        witness_stack = []
+        num_witness_items = 0
+        if len(witness) > 0:
+            num_witness_items = witness[0]
+            witness = witness[1:]
+        for i in range(num_witness_items):
+            item_len = witness[0]
+            witness_stack.append(witness[1:item_len+1])
+            witness = witness[item_len+1:]
+
+        # Check for script-path spend with NUMS_H
+        if len(witness_stack) > 1 and witness_stack[-1][0] == 0x50:
+            witness_stack.pop()
+        if len(witness_stack) > 1:  # script-path spend?
+            control_block = witness_stack[-1]
+            internal_key = control_block[1:33]
+            if internal_key == NUMS_H:  # skip
+                return b''
+
+        # Convert to x-only (32 bytes) for taproot
+        if len(pubkey) == 33:
+            pubkey = pubkey[1:]  # Remove prefix byte
+        return pubkey
+    else:  # regular input - use full compressed pubkey (33 bytes)
+        return pubkey
+
+def gen_byte_array(hex):
+    assert len(hex) % 2 == 0
+    if hex == "":
+        return "{0x00}"
+    s = ',0x'.join(a + b for a, b in zip(hex[::2], hex[1::2]))
+    return "{0x" + s + "}"
+
+def maybe_gen_comment(comment):
+    if comment:
+        return f" /* {comment} */"
+    else:
+        return ""
+
+def gen_key_material(keys, comment=None, prepend_count=False):
+    assert len(keys) <= MAX_INPUTS_PER_TEST_CASE
+    out = ""
+    if prepend_count:
+        out += f"        {len(keys)},\n"
+    out += f"        {{{maybe_gen_comment(comment)}\n"
+    for k in keys:
+        out += f"            {gen_byte_array(k)},\n"
+    if not keys:
+        out += '            "",\n'
+    out +=  "        },\n"
+    return out
+
+def gen_recipient_addr_material(recipients):
+    assert len(recipients) <= MAX_RECIPIENT_ENTRIES_PER_TEST_CASE
+    num_outputs = sum([r.get('count', 1) for r in recipients])
+    assert num_outputs <= MAX_OUTPUTS_PER_TEST_CASE
+    out  = f"        {num_outputs},\n"
+    out += f"        {len(recipients)},\n"
+    out += "        { /* recipient pubkey entries (address data) */\n"
+    for i in range(MAX_RECIPIENT_ENTRIES_PER_TEST_CASE):
+        out += "            {\n"
+        if i < len(recipients):
+            # Use the scan_pubkey and spend_pubkey directly from the recipient
+            scan_pubkey = bytes.fromhex(recipients[i]['scan_pub_key'])
+            spend_pubkey = bytes.fromhex(recipients[i]['spend_pub_key'])
+
+            out += f"                {gen_byte_array(scan_pubkey.hex())},\n"
+            out += f"                {gen_byte_array(spend_pubkey.hex())},\n"
+            out += f"                {recipients[i].get('count', 1)},\n"
+        else:
+            out += '                "",\n'
+            out += '                "",\n'
+            out += '                0,\n'
+        out += "            },\n"
+    out += "        },\n"
+    return out
+
+def gen_sending_outputs(output_sets, comment=None, prepend_count=False):
+    assert len(output_sets) <= MAX_PERMUTATIONS_PER_SENDING_TEST_CASE
+    out = ""
+    if prepend_count:
+        out += f"        {len(output_sets)},\n"
+        out += f"        {len(output_sets[0])},\n"
+    out += f"        {{{maybe_gen_comment(comment)}\n"
+    for o in output_sets:
+        out += gen_outputs(outputs=o, prepend_count=False, indent=12)
+    if not output_sets:
+        out += gen_outputs(comment=None, outputs=[], prepend_count=False, indent=12)
+    out += "        },\n"
+    return out
+
+def gen_outputs(outputs, comment=None, prepend_count=False, indent=8):
+    out = ""
+    spaces = indent * " "
+    if prepend_count:
+        out += spaces + f"{len(outputs)},\n"
+    out += f"        {{{maybe_gen_comment(comment)}\n"
+    for o in outputs:
+        out += spaces + f"    {gen_byte_array(o)},\n"
+    if not outputs:
+        out += spaces + '    "",\n'
+    out += spaces + "},\n"
+    return out
+
+def gen_labels(labels):
+    assert len(labels) <= MAX_LABELS_PER_TEST_CASE
+    out = "        /* labels */\n"
+    out += f"        {len(labels)}, {{"
+    for i in range(MAX_LABELS_PER_TEST_CASE):
+        if i < len(labels):
+            out += f"{labels[i]}, "
+        else:
+            out += "0xffffffff, "
+    out += "},\n"
+    return out
+
+def gen_preamble(test_vectors):
+    out = "/* Note: this file was autogenerated using tests_silentpayments_generate.py. Do not edit. */\n"
+    out += f"""
+#include <stddef.h>
+
+#define MAX_INPUTS_PER_TEST_CASE  {MAX_INPUTS_PER_TEST_CASE}
+#define MAX_OUTPUTS_PER_TEST_CASE {MAX_OUTPUTS_PER_TEST_CASE}
+#define MAX_RECIPIENT_ENTRIES_PER_TEST_CASE {MAX_RECIPIENT_ENTRIES_PER_TEST_CASE}
+#define MAX_LABELS_PER_TEST_CASE  {MAX_LABELS_PER_TEST_CASE}
+#define MAX_PERMUTATIONS_PER_SENDING_TEST_CASE {MAX_PERMUTATIONS_PER_SENDING_TEST_CASE}
+#define MAX_RECEIVE_SUBTESTS {MAX_RECEIVE_SUBTESTS}
+
+struct bip352_recipient_addressdata {{
+    unsigned char scan_pubkey[33];
+    unsigned char spend_pubkey[33];
+    size_t count;
+}};
+
+struct bip352_receive_subtest {{
+    /* Given recipient data */
+    unsigned char scan_seckey[32];
+    unsigned char spend_seckey[32];
+    size_t num_to_scan_outputs;
+    unsigned char to_scan_outputs[MAX_OUTPUTS_PER_TEST_CASE][32];
+    size_t num_labels;
+    unsigned int label_integers[MAX_LABELS_PER_TEST_CASE];
+
+    /* Expected recipient data */
+    size_t full_check; /* 1..detailed check against tweaks and signatures, 0..only check found outputs count */
+    size_t num_found_output_pubkeys;
+    unsigned char found_output_pubkeys[MAX_OUTPUTS_PER_TEST_CASE][32];
+    unsigned char found_seckey_tweaks[MAX_OUTPUTS_PER_TEST_CASE][32];
+    unsigned char found_signatures[MAX_OUTPUTS_PER_TEST_CASE][64];
+}};
+
+struct bip352_test_vector {{
+    /* Inputs (private keys / public keys + smallest outpoint) */
+    size_t num_plain_inputs;
+    unsigned char plain_seckeys[MAX_INPUTS_PER_TEST_CASE][32];
+    unsigned char plain_pubkeys[MAX_INPUTS_PER_TEST_CASE][33];
+    size_t num_taproot_inputs;
+    unsigned char taproot_seckeys[MAX_INPUTS_PER_TEST_CASE][32];
+    unsigned char xonly_pubkeys[MAX_INPUTS_PER_TEST_CASE][32];
+    unsigned char outpoint_smallest[36];
+
+    /* Given sender data (pubkeys encoded per output address to send to) */
+    size_t num_outputs;
+    size_t num_recipient_entries;
+    struct bip352_recipient_addressdata recipient_pubkeys[MAX_RECIPIENT_ENTRIES_PER_TEST_CASE];
+
+    /* Expected sender data */
+    size_t num_output_sets;
+    size_t num_recipient_outputs;
+    unsigned char recipient_outputs[MAX_PERMUTATIONS_PER_SENDING_TEST_CASE][MAX_OUTPUTS_PER_TEST_CASE][32];
+
+    size_t num_receive_subtests;
+    struct bip352_receive_subtest receive_subtests[MAX_RECEIVE_SUBTESTS];
+}};
+"""
+    return out
+
+def gen_test_vectors(test_vectors):
+    out = f"#define SECP256K1_SILENTPAYMENTS_NUMBER_TESTVECTORS {len(test_vectors)}\n\n"
+    out += "static const struct bip352_test_vector bip352_test_vectors[SECP256K1_SILENTPAYMENTS_NUMBER_TESTVECTORS] = {\n"
+    for test_i, test_vector in enumerate(test_vectors):
+        # determine input private and public keys, grouped into plain and taproot/x-only
+        input_plain_seckeys = []
+        input_taproot_seckeys = []
+        input_plain_pubkeys = []
+        input_xonly_pubkeys = []
+        outpoints = []
+
+        # To keep this script simple and the generated test vectors file (vectors.h) small, we take
+        # use of the fact that currently all BIP352 test vectors only have a single sending subtest.
+        # If that ever changes in the future, the following assertion would fail and this script,
+        # its emitted data structures and the test code consuming the generated header would need to
+        # be extended, in a similar way to how it's already done for the receiving subtests.
+        assert len(test_vector['sending']) == 1
+
+        pubkey_index = 0
+        input_pubkeys_hex = test_vector['sending'][0]['expected']['input_pub_keys']
+
+        for vec in test_vector['sending'][0]['given']['vin']:
+            outpoints.append((vec['txid'], vec['vout']))
+
+            if pubkey_index < len(input_pubkeys_hex):
+                pubkey = get_pubkey_from_input(vec, input_pubkeys_hex[pubkey_index])
+                if len(pubkey) == 33:  # regular input
+                    input_plain_seckeys.append(vec['private_key'])
+                    input_plain_pubkeys.append(pubkey.hex())
+                    pubkey_index += 1
+                elif len(pubkey) == 32:  # taproot input
+                    input_taproot_seckeys.append(vec['private_key'])
+                    input_xonly_pubkeys.append(pubkey.hex())
+                    pubkey_index += 1
+                # len(pubkey) == 0, it's a NUMS_H input - skip without incrementing
+
+        out += f"    /* ----- {test_vector['comment']} ({test_i + 1}) ----- */\n"
+        out +=  "    {\n"
+
+        outpoint_L = smallest_outpoint(outpoints).hex()
+        out += gen_key_material(input_plain_seckeys, "input plain seckeys", prepend_count=True)
+        out += gen_key_material(input_plain_pubkeys, "input plain pubkeys")
+        out += gen_key_material(input_taproot_seckeys, "input taproot seckeys", prepend_count=True)
+        out += gen_key_material(input_xonly_pubkeys, "input x-only pubkeys")
+        out += "        /* smallest outpoint */\n"
+        out += f"        {gen_byte_array(outpoint_L)},\n"
+
+        # emit recipient pubkeys (address data)
+        out += gen_recipient_addr_material(test_vector['sending'][0]['given']['recipients'])
+        # emit recipient outputs
+        out += gen_sending_outputs(test_vector['sending'][0]['expected']['outputs'], "recipient outputs", prepend_count=True)
+
+        assert len(test_vector['receiving']) <= MAX_RECEIVE_SUBTESTS
+        out += f"        {len(test_vector['receiving'])}, /* number of receive subtests */\n"
+        out += "        {\n"
+        for recv_test in test_vector['receiving']:
+            out += "        {\n"
+            # emit recipient scan/spend seckeys
+            recv_test_given = recv_test['given']
+            recv_test_expected = recv_test['expected']
+            out += "        /* recipient data (scan and spend seckeys) */\n"
+            out += f"        {gen_byte_array(recv_test_given['key_material']['scan_priv_key'])},\n"
+            out += f"        {gen_byte_array(recv_test_given['key_material']['spend_priv_key'])},\n"
+
+            # emit recipient to-scan outputs, labels and expected-found outputs
+            out += gen_outputs(recv_test_given['outputs'], "outputs to scan", prepend_count=True)
+            out += gen_labels(recv_test_given['labels'])
+            full_check = 'outputs' in recv_test_expected
+            out += f"        {int(full_check)}, /* full check? */\n"
+            if full_check:
+                expected_pubkeys = [o['pub_key'] for o in recv_test_expected['outputs']]
+                expected_tweaks = [o['priv_key_tweak'] for o in recv_test_expected['outputs']]
+                expected_signatures = [o['signature'] for o in recv_test_expected['outputs']]
+                out += "        /* expected output data (pubkeys and seckey tweaks) */\n"
+            else:
+                expected_pubkeys = []
+                expected_tweaks = []
+                expected_signatures = []
+                out += "        /* expected number of outputs */\n"
+                out += f"        {recv_test_expected['n_outputs']},\n"
+
+            out += gen_outputs(expected_pubkeys, prepend_count=full_check)
+            out += gen_outputs(expected_tweaks)
+            out += gen_outputs(expected_signatures)
+            out += "        },\n"
+        for _ in range(len(test_vector['receiving']), MAX_RECEIVE_SUBTESTS):
+            out += '        { "", "", 0, {"",}, 0, {0,}, 0, 0, {"",}, {"",}, {"",} }, /* unused receive subtest entry */\n'
+        out += "        },\n"
+        out += "    },\n\n"
+    out += "};\n"
+    return out
+
+def main():
+    if len(sys.argv) != 2:
+        print(__doc__)
+        sys.exit(1)
+
+    filename_input = sys.argv[1]
+    with open(filename_input) as f:
+        test_vectors = json.load(f)
+
+    print(gen_preamble(test_vectors))
+    print(gen_test_vectors(test_vectors), end="")
+
+if __name__ == "__main__":
+    main()
diff --git a/depend/bitcoin/src/serialize.h b/depend/bitcoin/src/serialize.h
index 4c33311c..a1395c47 100644
--- a/depend/bitcoin/src/serialize.h
+++ b/depend/bitcoin/src/serialize.h
@@ -24,6 +24,7 @@
 #include <set>
 #include <span>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -31,10 +32,10 @@
  * The maximum size of a serialized object in bytes or number of elements
  * (for eg vectors) when the size is encoded as CompactSize.
  */
-static constexpr uint64_t MAX_SIZE = 0x02000000;
+inline constexpr uint64_t MAX_SIZE = 0x02000000;
 
 /** Maximum amount of memory (in bytes) to allocate at once when deserializing vectors. */
-static const unsigned int MAX_VECTOR_ALLOCATE = 5000000;
+inline constexpr unsigned int MAX_VECTOR_ALLOCATE{5'000'000};
 
 /**
  * Dummy data type to identify deserializing constructors.
@@ -48,7 +49,7 @@ static const unsigned int MAX_VECTOR_ALLOCATE = 5000000;
  * is likely the only way to do so.
  */
 struct deserialize_type {};
-constexpr deserialize_type deserialize {};
+inline constexpr deserialize_type deserialize {};
 
 /*
  * Lowest-level serialization and conversion.
@@ -493,6 +494,7 @@ static inline Wrapper<Formatter, T&> Using(T&& t) { return Wrapper<Formatter, T&
 #define VARINT(obj) Using<VarIntFormatter<VarIntMode::DEFAULT>>(obj)
 #define COMPACTSIZE(obj) Using<CompactSizeFormatter<true>>(obj)
 #define LIMITED_STRING(obj,n) Using<LimitedStringFormatter<n>>(obj)
+#define LIMITED_VECTOR(obj,n) Using<LimitedVectorFormatter<n>>(obj)
 
 /** Serialization wrapper class for integers in VarInt format. */
 template<VarIntMode Mode>
@@ -600,6 +602,19 @@ struct ChronoFormatter {
 template <typename U>
 using LossyChronoFormatter = ChronoFormatter<U, true>;
 
+class CompactSizeReader
+{
+protected:
+    uint64_t& n;
+public:
+    explicit CompactSizeReader(uint64_t& n_in) : n(n_in) {}
+
+    template<typename Stream>
+    void Unserialize(Stream &s) const {
+        n = ReadCompactSize<Stream>(s);
+    }
+};
+
 class CompactSizeWriter
 {
 protected:
@@ -692,6 +707,12 @@ struct VectorFormatter
 template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str);
 template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str);
 
+/**
+ *  string_view
+ */
+template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string_view<C>& str);
+template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string_view<C>& str) = delete;
+
 /**
  * prevector
  */
@@ -770,6 +791,35 @@ struct DefaultFormatter
     static void Unser(Stream& s, T& t) { Unserialize(s, t); }
 };
 
+/**
+ * Limited vector formatter. Throws an error if a vector is oversized.
+ */
+
+template<size_t Limit, class Formatter = DefaultFormatter>
+struct LimitedVectorFormatter
+{
+    template<typename Stream, typename V>
+    void Unser(Stream& s, V& v)
+    {
+        Formatter formatter;
+        v.clear();
+        size_t size = ReadCompactSize(s);
+        if (size > Limit) {
+            throw std::ios_base::failure("Vector length limit exceeded");
+        }
+        v.reserve(size);
+        for (size_t i = 0; i < size; ++i) {
+            v.emplace_back();
+            formatter.Unser(s, v.back());
+        }
+    }
+
+    template<typename Stream, typename V>
+    void Ser(Stream& s, const V& v)
+    {
+        VectorFormatter<Formatter>{}.Ser(s, v);
+    }
+};
 
 
 
@@ -794,7 +844,17 @@ void Unserialize(Stream& is, std::basic_string<C>& str)
         is.read(MakeWritableByteSpan(str));
 }
 
-
+/**
+ * string_view
+ */
+template<typename Stream, typename C>
+void Serialize(Stream& os, const std::basic_string_view<C>& str)
+{
+    WriteCompactSize(os, str.size());
+    if (!str.empty()) {
+        os.write(MakeByteSpan(str));
+    }
+}
 
 /**
  * prevector
diff --git a/depend/bitcoin/src/signet.cpp b/depend/bitcoin/src/signet.cpp
index d0f8aa28..9206f477 100644
--- a/depend/bitcoin/src/signet.cpp
+++ b/depend/bitcoin/src/signet.cpp
@@ -11,9 +11,9 @@
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/verify_flags.h>
 #include <streams.h>
 #include <uint256.h>
-#include <util/check.h>
 #include <util/log.h>
 
 #include <algorithm>
diff --git a/depend/bitcoin/src/streams.h b/depend/bitcoin/src/streams.h
index 96cea55e..e939dd18 100644
--- a/depend/bitcoin/src/streams.h
+++ b/depend/bitcoin/src/streams.h
@@ -265,6 +265,20 @@ class DataStream
     size_t GetMemoryUsage() const noexcept;
 };
 
+// Require empty scratch streams on entry and reset them on exit.
+class ScopedDataStreamUsage
+{
+    DataStream& m_stream;
+
+public:
+    explicit ScopedDataStreamUsage(DataStream& stream) : m_stream{stream} { assert(m_stream.empty()); }
+
+    ScopedDataStreamUsage(const ScopedDataStreamUsage&) = delete;
+    ScopedDataStreamUsage& operator=(const ScopedDataStreamUsage&) = delete;
+
+    ~ScopedDataStreamUsage() { m_stream.clear(); }
+};
+
 template <typename IStream>
 class BitStreamReader
 {
diff --git a/depend/bitcoin/src/support/events.h b/depend/bitcoin/src/support/events.h
deleted file mode 100644
index f89daf6d..00000000
--- a/depend/bitcoin/src/support/events.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2016-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.
-
-#ifndef BITCOIN_SUPPORT_EVENTS_H
-#define BITCOIN_SUPPORT_EVENTS_H
-
-#include <ios>
-#include <memory>
-
-#include <event2/event.h>
-#include <event2/http.h>
-
-#define MAKE_RAII(type) \
-/* deleter */\
-struct type##_deleter {\
-    void operator()(struct type* ob) {\
-        type##_free(ob);\
-    }\
-};\
-/* unique ptr typedef */\
-typedef std::unique_ptr<struct type, type##_deleter> raii_##type
-
-MAKE_RAII(event_base);
-MAKE_RAII(event);
-MAKE_RAII(evhttp);
-MAKE_RAII(evhttp_request);
-MAKE_RAII(evhttp_connection);
-
-inline raii_event_base obtain_event_base() {
-    auto result = raii_event_base(event_base_new());
-    if (!result.get())
-        throw std::runtime_error("cannot create event_base");
-    return result;
-}
-
-inline raii_event obtain_event(struct event_base* base, evutil_socket_t s, short events, event_callback_fn cb, void* arg) {
-    return raii_event(event_new(base, s, events, cb, arg));
-}
-
-inline raii_evhttp obtain_evhttp(struct event_base* base) {
-    return raii_evhttp(evhttp_new(base));
-}
-
-inline raii_evhttp_request obtain_evhttp_request(void(*cb)(struct evhttp_request *, void *), void *arg) {
-    return raii_evhttp_request(evhttp_request_new(cb, arg));
-}
-
-inline raii_evhttp_connection obtain_evhttp_connection_base(struct event_base* base, std::string host, uint16_t port) {
-    auto result = raii_evhttp_connection(evhttp_connection_base_new(base, nullptr, host.c_str(), port));
-    if (!result.get())
-        throw std::runtime_error("create connection failed");
-    return result;
-}
-
-#endif // BITCOIN_SUPPORT_EVENTS_H
diff --git a/depend/bitcoin/src/support/lockedpool.cpp b/depend/bitcoin/src/support/lockedpool.cpp
index ff3a9e69..97f0df40 100644
--- a/depend/bitcoin/src/support/lockedpool.cpp
+++ b/depend/bitcoin/src/support/lockedpool.cpp
@@ -262,7 +262,8 @@ size_t PosixLockedPageAllocator::GetLimit()
 #ifdef RLIMIT_MEMLOCK
     struct rlimit rlim;
     if (getrlimit(RLIMIT_MEMLOCK, &rlim) == 0) {
-        if (rlim.rlim_cur != RLIM_INFINITY) {
+        if (rlim.rlim_cur != RLIM_INFINITY &&
+            std::cmp_less_equal(rlim.rlim_cur, static_cast<rlim_t>(std::numeric_limits<size_t>::max()))) {
             return rlim.rlim_cur;
         }
     }
diff --git a/depend/bitcoin/src/support/lockedpool.h b/depend/bitcoin/src/support/lockedpool.h
index c4966bbb..dd3c9d41 100644
--- a/depend/bitcoin/src/support/lockedpool.h
+++ b/depend/bitcoin/src/support/lockedpool.h
@@ -131,11 +131,11 @@ class LockedPool
      * allocation and deallocation overhead. Setting it too high allocates
      * more locked memory from the OS than strictly necessary.
      */
-    static const size_t ARENA_SIZE = 256*1024;
+    static constexpr size_t ARENA_SIZE{256*1024};
     /** Chunk alignment. Another compromise. Setting this too high will waste
      * memory, setting it too low will facilitate fragmentation.
      */
-    static const size_t ARENA_ALIGN = 16;
+    static constexpr size_t ARENA_ALIGN{16};
 
     /** Callback when allocation succeeds but locking fails.
      */
diff --git a/depend/bitcoin/src/sync.h b/depend/bitcoin/src/sync.h
index 123184d4..28bc78e9 100644
--- a/depend/bitcoin/src/sync.h
+++ b/depend/bitcoin/src/sync.h
@@ -251,7 +251,7 @@ class SCOPED_LOCKABLE UniqueLock : public MutexType::unique_lock
 // it is not possible to use the lock's copy of the mutex for that purpose.
 // Instead, the original mutex needs to be passed back to the reverse_lock for
 // the sake of thread-safety analysis, but it is not actually used otherwise.
-#define REVERSE_LOCK(g, cs) typename std::decay<decltype(g)>::type::reverse_lock UNIQUE_NAME(revlock)(g, cs, #cs, __FILE__, __LINE__)
+#define REVERSE_LOCK(g, cs) typename std::decay<decltype(g)>::type::reverse_lock BITCOIN_UNIQUE_NAME(revlock)(g, cs, #cs, __FILE__, __LINE__)
 
 // When locking a Mutex, require negative capability to ensure the lock
 // is not already held
@@ -265,7 +265,7 @@ inline MutexType& MaybeCheckNotHeld(MutexType& m) LOCKS_EXCLUDED(m) LOCK_RETURNE
 template <typename MutexType>
 inline MutexType* MaybeCheckNotHeld(MutexType* m) LOCKS_EXCLUDED(m) LOCK_RETURNED(m) { return m; }
 
-#define LOCK(cs) UniqueLock UNIQUE_NAME(criticalblock)(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__)
+#define LOCK(cs) UniqueLock BITCOIN_UNIQUE_NAME(criticalblock)(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__)
 #define LOCK2(cs1, cs2)                                               \
     UniqueLock criticalblock1(MaybeCheckNotHeld(cs1), #cs1, __FILE__, __LINE__); \
     UniqueLock criticalblock2(MaybeCheckNotHeld(cs2), #cs2, __FILE__, __LINE__)
diff --git a/depend/bitcoin/src/test/CMakeLists.txt b/depend/bitcoin/src/test/CMakeLists.txt
index 1365d6c1..5c614ab3 100644
--- a/depend/bitcoin/src/test/CMakeLists.txt
+++ b/depend/bitcoin/src/test/CMakeLists.txt
@@ -15,6 +15,7 @@ add_executable(test_bitcoin
   base32_tests.cpp
   base58_tests.cpp
   base64_tests.cpp
+  baseindex_tests.cpp
   bech32_tests.cpp
   bip32_tests.cpp
   bip324_tests.cpp
@@ -63,7 +64,6 @@ add_executable(test_bitcoin
   miniminer_tests.cpp
   miniscript_tests.cpp
   minisketch_tests.cpp
-  mock_process.cpp
   multisig_tests.cpp
   bip328_tests.cpp
   net_peer_connection_tests.cpp
@@ -81,7 +81,7 @@ add_executable(test_bitcoin
   pow_tests.cpp
   prevector_tests.cpp
   private_broadcast_tests.cpp
-  raii_event_tests.cpp
+  psbt_tests.cpp
   random_tests.cpp
   rbf_tests.cpp
   rest_tests.cpp
@@ -149,6 +149,7 @@ target_json_data_sources(test_bitcoin
   data/key_io_valid.json
   data/script_tests.json
   data/sighash.json
+  data/siphash.json
   data/tx_invalid.json
   data/tx_valid.json
 )
@@ -167,18 +168,9 @@ target_link_libraries(test_bitcoin
   minisketch
   secp256k1
   Boost::headers
-  libevent::extra
   $<TARGET_NAME_IF_EXISTS:USDT::headers>
 )
 
-if(ENABLE_WALLET)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/src/wallet/test wallet)
-endif()
-
-if(ENABLE_IPC)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/src/ipc/test ipc)
-endif()
-
 function(add_boost_test source_file)
   if(NOT EXISTS ${source_file})
     return()
@@ -192,8 +184,6 @@ function(add_boost_test source_file)
   list(TRANSFORM test_suite_macro
     REPLACE "(BOOST_FIXTURE_TEST_SUITE|BOOST_AUTO_TEST_SUITE)\\(" ""
   )
-  # The mock_process test suite does not contain unit tests.
-  list(REMOVE_ITEM test_suite_macro "mock_process")
   foreach(test_suite_name IN LISTS test_suite_macro)
     add_test(NAME ${test_suite_name}
       COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no --log_level=test_suite -- -printtoconsole=1
@@ -202,7 +192,6 @@ function(add_boost_test source_file)
       SKIP_REGULAR_EXPRESSION
         "no test cases matching filter"
         "skipping script_assets_test"
-        "skipping total_ram"
     )
   endforeach()
 endfunction()
@@ -219,6 +208,14 @@ function(add_all_test_targets)
   endforeach()
 endfunction()
 
+if(ENABLE_WALLET)
+  add_subdirectory(${PROJECT_SOURCE_DIR}/src/wallet/test wallet)
+endif()
+
+if(ENABLE_IPC)
+  add_subdirectory(${PROJECT_SOURCE_DIR}/src/ipc/test ipc)
+endif()
+
 add_all_test_targets()
 
 install_binary_component(test_bitcoin INTERNAL)
diff --git a/depend/bitcoin/src/test/addrman_tests.cpp b/depend/bitcoin/src/test/addrman_tests.cpp
index cd1c651a..0348a87f 100644
--- a/depend/bitcoin/src/test/addrman_tests.cpp
+++ b/depend/bitcoin/src/test/addrman_tests.cpp
@@ -9,6 +9,7 @@
 #include <clientversion.h>
 #include <hash.h>
 #include <netbase.h>
+#include <netgroup.h>
 #include <random.h>
 #include <test/data/asmap.raw.h>
 #include <test/util/setup_common.h>
@@ -97,8 +98,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
 
 BOOST_AUTO_TEST_CASE(addrman_terrible_many_failures)
 {
-    auto now = Now<NodeSeconds>();
-    SetMockTime(now - (ADDRMAN_MIN_FAIL + 24h));
+    FakeNodeClock clock{};
 
     auto addrman{std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node))};
 
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(addrman_terrible_many_failures)
     BOOST_CHECK(addrman->Add({addr}, source));
     BOOST_CHECK(addrman->Good(addr));
 
-    SetMockTime(now);
+    clock += ADDRMAN_MIN_FAIL + 24h;
 
     CAddress addr_helper{CAddress(ResolveService("251.252.2.3", 8333), NODE_NONE)};
     addr_helper.nTime = Now<NodeSeconds>();
@@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE(addrman_terrible_many_failures)
 
 BOOST_AUTO_TEST_CASE(addrman_penalty_self_announcement)
 {
-    SetMockTime(Now<NodeSeconds>());
+    FakeNodeClock clock{};
     auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
 
     const auto base_time{Now<NodeSeconds>() - 10000s};
@@ -1031,8 +1031,8 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
     BOOST_CHECK_EQUAL(addrman->SelectTriedCollision().first.ToStringAddrPort(), "250.1.1.36:0");
 
     // Eviction is also successful if too much time has passed since last try
-    NodeClockContext clock_ctx{};
-    clock_ctx += 4h;
+    FakeNodeClock clock{};
+    clock += 4h;
     addrman->ResolveCollisions();
     BOOST_CHECK(addrman->SelectTriedCollision().first.ToStringAddrPort() == "[::]:0");
     //Now 19 is in tried again, and 36 back to new
diff --git a/depend/bitcoin/src/test/amount_tests.cpp b/depend/bitcoin/src/test/amount_tests.cpp
index e1630b41..0a273a21 100644
--- a/depend/bitcoin/src/test/amount_tests.cpp
+++ b/depend/bitcoin/src/test/amount_tests.cpp
@@ -81,11 +81,15 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     // Previously, precision was limited to three decimal digits
     // due to only supporting satoshis per kB, so CFeeRate(CAmount(1), 1001) was equal to CFeeRate(0)
     // Since #32750, higher precision is maintained.
-    BOOST_CHECK(CFeeRate(CAmount(1), 1001) > CFeeRate(0) && CFeeRate(CAmount(1), 1001) < CFeeRate(1));
-    BOOST_CHECK(CFeeRate(CAmount(2), 1001) > CFeeRate(1) && CFeeRate(CAmount(2), 1001) < CFeeRate(2));
+    BOOST_CHECK(CFeeRate(CAmount(1), 1001) > CFeeRate(0));
+    BOOST_CHECK(CFeeRate(CAmount(1), 1001) < CFeeRate(1));
+    BOOST_CHECK(CFeeRate(CAmount(2), 1001) > CFeeRate(1));
+    BOOST_CHECK(CFeeRate(CAmount(2), 1001) < CFeeRate(2));
     // some more integer checks
-    BOOST_CHECK(CFeeRate(CAmount(26), 789) > CFeeRate(32) && CFeeRate(CAmount(26), 789) < CFeeRate(33));
-    BOOST_CHECK(CFeeRate(CAmount(27), 789) > CFeeRate(34) && CFeeRate(CAmount(27), 789) < CFeeRate(35));
+    BOOST_CHECK(CFeeRate(CAmount(26), 789) > CFeeRate(32));
+    BOOST_CHECK(CFeeRate(CAmount(26), 789) < CFeeRate(33));
+    BOOST_CHECK(CFeeRate(CAmount(27), 789) > CFeeRate(34));
+    BOOST_CHECK(CFeeRate(CAmount(27), 789) < CFeeRate(35));
     // Maximum size in bytes, should not crash
     CFeeRate(MAX_MONEY, std::numeric_limits<int32_t>::max()).GetFeePerK();
 
diff --git a/depend/bitcoin/src/test/argsman_tests.cpp b/depend/bitcoin/src/test/argsman_tests.cpp
index c8802d36..d6175aef 100644
--- a/depend/bitcoin/src/test/argsman_tests.cpp
+++ b/depend/bitcoin/src/test/argsman_tests.cpp
@@ -204,24 +204,33 @@ BOOST_AUTO_TEST_CASE(util_ParseParameters)
     testArgs.SetupArgs({a, b, ccc, d});
     BOOST_CHECK(testArgs.ParseParameters(0, argv_test, error));
     testArgs.LockSettings([&](const common::Settings& s) {
-        BOOST_CHECK(s.command_line_options.empty() && s.ro_config.empty());
+        BOOST_CHECK(s.command_line_options.empty());
+        BOOST_CHECK(s.ro_config.empty());
     });
 
     BOOST_CHECK(testArgs.ParseParameters(1, argv_test, error));
     testArgs.LockSettings([&](const common::Settings& s) {
-        BOOST_CHECK(s.command_line_options.empty() && s.ro_config.empty());
+        BOOST_CHECK(s.command_line_options.empty());
+        BOOST_CHECK(s.ro_config.empty());
     });
 
     BOOST_CHECK(testArgs.ParseParameters(7, argv_test, error));
     // expectation: -ignored is ignored (program name argument),
     // -a, -b and -ccc end up in map, -d ignored because it is after
     // a non-option argument (non-GNU option parsing)
-    BOOST_CHECK(testArgs.IsArgSet("-a") && testArgs.IsArgSet("-b") && testArgs.IsArgSet("-ccc")
-                && !testArgs.IsArgSet("f") && !testArgs.IsArgSet("-d"));
+    BOOST_CHECK(testArgs.IsArgSet("-a"));
+    BOOST_CHECK(testArgs.IsArgSet("-b"));
+    BOOST_CHECK(testArgs.IsArgSet("-ccc"));
+    BOOST_CHECK(!testArgs.IsArgSet("f"));
+    BOOST_CHECK(!testArgs.IsArgSet("-d"));
     testArgs.LockSettings([&](const common::Settings& s) {
-        BOOST_CHECK(s.command_line_options.size() == 3 && s.ro_config.empty());
-        BOOST_CHECK(s.command_line_options.contains("a") && s.command_line_options.contains("b") && s.command_line_options.contains("ccc")
-                    && !s.command_line_options.contains("f") && !s.command_line_options.contains("d"));
+        BOOST_CHECK(s.command_line_options.size() == 3);
+        BOOST_CHECK(s.ro_config.empty());
+        BOOST_CHECK(s.command_line_options.contains("a"));
+        BOOST_CHECK(s.command_line_options.contains("b"));
+        BOOST_CHECK(s.command_line_options.contains("ccc"));
+        BOOST_CHECK(!s.command_line_options.contains("f"));
+        BOOST_CHECK(!s.command_line_options.contains("d"));
 
         BOOST_CHECK(s.command_line_options.at("a").size() == 1);
         BOOST_CHECK(s.command_line_options.at("a").front().get_str() == "");
@@ -329,7 +338,8 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArg)
 
     // Nothing else should be in the map
     testArgs.LockSettings([&](const common::Settings& s) {
-        BOOST_CHECK(s.command_line_options.size() == 6 && s.ro_config.empty());
+        BOOST_CHECK(s.command_line_options.size() == 6);
+        BOOST_CHECK(s.ro_config.empty());
     });
 
     // The -no prefix should get stripped on the way in.
@@ -397,8 +407,8 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArgEdgeCases)
     // Command line overrides, but doesn't erase old setting
     BOOST_CHECK(!testArgs.IsArgNegated("-bar"));
     BOOST_CHECK(testArgs.GetArg("-bar", "xxx") == "");
-    BOOST_CHECK(testArgs.GetArgs("-bar").size() == 1
-                && testArgs.GetArgs("-bar").front() == "");
+    BOOST_REQUIRE(testArgs.GetArgs("-bar").size() == 1);
+    BOOST_CHECK(testArgs.GetArgs("-bar").front() == "");
 }
 
 BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
@@ -498,22 +508,22 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
         BOOST_CHECK(test_args.GetBoolArg("-iii", def) == def);
     }
 
-    BOOST_CHECK(test_args.GetArgs("-a").size() == 1
-                && test_args.GetArgs("-a").front() == "");
-    BOOST_CHECK(test_args.GetArgs("-b").size() == 1
-                && test_args.GetArgs("-b").front() == "1");
-    BOOST_CHECK(test_args.GetArgs("-ccc").size() == 2
-                && test_args.GetArgs("-ccc").front() == "argument"
-                && test_args.GetArgs("-ccc").back() == "multiple");
+    BOOST_REQUIRE(test_args.GetArgs("-a").size() == 1);
+    BOOST_CHECK(test_args.GetArgs("-a").front() == "");
+    BOOST_REQUIRE(test_args.GetArgs("-b").size() == 1);
+    BOOST_CHECK(test_args.GetArgs("-b").front() == "1");
+    BOOST_REQUIRE(test_args.GetArgs("-ccc").size() == 2);
+    BOOST_CHECK(test_args.GetArgs("-ccc").front() == "argument");
+    BOOST_CHECK(test_args.GetArgs("-ccc").back() == "multiple");
     BOOST_CHECK(test_args.GetArgs("-fff").size() == 0);
     BOOST_CHECK(test_args.GetArgs("-nofff").size() == 0);
-    BOOST_CHECK(test_args.GetArgs("-ggg").size() == 1
-                && test_args.GetArgs("-ggg").front() == "1");
+    BOOST_REQUIRE(test_args.GetArgs("-ggg").size() == 1);
+    BOOST_CHECK(test_args.GetArgs("-ggg").front() == "1");
     BOOST_CHECK(test_args.GetArgs("-noggg").size() == 0);
     BOOST_CHECK(test_args.GetArgs("-h").size() == 0);
     BOOST_CHECK(test_args.GetArgs("-noh").size() == 0);
-    BOOST_CHECK(test_args.GetArgs("-i").size() == 1
-                && test_args.GetArgs("-i").front() == "1");
+    BOOST_REQUIRE(test_args.GetArgs("-i").size() == 1);
+    BOOST_CHECK(test_args.GetArgs("-i").front() == "1");
     BOOST_CHECK(test_args.GetArgs("-noi").size() == 0);
     BOOST_CHECK(test_args.GetArgs("-zzz").size() == 0);
 
@@ -634,6 +644,82 @@ BOOST_AUTO_TEST_CASE(util_GetArg)
     BOOST_CHECK_EQUAL(testArgs.GetArg("pritest4", "default"), "b");
 }
 
+BOOST_AUTO_TEST_CASE(util_AddCommand)
+{
+    enum TestFail { SUCCESS,
+                    PARSE_FAIL,
+                    PARSE_ERROR,
+                    NO_COMMAND,
+                    COMMAND_OPTS_BAD_DETAILS,
+                    COMMAND_OPTS };
+
+    auto testfn = [&](const auto& argv) -> TestFail {
+        TestArgsManager test_args;
+        test_args.AddArg("-opt1=<file name>", "Opt 1", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::COMMAND_OPTIONS);
+        test_args.AddArg("-opt2=<file name>", "Opt 2", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::COMMAND_OPTIONS);
+        test_args.AddArg("-opt3=<file name>", "Opt 3", ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS);
+
+        test_args.AddCommand("cmd1", "No specific options");
+        test_args.AddCommand("cmd2", "Opt 1", {"-opt1"});
+        test_args.AddCommand("cmd3", "Opt 1 or 2", {"-opt1", "-opt2"});
+
+        std::string error;
+        if (!test_args.ParseParameters(argv.size(), argv.data(), error)) return PARSE_FAIL;
+        if (!error.empty()) return PARSE_ERROR;
+        const auto command = test_args.GetCommand();
+        if (!command) return NO_COMMAND;
+        std::vector<std::string> details;
+        if (!test_args.CheckCommandOptions(command->command, &details)) {
+            if (details.empty()) return COMMAND_OPTS_BAD_DETAILS;
+            return COMMAND_OPTS;
+        } else if (!details.empty()) {
+            return COMMAND_OPTS_BAD_DETAILS;
+        }
+        return SUCCESS;
+    };
+
+    BOOST_CHECK_EQUAL(COMMAND_OPTS, testfn(std::array{"x", "-opt1=foo", "cmd1"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "cmd1", "-opt1=foo"})); // things after the command are "args" and left unparsed, not options
+
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt1=foo", "cmd2"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt1=foo", "cmd3"}));
+    BOOST_CHECK_EQUAL(COMMAND_OPTS, testfn(std::array{"x", "-opt2=foo", "cmd1"}));
+    BOOST_CHECK_EQUAL(COMMAND_OPTS, testfn(std::array{"x", "-opt2=foo", "cmd2"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt2=foo", "cmd3"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt3=foo", "cmd1"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt3=foo", "cmd2"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt3=foo", "cmd3"}));
+
+    BOOST_CHECK_EQUAL(COMMAND_OPTS, testfn(std::array{"x", "-opt1=foo", "-opt3=bar", "-opt2=baz", "cmd1"}));
+    BOOST_CHECK_EQUAL(COMMAND_OPTS, testfn(std::array{"x", "-opt1=foo", "-opt3=bar", "-opt2=baz", "cmd2"}));
+    BOOST_CHECK_EQUAL(SUCCESS, testfn(std::array{"x", "-opt1=foo", "-opt3=bar", "-opt2=baz", "cmd3"}));
+
+    BOOST_CHECK_EQUAL(PARSE_FAIL, testfn(std::array{"x", "cmd4"}));
+    BOOST_CHECK_EQUAL(NO_COMMAND, testfn(std::array{"x", "-opt3=foo"}));
+    BOOST_CHECK_EQUAL(PARSE_FAIL, testfn(std::array{"x", "-opt4=foo"}));
+}
+
+BOOST_AUTO_TEST_CASE(util_AddCommand_clearargs_replaces_command_options)
+{
+    const auto add_command{[&](TestArgsManager& test_args, const std::string& option) {
+            test_args.AddArg(option, "option", ArgsManager::ALLOW_ANY, OptionsCategory::COMMAND_OPTIONS);
+            test_args.AddCommand("cmd", "cmd", {option});
+    }};
+
+    TestArgsManager test_args;
+    add_command(test_args, "-opt1");
+    test_args.ClearArgs();
+    add_command(test_args, "-opt2");
+
+    const auto help{test_args.GetHelpMessage()};
+    BOOST_CHECK(help.find("-opt2") != std::string::npos);
+
+    test_args.ForceSetArg("-opt2", "1");
+    std::vector<std::string> details;
+    BOOST_CHECK(test_args.CheckCommandOptions("cmd", &details));
+    BOOST_CHECK(details.empty());
+}
+
 BOOST_AUTO_TEST_CASE(util_GetChainTypeString)
 {
     TestArgsManager test_args;
diff --git a/depend/bitcoin/src/test/arith_uint256_tests.cpp b/depend/bitcoin/src/test/arith_uint256_tests.cpp
index 016b4658..89e38b85 100644
--- a/depend/bitcoin/src/test/arith_uint256_tests.cpp
+++ b/depend/bitcoin/src/test/arith_uint256_tests.cpp
@@ -267,8 +267,14 @@ BOOST_AUTO_TEST_CASE( comparison ) // <= >= < >
     arith_uint256 TmpL;
     for (unsigned int i = 0; i < 256; ++i) {
         TmpL= OneL<< i;
-        BOOST_CHECK( TmpL >= ZeroL && TmpL > ZeroL && ZeroL < TmpL && ZeroL <= TmpL);
-        BOOST_CHECK( TmpL >= 0 && TmpL > 0 && 0 < TmpL && 0 <= TmpL);
+        BOOST_CHECK(TmpL >= ZeroL);
+        BOOST_CHECK(TmpL > ZeroL);
+        BOOST_CHECK(ZeroL < TmpL);
+        BOOST_CHECK(ZeroL <= TmpL);
+        BOOST_CHECK(TmpL >= 0);
+        BOOST_CHECK(TmpL > 0);
+        BOOST_CHECK(0 < TmpL);
+        BOOST_CHECK(0 <= TmpL);
         TmpL |= R1L;
         BOOST_CHECK( TmpL >= R1L ); BOOST_CHECK( (TmpL == R1L) != (TmpL > R1L)); BOOST_CHECK( (TmpL == R1L) || !( TmpL <= R1L));
         BOOST_CHECK( R1L <= TmpL ); BOOST_CHECK( (R1L == TmpL) != (R1L < TmpL)); BOOST_CHECK( (TmpL == R1L) || !( R1L >= TmpL));
diff --git a/depend/bitcoin/src/test/banman_tests.cpp b/depend/bitcoin/src/test/banman_tests.cpp
index d1e79e35..a2053896 100644
--- a/depend/bitcoin/src/test/banman_tests.cpp
+++ b/depend/bitcoin/src/test/banman_tests.cpp
@@ -17,7 +17,7 @@ BOOST_FIXTURE_TEST_SUITE(banman_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(file)
 {
-    NodeClockContext clock_ctx{777s};
+    FakeNodeClock clock{777s};
     const fs::path banlist_path{m_args.GetDataDirBase() / "banlist_test"};
     {
         const std::string entries_write{
diff --git a/depend/bitcoin/src/test/base58_tests.cpp b/depend/bitcoin/src/test/base58_tests.cpp
index 35b8ea46..411d71fb 100644
--- a/depend/bitcoin/src/test/base58_tests.cpp
+++ b/depend/bitcoin/src/test/base58_tests.cpp
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
         std::vector<unsigned char> expected = ParseHex(test[0].get_str());
         std::string base58string = test[1].get_str();
         BOOST_CHECK_MESSAGE(DecodeBase58(base58string, result, 256), strTest);
-        BOOST_CHECK_MESSAGE(result.size() == expected.size() && std::equal(result.begin(), result.end(), expected.begin()), strTest);
+        BOOST_CHECK_MESSAGE(std::ranges::equal(result ,expected), strTest);
     }
 
     BOOST_CHECK(!DecodeBase58("invalid"s, result, 100));
diff --git a/depend/bitcoin/src/test/baseindex_tests.cpp b/depend/bitcoin/src/test/baseindex_tests.cpp
new file mode 100644
index 00000000..553b07ee
--- /dev/null
+++ b/depend/bitcoin/src/test/baseindex_tests.cpp
@@ -0,0 +1,228 @@
+// Copyright (c) 2020-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.
+
+#include <addresstype.h>
+#include <blockfilter.h>
+#include <chain.h>
+#include <chainparams.h>
+#include <coins.h>
+#include <common/args.h>
+#include <consensus/validation.h>
+#include <index/base.h>
+#include <index/blockfilterindex.h>
+#include <index/coinstatsindex.h>
+#include <index/txindex.h>
+#include <index/txospenderindex.h>
+#include <interfaces/chain.h>
+#include <kernel/types.h>
+#include <key.h>
+#include <node/context.h>
+#include <primitives/block.h>
+#include <script/script.h>
+#include <sync.h>
+#include <test/util/mining.h>
+#include <test/util/setup_common.h>
+#include <test/util/time.h>
+#include <test/util/validation.h>
+#include <tinyformat.h>
+#include <util/byte_units.h>
+#include <util/check.h>
+#include <util/fs.h>
+#include <validation.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <chrono>
+#include <functional>
+#include <future>
+#include <memory>
+#include <string>
+#include <thread>
+#include <utility>
+#include <vector>
+
+using kernel::ChainstateRole;
+
+using IndexFactory = std::function<std::unique_ptr<BaseIndex>(node::NodeContext&)>;
+
+static const std::vector<std::pair<std::string, IndexFactory>> INDEX_FACTORIES{
+    {"coinstatsindex", [](node::NodeContext& node) -> std::unique_ptr<BaseIndex> {
+        return std::make_unique<CoinStatsIndex>(interfaces::MakeChain(node), /*n_cache_size=*/1_MiB); }},
+    {"txindex", [](node::NodeContext& node) -> std::unique_ptr<BaseIndex> {
+        return std::make_unique<TxIndex>(interfaces::MakeChain(node), /*n_cache_size=*/1_MiB); }},
+    {"txospenderindex", [](node::NodeContext& node) -> std::unique_ptr<BaseIndex> {
+        return std::make_unique<TxoSpenderIndex>(interfaces::MakeChain(node), /*n_cache_size=*/1_MiB); }},
+    {"blockfilterindex", [](node::NodeContext& node) -> std::unique_ptr<BaseIndex> {
+        return std::make_unique<BlockFilterIndex>(interfaces::MakeChain(node), BlockFilterType::BASIC, /*n_cache_size=*/1_MiB); }},
+};
+
+// Tests of generic BaseIndex functionality that is independent of which
+// concrete index is being used.
+BOOST_AUTO_TEST_SUITE(baseindex_tests)
+
+// Test that the index does not commit ahead of the chainstate's last
+// flushed block. If it did, a subsequent unclean shutdown would corrupt
+// the index, because during reverting it would require blocks that were
+// never flushed to disk.
+BOOST_FIXTURE_TEST_CASE(baseindex_no_commit_ahead_of_flush, TestChain100Setup)
+{
+    Chainstate& chainstate = Assert(m_node.chainman)->ActiveChainstate();
+    for (const auto& [index_name, make_index] : INDEX_FACTORIES) {
+        BOOST_TEST_INFO_SCOPE(index_name);
+        const int tip_height{WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->nHeight)};
+        auto sync_index = [&](bool do_flush, int expected_sync_height, int expected_commit_height) {
+            auto index{make_index(m_node)};
+            BOOST_REQUIRE(index->Init());
+            index->Sync();
+            if (do_flush) {
+                chainstate.ForceFlushStateToDisk();
+                m_node.chain->context()->validation_signals->SyncWithValidationInterfaceQueue();
+            }
+            BOOST_CHECK_EQUAL(index->GetSummary().best_block_height, expected_sync_height);
+            index->Stop();
+            // Reload index to see which block data was actually committed.
+            BOOST_REQUIRE(index->Init());
+            BOOST_CHECK_EQUAL(index->GetSummary().best_block_height, expected_commit_height);
+            index->Stop();
+        };
+
+        // Part 1: Sync, then "crash" (stop without flushing). Models a node that
+        // started up, had its index catch up, but never flushed before going down.
+        // The end-of-sync Commit() runs at the chain tip but m_last_flushed_block
+        // is null, so it is skipped.
+        sync_index(false, tip_height, 0);
+
+        // Part 2: Restart cleanly. Sync, force a chainstate flush, and drain the
+        // validation queue so the index's ChainStateFlushed callback runs.
+        // Now m_last_flushed_block == tip and the index can commit.
+        sync_index(true, tip_height, tip_height);
+
+        // Part 3: Connect a new block on the chain without flushing
+        // (m_last_flushed_block stays at tip_height). For a real node this would
+        // happen in parallel with Sync(). Here we do it before Sync() to make the
+        // race state deterministic.
+        CreateAndProcessBlock({}, CScript() << OP_TRUE);
+        sync_index(false, tip_height + 1, tip_height);
+    }
+}
+
+// Test shutdown between BlockConnected and ChainStateFlushed notifications,
+// make sure index is not corrupted and is able to reload.
+BOOST_FIXTURE_TEST_CASE(index_unclean_shutdown, TestChain100Setup)
+{
+    Chainstate& chainstate = Assert(m_node.chainman)->ActiveChainstate();
+    const CChainParams& params = Params();
+    for (const auto& [index_name, make_index] : INDEX_FACTORIES) {
+        BOOST_TEST_INFO_SCOPE(index_name);
+        {
+            auto index{make_index(m_node)};
+            BOOST_REQUIRE(index->Init());
+            index->Sync();
+            std::shared_ptr<const CBlock> new_block;
+            CBlockIndex* new_block_index = nullptr;
+            {
+                const CScript script_pub_key{CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG};
+                const CBlock block = this->CreateBlock({}, script_pub_key);
+
+                new_block = std::make_shared<CBlock>(block);
+
+                LOCK(cs_main);
+                BlockValidationState state;
+                BOOST_CHECK(CheckBlock(block, state, params.GetConsensus()));
+                BOOST_CHECK(m_node.chainman->AcceptBlock(new_block, state, &new_block_index, true, nullptr, nullptr, true));
+                CCoinsViewCache view(&chainstate.CoinsTip());
+                BOOST_CHECK(chainstate.ConnectBlock(block, state, new_block_index, view));
+            }
+            // Send block connected notification, then stop the index without
+            // sending a chainstate flushed notification. Prior to #24138, this
+            // would cause the index to be corrupted and fail to reload.
+            ValidationInterfaceTest::BlockConnected(ChainstateRole{}, *index, new_block, new_block_index);
+            index->Stop();
+        }
+
+        {
+            auto index{make_index(m_node)};
+            BOOST_REQUIRE(index->Init());
+            // Make sure the index can be loaded.
+            BOOST_REQUIRE(index->StartBackgroundSync());
+            index->Stop();
+        }
+    }
+}
+
+class IndexReorgCrash : public BaseIndex
+{
+private:
+    FakeNodeClock& m_clock;
+    std::unique_ptr<BaseIndex::DB> m_db;
+    std::shared_future<void> m_blocker;
+    int m_blocking_height;
+
+public:
+    explicit IndexReorgCrash(std::unique_ptr<interfaces::Chain> chain, std::shared_future<void> blocker, int blocking_height, FakeNodeClock& clock)
+        : BaseIndex(std::move(chain), "test index", "testidx"), m_clock(clock), m_blocker(blocker), m_blocking_height(blocking_height)
+    {
+        const fs::path path = gArgs.GetDataDirNet() / "index";
+        fs::create_directories(path);
+        m_db = std::make_unique<BaseIndex::DB>(path / "db", /*n_cache_size=*/0, /*f_memory=*/true, /*f_wipe=*/false);
+    }
+
+    bool AllowPrune() const override { return false; }
+    BaseIndex::DB& GetDB() const override { return *m_db; }
+
+    bool CustomAppend(const interfaces::BlockInfo& block) override
+    {
+        // Simulate a delay so new blocks can get connected during the initial sync
+        if (block.height == m_blocking_height) m_blocker.wait();
+
+        // Move mock time forward so the best index gets updated only when we are not at the blocking height
+        if (block.height == m_blocking_height - 1 || block.height > m_blocking_height) {
+            m_clock += 31s;
+        }
+
+        return true;
+    }
+};
+
+BOOST_FIXTURE_TEST_CASE(index_reorg_crash, TestChain100Setup)
+{
+    std::promise<void> promise;
+    std::shared_future<void> blocker(promise.get_future());
+    int blocking_height = WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->nHeight);
+
+    IndexReorgCrash index{interfaces::MakeChain(m_node), blocker, blocking_height, m_clock};
+    BOOST_REQUIRE(index.Init());
+    BOOST_REQUIRE(index.StartBackgroundSync());
+
+    auto func_wait_until = [&](int height, std::chrono::milliseconds timeout) {
+        auto deadline = std::chrono::steady_clock::now() + timeout;
+        while (index.GetSummary().best_block_height < height) {
+            if (std::chrono::steady_clock::now() > deadline) {
+                BOOST_FAIL(strprintf("Timeout waiting for index height %d (current: %d)", height, index.GetSummary().best_block_height));
+                return;
+            }
+            std::this_thread::sleep_for(100ms);
+        }
+    };
+
+    // Wait until the index is one block before the fork point
+    func_wait_until(blocking_height - 1, /*timeout=*/5s);
+
+    // Create a fork to trigger the reorg
+    std::vector<std::shared_ptr<CBlock>> fork;
+    const CBlockIndex* prev_tip = WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->pprev);
+    BOOST_REQUIRE(BuildChain(m_node, prev_tip, GetScriptForDestination(PKHash(GenerateRandomKey().GetPubKey())), 3, fork));
+
+    for (const auto& block : fork) {
+        BOOST_REQUIRE(m_node.chainman->ProcessNewBlock(block, /*force_processing=*/true, /*min_pow_checked=*/true, nullptr));
+    }
+
+    // Unblock the index thread so it can process the reorg
+    promise.set_value();
+    // Wait for the index to reach the new tip
+    func_wait_until(blocking_height + 2, 5s);
+    index.Stop();
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/bip328_tests.cpp b/depend/bitcoin/src/test/bip328_tests.cpp
index 9fffa00b..630771d5 100644
--- a/depend/bitcoin/src/test/bip328_tests.cpp
+++ b/depend/bitcoin/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 = {
diff --git a/depend/bitcoin/src/test/bip32_tests.cpp b/depend/bitcoin/src/test/bip32_tests.cpp
index 1df368ad..d5e844ef 100644
--- a/depend/bitcoin/src/test/bip32_tests.cpp
+++ b/depend/bitcoin/src/test/bip32_tests.cpp
@@ -9,6 +9,7 @@
 #include <key_io.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
+#include <util/bip32.h>
 #include <util/strencodings.h>
 
 #include <string>
@@ -184,6 +185,46 @@ BOOST_AUTO_TEST_CASE(bip32_test5) {
     }
 }
 
+BOOST_AUTO_TEST_CASE(bip32_derive_ext_key)
+{
+    const CExtKey master{DecodeExtKey(test1.vDerive[0].prv)};
+    const std::vector<uint32_t> path{test1.vDerive[0].nChild, test1.vDerive[1].nChild};
+    const auto derived{DeriveExtKey(master, path)};
+    BOOST_REQUIRE(derived);
+    BOOST_CHECK(EncodeExtKey(derived->first) == test1.vDerive[2].prv);
+
+    KeyOriginInfo expected_origin;
+    expected_origin.fingerprint = master.id_key_fingerprint();
+    expected_origin.path = path;
+    BOOST_CHECK(derived->second == expected_origin);
+
+    const auto root{DeriveExtKey(master, {})};
+    BOOST_REQUIRE(root);
+    BOOST_CHECK(root->first == master);
+    expected_origin.path.clear();
+    BOOST_CHECK(root->second == expected_origin);
+
+    CExtKey max_depth{master};
+    for (auto i{0}; i++ < 255;) {
+        CExtKey next_key;
+        BOOST_REQUIRE(max_depth.Derive(next_key, 0));
+        max_depth = next_key;
+    }
+    BOOST_CHECK(!DeriveExtKey(max_depth, {0}));
+}
+
+BOOST_AUTO_TEST_CASE(bip32_has_hardened_derivation)
+{
+    const std::vector<uint32_t> empty;
+    const std::vector<uint32_t> unhardened{0, 1, 2};
+    const std::vector<uint32_t> hardened{0x80000000U};
+    const std::vector<uint32_t> mixed{0, 1 | 0x80000000U, 2};
+    BOOST_CHECK(!HasHardenedDerivation(empty));
+    BOOST_CHECK(!HasHardenedDerivation(unhardened));
+    BOOST_CHECK(HasHardenedDerivation(hardened));
+    BOOST_CHECK(HasHardenedDerivation(mixed));
+}
+
 BOOST_AUTO_TEST_CASE(bip32_max_depth) {
     CExtKey key_parent{DecodeExtKey(test1.vDerive[0].prv)}, key_child;
     CExtPubKey pubkey_parent{DecodeExtPubKey(test1.vDerive[0].pub)}, pubkey_child;
@@ -197,9 +238,91 @@ BOOST_AUTO_TEST_CASE(bip32_max_depth) {
     }
 
     // But trying to derive a non-existent 256th depth will fail!
-    BOOST_CHECK(key_parent.nDepth == 255 && pubkey_parent.nDepth == 255);
+    BOOST_CHECK(key_parent.nDepth == 255);
+    BOOST_CHECK(pubkey_parent.nDepth == 255);
     BOOST_CHECK(!key_parent.Derive(key_child, 0));
     BOOST_CHECK(!pubkey_parent.Derive(pubkey_child, 0));
 }
 
+BOOST_AUTO_TEST_CASE(parse_hd_keypath)
+{
+    std::vector<uint32_t> keypath;
+
+    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1", keypath));
+    BOOST_CHECK(!ParseHDKeypath("///////////////////////////", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1'/1", keypath));
+    BOOST_CHECK(!ParseHDKeypath("//////////////////////////'/", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/", keypath));
+    BOOST_CHECK(!ParseHDKeypath("1///////////////////////////", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1'/", keypath));
+    BOOST_CHECK(!ParseHDKeypath("1/'//////////////////////////", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("", keypath));
+    BOOST_CHECK(!ParseHDKeypath(" ", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("0", keypath));
+    BOOST_CHECK(!ParseHDKeypath("O", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("0000'/0000'/0000'", keypath));
+    BOOST_CHECK(!ParseHDKeypath("0000,/0000,/0000,", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("01234", keypath));
+    BOOST_CHECK(!ParseHDKeypath("0x1234", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("1", keypath));
+    BOOST_CHECK(!ParseHDKeypath(" 1", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("42", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m42", keypath));
+
+    // A path element's numeric part is capped at 2^31-1; the top bit is
+    // reserved for the hardened marker (h or ').
+    BOOST_CHECK(ParseHDKeypath("2147483647", keypath));  // 0x7fffffff, largest normal index
+    BOOST_CHECK(!ParseHDKeypath("2147483648", keypath)); // 0x80000000, would set the hardened bit
+    BOOST_CHECK(!ParseHDKeypath("4294967295", keypath)); // 0xffffffff
+    BOOST_CHECK(!ParseHDKeypath("4294967296", keypath)); // uint32_t max + 1
+
+    BOOST_CHECK(ParseHDKeypath("m", keypath));
+    BOOST_CHECK(!ParseHDKeypath("n", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/", keypath));
+    BOOST_CHECK(!ParseHDKeypath("n/", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0", keypath));
+    BOOST_CHECK(!ParseHDKeypath("n/0", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0'", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/0''", keypath));
+
+    keypath.clear();
+    BOOST_REQUIRE(ParseHDKeypath("m/0h/1h/2h", keypath));
+    BOOST_REQUIRE_EQUAL(keypath.size(), 3);
+    BOOST_CHECK_EQUAL(keypath[0], 0x80000000U);
+    BOOST_CHECK_EQUAL(keypath[1], 0x80000001U);
+    BOOST_CHECK_EQUAL(keypath[2], 0x80000002U);
+    BOOST_CHECK(!ParseHDKeypath("m/0hh", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/h0", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0'/0'", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/'0/0'", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0/0", keypath));
+    BOOST_CHECK(!ParseHDKeypath("n/0/0", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0/0/00", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/0/0/f00", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0/0/000000000000000000000000000000000000000000000000000000000000000000000000000000000000", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/1/1/111111111111111111111111111111111111111111111111111111111111111111111111111111111111", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/0/00/0", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/0'/00/'0", keypath));
+
+    BOOST_CHECK(ParseHDKeypath("m/1/", keypath));
+    BOOST_CHECK(!ParseHDKeypath("m/1//", keypath));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/blockencodings_tests.cpp b/depend/bitcoin/src/test/blockencodings_tests.cpp
index e4200cac..60cb73d2 100644
--- a/depend/bitcoin/src/test/blockencodings_tests.cpp
+++ b/depend/bitcoin/src/test/blockencodings_tests.cpp
@@ -144,6 +144,13 @@ class TestHeaderAndShortIDs {
     SERIALIZE_METHODS(TestHeaderAndShortIDs, obj) { READWRITE(obj.header, obj.nonce, Using<VectorFormatter<CustomUintFormatter<CBlockHeaderAndShortTxIDs::SHORTTXIDS_LENGTH>>>(obj.shorttxids), obj.prefilledtxn); }
 };
 
+struct TestPartiallyDownloadedBlock : PartiallyDownloadedBlock {
+    using PartiallyDownloadedBlock::PartiallyDownloadedBlock;
+
+    size_t GetMempoolCount() const { return mempool_count; }
+    size_t GetExtraCount() const { return extra_count; }
+};
+
 BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
 {
     CTxMemPool& pool = *Assert(m_node.mempool);
@@ -319,6 +326,13 @@ BOOST_AUTO_TEST_CASE(ReceiveWithExtraTransactions) {
     const CTransactionRef non_block_tx = MakeTransactionRef(std::move(mtx));
 
     CBlock block(BuildBlockTestCase(rand_ctx));
+    // Leave one transaction missing so scanning doesn't stop before the collision.
+    mtx = BuildTransactionTestCase();
+    mtx.vin[0].prevout.hash = Txid::FromUint256(rand_ctx.rand256());
+    block.vtx.push_back(MakeTransactionRef(std::move(mtx)));
+    block.hashMerkleRoot = BlockMerkleRoot(block);
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+
     std::vector<std::pair<Wtxid, CTransactionRef>> extra_txn;
     extra_txn.resize(10);
 
@@ -352,6 +366,34 @@ BOOST_AUTO_TEST_CASE(ReceiveWithExtraTransactions) {
         // This transaction is now available via extra_txn:
         BOOST_CHECK(partial_block_with_extra.IsTxAvailable(1));
         BOOST_CHECK(partial_block_with_extra.IsTxAvailable(2));
+
+        // Simulate a mempool collision after finding an unrelated extra transaction.
+        extra_txn[2] = {block.vtx[2]->GetWitnessHash(), non_block_tx};
+        TestPartiallyDownloadedBlock partial_block_with_extra_collision{&pool};
+        BOOST_CHECK_EQUAL(partial_block_with_extra_collision.InitData(cmpctblock, extra_txn), READ_STATUS_OK);
+        BOOST_CHECK(partial_block_with_extra_collision.IsTxAvailable(1));
+        BOOST_CHECK(!partial_block_with_extra_collision.IsTxAvailable(2));
+        BOOST_CHECK_EQUAL(partial_block_with_extra_collision.GetMempoolCount(), 1U);
+        BOOST_CHECK_EQUAL(partial_block_with_extra_collision.GetExtraCount(), 1U);
+
+        // Now also collide the extra-sourced slot: both counters decrement exactly once.
+        extra_txn[3] = {block.vtx[1]->GetWitnessHash(), non_block_tx};
+        TestPartiallyDownloadedBlock partial_block_with_extra_source_collision{&pool};
+        BOOST_CHECK_EQUAL(partial_block_with_extra_source_collision.InitData(cmpctblock, extra_txn), READ_STATUS_OK);
+        BOOST_CHECK(!partial_block_with_extra_source_collision.IsTxAvailable(1));
+        BOOST_CHECK(!partial_block_with_extra_source_collision.IsTxAvailable(2));
+        BOOST_CHECK_EQUAL(partial_block_with_extra_source_collision.GetMempoolCount(), 0U);
+        BOOST_CHECK_EQUAL(partial_block_with_extra_source_collision.GetExtraCount(), 0U);
+
+        // Collided slots are terminal: not even the genuine transactions refill them.
+        extra_txn[4] = {block.vtx[2]->GetWitnessHash(), block.vtx[2]};
+        extra_txn[5] = {block.vtx[1]->GetWitnessHash(), block.vtx[1]};
+        TestPartiallyDownloadedBlock partial_block_no_refill{&pool};
+        BOOST_CHECK_EQUAL(partial_block_no_refill.InitData(cmpctblock, extra_txn), READ_STATUS_OK);
+        BOOST_CHECK(!partial_block_no_refill.IsTxAvailable(1));
+        BOOST_CHECK(!partial_block_no_refill.IsTxAvailable(2));
+        BOOST_CHECK_EQUAL(partial_block_no_refill.GetMempoolCount(), 0U);
+        BOOST_CHECK_EQUAL(partial_block_no_refill.GetExtraCount(), 0U);
     }
 }
 
diff --git a/depend/bitcoin/src/test/blockfilter_index_tests.cpp b/depend/bitcoin/src/test/blockfilter_index_tests.cpp
index 10e4ffa4..6b5b6deb 100644
--- a/depend/bitcoin/src/test/blockfilter_index_tests.cpp
+++ b/depend/bitcoin/src/test/blockfilter_index_tests.cpp
@@ -4,33 +4,38 @@
 
 #include <addresstype.h>
 #include <blockfilter.h>
-#include <chainparams.h>
-#include <consensus/merkle.h>
-#include <consensus/validation.h>
+#include <chain.h>
 #include <index/blockfilterindex.h>
 #include <interfaces/chain.h>
-#include <node/miner.h>
-#include <pow.h>
+#include <key.h>
+#include <node/blockstorage.h>
+#include <primitives/block.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/blockfilter.h>
 #include <test/util/common.h>
+#include <test/util/mining.h>
 #include <test/util/setup_common.h>
-#include <util/byte_units.h>
+#include <uint256.h>
+#include <util/check.h>
 #include <validation.h>
 
 #include <boost/test/unit_test.hpp>
-#include <future>
 
-using node::BlockAssembler;
+#include <compare>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <span>
+#include <string>
+#include <utility>
+#include <vector>
+
 using node::BlockManager;
-using node::CBlockTemplate;
 
 BOOST_AUTO_TEST_SUITE(blockfilter_index_tests)
 
-struct BuildChainTestingSetup : public TestChain100Setup {
-    CBlock CreateBlock(const CBlockIndex* prev, const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey);
-    bool BuildChain(const CBlockIndex* pindex, const CScript& coinbase_script_pub_key, size_t length, std::vector<std::shared_ptr<CBlock>>& chain);
-};
-
 static bool CheckFilterLookups(BlockFilterIndex& filter_index, const CBlockIndex* block_index,
                                uint256& last_header, const BlockManager& blockman)
 {
@@ -65,57 +70,7 @@ static bool CheckFilterLookups(BlockFilterIndex& filter_index, const CBlockIndex
     return true;
 }
 
-CBlock BuildChainTestingSetup::CreateBlock(const CBlockIndex* prev,
-    const std::vector<CMutableTransaction>& txns,
-    const CScript& scriptPubKey)
-{
-    BlockAssembler::Options options;
-    options.coinbase_output_script = scriptPubKey;
-    options.include_dummy_extranonce = true;
-    std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler{m_node.chainman->ActiveChainstate(), m_node.mempool.get(), options}.CreateNewBlock();
-    CBlock& block = pblocktemplate->block;
-    block.hashPrevBlock = prev->GetBlockHash();
-    block.nTime = prev->nTime + 1;
-
-    // Replace mempool-selected txns with just coinbase plus passed-in txns:
-    block.vtx.resize(1);
-    for (const CMutableTransaction& tx : txns) {
-        block.vtx.push_back(MakeTransactionRef(tx));
-    }
-    {
-        CMutableTransaction tx_coinbase{*block.vtx.at(0)};
-        tx_coinbase.nLockTime = static_cast<uint32_t>(prev->nHeight);
-        tx_coinbase.vin.at(0).scriptSig = CScript{} << prev->nHeight + 1;
-        block.vtx.at(0) = MakeTransactionRef(std::move(tx_coinbase));
-        block.hashMerkleRoot = BlockMerkleRoot(block);
-    }
-
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, m_node.chainman->GetConsensus())) ++block.nNonce;
-
-    return block;
-}
-
-bool BuildChainTestingSetup::BuildChain(const CBlockIndex* pindex,
-    const CScript& coinbase_script_pub_key,
-    size_t length,
-    std::vector<std::shared_ptr<CBlock>>& chain)
-{
-    std::vector<CMutableTransaction> no_txns;
-
-    chain.resize(length);
-    for (auto& block : chain) {
-        block = std::make_shared<CBlock>(CreateBlock(pindex, no_txns, coinbase_script_pub_key));
-
-        BlockValidationState state;
-        if (!Assert(m_node.chainman)->ProcessNewBlockHeaders({{*block}}, true, state, &pindex)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-BOOST_FIXTURE_TEST_CASE(blockfilter_index_initial_sync, BuildChainTestingSetup)
+BOOST_FIXTURE_TEST_CASE(blockfilter_index_initial_sync, TestChain100Setup)
 {
     BlockFilterIndex filter_index(interfaces::MakeChain(m_node), BlockFilterType::BASIC, 1_MiB, true);
     BOOST_REQUIRE(filter_index.Init());
@@ -169,8 +124,8 @@ BOOST_FIXTURE_TEST_CASE(blockfilter_index_initial_sync, BuildChainTestingSetup)
     CScript coinbase_script_pub_key_A = GetScriptForDestination(PKHash(coinbase_key_A.GetPubKey()));
     CScript coinbase_script_pub_key_B = GetScriptForDestination(PKHash(coinbase_key_B.GetPubKey()));
     std::vector<std::shared_ptr<CBlock>> chainA, chainB;
-    BOOST_REQUIRE(BuildChain(tip, coinbase_script_pub_key_A, 10, chainA));
-    BOOST_REQUIRE(BuildChain(tip, coinbase_script_pub_key_B, 10, chainB));
+    BOOST_REQUIRE(BuildChain(m_node, tip, coinbase_script_pub_key_A, 10, chainA));
+    BOOST_REQUIRE(BuildChain(m_node, tip, coinbase_script_pub_key_B, 10, chainB));
 
     // Check that new blocks on chain A get indexed.
     uint256 chainA_last_header = last_header;
@@ -308,81 +263,4 @@ BOOST_FIXTURE_TEST_CASE(blockfilter_index_init_destroy, BasicTestingSetup)
     BOOST_CHECK(filter_index == nullptr);
 }
 
-class IndexReorgCrash : public BaseIndex
-{
-private:
-    std::unique_ptr<BaseIndex::DB> m_db;
-    std::shared_future<void> m_blocker;
-    int m_blocking_height;
-
-public:
-    explicit IndexReorgCrash(std::unique_ptr<interfaces::Chain> chain, std::shared_future<void> blocker,
-                             int blocking_height) : BaseIndex(std::move(chain), "test index"), m_blocker(blocker),
-                                                    m_blocking_height(blocking_height)
-    {
-        const fs::path path = gArgs.GetDataDirNet() / "index";
-        fs::create_directories(path);
-        m_db = std::make_unique<BaseIndex::DB>(path / "db", /*n_cache_size=*/0, /*f_memory=*/true, /*f_wipe=*/false);
-    }
-
-    bool AllowPrune() const override { return false; }
-    BaseIndex::DB& GetDB() const override { return *m_db; }
-
-    bool CustomAppend(const interfaces::BlockInfo& block) override
-    {
-        // Simulate a delay so new blocks can get connected during the initial sync
-        if (block.height == m_blocking_height) m_blocker.wait();
-
-        // Move mock time forward so the best index gets updated only when we are not at the blocking height
-        if (block.height == m_blocking_height - 1 || block.height > m_blocking_height) {
-            SetMockTime(GetTime<std::chrono::seconds>() + 31s);
-        }
-
-        return true;
-    }
-};
-
-BOOST_FIXTURE_TEST_CASE(index_reorg_crash, BuildChainTestingSetup)
-{
-    // Enable mock time
-    SetMockTime(GetTime<std::chrono::minutes>());
-
-    std::promise<void> promise;
-    std::shared_future<void> blocker(promise.get_future());
-    int blocking_height = WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->nHeight);
-
-    IndexReorgCrash index(interfaces::MakeChain(m_node), blocker, blocking_height);
-    BOOST_REQUIRE(index.Init());
-    BOOST_REQUIRE(index.StartBackgroundSync());
-
-    auto func_wait_until = [&](int height, std::chrono::milliseconds timeout) {
-        auto deadline = std::chrono::steady_clock::now() + timeout;
-        while (index.GetSummary().best_block_height < height) {
-            if (std::chrono::steady_clock::now() > deadline) {
-                BOOST_FAIL(strprintf("Timeout waiting for index height %d (current: %d)", height, index.GetSummary().best_block_height));
-                return;
-            }
-            std::this_thread::sleep_for(100ms);
-        }
-    };
-
-    // Wait until the index is one block before the fork point
-    func_wait_until(blocking_height - 1, /*timeout=*/5s);
-
-    // Create a fork to trigger the reorg
-    std::vector<std::shared_ptr<CBlock>> fork;
-    const CBlockIndex* prev_tip = WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->pprev);
-    BOOST_REQUIRE(BuildChain(prev_tip, GetScriptForDestination(PKHash(GenerateRandomKey().GetPubKey())), 3, fork));
-
-    for (const auto& block : fork) {
-        BOOST_REQUIRE(m_node.chainman->ProcessNewBlock(block, /*force_processing=*/true, /*min_pow_checked=*/true, nullptr));
-    }
-
-    // Unblock the index thread so it can process the reorg
-    promise.set_value();
-    // Wait for the index to reach the new tip
-    func_wait_until(blocking_height + 2, 5s);
-    index.Stop();
-}
-
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/blockmanager_tests.cpp b/depend/bitcoin/src/test/blockmanager_tests.cpp
index 6ca4eb9b..2eea73d0 100644
--- a/depend/bitcoin/src/test/blockmanager_tests.cpp
+++ b/depend/bitcoin/src/test/blockmanager_tests.cpp
@@ -42,6 +42,7 @@ BOOST_AUTO_TEST_CASE(blockmanager_find_block_pos)
     };
     BlockManager blockman{*Assert(m_node.shutdown_signal), blockman_opts};
     // simulate adding a genesis block normally
+    LOCK(::cs_main);
     BOOST_CHECK_EQUAL(blockman.WriteBlock(params->GenesisBlock(), 0).nPos, STORAGE_HEADER_BYTES);
     // simulate what happens during reindex
     // simulate a well-formed genesis block being found at offset 8 in the blk00000.dat file
@@ -257,6 +258,7 @@ BOOST_AUTO_TEST_CASE(blockmanager_flush_block_file)
     constexpr int TEST_BLOCK_SIZE{81};
 
     // Blockstore is empty
+    LOCK(::cs_main);
     BOOST_CHECK_EQUAL(blockman.CalculateCurrentUsage(), 0);
 
     // Write the first block to a new location.
diff --git a/depend/bitcoin/src/test/btcsignals_tests.cpp b/depend/bitcoin/src/test/btcsignals_tests.cpp
index b3203ebe..d6122896 100644
--- a/depend/bitcoin/src/test/btcsignals_tests.cpp
+++ b/depend/bitcoin/src/test/btcsignals_tests.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <btcsignals.h>
 #include <test/util/setup_common.h>
+#include <util/btcsignals.h>
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,22 +12,6 @@
 namespace {
 
 
-struct MoveOnlyData {
-    MoveOnlyData(int data) : m_data(data) {}
-    MoveOnlyData(MoveOnlyData&&) = default;
-
-    MoveOnlyData& operator=(MoveOnlyData&&) = delete;
-    MoveOnlyData(const MoveOnlyData&) = delete;
-    MoveOnlyData& operator=(const MoveOnlyData&) = delete;
-
-    int m_data;
-};
-
-MoveOnlyData MoveOnlyReturnCallback(int val)
-{
-    return {val};
-}
-
 void IncrementCallback(int& val)
 {
     val++;
@@ -97,61 +81,48 @@ BOOST_AUTO_TEST_CASE(disconnects)
     BOOST_CHECK_EQUAL(val, 6);
 }
 
-/* Check that move-only return types work correctly
- */
-BOOST_AUTO_TEST_CASE(moveonly_return)
-{
-    btcsignals::signal<MoveOnlyData(int)> sig0;
-    sig0.connect(MoveOnlyReturnCallback);
-    int data{3};
-    auto ret = sig0(data);
-    BOOST_CHECK_EQUAL(ret->m_data, 3);
-}
-
-/* The result of the signal invocation should always be the result of the last
- * enabled callback.
- */
-BOOST_AUTO_TEST_CASE(return_value)
+BOOST_AUTO_TEST_CASE(any_of_combiner)
 {
-    btcsignals::signal<bool()> sig0;
+    btcsignals::signal<bool(), btcsignals::any_of> sig0;
     decltype(sig0)::result_type ret;
     ret = sig0();
-    BOOST_CHECK(!ret);
+    BOOST_CHECK_EQUAL(ret, false);
     {
-        btcsignals::scoped_connection conn0 = sig0.connect(ReturnTrue);
+        btcsignals::scoped_connection conn0{sig0.connect(ReturnTrue)};
         ret = sig0();
-        BOOST_CHECK(ret && *ret == true);
+        BOOST_CHECK_EQUAL(ret, true);
     }
     ret = sig0();
-    BOOST_CHECK(!ret);
+    BOOST_CHECK_EQUAL(ret, false);
     {
-        btcsignals::scoped_connection conn1 = sig0.connect(ReturnTrue);
-        btcsignals::scoped_connection conn0 = sig0.connect(ReturnFalse);
+        btcsignals::scoped_connection conn0{sig0.connect(ReturnTrue)};
+        btcsignals::scoped_connection conn1{sig0.connect(ReturnFalse)};
         ret = sig0();
-        BOOST_CHECK(ret && *ret == false);
+        BOOST_CHECK_EQUAL(ret, true);
         conn0.disconnect();
         ret = sig0();
-        BOOST_CHECK(ret && *ret == true);
+        BOOST_CHECK_EQUAL(ret, false);
     }
     ret = sig0();
-    BOOST_CHECK(!ret);
+    BOOST_CHECK_EQUAL(ret, false);
 }
 
 /* Test the thread-safety of connect/disconnect/empty/connected/callbacks.
  * Connect sig0 to an incrementor function and loop in a thread.
  * Meanwhile, in another thread, inject and call new increment callbacks.
  * Both threads are constantly calling empty/connected.
- * Though the end-result is undefined due to a non-deterministic number of
- * total callbacks executed, this should all be completely threadsafe.
+ * The end-result must be deterministic for the atomic modified by conn0.
+ * Though, the end-result for the atomic modified by the extra connections is
+ * undefined due to a non-deterministic number of total callbacks executed.
+ * In any case, this should all be completely threadsafe.
  * Sanitizers should pick up any buggy data race behavior (if present).
  */
 BOOST_AUTO_TEST_CASE(thread_safety)
 {
     btcsignals::signal<void()> sig0;
-    std::atomic<uint32_t> val{0};
-    auto conn0 = sig0.connect([&val] {
-        val++;
-    });
+    std::atomic<uint32_t> val_det{0};
+    std::atomic<uint32_t> val_non_det{0};
+    auto conn0 = sig0.connect([&val_det] { val_det++; });
 
     std::thread incrementor([&conn0, &sig0] {
         for (int i = 0; i < 1000; i++) {
@@ -164,16 +135,17 @@ BOOST_AUTO_TEST_CASE(thread_safety)
         assert(conn0.connected());
     });
 
-    std::thread extra_increment_injector([&conn0, &sig0, &val] {
+    std::thread extra_increment_injector([&conn0, &sig0, &val_non_det] {
         static constexpr size_t num_extra_conns{1000};
         std::vector<btcsignals::scoped_connection> extra_conns;
         extra_conns.reserve(num_extra_conns);
         for (size_t i = 0; i < num_extra_conns; i++) {
             BOOST_CHECK(!sig0.empty());
             BOOST_CHECK(conn0.connected());
-            extra_conns.emplace_back(sig0.connect([&val] {
-                val++;
-            }));
+            btcsignals::scoped_connection extra{sig0.connect([&val_non_det] { val_non_det++; })};
+            if (i % 2 == 0) {
+                extra_conns.emplace_back(std::move(extra));
+            }
             sig0();
         }
     });
@@ -182,10 +154,16 @@ BOOST_AUTO_TEST_CASE(thread_safety)
     conn0.disconnect();
     BOOST_CHECK(sig0.empty());
 
-    // sig will have been called 2000 times, and at least 1000 of those will
-    // have been executing multiple incrementing callbacks. So while val is
-    // probably MUCH bigger, it's guaranteed to be at least 3000.
-    BOOST_CHECK_GE(val.load(), 3000);
+    // sig0 will have been called 2000 times, and only the first connection did
+    // increment val_det, so it must be 2000.
+    BOOST_CHECK_EQUAL(val_det.load(), 2000);
+    // The number of connections that increment val_non_det is growing from 1
+    // to 500, where 500 are disconnected immediately again after the step.
+    // Before the end of each step the connections are called at least once.
+    // However, it is unknown how often the connections have been called
+    // exactly. The 500th Triangular Number gives a lower estimate.
+    // T_n=n(n+1)/2
+    BOOST_CHECK_GE(val_non_det.load(), 500 * 501 / 2);
 }
 
 /* Test that connection and disconnection works from within signal
diff --git a/depend/bitcoin/src/test/caches_tests.cpp b/depend/bitcoin/src/test/caches_tests.cpp
index 69c42f0b..1291eb33 100644
--- a/depend/bitcoin/src/test/caches_tests.cpp
+++ b/depend/bitcoin/src/test/caches_tests.cpp
@@ -2,41 +2,40 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://opensource.org/license/mit.
 
+#include <kernel/caches.h>
 #include <node/caches.h>
 #include <util/byte_units.h>
 
 #include <boost/test/unit_test.hpp>
 
+#include <cstdint>
+
 using namespace node;
 
+namespace {
+void CheckDbCacheWarnThreshold(uint64_t threshold, uint64_t total_ram)
+{
+    BOOST_CHECK(!ShouldWarnOversizedDbCache(threshold, total_ram));
+    BOOST_CHECK( ShouldWarnOversizedDbCache(threshold + 1, total_ram));
+}
+} // namespace
+
 BOOST_AUTO_TEST_SUITE(caches_tests)
 
 BOOST_AUTO_TEST_CASE(oversized_dbcache_warning)
 {
-    // memory restricted setup - cap is DEFAULT_DB_CACHE (450 MiB)
-    BOOST_CHECK(!ShouldWarnOversizedDbCache(/*dbcache=*/4_MiB, /*total_ram=*/1_GiB));    // Under cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/512_MiB, /*total_ram=*/1_GiB));  // At cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/1500_MiB, /*total_ram=*/1_GiB)); // Over cap
-
-    // 2 GiB RAM - cap is 75%
-    BOOST_CHECK(!ShouldWarnOversizedDbCache(/*dbcache=*/1500_MiB, /*total_ram=*/2_GiB)); // Under cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/1600_MiB, /*total_ram=*/2_GiB)); // Over cap
-
-    // 4 GiB RAM - cap is 75%
-    BOOST_CHECK(!ShouldWarnOversizedDbCache(/*dbcache=*/2500_MiB, /*total_ram=*/4_GiB)); // Under cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/3500_MiB, /*total_ram=*/4_GiB)); // Over cap
-
-    // 8 GiB RAM - cap is 75%
-    BOOST_CHECK(!ShouldWarnOversizedDbCache(/*dbcache=*/6000_MiB, /*total_ram=*/8_GiB)); // Under cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/7000_MiB, /*total_ram=*/8_GiB)); // Over cap
-
-    // 16 GiB RAM - cap is 75%
-    BOOST_CHECK(!ShouldWarnOversizedDbCache(/*dbcache=*/10_GiB, /*total_ram=*/16_GiB)); // Under cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/15_GiB, /*total_ram=*/16_GiB)); // Over cap
-
-    // 32 GiB RAM - cap is 75%
-    BOOST_CHECK(!ShouldWarnOversizedDbCache(/*dbcache=*/20_GiB, /*total_ram=*/32_GiB)); // Under cap
-    BOOST_CHECK( ShouldWarnOversizedDbCache(/*dbcache=*/30_GiB, /*total_ram=*/32_GiB)); // Over cap
+    BOOST_CHECK(!ShouldWarnOversizedDbCache(MIN_DBCACHE_BYTES, 1_GiB));
+
+    // Below DBCACHE_WARNING_RESERVED_RAM the existing fixed default dominates.
+    CheckDbCacheWarnThreshold(DEFAULT_KERNEL_CACHE, 1_GiB);
+    CheckDbCacheWarnThreshold(DEFAULT_KERNEL_CACHE, DBCACHE_WARNING_RESERVED_RAM);
+
+    // Above DBCACHE_WARNING_RESERVED_RAM the warning fires at 75% of the headroom.
+    CheckDbCacheWarnThreshold(((3_GiB - DBCACHE_WARNING_RESERVED_RAM) / 4) * 3, 3_GiB);
+
+    for (const auto total_ram : {8_GiB, 16_GiB, 32_GiB}) {
+        CheckDbCacheWarnThreshold(((total_ram - DBCACHE_WARNING_RESERVED_RAM) / 4) * 3, total_ram);
+    }
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/chainstate_write_tests.cpp b/depend/bitcoin/src/test/chainstate_write_tests.cpp
index d0925b61..6699846c 100644
--- a/depend/bitcoin/src/test/chainstate_write_tests.cpp
+++ b/depend/bitcoin/src/test/chainstate_write_tests.cpp
@@ -31,7 +31,7 @@ BOOST_FIXTURE_TEST_CASE(chainstate_write_interval, TestingSetup)
     m_node.validation_signals->RegisterSharedValidationInterface(sub);
     auto& chainstate{Assert(m_node.chainman)->ActiveChainstate()};
     BlockValidationState state_dummy{};
-    NodeClockContext clock_ctx{};
+    FakeNodeClock clock{};
 
     // The first periodic flush sets m_next_write and does not flush
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::PERIODIC);
@@ -39,12 +39,12 @@ BOOST_FIXTURE_TEST_CASE(chainstate_write_interval, TestingSetup)
     BOOST_CHECK(!sub->m_did_flush);
 
     // The periodic flush interval is between 50 and 70 minutes (inclusive)
-    clock_ctx += DATABASE_WRITE_INTERVAL_MIN - 1min;
+    clock += DATABASE_WRITE_INTERVAL_MIN - 1min;
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::PERIODIC);
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
     BOOST_CHECK(!sub->m_did_flush);
 
-    clock_ctx += DATABASE_WRITE_INTERVAL_MAX;
+    clock += DATABASE_WRITE_INTERVAL_MAX;
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::PERIODIC);
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
     BOOST_CHECK(sub->m_did_flush);
@@ -85,10 +85,11 @@ BOOST_FIXTURE_TEST_CASE(write_during_multiblock_activation, TestChain100Setup)
 
     // Set m_next_write to current time
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::FORCE_FLUSH);
+    BOOST_CHECK_EQUAL(WITH_LOCK(::cs_main, return chainstate.GetLastFlushedBlock()), second_from_tip->pprev);
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
     // The periodic flush interval is between 50 and 70 minutes (inclusive)
     // The next call to a PERIODIC write will flush
-    SetMockTime(GetMockTime() + DATABASE_WRITE_INTERVAL_MAX);
+    m_clock += DATABASE_WRITE_INTERVAL_MAX;
 
     const auto sub{std::make_shared<TestSubscriber>()};
     m_node.validation_signals->RegisterSharedValidationInterface(sub);
@@ -101,6 +102,7 @@ BOOST_FIXTURE_TEST_CASE(write_during_multiblock_activation, TestChain100Setup)
     // inside the outer loop.
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
     BOOST_CHECK_EQUAL(sub->m_flushed_at_block, second_from_tip);
+    BOOST_CHECK_EQUAL(WITH_LOCK(::cs_main, return chainstate.GetLastFlushedBlock()), second_from_tip);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/checkqueue_tests.cpp b/depend/bitcoin/src/test/checkqueue_tests.cpp
index 3e2fc83f..a980702c 100644
--- a/depend/bitcoin/src/test/checkqueue_tests.cpp
+++ b/depend/bitcoin/src/test/checkqueue_tests.cpp
@@ -233,7 +233,8 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_Catches_Failure)
         }
         auto result = control.Complete();
         if (i > 0) {
-            BOOST_REQUIRE(result.has_value() && *result == static_cast<int>(17 * i));
+            BOOST_REQUIRE(result.has_value());
+            BOOST_REQUIRE(*result == static_cast<int>(17 * i));
         } else {
             BOOST_REQUIRE(!result.has_value());
         }
diff --git a/depend/bitcoin/src/test/coins_tests.cpp b/depend/bitcoin/src/test/coins_tests.cpp
index 14ccb1c4..6f06399a 100644
--- a/depend/bitcoin/src/test/coins_tests.cpp
+++ b/depend/bitcoin/src/test/coins_tests.cpp
@@ -14,6 +14,7 @@
 #include <uint256.h>
 #include <undo.h>
 #include <util/byte_units.h>
+#include <util/check.h>
 #include <util/strencodings.h>
 
 #include <map>
@@ -193,7 +194,7 @@ void SimulationTest(CCoinsView* base, bool fake_best_block)
                     coin = newcoin;
                 }
                 if (COutPoint op(txid, 0); !stack.back()->map().contains(op) && !newcoin.out.scriptPubKey.IsUnspendable() && m_rng.randbool()) {
-                    stack.back()->EmplaceCoinInternalDANGER(std::move(op), std::move(newcoin));
+                    stack.back()->EmplaceCoinInternalDANGER(op, std::move(newcoin));
                 } else {
                     stack.back()->AddCoin(op, std::move(newcoin), /*possible_overwrite=*/!coin.IsSpent() || m_rng.randbool());
                 }
@@ -1060,6 +1061,30 @@ 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);
+    WITH_LOCK(::cs_main, return base.CompactFullAsync()).wait();
+    BOOST_CHECK_EQUAL(level2_files(base), 1);
+
+    BOOST_CHECK(*Assert(base.GetCoin(outpoint)) == coin);
+    BOOST_CHECK_EQUAL(base.GetBestBlock(), block_hash);
+}
+
 BOOST_AUTO_TEST_CASE(coins_resource_is_used)
 {
     CCoinsMapMemoryResource resource;
@@ -1109,11 +1134,11 @@ BOOST_AUTO_TEST_CASE(ccoins_emplace_duplicate_keeps_usage_balanced)
     const COutPoint outpoint{Txid::FromUint256(m_rng.rand256()), m_rng.rand32()};
 
     const Coin coin1{CTxOut{m_rng.randrange(10), CScript{} << m_rng.randbytes(CScriptBase::STATIC_SIZE + 1)}, 1, false};
-    cache.EmplaceCoinInternalDANGER(COutPoint{outpoint}, Coin{coin1});
+    cache.EmplaceCoinInternalDANGER(outpoint, Coin{coin1});
     cache.SelfTest();
 
     const Coin coin2{CTxOut{m_rng.randrange(20), CScript{} << m_rng.randbytes(CScriptBase::STATIC_SIZE + 2)}, 2, false};
-    cache.EmplaceCoinInternalDANGER(COutPoint{outpoint}, Coin{coin2});
+    cache.EmplaceCoinInternalDANGER(outpoint, Coin{coin2});
     cache.SelfTest();
 
     BOOST_CHECK(cache.AccessCoin(outpoint) == coin1);
@@ -1132,7 +1157,7 @@ BOOST_AUTO_TEST_CASE(ccoins_reset_guard)
     const COutPoint outpoint{Txid::FromUint256(m_rng.rand256()), m_rng.rand32()};
 
     const Coin coin{CTxOut{m_rng.randrange(10), CScript{} << m_rng.randbytes(CScriptBase::STATIC_SIZE + 1)}, 1, false};
-    cache.EmplaceCoinInternalDANGER(COutPoint{outpoint}, Coin{coin});
+    cache.EmplaceCoinInternalDANGER(outpoint, Coin{coin});
     BOOST_CHECK_EQUAL(cache.GetDirtyCount(), 1U);
 
     uint256 cache_best_block{m_rng.rand256()};
diff --git a/depend/bitcoin/src/test/coinscachepair_tests.cpp b/depend/bitcoin/src/test/coinscachepair_tests.cpp
index 0c208e93..57bc27be 100644
--- a/depend/bitcoin/src/test/coinscachepair_tests.cpp
+++ b/depend/bitcoin/src/test/coinscachepair_tests.cpp
@@ -21,7 +21,8 @@ std::list<CoinsCachePair> CreatePairs(CoinsCachePair& sentinel)
         auto node{std::prev(nodes.end())};
         CCoinsCacheEntry::SetDirty(*node, sentinel);
 
-        BOOST_CHECK(node->second.IsDirty() && !node->second.IsFresh());
+        BOOST_CHECK(node->second.IsDirty());
+        BOOST_CHECK(!node->second.IsFresh());
         BOOST_CHECK_EQUAL(node->second.Next(), &sentinel);
         BOOST_CHECK_EQUAL(sentinel.second.Prev(), &(*node));
 
@@ -63,7 +64,8 @@ BOOST_AUTO_TEST_CASE(linked_list_iteration)
 
     // Delete the nodes from the list to make sure there are no dangling pointers
     for (auto it{nodes.begin()}; it != nodes.end(); it = nodes.erase(it)) {
-        BOOST_CHECK(!it->second.IsDirty() && !it->second.IsFresh());
+        BOOST_CHECK(!it->second.IsDirty());
+        BOOST_CHECK(!it->second.IsFresh());
     }
 }
 
@@ -105,9 +107,11 @@ BOOST_AUTO_TEST_CASE(linked_list_random_deletion)
     nodes.erase(n2);
     // Check that n1 now points to n3, and n3 still points to n4
     // Also check that state was not altered
-    BOOST_CHECK(n1->second.IsDirty() && !n1->second.IsFresh());
+    BOOST_CHECK(n1->second.IsDirty());
+    BOOST_CHECK(!n1->second.IsFresh());
     BOOST_CHECK_EQUAL(n1->second.Next(), &(*n3));
-    BOOST_CHECK(n3->second.IsDirty() && !n3->second.IsFresh());
+    BOOST_CHECK(n3->second.IsDirty());
+    BOOST_CHECK(!n3->second.IsFresh());
     BOOST_CHECK_EQUAL(n3->second.Next(), &(*n4));
     BOOST_CHECK_EQUAL(n3->second.Prev(), &(*n1));
 
@@ -116,7 +120,8 @@ BOOST_AUTO_TEST_CASE(linked_list_random_deletion)
     nodes.erase(n1);
     // Check that sentinel now points to n3, and n3 still points to n4
     // Also check that state was not altered
-    BOOST_CHECK(n3->second.IsDirty() && !n3->second.IsFresh());
+    BOOST_CHECK(n3->second.IsDirty());
+    BOOST_CHECK(!n3->second.IsFresh());
     BOOST_CHECK_EQUAL(sentinel.second.Next(), &(*n3));
     BOOST_CHECK_EQUAL(n3->second.Next(), &(*n4));
     BOOST_CHECK_EQUAL(n3->second.Prev(), &sentinel);
@@ -126,7 +131,8 @@ BOOST_AUTO_TEST_CASE(linked_list_random_deletion)
     nodes.erase(n4);
     // Check that sentinel still points to n3, and n3 points to sentinel
     // Also check that state was not altered
-    BOOST_CHECK(n3->second.IsDirty() && !n3->second.IsFresh());
+    BOOST_CHECK(n3->second.IsDirty());
+    BOOST_CHECK(!n3->second.IsFresh());
     BOOST_CHECK_EQUAL(sentinel.second.Next(), &(*n3));
     BOOST_CHECK_EQUAL(n3->second.Next(), &sentinel);
     BOOST_CHECK_EQUAL(sentinel.second.Prev(), &(*n3));
@@ -148,7 +154,8 @@ BOOST_AUTO_TEST_CASE(linked_list_set_state)
 
     // Check that setting DIRTY inserts it into linked list and sets state
     CCoinsCacheEntry::SetDirty(n1, sentinel);
-    BOOST_CHECK(n1.second.IsDirty() && !n1.second.IsFresh());
+    BOOST_CHECK(n1.second.IsDirty());
+    BOOST_CHECK(!n1.second.IsFresh());
     BOOST_CHECK_EQUAL(n1.second.Next(), &sentinel);
     BOOST_CHECK_EQUAL(n1.second.Prev(), &sentinel);
     BOOST_CHECK_EQUAL(sentinel.second.Next(), &n1);
@@ -156,7 +163,8 @@ BOOST_AUTO_TEST_CASE(linked_list_set_state)
 
     // Check that setting FRESH on new node inserts it after n1
     CCoinsCacheEntry::SetFresh(n2, sentinel);
-    BOOST_CHECK(n2.second.IsFresh() && !n2.second.IsDirty());
+    BOOST_CHECK(n2.second.IsFresh());
+    BOOST_CHECK(!n2.second.IsDirty());
     BOOST_CHECK_EQUAL(n2.second.Next(), &sentinel);
     BOOST_CHECK_EQUAL(n2.second.Prev(), &n1);
     BOOST_CHECK_EQUAL(n1.second.Next(), &n2);
@@ -164,7 +172,8 @@ BOOST_AUTO_TEST_CASE(linked_list_set_state)
 
     // Check that we can set extra state, but they don't change our position
     CCoinsCacheEntry::SetFresh(n1, sentinel);
-    BOOST_CHECK(n1.second.IsDirty() && n1.second.IsFresh());
+    BOOST_CHECK(n1.second.IsDirty());
+    BOOST_CHECK(n1.second.IsFresh());
     BOOST_CHECK_EQUAL(n1.second.Next(), &n2);
     BOOST_CHECK_EQUAL(n1.second.Prev(), &sentinel);
     BOOST_CHECK_EQUAL(sentinel.second.Next(), &n1);
@@ -172,7 +181,8 @@ BOOST_AUTO_TEST_CASE(linked_list_set_state)
 
     // Check that we can clear state then re-set it
     n1.second.SetClean();
-    BOOST_CHECK(!n1.second.IsDirty() && !n1.second.IsFresh());
+    BOOST_CHECK(!n1.second.IsDirty());
+    BOOST_CHECK(!n1.second.IsFresh());
     BOOST_CHECK_EQUAL(sentinel.second.Next(), &n2);
     BOOST_CHECK_EQUAL(sentinel.second.Prev(), &n2);
     BOOST_CHECK_EQUAL(n2.second.Next(), &sentinel);
@@ -180,7 +190,8 @@ BOOST_AUTO_TEST_CASE(linked_list_set_state)
 
     // Calling `SetClean` a second time has no effect
     n1.second.SetClean();
-    BOOST_CHECK(!n1.second.IsDirty() && !n1.second.IsFresh());
+    BOOST_CHECK(!n1.second.IsDirty());
+    BOOST_CHECK(!n1.second.IsFresh());
     BOOST_CHECK_EQUAL(sentinel.second.Next(), &n2);
     BOOST_CHECK_EQUAL(sentinel.second.Prev(), &n2);
     BOOST_CHECK_EQUAL(n2.second.Next(), &sentinel);
@@ -188,7 +199,8 @@ BOOST_AUTO_TEST_CASE(linked_list_set_state)
 
     // Adding DIRTY re-inserts it after n2
     CCoinsCacheEntry::SetDirty(n1, sentinel);
-    BOOST_CHECK(n1.second.IsDirty() && !n1.second.IsFresh());
+    BOOST_CHECK(n1.second.IsDirty());
+    BOOST_CHECK(!n1.second.IsFresh());
     BOOST_CHECK_EQUAL(n2.second.Next(), &n1);
     BOOST_CHECK_EQUAL(n1.second.Prev(), &n2);
     BOOST_CHECK_EQUAL(n1.second.Next(), &sentinel);
diff --git a/depend/bitcoin/src/test/coinstatsindex_tests.cpp b/depend/bitcoin/src/test/coinstatsindex_tests.cpp
index f7f97c9b..d3463df5 100644
--- a/depend/bitcoin/src/test/coinstatsindex_tests.cpp
+++ b/depend/bitcoin/src/test/coinstatsindex_tests.cpp
@@ -2,19 +2,25 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
+#include <chain.h>
 #include <index/coinstatsindex.h>
 #include <interfaces/chain.h>
 #include <kernel/coinstats.h>
-#include <kernel/types.h>
+#include <key.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
-#include <test/util/validation.h>
-#include <util/byte_units.h>
+#include <util/check.h>
 #include <validation.h>
 
 #include <boost/test/unit_test.hpp>
 
-using kernel::ChainstateRole;
+#include <memory>
+#include <optional>
+#include <span>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(coinstatsindex_tests)
 
@@ -69,45 +75,4 @@ BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)
     coin_stats_index.Stop();
 }
 
-// Test shutdown between BlockConnected and ChainStateFlushed notifications,
-// make sure index is not corrupted and is able to reload.
-BOOST_FIXTURE_TEST_CASE(coinstatsindex_unclean_shutdown, TestChain100Setup)
-{
-    Chainstate& chainstate = Assert(m_node.chainman)->ActiveChainstate();
-    const CChainParams& params = Params();
-    {
-        CoinStatsIndex index{interfaces::MakeChain(m_node), 1_MiB};
-        BOOST_REQUIRE(index.Init());
-        index.Sync();
-        std::shared_ptr<const CBlock> new_block;
-        CBlockIndex* new_block_index = nullptr;
-        {
-            const CScript script_pub_key{CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG};
-            const CBlock block = this->CreateBlock({}, script_pub_key, chainstate);
-
-            new_block = std::make_shared<CBlock>(block);
-
-            LOCK(cs_main);
-            BlockValidationState state;
-            BOOST_CHECK(CheckBlock(block, state, params.GetConsensus()));
-            BOOST_CHECK(m_node.chainman->AcceptBlock(new_block, state, &new_block_index, true, nullptr, nullptr, true));
-            CCoinsViewCache view(&chainstate.CoinsTip());
-            BOOST_CHECK(chainstate.ConnectBlock(block, state, new_block_index, view));
-        }
-        // Send block connected notification, then stop the index without
-        // sending a chainstate flushed notification. Prior to #24138, this
-        // would cause the index to be corrupted and fail to reload.
-        ValidationInterfaceTest::BlockConnected(ChainstateRole{}, index, new_block, new_block_index);
-        index.Stop();
-    }
-
-    {
-        CoinStatsIndex index{interfaces::MakeChain(m_node), 1_MiB};
-        BOOST_REQUIRE(index.Init());
-        // Make sure the index can be loaded.
-        BOOST_REQUIRE(index.StartBackgroundSync());
-        index.Stop();
-    }
-}
-
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/coinsviewoverlay_tests.cpp b/depend/bitcoin/src/test/coinsviewoverlay_tests.cpp
index 6b20b312..b63807da 100644
--- a/depend/bitcoin/src/test/coinsviewoverlay_tests.cpp
+++ b/depend/bitcoin/src/test/coinsviewoverlay_tests.cpp
@@ -3,24 +3,33 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <coins.h>
+#include <kernel/chainstatemanager_opts.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <primitives/transaction_identifier.h>
 #include <txdb.h>
 #include <uint256.h>
 #include <util/byte_units.h>
-#include <util/hasher.h>
+#include <util/threadpool.h>
 
 #include <boost/test/unit_test.hpp>
 
 #include <cstdint>
 #include <cstring>
+#include <memory>
 #include <ranges>
-
-BOOST_AUTO_TEST_SUITE(coinsviewoverlay_tests)
+#include <unordered_set>
+#include <vector>
 
 namespace {
 
+std::shared_ptr<ThreadPool> MakeStartedThreadPool()
+{
+    auto pool{std::make_shared<ThreadPool>("fetch_test")};
+    pool->Start(DEFAULT_PREVOUTFETCH_THREADS);
+    return pool;
+}
+
 CBlock CreateBlock() noexcept
 {
     static constexpr auto NUM_TXS{100};
@@ -29,10 +38,13 @@ CBlock CreateBlock() noexcept
     coinbase.vin.emplace_back();
     block.vtx.push_back(MakeTransactionRef(coinbase));
 
+    Txid prevhash{Txid::FromUint256(uint256{1})};
+
     for (const auto i : std::views::iota(1, NUM_TXS)) {
         CMutableTransaction tx;
-        Txid txid{Txid::FromUint256(uint256(i))};
+        const Txid txid{i % 20 == 0 ? prevhash : Txid::FromUint256(uint256(i))};
         tx.vin.emplace_back(txid, 0);
+        prevhash = tx.GetHash();
         block.vtx.push_back(MakeTransactionRef(tx));
     }
 
@@ -44,12 +56,16 @@ void PopulateView(const CBlock& block, CCoinsView& view, bool spent = false)
     CCoinsViewCache cache{&view};
     cache.SetBestBlock(uint256::ONE);
 
+    std::unordered_set<Txid, SaltedCoinsCacheHasher> txids{};
+    txids.reserve(block.vtx.size() - 1);
     for (const auto& tx : block.vtx | std::views::drop(1)) {
         for (const auto& in : tx->vin) {
+            if (txids.contains(in.prevout.hash)) continue;
             Coin coin{};
             if (!spent) coin.out.nValue = 1;
-            cache.EmplaceCoinInternalDANGER(COutPoint{in.prevout}, std::move(coin));
+            cache.EmplaceCoinInternalDANGER(in.prevout, std::move(coin));
         }
+        txids.emplace(tx->GetHash());
     }
 
     cache.Flush();
@@ -58,6 +74,8 @@ void PopulateView(const CBlock& block, CCoinsView& view, bool spent = false)
 void CheckCache(const CBlock& block, const CCoinsViewCache& cache)
 {
     uint32_t counter{0};
+    std::unordered_set<Txid, SaltedCoinsCacheHasher> txids{};
+    txids.reserve(block.vtx.size() - 1);
 
     for (const auto& tx : block.vtx) {
         if (tx->IsCoinBase()) {
@@ -68,9 +86,11 @@ void CheckCache(const CBlock& block, const CCoinsViewCache& cache)
                 const auto& first{cache.AccessCoin(outpoint)};
                 const auto& second{cache.AccessCoin(outpoint)};
                 BOOST_CHECK_EQUAL(&first, &second);
-                ++counter;
-                BOOST_CHECK(cache.HaveCoinInCache(outpoint));
+                const auto have{cache.HaveCoinInCache(outpoint)};
+                BOOST_CHECK_NE(txids.contains(outpoint.hash), have);
+                counter += have;
             }
+            txids.emplace(tx->GetHash());
         }
     }
     BOOST_CHECK_EQUAL(cache.GetCacheSize(), counter);
@@ -78,13 +98,16 @@ void CheckCache(const CBlock& block, const CCoinsViewCache& cache)
 
 } // namespace
 
+BOOST_AUTO_TEST_SUITE(coinsviewoverlay_tests)
+
 BOOST_AUTO_TEST_CASE(fetch_inputs_from_db)
 {
     const auto block{CreateBlock()};
     CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
     PopulateView(block, db);
     CCoinsViewCache main_cache{&db};
-    CoinsViewOverlay view{&main_cache};
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+    const auto reset_guard{view.StartFetching(block)};
     const auto& outpoint{block.vtx[1]->vin[0].prevout};
 
     BOOST_CHECK(view.HaveCoin(outpoint));
@@ -111,7 +134,8 @@ BOOST_AUTO_TEST_CASE(fetch_inputs_from_cache)
     CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
     CCoinsViewCache main_cache{&db};
     PopulateView(block, main_cache);
-    CoinsViewOverlay view{&main_cache};
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+    const auto reset_guard{view.StartFetching(block)};
     CheckCache(block, view);
 
     const auto& outpoint{block.vtx[1]->vin[0].prevout};
@@ -131,7 +155,8 @@ BOOST_AUTO_TEST_CASE(fetch_no_double_spend)
     CCoinsViewCache main_cache{&db};
     // Add all inputs as spent already in cache
     PopulateView(block, main_cache, /*spent=*/true);
-    CoinsViewOverlay view{&main_cache};
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+    const auto reset_guard{view.StartFetching(block)};
     for (const auto& tx : block.vtx) {
         for (const auto& in : tx->vin) {
             const auto& c{view.AccessCoin(in.prevout)};
@@ -149,7 +174,8 @@ BOOST_AUTO_TEST_CASE(fetch_no_inputs)
     const auto block{CreateBlock()};
     CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
     CCoinsViewCache main_cache{&db};
-    CoinsViewOverlay view{&main_cache};
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+    const auto reset_guard{view.StartFetching(block)};
     for (const auto& tx : block.vtx) {
         for (const auto& in : tx->vin) {
             const auto& c{view.AccessCoin(in.prevout)};
@@ -161,5 +187,120 @@ BOOST_AUTO_TEST_CASE(fetch_no_inputs)
     BOOST_CHECK_EQUAL(view.GetCacheSize(), 0);
 }
 
+// Access coins that are not block inputs
+BOOST_AUTO_TEST_CASE(access_non_input_coins)
+{
+    CBlock block;
+    CMutableTransaction coinbase;
+    coinbase.vin.emplace_back();
+    block.vtx.push_back(MakeTransactionRef(coinbase));
+    CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
+    CCoinsViewCache main_cache{&db};
+    Coin coin{};
+    coin.out.nValue = 1;
+    const COutPoint outpoint{Txid::FromUint256(uint256::ZERO), 0};
+    main_cache.EmplaceCoinInternalDANGER(COutPoint{outpoint}, std::move(coin));
+
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+    const auto reset_guard{view.StartFetching(block)};
+
+    // Non-input fallback hit.
+    BOOST_CHECK(!view.AccessCoin(outpoint).IsSpent());
+
+    // Non-input fallback miss.
+    const COutPoint missing_outpoint{Txid::FromUint256(uint256::ONE), 0};
+    BOOST_CHECK(view.AccessCoin(missing_outpoint).IsSpent());
+    BOOST_CHECK(!view.HaveCoinInCache(missing_outpoint));
+}
+
+// Access a fetched input out of order (i.e. not the next one in m_inputs).
+// FetchCoinFromBase must fall back to base->PeekCoin, and the coin must still
+// be inserted into the cache.
+BOOST_AUTO_TEST_CASE(fetch_out_of_order_input_uses_normal_lookup)
+{
+    const auto block{CreateBlock()};
+    CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
+    CCoinsViewCache main_cache{&db};
+    PopulateView(block, main_cache);
+
+    std::vector<COutPoint> fetched_inputs;
+    std::unordered_set<Txid, SaltedCoinsCacheHasher> txids;
+    txids.reserve(block.vtx.size() - 1);
+    for (const auto& tx : block.vtx | std::views::drop(1)) {
+        for (const auto& input : tx->vin) {
+            if (!txids.contains(input.prevout.hash)) fetched_inputs.push_back(input.prevout);
+        }
+        txids.emplace(tx->GetHash());
+    }
+    BOOST_REQUIRE_GE(fetched_inputs.size(), 2U);
+
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+    const auto reset_guard{view.StartFetching(block)};
+
+    const auto& out_of_order_input{fetched_inputs[1]};
+    BOOST_CHECK(!view.HaveCoinInCache(out_of_order_input));
+    BOOST_CHECK(!view.AccessCoin(out_of_order_input).IsSpent());
+    BOOST_CHECK(view.HaveCoinInCache(out_of_order_input));
+
+    CheckCache(block, view);
+}
+
+// The ResetGuard returned by StartFetching must clear all per-block state when
+// it goes out of scope, so the overlay can be reused for a subsequent block.
+// Flush must also clear all per-block state to be reused.
+BOOST_AUTO_TEST_CASE(fetch_state_is_reusable_after_teardown)
+{
+    const auto block{CreateBlock()};
+    CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
+    CCoinsViewCache main_cache{&db};
+    PopulateView(block, main_cache);
+    CoinsViewOverlay view{&main_cache, MakeStartedThreadPool()};
+
+    for (const bool use_flush : {false, true, false}) {
+        {
+            const auto reset_guard{view.StartFetching(block)};
+            CheckCache(block, view);
+            BOOST_CHECK_GT(view.GetCacheSize(), 0U);
+            if (use_flush) {
+                view.SetBestBlock(uint256::ONE);
+                view.Flush();
+            }
+        }
+        BOOST_CHECK_EQUAL(view.GetCacheSize(), 0U);
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
+BOOST_AUTO_TEST_SUITE(coinsviewoverlay_tests_noworkers)
+
+// Test that disabled input fetching falls back to normal cache lookups via base->PeekCoin.
+BOOST_AUTO_TEST_CASE(fetch_unstarted_thread_pool)
+{
+    const auto block{CreateBlock()};
+    CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
+    CCoinsViewCache main_cache{&db};
+    PopulateView(block, main_cache);
+    auto thread_pool{std::make_shared<ThreadPool>("fetch_none")};
+    CoinsViewOverlay view{&main_cache, thread_pool};
+    const auto reset_guard{view.StartFetching(block)};
+    CheckCache(block, view);
+}
+
+// Test that an interrupted thread pool falls back to normal cache lookups via base->PeekCoin.
+BOOST_AUTO_TEST_CASE(fetch_interrupted_thread_pool_uses_normal_lookup)
+{
+    const auto block{CreateBlock()};
+    CCoinsViewDB db{{.path = "", .cache_bytes = 1_MiB, .memory_only = true}, {}};
+    CCoinsViewCache main_cache{&db};
+    PopulateView(block, main_cache);
+
+    auto thread_pool{std::make_shared<ThreadPool>("fetch_intr")};
+    thread_pool->Start(DEFAULT_PREVOUTFETCH_THREADS);
+    thread_pool->Interrupt();
+    CoinsViewOverlay view{&main_cache, thread_pool};
+    const auto reset_guard{view.StartFetching(block)};
+    CheckCache(block, view);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/common_url_tests.cpp b/depend/bitcoin/src/test/common_url_tests.cpp
index 065c7d97..33e80c82 100644
--- a/depend/bitcoin/src/test/common_url_tests.cpp
+++ b/depend/bitcoin/src/test/common_url_tests.cpp
@@ -5,6 +5,7 @@
 #include <common/url.h>
 
 #include <string>
+#include <string_view>
 
 #include <boost/test/unit_test.hpp>
 
@@ -72,4 +73,44 @@ BOOST_AUTO_TEST_CASE(decode_internal_nulls_test) {
     BOOST_CHECK_EQUAL(UrlDecode("abc%00%00"), result2);
 }
 
+BOOST_AUTO_TEST_CASE(url_encode) {
+    auto to_encode = std::string_view{
+        "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+        "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+        "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+        "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+        "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+        "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+        "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+        "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+        "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+        "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+        "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+        "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+        "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+        "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+        "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+        "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+        256};
+    auto expected_encoded =
+        "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F"
+        "%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F"
+        "%20%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F"
+        "0123456789%3A%3B%3C%3D%3E%3F"
+        "%40ABCDEFGHIJKLMNO"
+        "PQRSTUVWXYZ%5B%5C%5D%5E_"
+        "%60abcdefghijklmno"
+        "pqrstuvwxyz%7B%7C%7D~%7F"
+        "%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F"
+        "%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F"
+        "%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF"
+        "%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF"
+        "%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF"
+        "%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF"
+        "%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF"
+        "%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF";
+    BOOST_CHECK_EQUAL(UrlEncode(to_encode), expected_encoded);
+    BOOST_CHECK_EQUAL(UrlDecode(expected_encoded), to_encode);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/data/script_tests.json b/depend/bitcoin/src/test/data/script_tests.json
index 25581c4d..b88c6415 100644
--- a/depend/bitcoin/src/test/data/script_tests.json
+++ b/depend/bitcoin/src/test/data/script_tests.json
@@ -2569,9 +2569,27 @@
     "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the second key"
 ],
 
+["CHECKSIGVERIFY and CHECKMULTISIGVERIFY failure tests"],
+["0", "0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 CHECKSIGVERIFY 1", "P2SH,STRICTENC", "CHECKSIGVERIFY", "CHECKSIGVERIFY fails with its own error code when the signature check fails"],
+["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIGVERIFY 1", "P2SH,STRICTENC", "CHECKMULTISIGVERIFY", "CHECKMULTISIGVERIFY fails with its own error code when the signature check fails"],
+
+["CHECKLOCKTIMEVERIFY tests"],
+["All tests below can only exercise failure paths: the spending transaction in these tests"],
+["has nLockTime 0 and a final nSequence, so CheckLockTime never succeeds."],
+["", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "INVALID_STACK_OPERATION", "CLTV automatically fails on an empty stack"],
+["-1", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "NEGATIVE_LOCKTIME", "CLTV automatically fails if stack top is negative"],
+["0x0180", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "UNSATISFIED_LOCKTIME", "Negative zero is treated as 0, so CLTV fails with UNSATISFIED_LOCKTIME rather than NEGATIVE_LOCKTIME"],
+["0x0100", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY,MINIMALDATA", "SCRIPTNUM", "CLTV use is non-standard if stack top is not minimally encoded"],
+["0", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "UNSATISFIED_LOCKTIME", "CLTV fails if the input's nSequence is final, even when the lock time requirement is met"],
+["499999999", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "UNSATISFIED_LOCKTIME", "CLTV fails if the stack operand (height) is greater than the tx nLockTime"],
+["500000000", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "UNSATISFIED_LOCKTIME", "CLTV fails if the operand is time-based while the tx nLockTime is height-based"],
+["0x050000000001", "CHECKLOCKTIMEVERIFY", "CHECKLOCKTIMEVERIFY", "UNSATISFIED_LOCKTIME",
+ "CLTV accepts a 5-byte operand (2^32), but it is time-based while the tx nLockTime is height-based"],
+
 ["CHECKSEQUENCEVERIFY tests"],
 ["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on an empty stack"],
 ["-1", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"],
+["0x0180", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "Negative zero is treated as 0, so CSV fails with UNSATISFIED_LOCKTIME rather than NEGATIVE_LOCKTIME"],
 ["0x0100", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY,MINIMALDATA", "SCRIPTNUM", "CSV fails if stack top is not minimally encoded"],
 ["0", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"],
 ["0x050000000001", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME",
diff --git a/depend/bitcoin/src/test/data/siphash.json b/depend/bitcoin/src/test/data/siphash.json
new file mode 100644
index 00000000..19b4aaad
--- /dev/null
+++ b/depend/bitcoin/src/test/data/siphash.json
@@ -0,0 +1,732 @@
+[
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": [],
+    "expected": {"siphash24": "1e924b9d737700d7", "siphash13uj": "74fdd8982aa99156"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": [],
+    "expected": {"siphash24": "726fdb47dd0e0e31", "siphash13uj": "feee657d7e331ac3"}
+  },
+  {
+    "key": ["ffffffffffffffff", "ffffffffffffffff"],
+    "input": [],
+    "expected": {"siphash24": "35dd279ee86ce565", "siphash13uj": "b2203b65f6fc20f2"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000000"],
+    "expected": {"siphash24": "39d3851ca07681a7", "siphash13uj": "6a74cba00ddbfeba"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["ffffffffffffffff"],
+    "expected": {"siphash24": "2a68ff30a3d9da34", "siphash13uj": "a49b16683645df11"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304050607"],
+    "expected": {"siphash24": "93f5f5799a932462", "siphash13uj": "636d75a66b0b2dee"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["0000000000000000"],
+    "expected": {"siphash24": "e849e8bb6ffe2567", "siphash13uj": "44ba508bb47f860a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000000000000000000000000000000000000000000000000000000"],
+    "expected": {"siphash24": "8990d3e4299496f4", "siphash13uj": "6a74cba00ddbfeba"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"],
+    "expected": {"siphash24": "e1041d47f898e431", "siphash13uj": "7f745a471ec7c2f6"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"],
+    "expected": {"siphash24": "7127512f72f27cce", "siphash13uj": "c67d87b08ca4b5c6"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["0000000000000000000000000000000000000000000000000000000000000000"],
+    "expected": {"siphash24": "6c37e103dfa2827d", "siphash13uj": "44ba508bb47f860a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["1011121314151617"],
+    "expected": {"siphash24": "76b71a8cb872b528", "siphash13uj": "17bd848a0ddd6294"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["1011121314151617000000000000000000000000000000000000000000000000"],
+    "expected": {"siphash24": "070fb8d2b4264e7e", "siphash13uj": "17bd848a0ddd6294"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0102030405060708", "0203040506070809", "030405060708090a"],
+    "expected": {"siphash24": "9b3c1cee5de9caa4", "siphash13uj": "46b8c5978195f0d0"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0102030405060708000000000000000000000000000000000000000000000000", "0203040506070809000000000000000000000000000000000000000000000000", "030405060708090a000000000000000000000000000000000000000000000000"],
+    "expected": {"siphash24": "e9277fda84de2f84", "siphash13uj": "46b8c5978195f0d0"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f"],
+    "expected": {"siphash24": "27bd5ecb84e56c87", "siphash13uj": "d2c0b9ab84599147"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["4041424344454647", "48494a4b4c4d4e4f", "5051525354555657", "58595a5b5c5d5e5f"],
+    "expected": {"siphash24": "27bd5ecb84e56c87", "siphash13uj": "d630244e335448dd"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304050607", "08090a0b0c0d0e0f"],
+    "expected": {"siphash24": "3f2acc7f57c29bdb", "siphash13uj": "7c25d372353b5aa1"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304050607", "08090a0b0c0d0e0f", "1011121314151617", "18191a1b1c1d1e1f"],
+    "expected": {"siphash24": "7127512f72f27cce", "siphash13uj": "1aba99b7cf175f4a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304050607", "08090a0b0c0d0e0f", "1011121314151617", "18191a1b1c1d1e1f", "2021222324252627", "28292a2b2c2d2e2f", "3031323334353637", "38393a3b3c3d3e3f"],
+    "expected": {"siphash24": "acd2c40b8502cad8", "siphash13uj": "ba4cdea787bdabb9"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000", "0000000000000000"],
+    "expected": {"siphash24": "d6d266a868d1e17c", "siphash13uj": "b40ca9149482127a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"],
+    "expected": {"siphash24": "acd2c40b8502cad8", "siphash13uj": "6bd1d4ec2ccd0192"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f", "404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f", "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f"],
+    "expected": {"siphash24": "deb79e256c8736ae", "siphash13uj": "497a4c5f66a6c9ac"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f", "404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f", "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f", "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f", "a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf", "c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "e0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"],
+    "expected": {"siphash24": "999d0526d2a7bfd7", "siphash13uj": "33f9f36a0690842d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["1112131415161718", "22232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f4041"],
+    "expected": {"siphash24": "2a8b45c236d6964c", "siphash13uj": "2e989a98fc8ab941"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["22232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f4041", "1112131415161718"],
+    "expected": {"siphash24": "2086c12dd61e796a", "siphash13uj": "6f62e14ce40a8928"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["a0a1a2a3a4a5a6a7", "b0b1b2b3b4b5b6b7"],
+    "expected": {"siphash24": "103eacf2c5a3c798", "siphash13uj": "3d50654ce19fef0a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["b0b1b2b3b4b5b6b7", "a0a1a2a3a4a5a6a7"],
+    "expected": {"siphash24": "16098ab961ca74be", "siphash13uj": "93d52229e1bf3f12"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0102030405060708", "02030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021", "030405060708090a"],
+    "expected": {"siphash24": "f33f8a1ac89a38a5", "siphash13uj": "93d4844f68473bde"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20", "0203040506070809", "030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122"],
+    "expected": {"siphash24": "83a7e7cb48fcc3f0", "siphash13uj": "1eeb5627f80ec45e"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0101010101010101", "0202020202020202", "0303030303030303030303030303030303030303030303030303030303030303", "0404040404040404040404040404040404040404040404040404040404040404", "0505050505050505"],
+    "expected": {"siphash24": "2da632417cf98266", "siphash13uj": "36c183e8c31960ca"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304050607", "08090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627", "28292a2b2c2d2e2f", "303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f", "5051525354555657", "58595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f7071727374757677"],
+    "expected": {"siphash24": "9fee744ff1c22fcc", "siphash13uj": "0373fa0d4680e12a"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["3031323334353637", "505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f"],
+    "expected": {"siphash24": "f4b057ed3852ca9c", "siphash13uj": "0ca784307a2b3941"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["3031323334353637", "505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f"],
+    "expected": {"siphash24": "b0ecaab557894381", "siphash13uj": "40a0e330ade3b826"}
+  },
+  {
+    "key": ["ffffffffffffffff", "ffffffffffffffff"],
+    "input": ["3031323334353637", "505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f"],
+    "expected": {"siphash24": "c31e72088331c72c", "siphash13uj": "39b802d0fb124208"}
+  },
+  {
+    "key": ["0123456789abcdef", "0000000000000000"],
+    "input": ["3031323334353637", "505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f"],
+    "expected": {"siphash24": "f74571f90abc512c", "siphash13uj": "21bd1ab2c8db2044"}
+  },
+  {
+    "key": ["0000000000000000", "0123456789abcdef"],
+    "input": ["3031323334353637", "505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f"],
+    "expected": {"siphash24": "4b58713a5c1de640", "siphash13uj": "bc66d61864912a68"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0100000000000000"],
+    "expected": {"siphash24": "2b91b2b085e6d1f6", "siphash13uj": "7426afff81e13e5d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000080"],
+    "expected": {"siphash24": "45f93120d11c42c2", "siphash13uj": "dbd8592fe9fd3b1b"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000000000000000000000000000000000000000000000000000080"],
+    "expected": {"siphash24": "52de95ec1fc46cf4", "siphash13uj": "c946b5eafdebf91d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0100000000000000010000000000000001000000000000000100000000000000"],
+    "expected": {"siphash24": "256fc49da00e8ae9", "siphash13uj": "28193aab7f7f53b5"}
+  },
+  {
+    "key": ["3becfe231ec833e1", "e5fe84a1124e5b76"],
+    "input": ["5d6fae7bea1143a44b6a307d8dd3a8d5946d1b50943a0a4edb5390d7f41c6e29", "d22ee74ea5bb4d8d", "8032bbb059b1b9ef", "ec2ae4550dad3c60"],
+    "expected": {"siphash24": "2f57b02b4a7cf7d6", "siphash13uj": "8f201c9a3e7ca92a"}
+  },
+  {
+    "key": ["cff49392d5b0aefe", "b8a0d7022086fc70"],
+    "input": [],
+    "expected": {"siphash24": "9c7123b7b45d0895", "siphash13uj": "25f929e44740ac55"}
+  },
+  {
+    "key": ["9bf012bb0d65f966", "f15a2c8514da1d9d"],
+    "input": [],
+    "expected": {"siphash24": "a5c78c807512368a", "siphash13uj": "e317bf983b4cf183"}
+  },
+  {
+    "key": ["4ac23ef0d1555a54", "4a498a3964dd2bc1"],
+    "input": ["3e83c8e8b335d732", "539aea9c7872ae8f", "6f14ac803d3a9181"],
+    "expected": {"siphash24": "be7ea59e0e60a59d", "siphash13uj": "3adb5b8275ff1694"}
+  },
+  {
+    "key": ["eef84fb309e552b9", "e60195c78faa2ee8"],
+    "input": [],
+    "expected": {"siphash24": "001e0c1c4140f9ec", "siphash13uj": "2bdc46f9f5e83bdc"}
+  },
+  {
+    "key": ["ecfdd5a1ea62a991", "6448b8f842081342"],
+    "input": ["6d72f7bce2f0f751", "e277849660a8af7f"],
+    "expected": {"siphash24": "3bc824e8141dcdd9", "siphash13uj": "89510c79ae874736"}
+  },
+  {
+    "key": ["ab7a12b9c8774c7d", "38056b7041eb2098"],
+    "input": ["feebaa5f18a92c7e", "192679c9e82e3aa7"],
+    "expected": {"siphash24": "783219f01bb9d829", "siphash13uj": "a7cb7379701c754e"}
+  },
+  {
+    "key": ["13551d7a6089e83e", "ec3f8c0f4cbc1f7c"],
+    "input": ["7a0704789365d997", "4bb21a07f4b75d0208d5d4638edcc438c9f8ffcc78e2106a0637c629f81ffbdb", "a7d8197a04173065ec896b73a6803d6113201c56fd643b241200b7ea357e6efd", "0202e1ebcf15e1a8", "316c96f5464fa473", "0700f913bbe4dad357c5db1b7e79abd29e6e590e842141a16cb6e97e6933206c"],
+    "expected": {"siphash24": "30cca0cb21a31ffe", "siphash13uj": "638ab9733accc61a"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f"],
+    "expected": {"siphash24": "1ca45bed0c8a9300", "siphash13uj": "071384882b8b1ef6"}
+  },
+  {
+    "key": ["ffffffffffffffff", "ffffffffffffffff"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f"],
+    "expected": {"siphash24": "acb2f25002d4ece5", "siphash13uj": "6d3cb0c74116cdd5"}
+  },
+  {
+    "key": ["25fd75c04a240044", "4e3816151d29e2ce"],
+    "input": ["8940d79240a5bf8acdf428eece829dc27d8cc2ff7b74aaeb134f66062192d308"],
+    "expected": {"siphash24": "135eaef5f79941ad", "siphash13uj": "16823b5389538dba"}
+  },
+  {
+    "key": ["aea4345a0fc4e761", "49456a8e8d82e5ee"],
+    "input": ["6e0e507f21292ad46a49aa0b20efec23000474f6203f5ceaf4f9325c4e032bbe"],
+    "expected": {"siphash24": "56e57b1e7d81c846", "siphash13uj": "36ae52fdbe166c9a"}
+  },
+  {
+    "key": ["f7ce16edcfe54eeb", "81c22c4aed3e516d"],
+    "input": ["caf32c2d8d827c8e55ee92253cffc657359af1cab7f24804afabac89a436fc75"],
+    "expected": {"siphash24": "84cad9f91acd36d0", "siphash13uj": "d8ebd74386d41628"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["22232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f4041", "11121314"],
+    "expected": {"siphash24": "6ff1e744e4b586fc"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000000000000000000000000000000000000000000000000000000", "00000000"],
+    "expected": {"siphash24": "115c6b8926ef399f"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "ffffffff"],
+    "expected": {"siphash24": "0b2ebbee73a3d1ed"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "40414243"],
+    "expected": {"siphash24": "65f756d1213070be"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0100000000000000000000000000000000000000000000000000000000000000", "00000000"],
+    "expected": {"siphash24": "12691f997c461ea1"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f", "20212223"],
+    "expected": {"siphash24": "c1164a11849da500"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f", "21222324"],
+    "expected": {"siphash24": "0efac191c5ac8cff"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f", "20212223"],
+    "expected": {"siphash24": "fb3489181e5cf821"}
+  },
+  {
+    "key": ["49b001bc5a213d62", "80a330a42e60a89d"],
+    "input": ["6f7438d2dd360dcea691dd40e87426f4af6870315898ccbde0d3b19fcbb5ae6d", "55c36c12"],
+    "expected": {"siphash24": "fe9e704f0f707a09"}
+  },
+  {
+    "key": ["f4d704fa00ce074d", "6f1a65f3fe494b0a"],
+    "input": ["175202cb9f976ebd6c4ddc4a80d63b2b53e2976466041ae43b41397c41fe66ac", "803a0172"],
+    "expected": {"siphash24": "42861dd0d0b147c5"}
+  },
+  {
+    "key": ["c3f929b4cb53785c", "1693fa676a8ee165"],
+    "input": ["2ac097c589bc75eb6e294605cafb3198891ff93764032225756aab86de06514b", "5c642eed"],
+    "expected": {"siphash24": "f4c119ec8022dc9f"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000"],
+    "expected": {"siphash24": "9aef4ef6217cbc9b", "siphash13uj": "71c3a354a6b56058"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "ffffffffffffffff"],
+    "expected": {"siphash24": "ccf329a45ab38059", "siphash13uj": "958c1a52a5e57e8b"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "4041424344454647"],
+    "expected": {"siphash24": "50a2be7f0f871937", "siphash13uj": "6cfc788446f0491d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0100000000000000000000000000000000000000000000000000000000000000", "0000000000000080"],
+    "expected": {"siphash24": "5c7d5fcb5ea2a305", "siphash13uj": "9e89e2fc7abb2ba2"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f", "2021222324252627"],
+    "expected": {"siphash24": "ac705932e98104a4", "siphash13uj": "cdcd25f7a2ba32c5"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f", "2122232425262728"],
+    "expected": {"siphash24": "7cbaa4ae7acddb81", "siphash13uj": "738d1f7d2d53622b"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f", "2021222324252627"],
+    "expected": {"siphash24": "22cfffe8bffea59f", "siphash13uj": "0f078522df1349f3"}
+  },
+  {
+    "key": ["49b001bc5a213d62", "80a330a42e60a89d"],
+    "input": ["6f7438d2dd360dcea691dd40e87426f4af6870315898ccbde0d3b19fcbb5ae6d", "55c36c12f25fffc9"],
+    "expected": {"siphash24": "9a5250a51a9eebfb", "siphash13uj": "da1c5bf6cf31653d"}
+  },
+  {
+    "key": ["f4d704fa00ce074d", "6f1a65f3fe494b0a"],
+    "input": ["175202cb9f976ebd6c4ddc4a80d63b2b53e2976466041ae43b41397c41fe66ac", "803a01720ad0c5a9"],
+    "expected": {"siphash24": "70552fcc39899ae4", "siphash13uj": "5725ddc762049274"}
+  },
+  {
+    "key": ["c3f929b4cb53785c", "1693fa676a8ee165"],
+    "input": ["2ac097c589bc75eb6e294605cafb3198891ff93764032225756aab86de06514b", "5c642eedd61df985"],
+    "expected": {"siphash24": "7b87d628efb69dd7", "siphash13uj": "49b121224ea53698"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": [""],
+    "expected": {"siphash24": "726fdb47dd0e0e31"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["00"],
+    "expected": {"siphash24": "74f839c593dc67fd"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001"],
+    "expected": {"siphash24": "0d6c8009d9a94f5a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102"],
+    "expected": {"siphash24": "85676696d7fb7e2d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["00010203"],
+    "expected": {"siphash24": "cf2794e0277187b7"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304"],
+    "expected": {"siphash24": "18765564cd99a68d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405"],
+    "expected": {"siphash24": "cbc9466e58fee3ce"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["00010203040506"],
+    "expected": {"siphash24": "ab0200f58b01d137"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708"],
+    "expected": {"siphash24": "9e0082df0ba9e4b0"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["00010203040506070809"],
+    "expected": {"siphash24": "7a5dbbc594ddb9f3"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a"],
+    "expected": {"siphash24": "f4b32f46226bada7"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b"],
+    "expected": {"siphash24": "751e8fbc860ee5fb"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c"],
+    "expected": {"siphash24": "14ea5627c0843d90"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d"],
+    "expected": {"siphash24": "f723ca908e7af2ee"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e"],
+    "expected": {"siphash24": "a129ca6149be45e5"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f"],
+    "expected": {"siphash24": "3f2acc7f57c29bdb"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f10"],
+    "expected": {"siphash24": "699ae9f52cbe4794"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f1011"],
+    "expected": {"siphash24": "4bc1b3f0968dd39c"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112"],
+    "expected": {"siphash24": "bb6dc91da77961bd"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f10111213"],
+    "expected": {"siphash24": "bed65cf21aa2ee98"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f1011121314"],
+    "expected": {"siphash24": "d0f2cbb02e3b67c7"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415"],
+    "expected": {"siphash24": "93536795e3a33e88"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f10111213141516"],
+    "expected": {"siphash24": "a80c038ccd5ccec8"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f1011121314151617"],
+    "expected": {"siphash24": "b8ad50c6f649af94"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718"],
+    "expected": {"siphash24": "bce192de8a85b8ea"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f10111213141516171819"],
+    "expected": {"siphash24": "17d835b85bbb15f3"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a"],
+    "expected": {"siphash24": "2f2e6163076bcfad"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b"],
+    "expected": {"siphash24": "de4daaaca71dc9a5"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c"],
+    "expected": {"siphash24": "a6a2506687956571"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d"],
+    "expected": {"siphash24": "ad87a3535c49ef28"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e"],
+    "expected": {"siphash24": "32d892fad841c342"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"],
+    "expected": {"siphash24": "a7f32346f95978e3"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021"],
+    "expected": {"siphash24": "12e0b01abb051238"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122"],
+    "expected": {"siphash24": "15e034d40fa197ae"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212223"],
+    "expected": {"siphash24": "314dffbe0815a3b4"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324"],
+    "expected": {"siphash24": "027990f029623981"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425"],
+    "expected": {"siphash24": "cadcd4e59ef40c4d"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212223242526"],
+    "expected": {"siphash24": "9abfd8766a33735c"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627"],
+    "expected": {"siphash24": "0e3ea96b5304a7d0"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728"],
+    "expected": {"siphash24": "ad0c42d6fc585992"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212223242526272829"],
+    "expected": {"siphash24": "187306c89bc215a9"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a"],
+    "expected": {"siphash24": "d4a60abcf3792b95"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b"],
+    "expected": {"siphash24": "f935451de4f21df2"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c"],
+    "expected": {"siphash24": "a9538f0419755787"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d"],
+    "expected": {"siphash24": "db9acddff56ca510"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e"],
+    "expected": {"siphash24": "d06c98cd5c0975eb"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f"],
+    "expected": {"siphash24": "e612a3cb9ecba951"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30"],
+    "expected": {"siphash24": "c766e62cfcadaf96"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031"],
+    "expected": {"siphash24": "ee64435a9752fe72"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132"],
+    "expected": {"siphash24": "a192d576b245165a"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233"],
+    "expected": {"siphash24": "0a8787bf8ecb74b2"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334"],
+    "expected": {"siphash24": "81b3e73d20b49b6f"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435"],
+    "expected": {"siphash24": "7fa8220ba3b2ecea"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233343536"],
+    "expected": {"siphash24": "245731c13ca42499"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637"],
+    "expected": {"siphash24": "b78dbfaf3a8d83bd"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738"],
+    "expected": {"siphash24": "ea1ad565322a1a0b"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233343536373839"],
+    "expected": {"siphash24": "60e61c23a3795013"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a"],
+    "expected": {"siphash24": "6606d7e446282b93"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b"],
+    "expected": {"siphash24": "6ca4ecb15c5f91e1"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c"],
+    "expected": {"siphash24": "9f626da15c9625f3"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d"],
+    "expected": {"siphash24": "e51b38608ef25f57"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e"],
+    "expected": {"siphash24": "958a324ceb064572"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["", ""],
+    "expected": {"siphash24": "726fdb47dd0e0e31"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["", "00010203"],
+    "expected": {"siphash24": "cf2794e0277187b7"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["00010203", ""],
+    "expected": {"siphash24": "cf2794e0277187b7"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["0001020304050607", ""],
+    "expected": {"siphash24": "93f5f5799a932462"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102", "030405"],
+    "expected": {"siphash24": "cbc9466e58fee3ce"}
+  },
+  {
+    "key": ["0000000000000000", "0000000000000000"],
+    "input": ["0001020304", "0506070809"],
+    "expected": {"siphash24": "789ad31dad123412"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["000102030405060708090a0b0c0d0e0f", "ff"],
+    "expected": {"siphash24": "de12af186282e681"}
+  },
+  {
+    "key": ["ffffffffffffffff", "ffffffffffffffff"],
+    "input": ["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", ""],
+    "expected": {"siphash24": "5b57d1f2ce33f816"}
+  },
+  {
+    "key": ["0706050403020100", "0f0e0d0c0b0a0908"],
+    "input": ["00", "01", "02", "03", "04"],
+    "expected": {"siphash24": "18765564cd99a68d"}
+  }
+]
diff --git a/depend/bitcoin/src/test/dbwrapper_tests.cpp b/depend/bitcoin/src/test/dbwrapper_tests.cpp
index a57b77e3..185bf491 100644
--- a/depend/bitcoin/src/test/dbwrapper_tests.cpp
+++ b/depend/bitcoin/src/test/dbwrapper_tests.cpp
@@ -184,6 +184,13 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
 
         // key3 should've never been written
         BOOST_CHECK(dbw.Read(key3, res) == false);
+
+        batch.Clear();
+        batch.Write(key3, in3);
+        dbw.WriteBatch(batch);
+
+        BOOST_CHECK(dbw.Read(key3, res));
+        BOOST_CHECK_EQUAL(res.ToString(), in3.ToString());
     }
 }
 
@@ -212,18 +219,36 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
         BOOST_CHECK(!it->GetKey(key_too_large));
 
         uint8_t key_res;
+
+        BOOST_REQUIRE(it->GetKey(key_res));
+        BOOST_CHECK_EQUAL(key_res, key);
+        // A failed value decode must not leave the iterator's scratch stream dirty.
+        std::pair<uint256, uint8_t> value_too_large;
+        BOOST_CHECK(!it->GetValue(value_too_large));
+
         uint256 val_res;
+        BOOST_REQUIRE(it->GetValue(val_res));
+        BOOST_CHECK_EQUAL(val_res.ToString(), in.ToString());
+
+        it->Seek(key2);
 
         BOOST_REQUIRE(it->GetKey(key_res));
+        BOOST_CHECK_EQUAL(key_res, key2);
         BOOST_REQUIRE(it->GetValue(val_res));
+        BOOST_CHECK_EQUAL(val_res.ToString(), in2.ToString());
+
+        it->Seek(key);
+
+        BOOST_REQUIRE(it->GetKey(key_res));
         BOOST_CHECK_EQUAL(key_res, key);
+        BOOST_REQUIRE(it->GetValue(val_res));
         BOOST_CHECK_EQUAL(val_res.ToString(), in.ToString());
 
         it->Next();
 
         BOOST_REQUIRE(it->GetKey(key_res));
-        BOOST_REQUIRE(it->GetValue(val_res));
         BOOST_CHECK_EQUAL(key_res, key2);
+        BOOST_REQUIRE(it->GetValue(val_res));
         BOOST_CHECK_EQUAL(val_res.ToString(), in2.ToString());
 
         it->Next();
diff --git a/depend/bitcoin/src/test/denialofservice_tests.cpp b/depend/bitcoin/src/test/denialofservice_tests.cpp
index 9709eacd..1a003c00 100644
--- a/depend/bitcoin/src/test/denialofservice_tests.cpp
+++ b/depend/bitcoin/src/test/denialofservice_tests.cpp
@@ -91,8 +91,8 @@ BOOST_AUTO_TEST_CASE(outbound_slow_chain_eviction)
     }
     connman.FlushSendBuffer(dummyNode1);
 
-    NodeClockContext clock_ctx{};
-    clock_ctx += 21min;
+    FakeNodeClock clock{};
+    clock += 21min;
 
     BOOST_CHECK(peerman.SendMessages(dummyNode1)); // should result in getheaders
     {
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(outbound_slow_chain_eviction)
         BOOST_CHECK(!to_send.empty());
     }
 
-    clock_ctx += 3min;
+    clock += 3min;
     BOOST_CHECK(peerman.SendMessages(dummyNode1)); // should result in disconnect
     BOOST_CHECK(dummyNode1.fDisconnect == true);
 
@@ -153,7 +153,7 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
     options.m_max_automatic_connections = DEFAULT_MAX_PEER_CONNECTIONS;
 
     const auto time_init{Now<NodeSeconds>()};
-    NodeClockContext clock_ctx{time_init};
+    FakeNodeClock clock{time_init};
     const auto delta{3 * std::chrono::seconds{m_node.chainman->GetConsensus().nPowTargetSpacing} + 1s};
     connman->Init(options);
     std::vector<CNode *> vNodes;
@@ -170,7 +170,7 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
         BOOST_CHECK(node->fDisconnect == false);
     }
 
-    clock_ctx += delta;
+    clock += delta;
 
     // Now tip should definitely be stale, and we should look for an extra
     // outbound peer
@@ -185,9 +185,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
     // If we add one more peer, something should get marked for eviction
     // on the next check (since we're mocking the time to be in the future, the
     // required time connected check should be satisfied).
-    clock_ctx.set(time_init);
+    clock.set(time_init);
     AddRandomOutboundPeer(id, vNodes, *peerLogic, *connman, ConnectionType::OUTBOUND_FULL_RELAY);
-    clock_ctx += delta;
+    clock += delta;
 
     peerLogic->CheckForStaleTipAndEvictPeers();
     for (int i = 0; i < max_outbound_full_relay; ++i) {
@@ -213,9 +213,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
 
     // Add an onion peer, that will be protected because it is the only one for
     // its network, so another peer gets disconnected instead.
-    clock_ctx.set(time_init);
+    clock.set(time_init);
     AddRandomOutboundPeer(id, vNodes, *peerLogic, *connman, ConnectionType::OUTBOUND_FULL_RELAY, /*onion_peer=*/true);
-    clock_ctx += delta;
+    clock += delta;
     peerLogic->CheckForStaleTipAndEvictPeers();
 
     for (int i = 0; i < max_outbound_full_relay - 2; ++i) {
@@ -226,9 +226,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
     BOOST_CHECK(vNodes[max_outbound_full_relay]->fDisconnect == false);
 
     // Add a second onion peer which won't be protected
-    clock_ctx.set(time_init);
+    clock.set(time_init);
     AddRandomOutboundPeer(id, vNodes, *peerLogic, *connman, ConnectionType::OUTBOUND_FULL_RELAY, /*onion_peer=*/true);
-    clock_ctx += delta;
+    clock += delta;
     peerLogic->CheckForStaleTipAndEvictPeers();
 
     BOOST_CHECK(vNodes.back()->fDisconnect == true);
@@ -243,6 +243,7 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
 BOOST_FIXTURE_TEST_CASE(block_relay_only_eviction, OutboundTest)
 {
     NodeId id{0};
+    FakeNodeClock clock{};
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman, Params());
     auto peerLogic = PeerManager::make(*connman, *m_node.addrman, nullptr, *m_node.chainman, *m_node.mempool, *m_node.warnings, {});
 
@@ -274,8 +275,7 @@ BOOST_FIXTURE_TEST_CASE(block_relay_only_eviction, OutboundTest)
     }
     BOOST_CHECK(vNodes.back()->fDisconnect == false);
 
-    NodeClockContext clock_ctx{};
-    clock_ctx += MINIMUM_CONNECT_TIME;
+    clock += MINIMUM_CONNECT_TIME;
     peerLogic->CheckForStaleTipAndEvictPeers();
     for (int i = 0; i < max_outbound_block_relay; ++i) {
         BOOST_CHECK(vNodes[i]->fDisconnect == false);
@@ -413,7 +413,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     auto peerLogic = PeerManager::make(*connman, *m_node.addrman, banman.get(), *m_node.chainman, *m_node.mempool, *m_node.warnings, {});
 
     banman->ClearBanned();
-    const NodeClockContext clock_ctx{}; // keep mocktime constant
+    const FakeNodeClock clock{}; // keep mocktime constant
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
     NodeId id{0};
diff --git a/depend/bitcoin/src/test/descriptor_tests.cpp b/depend/bitcoin/src/test/descriptor_tests.cpp
index 0ede4dc9..7366953f 100644
--- a/depend/bitcoin/src/test/descriptor_tests.cpp
+++ b/depend/bitcoin/src/test/descriptor_tests.cpp
@@ -159,7 +159,7 @@ std::set<std::pair<CPubKey, KeyOriginInfo>> GetKeyOriginData(const FlatSigningPr
             bytes[0] = 0x02;
             CPubKey norm_pubkey{bytes};
             KeyOriginInfo norm_origin = data.second;
-            std::fill(std::begin(norm_origin.fingerprint), std::end(norm_origin.fingerprint), 0); // fingerprints don't necessarily match.
+            norm_origin.fingerprint.fill(0); // fingerprints don't necessarily match.
             ret.emplace(norm_pubkey, norm_origin);
         } else {
             ret.insert(data);
@@ -216,6 +216,11 @@ void DoCheck(std::string prv, std::string pub, const std::string& norm_pub, int
     // Check private keys are extracted from the private version but not the public one.
     BOOST_CHECK(keys_priv.keys.size());
     BOOST_CHECK(!keys_pub.keys.size());
+    const bool have_all_private_keys = !(flags & MISSING_PRIVKEYS);
+    BOOST_CHECK_EQUAL(parse_priv->HavePrivateKeys(keys_priv), have_all_private_keys);
+    BOOST_CHECK_EQUAL(parse_pub->HavePrivateKeys(keys_priv), have_all_private_keys);
+    BOOST_CHECK(!parse_priv->HavePrivateKeys(keys_pub));
+    BOOST_CHECK(!parse_pub->HavePrivateKeys(keys_pub));
 
     // If expected_pub is provided, check that the serialize matches that.
     // Otherwise check that they serialize back to the public version.
@@ -243,9 +248,6 @@ void DoCheck(std::string prv, std::string pub, const std::string& norm_pub, int
         } else {
             BOOST_CHECK_MESSAGE(EqualDescriptor(prv, prv1), "Private ser: " + prv1 + " Private desc: " + prv);
         }
-        BOOST_CHECK(!parse_priv->HavePrivateKeys(keys_pub));
-        BOOST_CHECK(parse_pub->HavePrivateKeys(keys_priv));
-
         BOOST_CHECK(!parse_priv->ToPrivateString(keys_pub, prv1));
         BOOST_CHECK(parse_pub->ToPrivateString(keys_priv, prv1));
         if (expected_prv) {
@@ -476,6 +478,9 @@ void DoCheck(std::string prv, std::string pub, const std::string& norm_pub, int
                 BOOST_CHECK_MESSAGE(paths.contains(origin.second.second.path), "Unexpected key path: " + prv);
                 left_paths.erase(origin.second.second.path);
             }
+
+            // Check that descriptors that have no hardened steps can self expand
+            BOOST_CHECK_EQUAL((t ? parse_priv : parse_pub)->CanSelfExpand(), !(flags & HARDENED));
         }
     }
 
@@ -509,7 +514,7 @@ void CheckMultipath(const std::string& prv,
         const std::vector<std::string>& expanded_prvs,
         const std::vector<std::string>& expanded_pubs,
         const std::vector<std::string>& expanded_norm_pubs,
-        int flags,
+        const std::vector<int>& flags,
         const std::vector<std::vector<std::vector<std::string>>>& scripts,
         const std::optional<OutputType>& type,
         const std::vector<std::set<std::vector<uint32_t>>>& paths)
@@ -519,7 +524,11 @@ void CheckMultipath(const std::string& prv,
     assert(expanded_prvs.size() == scripts.size());
     assert(expanded_prvs.size() == paths.size());
     for (size_t i = 0; i < expanded_prvs.size(); ++i) {
-        Check(prv, pub, expanded_norm_pubs.at(i), flags, scripts.at(i), type, std::nullopt, paths.at(i),
+        int flag = flags.at(0);
+        if (flags.size() > 1) {
+            flag = flags.at(i);
+        }
+        Check(prv, pub, expanded_norm_pubs.at(i), flag, scripts.at(i), type, std::nullopt, paths.at(i),
               /*spender_nlocktime=*/0, /*spender_nsequence=*/CTxIn::SEQUENCE_FINAL, /*preimages=*/{},
               expanded_prvs.at(i), expanded_pubs.at(i), i);
     }
@@ -560,7 +569,7 @@ void CheckInferDescriptor(const std::string& script_hex, const std::string& expe
             std::vector<std::span<const char>> origin_split = Split(origin_sp, "/");
             std::string fpr_str(origin_split[0].begin(), origin_split[0].end());
             auto fpr_bytes = ParseHex(fpr_str);
-            std::copy(fpr_bytes.begin(), fpr_bytes.end(), info.fingerprint);
+            std::copy_n(fpr_bytes.begin(), info.fingerprint.size(), info.fingerprint.begin());
             for (size_t i = 1; i < origin_split.size(); ++i) {
                 std::span<const char> elem = origin_split[i];
                 bool hardened = false;
@@ -659,7 +668,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0)",
                 "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/1)",
             },
-            DEFAULT,
+           {DEFAULT},
             {
                 {{"210379e45b3cf75f9c5f9befd8e9506fb962f6a9d185ac87001ec44a8d3df8d4a9e3ac"}},
                 {{"21034f8d02282ac6786737d0f37f0df7655f49daa24843bc7de3f4ea88603d26d10aac"}},
@@ -684,7 +693,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "pkh([bd16bee5/2147483647h]xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)",
                 "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/0/0)",
             },
-            HARDENED,
+            {HARDENED, DEFAULT},
             {
                 {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}},
                 {{"76a914f103317b9f0b758a62cb3879281d23e3b1deb90d88ac"}},
@@ -709,7 +718,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "wpkh([ffffffff/13h]xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH/1/2/*)",
                 "wpkh([ffffffff/13h]xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH/3/2/*)",
             },
-            RANGE,
+            {RANGE},
             {
                 {{"0014326b2249e3a25d5dc60935f044ee835d090ba859"},{"0014af0bd98abc2f2cae66e36896a39ffe2d32984fb7"},{"00141fa798efd1cbf95cebf912c031b8a4a6e9fb9f27"}},
                 {{"001426183882ef9c76b9a44386e9b387f33cee7c3a2d"},{"001447c1b9dc215c3f8b47e572981eb97528768cde4e"},{"00146e92cbaa397f9caeccf9a049460258af6ccd67e2"}},
@@ -734,7 +743,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "sh(wpkh(xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8/10/20/30/40/*h))",
                 "sh(wpkh(xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8/100h/20/30/40/*h))",
             },
-            RANGE | HARDENED | DERIVE_HARDENED,
+            {RANGE | HARDENED | DERIVE_HARDENED},
             {
                 {{"a9149a4d9901d6af519b2a23d4a2f51650fcba87ce7b87"},{"a914bed59fc0024fae941d6e20a3b44a109ae740129287"},{"a9148483aa1116eb9c05c482a72bada4b1db24af654387"}},
                 {{"a91470192039cb9529aadf4e53e46d9ac6a13790865787"},{"a914855859faffabf1e4ed2bb7411ab66f4599b1abd287"},{"a9148f2cfd4b486de247c44684160da164617ccf2c2687"}},
@@ -759,7 +768,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "multi(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/3/0/*)",
                 "multi(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/2/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/4/0/*)",
             },
-            RANGE,
+            {RANGE},
             {
                 {{"522103095e95d8c50ae3f3fea93fa8e983f710489f60ff681a658c06eba64622c824b121020443e9e729b42628913f1a69b46b7d43ff87c46e86140e12ee420d7e2e8caf8c52ae"},{"5221027512d6bd74e24eeb1ad752d5be800adc5886ded11c5293a9a701db83658b526a2102371e912dea5fefa56158908fe4c9f66bc925a8939b10f3821e8f8be797b9ca8252ae"},{"522102cc9fd211dc0a1c8bb7a106ff831be0e253bc992f21d08fb8a6fd43fae51b9b892103e43eddc68afc9746c9d09ce0bf8067b4f2416287abbc422ed1ac300673b1104952ae"}},
                 {{"5221031c0517fff3d483f06ca769bd2326bf30aca1c4de278e676e6ef760c3301244c6210316e171ff4f82dc62ad3f0d84c97865034fc5041eaa508b48c1d7af77f301c8bd52ae"},{"52210240f010ccff4202ade2ef87756f6b9af57bbf5ebcb0393b949e6e5d45d30bff36210229057a7e03510b8cb66727fab3f47a52a02ea94eae03e7c2e81b72a26781bfde52ae"},{"5221034052522058a07b647bd08fa1a9eaedae0222eac76ddd122ff8096ec969398de721038cb8180dd4c956848bcf191e45aaf297146207559fb8737881156aadaf13704152ae"}},
@@ -787,7 +796,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/1)",
                 "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2)",
             },
-            DEFAULT,
+            {DEFAULT},
             {
                 {{"76a9145a61ff8eb7aaca3010db97ebda76121610b7809688ac"}},
                 {{"76a9142f792a782cf4adbb321fe646c8e220563649b8fa88ac"}},
@@ -817,7 +826,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "sh(multi(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/2/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/4/*))",
                 "sh(multi(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/3/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/5/*))",
             },
-            RANGE,
+            {RANGE},
             {
                 {{"a914689cdf7de5836ec04fb971d128cc84858f73e11487"},{"a9142ea7dbaf0a77ee19f080cdacb3e13560e3cd9cf587"},{"a9143da854021f58f5e2d3ff6bb4fcd0ced877deb34987"}},
                 {{"a9143dd613d162e89b83369bbf08e5f1977cfdc9b02787"},{"a91449eef5d3df5c465b20a630c66058fe689082d8e187"},{"a91492be56babf54ea2109c577f799ba6d73948e8c3287"}},
@@ -847,7 +856,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "tr(xpub661MyMwAqRbcF3yVrV2KyYetLMYA5mCbv4BhrKwUrFE9LZM6JRR1AEt8Jq4V4C8LwtTke6YEEdCZqgXp85YRk2j74EfJKhe3QybQ9kcUjs4/7/*,{pk(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/2/0/*),pk(xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/4/*)})",
                 "tr(xpub661MyMwAqRbcF3yVrV2KyYetLMYA5mCbv4BhrKwUrFE9LZM6JRR1AEt8Jq4V4C8LwtTke6YEEdCZqgXp85YRk2j74EfJKhe3QybQ9kcUjs4/8/*,{pk(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/3/0/*),pk(xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/5/*)})",
             },
-            XONLY_KEYS | RANGE,
+            {XONLY_KEYS | RANGE},
             {
                 {{"5120993e5b1d71d14cbb0a90c57ea0fed1d5bf77d5804cee206c3dbd7e4d2c67d869"},{"51207b8f629f6d406b92ffa6284f5545085eafb837c469018b715755f619b587163b"},{"512061f52925826e51e4615007557ddbea55b22c817909d7ebcfd3c454c634643ece"}},
                 {{"5120633808b2156d0a6597e8b07f59c387bb4c2d5c02c4cb98f1802748e64c6abf5f"},{"5120fc5f06ded29328c170bf7e49e71c9cc8699befa2bf0a2a80802a1f32ab72d291"},{"5120fd05e2227e0dac972dff9941e332db8461bedc320c2a74def44e469ddbad9d21"}},
@@ -877,7 +886,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "tr(xpub661MyMwAqRbcF3yVrV2KyYetLMYA5mCbv4BhrKwUrFE9LZM6JRR1AEt8Jq4V4C8LwtTke6YEEdCZqgXp85YRk2j74EfJKhe3QybQ9kcUjs4/6/*,{pk(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/2/0/*),pk(xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/4/*)})",
                 "tr(xpub661MyMwAqRbcF3yVrV2KyYetLMYA5mCbv4BhrKwUrFE9LZM6JRR1AEt8Jq4V4C8LwtTke6YEEdCZqgXp85YRk2j74EfJKhe3QybQ9kcUjs4/6/*,{pk(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/3/0/*),pk(xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/5/*)})",
             },
-            XONLY_KEYS | RANGE,
+            {XONLY_KEYS | RANGE},
             {
                 {{"5120993e5b1d71d14cbb0a90c57ea0fed1d5bf77d5804cee206c3dbd7e4d2c67d869"},{"51207b8f629f6d406b92ffa6284f5545085eafb837c469018b715755f619b587163b"},{"512061f52925826e51e4615007557ddbea55b22c817909d7ebcfd3c454c634643ece"}},
                 {{"5120c481a8ada38d1070094f62af526d4f8aae2eb1e44d1fd961be6a25198b4da77b"},{"512034a2d31c091905e62def62b575b88beff41723d83acb02dfada2e73d9c529b40"},{"5120e0ecc278655b092962ded92a5781bd8e86e8408055de05f121e107fa211e5dfb"}},
@@ -904,7 +913,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "wsh(or_d(pk([2557c640/48h/1h/0h/2h]xpub6ArU6mnJDxmynaVKLV8FiFDaA9bVUw6efLEqt99qGK6B4QVWiNjc21JNFKkXNjgT8NCUmpFpSSBrYFtWEAqGirbqT4J1bRFpWyAnYdzmZUm/0/*),and_v(v:pkh([00aabb22/48h/1h/0h/2h]xpub6ArU6mnJDxmyogzqia2fdnD3gWHvfDtZAHdmKx4ccJwUBZd3rpgQM9qgmPAn1mqT2yh81uvGGohMkg3fNLoXZzn7sRo4a1X3KnCAVot2yuS/0/*),older(2))))",
                 "wsh(or_d(pk([2557c640/48h/1h/0h/2h]xpub6ArU6mnJDxmynaVKLV8FiFDaA9bVUw6efLEqt99qGK6B4QVWiNjc21JNFKkXNjgT8NCUmpFpSSBrYFtWEAqGirbqT4J1bRFpWyAnYdzmZUm/1/*),and_v(v:pkh([00aabb22/48h/1h/0h/2h]xpub6ArU6mnJDxmyogzqia2fdnD3gWHvfDtZAHdmKx4ccJwUBZd3rpgQM9qgmPAn1mqT2yh81uvGGohMkg3fNLoXZzn7sRo4a1X3KnCAVot2yuS/1/*),older(2))))"
             },
-            RANGE,
+            {RANGE},
             {
                 {{"0020538436a60f2a638ea9e1e1342e9b93374aa7ec559ff0a805b3a185d4ba855d7f"},{"00203a588d107d604b6913201c7c1e1722f07a0f8fb3a382744f17b9ae5f6ccfcdd7"},{"0020d30fb375f7c491a208e77c7b5d0996ca14cf4a770c2ab5981f915c0e4565c74a"}},
                 {{"002072b5fc3a691c48fdbaf485f27e787b4094055d4b434c90c81ed1090f3d48733b"},{"0020a9ccdf4496e5d60db4704b27494d9d74f54a16c180ff954a43ce5e3aa465113a"},{"0020d17e21820a0069ca87049513eca763f08a74b586724441e7d76fc5142bcc327c"}},
@@ -929,7 +938,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
             "tr(xpub6CY33ZvKuS63kwDnpNCCo5YrrgkUXgdUKdCVhd4Dru5gCB3z8wGnqFiUP98Za5pYSYF5KmvBHTY3Ra8FAJGggzBjuHS69WzN8gscPupuZwK,l:pk(xpub6E9a95u27Qqa13XEz62FUgaFMWzHnHrb54dWfMHU7K9A33eDccvUkbu1sHYoByHAgJdR326rWqn9pGZgZHz1afDprW5gGwS4gUX8Ri6aGPZ/2))",
             "tr(xpub6CY33ZvKuS63kwDnpNCCo5YrrgkUXgdUKdCVhd4Dru5gCB3z8wGnqFiUP98Za5pYSYF5KmvBHTY3Ra8FAJGggzBjuHS69WzN8gscPupuZwK,l:pk(xpub6E9a95u27Qqa13XEz62FUgaFMWzHnHrb54dWfMHU7K9A33eDccvUkbu1sHYoByHAgJdR326rWqn9pGZgZHz1afDprW5gGwS4gUX8Ri6aGPZ/3))",
         },
-        XONLY_KEYS,
+        {XONLY_KEYS},
         {
             {{"512094cb097990da64eebbad7b979b1326f3cbe356357abf4deb4c4ff80c7acbe902"}},
             {{"5120f091450b88c606f5cbc3f0cebe89e00bc5dd27f92e22f54da06439bc0c401f41"}},
@@ -954,7 +963,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "tr(xpub6CY33ZvKuS63kwDnpNCCo5YrrgkUXgdUKdCVhd4Dru5gCB3z8wGnqFiUP98Za5pYSYF5KmvBHTY3Ra8FAJGggzBjuHS69WzN8gscPupuZwK/2,l:pk(xpub6E9a95u27Qqa13XEz62FUgaFMWzHnHrb54dWfMHU7K9A33eDccvUkbu1sHYoByHAgJdR326rWqn9pGZgZHz1afDprW5gGwS4gUX8Ri6aGPZ))",
                 "tr(xpub6CY33ZvKuS63kwDnpNCCo5YrrgkUXgdUKdCVhd4Dru5gCB3z8wGnqFiUP98Za5pYSYF5KmvBHTY3Ra8FAJGggzBjuHS69WzN8gscPupuZwK/3,l:pk(xpub6E9a95u27Qqa13XEz62FUgaFMWzHnHrb54dWfMHU7K9A33eDccvUkbu1sHYoByHAgJdR326rWqn9pGZgZHz1afDprW5gGwS4gUX8Ri6aGPZ))",
             },
-            XONLY_KEYS,
+            {XONLY_KEYS},
             {
                 {{"51200e3c14456bfa30f9f0bed6e55f35e1e9ca17c835e9f71b25bac0dfaab38ff2cd"}},
                 {{"51202bdda29337ecaf8fcd5aa395febac6f99b8a866a0e8fb3f7bde2e24b1a7df2ba"}},
@@ -983,6 +992,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
 
     // Multisig constructions
     Check("multi(1,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt, /*op_desc_id=*/uint256{"b147e25eb4a9d3da4e86ed8e970d817563ae2cb9c71a756b11cfdeb4dc11b70c"});
+    Check("multi(2,KzoAz5CanayRKex3fSLQ2BwJpN7U52gZvxMyk78nDMHuqrUxuSJy,KwGNz6YCCQtYvFzMtrC6D3tKTKdBBboMrLTsjr2NYVBwapCkn7Mr,KxogYhiNfwxuswvXV66eFyKcCpm7dZ7TqHVqujHAVUjJxyivxQ9X)", "multi(2,03669b8afcec803a0d323e9a17f3ea8e68e8abe5a278020a929adbec52421adbd0,0260b2003c386519fc9eadf2b5cf124dd8eea4c4e68d5e154050a9346ea98ce600,0362a74e399c39ed5593852a30147f2959b56bb827dfa3e60e464b02ccf87dc5e8)", "multi(2,03669b8afcec803a0d323e9a17f3ea8e68e8abe5a278020a929adbec52421adbd0,0260b2003c386519fc9eadf2b5cf124dd8eea4c4e68d5e154050a9346ea98ce600,0362a74e399c39ed5593852a30147f2959b56bb827dfa3e60e464b02ccf87dc5e8)", SIGNABLE, {{"522103669b8afcec803a0d323e9a17f3ea8e68e8abe5a278020a929adbec52421adbd0210260b2003c386519fc9eadf2b5cf124dd8eea4c4e68d5e154050a9346ea98ce600210362a74e399c39ed5593852a30147f2959b56bb827dfa3e60e464b02ccf87dc5e853ae"}}, std::nullopt); // Bare multisig at TOP level with exactly 3 pubkeys is allowed
     Check("sortedmulti(1,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "sortedmulti(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "sortedmulti(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt, /*op_desc_id=*/uint256{"62b59d1e32a62176ef7a17538f3b80c7d1afc53e5644eb753525bdb5d556486c"});
     Check("sortedmulti(1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "sortedmulti(1,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "sortedmulti(1,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
     Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", "sh(multi(2,[00000000/111h/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, /*op_desc_id=*/std::nullopt, {{0x8000006FUL,222},{0}});
@@ -1157,14 +1167,15 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
     CheckInferDescriptor("4104032540df1d3c7070a8ab3a9cdd304dfc7fd1e6541369c53c4c3310b2537d91059afc8b8e7673eb812a32978dabb78c40f2e423f7757dca61d11838c7aeeb5220ac", "pk(04032540df1d3c7070a8ab3a9cdd304dfc7fd1e6541369c53c4c3310b2537d91059afc8b8e7673eb812a32978dabb78c40f2e423f7757dca61d11838c7aeeb5220)", {}, {{"04032540df1d3c7070a8ab3a9cdd304dfc7fd1e6541369c53c4c3310b2537d91059afc8b8e7673eb812a32978dabb78c40f2e423f7757dca61d11838c7aeeb5220", ""}});
 
     // MuSig2 parsing
-    Check("rawtr(musig(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "rawtr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "rawtr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", XONLY_KEYS | MUSIG, {{"5120789d937bade6673538f3e28d8368dda4d0512f94da44cf477a505716d26a1575"}}, OutputType::BECH32M);
-    Check("tr(musig(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "tr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "tr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", XONLY_KEYS | MUSIG, {{"512079e6c3e628c9bfbce91de6b7fb28e2aec7713d377cf260ab599dcbc40e542312"}}, OutputType::BECH32M);
-    Check("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*))","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*))","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*))", XONLY_KEYS | RANGE | MUSIG, {{"5120754ccfd18ed4051de3b1144b6145cad4b2999387338dfb85ec392f2963ceaa3a"}, {"5120be80016576d2691ccc4077bc91d7ece4db34667d6e84829d5e08480cd4bc0b78"}, {"5120b7139e2f8b92570ad96c40c3b5e6557a5194e288a96df6f29980523365239d58"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
-    Check("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*)", XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION, {{"51209508c08832f3bb9d5e8baf8cb5cfa3669902e2f2da19acea63ff47b93faa9bfc"}, {"51205ca1102663025a83dd9b5dbc214762c5a6309af00d48167d2d6483808525a298"}, {"51207dbed1b89c338df6a1ae137f133a19cae6e03d481196ee6f1a5c7d1aeb56b166"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
-    Check("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)", XONLY_KEYS | MUSIG | MUSIG_DERIVATION, {{"51200e355f2bc9e754268e12bbd337499c2f7ffafc3101c41792709007b25a862532"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0}, {1}});
-    Check("tr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*,pk(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S))","tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*,pk(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9))","tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*,pk(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9))", XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION, {{"51201d377b637b5c73f670f5c8a96a2c0bb0d1a682a1fca6aba91fe673501a189782"}, {"51208950c83b117a6c208d5205ffefcf75b187b32512eb7f0d8577db8d9102833036"}, {"5120a49a477c61df73691b77fcd563a80a15ea67bb9c75470310ce5c0f25918db60d"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
-    Check("tr(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S,pk(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*))","tr(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,pk(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*))","tr(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,pk(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*))", XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION, {{"512068983d461174afc90c26f3b2821d8a9ced9534586a756763b68371a404635cc8"}, {"5120368e2d864115181bdc8bb5dc8684be8d0760d5c33315570d71a21afce4afd43e"}, {"512097a1e6270b33ad85744677418bae5f59ea9136027223bc6e282c47c167b471d5"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
+    Check("rawtr(musig(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "rawtr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "rawtr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", MISSING_PRIVKEYS | XONLY_KEYS | MUSIG, {{"5120789d937bade6673538f3e28d8368dda4d0512f94da44cf477a505716d26a1575"}}, OutputType::BECH32M);
+    Check("tr(musig(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "tr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", "tr(musig(02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,023590a94e768f8e1815c2f24b4d80a8e3149316c3518ce7b7ad338368d038ca66))", MISSING_PRIVKEYS | XONLY_KEYS | MUSIG, {{"512079e6c3e628c9bfbce91de6b7fb28e2aec7713d377cf260ab599dcbc40e542312"}}, OutputType::BECH32M);
+    Check("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*))","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*))","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*))", MISSING_PRIVKEYS | XONLY_KEYS | RANGE | MUSIG, {{"5120754ccfd18ed4051de3b1144b6145cad4b2999387338dfb85ec392f2963ceaa3a"}, {"5120be80016576d2691ccc4077bc91d7ece4db34667d6e84829d5e08480cd4bc0b78"}, {"5120b7139e2f8b92570ad96c40c3b5e6557a5194e288a96df6f29980523365239d58"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
+    Check("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*)", MISSING_PRIVKEYS | XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION, {{"51209508c08832f3bb9d5e8baf8cb5cfa3669902e2f2da19acea63ff47b93faa9bfc"}, {"51205ca1102663025a83dd9b5dbc214762c5a6309af00d48167d2d6483808525a298"}, {"51207dbed1b89c338df6a1ae137f133a19cae6e03d481196ee6f1a5c7d1aeb56b166"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
+    Check("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)","rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)", MISSING_PRIVKEYS | XONLY_KEYS | MUSIG | MUSIG_DERIVATION, {{"51200e355f2bc9e754268e12bbd337499c2f7ffafc3101c41792709007b25a862532"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0}, {1}});
+    Check("tr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*,pk(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S))","tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*,pk(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9))","tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*,pk(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9))", MISSING_PRIVKEYS | XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION, {{"51201d377b637b5c73f670f5c8a96a2c0bb0d1a682a1fca6aba91fe673501a189782"}, {"51208950c83b117a6c208d5205ffefcf75b187b32512eb7f0d8577db8d9102833036"}, {"5120a49a477c61df73691b77fcd563a80a15ea67bb9c75470310ce5c0f25918db60d"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
+    Check("tr(KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU74sHUHy8S,pk(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*))","tr(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,pk(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*))","tr(f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9,pk(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/0/*))", MISSING_PRIVKEYS | XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION, {{"512068983d461174afc90c26f3b2821d8a9ced9534586a756763b68371a404635cc8"}, {"5120368e2d864115181bdc8bb5dc8684be8d0760d5c33315570d71a21afce4afd43e"}, {"512097a1e6270b33ad85744677418bae5f59ea9136027223bc6e282c47c167b471d5"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0, 0}, {0, 1}, {0, 2}});
     Check("tr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/1,xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/1)/2)", "tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1)/2)", "tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1)/2)", XONLY_KEYS | MUSIG | MUSIG_DERIVATION | UNIQUE_XPUBS, {{"5120a17ceacd6422bd5ffd9f165807b254b7d68ad39f179cc4f11545a6835227e97c"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{1}, {2}});
+    Check("rawtr(musig(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)","rawtr(musig(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)","rawtr(musig([bd16bee5/2147483647h]xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y)/1)", MISSING_PRIVKEYS | HARDENED | XONLY_KEYS | MUSIG | MUSIG_DERIVATION, {{"5120ebf2bcce516ef6567a9001ce6e5dc43a02bb62d37b51d86d773fa96dcd3a8d4c"}}, OutputType::BECH32M, /*op_desc_id=*/std::nullopt, {{}, {0xFFFFFFFFUL,0}, {1}});
     CheckMultipath("rawtr(musig(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/<1;2;3>/0/*,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0/*,xprv9s21ZrQH143K3jUwNHoqQNrtzJnJmx4Yup8NkNLdVQCymYbPbJXnPhwkfTfxZfptcs3rLAPUXS39oDLgrNKQGwbGsEmJJ8BU3RzQuvShEG4/0/0/<3;4;5>/*))",
             "rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/<1;2;3>/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/<3;4;5>/*))",
             {
@@ -1182,7 +1193,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/2/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/4/*))",
                 "rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/3/0/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/*,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t/0/0/5/*))",
             },
-            XONLY_KEYS | RANGE | MUSIG,
+            {XONLY_KEYS | RANGE | MUSIG},
             {
                 {{"51204ba445a411bd8500476ef916e6d4dd7c137a77e0637e5b0e98339210d78d595a"},{"5120800394c4f39743734c9a15eaa171476814bed0ea19ad771037c5f1ceb20244a9"},{"512011658c4e00fae6f22b9adc2b3823ff3ec6367599783788f4aa8fe1ab3dd0a7ea"}},
                 {{"5120b977ae89f221762a61ee986fed7a493426462483afef46f7225765e015934961"},{"5120b70bf732ed38fcc2052075f83901f8588f1016f6741aaacce6e439a02235e5ed"},{"5120d7fa329159ae543b41ca81c7b0e916824ce5d13f61de5b6246dc55a3367f8596"}},
@@ -1212,7 +1223,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t)/4/*)",
                 "rawtr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t)/5/*)",
             },
-            XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION,
+            {XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION},
             {
                 {{"51204a0fecdd99c67eb2afca0efa9a008c8bbc4dbb5ccb094b3eee273127b1ababee"},{"512006120155e6bfd6a3abf8a697caaf5669058395ae0052283a1c6e852d373ceccd"},{"5120d46831206710fca12ef7b562a0812250fdda110146dc1b9ac3a099c81ebcef82"}},
                 {{"5120f2b491de0be3b53482253865a5e0f2d2dbdc425d59db0c48f01c6bed9c6687c2"},{"5120601daf543e702b9c28a02f33961dfddfad666d9218b3b0b80177420b37619683"},{"512081dc64aac07811399defde8c959e3a66c56b621360e55ff01c2d43dfe7928b66"}},
@@ -1242,7 +1253,7 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
                 "tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t)/6/*,pk(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/8/*))",
                 "tr(musig(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y,xpub661MyMwAqRbcGDZQUKLqmWodYLcoBQnQH33yYkkF3jjxeLvY8qr2wWGEWkiKFaaQfJCoi3HeEq3Dc5DptfbCyjD38fNhSqtKc1UHaP4ba3t)/6/*,pk(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/9/*))",
             },
-            XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION | MIXED_MUSIG,
+            {XONLY_KEYS | RANGE | MUSIG | MUSIG_DERIVATION | MIXED_MUSIG},
             {
                 {{"5120682fd07aa0f18643fd2c8a2411a0525b5391d7ad54e1904c9c0d7f524e49b39c"},{"51200410a642ea6b9ab884ba892205f484ad716cf0d8426dd739bd67d1636cdce870"},{"5120971dc3136dd90be8aa879d9b0f5c449b62e738cbf7129623098bb3b3aa57eb7d"}},
                 {{"51208e4158b3e54e32b4ad22f6dffb9f7968c92dfe96fd0b8fd3d30d3e2558a2a694"},{"512094273ac6b6f8ac060ba5681ba0906e54a51ab67fd08092e9b2af568b82aa1c7c"},{"5120ef0c7915708eb5baa95125e75417306391f339cfc533a19000ab8f2f53da78c1"}},
@@ -1334,4 +1345,65 @@ BOOST_AUTO_TEST_CASE(descriptor_older_warnings)
     }
 }
 
+void CheckSingleUnparsable(const std::string& desc, const std::string& expected_error)
+{
+    FlatSigningProvider keys;
+    std::string error;
+    auto parsed = Parse(desc, keys, error);
+    BOOST_CHECK_MESSAGE(parsed.empty(), desc);
+    BOOST_CHECK_EQUAL(error, expected_error);
+}
+
+void CheckUnused(const std::string& prv, const std::string& pub)
+{
+    FlatSigningProvider keys_priv, keys_pub;
+    std::string error;
+
+    std::unique_ptr<Descriptor> parse_priv;
+    std::unique_ptr<Descriptor> parse_pub;
+    parse_priv = std::move(Parse(prv, keys_priv, error).at(0));
+    parse_pub = std::move(Parse(pub, keys_pub, error).at(0));
+    BOOST_CHECK_MESSAGE(parse_priv, error);
+    BOOST_CHECK_MESSAGE(parse_pub, error);
+
+    BOOST_CHECK(parse_priv->GetOutputType() == std::nullopt);
+    BOOST_CHECK(parse_pub->GetOutputType() == std::nullopt);
+
+    // Check private keys are extracted from the private version but not the public one.
+    BOOST_CHECK(keys_priv.keys.size());
+    BOOST_CHECK(!keys_pub.keys.size());
+
+    // Check that both versions serialize back to the public version.
+    std::string pub1 = parse_priv->ToString();
+    std::string pub2 = parse_pub->ToString();
+    BOOST_CHECK_MESSAGE(EqualDescriptor(pub, pub1), "Private ser: " + pub1 + " Public desc: " + pub);
+    BOOST_CHECK_MESSAGE(EqualDescriptor(pub, pub2), "Public ser: " + pub2 + " Public desc: " + pub);
+
+    // Check both only have one pubkey
+    std::set<CPubKey> prv_pubkeys;
+    std::set<CExtPubKey> prv_extpubs;
+    parse_pub->GetPubKeys(prv_pubkeys, prv_extpubs);
+    BOOST_CHECK_EQUAL(prv_pubkeys.size() + prv_extpubs.size(), 1);
+    std::set<CPubKey> pub_pubkeys;
+    std::set<CExtPubKey> pub_extpubs;
+    parse_pub->GetPubKeys(pub_pubkeys, pub_extpubs);
+    BOOST_CHECK_EQUAL(pub_pubkeys.size() + pub_extpubs.size(), 1);
+}
+
+// unused() descriptors don't produce scripts, so these need to be tested separately
+BOOST_AUTO_TEST_CASE(unused_descriptor_test)
+{
+    CheckUnparsable("unused(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "unused(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "unused(): only one key expected");
+    CheckUnparsable("wsh(unused(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "wsh(unused(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", "Can only have unused at top level");
+    CheckUnparsable("unused(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/*)", "unused(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/*)", "unused(): key cannot be ranged");
+    CheckUnparsable("unused()", "unused()", "No key provided");
+
+    // x-only keys cannot be used in unused()
+    CheckSingleUnparsable("unused(a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "Pubkey 'a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd' is invalid");
+
+    CheckUnused("unused(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "unused(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)");
+    CheckUnused("unused(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "unused(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)");
+    CheckUnused("unused(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/0h/0h/1)", "unused(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/0h/0h/1)");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/feefrac_tests.cpp b/depend/bitcoin/src/test/feefrac_tests.cpp
index ff95fc9e..3d5fe0cb 100644
--- a/depend/bitcoin/src/test/feefrac_tests.cpp
+++ b/depend/bitcoin/src/test/feefrac_tests.cpp
@@ -70,40 +70,40 @@ BOOST_AUTO_TEST_CASE(feefrac_operators)
     BOOST_CHECK(p1 + p3 == p4);
 
     // Fee-rate comparison
-    BOOST_CHECK(p1 > p2);
-    BOOST_CHECK(p1 >= p2);
-    BOOST_CHECK(p1 >= p4-p3);
-    BOOST_CHECK(!(p1 >> p3)); // not strictly better
-    BOOST_CHECK(p1 >> p2); // strictly greater feerate
-
-    BOOST_CHECK(p2 < p1);
-    BOOST_CHECK(p2 <= p1);
-    BOOST_CHECK(p1 <= p4-p3);
-    BOOST_CHECK(!(p3 << p1)); // not strictly worse
-    BOOST_CHECK(p2 << p1); // strictly lower feerate
+    BOOST_CHECK(ByRatioNegSize{p1} > ByRatioNegSize{p2});
+    BOOST_CHECK(ByRatioNegSize{p1} >= ByRatioNegSize{p2});
+    BOOST_CHECK(ByRatioNegSize{p1} >= ByRatioNegSize{p4-p3});
+    BOOST_CHECK(!(ByRatio{p1} > ByRatio{p3})); // not strictly better
+    BOOST_CHECK(ByRatio{p1} > ByRatio{p2}); // strictly greater feerate
+
+    BOOST_CHECK(ByRatioNegSize{p2} < ByRatioNegSize{p1});
+    BOOST_CHECK(ByRatioNegSize{p2} <= ByRatioNegSize{p1});
+    BOOST_CHECK(ByRatioNegSize{p1} <= ByRatioNegSize{p4-p3});
+    BOOST_CHECK(!(ByRatio{p3} < ByRatio{p1})); // not strictly worse
+    BOOST_CHECK(ByRatio{p2} < ByRatio{p1}); // strictly lower feerate
 
     // "empty" comparisons
-    BOOST_CHECK(!(p1 >> empty)); // << will always result in false
-    BOOST_CHECK(!(p1 << empty));
-    BOOST_CHECK(!(empty >> empty));
-    BOOST_CHECK(!(empty << empty));
+    BOOST_CHECK(!(ByRatio{p1} > ByRatio{empty})); // << will always result in false
+    BOOST_CHECK(!(ByRatio{p1} < ByRatio{empty}));
+    BOOST_CHECK(!(ByRatio{empty} > ByRatio{empty}));
+    BOOST_CHECK(!(ByRatio{empty} < ByRatio{empty}));
 
     // empty is always bigger than everything else
-    BOOST_CHECK(empty > p1);
-    BOOST_CHECK(empty > p2);
-    BOOST_CHECK(empty > p3);
-    BOOST_CHECK(empty >= p1);
-    BOOST_CHECK(empty >= p2);
-    BOOST_CHECK(empty >= p3);
+    BOOST_CHECK(ByRatioNegSize{empty} > ByRatioNegSize{p1});
+    BOOST_CHECK(ByRatioNegSize{empty} > ByRatioNegSize{p2});
+    BOOST_CHECK(ByRatioNegSize{empty} > ByRatioNegSize{p3});
+    BOOST_CHECK(ByRatioNegSize{empty} >= ByRatioNegSize{p1});
+    BOOST_CHECK(ByRatioNegSize{empty} >= ByRatioNegSize{p2});
+    BOOST_CHECK(ByRatioNegSize{empty} >= ByRatioNegSize{p3});
 
     // check "max" values for comparison
     FeeFrac oversized_1{4611686000000, 4000000};
     FeeFrac oversized_2{184467440000000, 100000};
 
-    BOOST_CHECK(oversized_1 < oversized_2);
-    BOOST_CHECK(oversized_1 <= oversized_2);
-    BOOST_CHECK(oversized_1 << oversized_2);
-    BOOST_CHECK(oversized_1 != oversized_2);
+    BOOST_CHECK(ByRatioNegSize{oversized_1} < ByRatioNegSize{oversized_2});
+    BOOST_CHECK(ByRatioNegSize{oversized_1} <= ByRatioNegSize{oversized_2});
+    BOOST_CHECK(ByRatio{oversized_1} < ByRatio{oversized_2});
+    BOOST_CHECK(ByRatioNegSize{oversized_1} != ByRatioNegSize{oversized_2});
 
     BOOST_CHECK_EQUAL(oversized_1.EvaluateFeeDown(0), 0);
     BOOST_CHECK_EQUAL(oversized_1.EvaluateFeeDown(1), 1152921);
@@ -124,13 +124,13 @@ BOOST_AUTO_TEST_CASE(feefrac_operators)
 
     // Tests paths that use double arithmetic
     FeeFrac busted{(static_cast<int64_t>(INT32_MAX)) + 1, INT32_MAX};
-    BOOST_CHECK(!(busted < busted));
+    BOOST_CHECK(!(ByRatioNegSize{busted} < ByRatioNegSize{busted}));
 
     FeeFrac max_fee{2100000000000000, INT32_MAX};
-    BOOST_CHECK(!(max_fee < max_fee));
-    BOOST_CHECK(!(max_fee > max_fee));
-    BOOST_CHECK(max_fee <= max_fee);
-    BOOST_CHECK(max_fee >= max_fee);
+    BOOST_CHECK(!(ByRatioNegSize{max_fee} < ByRatioNegSize{max_fee}));
+    BOOST_CHECK(!(ByRatioNegSize{max_fee} > ByRatioNegSize{max_fee}));
+    BOOST_CHECK(ByRatioNegSize{max_fee} <= ByRatioNegSize{max_fee});
+    BOOST_CHECK(ByRatioNegSize{max_fee} >= ByRatioNegSize{max_fee});
 
     BOOST_CHECK_EQUAL(max_fee.EvaluateFeeDown(0), 0);
     BOOST_CHECK_EQUAL(max_fee.EvaluateFeeDown(1), 977888);
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE(feefrac_operators)
     BOOST_CHECK_EQUAL(max_fee.EvaluateFeeUp(INT32_MAX), 2100000000000000);
 
     FeeFrac max_fee2{1, 1};
-    BOOST_CHECK(max_fee >= max_fee2);
+    BOOST_CHECK(ByRatioNegSize{max_fee} >= ByRatioNegSize{max_fee2});
 
     // Test for integer overflow issue (https://github.com/bitcoin/bitcoin/issues/32294)
     BOOST_CHECK_EQUAL((FeeFrac{0x7ffffffdfffffffb, 0x7ffffffd}.EvaluateFeeDown(0x7fffffff)), 0x7fffffffffffffff);
diff --git a/depend/bitcoin/src/test/feerounder_tests.cpp b/depend/bitcoin/src/test/feerounder_tests.cpp
index 82cd7d65..d88a4f77 100644
--- a/depend/bitcoin/src/test/feerounder_tests.cpp
+++ b/depend/bitcoin/src/test/feerounder_tests.cpp
@@ -9,7 +9,7 @@
 
 #include <set>
 
-BOOST_AUTO_TEST_SUITE(fee_rounder_tests)
+BOOST_AUTO_TEST_SUITE(feerounder_tests)
 
 BOOST_AUTO_TEST_CASE(FeeRounder)
 {
diff --git a/depend/bitcoin/src/test/fuzz/CMakeLists.txt b/depend/bitcoin/src/test/fuzz/CMakeLists.txt
index fc82fdc0..7888f149 100644
--- a/depend/bitcoin/src/test/fuzz/CMakeLists.txt
+++ b/depend/bitcoin/src/test/fuzz/CMakeLists.txt
@@ -26,6 +26,7 @@ add_executable(fuzz
   chain.cpp
   checkqueue.cpp
   cluster_linearize.cpp
+  cmpctblock.cpp
   coins_view.cpp
   coinscache_sim.cpp
   connman.cpp
@@ -39,6 +40,7 @@ add_executable(fuzz
   crypto_hkdf_hmac_sha256_l32.cpp
   crypto_poly1305.cpp
   cuckoocache.cpp
+  dbwrapper.cpp
   decode_tx.cpp
   descriptor_parse.cpp
   deserialize.cpp
@@ -77,6 +79,7 @@ add_executable(fuzz
   overflow.cpp
   p2p_handshake.cpp
   p2p_headers_presync.cpp
+  p2p_private_broadcast.cpp
   p2p_transport_serialization.cpp
   pcp.cpp
   package_eval.cpp
@@ -92,6 +95,7 @@ add_executable(fuzz
   pow.cpp
   prevector.cpp
   primitives_transaction.cpp
+  private_broadcast.cpp
   process_message.cpp
   process_messages.cpp
   protocol.cpp
@@ -138,6 +142,10 @@ add_executable(fuzz
   versionbits.cpp
 )
 
+if(ENABLE_IPC)
+  add_subdirectory(${PROJECT_SOURCE_DIR}/src/ipc/test/fuzz ipc)
+endif()
+
 add_windows_application_manifest(fuzz)
 
 target_link_libraries(fuzz
@@ -152,7 +160,6 @@ target_link_libraries(fuzz
   univalue
   secp256k1
   Boost::headers
-  libevent::extra
 )
 
 if(ENABLE_WALLET)
diff --git a/depend/bitcoin/src/test/fuzz/addrman.cpp b/depend/bitcoin/src/test/fuzz/addrman.cpp
index 75048028..2244734d 100644
--- a/depend/bitcoin/src/test/fuzz/addrman.cpp
+++ b/depend/bitcoin/src/test/fuzz/addrman.cpp
@@ -117,7 +117,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     NetGroupManager netgroupman{ConsumeNetGroupManager(fuzzed_data_provider)};
     auto addr_man_ptr = std::make_unique<AddrManDeterministic>(netgroupman, fuzzed_data_provider, GetCheckRatio());
     if (fuzzed_data_provider.ConsumeBool()) {
@@ -130,7 +130,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
         }
     }
     AddrManDeterministic& addr_man = *addr_man_ptr;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -141,7 +141,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
             },
             [&] {
                 std::vector<CAddress> addresses;
-                LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+                LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
                     addresses.push_back(ConsumeAddress(fuzzed_data_provider));
                 }
                 auto net_addr = ConsumeNetAddr(fuzzed_data_provider);
@@ -202,7 +202,7 @@ FUZZ_TARGET(addrman_serdeser, .init = initialize_addrman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     NetGroupManager netgroupman{ConsumeNetGroupManager(fuzzed_data_provider)};
     AddrManDeterministic addr_man1{netgroupman, fuzzed_data_provider, GetCheckRatio()};
diff --git a/depend/bitcoin/src/test/fuzz/autofile.cpp b/depend/bitcoin/src/test/fuzz/autofile.cpp
index 5aa5d8c1..0a445903 100644
--- a/depend/bitcoin/src/test/fuzz/autofile.cpp
+++ b/depend/bitcoin/src/test/fuzz/autofile.cpp
@@ -24,8 +24,7 @@ FUZZ_TARGET(autofile)
         fuzzed_file_provider.open(),
         Obfuscation{std::span{key_bytes}.first<Obfuscation::KEY_SIZE>()},
     };
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/banman.cpp b/depend/bitcoin/src/test/fuzz/banman.cpp
index aa7e76b9..2e50720f 100644
--- a/depend/bitcoin/src/test/fuzz/banman.cpp
+++ b/depend/bitcoin/src/test/fuzz/banman.cpp
@@ -45,7 +45,7 @@ FUZZ_TARGET(banman, .init = initialize_banman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     fs::path banlist_file = gArgs.GetDataDirNet() / "fuzzed_banlist";
 
     const bool start_with_corrupted_banlist{fuzzed_data_provider.ConsumeBool()};
@@ -66,8 +66,7 @@ FUZZ_TARGET(banman, .init = initialize_banman)
         // might call DumpBanlist (or other methods that are at least linear
         // complexity of the input size).
         bool contains_invalid{false};
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 300)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 300) {
             CallOneOf(
                 fuzzed_data_provider,
                 [&] {
@@ -125,7 +124,7 @@ FUZZ_TARGET(banman, .init = initialize_banman)
         }
         if (!force_read_and_write_to_err) {
             ban_man.DumpBanlist();
-            clock_ctx.set(ConsumeTime(fuzzed_data_provider));
+            clock.set(ConsumeTime(fuzzed_data_provider));
             banmap_t banmap;
             ban_man.GetBanned(banmap);
             BanMan ban_man_read{banlist_file, /*client_interface=*/nullptr, /*default_ban_time=*/0};
diff --git a/depend/bitcoin/src/test/fuzz/base_encode_decode.cpp b/depend/bitcoin/src/test/fuzz/base_encode_decode.cpp
index 1d2f4d7e..3f9c2abb 100644
--- a/depend/bitcoin/src/test/fuzz/base_encode_decode.cpp
+++ b/depend/bitcoin/src/test/fuzz/base_encode_decode.cpp
@@ -90,8 +90,5 @@ FUZZ_TARGET(psbt_base64_decode)
 {
     const std::string random_string{buffer.begin(), buffer.end()};
 
-    PartiallySignedTransaction psbt;
-    std::string error;
-    const bool ok{DecodeBase64PSBT(psbt, random_string, error)};
-    assert(ok == error.empty());
+    util::Result<PartiallySignedTransaction> psbt = DecodeBase64PSBT(random_string);
 }
diff --git a/depend/bitcoin/src/test/fuzz/bip324.cpp b/depend/bitcoin/src/test/fuzz/bip324.cpp
index b787bd16..6d05ff6b 100644
--- a/depend/bitcoin/src/test/fuzz/bip324.cpp
+++ b/depend/bitcoin/src/test/fuzz/bip324.cpp
@@ -64,7 +64,7 @@ FUZZ_TARGET(bip324_cipher_roundtrip, .init=Initialize)
     assert(std::ranges::equal(initiator.GetSendGarbageTerminator(), responder.GetReceiveGarbageTerminator()));
     assert(std::ranges::equal(initiator.GetReceiveGarbageTerminator(), responder.GetSendGarbageTerminator()));
 
-    LIMITED_WHILE(provider.remaining_bytes(), 1000) {
+    LIMITED_WHILE (provider.remaining_bytes(), 1000) {
         // Mode:
         // - Bit 0: whether the ignore bit is set in message
         // - Bit 1: whether the responder (0) or initiator (1) sends
diff --git a/depend/bitcoin/src/test/fuzz/bitdeque.cpp b/depend/bitcoin/src/test/fuzz/bitdeque.cpp
index bf6e6ea5..6e4f06af 100644
--- a/depend/bitcoin/src/test/fuzz/bitdeque.cpp
+++ b/depend/bitcoin/src/test/fuzz/bitdeque.cpp
@@ -54,8 +54,7 @@ FUZZ_TARGET(bitdeque, .init = InitRandData)
     }
 
     const auto iter_limit{maxlen > 6000 ? 90U : 900U};
-    LIMITED_WHILE(provider.remaining_bytes() > 0, iter_limit)
-    {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, iter_limit) {
         CallOneOf(
             provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/bitset.cpp b/depend/bitcoin/src/test/fuzz/bitset.cpp
index ce6be049..c5e532c6 100644
--- a/depend/bitcoin/src/test/fuzz/bitset.cpp
+++ b/depend/bitcoin/src/test/fuzz/bitset.cpp
@@ -68,7 +68,7 @@ void TestType(FuzzBufferType buffer)
         assert(sim[idx].count() == real[idx].Count());
     };
 
-    LIMITED_WHILE(buffer.size() > 0, 1000) {
+    LIMITED_WHILE (buffer.size() > 0, 1000) {
         // Read one byte to determine which operation to execute on the BitSets.
         int command = ReadByte(buffer) % 64;
         // Read another byte that determines which bitsets will be involved.
diff --git a/depend/bitcoin/src/test/fuzz/block_index_tree.cpp b/depend/bitcoin/src/test/fuzz/block_index_tree.cpp
index 2eac6d6b..a4d38974 100644
--- a/depend/bitcoin/src/test/fuzz/block_index_tree.cpp
+++ b/depend/bitcoin/src/test/fuzz/block_index_tree.cpp
@@ -42,7 +42,7 @@ void initialize_block_index_tree()
 FUZZ_TARGET(block_index_tree, .init = initialize_block_index_tree)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     auto& chainman = static_cast<TestChainstateManager&>(*g_setup->m_node.chainman);
     auto& blockman = static_cast<TestBlockManager&>(chainman.m_blockman);
     CBlockIndex* genesis = chainman.ActiveChainstate().m_chain[0];
@@ -53,8 +53,7 @@ FUZZ_TARGET(block_index_tree, .init = initialize_block_index_tree)
 
     std::vector<CBlockIndex*> pruned_blocks;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 1000) {
         if (abort_run) break;
         CallOneOf(
             fuzzed_data_provider,
diff --git a/depend/bitcoin/src/test/fuzz/blockfilter.cpp b/depend/bitcoin/src/test/fuzz/blockfilter.cpp
index ed0f9e0d..39b49c84 100644
--- a/depend/bitcoin/src/test/fuzz/blockfilter.cpp
+++ b/depend/bitcoin/src/test/fuzz/blockfilter.cpp
@@ -38,8 +38,7 @@ FUZZ_TARGET(blockfilter)
         (void)gcs_filter.GetEncoded();
         (void)gcs_filter.Match(ConsumeRandomLengthByteVector(fuzzed_data_provider));
         GCSFilter::ElementSet element_set;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30000)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30000) {
             element_set.insert(ConsumeRandomLengthByteVector(fuzzed_data_provider));
         }
         gcs_filter.MatchAny(element_set);
diff --git a/depend/bitcoin/src/test/fuzz/bloom_filter.cpp b/depend/bitcoin/src/test/fuzz/bloom_filter.cpp
index af6d8ae4..6c148960 100644
--- a/depend/bitcoin/src/test/fuzz/bloom_filter.cpp
+++ b/depend/bitcoin/src/test/fuzz/bloom_filter.cpp
@@ -24,8 +24,7 @@ FUZZ_TARGET(bloom_filter)
         1.0 / fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(1, std::numeric_limits<unsigned int>::max()),
         fuzzed_data_provider.ConsumeIntegral<unsigned int>(),
         static_cast<unsigned char>(fuzzed_data_provider.PickValueInArray({BLOOM_UPDATE_NONE, BLOOM_UPDATE_ALL, BLOOM_UPDATE_P2PUBKEY_ONLY, BLOOM_UPDATE_MASK}))};
-    LIMITED_WHILE(good_data && fuzzed_data_provider.remaining_bytes() > 0, 10'000)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.remaining_bytes() > 0, 10'000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/buffered_file.cpp b/depend/bitcoin/src/test/fuzz/buffered_file.cpp
index 9ba8db2c..b7b0f13e 100644
--- a/depend/bitcoin/src/test/fuzz/buffered_file.cpp
+++ b/depend/bitcoin/src/test/fuzz/buffered_file.cpp
@@ -34,8 +34,7 @@ FUZZ_TARGET(buffered_file)
     }
     if (opt_buffered_file && !fuzzed_file.IsNull()) {
         bool setpos_fail = false;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
             CallOneOf(
                 fuzzed_data_provider,
                 [&] {
diff --git a/depend/bitcoin/src/test/fuzz/chain.cpp b/depend/bitcoin/src/test/fuzz/chain.cpp
index 4d3a6f42..c0525655 100644
--- a/depend/bitcoin/src/test/fuzz/chain.cpp
+++ b/depend/bitcoin/src/test/fuzz/chain.cpp
@@ -37,7 +37,7 @@ FUZZ_TARGET(chain)
     (void)CDiskBlockIndex{*disk_block_index};
     (void)disk_block_index->BuildSkip();
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const BlockStatus block_status = fuzzed_data_provider.PickValueInArray({
             BlockStatus::BLOCK_VALID_UNKNOWN,
             BlockStatus::BLOCK_VALID_RESERVED,
diff --git a/depend/bitcoin/src/test/fuzz/cluster_linearize.cpp b/depend/bitcoin/src/test/fuzz/cluster_linearize.cpp
index b7359401..85456004 100644
--- a/depend/bitcoin/src/test/fuzz/cluster_linearize.cpp
+++ b/depend/bitcoin/src/test/fuzz/cluster_linearize.cpp
@@ -126,7 +126,7 @@ class SimpleCandidateFinder
                     // Add a queue entry with split excluded.
                     queue.emplace_back(inc, und - m_depgraph.Descendants(split));
                     // Update statistics to account for the candidate new_inc.
-                    if (new_inc.feerate > best.feerate) best = new_inc;
+                    if (ByRatioNegSize{new_inc.feerate} > ByRatioNegSize{best.feerate}) best = new_inc;
                     break;
                 }
             }
@@ -181,7 +181,7 @@ class ExhaustiveCandidateFinder
                 x_shifted >>= 1;
             }
             SetInfo cur(m_depgraph, txn & m_todo);
-            if (cur.feerate > best.feerate) best = cur;
+            if (ByRatioNegSize{cur.feerate} > ByRatioNegSize{best.feerate}) best = cur;
         }
         return best;
     }
@@ -485,7 +485,7 @@ FUZZ_TARGET(clusterlin_depgraph_sim)
 
     auto last_compaction_pos{real.PositionRange()};
 
-    LIMITED_WHILE(provider.remaining_bytes() > 0, 1000) {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, 1000) {
         int command = provider.ConsumeIntegral<uint8_t>() % 4;
         while (true) {
             // Iterate decreasing command until an applicable branch is found.
@@ -611,7 +611,6 @@ FUZZ_TARGET(clusterlin_components)
     // Construct a depgraph.
     SpanReader reader(buffer);
     DepGraph<TestBitSet> depgraph;
-    std::vector<DepGraphIndex> linearization;
     try {
         reader >> Using<DepGraphFormatter>(depgraph);
     } catch (const std::ios_base::failure&) {}
@@ -737,7 +736,7 @@ FUZZ_TARGET(clusterlin_chunking)
 
     // Verify that chunk feerates are monotonically non-increasing.
     for (size_t i = 1; i < chunking.size(); ++i) {
-        assert(!(chunking[i] >> chunking[i - 1]));
+        assert(ByRatio{chunking[i]} <= ByRatio{chunking[i - 1]});
     }
 
     // Naively recompute the chunks (each is the highest-feerate prefix of what remains).
@@ -748,7 +747,7 @@ FUZZ_TARGET(clusterlin_chunking)
         for (DepGraphIndex idx : linearization) {
             if (todo[idx]) {
                 accumulator.Set(depgraph, idx);
-                if (best.feerate.IsEmpty() || accumulator.feerate >> best.feerate) {
+                if (best.feerate.IsEmpty() || ByRatio{accumulator.feerate} > ByRatio{best.feerate}) {
                     best = accumulator;
                 }
             }
@@ -825,7 +824,7 @@ FUZZ_TARGET(clusterlin_simple_finder)
             // Compare with a non-empty topological set read from the fuzz input (comparing with an
             // empty set is not interesting).
             auto read_topo = ReadTopologicalSet(depgraph, todo, reader, /*non_empty=*/true);
-            assert(found.feerate >= depgraph.FeeRate(read_topo));
+            assert(ByRatioNegSize{found.feerate} >= ByRatioNegSize{depgraph.FeeRate(read_topo)});
         }
 
         // Find a non-empty topologically valid subset of transactions to remove from the graph.
@@ -1110,9 +1109,9 @@ FUZZ_TARGET(clusterlin_linearize)
                     // Check whether tx2 only depends on transactions that precede tx1.
                     if ((depgraph.Ancestors(tx2) - done).Count() == 1) {
                         // tx2 could take position pos1.
-                        // Verify that individual transaction feerate is decreasing (note that >=
-                        // tie-breaks by size).
-                        assert(depgraph.FeeRate(tx1) >= depgraph.FeeRate(tx2));
+                        // Verify that individual transaction feerate is decreasing (tie-breaking by
+                        // size).
+                        assert(ByRatioNegSize{depgraph.FeeRate(tx1)} >= ByRatioNegSize{depgraph.FeeRate(tx2)});
                         // If feerate and size are equal, compare by DepGraphIndex.
                         if (depgraph.FeeRate(tx1) == depgraph.FeeRate(tx2)) {
                             assert(tx1 < tx2);
@@ -1139,8 +1138,8 @@ FUZZ_TARGET(clusterlin_linearize)
                 // Check whether chunk2 only depends on transactions that precede chunk1.
                 if ((chunk2_ancestors - done).IsSubsetOf(chunk2.transactions)) {
                     // chunk2 could take position chunk_num1.
-                    // Verify that chunk feerate is decreasing (note that >= tie-breaks by size).
-                    assert(chunk1.feerate >= chunk2.feerate);
+                    // Verify that chunk feerate is decreasing (tie-breaking by size).
+                    assert(ByRatioNegSize{chunk1.feerate} >= ByRatioNegSize{chunk2.feerate});
                     // If feerate and size are equal, compare by maximum DepGraphIndex element.
                     if (chunk1.feerate == chunk2.feerate) {
                         assert(chunk1.transactions.Last() < chunk2.transactions.Last());
diff --git a/depend/bitcoin/src/test/fuzz/cmpctblock.cpp b/depend/bitcoin/src/test/fuzz/cmpctblock.cpp
new file mode 100644
index 00000000..5a67e8d9
--- /dev/null
+++ b/depend/bitcoin/src/test/fuzz/cmpctblock.cpp
@@ -0,0 +1,483 @@
+// Copyright (c) 2026 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <addrman.h>
+#include <blockencodings.h>
+#include <chain.h>
+#include <chainparams.h>
+#include <coins.h>
+#include <consensus/amount.h>
+#include <consensus/consensus.h>
+#include <consensus/merkle.h>
+#include <net.h>
+#include <net_processing.h>
+#include <netmessagemaker.h>
+#include <node/blockstorage.h>
+#include <policy/truc_policy.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <protocol.h>
+#include <script/script.h>
+#include <serialize.h>
+#include <sync.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+#include <test/fuzz/util/net.h>
+#include <test/util/net.h>
+#include <test/util/random.h>
+#include <test/util/script.h>
+#include <test/util/setup_common.h>
+#include <test/util/time.h>
+#include <test/util/validation.h>
+#include <txmempool.h>
+#include <uint256.h>
+#include <util/check.h>
+#include <util/task_runner.h>
+#include <util/time.h>
+#include <validation.h>
+#include <validationinterface.h>
+
+#include <boost/multi_index/detail/hash_index_iterator.hpp>
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <memory>
+#include <optional>
+#include <string>
+#include <thread>
+#include <utility>
+#include <vector>
+
+namespace {
+
+TestingSetup* g_setup;
+
+//! Fee each created tx will pay.
+const CAmount AMOUNT_FEE{1000};
+//! Cached coinbases that each iteration can copy and use.
+std::vector<std::pair<COutPoint, CAmount>> g_mature_coinbase;
+//! Constant value used to create valid headers.
+uint32_t g_nBits;
+//! One for each block the fuzzer generates.
+struct BlockInfo {
+    std::shared_ptr<CBlock> block;
+    uint256 hash;
+    uint32_t height;
+};
+//! Used to access prefilledtxn and shorttxids.
+class FuzzedCBlockHeaderAndShortTxIDs : public CBlockHeaderAndShortTxIDs
+{
+    using CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs;
+
+public:
+    void AddPrefilledTx(PrefilledTransaction&& prefilledtx)
+    {
+        prefilledtxn.push_back(std::move(prefilledtx));
+    }
+
+    void RemoveCoinbasePrefill()
+    {
+        prefilledtxn.erase(prefilledtxn.begin());
+    }
+
+    void InsertCoinbaseShortTxID(uint64_t shorttxid)
+    {
+        shorttxids.insert(shorttxids.begin(), shorttxid);
+    }
+
+    void EraseShortTxIDs(size_t index)
+    {
+        shorttxids.erase(shorttxids.begin() + index);
+    }
+
+    size_t PrefilledTxCount() {
+        return prefilledtxn.size();
+    }
+
+    size_t ShortTxIDCount() {
+        return shorttxids.size();
+    }
+};
+
+
+//! Used to run tasks in a std::thread to avoid DEBUG_LOCKORDER false positives.
+class ImmediateBackgroundTaskRunner : public util::TaskRunnerInterface
+{
+public:
+    void insert(std::function<void()> func) override { std::thread(std::move(func)).join(); }
+    void flush() override {}
+    size_t size() override { return 0; }
+};
+
+} // namespace
+
+extern void MakeRandDeterministicDANGEROUS(const uint256& seed) noexcept;
+
+void initialize_cmpctblock()
+{
+    static const auto testing_setup = MakeNoLogFileContext<TestingSetup>();
+    g_setup = testing_setup.get();
+    g_nBits = Params().GenesisBlock().nBits;
+    // Replace validation_signals before creating chainman and mempool so they use it.
+    testing_setup->m_node.validation_signals = std::make_unique<ValidationSignals>(std::make_unique<ImmediateBackgroundTaskRunner>());
+    g_mature_coinbase = ResetChainmanAndMempool(*g_setup);
+}
+
+FUZZ_TARGET(cmpctblock, .init = initialize_cmpctblock)
+{
+    SeedRandomStateForTest(SeedRand::ZEROS);
+    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+
+    GetFakeNodeClock().set(1610000000s);
+    FakeSteadyClock steady_clock;
+
+    auto setup = g_setup;
+    auto& mempool = *setup->m_node.mempool;
+    auto& chainman = static_cast<TestChainstateManager&>(*setup->m_node.chainman);
+    chainman.ResetIbd();
+    chainman.DisableNextWrite();
+    const size_t initial_index_size{WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())};
+
+    AddrMan addrman{*setup->m_node.netgroupman, /*deterministic=*/true, /*consistency_check_ratio=*/0};
+    auto& connman = *static_cast<ConnmanTestMsg*>(setup->m_node.connman.get());
+    auto peerman = PeerManager::make(connman, addrman,
+                                     /*banman=*/nullptr, chainman,
+                                     mempool, *setup->m_node.warnings,
+                                     PeerManager::Options{
+                                         .deterministic_rng = true,
+                                     });
+    connman.SetMsgProc(peerman.get());
+
+    setup->m_node.validation_signals->RegisterValidationInterface(peerman.get());
+    setup->m_node.validation_signals->SyncWithValidationInterfaceQueue();
+
+    LOCK(NetEventsInterface::g_msgproc_mutex);
+
+    std::vector<CNode*> peers;
+    for (int i = 0; i < 4; ++i) {
+        peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock, i).release());
+        CNode& p2p_node = *peers.back();
+        FillNode(fuzzed_data_provider, connman, p2p_node);
+        connman.AddTestNode(p2p_node);
+    }
+
+    // Stores blocks generated this iteration.
+    std::vector<BlockInfo> info;
+
+    // Coinbase UTXOs for this iteration.
+    std::vector<std::pair<COutPoint, CAmount>> mature_coinbase = g_mature_coinbase;
+
+    const uint64_t initial_sequence{WITH_LOCK(mempool.cs, return mempool.GetSequence())};
+
+    auto create_tx = [&]() -> CTransactionRef {
+        CMutableTransaction tx_mut;
+        tx_mut.version = fuzzed_data_provider.ConsumeBool() ? CTransaction::CURRENT_VERSION : TRUC_VERSION;
+        tx_mut.nLockTime = fuzzed_data_provider.ConsumeBool() ? 0 : fuzzed_data_provider.ConsumeIntegral<uint32_t>();
+
+        // Choose an outpoint from the mempool, created blocks, or coinbases.
+        CAmount amount_in;
+        COutPoint outpoint;
+        unsigned long mempool_size = mempool.size();
+        if (mempool_size != 0 && fuzzed_data_provider.ConsumeBool()) {
+            size_t random_idx = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, mempool_size - 1);
+            CTransactionRef tx = WITH_LOCK(mempool.cs, return mempool.txns_randomized[random_idx].second->GetSharedTx(););
+            outpoint = COutPoint(tx->GetHash(), 0);
+            amount_in = tx->vout[0].nValue;
+        } else if (info.size() != 0 && fuzzed_data_provider.ConsumeBool()) {
+            // These blocks (and txs) may be invalid, use a spent output, or not be in the main chain.
+            auto info_it = info.begin();
+            std::advance(info_it, fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, info.size() - 1));
+            auto tx_it = info_it->block->vtx.begin();
+            std::advance(tx_it, fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, info_it->block->vtx.size() - 1));
+            outpoint = COutPoint(tx_it->get()->GetHash(), 0);
+            amount_in = tx_it->get()->vout[0].nValue;
+        } else {
+            auto coinbase_it = mature_coinbase.begin();
+            std::advance(coinbase_it, fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, mature_coinbase.size() - 1));
+            outpoint = coinbase_it->first;
+            amount_in = coinbase_it->second;
+        }
+
+        const auto sequence = ConsumeSequence(fuzzed_data_provider);
+        const auto script_sig = CScript{};
+        const auto script_wit_stack = std::vector<std::vector<uint8_t>>{WITNESS_STACK_ELEM_OP_TRUE};
+
+        CTxIn in;
+        in.prevout = outpoint;
+        in.nSequence = sequence;
+        in.scriptSig = script_sig;
+        in.scriptWitness.stack = script_wit_stack;
+        tx_mut.vin.push_back(in);
+
+        const CAmount amount_out = amount_in - AMOUNT_FEE;
+        tx_mut.vout.emplace_back(amount_out, P2WSH_OP_TRUE);
+
+        auto tx = MakeTransactionRef(tx_mut);
+        return tx;
+    };
+
+    auto create_block = [&]() {
+        uint256 prev;
+        uint32_t height;
+
+        if (info.size() == 0 || fuzzed_data_provider.ConsumeBool()) {
+            LOCK(cs_main);
+            prev = chainman.ActiveChain().Tip()->GetBlockHash();
+            height = chainman.ActiveChain().Height() + 1;
+        } else {
+            size_t index = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, info.size() - 1);
+            prev = info[index].hash;
+            height = info[index].height + 1;
+        }
+
+        const auto new_time = WITH_LOCK(::cs_main, return chainman.ActiveChain().Tip()->GetMedianTimePast() + 1);
+
+        CBlockHeader header;
+        header.nNonce = 0;
+        header.hashPrevBlock = prev;
+        header.nBits = g_nBits;
+        header.nTime = new_time;
+        header.nVersion = fuzzed_data_provider.ConsumeIntegral<int32_t>();
+
+        std::shared_ptr<CBlock> block = std::make_shared<CBlock>();
+        *block = header;
+
+        CMutableTransaction coinbase_tx;
+        coinbase_tx.vin.resize(1);
+        coinbase_tx.vin[0].prevout.SetNull();
+        coinbase_tx.vin[0].scriptSig = CScript() << height << OP_0;
+        coinbase_tx.vout.resize(1);
+        coinbase_tx.vout[0].scriptPubKey = CScript() << OP_TRUE;
+        coinbase_tx.vout[0].nValue = COIN;
+        block->vtx.push_back(MakeTransactionRef(coinbase_tx));
+
+        const auto mempool_size = mempool.size();
+        if (fuzzed_data_provider.ConsumeBool() && mempool_size != 0) {
+            // Add txns from the mempool. Since we do not include parents, it may be an invalid block.
+            size_t num_txns = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, mempool_size);
+            size_t random_idx = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, mempool_size - 1);
+
+            LOCK(mempool.cs);
+            for (size_t i = random_idx; i < random_idx + num_txns; ++i) {
+                CTransactionRef mempool_tx = mempool.txns_randomized[i % mempool_size].second->GetSharedTx();
+                block->vtx.push_back(mempool_tx);
+            }
+        }
+
+        // Create and add (possibly invalid) txns that are not in the mempool.
+        if (fuzzed_data_provider.ConsumeBool()) {
+            size_t new_txns = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 10);
+            for (size_t i = 0; i < new_txns; ++i) {
+                CTransactionRef non_mempool_tx = create_tx();
+                block->vtx.push_back(non_mempool_tx);
+            }
+        }
+
+        CBlockIndex* pindexPrev{WITH_LOCK(::cs_main, return chainman.m_blockman.LookupBlockIndex(prev))};
+        chainman.GenerateCoinbaseCommitment(*block, pindexPrev);
+
+        bool mutated;
+        block->hashMerkleRoot = BlockMerkleRoot(*block, &mutated);
+        FinalizeHeader(*block, chainman);
+
+        BlockInfo block_info;
+        block_info.block = block;
+        block_info.hash = block->GetHash();
+        block_info.height = height;
+
+        return block_info;
+    };
+
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 1000) {
+        CSerializedNetMsg net_msg;
+        bool sent_net_msg = true;
+        bool requested_hb = false;
+        bool sent_sendcmpct = false;
+        bool valid_sendcmpct = false;
+
+        CallOneOf(
+            fuzzed_data_provider,
+            [&]() {
+                // Send a compact block.
+                std::shared_ptr<CBlock> cblock;
+
+                // Pick an existing block or create a new block.
+                if (fuzzed_data_provider.ConsumeBool() && info.size() != 0) {
+                    size_t index = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, info.size() - 1);
+                    cblock = info[index].block;
+                } else {
+                    BlockInfo block_info = create_block();
+                    cblock = block_info.block;
+                    info.push_back(block_info);
+                }
+
+                uint64_t nonce = fuzzed_data_provider.ConsumeIntegral<uint64_t>();
+                FuzzedCBlockHeaderAndShortTxIDs cmpctblock(*cblock, nonce);
+
+                if (fuzzed_data_provider.ConsumeBool()) {
+                    CBlockHeaderAndShortTxIDs base_cmpctblock = cmpctblock;
+                    net_msg = NetMsg::Make(NetMsgType::CMPCTBLOCK, base_cmpctblock);
+                    return;
+                }
+
+                int prev_idx = 0;
+                size_t num_erased = 1;
+                size_t num_txs = cblock->vtx.size();
+
+                for (size_t i = 0; i < num_txs; ++i) {
+                    if (i == 0) {
+                        // Handle the coinbase specially. We either keep it prefilled or remove it.
+                        if (fuzzed_data_provider.ConsumeBool()) continue;
+
+                        // Remove the prefilled coinbase.
+                        num_erased = 0;
+                        uint64_t coinbase_shortid = cmpctblock.GetShortID(cblock->vtx[0]->GetWitnessHash());
+                        cmpctblock.RemoveCoinbasePrefill();
+                        cmpctblock.InsertCoinbaseShortTxID(coinbase_shortid);
+                        continue;
+                    }
+
+                    if (fuzzed_data_provider.ConsumeBool()) continue;
+
+                    uint16_t prefill_idx = num_erased == 0 ? i : i - prev_idx - 1;
+                    prev_idx = i;
+                    CTransactionRef txref = cblock->vtx[i];
+                    PrefilledTransaction prefilledtx = {/*index=*/prefill_idx, txref};
+                    cmpctblock.AddPrefilledTx(std::move(prefilledtx));
+
+                    // Remove from shorttxids since we've prefilled. Subtract however many txs have been prefilled.
+                    cmpctblock.EraseShortTxIDs(i - num_erased);
+                    ++num_erased;
+                }
+
+                assert(cmpctblock.PrefilledTxCount() + cmpctblock.ShortTxIDCount() == num_txs);
+
+                CBlockHeaderAndShortTxIDs base_cmpctblock = cmpctblock;
+                net_msg = NetMsg::Make(NetMsgType::CMPCTBLOCK, base_cmpctblock);
+            },
+            [&]() {
+                // Send a blocktxn message for an existing block (if one exists).
+                size_t num_blocks = info.size();
+                if (num_blocks == 0) {
+                    sent_net_msg = false;
+                    return;
+                }
+
+                // Fetch an existing block and randomly choose transactions to send over.
+                size_t index = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, num_blocks - 1);
+                const BlockInfo& block_info = info[index];
+                BlockTransactions block_txn;
+                block_txn.blockhash = block_info.hash;
+                std::shared_ptr<CBlock> cblock = block_info.block;
+
+                for (size_t i = 0; i < cblock->vtx.size(); i++) {
+                    if (fuzzed_data_provider.ConsumeBool()) continue;
+
+                    block_txn.txn.push_back(cblock->vtx[i]);
+                }
+
+                net_msg = NetMsg::Make(NetMsgType::BLOCKTXN, block_txn);
+            },
+            [&]() {
+                // Send a headers message for an existing block (if one exists).
+                size_t num_blocks = info.size();
+                if (num_blocks == 0) {
+                    sent_net_msg = false;
+                    return;
+                }
+
+                // Choose an existing block and send a HEADERS message for it.
+                size_t index = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, num_blocks - 1);
+                CBlock block = *info[index].block;
+                block.vtx.clear(); // No tx in HEADERS.
+                std::vector<CBlock> headers;
+                headers.emplace_back(block);
+
+                net_msg = NetMsg::Make(NetMsgType::HEADERS, TX_WITH_WITNESS(headers));
+            },
+            [&]() {
+                // Send a sendcmpct message, optionally setting hb mode.
+                bool hb = fuzzed_data_provider.ConsumeBool();
+                uint64_t version{fuzzed_data_provider.ConsumeBool() ? CMPCTBLOCKS_VERSION : fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
+                net_msg = NetMsg::Make(NetMsgType::SENDCMPCT, /*high_bandwidth=*/hb, /*version=*/version);
+                requested_hb = hb;
+                sent_sendcmpct = true;
+                valid_sendcmpct = version == CMPCTBLOCKS_VERSION;
+            },
+            [&]() {
+                // Mine a block, but don't send it.
+                BlockInfo block_info = create_block();
+                info.push_back(block_info);
+                sent_net_msg = false;
+            },
+            [&]() {
+                // Send a transaction.
+                CTransactionRef tx = create_tx();
+                net_msg = NetMsg::Make(NetMsgType::TX, TX_WITH_WITNESS(*tx));
+            },
+            [&]() {
+                // Set mock time randomly or to tip's time.
+                if (fuzzed_data_provider.ConsumeBool()) {
+                    GetFakeNodeClock().set(ConsumeTime(fuzzed_data_provider));
+                } else {
+                    const NodeSeconds tip_time = WITH_LOCK(::cs_main, return chainman.ActiveChain().Tip()->Time());
+                    GetFakeNodeClock().set(tip_time);
+                }
+
+                sent_net_msg = false;
+            });
+
+        if (!sent_net_msg) {
+            continue;
+        }
+
+        CNode& random_node = *PickValue(fuzzed_data_provider, peers);
+        connman.FlushSendBuffer(random_node);
+        (void)connman.ReceiveMsgFrom(random_node, std::move(net_msg));
+
+        bool more_work{true};
+        while (more_work) {
+            random_node.fPauseSend = false;
+
+            more_work = connman.ProcessMessagesOnce(random_node);
+            peerman->SendMessages(random_node);
+        }
+
+        std::vector<CNodeStats> stats;
+        connman.GetNodeStats(stats);
+
+        // We should have at maximum 3 HB peers.
+        int num_hb = 0;
+        for (const CNodeStats& stat : stats) {
+            if (stat.m_bip152_highbandwidth_to) {
+                // HB peers cannot be feelers or other "special" connections (besides addr-fetch).
+                CNode* hb_peer = peers[stat.nodeid];
+                if (!hb_peer->fDisconnect) num_hb += 1;
+                assert(hb_peer->IsInboundConn() || hb_peer->IsOutboundOrBlockRelayConn() || hb_peer->IsManualConn() || hb_peer->IsAddrFetchConn());
+            }
+        }
+        assert(num_hb <= 3);
+
+        if (sent_sendcmpct && !random_node.fDisconnect) {
+            // If the fuzzer sent SENDCMPCT with proper version, check the node's state matches what it sent.
+            const CNodeStats& random_node_stats = stats[random_node.GetId()];
+            if (valid_sendcmpct) assert(random_node_stats.m_bip152_highbandwidth_from == requested_hb);
+        }
+    }
+
+    setup->m_node.validation_signals->SyncWithValidationInterfaceQueue();
+    setup->m_node.validation_signals->UnregisterAllValidationInterfaces();
+    connman.StopNodes();
+
+    const size_t end_index_size{WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())};
+    const uint64_t end_sequence{WITH_LOCK(mempool.cs, return mempool.GetSequence())};
+
+    if (initial_index_size != end_index_size || initial_sequence != end_sequence) {
+        MakeRandDeterministicDANGEROUS(uint256::ZERO);
+        g_mature_coinbase = ResetChainmanAndMempool(*g_setup);
+    }
+}
diff --git a/depend/bitcoin/src/test/fuzz/coins_view.cpp b/depend/bitcoin/src/test/fuzz/coins_view.cpp
index c11581d2..6f5dbd62 100644
--- a/depend/bitcoin/src/test/fuzz/coins_view.cpp
+++ b/depend/bitcoin/src/test/fuzz/coins_view.cpp
@@ -7,7 +7,10 @@
 #include <consensus/tx_check.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
+#include <kernel/chainstatemanager_opts.h>
+#include <kernel/cs_main.h>
 #include <policy/policy.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <test/fuzz/FuzzedDataProvider.h>
@@ -16,6 +19,7 @@
 #include <test/util/setup_common.h>
 #include <txdb.h>
 #include <util/hasher.h>
+#include <util/threadpool.h>
 
 #include <cassert>
 #include <algorithm>
@@ -83,6 +87,50 @@ class MutationGuardCoinsViewCache final : public CCoinsViewCache
 
     using CCoinsViewCache::CCoinsViewCache;
 };
+
+// Reuse a single global thread pool across fuzz iterations. Creating and destroying a pool every
+// iteration leaks memory, since iterations can run faster than the OS can tear down the threads.
+std::shared_ptr<ThreadPool> g_thread_pool{std::make_shared<ThreadPool>("view_fuzz")};
+
+void StartPoolIfNeeded()
+{
+    if (!g_thread_pool->WorkersCount()) g_thread_pool->Start(DEFAULT_PREVOUTFETCH_THREADS);
+}
+
+//! Build a random block and seed a view with utxos for its inputs.
+CBlock BuildRandomBlock(FuzzedDataProvider& fuzzed_data_provider, CCoinsView& view)
+{
+    CBlock block;
+    CMutableTransaction coinbase;
+    coinbase.vin.emplace_back();
+    block.vtx.push_back(MakeTransactionRef(coinbase));
+
+    CCoinsViewCache seed_cache{&view, /*deterministic=*/true};
+    seed_cache.SetBestBlock(uint256::ONE);
+
+    Txid prevhash{Txid::FromUint256(ConsumeUInt256(fuzzed_data_provider))};
+    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
+    {
+        CMutableTransaction tx;
+        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
+        {
+            const Txid txid{fuzzed_data_provider.ConsumeBool()
+                                ? Txid::FromUint256(ConsumeUInt256(fuzzed_data_provider))
+                                : prevhash};
+            const COutPoint outpoint{txid, fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
+            if (auto coin{ConsumeDeserializable<Coin>(fuzzed_data_provider)}; coin && !coin->IsSpent()) {
+                seed_cache.AddCoin(outpoint, std::move(*coin), /*possible_overwrite=*/true);
+            }
+            tx.vin.emplace_back(outpoint);
+        }
+        prevhash = tx.GetHash();
+        block.vtx.push_back(MakeTransactionRef(tx));
+    }
+
+    seed_cache.Flush();
+    return block;
+}
+
 } // namespace
 
 void initialize_coins_view()
@@ -92,7 +140,9 @@ void initialize_coins_view()
 
 void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& coins_view_cache, CCoinsView* backend_coins_view)
 {
-    const bool is_db{dynamic_cast<CCoinsViewDB*>(backend_coins_view) != nullptr};
+    auto* const db{dynamic_cast<CCoinsViewDB*>(backend_coins_view)};
+    auto* const overlay{dynamic_cast<CoinsViewOverlay*>(&coins_view_cache)};
+    const bool is_db{db != nullptr};
     bool good_data{true};
     auto* original_backend{backend_coins_view};
 
@@ -100,8 +150,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
     COutPoint random_out_point;
     Coin random_coin;
     CMutableTransaction random_mutable_transaction;
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 10'000)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 10'000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -115,15 +164,20 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
                     const bool possible_overwrite{coins_view_cache.PeekCoin(outpoint) || fuzzed_data_provider.ConsumeBool()};
                     coins_view_cache.AddCoin(outpoint, std::move(coin), possible_overwrite);
                 } else {
-                    coins_view_cache.EmplaceCoinInternalDANGER(std::move(outpoint), std::move(coin));
+                    coins_view_cache.EmplaceCoinInternalDANGER(outpoint, std::move(coin));
                 }
             },
             [&] {
+                if (overlay && !overlay->AllInputsConsumed()) return; // CoinsViewOverlay::Flush() must have all inputs consumed before being called
                 coins_view_cache.Flush(/*reallocate_cache=*/fuzzed_data_provider.ConsumeBool());
             },
             [&] {
+                if (overlay) return; // CoinsViewOverlay::Sync() is never called in production code
                 coins_view_cache.Sync();
             },
+            [&] {
+                if (db) WITH_LOCK(::cs_main, (void)db->CompactFullAsync());
+            },
             [&] {
                 uint256 best_block{ConsumeUInt256(fuzzed_data_provider)};
                 // `CCoinsViewDB::BatchWrite()` requires a non-null best block.
@@ -150,6 +204,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
                 coins_view_cache.Uncache(random_out_point);
             },
             [&] {
+                if (overlay) return; // // CoinsViewOverlay::SetBackend() is never called in production code
                 const bool use_original_backend{fuzzed_data_provider.ConsumeBool()};
                 if (use_original_backend && backend_coins_view != original_backend) {
                     // FRESH flags valid against the empty backend may be invalid
@@ -190,9 +245,8 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
                 sentinel.second.SelfRef(sentinel);
                 size_t dirty_count{0};
                 CCoinsMapMemoryResource resource;
-                CCoinsMap coins_map{0, SaltedOutpointHasher{/*deterministic=*/true}, CCoinsMap::key_equal{}, &resource};
-                LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 10'000)
-                {
+                CCoinsMap coins_map{0, SaltedCoinsCacheHasher{/*deterministic=*/true}, CCoinsMap::key_equal{}, &resource};
+                LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 10'000) {
                     CCoinsCacheEntry coins_cache_entry;
                     if (fuzzed_data_provider.ConsumeBool()) {
                         coins_cache_entry.coin = random_coin;
@@ -222,13 +276,6 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
     }
 
     {
-        bool expected_code_path = false;
-        try {
-            (void)coins_view_cache.Cursor();
-        } catch (const std::logic_error&) {
-            expected_code_path = true;
-        }
-        assert(expected_code_path);
         (void)coins_view_cache.DynamicMemoryUsage();
         (void)coins_view_cache.EstimateSize();
         (void)coins_view_cache.GetBestBlock();
@@ -239,7 +286,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
 
     {
         if (is_db && backend_coins_view == original_backend) {
-            assert(backend_coins_view->Cursor());
+            assert(db->Cursor());
         }
         (void)backend_coins_view->EstimateSize();
         (void)backend_coins_view->GetBestBlock();
@@ -333,11 +380,20 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
             assert(!exists_using_access_coin && !exists_using_have_coin_in_cache && !exists_using_have_coin);
         }
         // If HaveCoin on the backend is true, it must also be on the cache if the coin wasn't spent.
-        const bool exists_using_have_coin_in_backend = backend_coins_view->HaveCoin(random_out_point);
+        std::optional<Coin> coin_in_backend;
+        bool exists_using_have_coin_in_backend;
+        if (dynamic_cast<CoinsViewOverlay*>(&coins_view_cache)) {
+            // PeekCoin does not mutate cacheCoins, so async workers can keep running.
+            coin_in_backend = backend_coins_view->PeekCoin(random_out_point);
+            exists_using_have_coin_in_backend = coin_in_backend.has_value();
+        } else {
+            exists_using_have_coin_in_backend = backend_coins_view->HaveCoin(random_out_point);
+            coin_in_backend = backend_coins_view->GetCoin(random_out_point);
+        }
         if (!coin_using_access_coin.IsSpent() && exists_using_have_coin_in_backend) {
             assert(exists_using_have_coin);
         }
-        if (auto coin{backend_coins_view->GetCoin(random_out_point)}) {
+        if (coin_in_backend) {
             assert(exists_using_have_coin_in_backend);
             // Note we can't assert that `coin_using_get_coin == *coin` because the coin in
             // the cache may have been modified but not yet flushed.
@@ -373,8 +429,34 @@ FUZZ_TARGET(coins_view_db, .init = initialize_coins_view)
 // called.
 FUZZ_TARGET(coins_view_overlay, .init = initialize_coins_view)
 {
+    SeedRandomStateForTest(SeedRand::ZEROS); // for SaltedCoinsCacheHasher
+    StartPoolIfNeeded();
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     MutationGuardCoinsViewCache backend_cache{&CoinsViewEmpty::Get(), /*deterministic=*/true};
-    CoinsViewOverlay coins_view_cache{&backend_cache, /*deterministic=*/true};
+    CoinsViewOverlay coins_view_cache{&backend_cache, g_thread_pool, /*deterministic=*/true};
+    CBlock block{BuildRandomBlock(fuzzed_data_provider, backend_cache)};
+    const auto reset_guard{coins_view_cache.StartFetching(block)};
     TestCoinsView(fuzzed_data_provider, coins_view_cache, &backend_cache);
 }
+
+FUZZ_TARGET(coins_view_stacked, .init = initialize_coins_view)
+{
+    SeedRandomStateForTest(SeedRand::ZEROS); // for SaltedCoinsCacheHasher
+    StartPoolIfNeeded();
+    FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+    auto db_params = DBParams{
+        .path = "",
+        .cache_bytes = 1_MiB,
+        .memory_only = true,
+    };
+    CCoinsViewDB backend_base_coins_view{std::move(db_params), CoinsViewOptions{}};
+    CCoinsViewCache backend_cache{&backend_base_coins_view, /*deterministic=*/true};
+    TestCoinsView(fuzzed_data_provider, backend_cache, &backend_base_coins_view);
+    CoinsViewOverlay coins_view_cache{&backend_cache, g_thread_pool, /*deterministic=*/true};
+    CBlock block{BuildRandomBlock(fuzzed_data_provider, backend_base_coins_view)};
+    {
+        const auto reset_guard{coins_view_cache.StartFetching(block)};
+        TestCoinsView(fuzzed_data_provider, coins_view_cache, &backend_cache);
+    }
+    TestCoinsView(fuzzed_data_provider, backend_cache, &backend_base_coins_view);
+}
diff --git a/depend/bitcoin/src/test/fuzz/coinscache_sim.cpp b/depend/bitcoin/src/test/fuzz/coinscache_sim.cpp
index 9d41a6c0..3e5d29a2 100644
--- a/depend/bitcoin/src/test/fuzz/coinscache_sim.cpp
+++ b/depend/bitcoin/src/test/fuzz/coinscache_sim.cpp
@@ -4,10 +4,14 @@
 
 #include <coins.h>
 #include <crypto/sha256.h>
+#include <kernel/chainstatemanager_opts.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
+#include <test/util/setup_common.h>
+#include <util/threadpool.h>
 
 #include <cassert>
 #include <cstdint>
@@ -34,12 +38,20 @@ struct PrecomputedData
     //! Randomly generated Coin values.
     Coin coins[NUM_COINS];
 
+    //! Block with a tx containing as inputs the above outpoints.
+    CBlock block;
+
     PrecomputedData()
     {
         static const uint8_t PREFIX_O[1] = {'o'}; /** Hash prefix for outpoint hashes. */
         static const uint8_t PREFIX_S[1] = {'s'}; /** Hash prefix for coins scriptPubKeys. */
         static const uint8_t PREFIX_M[1] = {'m'}; /** Hash prefix for coins nValue/fCoinBase. */
 
+        CMutableTransaction coinbase;
+        coinbase.vin.emplace_back();
+        block.vtx.push_back(MakeTransactionRef(coinbase));
+
+        CMutableTransaction tx;
         for (uint32_t i = 0; i < NUM_OUTPOINTS; ++i) {
             uint32_t idx = (i * 1200U) >> 12; /* Map 3 or 4 entries to same txid. */
             const uint8_t ser[4] = {uint8_t(idx), uint8_t(idx >> 8), uint8_t(idx >> 16), uint8_t(idx >> 24)};
@@ -47,7 +59,9 @@ struct PrecomputedData
             CSHA256().Write(PREFIX_O, 1).Write(ser, sizeof(ser)).Finalize(txid.begin());
             outpoints[i].hash = Txid::FromUint256(txid);
             outpoints[i].n = i;
+            tx.vin.emplace_back(outpoints[i]);
         }
+        block.vtx.push_back(MakeTransactionRef(tx));
 
         for (uint32_t i = 0; i < NUM_COINS; ++i) {
             const uint8_t ser[4] = {uint8_t(i), uint8_t(i >> 8), uint8_t(i >> 16), uint8_t(i >> 24)};
@@ -70,7 +84,7 @@ struct PrecomputedData
                 coins[i].out.scriptPubKey[0] = OP_HASH160;
                 coins[i].out.scriptPubKey[1] = 20;
                 std::copy(hash.begin(), hash.begin() + 20, coins[i].out.scriptPubKey.begin() + 2);
-                coins[i].out.scriptPubKey[12] = OP_EQUAL;
+                coins[i].out.scriptPubKey[22] = OP_EQUAL;
                 break;
             case 2: /* P2WPKH */
                 coins[i].out.scriptPubKey.resize(22);
@@ -182,10 +196,29 @@ class CoinsViewBottom final : public CoinsViewEmpty
     }
 };
 
+// Hold a non-movable ResetGuard on the heap so StartFetching can remain active
+// for the lifetime of a CoinsViewOverlay cache level.
+struct OverlayFetchScope
+{
+    CCoinsViewCache::ResetGuard guard;
+    OverlayFetchScope(CoinsViewOverlay& view, const CBlock& block) : guard(view.StartFetching(block)) {}
+};
+
+// Reuse a single global thread pool across fuzz iterations. Creating and destroying a pool every
+// iteration leaks memory, since iterations can run faster than the OS can tear down the threads.
+std::shared_ptr<ThreadPool> g_thread_pool{std::make_shared<ThreadPool>("cache_fuzz")};
+
+void StartPoolIfNeeded()
+{
+    if (!g_thread_pool->WorkersCount()) g_thread_pool->Start(DEFAULT_PREVOUTFETCH_THREADS);
+}
+
 } // namespace
 
-FUZZ_TARGET(coinscache_sim)
+FUZZ_TARGET(coinscache_sim, .init = [] { static auto setup{MakeNoLogFileContext<>()}; })
 {
+    SeedRandomStateForTest(SeedRand::ZEROS);
+    StartPoolIfNeeded();
     /** Precomputed COutPoint and CCoins values. */
     static const PrecomputedData data;
 
@@ -193,6 +226,8 @@ FUZZ_TARGET(coinscache_sim)
     CoinsViewBottom bottom;
     /** Real CCoinsViewCache objects. */
     std::vector<std::unique_ptr<CCoinsViewCache>> caches;
+    /** Long-lived StartFetching guard (nullptr unless corresponding level is a CoinsViewOverlay). */
+    std::unique_ptr<OverlayFetchScope> overlay_fetch_scope;
     /** Simulated cache data (sim_caches[0] matches bottom, sim_caches[i+1] matches caches[i]). */
     CacheLevel sim_caches[MAX_CACHES + 1];
     /** Current height in the simulation. */
@@ -233,7 +268,7 @@ FUZZ_TARGET(coinscache_sim)
     // Main simulation loop: read commands from the fuzzer input, and apply them
     // to both the real cache stack and the simulation.
     FuzzedDataProvider provider(buffer.data(), buffer.size());
-    LIMITED_WHILE(provider.remaining_bytes(), 10000) {
+    LIMITED_WHILE (provider.remaining_bytes(), 10000) {
         // Every operation (except "Change height") moves current height forward,
         // so it functions as a kind of epoch, making ~all UTXOs unique.
         ++current_height;
@@ -368,11 +403,17 @@ FUZZ_TARGET(coinscache_sim)
 
             [&]() { // Add a cache level (if not already at the max).
                 if (caches.size() != MAX_CACHES) {
+                    if (overlay_fetch_scope) {
+                        overlay_fetch_scope.reset();
+                        sim_caches[caches.size()].Wipe();
+                    }
                     // Apply to real caches.
                     if (provider.ConsumeBool()) {
                         caches.emplace_back(new CCoinsViewCache(&*caches.back(), /*deterministic=*/true));
                     } else {
-                        caches.emplace_back(new CoinsViewOverlay(&*caches.back(), /*deterministic=*/true));
+                        caches.emplace_back(new CoinsViewOverlay(&*caches.back(), g_thread_pool, /*deterministic=*/true));
+                        auto& overlay{static_cast<CoinsViewOverlay&>(*caches.back())};
+                        overlay_fetch_scope = std::make_unique<OverlayFetchScope>(overlay, data.block);
                     }
                     // Apply to simulation data.
                     sim_caches[caches.size()].Wipe();
@@ -382,10 +423,16 @@ FUZZ_TARGET(coinscache_sim)
             [&]() { // Remove a cache level.
                 // Apply to real caches (this reduces caches.size(), implicitly doing the same on the simulation data).
                 caches.back()->SanityCheck();
+                overlay_fetch_scope.reset();
                 caches.pop_back();
             },
 
             [&]() { // Flush.
+                // CoinsViewOverlay::Flush() must have all inputs consumed before being called
+                if (auto* overlay{dynamic_cast<CoinsViewOverlay*>(caches.back().get())};
+                    overlay && !overlay->AllInputsConsumed()) {
+                    return;
+                }
                 // Apply to simulation data.
                 flush();
                 // Apply to real caches.
@@ -393,6 +440,7 @@ FUZZ_TARGET(coinscache_sim)
             },
 
             [&]() { // Sync.
+                if (overlay_fetch_scope) return; // CoinsViewOverlay::Sync() is never called in production
                 // Apply to simulation data (note that in our simulation, syncing and flushing is the same thing).
                 flush();
                 // Apply to real caches.
@@ -401,9 +449,13 @@ FUZZ_TARGET(coinscache_sim)
 
             [&]() { // Reset.
                 sim_caches[caches.size()].Wipe();
-                // Apply to real caches.
-                {
-                    const auto reset_guard{caches.back()->CreateResetGuard()};
+                // Apply to real caches. Optionally start fetching again.
+                if (overlay_fetch_scope && provider.ConsumeBool()) {
+                    overlay_fetch_scope.reset();
+                    auto& overlay{static_cast<CoinsViewOverlay&>(*caches.back())};
+                    overlay_fetch_scope = std::make_unique<OverlayFetchScope>(overlay, data.block);
+                } else {
+                    (void)caches.back()->CreateResetGuard();
                 }
             },
 
@@ -427,26 +479,25 @@ FUZZ_TARGET(coinscache_sim)
     }
 
     // Full comparison between caches and simulation data, from bottom to top,
-    // as AccessCoin on a higher cache may affect caches below it.
     for (unsigned sim_idx = 1; sim_idx <= caches.size(); ++sim_idx) {
         auto& cache = *caches[sim_idx - 1];
         size_t cache_size = 0;
 
         for (uint32_t outpointidx = 0; outpointidx < NUM_OUTPOINTS; ++outpointidx) {
             cache_size += cache.HaveCoinInCache(data.outpoints[outpointidx]);
-            const auto& real = cache.AccessCoin(data.outpoints[outpointidx]);
+            const auto real{cache.PeekCoin(data.outpoints[outpointidx])};
             auto sim = lookup(outpointidx, sim_idx);
             if (!sim.has_value()) {
-                assert(real.IsSpent());
+                assert(!real);
             } else {
-                assert(!real.IsSpent());
-                assert(real.out == data.coins[sim->first].out);
-                assert(real.fCoinBase == data.coins[sim->first].fCoinBase);
-                assert(real.nHeight == sim->second);
+                assert(!real->IsSpent());
+                assert(real->out == data.coins[sim->first].out);
+                assert(real->fCoinBase == data.coins[sim->first].fCoinBase);
+                assert(real->nHeight == sim->second);
             }
         }
 
-        // HaveCoinInCache ignores spent coins, so GetCacheSize() may exceed it. */
+        // HaveCoinInCache ignores spent coins, so GetCacheSize() may exceed it.
         assert(cache.GetCacheSize() >= cache_size);
     }
 
diff --git a/depend/bitcoin/src/test/fuzz/connman.cpp b/depend/bitcoin/src/test/fuzz/connman.cpp
index 1b0859d6..195c2f28 100644
--- a/depend/bitcoin/src/test/fuzz/connman.cpp
+++ b/depend/bitcoin/src/test/fuzz/connman.cpp
@@ -41,7 +41,8 @@ FUZZ_TARGET(connman, .init = initialize_connman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
+    FakeSteadyClock steady_clock;
     auto netgroupman{ConsumeNetGroupManager(fuzzed_data_provider)};
     auto addr_man_ptr{std::make_unique<AddrManDeterministic>(netgroupman, fuzzed_data_provider, GetCheckRatio())};
     if (fuzzed_data_provider.ConsumeBool()) {
@@ -58,8 +59,8 @@ FUZZ_TARGET(connman, .init = initialize_connman)
 
     // Mock CreateSock() to create FuzzedSock.
     auto CreateSockOrig = CreateSock;
-    CreateSock = [&fuzzed_data_provider](int, int, int) {
-        return std::make_unique<FuzzedSock>(fuzzed_data_provider);
+    CreateSock = [&fuzzed_data_provider, &steady_clock](int, int, int) {
+        return std::make_unique<FuzzedSock>(fuzzed_data_provider, steady_clock);
     };
 
     // Mock g_dns_lookup() to return a fuzzed address.
@@ -81,6 +82,13 @@ FUZZ_TARGET(connman, .init = initialize_connman)
     options.m_msgproc = &net_events;
     options.nMaxOutboundLimit = max_outbound_limit;
 
+    const auto local_services{ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS)};
+    options.m_local_services = local_services;
+
+    const auto use_addrman_outgoing{fuzzed_data_provider.ConsumeBool()};
+    options.m_use_addrman_outgoing = use_addrman_outgoing;
+    options.m_max_automatic_connections = fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 1000);
+
     auto consume_whitelist = [&]() {
         std::vector<NetWhitelistPermissions> result(fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 3));
         for (auto& entry : result) {
@@ -94,20 +102,27 @@ FUZZ_TARGET(connman, .init = initialize_connman)
 
     connman.Init(options);
 
+    const uint64_t total_bytes_recv_initial{connman.GetTotalBytesRecv()};
+    const uint64_t total_bytes_sent_initial{connman.GetTotalBytesSent()};
+
     CNetAddr random_netaddr;
     CAddress random_address;
-    CNode random_node = ConsumeNode(fuzzed_data_provider);
+    CNode random_node = ConsumeNode(fuzzed_data_provider, steady_clock);
     CSubNet random_subnet;
     std::string random_string;
+    std::vector<NodeId> node_ids;
+    std::vector<std::string> node_addr_names;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100) {
-        CNode& p2p_node{*ConsumeNodeAsUniquePtr(fuzzed_data_provider).release()};
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
+        CNode& p2p_node{*ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock).release()};
         // Simulate post-handshake state.
         p2p_node.fSuccessfullyConnected = true;
         connman.AddTestNode(p2p_node);
+        node_ids.push_back(p2p_node.GetId());
+        node_addr_names.push_back(p2p_node.m_addr_name);
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -123,7 +138,23 @@ FUZZ_TARGET(connman, .init = initialize_connman)
                 random_string = fuzzed_data_provider.ConsumeRandomLengthString(64);
             },
             [&] {
-                connman.AddNode({random_string, fuzzed_data_provider.ConsumeBool()});
+                const std::string& node_str = (!node_addr_names.empty() && fuzzed_data_provider.ConsumeBool())
+                    ? PickValue(fuzzed_data_provider, node_addr_names)
+                    : random_string;
+                const auto added_node_info{connman.GetAddedNodeInfo(/*include_connected=*/true)};
+                const auto add_node{connman.AddNode({node_str, /*use_v2transport=*/fuzzed_data_provider.ConsumeBool()})};
+                if (add_node) {
+                    assert(!connman.AddNode({node_str, /*use_v2transport=*/fuzzed_data_provider.ConsumeBool()}));
+                    assert(added_node_info.size() < connman.GetAddedNodeInfo(/*include_connected=*/true).size());
+                    const auto remove{fuzzed_data_provider.ConsumeBool()};
+                    if (remove) {
+                        assert(connman.RemoveAddedNode(node_str));
+                        assert(added_node_info.size() == connman.GetAddedNodeInfo(/*include_connected=*/true).size());
+                    }
+                }
+            },
+            [&] {
+                (void)connman.RemoveAddedNode(random_string);
             },
             [&] {
                 connman.CheckIncomingNonce(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
@@ -141,10 +172,15 @@ FUZZ_TARGET(connman, .init = initialize_connman)
                 connman.DisconnectNode(random_subnet);
             },
             [&] {
-                connman.ForEachNode([](auto) {});
-            },
-            [&] {
-                (void)connman.ForNode(fuzzed_data_provider.ConsumeIntegral<NodeId>(), [&](auto) { return fuzzed_data_provider.ConsumeBool(); });
+                NodeId id = node_ids.empty() || fuzzed_data_provider.ConsumeBool()
+                    ? fuzzed_data_provider.ConsumeIntegral<NodeId>()
+                    : PickValue(fuzzed_data_provider, node_ids);
+                (void)connman.ForNode(id, [&](CNode* pnode) {
+                    (void)pnode->GetId();
+                    (void)pnode->IsInboundConn();
+                    (void)pnode->IsFullOutboundConn();
+                    return true;
+                });
             },
             [&] {
                 auto max_addresses = fuzzed_data_provider.ConsumeIntegral<size_t>();
@@ -173,13 +209,28 @@ FUZZ_TARGET(connman, .init = initialize_connman)
                 connman.PushMessage(&random_node, std::move(serialized_net_msg));
             },
             [&] {
-                connman.RemoveAddedNode(random_string);
+                const auto set_active{fuzzed_data_provider.ConsumeBool()};
+                connman.SetNetworkActive(set_active);
+                assert(connman.GetNetworkActive() == set_active);
             },
             [&] {
-                connman.SetNetworkActive(fuzzed_data_provider.ConsumeBool());
+                connman.SetTryNewOutboundPeer(fuzzed_data_provider.ConsumeBool());
             },
             [&] {
-                connman.SetTryNewOutboundPeer(fuzzed_data_provider.ConsumeBool());
+                const auto services{ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS)};
+                const auto before{connman.GetLocalServices()};
+                if (fuzzed_data_provider.ConsumeBool()) {
+                    connman.AddLocalServices(services);
+                    assert((connman.GetLocalServices() & services) == services);
+                    // Restore by clearing only the bits that weren't already set.
+                    connman.RemoveLocalServices(ServiceFlags(services & ~before));
+                } else {
+                    connman.RemoveLocalServices(services);
+                    assert((connman.GetLocalServices() & services) == 0);
+                    // Restore by re-adding only the bits that were previously set.
+                    connman.AddLocalServices(ServiceFlags(services & before));
+                }
+                assert(connman.GetLocalServices() == before);
             },
             [&] {
                 ConnectionType conn_type{
@@ -188,13 +239,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());
@@ -228,20 +285,31 @@ FUZZ_TARGET(connman, .init = initialize_connman)
                 connman.SocketHandlerPublic();
             });
     }
-    (void)connman.GetAddedNodeInfo(fuzzed_data_provider.ConsumeBool());
+    connman.ForEachNode([](CNode* pnode) {
+        (void)pnode->GetId();
+        (void)pnode->IsInboundConn();
+        (void)pnode->IsFullOutboundConn();
+        (void)pnode->ConnectionTypeAsString();
+    });
+    (void)connman.GetAddedNodeInfo(/*include_connected=*/false);
     (void)connman.GetExtraFullOutboundCount();
-    (void)connman.GetLocalServices();
+    assert(connman.GetLocalServices() == local_services);
     assert(connman.GetMaxOutboundTarget() == max_outbound_limit);
-    (void)connman.GetMaxOutboundTimeframe();
-    (void)connman.GetMaxOutboundTimeLeftInCycle();
-    (void)connman.GetNetworkActive();
+    const auto time_left_in_cycle{connman.GetMaxOutboundTimeLeftInCycle()};
     std::vector<CNodeStats> stats;
     connman.GetNodeStats(stats);
-    (void)connman.GetOutboundTargetBytesLeft();
-    (void)connman.GetTotalBytesRecv();
-    (void)connman.GetTotalBytesSent();
+    const auto bytes_left{connman.GetOutboundTargetBytesLeft()};
+    assert(bytes_left <= max_outbound_limit);
+    if (max_outbound_limit == 0) {
+        assert(bytes_left == 0);
+        assert(time_left_in_cycle == std::chrono::seconds{0});
+        assert(!connman.OutboundTargetReached(/*historicalBlockServingLimit=*/false));
+        assert(!connman.OutboundTargetReached(/*historicalBlockServingLimit=*/true));
+    }
+    assert(connman.GetTotalBytesRecv() >= total_bytes_recv_initial);
+    assert(connman.GetTotalBytesSent() >= total_bytes_sent_initial);
     (void)connman.GetTryNewOutboundPeer();
-    (void)connman.GetUseAddrmanOutgoing();
+    assert(connman.GetUseAddrmanOutgoing() == use_addrman_outgoing);
     (void)connman.ASMapHealthCheck();
 
     connman.ClearTestNodes();
diff --git a/depend/bitcoin/src/test/fuzz/crypto.cpp b/depend/bitcoin/src/test/fuzz/crypto.cpp
index ff918f98..c95181f0 100644
--- a/depend/bitcoin/src/test/fuzz/crypto.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto.cpp
@@ -38,8 +38,7 @@ FUZZ_TARGET(crypto)
     SHA3_256 sha3;
     CSipHasher sip_hasher{fuzzed_data_provider.ConsumeIntegral<uint64_t>(), fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/crypto_aes256.cpp b/depend/bitcoin/src/test/fuzz/crypto_aes256.cpp
index d35919f2..67124479 100644
--- a/depend/bitcoin/src/test/fuzz/crypto_aes256.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto_aes256.cpp
@@ -19,7 +19,7 @@ FUZZ_TARGET(crypto_aes256)
     AES256Encrypt encrypt{key.data()};
     AES256Decrypt decrypt{key.data()};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::vector<uint8_t> plaintext = ConsumeFixedLengthByteVector(fuzzed_data_provider, AES_BLOCKSIZE);
         std::vector<uint8_t> ciphertext(AES_BLOCKSIZE);
         encrypt.Encrypt(ciphertext.data(), plaintext.data());
diff --git a/depend/bitcoin/src/test/fuzz/crypto_aes256cbc.cpp b/depend/bitcoin/src/test/fuzz/crypto_aes256cbc.cpp
index 87064b66..81502235 100644
--- a/depend/bitcoin/src/test/fuzz/crypto_aes256cbc.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto_aes256cbc.cpp
@@ -21,7 +21,7 @@ FUZZ_TARGET(crypto_aes256cbc)
     AES256CBCEncrypt encrypt{key.data(), iv.data(), pad};
     AES256CBCDecrypt decrypt{key.data(), iv.data(), pad};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::vector<uint8_t> plaintext = ConsumeRandomLengthByteVector(fuzzed_data_provider);
         std::vector<uint8_t> ciphertext(plaintext.size() + AES_BLOCKSIZE);
         const int encrypt_ret = encrypt.Encrypt(plaintext.data(), plaintext.size(), ciphertext.data());
diff --git a/depend/bitcoin/src/test/fuzz/crypto_chacha20.cpp b/depend/bitcoin/src/test/fuzz/crypto_chacha20.cpp
index 15e45419..652292e6 100644
--- a/depend/bitcoin/src/test/fuzz/crypto_chacha20.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto_chacha20.cpp
@@ -20,7 +20,7 @@ FUZZ_TARGET(crypto_chacha20)
     const auto key = ConsumeFixedLengthByteVector<std::byte>(fuzzed_data_provider, ChaCha20::KEYLEN);
     ChaCha20 chacha20{key};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -144,8 +144,7 @@ FUZZ_TARGET(crypto_fschacha20)
 
     auto fsc20 = FSChaCha20{key, fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(1, 1024)};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         auto input = fuzzed_data_provider.ConsumeBytes<std::byte>(fuzzed_data_provider.ConsumeIntegralInRange(0, 4096));
         std::vector<std::byte> output;
         output.resize(input.size());
diff --git a/depend/bitcoin/src/test/fuzz/crypto_chacha20poly1305.cpp b/depend/bitcoin/src/test/fuzz/crypto_chacha20poly1305.cpp
index 0f7228f5..42ab6d1e 100644
--- a/depend/bitcoin/src/test/fuzz/crypto_chacha20poly1305.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto_chacha20poly1305.cpp
@@ -39,8 +39,7 @@ FUZZ_TARGET(crypto_aeadchacha20poly1305)
     // data).
     InsecureRandomContext rng(provider.ConsumeIntegral<uint64_t>());
 
-    LIMITED_WHILE(provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (provider.ConsumeBool(), 100) {
         // Mode:
         // - Bit 0: whether to use single-plain Encrypt/Decrypt; otherwise use a split at prefix.
         // - Bit 2: whether this ciphertext will be corrupted (making it the last sent one)
@@ -130,8 +129,7 @@ FUZZ_TARGET(crypto_fschacha20poly1305)
     // data).
     InsecureRandomContext rng(provider.ConsumeIntegral<uint64_t>());
 
-    LIMITED_WHILE(provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (provider.ConsumeBool(), 100) {
         // Mode:
         // - Bit 0: whether to use single-plain Encrypt/Decrypt; otherwise use a split at prefix.
         // - Bit 2: whether this ciphertext will be corrupted (making it the last sent one)
diff --git a/depend/bitcoin/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp b/depend/bitcoin/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
index f5ca9aee..ef4f02a5 100644
--- a/depend/bitcoin/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
@@ -18,7 +18,7 @@ FUZZ_TARGET(crypto_hkdf_hmac_sha256_l32)
     const std::vector<uint8_t> initial_key_material = ConsumeRandomLengthByteVector(fuzzed_data_provider);
 
     CHKDF_HMAC_SHA256_L32 hkdf_hmac_sha256_l32(initial_key_material.data(), initial_key_material.size(), fuzzed_data_provider.ConsumeRandomLengthString(1024));
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         std::vector<uint8_t> out(32);
         hkdf_hmac_sha256_l32.Expand32(fuzzed_data_provider.ConsumeRandomLengthString(128), out.data());
     }
diff --git a/depend/bitcoin/src/test/fuzz/crypto_poly1305.cpp b/depend/bitcoin/src/test/fuzz/crypto_poly1305.cpp
index 5a4404cf..249322cb 100644
--- a/depend/bitcoin/src/test/fuzz/crypto_poly1305.cpp
+++ b/depend/bitcoin/src/test/fuzz/crypto_poly1305.cpp
@@ -34,7 +34,7 @@ FUZZ_TARGET(crypto_poly1305_split)
     std::vector<std::byte> total_input;
 
     // Process input in pieces.
-    LIMITED_WHILE(provider.remaining_bytes(), 100) {
+    LIMITED_WHILE (provider.remaining_bytes(), 100) {
         auto in = ConsumeRandomLengthByteVector<std::byte>(provider);
         poly_split.Update(in);
         // Update total_input to match what was processed.
diff --git a/depend/bitcoin/src/test/fuzz/cuckoocache.cpp b/depend/bitcoin/src/test/fuzz/cuckoocache.cpp
index 55da81ff..d6c38ea0 100644
--- a/depend/bitcoin/src/test/fuzz/cuckoocache.cpp
+++ b/depend/bitcoin/src/test/fuzz/cuckoocache.cpp
@@ -38,7 +38,7 @@ FUZZ_TARGET(cuckoocache)
     } else {
         cuckoo_cache.setup(fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(0, 4096));
     }
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         if (fuzzed_data_provider.ConsumeBool()) {
             cuckoo_cache.insert(fuzzed_data_provider.ConsumeBool());
         } else {
diff --git a/depend/bitcoin/src/test/fuzz/dbwrapper.cpp b/depend/bitcoin/src/test/fuzz/dbwrapper.cpp
new file mode 100644
index 00000000..233aee77
--- /dev/null
+++ b/depend/bitcoin/src/test/fuzz/dbwrapper.cpp
@@ -0,0 +1,466 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <dbwrapper.h>
+#include <compat/byteswap.h>
+#include <random.h>
+#include <sync.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+#include <test/util/random.h>
+#include <test/util/setup_common.h>
+#include <util/byte_units.h>
+#include <util/check.h>
+#include <util/threadpool.h>
+
+#include <leveldb/env.h>
+#include <leveldb/helpers/memenv/memenv.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstdint>
+#include <deque>
+#include <functional>
+#include <future>
+#include <latch>
+#include <map>
+#include <memory>
+#include <numeric>
+#include <optional>
+#include <set>
+#include <span>
+#include <string>
+#include <tuple>
+#include <vector>
+
+namespace {
+
+/**
+ * A leveldb::Env that wraps a memenv and captures scheduled background
+ * work (compaction) instead of dispatching to a real thread. The fuzz
+ * harness calls RunOne() or DrainWork() at fuzzer-chosen points to
+ * execute it, giving deterministic control over when compaction
+ * interleaves with foreground operations.
+ *
+ * Deadlock prevention: LevelDB's MakeRoomForWrite blocks on a condition
+ * variable when the previous immutable memtable is still awaiting compaction,
+ * or when the L0 file count hits kL0_StopWritesTrigger. Since both conditions
+ * can only be resolved by the (deferred) background work, the harness drains
+ * all pending work before every write to avoid a single-threaded deadlock.
+ * Callers must also DrainWork() before destroying the CDBWrapper, since the
+ * leveldb destructor waits for any pending background work to complete.
+ *
+ * The same reasoning rules out exercising DBOptions::force_compact under
+ * this env, because CompactRange(nullptr, nullptr) blocks waiting for
+ * background work that is queued on the (blocked) foreground thread. The
+ * sibling dbwrapper_threaded target covers that path.
+ */
+class DeterministicEnv final : public leveldb::EnvWrapper
+{
+    using WorkFunction = void (*)(void*);
+
+    struct Work {
+        WorkFunction function;
+        void* arg;
+    };
+
+    Mutex m_mutex;
+    std::deque<Work> m_queue GUARDED_BY(m_mutex);
+
+public:
+    explicit DeterministicEnv(leveldb::Env* base) : EnvWrapper(base) {}
+
+    void Schedule(WorkFunction function, void* arg) override EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    {
+        LOCK(m_mutex);
+        m_queue.push_back({function, arg});
+    }
+
+    /** Execute one pending background task. The task may schedule a
+     *  successor which is left pending for a later call. */
+    bool RunOne() EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    {
+        Work work;
+        {
+            LOCK(m_mutex);
+            if (m_queue.empty()) return false;
+            work = m_queue.front();
+            m_queue.pop_front();
+        }
+        work.function(work.arg);
+        return true;
+    }
+
+    /** Execute pending background tasks until none remain. */
+    void DrainWork() EXCLUSIVE_LOCKS_REQUIRED(!m_mutex) { while (RunOne()) {} }
+};
+
+constexpr size_t MAX_VALUE_LEN{4096};
+constexpr uint8_t MAX_VALUE_MULTIPLIER{8};
+constexpr size_t WRITE_BATCH_HEADER{12}; // See kHeader in db/write_batch.cc
+
+/** Mirror of CDBWrapper::OBFUSCATION_KEY, the fixed key under which leveldb
+ *  stores the obfuscation metadata entry when obfuscation is enabled. */
+const std::string OBFUSCATION_KEY{"\000obfuscate_key", 14};
+
+/** Generate a deterministic value from key and size. The fuzz input picks
+ *  a 16-bit length (up to MAX_VALUE_LEN) and an 8-bit multiplier so that a
+ *  small amount of fuzz input can produce a wide range of value sizes. */
+std::vector<uint8_t> MakeValue(uint16_t key, uint32_t size)
+{
+    std::vector<uint8_t> v(size);
+    std::iota(v.begin(), v.end(), static_cast<uint8_t>(key ^ (key >> 8)));
+    return v;
+}
+
+/** Equivalent to leveldb::BytewiseComparator() on 2-byte little-endian
+ *  serialized uint16_t keys, while keeping the oracle keyed by uint16_t. */
+struct LevelDBBytewiseU16Cmp {
+    bool operator()(uint16_t a, uint16_t b) const { return internal_bswap_16(a) < internal_bswap_16(b); }
+};
+
+/** key → value-size map ordered by LevelDB's bytewise comparator. */
+using Oracle = std::map<uint16_t, uint32_t, LevelDBBytewiseU16Cmp>;
+
+struct FailUnserialize {
+    template <typename Stream>
+    void Unserialize(Stream&) { throw std::ios_base::failure{"always fail"}; }
+};
+
+uint16_t ConsumeKey(FuzzedDataProvider& provider) { return provider.ConsumeIntegral<uint16_t>(); }
+uint32_t ConsumeValueSize(FuzzedDataProvider& provider)
+{
+    const uint16_t len{provider.ConsumeIntegralInRange<uint16_t>(0, MAX_VALUE_LEN)};
+    const uint8_t multiplier{provider.ConsumeIntegralInRange<uint8_t>(1, MAX_VALUE_MULTIPLIER)};
+    return static_cast<uint32_t>(len) * multiplier;
+}
+
+/** Verify that the DB iterator matches the oracle, handling the obfuscation
+ *  metadata entry (stored under a non-uint16_t key) when obfuscation is on. */
+void VerifyIterator(CDBWrapper& dbw, const Oracle& oracle,
+                    bool obfuscate, std::optional<uint16_t> seek_key = std::nullopt)
+{
+    const std::unique_ptr<CDBIterator> it{dbw.NewIterator()};
+    auto oracle_it{seek_key ? oracle.lower_bound(*seek_key) : oracle.begin()};
+    if (seek_key) {
+        it->Seek(*seek_key);
+    } else {
+        it->SeekToFirst();
+    }
+    for (; it->Valid(); it->Next()) {
+        uint16_t db_key;
+        assert(it->GetKey(db_key));
+        if (oracle_it != oracle.end() && db_key == oracle_it->first) {
+            std::vector<uint8_t> db_value;
+            assert(it->GetValue(db_value));
+            assert(db_value == MakeValue(db_key, oracle_it->second));
+            ++oracle_it;
+        } else {
+            assert(obfuscate);
+            std::string key_str;
+            assert(it->GetKey(key_str));
+            assert(key_str == OBFUSCATION_KEY);
+        }
+    }
+    assert(oracle_it == oracle.end());
+}
+
+/** Maximum number of concurrent reader threads in dbwrapper_concurrent_reads. */
+constexpr size_t MAX_READ_WORKERS{8};
+
+/** Maximum number of queries each worker executes in dbwrapper_concurrent_reads. */
+constexpr size_t MAX_READ_QUERIES_PER_WORKER{128};
+
+ThreadPool g_read_pool{"dbfuzz"};
+
+void StartReadPoolIfNeeded()
+{
+    if (!g_read_pool.WorkersCount()) g_read_pool.Start(MAX_READ_WORKERS);
+}
+
+/** Build randomized DBParams from the fuzz input, shared by all targets. */
+DBParams ConsumeDBParams(FuzzedDataProvider& provider, leveldb::Env* testing_env,
+                         bool obfuscate, DBOptions options = {})
+{
+    return DBParams{
+        .path = "dbwrapper_fuzz",
+        .cache_bytes = provider.ConsumeIntegralInRange<size_t>(64 << 10, 1_MiB),
+        .obfuscate = obfuscate,
+        .bloom_filter = provider.ConsumeBool(),
+        .options = options,
+        .testing_env = testing_env,
+        .max_file_size = provider.ConsumeBool()
+            ? DBWRAPPER_MAX_FILE_SIZE
+            : provider.ConsumeIntegralInRange<size_t>(1_MiB, 4_MiB),
+    };
+}
+
+template <typename DrainWorkFn, typename RunOneFn>
+void TestDbWrapper(FuzzedDataProvider& provider,
+                      leveldb::Env* testing_env,
+                      DrainWorkFn drain_work,
+                      RunOneFn run_one,
+                      bool allow_force_compact)
+{
+    SeedRandomStateForTest(SeedRand::ZEROS);
+
+    const bool obfuscate{provider.ConsumeBool()};
+
+    const auto make_db{[&](DBOptions options = {}) {
+        return std::make_unique<CDBWrapper>(ConsumeDBParams(provider, testing_env, obfuscate, options));
+    }};
+    std::unique_ptr<CDBWrapper> dbw{make_db()};
+
+    // Oracle: key → value size. Content is reconstructed via MakeValue().
+    Oracle oracle;
+
+    LIMITED_WHILE (provider.ConsumeBool(), 1'000) {
+        CallOneOf(
+            provider,
+            // --- Mutations ---
+            [&] {
+                const auto key{ConsumeKey(provider)};
+                const auto size{ConsumeValueSize(provider)};
+                drain_work();
+                dbw->Write(key, MakeValue(key, size), /*fSync=*/provider.ConsumeBool());
+                oracle[key] = size;
+            },
+            [&] {
+                const auto key{ConsumeKey(provider)};
+                drain_work();
+                dbw->Erase(key, /*fSync=*/provider.ConsumeBool());
+                oracle.erase(key);
+            },
+            [&] {
+                CDBBatch batch{*dbw};
+                std::map<uint16_t, uint32_t> batch_writes;
+                std::set<uint16_t> batch_erases;
+                const auto fill{[&] {
+                    LIMITED_WHILE (provider.ConsumeBool(), 20) {
+                        const auto key{ConsumeKey(provider)};
+                        if (provider.ConsumeBool()) {
+                            const auto size{ConsumeValueSize(provider)};
+                            batch.Write(key, MakeValue(key, size));
+                            batch_writes[key] = size;
+                            batch_erases.erase(key);
+                        } else {
+                            batch.Erase(key);
+                            batch_erases.insert(key);
+                            batch_writes.erase(key);
+                        }
+                    }
+                }};
+                fill();
+                if (provider.ConsumeBool()) {
+                    assert(batch.ApproximateSize() >= WRITE_BATCH_HEADER);
+                    batch.Clear();
+                    assert(batch.ApproximateSize() == WRITE_BATCH_HEADER);
+                    batch_writes.clear();
+                    batch_erases.clear();
+                    fill();
+                }
+                drain_work();
+                dbw->WriteBatch(batch, /*fSync=*/provider.ConsumeBool());
+                for (const auto& [k, v] : batch_writes) oracle[k] = v;
+                for (const auto& k : batch_erases) oracle.erase(k);
+            },
+            [&] {
+                drain_work();
+                dbw.reset();
+                DBOptions options{};
+                if (allow_force_compact && provider.ConsumeBool()) {
+                    options.force_compact = true;
+                }
+                dbw = make_db(options);
+                VerifyIterator(*dbw, oracle, obfuscate);
+            },
+            // --- Reads ---
+            [&] {
+                const auto key{ConsumeKey(provider)};
+                std::vector<uint8_t> value;
+                const bool found{dbw->Read(key, value)};
+                if (const auto it{oracle.find(key)}; it != oracle.end()) {
+                    assert(found && value == MakeValue(key, it->second));
+                } else {
+                    assert(!found);
+                }
+            },
+            [&] {
+                const auto key{ConsumeKey(provider)};
+                assert(dbw->Exists(key) == oracle.contains(key));
+            },
+            [&] {
+                uint16_t key{};
+                if (!oracle.empty() && provider.ConsumeBool()) {
+                    auto it{oracle.begin()};
+                    std::advance(it, provider.ConsumeIntegralInRange<size_t>(0, oracle.size() - 1));
+                    key = it->first;
+                } else {
+                    key = ConsumeKey(provider);
+                }
+                FailUnserialize wrong_type;
+                assert(!dbw->Read(key, wrong_type));
+            },
+            [&] {
+                const auto seek_key{provider.ConsumeBool()
+                                        ? std::optional<uint16_t>{ConsumeKey(provider)}
+                                        : std::nullopt};
+                VerifyIterator(*dbw, oracle, obfuscate, seek_key);
+            },
+            // --- Stats ---
+            [&] {
+                assert(dbw->IsEmpty() == (oracle.empty() && !obfuscate));
+            },
+            [&] {
+                const auto [k1, k2]{std::minmax({ConsumeKey(provider), ConsumeKey(provider)}, LevelDBBytewiseU16Cmp{})};
+                const size_t estimate_size{dbw->EstimateSize(k1, k2)};
+                if (k1 == k2) assert(estimate_size == 0);
+            },
+            [&] {
+                (void)dbw->DynamicMemoryUsage();
+            },
+            // --- Compaction control (no-op when run_one is no-op) ---
+            [&] {
+                run_one();
+            });
+    }
+
+    VerifyIterator(*dbw, oracle, obfuscate);
+    drain_work();
+}
+
+} // namespace
+
+FUZZ_TARGET(dbwrapper, .init = [] { static auto setup{MakeNoLogFileContext<>()}; })
+{
+    FuzzedDataProvider provider{buffer.data(), buffer.size()};
+
+    const auto memenv{std::unique_ptr<leveldb::Env>{leveldb::NewMemEnv(leveldb::Env::Default())}};
+    DeterministicEnv det_env{memenv.get()};
+    TestDbWrapper(
+        provider, &det_env,
+        [&] { det_env.DrainWork(); },
+        [&] { return det_env.RunOne(); },
+        /*allow_force_compact=*/false);
+}
+
+FUZZ_TARGET(dbwrapper_threaded, .init = [] { static auto setup{MakeNoLogFileContext<>()}; })
+{
+    FuzzedDataProvider provider{buffer.data(), buffer.size()};
+
+    const auto memenv{std::unique_ptr<leveldb::Env>{leveldb::NewMemEnv(leveldb::Env::Default())}};
+    TestDbWrapper(
+        provider, memenv.get(),
+        /*drain_work=*/[] {},
+        /*run_one=*/[] { return false; },
+        /*allow_force_compact=*/true);
+}
+
+FUZZ_TARGET(dbwrapper_concurrent_reads, .init = [] { static auto setup{MakeNoLogFileContext<>()}; })
+{
+    StartReadPoolIfNeeded();
+    SeedRandomStateForTest(SeedRand::ZEROS);
+
+    FuzzedDataProvider provider{buffer.data(), buffer.size()};
+
+    const auto memenv{std::unique_ptr<leveldb::Env>{leveldb::NewMemEnv(leveldb::Env::Default())}};
+    DeterministicEnv det_env{memenv.get()};
+
+    CDBWrapper db{ConsumeDBParams(provider, &det_env, /*obfuscate=*/provider.ConsumeBool())};
+
+    // Seed the DB. Drain work after small batches so we don't deadlock on a
+    // scheduled compaction.
+    const size_t num_entries{provider.ConsumeIntegralInRange<size_t>(100, 5'000)};
+    std::vector<uint16_t> keys;
+    keys.reserve(num_entries);
+    Oracle oracle;
+    constexpr size_t SEED_BATCH_SIZE{400};
+    for (size_t start{0}; start < num_entries; start += SEED_BATCH_SIZE) {
+        CDBBatch batch{db};
+        const size_t end{std::min(start + SEED_BATCH_SIZE, num_entries)};
+        for (size_t i{start}; i < end; ++i) {
+            const auto k{ConsumeKey(provider)};
+            const auto size{ConsumeValueSize(provider)};
+            batch.Write(k, MakeValue(k, size));
+            keys.push_back(k);
+            oracle[k] = size;
+        }
+        det_env.DrainWork();
+        db.WriteBatch(batch, /*fSync=*/true);
+    }
+
+    while (provider.ConsumeBool() && det_env.RunOne()) {}
+
+    // Build query list from seeded and random keys.
+    const size_t num_queries{provider.ConsumeIntegralInRange<size_t>(1, 2'000)};
+    enum class ReadOp { Read, Exists, IteratorSeek };
+    std::vector<std::tuple<ReadOp, uint16_t>> queries;
+    queries.reserve(num_queries);
+    for (size_t i{0}; i < num_queries; ++i) {
+        const auto op{provider.PickValueInArray({ReadOp::Read, ReadOp::Exists, ReadOp::IteratorSeek})};
+        const uint16_t key{provider.ConsumeBool()
+                               ? keys[provider.ConsumeIntegralInRange<size_t>(0, keys.size() - 1)]
+                               : ConsumeKey(provider)};
+        queries.emplace_back(op, key);
+    }
+
+
+    // Workers + main thread synchronize on the latch so all reads start together.
+    std::latch start_latch{static_cast<ptrdiff_t>(MAX_READ_WORKERS + 1)};
+    std::vector<std::function<void()>> tasks(MAX_READ_WORKERS);
+    FastRandomContext rng{ConsumeUInt256(provider)};
+    std::ranges::generate(tasks, [&] {
+        return [&, seed = rng.rand256()] {
+            FastRandomContext thread_rng{seed};
+            std::vector<size_t> order(queries.size());
+            std::iota(order.begin(), order.end(), size_t{0});
+            std::ranges::shuffle(order, thread_rng);
+            const size_t queries_to_run{std::min(queries.size(), MAX_READ_QUERIES_PER_WORKER)};
+            std::vector<uint8_t> v;
+            std::string key_str;
+            start_latch.arrive_and_wait();
+            const std::unique_ptr<CDBIterator> it{db.NewIterator()};
+            // Every read must agree with the oracle, the source of truth.
+            for (const auto i : std::span{order}.first(queries_to_run)) {
+                const auto& [op, key] = queries[i];
+                switch (op) {
+                case ReadOp::Read:
+                    if (const auto oit{oracle.find(key)}; oit != oracle.end()) {
+                        assert(db.Read(key, v) && v == MakeValue(key, oit->second));
+                    } else {
+                        assert(!db.Read(key, v));
+                    }
+                    break;
+                case ReadOp::Exists:
+                    assert(db.Exists(key) == oracle.contains(key));
+                    break;
+                case ReadOp::IteratorSeek:
+                    it->Seek(key);
+                    // Skip the obfuscation metadata entry (a non-uint16_t key) if we land
+                    // on it, so the result matches the oracle, which only tracks user keys.
+                    if (it->Valid() && it->GetKey(key_str) && key_str == OBFUSCATION_KEY) it->Next();
+                    if (const auto oit{oracle.lower_bound(key)}; oit != oracle.end()) {
+                        assert(it->Valid());
+                        uint16_t actual_key;
+                        assert(it->GetKey(actual_key) && actual_key == oit->first);
+                        assert(it->GetValue(v) && v == MakeValue(actual_key, oit->second));
+                    } else {
+                        assert(!it->Valid());
+                    }
+                    break;
+                }
+            }
+        };
+    });
+    auto futures{*Assert(g_read_pool.Submit(std::move(tasks)))};
+
+    // Release the workers and immediately run the queued compaction on this
+    // thread, so compaction races against the concurrent reads.
+    start_latch.arrive_and_wait();
+    det_env.DrainWork();
+
+    for (auto& fut : futures) fut.get();
+    det_env.DrainWork();
+}
diff --git a/depend/bitcoin/src/test/fuzz/descriptor_parse.cpp b/depend/bitcoin/src/test/fuzz/descriptor_parse.cpp
index 6b3084e2..2e73cfcc 100644
--- a/depend/bitcoin/src/test/fuzz/descriptor_parse.cpp
+++ b/depend/bitcoin/src/test/fuzz/descriptor_parse.cpp
@@ -55,7 +55,11 @@ static void TestDescriptor(const Descriptor& desc, FlatSigningProvider& sig_prov
     }
 
     const auto max_sat_maxsig{desc.MaxSatisfactionWeight(true)};
-    const auto max_sat_nonmaxsig{desc.MaxSatisfactionWeight(true)};
+    const auto max_sat_nonmaxsig{desc.MaxSatisfactionWeight(false)};
+    // Whether an estimate is available must not depend on the signature-size
+    // assumption, and assuming non-max-size signatures must never increase it.
+    assert(max_sat_maxsig.has_value() == max_sat_nonmaxsig.has_value());
+    assert(max_sat_nonmaxsig <= max_sat_maxsig);
     const auto max_elems{desc.MaxSatisfactionElems()};
     // We must be able to estimate the max satisfaction size for any solvable descriptor (but combo).
     const bool is_nontop_or_nonsolvable{!*is_solvable || !desc.GetOutputType()};
diff --git a/depend/bitcoin/src/test/fuzz/deserialize.cpp b/depend/bitcoin/src/test/fuzz/deserialize.cpp
index 1329f471..046bfca5 100644
--- a/depend/bitcoin/src/test/fuzz/deserialize.cpp
+++ b/depend/bitcoin/src/test/fuzz/deserialize.cpp
@@ -57,14 +57,6 @@ namespace {
 struct invalid_fuzzing_input_exception : public std::exception {
 };
 
-template <typename T, typename P>
-DataStream Serialize(const T& obj, const P& params)
-{
-    DataStream ds{};
-    ds << params(obj);
-    return ds;
-}
-
 template <typename T, typename P>
 T Deserialize(DataStream&& ds, const P& params)
 {
@@ -73,17 +65,6 @@ T Deserialize(DataStream&& ds, const P& params)
     return obj;
 }
 
-template <typename T, typename P>
-void DeserializeFromFuzzingInput(FuzzBufferType buffer, T&& obj, const P& params)
-{
-    try {
-        SpanReader{buffer} >> params(obj);
-    } catch (const std::ios_base::failure&) {
-        throw invalid_fuzzing_input_exception();
-    }
-    assert(buffer.empty() || !Serialize(obj, params).empty());
-}
-
 template <typename T>
 DataStream Serialize(const T& obj)
 {
@@ -111,10 +92,23 @@ void DeserializeFromFuzzingInput(FuzzBufferType buffer, T&& obj)
     assert(buffer.empty() || !Serialize(obj).empty());
 }
 
+template <typename T>
+T DeserializeConstructFromFuzzingInput(FuzzBufferType buffer)
+{
+    try {
+        SpanReader reader{buffer};
+        T obj(deserialize, reader);
+        assert(buffer.empty() || !Serialize(obj).empty());
+        return obj;
+    } catch (const std::ios_base::failure&) {
+        throw invalid_fuzzing_input_exception();
+    }
+}
+
 template <typename T, typename P>
 void AssertEqualAfterSerializeDeserialize(const T& obj, const P& params)
 {
-    assert(Deserialize<T>(Serialize(obj, params), params) == obj);
+    assert(Deserialize<T>(Serialize(params(obj)), params) == obj);
 }
 template <typename T>
 void AssertEqualAfterSerializeDeserialize(const T& obj)
@@ -184,19 +178,18 @@ FUZZ_TARGET_DESERIALIZE(key_origin_info_deserialize, {
     AssertEqualAfterSerializeDeserialize(key_origin_info);
 })
 FUZZ_TARGET_DESERIALIZE(partially_signed_transaction_deserialize, {
-    PartiallySignedTransaction partially_signed_transaction;
-    DeserializeFromFuzzingInput(buffer, partially_signed_transaction);
+    PartiallySignedTransaction partially_signed_transaction = DeserializeConstructFromFuzzingInput<PartiallySignedTransaction>(buffer);
 })
 FUZZ_TARGET_DESERIALIZE(prefilled_transaction_deserialize, {
     PrefilledTransaction prefilled_transaction;
     DeserializeFromFuzzingInput(buffer, prefilled_transaction);
 })
 FUZZ_TARGET_DESERIALIZE(psbt_input_deserialize, {
-    PSBTInput psbt_input;
+    PSBTInput psbt_input(0, Txid{}, 0);
     DeserializeFromFuzzingInput(buffer, psbt_input);
 })
 FUZZ_TARGET_DESERIALIZE(psbt_output_deserialize, {
-    PSBTOutput psbt_output;
+    PSBTOutput psbt_output(0, 0, CScript());
     DeserializeFromFuzzingInput(buffer, psbt_output);
 })
 FUZZ_TARGET_DESERIALIZE(block_deserialize, {
diff --git a/depend/bitcoin/src/test/fuzz/feefrac.cpp b/depend/bitcoin/src/test/fuzz/feefrac.cpp
index d52a4658..6b6a3483 100644
--- a/depend/bitcoin/src/test/fuzz/feefrac.cpp
+++ b/depend/bitcoin/src/test/fuzz/feefrac.cpp
@@ -84,9 +84,9 @@ FUZZ_TARGET(feefrac)
 
     // Feerate comparisons
     auto cmp_feerate = MulCompare(f1, s2, f2, s1);
-    assert(FeeRateCompare(fr1, fr2) == cmp_feerate);
-    assert((fr1 << fr2) == std::is_lt(cmp_feerate));
-    assert((fr1 >> fr2) == std::is_gt(cmp_feerate));
+    assert((ByRatio{fr1} <=> ByRatio{fr2}) == cmp_feerate);
+    assert((ByRatio{fr1} < ByRatio{fr2}) == std::is_lt(cmp_feerate));
+    assert((ByRatio{fr1} > ByRatio{fr2}) == std::is_gt(cmp_feerate));
 
     // Compare with manual invocation of FeeFrac::Mul.
     auto cmp_mul = FeeFrac::Mul(f1, s2) <=> FeeFrac::Mul(f2, s1);
@@ -98,13 +98,13 @@ FUZZ_TARGET(feefrac)
 
     // Total order comparisons
     auto cmp_total = std::is_eq(cmp_feerate) ? (s2 <=> s1) : cmp_feerate;
-    assert((fr1 <=> fr2) == cmp_total);
-    assert((fr1 < fr2) == std::is_lt(cmp_total));
-    assert((fr1 > fr2) == std::is_gt(cmp_total));
-    assert((fr1 <= fr2) == std::is_lteq(cmp_total));
-    assert((fr1 >= fr2) == std::is_gteq(cmp_total));
-    assert((fr1 == fr2) == std::is_eq(cmp_total));
-    assert((fr1 != fr2) == std::is_neq(cmp_total));
+    assert((ByRatioNegSize{fr1} <=> ByRatioNegSize{fr2}) == cmp_total);
+    assert((ByRatioNegSize{fr1} < ByRatioNegSize{fr2}) == std::is_lt(cmp_total));
+    assert((ByRatioNegSize{fr1} > ByRatioNegSize{fr2}) == std::is_gt(cmp_total));
+    assert((ByRatioNegSize{fr1} <= ByRatioNegSize{fr2}) == std::is_lteq(cmp_total));
+    assert((ByRatioNegSize{fr1} >= ByRatioNegSize{fr2}) == std::is_gteq(cmp_total));
+    assert((ByRatioNegSize{fr1} == ByRatioNegSize{fr2}) == std::is_eq(cmp_total));
+    assert((ByRatioNegSize{fr1} != ByRatioNegSize{fr2}) == std::is_neq(cmp_total));
 }
 
 FUZZ_TARGET(feefrac_div_fallback)
diff --git a/depend/bitcoin/src/test/fuzz/feeratediagram.cpp b/depend/bitcoin/src/test/fuzz/feeratediagram.cpp
index 6dcc63e9..a1e51a66 100644
--- a/depend/bitcoin/src/test/fuzz/feeratediagram.cpp
+++ b/depend/bitcoin/src/test/fuzz/feeratediagram.cpp
@@ -63,9 +63,9 @@ FeeFrac EvaluateDiagram(int32_t size, std::span<const FeeFrac> diagram)
     return {point_a.fee * dir_coef.size + dir_coef.fee * (size - point_a.size), dir_coef.size};
 }
 
-std::weak_ordering CompareFeeFracWithDiagram(const FeeFrac& ff, std::span<const FeeFrac> diagram)
+std::strong_ordering CompareFeeFracWithDiagram(const FeeFrac& ff, std::span<const FeeFrac> diagram)
 {
-    return FeeRateCompare(FeeFrac{ff.fee, 1}, EvaluateDiagram(ff.size, diagram));
+    return ByRatio{FeeFrac{ff.fee, 1}} <=> ByRatio{EvaluateDiagram(ff.size, diagram)};
 }
 
 std::partial_ordering CompareDiagrams(std::span<const FeeFrac> dia1, std::span<const FeeFrac> dia2)
@@ -92,8 +92,7 @@ void PopulateChunks(FuzzedDataProvider& fuzzed_data_provider, std::vector<FeeFra
 {
     chunks.clear();
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 50)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 50) {
         chunks.emplace_back(fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(INT32_MIN>>1, INT32_MAX>>1), fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(1, 1000000));
     }
     return;
@@ -122,11 +121,11 @@ FUZZ_TARGET(build_and_compare_feerate_diagram)
     assert(real == sim);
 
     // Do explicit evaluation at up to 1000 points, and verify consistency with the result.
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes(), 1000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes(), 1000) {
         int32_t size = fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(0, diagram2.back().size);
         auto eval1 = EvaluateDiagram(size, diagram1);
         auto eval2 = EvaluateDiagram(size, diagram2);
-        auto cmp = FeeRateCompare(eval1, eval2);
+        auto cmp = ByRatio{eval1} <=> ByRatio{eval2};
         if (std::is_lt(cmp)) assert(!std::is_gt(real));
         if (std::is_gt(cmp)) assert(!std::is_lt(real));
     }
diff --git a/depend/bitcoin/src/test/fuzz/fees.cpp b/depend/bitcoin/src/test/fuzz/fees.cpp
index 1bd5c67a..1940e342 100644
--- a/depend/bitcoin/src/test/fuzz/fees.cpp
+++ b/depend/bitcoin/src/test/fuzz/fees.cpp
@@ -21,7 +21,7 @@ FUZZ_TARGET(fees)
     const CFeeRate minimal_incremental_fee{ConsumeMoney(fuzzed_data_provider)};
     FastRandomContext rng{/*fDeterministic=*/true};
     FeeFilterRounder fee_filter_rounder{minimal_incremental_fee, rng};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const CAmount current_minimum_fee = ConsumeMoney(fuzzed_data_provider);
         const CAmount rounded_fee = fee_filter_rounder.round(current_minimum_fee);
         assert(MoneyRange(rounded_fee));
diff --git a/depend/bitcoin/src/test/fuzz/fuzz.cpp b/depend/bitcoin/src/test/fuzz/fuzz.cpp
index 7fba26dd..8c1def43 100644
--- a/depend/bitcoin/src/test/fuzz/fuzz.cpp
+++ b/depend/bitcoin/src/test/fuzz/fuzz.cpp
@@ -231,7 +231,7 @@ int main(int argc, char** argv)
     // Enable AFL persistent mode. Requires compilation using afl-clang-fast++.
     // See fuzzing.md for details.
     const uint8_t* buffer = __AFL_FUZZ_TESTCASE_BUF;
-    while (__AFL_LOOP(100000)) {
+    while (__AFL_LOOP(100'000)) {
         size_t buffer_len = __AFL_FUZZ_TESTCASE_LEN;
         test_one_input({buffer, buffer_len});
     }
diff --git a/depend/bitcoin/src/test/fuzz/headerssync.cpp b/depend/bitcoin/src/test/fuzz/headerssync.cpp
index f54ea980..54a179aa 100644
--- a/depend/bitcoin/src/test/fuzz/headerssync.cpp
+++ b/depend/bitcoin/src/test/fuzz/headerssync.cpp
@@ -60,7 +60,7 @@ FUZZ_TARGET(headers_sync_state, .init = initialize_headers_sync_state_fuzz)
     CBlockHeader genesis_header{Params().GenesisBlock()};
     CBlockIndex start_index(genesis_header);
 
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider, /*min=*/start_index.GetMedianTimePast())};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider, /*min=*/start_index.GetMedianTimePast())};
 
     const uint256 genesis_hash = genesis_header.GetHash();
     start_index.phashBlock = &genesis_hash;
diff --git a/depend/bitcoin/src/test/fuzz/http_request.cpp b/depend/bitcoin/src/test/fuzz/http_request.cpp
index 9241060b..75d2729e 100644
--- a/depend/bitcoin/src/test/fuzz/http_request.cpp
+++ b/depend/bitcoin/src/test/fuzz/http_request.cpp
@@ -10,59 +10,59 @@
 #include <util/signalinterrupt.h>
 #include <util/strencodings.h>
 
-#include <event2/buffer.h>
-#include <event2/event.h>
-#include <event2/http.h>
-#include <event2/http_struct.h>
-
 #include <cassert>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-extern "C" int evhttp_parse_firstline_(struct evhttp_request*, struct evbuffer*);
-extern "C" int evhttp_parse_headers_(struct evhttp_request*, struct evbuffer*);
 
-std::string RequestMethodString(HTTPRequest::RequestMethod m);
+std::string_view RequestMethodString(HTTPRequestMethod m);
 
 FUZZ_TARGET(http_request)
 {
+    using http_bitcoin::HTTPRequest;
+    using http_bitcoin::MAX_HEADERS_SIZE;
+    using util::LineReader;
+
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    evhttp_request* evreq = evhttp_request_new(nullptr, nullptr);
-    assert(evreq != nullptr);
-    evreq->kind = EVHTTP_REQUEST;
-    evbuffer* evbuf = evbuffer_new();
-    assert(evbuf != nullptr);
-    const std::vector<uint8_t> http_buffer = ConsumeRandomLengthByteVector(fuzzed_data_provider, 4096);
-    evbuffer_add(evbuf, http_buffer.data(), http_buffer.size());
-    // Avoid constructing requests that will be interpreted by libevent as PROXY requests to avoid triggering
-    // a nullptr dereference. The dereference (req->evcon->http_server) takes place in evhttp_parse_request_line
-    // and is a consequence of our hacky but necessary use of the internal function evhttp_parse_firstline_ in
-    // this fuzzing harness. The workaround is not aesthetically pleasing, but it successfully avoids the troublesome
-    // code path. " http:// HTTP/1.1\n" was a crashing input prior to this workaround.
-    const std::string http_buffer_str = ToLower(std::string{http_buffer.begin(), http_buffer.end()});
-    if (http_buffer_str.find(" http://") != std::string::npos || http_buffer_str.find(" https://") != std::string::npos ||
-        evhttp_parse_firstline_(evreq, evbuf) != 1 || evhttp_parse_headers_(evreq, evbuf) != 1) {
-        evbuffer_free(evbuf);
-        evhttp_request_free(evreq);
+    const std::string http_buffer{fuzzed_data_provider.ConsumeRandomLengthString(4096)};
+
+    HTTPRequest http_request;
+    LineReader reader(http_buffer, MAX_HEADERS_SIZE);
+    try {
+        if (!http_request.LoadControlData(reader)) return;
+        if (!http_request.LoadHeaders(reader)) return;
+        if (!http_request.LoadBody(reader)) return;
+    } catch (const std::runtime_error&) {
         return;
     }
 
-    util::SignalInterrupt interrupt;
-    HTTPRequest http_request{evreq, interrupt, true};
-    const HTTPRequest::RequestMethod request_method = http_request.GetRequestMethod();
+    const HTTPRequestMethod request_method = http_request.GetRequestMethod();
     (void)RequestMethodString(request_method);
     (void)http_request.GetURI();
     (void)http_request.GetHeader("Host");
-    const std::string header = fuzzed_data_provider.ConsumeRandomLengthString(16);
+    std::string header = fuzzed_data_provider.ConsumeRandomLengthString(16);
     (void)http_request.GetHeader(header);
-    (void)http_request.WriteHeader(header, fuzzed_data_provider.ConsumeRandomLengthString(16));
+    (void)http_request.WriteHeader(std::string(header), fuzzed_data_provider.ConsumeRandomLengthString(16));
     (void)http_request.GetHeader(header);
+    // Reaching here means LoadControlData/LoadHeaders/LoadBody all succeeded, so the
+    // parsed body must be consistent with the message framing. Before libevent was
+    // replaced with http_bitcoin::HTTPRequest (#35182), ReadBody() always returned an
+    // empty string here; LoadBody now populates the body per RFC 9112 framing, so mirror
+    // its branch logic to assert the body matches the framing that produced it.
     const std::string body = http_request.ReadBody();
-    assert(body.empty());
-    const CService service = http_request.GetPeer();
-    assert(service.ToStringAddrPort() == "[::]:0");
-
-    evbuffer_free(evbuf);
-    evhttp_request_free(evreq);
+    const auto [has_transfer_encoding, transfer_encoding] = http_request.GetHeader("Transfer-Encoding");
+    const auto [has_content_length, content_length] = http_request.GetHeader("Content-Length");
+    if (has_transfer_encoding && ToLower(transfer_encoding) == "chunked") {
+        // A chunked body is the concatenation of the decoded chunks, bounded by MAX_BODY_SIZE.
+        assert(body.size() <= http_bitcoin::MAX_BODY_SIZE);
+    } else if (has_content_length) {
+        // A Content-Length body is exactly that many bytes.
+        const auto parsed_length{ToIntegral<uint64_t>(content_length)};
+        assert(parsed_length);
+        assert(body.size() == *parsed_length);
+    } else {
+        // Absent both framing headers there is no body.
+        assert(body.empty());
+    }
 }
diff --git a/depend/bitcoin/src/test/fuzz/i2p.cpp b/depend/bitcoin/src/test/fuzz/i2p.cpp
index d262e1d0..1e4be8a9 100644
--- a/depend/bitcoin/src/test/fuzz/i2p.cpp
+++ b/depend/bitcoin/src/test/fuzz/i2p.cpp
@@ -27,12 +27,13 @@ FUZZ_TARGET(i2p, .init = initialize_i2p)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
 
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
+    FakeSteadyClock steady_clock;
 
     // Mock CreateSock() to create FuzzedSock.
     auto CreateSockOrig = CreateSock;
-    CreateSock = [&fuzzed_data_provider](int, int, int) {
-        return std::make_unique<FuzzedSock>(fuzzed_data_provider);
+    CreateSock = [&fuzzed_data_provider, &steady_clock](int, int, int) {
+        return std::make_unique<FuzzedSock>(fuzzed_data_provider, steady_clock);
     };
 
     const fs::path private_key_path = gArgs.GetDataDirNet() / "fuzzed_i2p_private_key";
diff --git a/depend/bitcoin/src/test/fuzz/integer.cpp b/depend/bitcoin/src/test/fuzz/integer.cpp
index a1cd18bf..357b84e5 100644
--- a/depend/bitcoin/src/test/fuzz/integer.cpp
+++ b/depend/bitcoin/src/test/fuzz/integer.cpp
@@ -67,6 +67,7 @@ FUZZ_TARGET(integer, .init = initialize_integer)
     // ConsumeIntegral<char>() instead of casting from {u,}int8_t.
     const char ch = fuzzed_data_provider.ConsumeIntegral<char>();
     const bool b = fuzzed_data_provider.ConsumeBool();
+    const uint64_t u64_2{fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
 
     const Consensus::Params& consensus_params = Params().GetConsensus();
     (void)CheckProofOfWorkImpl(u256, u32, consensus_params);
@@ -118,8 +119,48 @@ FUZZ_TARGET(integer, .init = initialize_integer)
     }
     (void)MillisToTimeval(i64);
     (void)SighashToStr(uch);
-    (void)PresaltedSipHasher(u64, u64)(u256);
-    (void)PresaltedSipHasher(u64, u64)(u256, u32);
+    {
+        CSipHasher hasher{u64, u64_2};
+        const PresaltedSipHasher presalted_hasher{u64, u64_2};
+        hasher.Write(u256);
+        assert(presalted_hasher(u256) == hasher.Finalize());
+        uint8_t extra[4]{};
+        WriteLE32(extra, u32);
+        hasher.Write(extra);
+        assert(presalted_hasher(u256, u32) == hasher.Finalize());
+    }
+    {
+        const uint64_t data0{u160.GetUint64(0)}, data1{u160.GetUint64(1)};
+        SipHasher13UJ hasher{u64, u64_2};
+        const SipHasher13UJ fixed_hasher{u64, u64_2};
+        hasher.WriteJumbo(u256);
+        assert(fixed_hasher.Hash(u256) == hasher.Finalize());
+        hasher.Write(data0);
+        assert(fixed_hasher.Hash(u256, data0) == hasher.Finalize());
+
+        SipHasher13UJ reference{u64, u64_2};
+        SipHasher13UJ mixed{u64, u64_2};
+        reference.WriteJumbo(u256);
+        mixed.WriteJumbo(u256);
+
+        const auto write_normal{[](SipHasher13UJ& hasher, uint64_t data, bool as_jumbo) {
+            if (as_jumbo) {
+                uint256 data256{};
+                WriteLE64(data256.data(), data);
+                hasher.WriteJumbo(data256);
+            } else {
+                hasher.Write(data);
+            }
+        }};
+
+        reference.Write(data0).Write(data1);
+        write_normal(mixed, data0, b);
+        write_normal(mixed, data1, u8 & 1);
+        assert(mixed.Finalize() == reference.Finalize());
+
+        reference.WriteJumbo(u256).Write(data0);
+        assert(mixed.Hash(u256, data0) == reference.Finalize());
+    }
     (void)ToLower(ch);
     (void)ToUpper(ch);
     {
diff --git a/depend/bitcoin/src/test/fuzz/key.cpp b/depend/bitcoin/src/test/fuzz/key.cpp
index e4bedff8..19101ae8 100644
--- a/depend/bitcoin/src/test/fuzz/key.cpp
+++ b/depend/bitcoin/src/test/fuzz/key.cpp
@@ -85,7 +85,7 @@ FUZZ_TARGET(key, .init = initialize_key)
     {
         CKey child_key;
         ChainCode child_chaincode;
-        const bool ok = key.Derive(child_key, child_chaincode, 0, random_uint256);
+        const bool ok = key.Derive(child_key, child_chaincode, 0, ChainCode{random_uint256});
         assert(ok);
         assert(child_key.IsValid());
         assert(!(child_key == key));
@@ -275,7 +275,7 @@ FUZZ_TARGET(key, .init = initialize_key)
     {
         CPubKey child_pubkey;
         ChainCode child_chaincode;
-        const bool ok = pubkey.Derive(child_pubkey, child_chaincode, 0, random_uint256);
+        const bool ok = pubkey.Derive(child_pubkey, child_chaincode, 0, ChainCode{random_uint256});
         assert(ok);
         assert(child_pubkey != pubkey);
         assert(child_pubkey.IsCompressed());
diff --git a/depend/bitcoin/src/test/fuzz/load_external_block_file.cpp b/depend/bitcoin/src/test/fuzz/load_external_block_file.cpp
index 8b86f70d..be7e2bde 100644
--- a/depend/bitcoin/src/test/fuzz/load_external_block_file.cpp
+++ b/depend/bitcoin/src/test/fuzz/load_external_block_file.cpp
@@ -29,7 +29,7 @@ void initialize_load_external_block_file()
 FUZZ_TARGET(load_external_block_file, .init = initialize_load_external_block_file)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     FuzzedFileProvider fuzzed_file_provider{fuzzed_data_provider};
     AutoFile fuzzed_block_file{fuzzed_file_provider.open()};
     if (fuzzed_block_file.IsNull()) {
diff --git a/depend/bitcoin/src/test/fuzz/locale.cpp b/depend/bitcoin/src/test/fuzz/locale.cpp
index 0336f77a..15c050a4 100644
--- a/depend/bitcoin/src/test/fuzz/locale.cpp
+++ b/depend/bitcoin/src/test/fuzz/locale.cpp
@@ -45,7 +45,6 @@ FUZZ_TARGET(locale)
     const char* c_locale = std::setlocale(LC_ALL, "C");
     assert(c_locale != nullptr);
 
-    const std::string random_string = fuzzed_data_provider.ConsumeRandomLengthString(5);
     const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral<int64_t>();
     const std::string tostring_without_locale = util::ToString(random_int64);
     const std::string strprintf_int_without_locale = strprintf("%d", random_int64);
diff --git a/depend/bitcoin/src/test/fuzz/merkleblock.cpp b/depend/bitcoin/src/test/fuzz/merkleblock.cpp
index 86916fdf..76c5668f 100644
--- a/depend/bitcoin/src/test/fuzz/merkleblock.cpp
+++ b/depend/bitcoin/src/test/fuzz/merkleblock.cpp
@@ -34,7 +34,7 @@ FUZZ_TARGET(merkleblock)
                 if (fuzzed_data_provider.ConsumeBool()) {
                     merkle_block = CMerkleBlock{*opt_block, bloom_filter};
                 } else if (fuzzed_data_provider.ConsumeBool()) {
-                    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+                    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
                         txids.insert(Txid::FromUint256(ConsumeUInt256(fuzzed_data_provider)));
                     }
                     merkle_block = CMerkleBlock{*opt_block, txids};
diff --git a/depend/bitcoin/src/test/fuzz/mini_miner.cpp b/depend/bitcoin/src/test/fuzz/mini_miner.cpp
index 77f9e682..8848a0cd 100644
--- a/depend/bitcoin/src/test/fuzz/mini_miner.cpp
+++ b/depend/bitcoin/src/test/fuzz/mini_miner.cpp
@@ -2,27 +2,35 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <node/mini_miner.h>
+
+#include <consensus/amount.h>
+#include <kernel/cs_main.h>
+#include <policy/feerate.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/fuzz/util/mempool.h>
-#include <test/util/mining.h>
 #include <test/util/script.h>
+#include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
 #include <test/util/txmempool.h>
-
-#include <node/miner.h>
-#include <node/mini_miner.h>
-#include <node/types.h>
-#include <primitives/transaction.h>
-#include <random.h>
 #include <txmempool.h>
+#include <uint256.h>
 #include <util/check.h>
-#include <util/time.h>
 #include <util/translation.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <deque>
+#include <functional>
+#include <map>
+#include <optional>
+#include <utility>
 #include <vector>
 
 namespace {
@@ -41,7 +49,7 @@ FUZZ_TARGET(mini_miner, .init = initialize_miner)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     bilingual_str error;
     CTxMemPool pool{CTxMemPool::Options{}, error};
     Assert(error.empty());
@@ -49,8 +57,7 @@ FUZZ_TARGET(mini_miner, .init = initialize_miner)
     std::deque<COutPoint> available_coins = g_available_coins;
     LOCK2(::cs_main, pool.cs);
     // Cluster size cannot exceed 500
-    LIMITED_WHILE(!available_coins.empty(), 100)
-    {
+    LIMITED_WHILE (!available_coins.empty(), 100) {
         CMutableTransaction mtx = CMutableTransaction();
         const size_t num_inputs = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, available_coins.size());
         const size_t num_outputs = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 50);
@@ -87,7 +94,6 @@ FUZZ_TARGET(mini_miner, .init = initialize_miner)
                 outpoints.push_back(*outpoint);
             }
         }
-
     }
 
     const CFeeRate target_feerate{CFeeRate{ConsumeMoney(fuzzed_data_provider, /*max=*/MAX_MONEY/1000)}};
diff --git a/depend/bitcoin/src/test/fuzz/minisketch.cpp b/depend/bitcoin/src/test/fuzz/minisketch.cpp
index 48b211af..919f4b4b 100644
--- a/depend/bitcoin/src/test/fuzz/minisketch.cpp
+++ b/depend/bitcoin/src/test/fuzz/minisketch.cpp
@@ -36,8 +36,7 @@ FUZZ_TARGET(minisketch)
 
     // Fill two sets and keep the difference in a map
     std::map<uint32_t, bool> diff;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const auto entry{fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(1, std::numeric_limits<uint32_t>::max() - 1)};
         const auto KeepDiff{[&] {
             bool& mut{diff[entry]};
diff --git a/depend/bitcoin/src/test/fuzz/net.cpp b/depend/bitcoin/src/test/fuzz/net.cpp
index 20fbae15..594c1b19 100644
--- a/depend/bitcoin/src/test/fuzz/net.cpp
+++ b/depend/bitcoin/src/test/fuzz/net.cpp
@@ -32,15 +32,16 @@ void initialize_net()
 FUZZ_TARGET(net, .init = initialize_net)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
-    CNode node{ConsumeNode(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
+    FakeSteadyClock steady_clock;
+    CNode node{ConsumeNode(fuzzed_data_provider, steady_clock)};
     node.SetCommonVersion(fuzzed_data_provider.ConsumeIntegral<int>());
     if (const auto service_opt =
             ConsumeDeserializable<CService>(fuzzed_data_provider, ConsumeDeserializationParams<CNetAddr::SerParams>(fuzzed_data_provider)))
     {
         node.SetAddrLocal(*service_opt);
     }
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -81,14 +82,15 @@ FUZZ_TARGET(net, .init = initialize_net)
 FUZZ_TARGET(local_address, .init = initialize_net)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
+    FakeSteadyClock steady_clock;
     CService service{ConsumeService(fuzzed_data_provider)};
-    CNode node{ConsumeNode(fuzzed_data_provider)};
+    CNode node{ConsumeNode(fuzzed_data_provider, steady_clock)};
     {
         LOCK(g_maplocalhost_mutex);
         mapLocalHost.clear();
     }
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/netbase_dns_lookup.cpp b/depend/bitcoin/src/test/fuzz/netbase_dns_lookup.cpp
index ebcf84f5..e0c377ee 100644
--- a/depend/bitcoin/src/test/fuzz/netbase_dns_lookup.cpp
+++ b/depend/bitcoin/src/test/fuzz/netbase_dns_lookup.cpp
@@ -22,7 +22,7 @@ FUZZ_TARGET(netbase_dns_lookup)
 
     auto fuzzed_dns_lookup_function = [&](const std::string&, bool) {
         std::vector<CNetAddr> resolved_addresses;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
             resolved_addresses.push_back(ConsumeNetAddr(fuzzed_data_provider));
         }
         return resolved_addresses;
diff --git a/depend/bitcoin/src/test/fuzz/node_eviction.cpp b/depend/bitcoin/src/test/fuzz/node_eviction.cpp
index 562ece8b..9ef53fee 100644
--- a/depend/bitcoin/src/test/fuzz/node_eviction.cpp
+++ b/depend/bitcoin/src/test/fuzz/node_eviction.cpp
@@ -19,8 +19,7 @@ FUZZ_TARGET(node_eviction)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     std::vector<NodeEvictionCandidate> eviction_candidates;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         eviction_candidates.push_back({
             /*id=*/fuzzed_data_provider.ConsumeIntegral<NodeId>(),
             /*m_connected=*/ConsumeTime(fuzzed_data_provider),
diff --git a/depend/bitcoin/src/test/fuzz/p2p_handshake.cpp b/depend/bitcoin/src/test/fuzz/p2p_handshake.cpp
index 421aacd8..9b657d68 100644
--- a/depend/bitcoin/src/test/fuzz/p2p_handshake.cpp
+++ b/depend/bitcoin/src/test/fuzz/p2p_handshake.cpp
@@ -2,19 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <addrman.h>
-#include <consensus/consensus.h>
+#include <banman.h>
 #include <net.h>
 #include <net_processing.h>
-#include <node/warnings.h>
 #include <protocol.h>
-#include <script/script.h>
 #include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
-#include <test/util/mining.h>
 #include <test/util/net.h>
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
@@ -23,16 +19,15 @@
 #include <validationinterface.h>
 
 #include <ios>
-#include <string>
 #include <utility>
 #include <vector>
 
 namespace {
-const TestingSetup* g_setup;
+TestingSetup* g_setup;
 
 void initialize()
 {
-    static const auto testing_setup = MakeNoLogFileContext<const TestingSetup>(
+    static const auto testing_setup = MakeNoLogFileContext<TestingSetup>(
         /*chain_type=*/ChainType::REGTEST);
     g_setup = testing_setup.get();
 }
@@ -43,37 +38,45 @@ FUZZ_TARGET(p2p_handshake, .init = ::initialize)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
 
-    auto& connman = static_cast<ConnmanTestMsg&>(*g_setup->m_node.connman);
-    auto& chainman = static_cast<TestChainstateManager&>(*g_setup->m_node.chainman);
-    NodeClockContext clock_ctx{1610000000s}; // any time to successfully reset ibd
+    auto& node{g_setup->m_node};
+    auto& connman{static_cast<ConnmanTestMsg&>(*node.connman)};
+    auto& chainman{static_cast<TestChainstateManager&>(*node.chainman)};
+    FakeNodeClock clock{1610000000s}; // 2021-01-07, arbitrary
+    FakeSteadyClock steady_clock;
     chainman.ResetIbd();
 
-    node::Warnings warnings{};
-    auto netgroupman{NetGroupManager::NoAsmap()};
-    AddrMan addrman{netgroupman, /*deterministic=*/true, /*consistency_check_ratio=*/0};
-    auto peerman = PeerManager::make(connman, addrman,
+    node.banman.reset();
+    node.addrman.reset();
+    node.peerman.reset();
+    node.addrman = std::make_unique<AddrMan>(
+        *node.netgroupman, /*deterministic=*/true, /*consistency_check_ratio=*/0);
+    node.peerman = PeerManager::make(connman, *node.addrman,
                                      /*banman=*/nullptr, chainman,
-                                     *g_setup->m_node.mempool, warnings,
+                                     *node.mempool, *node.warnings,
                                      PeerManager::Options{
                                          .reconcile_txs = true,
                                          .deterministic_rng = true,
                                      });
-    connman.SetMsgProc(peerman.get());
+    connman.SetMsgProc(node.peerman.get());
+    connman.SetAddrman(*node.addrman);
 
     LOCK(NetEventsInterface::g_msgproc_mutex);
 
     std::vector<CNode*> peers;
     const auto num_peers_to_add = fuzzed_data_provider.ConsumeIntegralInRange(1, 3);
     for (int i = 0; i < num_peers_to_add; ++i) {
-        peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release());
+        peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock, i).release());
         connman.AddTestNode(*peers.back());
-        peerman->InitializeNode(
+        node.peerman->InitializeNode(
             *peers.back(),
             static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()));
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    // Toggle IBD from within the loop, so that some messages may be processed
+    // under IBD and the rest after leaving it. JumpOutOfIbd() latches, so guard
+    // it to call at most once.
+    bool jump_out_of_ibd{false};
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CNode& connection = *PickValue(fuzzed_data_provider, peers);
         if (connection.fDisconnect || connection.fSuccessfullyConnected) {
             // Skip if the connection was disconnected or if the version
@@ -81,7 +84,10 @@ FUZZ_TARGET(p2p_handshake, .init = ::initialize)
             continue;
         }
 
-        clock_ctx += std::chrono::seconds{
+        if (!jump_out_of_ibd) jump_out_of_ibd = fuzzed_data_provider.ConsumeBool();
+        if (jump_out_of_ibd && chainman.IsInitialBlockDownload()) chainman.JumpOutOfIbd();
+
+        clock += std::chrono::seconds{
                     fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(
                         -std::chrono::seconds{10min}.count(), // Allow mocktime to go backwards slightly
                         std::chrono::seconds{TIMEOUT_INTERVAL}.count()),
@@ -102,9 +108,9 @@ FUZZ_TARGET(p2p_handshake, .init = ::initialize)
                 more_work = connman.ProcessMessagesOnce(connection);
             } catch (const std::ios_base::failure&) {
             }
-            peerman->SendMessages(connection);
+            node.peerman->SendMessages(connection);
         }
     }
 
-    g_setup->m_node.connman->StopNodes();
+    node.connman->StopNodes();
 }
diff --git a/depend/bitcoin/src/test/fuzz/p2p_headers_presync.cpp b/depend/bitcoin/src/test/fuzz/p2p_headers_presync.cpp
index 704e447f..00c6dbe0 100644
--- a/depend/bitcoin/src/test/fuzz/p2p_headers_presync.cpp
+++ b/depend/bitcoin/src/test/fuzz/p2p_headers_presync.cpp
@@ -8,7 +8,6 @@
 #include <net_processing.h>
 #include <netmessagemaker.h>
 #include <node/peerman_args.h>
-#include <pow.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
@@ -143,13 +142,6 @@ CBlock ConsumeBlock(FuzzedDataProvider& fuzzed_data_provider, const uint256& pre
     return block;
 }
 
-void FinalizeHeader(CBlockHeader& header, const ChainstateManager& chainman)
-{
-    while (!CheckProofOfWork(header.GetHash(), header.nBits, chainman.GetParams().GetConsensus())) {
-        ++(header.nNonce);
-    }
-}
-
 // Global setup works for this test as state modification (specifically in the
 // block index) would indicate a bug.
 HeadersSyncSetup* g_testing_setup;
@@ -172,11 +164,11 @@ FUZZ_TARGET(p2p_headers_presync, .init = initialize)
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     // The steady clock is currently only used for logging, so a constant
     // time-point seems acceptable for now.
-    SteadyClockContext steady_ctx{};
+    FakeSteadyClock steady_ctx{};
 
     ChainstateManager& chainman = *g_testing_setup->m_node.chainman;
     CBlockHeader base{chainman.GetParams().GenesisBlock()};
-    const NodeClockContext clock_ctx{base.Time()};
+    const FakeNodeClock clock{base.Time()};
 
     LOCK(NetEventsInterface::g_msgproc_mutex);
 
@@ -188,8 +180,7 @@ FUZZ_TARGET(p2p_headers_presync, .init = initialize)
 
     std::vector<CBlockHeader> all_headers;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         auto finalized_block = [&]() {
             CBlock block = ConsumeBlock(fuzzed_data_provider, base.GetHash(), base.nBits);
             FinalizeHeader(block, chainman);
diff --git a/depend/bitcoin/src/test/fuzz/p2p_private_broadcast.cpp b/depend/bitcoin/src/test/fuzz/p2p_private_broadcast.cpp
new file mode 100644
index 00000000..547b2fbe
--- /dev/null
+++ b/depend/bitcoin/src/test/fuzz/p2p_private_broadcast.cpp
@@ -0,0 +1,258 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <banman.h>
+#include <net.h>
+#include <net_processing.h>
+#include <protocol.h>
+#include <sync.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+#include <test/fuzz/util/net.h>
+#include <test/util/net.h>
+#include <test/util/setup_common.h>
+#include <test/util/time.h>
+#include <test/util/validation.h>
+#include <util/time.h>
+#include <validationinterface.h>
+
+#include <array>
+#include <ios>
+#include <memory>
+#include <vector>
+
+namespace {
+TestingSetup* g_setup;
+
+void initialize()
+{
+    static const auto testing_setup = MakeNoLogFileContext<TestingSetup>(
+        /*chain_type=*/ChainType::REGTEST);
+    g_setup = testing_setup.get();
+}
+
+// Inbound message types with private broadcast specific handling.
+// Used as the guided path in the CallOneOf() below.
+constexpr std::array INBOUND_MSG_TYPES{
+    NetMsgType::VERSION,
+    NetMsgType::VERACK,
+    NetMsgType::GETDATA,
+    NetMsgType::PONG,
+};
+} // namespace
+
+FUZZ_TARGET(p2p_private_broadcast, .init = ::initialize)
+{
+    SeedRandomStateForTest(SeedRand::ZEROS);
+    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+
+    auto& node{g_setup->m_node};
+    auto& connman{static_cast<ConnmanTestMsg&>(*node.connman)};
+    connman.Reset();
+    auto& chainman{static_cast<TestChainstateManager&>(*node.chainman)};
+
+    FakeNodeClock clock_ctx{1610000000s};
+    FakeSteadyClock steady_clock;
+    chainman.ResetIbd();
+    // Sometimes leave IBD: incoming TX processing (the broadcast-abort path)
+    // returns early during IBD.
+    if (fuzzed_data_provider.ConsumeBool()) chainman.JumpOutOfIbd();
+
+    // Reset, so that dangling pointers can be detected by sanitizers.
+    node.banman.reset();
+    node.addrman.reset();
+    node.peerman.reset();
+    node.addrman = std::make_unique<AddrMan>(
+        *node.netgroupman, /*deterministic=*/true, /*consistency_check_ratio=*/0);
+    node.peerman = PeerManager::make(connman, *node.addrman,
+                                     /*banman=*/nullptr, chainman,
+                                     *node.mempool, *node.warnings,
+                                     PeerManager::Options{
+                                         .reconcile_txs = true,
+                                         .deterministic_rng = true,
+                                     });
+    connman.SetMsgProc(node.peerman.get());
+    connman.SetAddrman(*node.addrman);
+
+    // Seed with 0-3 transactions to test multiple pending broadcasts; zero exercises
+    // the connected-in-vain disconnect in PushPrivateBroadcastTx().
+    const int num_txs{fuzzed_data_provider.ConsumeIntegralInRange(0, 3)};
+    std::vector<CTransactionRef> seeded_txs;
+    for (int i = 0; i < num_txs; ++i) {
+        auto tx{MakeTransactionRef(ConsumeTransaction(fuzzed_data_provider, /*prevout_txids=*/std::nullopt))};
+        (void)node.peerman->InitiateTxBroadcastPrivate(tx);
+        seeded_txs.push_back(tx);
+    }
+
+    LOCK(NetEventsInterface::g_msgproc_mutex);
+
+    static NodeId node_id{0};
+    // Create at least one PRIVATE_BROADCAST peer, optionally add others of random types.
+    std::vector<CNode*> peers;
+
+    CNode* pb_node = new CNode(
+        /*id=*/node_id++,
+        /*sock=*/std::make_shared<FuzzedSock>(fuzzed_data_provider, steady_clock),
+        /*addrIn=*/ConsumeAddress(fuzzed_data_provider),
+        /*nKeyedNetGroupIn=*/0,
+        /*nLocalHostNonceIn=*/0,
+        /*addrBindIn=*/CService{},
+        /*addrNameIn=*/"",
+        /*conn_type_in=*/ConnectionType::PRIVATE_BROADCAST,
+        /*inbound_onion=*/false,
+        /*network_key=*/0);
+
+    peers.push_back(pb_node);
+    connman.AddTestNode(*pb_node);
+    // Capture outbound messages to verify if well formed (and to learn the PING
+    // nonce), before SocketSendData drains vSendMsg.
+    connman.SetCaptureMessages(true);
+    const auto CaptureMessageOrig = CaptureMessage;
+    const CAddress pb_addr = pb_node->addr;
+    std::optional<uint64_t> pb_ping_nonce;
+    CaptureMessage = [&](const CAddress& addr, const std::string& msg_type,
+                         std::span<const unsigned char> data, bool is_incoming) {
+        if (is_incoming || addr != pb_addr) return;
+        if (msg_type == NetMsgType::PING) {
+            Assert(data.size() == sizeof(uint64_t));
+            uint64_t nonce;
+            SpanReader{data} >> nonce;
+            pb_ping_nonce = nonce;
+            return;
+        }
+        if (msg_type == NetMsgType::VERSION) {
+            SpanReader ds{data};
+            int32_t version;
+            uint64_t my_services, your_services, my_services_dup, nonce;
+            int64_t my_time;
+            CService your_addr, my_addr;
+            std::string user_agent;
+            int32_t height;
+            bool relay;
+            ds >> version >> my_services >> my_time >>
+                your_services >> CNetAddr::V1(your_addr) >>
+                my_services_dup >> CNetAddr::V1(my_addr) >>
+                nonce >> user_agent >> height >> relay;
+            Assert(version == WTXID_RELAY_VERSION);
+            Assert(my_services == NODE_NONE && my_services_dup == NODE_NONE);
+            Assert(my_time == 0);
+            Assert(your_services == NODE_NONE);
+            Assert(your_addr == CService{});
+            Assert(user_agent == "/pynode:0.0.1/");
+            Assert(height == 0);
+            Assert(!relay);
+            return;
+        }
+        if (msg_type != NetMsgType::INV) return;
+        SpanReader ds{data};
+        std::vector<CInv> invs;
+        ds >> invs;
+        Assert(invs.size() == 1);
+        Assert(invs[0].IsMsgTx());
+    };
+
+    // Complete handshake so PushPrivateBroadcastTx runs.
+    connman.Handshake(
+        /*node=*/*pb_node,
+        /*successfully_connected=*/true,
+        /*remote_services=*/ServiceFlags(NODE_NETWORK | NODE_WITNESS),
+        /*local_services=*/NODE_NONE,
+        /*version=*/PROTOCOL_VERSION,
+        /*relay_txs=*/true);
+
+    // Optionally add extra peers of random connection types.
+    const int extra_peers{fuzzed_data_provider.ConsumeIntegralInRange(0, 2)};
+    for (int i = 0; i < extra_peers; ++i) {
+        auto extra_peer{ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock, node_id++)};
+        // An address collision would match the capture hook's filter and fail
+        // its assertions on this peer's (legitimate) other-typed messages.
+        if (extra_peer->addr == pb_addr) continue;
+        peers.push_back(extra_peer.release());
+        connman.AddTestNode(*peers.back());
+        node.peerman->InitializeNode(
+            *peers.back(),
+            static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()));
+    }
+
+    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
+    {
+        // Pick any random peer to test interleaved message handling.
+        CNode& p2p_node = *PickValue(fuzzed_data_provider, peers);
+        if (p2p_node.fDisconnect) continue;
+
+        clock_ctx += ConsumeDuration<std::chrono::seconds>(fuzzed_data_provider, 0s, 600s);
+
+        std::optional<CSerializedNetMsg> net_msg;
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                net_msg.emplace();
+                net_msg->m_type = std::string{PickValue(fuzzed_data_provider, INBOUND_MSG_TYPES)};
+            },
+            [&] {
+                net_msg.emplace();
+                net_msg->m_type = fuzzed_data_provider.ConsumeRandomLengthString(CMessageHeader::MESSAGE_TYPE_SIZE);
+            },
+            [&] {
+                (void)node.peerman->InitiateTxBroadcastPrivate(
+                    MakeTransactionRef(ConsumeTransaction(fuzzed_data_provider, /*prevout_txids=*/std::nullopt)));
+            },
+            [&] {
+                // Construct a valid GETDATA for a seeded tx to exercise the TX send path.
+                if (p2p_node.IsPrivateBroadcastConn() &&
+                    p2p_node.fSuccessfullyConnected &&
+                    !seeded_txs.empty()) {
+                    const auto& tx{PickValue(fuzzed_data_provider, seeded_txs)};
+                    net_msg.emplace(NetMsg::Make(
+                        NetMsgType::GETDATA,
+                        std::vector<CInv>{{MSG_TX, tx->GetHash().ToUint256()}}));
+                }
+            },
+            [&] {
+                // Confirm reception of the pushed TX with a PONG matching the captured PING nonce.
+                if (&p2p_node == pb_node && pb_ping_nonce) {
+                    net_msg.emplace(NetMsg::Make(NetMsgType::PONG, *pb_ping_nonce));
+                }
+            },
+            [&] {
+                // Echo a seeded tx back from a non-private-broadcast peer to exercise
+                // the received-from-network broadcast-abort path.
+                if (!p2p_node.IsPrivateBroadcastConn() &&
+                    p2p_node.fSuccessfullyConnected &&
+                    !seeded_txs.empty()) {
+                    const auto& tx{PickValue(fuzzed_data_provider, seeded_txs)};
+                    net_msg.emplace(NetMsg::Make(NetMsgType::TX, TX_WITH_WITNESS(*tx)));
+                }
+            });
+
+        if (net_msg) {
+            if (net_msg->data.empty()) {
+                net_msg->data = ConsumeRandomLengthByteVector(fuzzed_data_provider, MAX_PROTOCOL_MESSAGE_LENGTH);
+            }
+            connman.FlushSendBuffer(p2p_node);
+
+            // ConsumeTransaction() can produce messages larger than the
+            // maximum payload accepted by the P2P transport.
+            if (net_msg->data.size() > MAX_PROTOCOL_MESSAGE_LENGTH) continue;
+
+            (void)connman.ReceiveMsgFrom(p2p_node, std::move(*net_msg));
+
+            bool more_work{true};
+            while (more_work) {
+                p2p_node.fPauseSend = false;
+                try {
+                    more_work = connman.ProcessMessagesOnce(p2p_node);
+                } catch (const std::ios_base::failure&) {
+                }
+                node.peerman->SendMessages(p2p_node);
+            }
+        }
+    }
+
+    CaptureMessage = CaptureMessageOrig;
+    connman.SetCaptureMessages(false);
+
+    node.connman->StopNodes();
+}
diff --git a/depend/bitcoin/src/test/fuzz/p2p_transport_serialization.cpp b/depend/bitcoin/src/test/fuzz/p2p_transport_serialization.cpp
index 82b282d3..80a1781d 100644
--- a/depend/bitcoin/src/test/fuzz/p2p_transport_serialization.cpp
+++ b/depend/bitcoin/src/test/fuzz/p2p_transport_serialization.cpp
@@ -86,7 +86,6 @@ FUZZ_TARGET(p2p_transport_serialization, .init = initialize_p2p_transport_serial
             assert(msg.m_raw_message_size == CMessageHeader::HEADER_SIZE + msg.m_message_size);
             assert(msg.m_time == time);
 
-            std::vector<unsigned char> header;
             auto msg2 = NetMsg::Make(msg.m_type, std::span{msg.m_recv});
             bool queued = send_transport.SetMessageToSend(msg2);
             assert(queued);
@@ -294,7 +293,7 @@ void SimulationTest(Transport& initiator, Transport& responder, R& rng, FuzzedDa
     };
 
     // Main loop, interleaving new messages, sends, and receives.
-    LIMITED_WHILE(provider.remaining_bytes(), 1000) {
+    LIMITED_WHILE (provider.remaining_bytes(), 1000) {
         CallOneOf(provider,
             // (Try to) give the next message to the transport.
             [&] { new_msg_fn(/*side=*/0); },
diff --git a/depend/bitcoin/src/test/fuzz/package_eval.cpp b/depend/bitcoin/src/test/fuzz/package_eval.cpp
index 93cd8ad6..5d94cb18 100644
--- a/depend/bitcoin/src/test/fuzz/package_eval.cpp
+++ b/depend/bitcoin/src/test/fuzz/package_eval.cpp
@@ -2,26 +2,50 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <chain.h>
+#include <consensus/amount.h>
+#include <consensus/consensus.h>
 #include <consensus/validation.h>
-#include <node/context.h>
-#include <node/mempool_args.h>
-#include <node/miner.h>
+#include <node/mining_types.h>
+#include <policy/feerate.h>
+#include <policy/packages.h>
+#include <policy/policy.h>
+#include <policy/settings.h>
 #include <policy/truc_policy.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/mempool.h>
 #include <test/util/mining.h>
+#include <test/util/random.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
 #include <test/util/txmempool.h>
+#include <txmempool.h>
 #include <util/check.h>
-#include <util/rbf.h>
+#include <util/hasher.h>
+#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <validationinterface.h>
 
-using node::BlockAssembler;
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <limits>
+#include <map>
+#include <memory>
+#include <optional>
+#include <set>
+#include <span>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 using node::NodeContext;
 
 namespace {
@@ -44,12 +68,10 @@ void initialize_tx_pool()
     g_setup = testing_setup.get();
     SetMockTime(WITH_LOCK(g_setup->m_node.chainman->GetMutex(), return g_setup->m_node.chainman->ActiveTip()->Time()));
 
-    BlockAssembler::Options options;
-    options.coinbase_output_script = P2WSH_EMPTY;
-    options.include_dummy_extranonce = true;
-
     for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
-        COutPoint prevout{MineBlock(g_setup->m_node, options)};
+        COutPoint prevout{MineBlock(g_setup->m_node, {
+            .coinbase_output_script = P2WSH_EMPTY,
+        })};
         if (i < COINBASE_MATURITY) {
             // Remember the txids to avoid expensive disk access later on
             g_outpoints_coinbase_init_mature.push_back(prevout);
@@ -215,8 +237,7 @@ FUZZ_TARGET(ephemeral_package_eval, .init = initialize_tx_pool)
 
     chainstate.SetMempool(&tx_pool);
 
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 300)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 300) {
         Assert(!mempool_outpoints.empty());
 
         std::vector<CTransactionRef> txs;
@@ -370,8 +391,7 @@ FUZZ_TARGET(tx_package_eval, .init = initialize_tx_pool)
 
     chainstate.SetMempool(&tx_pool);
 
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 300)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 300) {
         Assert(!mempool_outpoints.empty());
 
         std::vector<CTransactionRef> txs;
diff --git a/depend/bitcoin/src/test/fuzz/parse_hd_keypath.cpp b/depend/bitcoin/src/test/fuzz/parse_hd_keypath.cpp
index 45aa1e87..d240f372 100644
--- a/depend/bitcoin/src/test/fuzz/parse_hd_keypath.cpp
+++ b/depend/bitcoin/src/test/fuzz/parse_hd_keypath.cpp
@@ -7,6 +7,7 @@
 #include <test/fuzz/util.h>
 #include <util/bip32.h>
 
+#include <cassert>
 #include <cstdint>
 #include <vector>
 
@@ -18,6 +19,12 @@ FUZZ_TARGET(parse_hd_keypath)
 
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     const std::vector<uint32_t> random_keypath = ConsumeRandomLengthIntegralVector<uint32_t>(fuzzed_data_provider);
-    (void)FormatHDKeypath(random_keypath, /*apostrophe=*/true); // WriteHDKeypath calls this with false
-    (void)WriteHDKeypath(random_keypath);
+
+    // Roundtrip WriteHDKeypath() and ParseHDKeypath()
+    for (const bool apostrophe : {false, true}) {
+        std::vector<uint32_t> roundtrip;
+        const std::string written{WriteHDKeypath(random_keypath, apostrophe)};
+        assert(ParseHDKeypath(written, roundtrip));
+        assert(roundtrip == random_keypath);
+    }
 }
diff --git a/depend/bitcoin/src/test/fuzz/partially_downloaded_block.cpp b/depend/bitcoin/src/test/fuzz/partially_downloaded_block.cpp
index 12fdb8f7..56815c46 100644
--- a/depend/bitcoin/src/test/fuzz/partially_downloaded_block.cpp
+++ b/depend/bitcoin/src/test/fuzz/partially_downloaded_block.cpp
@@ -48,7 +48,7 @@ FUZZ_TARGET(partially_downloaded_block, .init = initialize_pdb)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     auto block{ConsumeDeserializable<CBlock>(fuzzed_data_provider, TX_WITH_WITNESS)};
     if (!block || block->vtx.size() == 0 ||
diff --git a/depend/bitcoin/src/test/fuzz/pcp.cpp b/depend/bitcoin/src/test/fuzz/pcp.cpp
index 4f1faa98..d843c08e 100644
--- a/depend/bitcoin/src/test/fuzz/pcp.cpp
+++ b/depend/bitcoin/src/test/fuzz/pcp.cpp
@@ -6,8 +6,10 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
+#include <test/util/time.h>
 
 #include <common/pcp.h>
+#include <logging.h>
 #include <util/check.h>
 #include <util/threadinterrupt.h>
 
@@ -30,11 +32,13 @@ void port_map_target_init()
 FUZZ_TARGET(pcp_request_port_map, .init = port_map_target_init)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+    FakeSteadyClock steady_clock;
 
     // Create a mocked socket between random (and potentially invalid) client and gateway addresses.
+    auto CreateSockOrig = CreateSock;
     CreateSock = [&](int domain, int type, int protocol) {
         if ((domain == AF_INET || domain == AF_INET6) && type == SOCK_DGRAM && protocol == IPPROTO_UDP) {
-            return std::make_unique<FuzzedSock>(fuzzed_data_provider);
+            return std::make_unique<FuzzedSock>(fuzzed_data_provider, steady_clock);
         }
         return std::unique_ptr<FuzzedSock>();
     };
@@ -53,16 +57,20 @@ FUZZ_TARGET(pcp_request_port_map, .init = port_map_target_init)
         Assert(mapping->internal.GetPort() == port);
         mapping->ToString();
     }
+
+    CreateSock = CreateSockOrig;
 }
 
 FUZZ_TARGET(natpmp_request_port_map, .init = port_map_target_init)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+    FakeSteadyClock steady_clock;
 
     // Create a mocked socket between random (and potentially invalid) client and gateway addresses.
+    auto CreateSockOrig = CreateSock;
     CreateSock = [&](int domain, int type, int protocol) {
         if (domain == AF_INET && type == SOCK_DGRAM && protocol == IPPROTO_UDP) {
-            return std::make_unique<FuzzedSock>(fuzzed_data_provider);
+            return std::make_unique<FuzzedSock>(fuzzed_data_provider, steady_clock);
         }
         return std::unique_ptr<FuzzedSock>();
     };
@@ -80,4 +88,6 @@ FUZZ_TARGET(natpmp_request_port_map, .init = port_map_target_init)
         Assert(mapping->internal.GetPort() == port);
         mapping->ToString();
     }
+
+    CreateSock = CreateSockOrig;
 }
diff --git a/depend/bitcoin/src/test/fuzz/policy_estimator.cpp b/depend/bitcoin/src/test/fuzz/policy_estimator.cpp
index 576ab8cd..1e137a67 100644
--- a/depend/bitcoin/src/test/fuzz/policy_estimator.cpp
+++ b/depend/bitcoin/src/test/fuzz/policy_estimator.cpp
@@ -39,8 +39,7 @@ FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
         [&] { current_height = fuzzed_data_provider.ConsumeIntegralInRange<decltype(current_height)>(current_height, 1 << 30); },
     };
     advance_height();
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 10'000)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 10'000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -66,8 +65,7 @@ FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
             },
             [&] {
                 std::list<CTxMemPoolEntry> mempool_entries;
-                LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-                {
+                LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
                     const std::optional<CMutableTransaction> mtx = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider, TX_WITH_WITNESS);
                     if (!mtx) {
                         good_data = false;
diff --git a/depend/bitcoin/src/test/fuzz/poolresource.cpp b/depend/bitcoin/src/test/fuzz/poolresource.cpp
index 2b2b33bf..e5455feb 100644
--- a/depend/bitcoin/src/test/fuzz/poolresource.cpp
+++ b/depend/bitcoin/src/test/fuzz/poolresource.cpp
@@ -116,8 +116,7 @@ class PoolResourceFuzzer
 
     void Fuzz()
     {
-        LIMITED_WHILE(m_provider.ConsumeBool(), 10000)
-        {
+        LIMITED_WHILE (m_provider.ConsumeBool(), 10000) {
             CallOneOf(
                 m_provider,
                 [&] { Allocate(); },
diff --git a/depend/bitcoin/src/test/fuzz/pow.cpp b/depend/bitcoin/src/test/fuzz/pow.cpp
index a9151ca5..b60de392 100644
--- a/depend/bitcoin/src/test/fuzz/pow.cpp
+++ b/depend/bitcoin/src/test/fuzz/pow.cpp
@@ -30,7 +30,7 @@ FUZZ_TARGET(pow, .init = initialize_pow)
     std::vector<std::unique_ptr<CBlockIndex>> blocks;
     const uint32_t fixed_time = fuzzed_data_provider.ConsumeIntegral<uint32_t>();
     const uint32_t fixed_bits = fuzzed_data_provider.ConsumeIntegral<uint32_t>();
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 10000) {
         const std::optional<CBlockHeader> block_header = ConsumeDeserializable<CBlockHeader>(fuzzed_data_provider);
         if (!block_header) {
             continue;
diff --git a/depend/bitcoin/src/test/fuzz/prevector.cpp b/depend/bitcoin/src/test/fuzz/prevector.cpp
index aba6dca1..a96dc863 100644
--- a/depend/bitcoin/src/test/fuzz/prevector.cpp
+++ b/depend/bitcoin/src/test/fuzz/prevector.cpp
@@ -207,8 +207,7 @@ FUZZ_TARGET(prevector)
     FuzzedDataProvider prov(buffer.data(), buffer.size());
     prevector_tester<8, int> test;
 
-    LIMITED_WHILE(prov.remaining_bytes(), 3000)
-    {
+    LIMITED_WHILE (prov.remaining_bytes(), 3000) {
         switch (prov.ConsumeIntegralInRange<int>(0, 13 + 3 * (test.size() > 0))) {
         case 0: {
             auto position = prov.ConsumeIntegralInRange<size_t>(0, test.size());
diff --git a/depend/bitcoin/src/test/fuzz/private_broadcast.cpp b/depend/bitcoin/src/test/fuzz/private_broadcast.cpp
new file mode 100644
index 00000000..adcb2585
--- /dev/null
+++ b/depend/bitcoin/src/test/fuzz/private_broadcast.cpp
@@ -0,0 +1,237 @@
+// Copyright (c) 2025-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.
+
+#include <consensus/tx_check.h>
+#include <consensus/validation.h>
+#include <net.h>
+#include <primitives/transaction.h>
+#include <private_broadcast.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+#include <test/fuzz/util/net.h>
+#include <test/util/setup_common.h>
+#include <test/util/time.h>
+#include <util/overflow.h>
+#include <util/time.h>
+
+#include <algorithm>
+#include <ranges>
+#include <unordered_map>
+#include <unordered_set>
+
+struct CTransactionRefHash {
+    size_t operator()(const CTransactionRef& tx) const
+    {
+        return static_cast<size_t>(tx->GetWitnessHash().ToUint256().GetUint64(0));
+    }
+};
+
+struct CTransactionRefComp {
+    bool operator()(const CTransactionRef& a, const CTransactionRef& b) const
+    {
+        return a->GetWitnessHash() == b->GetWitnessHash();
+    }
+};
+
+FUZZ_TARGET(private_broadcast)
+{
+    SeedRandomStateForTest(SeedRand::ZEROS);
+    FuzzedDataProvider fdp(buffer.data(), buffer.size());
+    FakeNodeClock clock_ctx{ConsumeTime(fdp)};
+
+    const size_t cap{fdp.ConsumeIntegralInRange<size_t>(1, 12)};
+    const size_t max_send_attempts{fdp.ConsumeIntegralInRange<size_t>(1, 12)};
+    PrivateBroadcast pb{cap, max_send_attempts};
+
+    // Random transaction that the test generated and passed to Add(). Trimmed when Remove() is called.
+    // The values are the number of times a transaction was picked for sending.
+    std::unordered_map<CTransactionRef, size_t, CTransactionRefHash, CTransactionRefComp> transactions;
+
+    // Transactions passed to PickTxForSend(), indexed by node id. Trimmed when
+    // Remove() is called or a transaction is reset by Add().
+    std::unordered_map<NodeId, CTransactionRef> nodes_sent_to;
+
+    // A subset of `nodes_sent_to`, node ids passed to NodeConfirmedReception().
+    // Trimmed when Remove() is called or a transaction is reset by Add().
+    std::unordered_set<NodeId> nodes_that_confirmed_reception;
+
+    NodeId next_nodeid{0}; // Generate unique node ids.
+
+    const auto is_pending{[max_send_attempts](const auto& entry) {
+        return entry.second < max_send_attempts;
+    }};
+
+    const auto ExistentOrNewNodeId = [&next_nodeid, &fdp](){
+        if (next_nodeid == 0 || fdp.ConsumeBool()) {
+            return next_nodeid++;
+        }
+        return fdp.ConsumeIntegralInRange<NodeId>(0, next_nodeid - 1);
+    };
+
+    LIMITED_WHILE (fdp.ConsumeBool(), 10000) {
+        CallOneOf(
+            fdp,
+            [&] { // Add()
+                CTransactionRef tx;
+                if (transactions.empty() || fdp.ConsumeBool()) {
+                    tx = MakeTransactionRef(ConsumeTransaction(fdp, std::nullopt));
+                } else {
+                    tx = PickIterator(fdp, transactions)->first;
+                }
+
+                const bool present_before{transactions.contains(tx)};
+                const auto res{pb.Add(tx)};
+                if (present_before) {
+                    auto tx_it{transactions.find(tx)};
+                    Assert(tx_it != transactions.end());
+                    if (is_pending(*tx_it)) {
+                        Assert(res == PrivateBroadcast::AddResult::AlreadyPresent);
+                    } else {
+                        Assert(res == PrivateBroadcast::AddResult::Added);
+                        tx_it->second = 0;
+                        for (auto it = nodes_sent_to.begin(); it != nodes_sent_to.end();) {
+                            if (CTransactionRefComp{}(it->second, tx)) {
+                                nodes_that_confirmed_reception.erase(it->first);
+                                it = nodes_sent_to.erase(it);
+                            } else {
+                                ++it;
+                            }
+                        }
+                    }
+                } else if (transactions.size() >= cap) {
+                    Assert(res == PrivateBroadcast::AddResult::QueueFull);
+                } else {
+                    Assert(res == PrivateBroadcast::AddResult::Added);
+                    transactions.emplace(tx, 0);
+                }
+            },
+            [&] { // Remove()
+                if (transactions.empty()) {
+                    return;
+                }
+                const auto transactions_it{PickIterator(fdp, transactions)};
+                const CTransactionRef& tx{transactions_it->first};
+
+                size_t num_nodes_that_confirmed_tx{0};
+
+                // Remove relevant entries from nodes_sent_to[] and nodes_that_confirmed_reception[] if any.
+                for (auto it = nodes_sent_to.begin(); it != nodes_sent_to.end();) {
+                    const NodeId nodeid{it->first};
+                    if (CTransactionRefComp{}(it->second, tx)) {
+                        it = nodes_sent_to.erase(it);
+                        if (nodes_that_confirmed_reception.erase(nodeid) > 0) {
+                            ++num_nodes_that_confirmed_tx;
+                        }
+                    } else {
+                        ++it;
+                    }
+                }
+
+                const auto opt_num_confirmed{pb.Remove(tx)};
+
+                Assert(opt_num_confirmed.has_value());
+                Assert(opt_num_confirmed.value() == num_nodes_that_confirmed_tx);
+                Assert(!pb.Remove(tx).has_value());
+                transactions.erase(transactions_it);
+            },
+            [&] { // PickTxForSend()
+                // Only give pristine node ids to PickTxForSend() as required.
+                const NodeId will_send_to_nodeid{next_nodeid++};
+                const CService will_send_to_address{ConsumeService(fdp)};
+
+                const auto opt_tx{pb.PickTxForSend(will_send_to_nodeid, will_send_to_address)};
+
+                if (opt_tx.has_value()) {
+                    Assert(transactions.contains(opt_tx.value()));
+
+                    // "Number of times picked for sending" is the primary key in Priority's comparison
+                    // (fewest sends = highest priority), so PickTxForSend() must return a transaction
+                    // with the minimum send count of any in the queue. Ties are broken by state we
+                    // don't model, so only check this key.
+                    auto pending_transactions{transactions | std::views::filter(is_pending)};
+                    const size_t min_picked{std::ranges::min_element(
+                        pending_transactions, {}, [](const auto& el) { return el.second; })->second};
+                    const auto picked_it{transactions.find(opt_tx.value())};
+                    Assert(picked_it != transactions.end());
+                    Assert(picked_it->second == min_picked); // picked the least-sent transaction
+                    ++picked_it->second; // PickTxForSend() recorded exactly one send
+
+                    const auto& [_, inserted]{nodes_sent_to.emplace(will_send_to_nodeid, opt_tx.value())};
+                    Assert(inserted);
+                } else {
+                    Assert(std::ranges::none_of(transactions, is_pending));
+                }
+            },
+            [&] { // GetTxForNode()
+                const NodeId nodeid{ExistentOrNewNodeId()};
+
+                const auto opt_tx{pb.GetTxForNode(nodeid)};
+
+                if (nodes_sent_to.contains(nodeid)) {
+                    Assert(opt_tx.has_value());
+                    Assert(transactions.contains(opt_tx.value()));
+                    Assert(opt_tx.value() == nodes_sent_to.at(nodeid));
+                } else {
+                    Assert(!opt_tx.has_value());
+                }
+            },
+            [&] { // NodeConfirmedReception()
+                const NodeId nodeid{ExistentOrNewNodeId()};
+
+                pb.NodeConfirmedReception(nodeid);
+
+                if (nodes_sent_to.contains(nodeid)) {
+                    // nodeid was previously passed to PickTxForSend(), so NodeConfirmedReception()
+                    // must have changed the internal state. Remember this to later check that
+                    // DidNodeConfirmReception() works correctly.
+                    nodes_that_confirmed_reception.emplace(nodeid);
+                }
+            },
+            [&] { // DidNodeConfirmReception()
+                const NodeId nodeid{ExistentOrNewNodeId()};
+
+                const bool confirmed{pb.DidNodeConfirmReception(nodeid)};
+
+                if (nodes_that_confirmed_reception.contains(nodeid)) {
+                    Assert(confirmed);
+                } else {
+                    Assert(!confirmed);
+                }
+            },
+            [&] { // HavePendingTransactions()
+                if (std::ranges::any_of(transactions, is_pending)) {
+                    Assert(pb.HavePendingTransactions());
+                } else {
+                    Assert(!pb.HavePendingTransactions());
+                }
+            },
+            [&] { // GetStale()
+                const auto stale{pb.GetStale()};
+
+                Assert(stale.size() <= transactions.size());
+
+                for (const auto& stale_tx : stale) {
+                    const auto it{transactions.find(stale_tx)};
+                    Assert(it != transactions.end());
+                    Assert(is_pending(*it));
+                }
+            },
+            [&] { // GetBroadcastInfo()
+                const auto all_broadcast_info{pb.GetBroadcastInfo()};
+
+                Assert(all_broadcast_info.size() == transactions.size());
+
+                for (const auto& info : all_broadcast_info) {
+                    const auto it{transactions.find(info.tx)};
+                    Assert(it != transactions.end());
+                    Assert(info.peers.size() == it->second); // exactly the sends we recorded
+                    Assert(info.attempts_remaining == max_send_attempts - it->second);
+                }
+            },
+            [&] {
+                clock_ctx.set(ConsumeTime(fdp));
+            });
+    }
+}
diff --git a/depend/bitcoin/src/test/fuzz/process_message.cpp b/depend/bitcoin/src/test/fuzz/process_message.cpp
index 5f54857e..e4f0a36d 100644
--- a/depend/bitcoin/src/test/fuzz/process_message.cpp
+++ b/depend/bitcoin/src/test/fuzz/process_message.cpp
@@ -2,53 +2,50 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <addrman.h>
 #include <banman.h>
-#include <consensus/consensus.h>
+#include <kernel/chainparams.h>
 #include <net.h>
 #include <net_processing.h>
-#include <node/warnings.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <protocol.h>
-#include <script/script.h>
 #include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
-#include <test/util/mining.h>
 #include <test/util/net.h>
+#include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
 #include <test/util/validation.h>
+#include <uint256.h>
 #include <util/check.h>
 #include <util/time.h>
+#include <validation.h>
 #include <validationinterface.h>
 
+#include <algorithm>
+#include <array>
 #include <cstdlib>
+#include <functional>
 #include <iostream>
 #include <memory>
+#include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 namespace {
 TestingSetup* g_setup;
 std::string_view LIMIT_TO_MESSAGE_TYPE{};
 
-void ResetChainman(TestingSetup& setup)
-{
-    SetMockTime(setup.m_node.chainman->GetParams().GenesisBlock().Time());
-    setup.m_node.chainman.reset();
-    setup.m_make_chainman();
-    setup.LoadVerifyActivateChainstate();
-    for (int i = 0; i < 2 * COINBASE_MATURITY; i++) {
-        node::BlockAssembler::Options options;
-        options.include_dummy_extranonce = true;
-        MineBlock(setup.m_node, options);
-    }
-}
 } // namespace
 
+extern void MakeRandDeterministicDANGEROUS(const uint256& seed) noexcept;
+
 void initialize_process_message()
 {
     if (const auto val{std::getenv("LIMIT_TO_MESSAGE_TYPE")}) {
@@ -62,7 +59,7 @@ void initialize_process_message()
             {}),
     };
     g_setup = testing_setup.get();
-    ResetChainman(*g_setup);
+    ResetChainmanAndMempool(*g_setup);
 }
 
 FUZZ_TARGET(process_message, .init = initialize_process_message)
@@ -75,7 +72,9 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
     connman.Reset();
     auto& chainman{static_cast<TestChainstateManager&>(*node.chainman)};
     const auto block_index_size{WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())};
-    NodeClockContext clock_ctx{1610000000s}; // any time to successfully reset ibd
+    const auto initial_sequence{WITH_LOCK(node.mempool->cs, return node.mempool->GetSequence())};
+    GetFakeNodeClock().set(1610000000s); // 2021-01-07, arbitrary
+    FakeSteadyClock steady_clock;
     chainman.ResetIbd();
     chainman.DisableNextWrite();
 
@@ -103,12 +102,12 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
 
     node.validation_signals->RegisterValidationInterface(node.peerman.get());
 
-    CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
+    CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock).release();
 
     connman.AddTestNode(p2p_node);
     FillNode(fuzzed_data_provider, connman, p2p_node);
 
-    clock_ctx.set(ConsumeTime(fuzzed_data_provider));
+    GetFakeNodeClock().set(ConsumeTime(fuzzed_data_provider));
 
     CSerializedNetMsg net_msg;
     net_msg.m_type = random_message_type;
@@ -117,6 +116,10 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
     connman.FlushSendBuffer(p2p_node);
     (void)connman.ReceiveMsgFrom(p2p_node, std::move(net_msg));
 
+    if (fuzzed_data_provider.ConsumeBool()) {
+        chainman.JumpOutOfIbd();
+    }
+
     bool more_work{true};
     while (more_work) {
         p2p_node.fPauseSend = false;
@@ -129,8 +132,10 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
     node.validation_signals->SyncWithValidationInterfaceQueue();
     node.validation_signals->UnregisterValidationInterface(node.peerman.get());
     node.connman->StopNodes();
-    if (block_index_size != WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())) {
-        // Reuse the global chainman, but reset it when it is dirty
-        ResetChainman(*g_setup);
+    const auto end_sequence{WITH_LOCK(node.mempool->cs, return node.mempool->GetSequence())};
+    if (block_index_size != WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size()) || initial_sequence != end_sequence) {
+        // Reuse the global chainman and mempool, but reset them when dirty.
+        MakeRandDeterministicDANGEROUS(uint256::ZERO);
+        ResetChainmanAndMempool(*g_setup);
     }
 }
diff --git a/depend/bitcoin/src/test/fuzz/process_messages.cpp b/depend/bitcoin/src/test/fuzz/process_messages.cpp
index 9f33b0df..983d2a5e 100644
--- a/depend/bitcoin/src/test/fuzz/process_messages.cpp
+++ b/depend/bitcoin/src/test/fuzz/process_messages.cpp
@@ -2,27 +2,34 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <addrman.h>
 #include <banman.h>
-#include <consensus/consensus.h>
+#include <kernel/chainparams.h>
 #include <net.h>
 #include <net_processing.h>
-#include <node/warnings.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <protocol.h>
-#include <script/script.h>
 #include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
-#include <test/util/mining.h>
 #include <test/util/net.h>
+#include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
 #include <test/util/validation.h>
+#include <uint256.h>
+#include <util/check.h>
 #include <util/time.h>
+#include <validation.h>
 #include <validationinterface.h>
 
+#include <functional>
 #include <ios>
+#include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -30,20 +37,10 @@
 namespace {
 TestingSetup* g_setup;
 
-void ResetChainman(TestingSetup& setup)
-{
-    SetMockTime(setup.m_node.chainman->GetParams().GenesisBlock().Time());
-    setup.m_node.chainman.reset();
-    setup.m_make_chainman();
-    setup.LoadVerifyActivateChainstate();
-    node::BlockAssembler::Options options;
-    options.include_dummy_extranonce = true;
-    for (int i = 0; i < 2 * COINBASE_MATURITY; i++) {
-        MineBlock(setup.m_node, options);
-    }
-}
 } // namespace
 
+extern void MakeRandDeterministicDANGEROUS(const uint256& seed) noexcept;
+
 void initialize_process_messages()
 {
     static const auto testing_setup{
@@ -52,7 +49,7 @@ void initialize_process_messages()
             {}),
     };
     g_setup = testing_setup.get();
-    ResetChainman(*g_setup);
+    ResetChainmanAndMempool(*g_setup);
 }
 
 FUZZ_TARGET(process_messages, .init = initialize_process_messages)
@@ -65,7 +62,9 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
     connman.Reset();
     auto& chainman{static_cast<TestChainstateManager&>(*node.chainman)};
     const auto block_index_size{WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())};
-    NodeClockContext clock_ctx{1610000000s}; // any time to successfully reset ibd
+    const auto initial_sequence{WITH_LOCK(node.mempool->cs, return node.mempool->GetSequence())};
+    GetFakeNodeClock().set(1610000000s); // 2021-01-07, arbitrary
+    FakeSteadyClock steady_clock;
     chainman.ResetIbd();
     chainman.DisableNextWrite();
 
@@ -91,7 +90,7 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
     std::vector<CNode*> peers;
     const auto num_peers_to_add = fuzzed_data_provider.ConsumeIntegralInRange(1, 3);
     for (int i = 0; i < num_peers_to_add; ++i) {
-        peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release());
+        peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock, i).release());
         CNode& p2p_node = *peers.back();
 
         FillNode(fuzzed_data_provider, connman, p2p_node);
@@ -99,11 +98,16 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
         connman.AddTestNode(p2p_node);
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30)
-    {
+    // Toggle IBD from within the loop, so that some messages may be processed
+    // under IBD and the rest after leaving it. JumpOutOfIbd() latches, so guard
+    // it to call at most once.
+    bool jump_out_of_ibd{false};
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30) {
+        if (!jump_out_of_ibd) jump_out_of_ibd = fuzzed_data_provider.ConsumeBool();
+        if (jump_out_of_ibd && chainman.IsInitialBlockDownload()) chainman.JumpOutOfIbd();
         const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::MESSAGE_TYPE_SIZE).c_str()};
 
-        clock_ctx.set(ConsumeTime(fuzzed_data_provider));
+        GetFakeNodeClock().set(ConsumeTime(fuzzed_data_provider));
 
         CSerializedNetMsg net_msg;
         net_msg.m_type = random_message_type;
@@ -128,8 +132,10 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
     node.validation_signals->SyncWithValidationInterfaceQueue();
     node.validation_signals->UnregisterValidationInterface(node.peerman.get());
     node.connman->StopNodes();
-    if (block_index_size != WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())) {
-        // Reuse the global chainman, but reset it when it is dirty
-        ResetChainman(*g_setup);
+    const auto end_sequence{WITH_LOCK(node.mempool->cs, return node.mempool->GetSequence())};
+    if (block_index_size != WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size()) || initial_sequence != end_sequence) {
+        // Reuse the global chainman and mempool, but reset them when dirty.
+        MakeRandDeterministicDANGEROUS(uint256::ZERO);
+        ResetChainmanAndMempool(*g_setup);
     }
 }
diff --git a/depend/bitcoin/src/test/fuzz/psbt.cpp b/depend/bitcoin/src/test/fuzz/psbt.cpp
index e0f2177a..d3cb4954 100644
--- a/depend/bitcoin/src/test/fuzz/psbt.cpp
+++ b/depend/bitcoin/src/test/fuzz/psbt.cpp
@@ -25,19 +25,23 @@ FUZZ_TARGET(psbt)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    PartiallySignedTransaction psbt_mut;
-    std::string error;
     auto str = fuzzed_data_provider.ConsumeRandomLengthString();
-    if (!DecodeRawPSBT(psbt_mut, MakeByteSpan(str), error)) {
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeRawPSBT(MakeByteSpan(str));
+    if (!psbt_res) {
         return;
     }
+    PartiallySignedTransaction psbt_mut = *psbt_res;
     const PartiallySignedTransaction psbt = psbt_mut;
 
+    // We are on purpose not forward compatible, and version 1 is disabled.
+    const auto psbt_version{psbt.GetVersion()};
+    Assert(psbt_version == 0 || psbt_version == 2);
+
     // A PSBT must roundtrip.
-    PartiallySignedTransaction psbt_roundtrip;
     std::vector<uint8_t> psbt_ser;
     VectorWriter{psbt_ser, 0, psbt};
-    SpanReader{psbt_ser} >> psbt_roundtrip;
+    SpanReader reader{psbt_ser};
+    PartiallySignedTransaction psbt_roundtrip(deserialize, reader);
 
     // And be stable across roundtrips.
     std::vector<uint8_t> roundtrip_ser;
@@ -51,29 +55,71 @@ FUZZ_TARGET(psbt)
     }
 
     (void)psbt.IsNull();
-
-    std::optional<CMutableTransaction> tx = psbt.tx;
-    if (tx) {
-        const CMutableTransaction& mtx = *tx;
-        const PartiallySignedTransaction psbt_from_tx{mtx};
-    }
+    (void)psbt.GetUnsignedTx();
 
     for (const PSBTInput& input : psbt.inputs) {
         (void)PSBTInputSigned(input);
         (void)input.IsNull();
+        PSBTInput input_mod = input;
+        CTxOut tx_out;
+        if (input.GetUTXO(tx_out)) {
+            (void)tx_out.IsNull();
+            (void)tx_out.ToString();
+        }
+        // A PSBT input must roundtrip to signature data.
+        PSBTInput input_fill{psbt_version, input_mod.prev_txid, input_mod.prev_out, input_mod.sequence};
+        SignatureData sig_data;
+        input_mod.FillSignatureData(sig_data);
+        input_fill.FromSignatureData(sig_data);
+
+        // Only final_script_sig and final_script_witness are filled when sigdata is complete
+        if (sig_data.complete) {
+            Assert(input_mod.final_script_sig == input_fill.final_script_sig);
+            Assert(input_mod.final_script_witness == input_fill.final_script_witness);
+        } else {
+            // UTXOs don't go into SignatureData
+            input_mod.non_witness_utxo.reset();
+            input_mod.witness_utxo.SetNull();
+            // Sighash type doesn't go into SignatureData
+            input_mod.sighash_type.reset();
+            // Timelocks don't go into SignatureData
+            input_mod.time_locktime.reset();
+            input_mod.height_locktime.reset();
+            // Proprietary fields are not included in SignatureData
+            input_mod.m_proprietary.clear();
+            // Unknown fields are not included in SignatureData
+            input_mod.unknown.clear();
+
+            Assert(input_mod == input_fill);
+        }
     }
     (void)CountPSBTUnsignedInputs(psbt);
 
     for (const PSBTOutput& output : psbt.outputs) {
         (void)output.IsNull();
-    }
+        PSBTOutput output_mod = output;
+        // A PSBT output must roundtrip to signature data.
+        PSBTOutput output_fill{psbt_version, output_mod.amount, output_mod.script};
+        SignatureData sig_data;
+        output_mod.FillSignatureData(sig_data);
+        output_fill.FromSignatureData(sig_data);
 
-    for (size_t i = 0; i < psbt.tx->vin.size(); ++i) {
-        CTxOut tx_out;
-        if (psbt.GetInputUTXO(tx_out, i)) {
-            (void)tx_out.IsNull();
-            (void)tx_out.ToString();
+        // FillSignatureData will not fill tap tree or internal key if the tree is empty or
+        // the key is not fully valid. These need to be cleared before checking for equivalence
+        if (output_mod.m_tap_tree.empty() || !output_mod.m_tap_internal_key.IsFullyValid()) {
+            output_mod.m_tap_tree.clear();
+            std::fill(output_mod.m_tap_internal_key.begin(), output_mod.m_tap_internal_key.end(), 0);
         }
+        // Sort m_tap_tree to ensure the vectors match
+        std::sort(output_mod.m_tap_tree.begin(), output_mod.m_tap_tree.end());
+        std::sort(output_fill.m_tap_tree.begin(), output_fill.m_tap_tree.end());
+        // Proprietary fields are not included in SignatureData
+        output_mod.m_proprietary.clear();
+        // Unknown fields are not included in SignatureData
+        output_mod.unknown.clear();
+
+        Assert(output_mod.m_tap_internal_key == output_fill.m_tap_internal_key);
+        Assert(output_mod == output_fill);
     }
 
     psbt_mut = psbt;
@@ -85,21 +131,26 @@ FUZZ_TARGET(psbt)
         const PartiallySignedTransaction psbt_from_tx{result};
     }
 
-    PartiallySignedTransaction psbt_merge;
+    PartiallySignedTransaction psbt_merge = psbt;
     str = fuzzed_data_provider.ConsumeRandomLengthString();
-    if (!DecodeRawPSBT(psbt_merge, MakeByteSpan(str), error)) {
-        psbt_merge = psbt;
+    util::Result<PartiallySignedTransaction> psbt_merge_res = DecodeRawPSBT(MakeByteSpan(str));
+    if (psbt_merge_res) {
+        psbt_merge = *psbt_merge_res;
     }
     psbt_mut = psbt;
     (void)psbt_mut.Merge(psbt_merge);
     psbt_mut = psbt;
-    (void)CombinePSBTs(psbt_mut, {psbt_mut, psbt_merge});
-    psbt_mut = psbt;
-    for (unsigned int i = 0; i < psbt_merge.tx->vin.size(); ++i) {
-        (void)psbt_mut.AddInput(psbt_merge.tx->vin[i], psbt_merge.inputs[i]);
+    std::optional<PartiallySignedTransaction> comb_res = CombinePSBTs({psbt_mut, psbt_merge});
+    if (comb_res) {
+        psbt_mut = *comb_res;
     }
-    for (unsigned int i = 0; i < psbt_merge.tx->vout.size(); ++i) {
-        Assert(psbt_mut.AddOutput(psbt_merge.tx->vout[i], psbt_merge.outputs[i]));
+    for (const auto& psbt_in : psbt_merge.inputs) {
+        (void)psbt_mut.AddInput(psbt_in);
+    }
+    for (const auto& psbt_out : psbt_merge.outputs) {
+        (void)psbt_mut.AddOutput(psbt_out);
     }
     psbt_mut.unknown.insert(psbt_merge.unknown.begin(), psbt_merge.unknown.end());
+
+    RemoveUnnecessaryTransactions(psbt_mut);
 }
diff --git a/depend/bitcoin/src/test/fuzz/rbf.cpp b/depend/bitcoin/src/test/fuzz/rbf.cpp
index 3644881d..107a70a8 100644
--- a/depend/bitcoin/src/test/fuzz/rbf.cpp
+++ b/depend/bitcoin/src/test/fuzz/rbf.cpp
@@ -54,7 +54,7 @@ FUZZ_TARGET(rbf, .init = initialize_rbf)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     std::optional<CMutableTransaction> mtx = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider, TX_WITH_WITNESS);
     if (!mtx) {
         return;
@@ -64,8 +64,7 @@ FUZZ_TARGET(rbf, .init = initialize_rbf)
     CTxMemPool pool{MemPoolOptionsForTest(g_setup->m_node), error};
     Assert(error.empty());
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), NUM_ITERS)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), NUM_ITERS) {
         const std::optional<CMutableTransaction> another_mtx = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider, TX_WITH_WITNESS);
         if (!another_mtx) {
             break;
@@ -96,7 +95,7 @@ FUZZ_TARGET(package_rbf, .init = initialize_package_rbf)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     // "Real" virtual size is not important for this test since ConsumeTxMemPoolEntry generates its own virtual size values
     // so we construct small transactions for performance reasons. Child simply needs an input for later to perhaps connect to parent.
@@ -211,12 +210,12 @@ FUZZ_TARGET(package_rbf, .init = initialize_package_rbf)
         FeeFrac first_sum;
         for (size_t i = 0; i < calc_results->first.size(); ++i) {
             first_sum += calc_results->first[i];
-            if (i) assert(!(calc_results->first[i - 1] << calc_results->first[i]));
+            if (i) assert(ByRatio{calc_results->first[i - 1]} >= ByRatio{calc_results->first[i]});
         }
         FeeFrac second_sum;
         for (size_t i = 0; i < calc_results->second.size(); ++i) {
             second_sum += calc_results->second[i];
-            if (i) assert(!(calc_results->second[i - 1] << calc_results->second[i]));
+            if (i) assert(ByRatio{calc_results->second[i - 1]} >= ByRatio{calc_results->second[i]});
         }
 
         FeeFrac replaced;
diff --git a/depend/bitcoin/src/test/fuzz/rolling_bloom_filter.cpp b/depend/bitcoin/src/test/fuzz/rolling_bloom_filter.cpp
index 977b1c4b..73c06e3e 100644
--- a/depend/bitcoin/src/test/fuzz/rolling_bloom_filter.cpp
+++ b/depend/bitcoin/src/test/fuzz/rolling_bloom_filter.cpp
@@ -23,8 +23,7 @@ FUZZ_TARGET(rolling_bloom_filter)
     CRollingBloomFilter rolling_bloom_filter{
         fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(1, 1000),
         0.999 / fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(1, std::numeric_limits<unsigned int>::max())};
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 3000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 3000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/rpc.cpp b/depend/bitcoin/src/test/fuzz/rpc.cpp
index f0362db2..aa41013d 100644
--- a/depend/bitcoin/src/test/fuzz/rpc.cpp
+++ b/depend/bitcoin/src/test/fuzz/rpc.cpp
@@ -8,7 +8,6 @@
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <psbt.h>
-#include <rpc/client.h>
 #include <rpc/request.h>
 #include <rpc/server.h>
 #include <span.h>
@@ -34,11 +33,10 @@
 #include <memory>
 #include <optional>
 #include <stdexcept>
+#include <utility>
 #include <vector>
-enum class ChainType;
 
-using util::Join;
-using util::ToString;
+enum class ChainType;
 
 namespace {
 struct RPCFuzzTestingSetup : public TestingSetup {
@@ -46,16 +44,12 @@ struct RPCFuzzTestingSetup : public TestingSetup {
     {
     }
 
-    void CallRPC(const std::string& rpc_method, const std::vector<std::string>& arguments)
+    void CallRPC(const std::string& rpc_method, UniValue&& params)
     {
         JSONRPCRequest request;
         request.context = &m_node;
         request.strMethod = rpc_method;
-        try {
-            request.params = RPCConvertValues(rpc_method, arguments);
-        } catch (const std::runtime_error&) {
-            return;
-        }
+        request.params = std::move(params);
         tableRPC.execute(request);
     }
 
@@ -147,6 +141,7 @@ const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
     "getnetworkhashps",
     "getnetworkinfo",
     "getnodeaddresses",
+    "getopenrpcinfo",
     "getorphantxs",
     "getpeerinfo",
     "getprioritisedtransactions",
@@ -169,6 +164,7 @@ const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
     "prioritisetransaction",
     "pruneblockchain",
     "reconsiderblock",
+    "rpc.discover",
     "scanblocks",
     "scantxoutset",
     "sendmsgtopeer", // when no peers are connected, no p2p message is sent
@@ -193,68 +189,74 @@ const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
     "waitfornewblock",
 };
 
-std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, bool& good_data)
+UniValue ConsumeBasicRPCArgument(FuzzedDataProvider& fuzzed_data_provider, bool& good_data)
 {
     const size_t max_string_length = 4096;
     const size_t max_base58_bytes_length{64};
-    std::string r;
+    UniValue r{};
     CallOneOf(
         fuzzed_data_provider,
+        [&] {
+            // arbitrary JSON argument
+            if (!r.read(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length))) {
+                good_data = false;
+            }
+        },
+        [&] {
+            // null argument
+            r = UniValue{UniValue::VNULL};
+        },
         [&] {
             // string argument
-            r = fuzzed_data_provider.ConsumeRandomLengthString(max_string_length);
+            r = UniValue{fuzzed_data_provider.ConsumeRandomLengthString(max_string_length)};
         },
         [&] {
             // base64 argument
-            r = EncodeBase64(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length));
+            r = UniValue{EncodeBase64(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length))};
         },
         [&] {
             // hex argument
-            r = HexStr(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length));
+            r = UniValue{HexStr(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length))};
         },
         [&] {
             // bool argument
-            r = fuzzed_data_provider.ConsumeBool() ? "true" : "false";
-        },
-        [&] {
-            // range argument
-            r = "[" + ToString(fuzzed_data_provider.ConsumeIntegral<int64_t>()) + "," + ToString(fuzzed_data_provider.ConsumeIntegral<int64_t>()) + "]";
+            r = UniValue{fuzzed_data_provider.ConsumeBool()};
         },
         [&] {
             // integral argument (int64_t)
-            r = ToString(fuzzed_data_provider.ConsumeIntegral<int64_t>());
+            r = UniValue{fuzzed_data_provider.ConsumeIntegral<int64_t>()};
         },
         [&] {
             // integral argument (uint64_t)
-            r = ToString(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
+            r = UniValue{fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
         },
         [&] {
             // floating point argument
-            r = strprintf("%f", fuzzed_data_provider.ConsumeFloatingPoint<double>());
+            r = UniValue{fuzzed_data_provider.ConsumeFloatingPoint<double>()};
         },
         [&] {
             // tx destination argument
-            r = EncodeDestination(ConsumeTxDestination(fuzzed_data_provider));
+            r = UniValue{EncodeDestination(ConsumeTxDestination(fuzzed_data_provider))};
         },
         [&] {
             // uint160 argument
-            r = ConsumeUInt160(fuzzed_data_provider).ToString();
+            r = UniValue{ConsumeUInt160(fuzzed_data_provider).ToString()};
         },
         [&] {
             // uint256 argument
-            r = ConsumeUInt256(fuzzed_data_provider).ToString();
+            r = UniValue{ConsumeUInt256(fuzzed_data_provider).ToString()};
         },
         [&] {
             // base32 argument
-            r = EncodeBase32(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length));
+            r = UniValue{EncodeBase32(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length))};
         },
         [&] {
             // base58 argument
-            r = EncodeBase58(MakeUCharSpan(fuzzed_data_provider.ConsumeRandomLengthString(max_base58_bytes_length)));
+            r = UniValue{EncodeBase58(MakeUCharSpan(fuzzed_data_provider.ConsumeRandomLengthString(max_base58_bytes_length)))};
         },
         [&] {
             // base58 argument with checksum
-            r = EncodeBase58Check(MakeUCharSpan(fuzzed_data_provider.ConsumeRandomLengthString(max_base58_bytes_length)));
+            r = UniValue{EncodeBase58Check(MakeUCharSpan(fuzzed_data_provider.ConsumeRandomLengthString(max_base58_bytes_length)))};
         },
         [&] {
             // hex encoded block
@@ -265,7 +267,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
             }
             DataStream data_stream{};
             data_stream << TX_WITH_WITNESS(*opt_block);
-            r = HexStr(data_stream);
+            r = UniValue{HexStr(data_stream)};
         },
         [&] {
             // hex encoded block header
@@ -276,7 +278,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
             }
             DataStream data_stream{};
             data_stream << *opt_block_header;
-            r = HexStr(data_stream);
+            r = UniValue{HexStr(data_stream)};
         },
         [&] {
             // hex encoded tx
@@ -288,18 +290,18 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
             DataStream data_stream;
             auto allow_witness = (fuzzed_data_provider.ConsumeBool() ? TX_WITH_WITNESS : TX_NO_WITNESS);
             data_stream << allow_witness(*opt_tx);
-            r = HexStr(data_stream);
+            r = UniValue{HexStr(data_stream)};
         },
         [&] {
             // base64 encoded psbt
-            std::optional<PartiallySignedTransaction> opt_psbt = ConsumeDeserializable<PartiallySignedTransaction>(fuzzed_data_provider);
+            std::optional<PartiallySignedTransaction> opt_psbt = ConsumeDeserializableConstructor<PartiallySignedTransaction>(fuzzed_data_provider);
             if (!opt_psbt) {
                 good_data = false;
                 return;
             }
             DataStream data_stream{};
             data_stream << *opt_psbt;
-            r = EncodeBase64(data_stream);
+            r = UniValue{EncodeBase64(data_stream)};
         },
         [&] {
             // base58 encoded key
@@ -308,7 +310,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
                 good_data = false;
                 return;
             }
-            r = EncodeSecret(key);
+            r = UniValue{EncodeSecret(key)};
         },
         [&] {
             // hex encoded pubkey
@@ -317,25 +319,40 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
                 good_data = false;
                 return;
             }
-            r = HexStr(key.GetPubKey());
+            r = UniValue{HexStr(key.GetPubKey())};
         });
     return r;
 }
 
-std::string ConsumeArrayRPCArgument(FuzzedDataProvider& fuzzed_data_provider, bool& good_data)
-{
-    std::vector<std::string> scalar_arguments;
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
-    {
-        scalar_arguments.push_back(ConsumeScalarRPCArgument(fuzzed_data_provider, good_data));
-    }
-    return "[\"" + Join(scalar_arguments, "\",\"") + "\"]";
-}
+constexpr int MAX_RPC_ARGUMENT_NESTING{9};
 
-std::string ConsumeRPCArgument(FuzzedDataProvider& fuzzed_data_provider, bool& good_data)
+// NOLINTBEGIN(misc-no-recursion)
+UniValue ConsumeRPCArgument(FuzzedDataProvider& fuzzed_data_provider, bool& good_data, int nesting_depth)
 {
-    return fuzzed_data_provider.ConsumeBool() ? ConsumeScalarRPCArgument(fuzzed_data_provider, good_data) : ConsumeArrayRPCArgument(fuzzed_data_provider, good_data);
+    if (nesting_depth == 0) {
+        return ConsumeBasicRPCArgument(fuzzed_data_provider, good_data);
+    }
+    UniValue argument{};
+    std::vector<std::function<void()>> mks{
+        [&] { argument = ConsumeBasicRPCArgument(fuzzed_data_provider, good_data); },
+        [&] {
+            argument = UniValue(UniValue::VARR);
+            LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
+                argument.push_back(ConsumeRPCArgument(fuzzed_data_provider, good_data, nesting_depth - 1));
+            }
+        },
+        [&] {
+            argument = UniValue(UniValue::VOBJ);
+            LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
+                argument.pushKV(fuzzed_data_provider.ConsumeRandomLengthString(128),
+                                ConsumeRPCArgument(fuzzed_data_provider, good_data, nesting_depth - 1));
+            }
+        },
+    };
+    PickValue(fuzzed_data_provider, mks)();
+    return argument;
 }
+// NOLINTEND(misc-no-recursion)
 
 RPCFuzzTestingSetup* InitializeRPCFuzzTestingSetup()
 {
@@ -372,7 +389,7 @@ FUZZ_TARGET(rpc, .init = initialize_rpc)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     bool good_data{true};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     const std::string rpc_command = fuzzed_data_provider.ConsumeRandomLengthString(64);
     if (!g_limit_to_rpc_command.empty() && rpc_command != g_limit_to_rpc_command) {
         return;
@@ -381,10 +398,9 @@ FUZZ_TARGET(rpc, .init = initialize_rpc)
     if (!safe_for_fuzzing) {
         return;
     }
-    std::vector<std::string> arguments;
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
-    {
-        arguments.push_back(ConsumeRPCArgument(fuzzed_data_provider, good_data));
+    UniValue arguments(UniValue::VARR);
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
+        arguments.push_back(ConsumeRPCArgument(fuzzed_data_provider, good_data, MAX_RPC_ARGUMENT_NESTING));
     }
     try {
         std::optional<test_only_CheckFailuresAreExceptionsNotAborts> maybe_mock{};
@@ -393,7 +409,7 @@ FUZZ_TARGET(rpc, .init = initialize_rpc)
             // intentional trigger_internal_bug
             maybe_mock.emplace();
         }
-        rpc_testing_setup->CallRPC(rpc_command, arguments);
+        rpc_testing_setup->CallRPC(rpc_command, std::move(arguments));
     } catch (const UniValue& json_rpc_error) {
         const std::string error_msg{json_rpc_error.find_value("message").get_str()};
         if (error_msg.starts_with("Internal bug detected")) {
diff --git a/depend/bitcoin/src/test/fuzz/script_descriptor_cache.cpp b/depend/bitcoin/src/test/fuzz/script_descriptor_cache.cpp
index 329a04ea..91a98b6f 100644
--- a/depend/bitcoin/src/test/fuzz/script_descriptor_cache.cpp
+++ b/depend/bitcoin/src/test/fuzz/script_descriptor_cache.cpp
@@ -17,7 +17,7 @@ FUZZ_TARGET(script_descriptor_cache)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     DescriptorCache descriptor_cache;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::vector<uint8_t> code = fuzzed_data_provider.ConsumeBytes<uint8_t>(BIP32_EXTKEY_SIZE);
         if (code.size() == BIP32_EXTKEY_SIZE) {
             CExtPubKey xpub;
diff --git a/depend/bitcoin/src/test/fuzz/script_ops.cpp b/depend/bitcoin/src/test/fuzz/script_ops.cpp
index 5c5f60f2..99d62133 100644
--- a/depend/bitcoin/src/test/fuzz/script_ops.cpp
+++ b/depend/bitcoin/src/test/fuzz/script_ops.cpp
@@ -15,7 +15,7 @@ FUZZ_TARGET(script_ops)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     CScript script_mut = ConsumeScript(fuzzed_data_provider);
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/script_sign.cpp b/depend/bitcoin/src/test/fuzz/script_sign.cpp
index 036b9ff3..be7c2d28 100644
--- a/depend/bitcoin/src/test/fuzz/script_sign.cpp
+++ b/depend/bitcoin/src/test/fuzz/script_sign.cpp
@@ -49,7 +49,7 @@ FUZZ_TARGET(script_sign, .init = initialize_script_sign)
 
     {
         std::map<CPubKey, KeyOriginInfo> hd_keypaths;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
             const std::optional<CPubKey> pub_key = ConsumeDeserializable<CPubKey>(fuzzed_data_provider);
             if (!pub_key) {
                 break;
@@ -67,7 +67,7 @@ FUZZ_TARGET(script_sign, .init = initialize_script_sign)
         }
         std::map<CPubKey, KeyOriginInfo> deserialized_hd_keypaths;
         try {
-            DeserializeHDKeypaths(serialized, key, hd_keypaths);
+            DeserializeHDKeypaths(serialized, key, deserialized_hd_keypaths);
         } catch (const std::ios_base::failure&) {
         }
         assert(hd_keypaths.size() >= deserialized_hd_keypaths.size());
diff --git a/depend/bitcoin/src/test/fuzz/scriptnum_ops.cpp b/depend/bitcoin/src/test/fuzz/scriptnum_ops.cpp
index eab774db..35836fe9 100644
--- a/depend/bitcoin/src/test/fuzz/scriptnum_ops.cpp
+++ b/depend/bitcoin/src/test/fuzz/scriptnum_ops.cpp
@@ -28,7 +28,7 @@ FUZZ_TARGET(scriptnum_ops)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     CScriptNum script_num = ConsumeScriptNum(fuzzed_data_provider);
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/socks5.cpp b/depend/bitcoin/src/test/fuzz/socks5.cpp
index 12db69a2..982e5084 100644
--- a/depend/bitcoin/src/test/fuzz/socks5.cpp
+++ b/depend/bitcoin/src/test/fuzz/socks5.cpp
@@ -30,8 +30,10 @@ void initialize_socks5()
 
 FUZZ_TARGET(socks5, .init = initialize_socks5)
 {
+    g_socks5_interrupt.reset();
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
+    FakeSteadyClock steady_clock;
     ProxyCredentials proxy_credentials;
     proxy_credentials.username = fuzzed_data_provider.ConsumeRandomLengthString(512);
     proxy_credentials.password = fuzzed_data_provider.ConsumeRandomLengthString(512);
@@ -41,7 +43,7 @@ FUZZ_TARGET(socks5, .init = initialize_socks5)
     // Set FUZZED_SOCKET_FAKE_LATENCY=1 to exercise recv timeout code paths. This
     // will slow down fuzzing.
     g_socks5_recv_timeout = (fuzzed_data_provider.ConsumeBool() && std::getenv("FUZZED_SOCKET_FAKE_LATENCY") != nullptr) ? 1ms : default_socks5_recv_timeout;
-    FuzzedSock fuzzed_sock = ConsumeSock(fuzzed_data_provider);
+    FuzzedSock fuzzed_sock = ConsumeSock(fuzzed_data_provider, steady_clock);
     // This Socks5(...) fuzzing harness would have caught CVE-2017-18350 within
     // a few seconds of fuzzing.
     auto str_dest = fuzzed_data_provider.ConsumeRandomLengthString(512);
diff --git a/depend/bitcoin/src/test/fuzz/string.cpp b/depend/bitcoin/src/test/fuzz/string.cpp
index a7f8516f..02292774 100644
--- a/depend/bitcoin/src/test/fuzz/string.cpp
+++ b/depend/bitcoin/src/test/fuzz/string.cpp
@@ -67,7 +67,8 @@ FUZZ_TARGET(string)
     (void)HelpExampleCli(random_string_1, random_string_2);
     (void)HelpExampleRpc(random_string_1, random_string_2);
     (void)HelpMessageGroup(random_string_1);
-    (void)HelpMessageOpt(random_string_1, random_string_2);
+    (void)HelpMessageOpt(random_string_1, "", random_string_2);
+    (void)HelpMessageOpt(random_string_1, random_string_2, "");
     (void)IsDeprecatedRPCEnabled(random_string_1);
     (void)Join(random_string_vector, random_string_1);
     (void)JSONRPCError(fuzzed_data_provider.ConsumeIntegral<int>(), random_string_1);
diff --git a/depend/bitcoin/src/test/fuzz/system.cpp b/depend/bitcoin/src/test/fuzz/system.cpp
index 12c70c7a..03eed3ca 100644
--- a/depend/bitcoin/src/test/fuzz/system.cpp
+++ b/depend/bitcoin/src/test/fuzz/system.cpp
@@ -9,6 +9,7 @@
 #include <test/util/setup_common.h>
 
 #include <cstdint>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -31,13 +32,13 @@ FUZZ_TARGET(system, .init = initialize_system)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     ArgsManager args_manager{};
+    std::vector<std::string> command_option_names;
 
     if (fuzzed_data_provider.ConsumeBool()) {
         SetupHelpOptions(args_manager);
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 3000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 3000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -59,7 +60,7 @@ FUZZ_TARGET(system, .init = initialize_system)
                 args_manager.SoftSetBoolArg(str_arg, f_value);
             },
             [&] {
-                const OptionsCategory options_category = fuzzed_data_provider.PickValueInArray<OptionsCategory>({OptionsCategory::OPTIONS, OptionsCategory::CONNECTION, OptionsCategory::WALLET, OptionsCategory::WALLET_DEBUG_TEST, OptionsCategory::ZMQ, OptionsCategory::DEBUG_TEST, OptionsCategory::CHAINPARAMS, OptionsCategory::NODE_RELAY, OptionsCategory::BLOCK_CREATION, OptionsCategory::RPC, OptionsCategory::GUI, OptionsCategory::COMMANDS, OptionsCategory::REGISTER_COMMANDS, OptionsCategory::CLI_COMMANDS, OptionsCategory::IPC, OptionsCategory::HIDDEN});
+                const OptionsCategory options_category = fuzzed_data_provider.PickValueInArray<OptionsCategory>({OptionsCategory::OPTIONS, OptionsCategory::CONNECTION, OptionsCategory::WALLET, OptionsCategory::WALLET_DEBUG_TEST, OptionsCategory::ZMQ, OptionsCategory::DEBUG_TEST, OptionsCategory::CHAINPARAMS, OptionsCategory::NODE_RELAY, OptionsCategory::BLOCK_CREATION, OptionsCategory::RPC, OptionsCategory::GUI, OptionsCategory::COMMANDS, OptionsCategory::REGISTER_COMMANDS, OptionsCategory::CLI_COMMANDS, OptionsCategory::IPC, OptionsCategory::COMMAND_OPTIONS, OptionsCategory::HIDDEN});
                 // Avoid hitting:
                 // common/args.cpp:563: void ArgsManager::AddArg(const std::string &, const std::string &, unsigned int, const OptionsCategory &): Assertion `ret.second' failed.
                 const std::string argument_name = GetArgumentName(fuzzed_data_provider.ConsumeRandomLengthString(16));
@@ -69,6 +70,22 @@ FUZZ_TARGET(system, .init = initialize_system)
                 auto help = fuzzed_data_provider.ConsumeRandomLengthString(16);
                 auto flags = fuzzed_data_provider.ConsumeIntegral<unsigned int>() & ~ArgsManager::COMMAND;
                 args_manager.AddArg(argument_name, help, flags, options_category);
+                if (options_category == OptionsCategory::COMMAND_OPTIONS) {
+                    command_option_names.push_back(argument_name);
+                }
+            },
+            [&] {
+                auto cmd = fuzzed_data_provider.ConsumeRandomLengthString(16);
+                if (cmd.empty() || cmd[0] == '-' || cmd.find('=') != std::string::npos) return;
+                if (args_manager.GetArgFlags(cmd) != std::nullopt) return;
+                auto help = fuzzed_data_provider.ConsumeRandomLengthString(16);
+                std::set<std::string> options;
+                for (const auto& opt : command_option_names) {
+                    if (fuzzed_data_provider.ConsumeBool()) {
+                        options.insert(opt);
+                    }
+                }
+                args_manager.AddCommand(cmd, help, std::move(options));
             },
             [&] {
                 // Avoid hitting:
@@ -89,6 +106,7 @@ FUZZ_TARGET(system, .init = initialize_system)
             },
             [&] {
                 args_manager.ClearArgs();
+                command_option_names.clear();
             },
             [&] {
                 const std::vector<std::string> random_arguments = ConsumeRandomLengthStringVector(fuzzed_data_provider);
@@ -120,6 +138,10 @@ FUZZ_TARGET(system, .init = initialize_system)
     } catch (const std::runtime_error&) {
     }
     (void)args_manager.GetHelpMessage();
+    const auto command = args_manager.GetCommand();
+    if (command) {
+        (void)args_manager.CheckCommandOptions(command->command);
+    }
     (void)args_manager.GetUnrecognizedSections();
     (void)args_manager.GetUnsuitableSectionOnlyArgs();
     (void)args_manager.IsArgNegated(s1);
diff --git a/depend/bitcoin/src/test/fuzz/threadpool.cpp b/depend/bitcoin/src/test/fuzz/threadpool.cpp
index a5b01db1..48ec3ec8 100644
--- a/depend/bitcoin/src/test/fuzz/threadpool.cpp
+++ b/depend/bitcoin/src/test/fuzz/threadpool.cpp
@@ -43,13 +43,11 @@ static void GetFuture(std::future<void>& future, uint32_t& fail_counter)
 // instability in the fuzzing environment.
 // This is also how we use it in the app's lifecycle.
 ThreadPool g_pool{"fuzz"};
-Mutex g_pool_mutex;
 // Global to verify we always have the same number of threads.
 size_t g_num_workers = 3;
 
-static void StartPoolIfNeeded() EXCLUSIVE_LOCKS_REQUIRED(!g_pool_mutex)
+static void StartPoolIfNeeded()
 {
-    LOCK(g_pool_mutex);
     if (g_pool.WorkersCount() == g_num_workers) return;
     g_pool.Start(g_num_workers);
 }
@@ -60,7 +58,7 @@ static void setup_threadpool_test()
     LogInstance().DisableLogging();
 }
 
-FUZZ_TARGET(threadpool, .init = setup_threadpool_test) EXCLUSIVE_LOCKS_REQUIRED(!g_pool_mutex)
+FUZZ_TARGET(threadpool, .init = setup_threadpool_test)
 {
     // Because LibAFL calls fork() after calling the init setup function,
     // the child processes end up having one thread active and no workers.
diff --git a/depend/bitcoin/src/test/fuzz/timeoffsets.cpp b/depend/bitcoin/src/test/fuzz/timeoffsets.cpp
index dfa4dd70..9776ff45 100644
--- a/depend/bitcoin/src/test/fuzz/timeoffsets.cpp
+++ b/depend/bitcoin/src/test/fuzz/timeoffsets.cpp
@@ -22,7 +22,7 @@ FUZZ_TARGET(timeoffsets, .init = initialize_timeoffsets)
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     node::Warnings warnings{};
     TimeOffsets offsets{warnings};
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 4'000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 4'000) {
         (void)offsets.Median();
         offsets.Add(std::chrono::seconds{fuzzed_data_provider.ConsumeIntegral<std::chrono::seconds::rep>()});
         offsets.WarnIfOutOfSync();
diff --git a/depend/bitcoin/src/test/fuzz/torcontrol.cpp b/depend/bitcoin/src/test/fuzz/torcontrol.cpp
index e45f1e62..50fe82ff 100644
--- a/depend/bitcoin/src/test/fuzz/torcontrol.cpp
+++ b/depend/bitcoin/src/test/fuzz/torcontrol.cpp
@@ -25,7 +25,7 @@ FUZZ_TARGET(torcontrol, .init = initialize_torcontrol)
     CThreadInterrupt interrupt;
     TorControlConnection conn{interrupt};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         TorControlReply tor_control_reply;
         CallOneOf(
             fuzzed_data_provider,
diff --git a/depend/bitcoin/src/test/fuzz/tx_pool.cpp b/depend/bitcoin/src/test/fuzz/tx_pool.cpp
index bb155527..c14586f4 100644
--- a/depend/bitcoin/src/test/fuzz/tx_pool.cpp
+++ b/depend/bitcoin/src/test/fuzz/tx_pool.cpp
@@ -2,26 +2,53 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <chain.h>
+#include <coins.h>
+#include <consensus/amount.h>
+#include <consensus/consensus.h>
 #include <consensus/validation.h>
-#include <node/context.h>
-#include <node/mempool_args.h>
 #include <node/miner.h>
+#include <node/mining_types.h>
+#include <policy/feerate.h>
+#include <policy/packages.h>
+#include <policy/policy.h>
 #include <policy/truc_policy.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/mempool.h>
 #include <test/util/mining.h>
+#include <test/util/random.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
 #include <test/util/txmempool.h>
+#include <txmempool.h>
 #include <util/check.h>
-#include <util/rbf.h>
+#include <util/string.h>
+#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <validationinterface.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <limits>
+#include <map>
+#include <memory>
+#include <optional>
+#include <set>
+#include <span>
+#include <string>
+#include <utility>
+#include <vector>
 using node::BlockAssembler;
+using node::BlockCreateOptions;
 using node::NodeContext;
 using util::ToString;
 
@@ -46,12 +73,10 @@ void initialize_tx_pool()
     g_setup = testing_setup.get();
     SetMockTime(WITH_LOCK(g_setup->m_node.chainman->GetMutex(), return g_setup->m_node.chainman->ActiveTip()->Time()));
 
-    BlockAssembler::Options options;
-    options.coinbase_output_script = P2WSH_OP_TRUE;
-    options.include_dummy_extranonce = true;
-
     for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
-        COutPoint prevout{MineBlock(g_setup->m_node, options)};
+        COutPoint prevout{MineBlock(g_setup->m_node, {
+            .coinbase_output_script = P2WSH_OP_TRUE,
+        })};
         // Remember the txids to avoid expensive disk access later on
         auto& outpoints = i < COINBASE_MATURITY ?
                               g_outpoints_coinbase_init_mature :
@@ -91,14 +116,40 @@ void SetMempoolConstraints(ArgsManager& args, FuzzedDataProvider& fuzzed_data_pr
                      ToString(fuzzed_data_provider.ConsumeIntegralInRange<unsigned>(0, 999)));
 }
 
+/** Get a list of wtxids to query from the mempool for relay. Make the list heterogeneous with
+ * wtxids of mempool transactions, non-mempool transactions, and duplicates. */
+std::vector<Wtxid> WtxidsToRelay(FuzzedDataProvider& fuzzed_data_provider, const MockedTxPool& tx_pool)
+{
+    LOCK(tx_pool.cs);
+    std::vector<Wtxid> res;
+
+    uint8_t dummy{0};
+    const auto mempool_entries{tx_pool.entryAll()};
+    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100) {
+        if (!mempool_entries.empty() && fuzzed_data_provider.ConsumeBool()) {
+            // Wtxid of an in-mempool transaction
+            const auto& entry_ref{PickValue(fuzzed_data_provider, mempool_entries).get()};
+            res.push_back(entry_ref.GetTx().GetWitnessHash());
+            // Don't remove it from the mempool, so the next pick is possibly a duplicate
+        } else {
+            // Wtxid of a not-in-mempool transaction
+            res.push_back(Wtxid::FromUint256(uint256{dummy}));
+            // Possibly make the next wtxid of a not-in-mempool transaction, a duplicate
+            if (fuzzed_data_provider.ConsumeBool()) dummy++;
+        }
+    }
+
+    return res;
+}
+
 void Finish(FuzzedDataProvider& fuzzed_data_provider, MockedTxPool& tx_pool, Chainstate& chainstate)
 {
     WITH_LOCK(::cs_main, tx_pool.check(chainstate.CoinsTip(), chainstate.m_chain.Height() + 1));
     {
-        BlockAssembler::Options options;
-        options.nBlockMaxWeight = fuzzed_data_provider.ConsumeIntegralInRange(0U, MAX_BLOCK_WEIGHT);
-        options.blockMinFeeRate = CFeeRate{ConsumeMoney(fuzzed_data_provider, /*max=*/COIN)};
-        options.include_dummy_extranonce = true;
+        BlockCreateOptions options{
+            .block_min_fee_rate = CFeeRate{ConsumeMoney(fuzzed_data_provider, /*max=*/COIN)},
+            .block_max_weight = fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(DEFAULT_BLOCK_RESERVED_WEIGHT, MAX_BLOCK_WEIGHT),
+        };
         auto assembler = BlockAssembler{chainstate, &tx_pool, options};
         auto block_template = assembler.CreateNewBlock();
         Assert(block_template->block.vtx.size() >= 1);
@@ -126,6 +177,28 @@ void Finish(FuzzedDataProvider& fuzzed_data_provider, MockedTxPool& tx_pool, Cha
         assert(tx_pool.size() < info_all.size());
     }
 
+    // Query a number of mempool entries as if to relay them, and assert some invariants on the result.
+    auto wtxids_to_relay{WtxidsToRelay(fuzzed_data_provider, tx_pool)};
+    const auto wtxids_count_before{wtxids_to_relay.size()};
+    const auto n_to_sort{fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 100)};
+    const auto sorted_iter{WITH_LOCK(tx_pool.cs, return tx_pool.ExtractBestByMiningScoreWithTopology(wtxids_to_relay, n_to_sort))};
+    const auto expected_count{std::min(n_to_sort, wtxids_count_before)};
+    // We removed at least as many transactions from the list as we expected sorted entries.
+    Assert(wtxids_to_relay.size() <= wtxids_count_before - expected_count);
+    // When there is enough non-duplicate in-mempool transactions (list of remaining wtxids is
+    // non-empty), we must have received the expected number of entries.
+    Assert(sorted_iter.size() == expected_count || wtxids_to_relay.empty());
+    if (n_to_sort > 0) {
+        // If we asked for a positive number of entries, we must have removed all wtxids that do
+        // not correspond to a mempool entry..
+        const auto is_in_mempool = [&](const auto& wtxid) EXCLUSIVE_LOCKS_REQUIRED(tx_pool.cs) { return tx_pool.GetIter(wtxid).has_value(); };
+        Assert(WITH_LOCK(tx_pool.cs, return std::ranges::all_of(wtxids_to_relay, is_in_mempool)));
+        // ..As well as all duplicates.
+        const auto wtxids_count{wtxids_to_relay.size()};
+        const std::set<Wtxid> unique_wtxids{std::make_move_iterator(wtxids_to_relay.begin()), std::make_move_iterator(wtxids_to_relay.end())};
+        Assert(unique_wtxids.size() == wtxids_count);
+    }
+
     if (fuzzed_data_provider.ConsumeBool()) {
         // Try eviction
         LOCK2(::cs_main, tx_pool.cs);
@@ -248,8 +321,7 @@ FUZZ_TARGET(tx_pool_standard, .init = initialize_tx_pool)
         return coin.out.nValue;
     };
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         {
             // Total supply is the mempool fee + all outpoints
             CAmount supply_now{WITH_LOCK(tx_pool.cs, return tx_pool.GetTotalFee())};
@@ -430,8 +502,7 @@ FUZZ_TARGET(tx_pool, .init = initialize_tx_pool)
     // If we ever bypass limits, do not do TRUC invariants checks
     bool ever_bypassed_limits{false};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 300)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 300) {
         const auto mut_tx = ConsumeTransaction(fuzzed_data_provider, txids);
 
         if (fuzzed_data_provider.ConsumeBool()) {
diff --git a/depend/bitcoin/src/test/fuzz/txdownloadman.cpp b/depend/bitcoin/src/test/fuzz/txdownloadman.cpp
index a2c7fc56..c7a41da9 100644
--- a/depend/bitcoin/src/test/fuzz/txdownloadman.cpp
+++ b/depend/bitcoin/src/test/fuzz/txdownloadman.cpp
@@ -73,7 +73,7 @@ static std::vector<COutPoint> PickCoins(FuzzedDataProvider& fuzzed_data_provider
 {
     std::vector<COutPoint> ret;
     ret.push_back(fuzzed_data_provider.PickValueInArray(COINS));
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10) {
         ret.push_back(fuzzed_data_provider.PickValueInArray(COINS));
     }
     return ret;
@@ -169,7 +169,7 @@ FUZZ_TARGET(txdownloadman, .init = initialize)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     // Initialize txdownloadman
     bilingual_str error;
@@ -179,8 +179,7 @@ FUZZ_TARGET(txdownloadman, .init = initialize)
 
     std::chrono::microseconds time{244466666};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 500)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 500) {
         NodeId rand_peer = fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(0, NUM_PEERS - 1);
 
         // Transaction can be one of the premade ones or a randomly generated one
@@ -294,7 +293,7 @@ FUZZ_TARGET(txdownloadman_impl, .init = initialize)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     // Initialize a TxDownloadManagerImpl
     bilingual_str error;
@@ -304,8 +303,7 @@ FUZZ_TARGET(txdownloadman_impl, .init = initialize)
 
     std::chrono::microseconds time{244466666};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 500)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 500) {
         NodeId rand_peer = fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(0, NUM_PEERS - 1);
 
         // Transaction can be one of the premade ones or a randomly generated one
diff --git a/depend/bitcoin/src/test/fuzz/txgraph.cpp b/depend/bitcoin/src/test/fuzz/txgraph.cpp
index 0fc4e047..90b7cad3 100644
--- a/depend/bitcoin/src/test/fuzz/txgraph.cpp
+++ b/depend/bitcoin/src/test/fuzz/txgraph.cpp
@@ -16,6 +16,7 @@
 #include <iterator>
 #include <map>
 #include <memory>
+#include <ranges>
 #include <set>
 #include <utility>
 
@@ -433,11 +434,11 @@ FUZZ_TARGET(txgraph)
         assert(num_tx == sim.GetTransactionCount());
         // Sort by feerate only, since violating topological constraints within same-feerate
         // chunks won't affect diagram comparisons.
-        std::sort(chunk_feerates.begin(), chunk_feerates.end(), std::greater{});
+        std::ranges::sort(chunk_feerates, std::greater<ByRatioNegSize<FeeFrac>>{});
         return chunk_feerates;
     };
 
-    LIMITED_WHILE(provider.remaining_bytes() > 0, 200) {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, 200) {
         // Read a one-byte command.
         int command = provider.ConsumeIntegral<uint8_t>();
         int orig_command = command;
@@ -806,10 +807,10 @@ FUZZ_TARGET(txgraph)
                 assert(sim_gain == real_gain);
                 // Check that the feerates in each diagram are monotonically decreasing.
                 for (size_t i = 1; i < real_main_diagram.size(); ++i) {
-                    assert(FeeRateCompare(real_main_diagram[i], real_main_diagram[i - 1]) <= 0);
+                    assert(ByRatio{real_main_diagram[i]} <= ByRatio{real_main_diagram[i - 1]});
                 }
                 for (size_t i = 1; i < real_staged_diagram.size(); ++i) {
-                    assert(FeeRateCompare(real_staged_diagram[i], real_staged_diagram[i - 1]) <= 0);
+                    assert(ByRatio{real_staged_diagram[i]} <= ByRatio{real_staged_diagram[i - 1]});
                 }
                 break;
             } else if (block_builders.size() < 4 && !main_sim.IsOversized() && command-- == 0) {
@@ -829,7 +830,7 @@ FUZZ_TARGET(txgraph)
                 if (chunk) {
                     // Chunk feerates must be monotonously decreasing.
                     if (!builder_data.last_feerate.IsEmpty()) {
-                        assert(!(chunk->second >> builder_data.last_feerate));
+                        assert(ByRatio{chunk->second} <= ByRatio{builder_data.last_feerate});
                     }
                     builder_data.last_feerate = chunk->second;
                     // Verify the contents of GetCurrentChunk.
@@ -1006,7 +1007,7 @@ FUZZ_TARGET(txgraph)
                     for (auto i : cluster) sizes.push_back(top_sim.graph.FeeRate(i).size);
                     auto sum_sizes = std::accumulate(sizes.begin(), sizes.end(), uint64_t{0});
                     // Sort from large to small.
-                    std::sort(sizes.begin(), sizes.end(), std::greater{});
+                    std::ranges::sort(sizes, std::greater{});
                     // In the worst case, only the smallest transactions are removed.
                     while (sizes.size() > max_cluster_count || sum_sizes > max_cluster_size) {
                         sum_sizes -= sizes.back();
@@ -1075,8 +1076,8 @@ FUZZ_TARGET(txgraph)
         auto cmp = [&](SimTxGraph::Pos a, SimTxGraph::Pos b) noexcept {
             return real->CompareMainOrder(*sims[0].GetRef(a), *sims[0].GetRef(b)) < 0;
         };
-        std::sort(vec1.begin(), vec1.end(), cmp);
-        std::sort(vec2.begin(), vec2.end(), cmp);
+        std::ranges::sort(vec1, cmp);
+        std::ranges::sort(vec2, cmp);
 
         // Verify the resulting orderings are identical. This could only fail if the ordering was
         // not total.
@@ -1118,7 +1119,7 @@ FUZZ_TARGET(txgraph)
             std::pair<int32_t, uint64_t> max_chunk_tiebreak{0, 0};
             for (const auto& chunk : real_chunking) {
                 // If this is the first chunk with a strictly lower feerate, reset.
-                if (chunk.feerate << last_chunk_feerate) {
+                if (ByRatio{chunk.feerate} < ByRatio{last_chunk_feerate}) {
                     comp_prefix_sizes.clear();
                     max_chunk_tiebreak = {0, 0};
                 }
@@ -1199,7 +1200,7 @@ FUZZ_TARGET(txgraph)
                 auto cmp_redo = [&](SimTxGraph::Pos a, SimTxGraph::Pos b) noexcept {
                     return real_redo->CompareMainOrder(*txobjects_redo[a], *txobjects_redo[b]) < 0;
                 };
-                std::sort(vec_redo.begin(), vec_redo.end(), cmp_redo);
+                std::ranges::sort(vec_redo, cmp_redo);
                 // Compare with the ordering we got from real.
                 assert(vec1 == vec_redo);
             }
@@ -1212,12 +1213,12 @@ FUZZ_TARGET(txgraph)
             if (pos > 0) {
                 size_t before = rng.randrange<size_t>(pos);
                 auto before_feerate = real->GetMainChunkFeerate(*sims[0].GetRef(vec1[before]));
-                assert(FeeRateCompare(before_feerate, pos_feerate) >= 0);
+                assert(ByRatio{before_feerate} >= ByRatio{pos_feerate});
             }
             if (pos + 1 < vec1.size()) {
                 size_t after = pos + 1 + rng.randrange<size_t>(vec1.size() - 1 - pos);
                 auto after_feerate = real->GetMainChunkFeerate(*sims[0].GetRef(vec1[after]));
-                assert(FeeRateCompare(after_feerate, pos_feerate) <= 0);
+                assert(ByRatio{after_feerate} <= ByRatio{pos_feerate});
             }
         }
 
@@ -1265,17 +1266,17 @@ FUZZ_TARGET(txgraph)
             auto [main_cmp_diagram, stage_cmp_diagram] = real->GetMainStagingDiagrams();
             // Check that the feerates in each diagram are monotonically decreasing.
             for (size_t i = 1; i < main_cmp_diagram.size(); ++i) {
-                assert(FeeRateCompare(main_cmp_diagram[i], main_cmp_diagram[i - 1]) <= 0);
+                assert(ByRatio{main_cmp_diagram[i]} <= ByRatio{main_cmp_diagram[i - 1]});
             }
             for (size_t i = 1; i < stage_cmp_diagram.size(); ++i) {
-                assert(FeeRateCompare(stage_cmp_diagram[i], stage_cmp_diagram[i - 1]) <= 0);
+                assert(ByRatio{stage_cmp_diagram[i]} <= ByRatio{stage_cmp_diagram[i - 1]});
             }
             // Treat the diagrams as sets of chunk feerates, and sort them in the same way so that
             // std::set_difference can be used on them below. The exact ordering does not matter
             // here, but it has to be consistent with the one used in main_real_diagram and
             // stage_real_diagram).
-            std::sort(main_cmp_diagram.begin(), main_cmp_diagram.end(), std::greater{});
-            std::sort(stage_cmp_diagram.begin(), stage_cmp_diagram.end(), std::greater{});
+            std::ranges::sort(main_cmp_diagram, std::greater<ByRatioNegSize<FeeFrac>>{});
+            std::ranges::sort(stage_cmp_diagram, std::greater<ByRatioNegSize<FeeFrac>>{});
             // Find the chunks that appear in main_diagram but are missing from main_cmp_diagram.
             // This is allowed, because GetMainStagingDiagrams omits clusters in main unaffected
             // by staging.
@@ -1283,7 +1284,7 @@ FUZZ_TARGET(txgraph)
             std::set_difference(main_real_diagram.begin(), main_real_diagram.end(),
                                 main_cmp_diagram.begin(), main_cmp_diagram.end(),
                                 std::inserter(missing_main_cmp, missing_main_cmp.end()),
-                                std::greater{});
+                                std::greater<ByRatioNegSize<FeeFrac>>{});
             assert(main_cmp_diagram.size() + missing_main_cmp.size() == main_real_diagram.size());
             // Do the same for chunks in stage_diagram missing from stage_cmp_diagram.
             auto stage_real_diagram = get_diagram_fn(TxGraph::Level::TOP);
@@ -1291,7 +1292,7 @@ FUZZ_TARGET(txgraph)
             std::set_difference(stage_real_diagram.begin(), stage_real_diagram.end(),
                                 stage_cmp_diagram.begin(), stage_cmp_diagram.end(),
                                 std::inserter(missing_stage_cmp, missing_stage_cmp.end()),
-                                std::greater{});
+                                std::greater<ByRatioNegSize<FeeFrac>>{});
             assert(stage_cmp_diagram.size() + missing_stage_cmp.size() == stage_real_diagram.size());
             // The missing chunks must be equal across main & staging (otherwise they couldn't have
             // been omitted).
diff --git a/depend/bitcoin/src/test/fuzz/txorphan.cpp b/depend/bitcoin/src/test/fuzz/txorphan.cpp
index 09798990..24366808 100644
--- a/depend/bitcoin/src/test/fuzz/txorphan.cpp
+++ b/depend/bitcoin/src/test/fuzz/txorphan.cpp
@@ -41,7 +41,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     FastRandomContext orphanage_rng{ConsumeUInt256(fuzzed_data_provider)};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     auto orphanage = node::MakeTxOrphanage();
     std::vector<COutPoint> outpoints; // Duplicates are tolerated
@@ -56,8 +56,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
 
     std::vector<CTransactionRef> tx_history;
 
-    LIMITED_WHILE(outpoints.size() < 200'000 && fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (outpoints.size() < 200'000 && fuzzed_data_provider.ConsumeBool(), 1000) {
         // construct transaction
         const CTransactionRef tx = [&] {
             CMutableTransaction tx_mut;
@@ -104,8 +103,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
         }
 
         // trigger orphanage functions
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 1000)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 1000) {
             NodeId peer_id = fuzzed_data_provider.ConsumeIntegral<NodeId>();
             const auto total_bytes_start{orphanage->TotalOrphanUsage()};
             const auto total_peer_bytes_start{orphanage->UsageByPeer(peer_id)};
@@ -175,11 +173,13 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
                     {
                         auto bytes_from_peer_before{orphanage->UsageByPeer(peer_id)};
                         Assert(have_tx == orphanage->EraseTx(tx->GetWitnessHash()));
-                        // After EraseTx, the orphanage may trim itself, so all peers' usage may have gone up or down.
-                        if (have_tx) {
-                            if (!have_tx_and_peer) {
-                                Assert(orphanage->UsageByPeer(peer_id) == bytes_from_peer_before);
-                            }
+                        // After EraseTx, the orphanage may trim itself, so any peer's usage may decrease.
+                        if (!have_tx) {
+                            Assert(orphanage->UsageByPeer(peer_id) == bytes_from_peer_before);
+                        } else if (have_tx_and_peer) {
+                            Assert(orphanage->UsageByPeer(peer_id) <= bytes_from_peer_before - tx_weight);
+                        } else {
+                            Assert(orphanage->UsageByPeer(peer_id) <= bytes_from_peer_before);
                         }
                     }
                     have_tx = orphanage->HaveTx(tx->GetWitnessHash());
@@ -197,9 +197,13 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
                 [&] {
                     // Make a block out of txs and then EraseForBlock
                     CBlock block;
+                    int64_t block_weight{0};
                     int num_txs = fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(0, 1000);
                     for (int i{0}; i < num_txs; ++i) {
                         auto& tx_to_remove = PickValue(fuzzed_data_provider, tx_history);
+                        const auto tx_weight = GetTransactionWeight(*tx_to_remove);
+                        if (block_weight + tx_weight > MAX_BLOCK_WEIGHT) break;
+                        block_weight += tx_weight;
                         block.vtx.push_back(tx_to_remove);
                     }
                     orphanage->EraseForBlock(block);
@@ -228,7 +232,7 @@ FUZZ_TARGET(txorphan_protected, .init = initialize_orphanage)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     FastRandomContext orphanage_rng{ConsumeUInt256(fuzzed_data_provider)};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
 
     // We have num_peers peers. Some subset of them will never exceed their reserved weight or announcement count, and
     // should therefore never have any orphans evicted.
@@ -263,8 +267,7 @@ FUZZ_TARGET(txorphan_protected, .init = initialize_orphanage)
     // These are honest peer's live announcements. We expect them to be protected from eviction.
     std::set<Wtxid> protected_wtxids;
 
-    LIMITED_WHILE(outpoints.size() < 400 && fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (outpoints.size() < 400 && fuzzed_data_provider.ConsumeBool(), 1000) {
         // construct transaction
         const CTransactionRef tx = [&] {
             CMutableTransaction tx_mut;
@@ -299,8 +302,7 @@ FUZZ_TARGET(txorphan_protected, .init = initialize_orphanage)
         const auto wtxid{tx->GetWitnessHash()};
 
         // orphanage functions
-        LIMITED_WHILE(fuzzed_data_provider.remaining_bytes(), 10 * global_latency_score_limit)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.remaining_bytes(), 10 * global_latency_score_limit) {
             NodeId peer_id = fuzzed_data_provider.ConsumeIntegralInRange<NodeId>(0, num_peers - 1);
             const auto tx_weight{GetTransactionWeight(*tx)};
 
@@ -555,14 +557,14 @@ FUZZ_TARGET(txorphanage_sim)
             count += 1 + (txn[ann.tx]->vin.size() / 10);
             usage += GetTransactionWeight(*txn[ann.tx]);
         }
-        return std::max(FeeFrac{count, max_count}, FeeFrac{usage, max_usage});
+        return std::max<ByRatioNegSize<FeeFrac>>(FeeFrac{count, max_count}, FeeFrac{usage, max_usage});
     };
 
     //
     // 5. Run through a scenario of mutators on both real and simulated orphanage.
     //
 
-    LIMITED_WHILE(provider.remaining_bytes() > 0, 200) {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, 200) {
         int command = provider.ConsumeIntegralInRange<uint8_t>(0, 15);
         while (true) {
             if (sim_announcements.size() < MAX_ANN && command-- == 0) {
@@ -594,7 +596,7 @@ FUZZ_TARGET(txorphanage_sim)
                 assert(erased == sim_have);
                 std::erase_if(sim_announcements, [&](auto& ann) { return ann.tx == tx; });
                 break;
-           } else if (command-- == 0) {
+            } else if (command-- == 0) {
                 // EraseForPeer
                 auto peer = read_peer_fn();
                 real->EraseForPeer(peer);
@@ -707,13 +709,13 @@ FUZZ_TARGET(txorphanage_sim)
                 auto dos_score = dos_score_fn(peer, max_ann, max_mem);
                 // Use >= so that the more recent peer (higher NodeId) wins in case of
                 // ties.
-                if (dos_score >= worst_dos_score) {
+                if (ByRatioNegSize{dos_score} >= ByRatioNegSize{worst_dos_score}) {
                     worst_dos_score = dos_score;
                     worst_peer = peer;
                 }
             }
             assert(worst_peer != unsigned(-1));
-            assert(worst_dos_score >> FeeFrac(1, 1));
+            assert(ByRatio{worst_dos_score} > ByRatio{FeeFrac(1, 1)});
             // Find oldest announcement from worst_peer, preferring non-reconsiderable ones.
             bool done{false};
             for (int reconsider = 0; reconsider < 2; ++reconsider) {
diff --git a/depend/bitcoin/src/test/fuzz/util.cpp b/depend/bitcoin/src/test/fuzz/util.cpp
index da0e2dea..169f6838 100644
--- a/depend/bitcoin/src/test/fuzz/util.cpp
+++ b/depend/bitcoin/src/test/fuzz/util.cpp
@@ -166,7 +166,7 @@ uint32_t ConsumeSequence(FuzzedDataProvider& fuzzed_data_provider) noexcept
 std::map<COutPoint, Coin> ConsumeCoins(FuzzedDataProvider& fuzzed_data_provider) noexcept
 {
     std::map<COutPoint, Coin> coins;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::optional<COutPoint> outpoint{ConsumeDeserializable<COutPoint>(fuzzed_data_provider)};
         if (!outpoint) {
             break;
diff --git a/depend/bitcoin/src/test/fuzz/util.h b/depend/bitcoin/src/test/fuzz/util.h
index fd53e39f..04edef0b 100644
--- a/depend/bitcoin/src/test/fuzz/util.h
+++ b/depend/bitcoin/src/test/fuzz/util.h
@@ -13,6 +13,7 @@
 #include <consensus/consensus.h>
 #include <key.h>
 #include <merkleblock.h>
+#include <pow.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <serialize.h>
@@ -20,6 +21,7 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <uint256.h>
+#include <validation.h>
 
 #include <algorithm>
 #include <array>
@@ -44,13 +46,17 @@ size_t CallOneOf(FuzzedDataProvider& fuzzed_data_provider, Callables... callable
 }
 
 template <typename Collection>
-auto& PickValue(FuzzedDataProvider& fuzzed_data_provider, Collection& col)
+auto PickIterator(FuzzedDataProvider& fuzzed_data_provider, Collection& col)
 {
-    auto sz{col.size()};
+    const auto sz{col.size()};
     assert(sz >= 1);
-    auto it = col.begin();
-    std::advance(it, fuzzed_data_provider.ConsumeIntegralInRange<decltype(sz)>(0, sz - 1));
-    return *it;
+    return std::next(col.begin(), fuzzed_data_provider.ConsumeIntegralInRange<decltype(sz)>(0, sz - 1));
+}
+
+template <typename Collection>
+auto& PickValue(FuzzedDataProvider& fuzzed_data_provider, Collection& col)
+{
+    return *PickIterator(fuzzed_data_provider, col);
 }
 
 template<typename B = uint8_t>
@@ -124,6 +130,19 @@ template <typename T>
     return obj;
 }
 
+template <typename T>
+[[nodiscard]] inline std::optional<T> ConsumeDeserializableConstructor(FuzzedDataProvider& fuzzed_data_provider, const std::optional<size_t>& max_length = std::nullopt) noexcept
+{
+    const std::vector<uint8_t> buffer = ConsumeRandomLengthByteVector(fuzzed_data_provider, max_length);
+    SpanReader ds{buffer};
+    try {
+        T obj(deserialize, ds);
+        return obj;
+    } catch (const std::ios_base::failure&) {
+        return std::nullopt;
+    }
+}
+
 template <typename WeakEnumType, size_t size>
 [[nodiscard]] WeakEnumType ConsumeWeakEnum(FuzzedDataProvider& fuzzed_data_provider, const WeakEnumType (&all_types)[size]) noexcept
 {
@@ -345,4 +364,11 @@ void ReadFromStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) no
     }
 }
 
+inline void FinalizeHeader(CBlockHeader& header, const ChainstateManager& chainman)
+{
+    while (!CheckProofOfWork(header.GetHash(), header.nBits, chainman.GetParams().GetConsensus())) {
+        ++(header.nNonce);
+    }
+}
+
 #endif // BITCOIN_TEST_FUZZ_UTIL_H
diff --git a/depend/bitcoin/src/test/fuzz/util/check_globals.cpp b/depend/bitcoin/src/test/fuzz/util/check_globals.cpp
index ca311153..431519dc 100644
--- a/depend/bitcoin/src/test/fuzz/util/check_globals.cpp
+++ b/depend/bitcoin/src/test/fuzz/util/check_globals.cpp
@@ -19,6 +19,7 @@ struct CheckGlobalsImpl {
         g_seeded_g_prng_zero = false;
         g_used_system_time = false;
         SetMockTime(0s);
+        MockableSteadyClock::ClearMockTime();
     }
     ~CheckGlobalsImpl()
     {
@@ -43,7 +44,7 @@ struct CheckGlobalsImpl {
                          "The current fuzz target accessed system time.\n\n"
 
                          "This is acceptable, but requires the fuzz target to use \n"
-                         "a NodeClockContext, SteadyClockContext or call \n"
+                         "a FakeNodeClock, FakeSteadyClock or call \n"
                          "SetMockTime() at the \n" "beginning of processing the \n"
                          "fuzz input.\n\n"
 
diff --git a/depend/bitcoin/src/test/fuzz/util/descriptor.h b/depend/bitcoin/src/test/fuzz/util/descriptor.h
index 974e9ae8..86773162 100644
--- a/depend/bitcoin/src/test/fuzz/util/descriptor.h
+++ b/depend/bitcoin/src/test/fuzz/util/descriptor.h
@@ -49,7 +49,7 @@ class MockedDescriptorConverter {
 };
 
 //! Default maximum number of derivation indexes in a single derivation path when limiting its depth.
-constexpr int MAX_DEPTH{2};
+inline constexpr int MAX_DEPTH{2};
 
 /**
  * Whether the buffer, if it represents a valid descriptor, contains a derivation path deeper than
@@ -58,9 +58,9 @@ constexpr int MAX_DEPTH{2};
 bool HasDeepDerivPath(std::span<const uint8_t> buff, int max_depth = MAX_DEPTH);
 
 //! Default maximum number of sub-fragments.
-constexpr int MAX_SUBS{1'000};
+inline constexpr int MAX_SUBS{1'000};
 //! Maximum number of nested sub-fragments we'll allow in a descriptor.
-constexpr size_t MAX_NESTED_SUBS{10'000};
+inline constexpr size_t MAX_NESTED_SUBS{10'000};
 
 /**
  * Whether the buffer, if it represents a valid descriptor, contains a fragment with more
@@ -70,7 +70,7 @@ bool HasTooManySubFrag(std::span<const uint8_t> buff, int max_subs = MAX_SUBS,
                        size_t max_nested_subs = MAX_NESTED_SUBS);
 
 //! Default maximum number of wrappers per fragment.
-constexpr int MAX_WRAPPERS{100};
+inline constexpr int MAX_WRAPPERS{100};
 
 /**
  * Whether the buffer, if it represents a valid descriptor, contains a fragment with more
@@ -80,7 +80,7 @@ bool HasTooManyWrappers(std::span<const uint8_t> buff, int max_wrappers = MAX_WR
 
 /// Default maximum leaf size. This should be large enough to cover an extended
 /// key, including paths "/", inside and outside of "[]".
-constexpr uint32_t MAX_LEAF_SIZE{200};
+inline constexpr uint32_t MAX_LEAF_SIZE{200};
 
 /// Whether the expanded buffer (after calling GetDescriptor() in
 /// MockedDescriptorConverter) has a leaf size too large.
diff --git a/depend/bitcoin/src/test/fuzz/util/net.cpp b/depend/bitcoin/src/test/fuzz/util/net.cpp
index ba17e4e9..dfd295b3 100644
--- a/depend/bitcoin/src/test/fuzz/util/net.cpp
+++ b/depend/bitcoin/src/test/fuzz/util/net.cpp
@@ -111,13 +111,12 @@ P ConsumeDeserializationParams(FuzzedDataProvider& fuzzed_data_provider) noexcep
 template CNetAddr::SerParams ConsumeDeserializationParams(FuzzedDataProvider&) noexcept;
 template CAddress::SerParams ConsumeDeserializationParams(FuzzedDataProvider&) noexcept;
 
-FuzzedSock::FuzzedSock(FuzzedDataProvider& fuzzed_data_provider)
+FuzzedSock::FuzzedSock(FuzzedDataProvider& fuzzed_data_provider, FakeSteadyClock& clock)
     : Sock{fuzzed_data_provider.ConsumeIntegralInRange<SOCKET>(INVALID_SOCKET - 1, INVALID_SOCKET)},
       m_fuzzed_data_provider{fuzzed_data_provider},
       m_selectable{fuzzed_data_provider.ConsumeBool()},
-      m_time{MockableSteadyClock::INITIAL_MOCK_TIME}
+      m_clock{clock}
 {
-    ElapseTime(std::chrono::seconds(0)); // start mocking the steady clock.
 }
 
 FuzzedSock::~FuzzedSock()
@@ -129,12 +128,6 @@ FuzzedSock::~FuzzedSock()
     m_socket = INVALID_SOCKET;
 }
 
-void FuzzedSock::ElapseTime(std::chrono::milliseconds duration) const
-{
-    m_time += duration;
-    MockableSteadyClock::SetMockTime(m_time);
-}
-
 FuzzedSock& FuzzedSock::operator=(Sock&& other)
 {
     assert(false && "Move of Sock into FuzzedSock not allowed.");
@@ -340,7 +333,7 @@ std::unique_ptr<Sock> FuzzedSock::Accept(sockaddr* addr, socklen_t* addr_len) co
             }
         }
     }
-    return std::make_unique<FuzzedSock>(m_fuzzed_data_provider);
+    return std::make_unique<FuzzedSock>(m_fuzzed_data_provider, m_clock);
 }
 
 int FuzzedSock::GetSockOpt(int level, int opt_name, void* opt_val, socklen_t* opt_len) const
@@ -428,7 +421,7 @@ bool FuzzedSock::Wait(std::chrono::milliseconds timeout, Event requested, Event*
         // FuzzedDataProvider runs out of data.
         *occurred = m_fuzzed_data_provider.ConsumeBool() ? 0 : requested;
     }
-    ElapseTime(timeout);
+    m_clock += timeout;
     return true;
 }
 
@@ -441,7 +434,7 @@ bool FuzzedSock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& even
         // FuzzedDataProvider runs out of data.
         events.occurred = m_fuzzed_data_provider.ConsumeBool() ? 0 : events.requested;
     }
-    ElapseTime(timeout);
+    m_clock += timeout;
     return true;
 }
 
diff --git a/depend/bitcoin/src/test/fuzz/util/net.h b/depend/bitcoin/src/test/fuzz/util/net.h
index 36393811..520c6732 100644
--- a/depend/bitcoin/src/test/fuzz/util/net.h
+++ b/depend/bitcoin/src/test/fuzz/util/net.h
@@ -17,6 +17,7 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/util.h>
 #include <test/util/net.h>
+#include <test/util/time.h>
 #include <util/asmap.h>
 #include <util/sock.h>
 
@@ -178,17 +179,16 @@ class FuzzedSock : public Sock
     const bool m_selectable;
 
     /**
-     * Used to mock the steady clock in methods waiting for a given duration.
+     * Externally-provided context used to mock the steady clock in methods
+     * waiting for a given duration. It is a reference (rather than an owned
+     * member) so that several FuzzedSock instances sharing a test case (e.g.
+     * one per peer, or one created from Accept()) advance a single mocked
+     * clock.
      */
-    mutable std::chrono::milliseconds m_time;
-
-    /**
-     * Set the value of the mocked steady clock such as that many ms have passed.
-     */
-    void ElapseTime(std::chrono::milliseconds duration) const;
+    FakeSteadyClock& m_clock;
 
 public:
-    explicit FuzzedSock(FuzzedDataProvider& fuzzed_data_provider);
+    explicit FuzzedSock(FuzzedDataProvider& fuzzed_data_provider, FakeSteadyClock& clock);
 
     ~FuzzedSock() override;
 
@@ -228,9 +228,9 @@ class FuzzedSock : public Sock
     return FuzzedNetEvents{fdp};
 }
 
-[[nodiscard]] inline FuzzedSock ConsumeSock(FuzzedDataProvider& fuzzed_data_provider)
+[[nodiscard]] inline FuzzedSock ConsumeSock(FuzzedDataProvider& fuzzed_data_provider, FakeSteadyClock& clock)
 {
-    return FuzzedSock{fuzzed_data_provider};
+    return FuzzedSock{fuzzed_data_provider, clock};
 }
 
 [[nodiscard]] inline NetGroupManager ConsumeNetGroupManager(FuzzedDataProvider& fuzzed_data_provider) noexcept
@@ -267,10 +267,10 @@ inline std::vector<CService> ConsumeServiceVector(FuzzedDataProvider& fuzzed_dat
 CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept;
 
 template <bool ReturnUniquePtr = false>
-auto ConsumeNode(FuzzedDataProvider& fuzzed_data_provider, const std::optional<NodeId>& node_id_in = std::nullopt) noexcept
+auto ConsumeNode(FuzzedDataProvider& fuzzed_data_provider, FakeSteadyClock& clock, const std::optional<NodeId>& node_id_in = std::nullopt) noexcept
 {
     const NodeId node_id = node_id_in.value_or(fuzzed_data_provider.ConsumeIntegralInRange<NodeId>(0, std::numeric_limits<NodeId>::max()));
-    const auto sock = std::make_shared<FuzzedSock>(fuzzed_data_provider);
+    const auto sock = std::make_shared<FuzzedSock>(fuzzed_data_provider, clock);
     const CAddress address = ConsumeAddress(fuzzed_data_provider);
     const uint64_t keyed_net_group = fuzzed_data_provider.ConsumeIntegral<uint64_t>();
     const uint64_t local_host_nonce = fuzzed_data_provider.ConsumeIntegral<uint64_t>();
@@ -307,7 +307,7 @@ auto ConsumeNode(FuzzedDataProvider& fuzzed_data_provider, const std::optional<N
                      CNodeOptions{ .permission_flags = permission_flags }};
     }
 }
-inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, node_id_in); }
+inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, FakeSteadyClock& clock, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, clock, node_id_in); }
 
 void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, CNode& node) noexcept EXCLUSIVE_LOCKS_REQUIRED(NetEventsInterface::g_msgproc_mutex);
 
diff --git a/depend/bitcoin/src/test/fuzz/utxo_snapshot.cpp b/depend/bitcoin/src/test/fuzz/utxo_snapshot.cpp
index ed286865..e4098457 100644
--- a/depend/bitcoin/src/test/fuzz/utxo_snapshot.cpp
+++ b/depend/bitcoin/src/test/fuzz/utxo_snapshot.cpp
@@ -59,7 +59,7 @@ void sanity_check_snapshot()
     LOCK(cs_main);
     auto& cs{node.chainman->ActiveChainstate()};
     cs.ForceFlushStateToDisk(/*wipe_cache=*/false);
-    const auto stats{*Assert(kernel::ComputeUTXOStats(kernel::CoinStatsHashType::HASH_SERIALIZED, &cs.CoinsDB(), node.chainman->m_blockman))};
+    const auto stats{*Assert(kernel::ComputeUTXOStats(kernel::CoinStatsHashType::HASH_SERIALIZED, cs.CoinsDB(), node.chainman->m_blockman))};
     const auto cp_au_data{*Assert(node.chainman->GetParams().AssumeutxoForHeight(2 * COINBASE_MATURITY))};
     Assert(stats.nHeight == cp_au_data.height);
     Assert(stats.nTransactions + 1 == cp_au_data.m_chain_tx_count); // +1 for the genesis tx.
@@ -73,7 +73,7 @@ void initialize_chain()
     const auto params{CreateChainParams(ArgsManager{}, ChainType::REGTEST)};
     static const auto chain{CreateBlockChain(2 * COINBASE_MATURITY, *params)};
     g_chain = &chain;
-    SetMockTime(chain.back()->Time());
+    GetFakeNodeClock().set(chain.back()->Time());
 
     // Make sure we can generate a valid snapshot.
     sanity_check_snapshot();
@@ -104,7 +104,7 @@ void utxo_snapshot_fuzz(FuzzBufferType buffer)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)}; // regtest genesis block timestamp
+    GetFakeNodeClock().set(ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)); // regtest genesis block timestamp
     auto& setup{*g_setup};
     bool dirty_chainman{false}; // Reuse the global chainman, but reset it when it is dirty
     auto& chainman{*setup.m_node.chainman};
diff --git a/depend/bitcoin/src/test/fuzz/utxo_total_supply.cpp b/depend/bitcoin/src/test/fuzz/utxo_total_supply.cpp
index 1275fd45..f44b81de 100644
--- a/depend/bitcoin/src/test/fuzz/utxo_total_supply.cpp
+++ b/depend/bitcoin/src/test/fuzz/utxo_total_supply.cpp
@@ -3,29 +3,39 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h>
-#include <consensus/consensus.h>
+#include <consensus/amount.h>
 #include <consensus/merkle.h>
 #include <kernel/coinstats.h>
 #include <node/miner.h>
-#include <script/interpreter.h>
-#include <streams.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/mining.h>
+#include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
-#include <util/chaintype.h>
-#include <util/time.h>
+#include <txdb.h>
+#include <uint256.h>
+#include <util/check.h>
 #include <validation.h>
 
-using node::BlockAssembler;
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <utility>
+#include <vector>
 
 FUZZ_TARGET(utxo_total_supply)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)}; // regtest genesis block timestamp
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)}; // regtest genesis block timestamp
     /** The testing setup that creates a chainman only (no chainstate) */
     ChainTestingSetup test_setup{
         ChainType::REGTEST,
@@ -44,12 +54,11 @@ FUZZ_TARGET(utxo_total_supply)
         LOCK(chainman.GetMutex());
         return chainman.ActiveHeight();
     };
-    BlockAssembler::Options options;
-    options.coinbase_output_script = CScript() << OP_FALSE;
-    options.include_dummy_extranonce = true;
     const auto PrepareNextBlock = [&]() {
         // Use OP_FALSE to avoid BIP30 check from hitting early
-        auto block = PrepareBlock(node, options);
+        auto block = PrepareBlock(node, {
+            .coinbase_output_script = CScript() << OP_FALSE,
+        });
         // Replace OP_FALSE with OP_TRUE
         {
             CMutableTransaction tx{*block->vtx.back()};
@@ -93,7 +102,7 @@ FUZZ_TARGET(utxo_total_supply)
         LOCK(chainman.GetMutex());
         chainman.ActiveChainstate().ForceFlushStateToDisk(wipe_cache);
         utxo_stats = std::move(
-            *Assert(kernel::ComputeUTXOStats(kernel::CoinStatsHashType::NONE, &chainman.ActiveChainstate().CoinsDB(), chainman.m_blockman, {})));
+            *Assert(kernel::ComputeUTXOStats(kernel::CoinStatsHashType::NONE, chainman.ActiveChainstate().CoinsDB(), chainman.m_blockman, {})));
         // Check that miner can't print more money than they are allowed to
         assert(circulation == utxo_stats.total_amount);
     };
@@ -107,8 +116,12 @@ FUZZ_TARGET(utxo_total_supply)
     // Assuming that the fuzzer will mine relatively short chains (less than 200 blocks), we want the duplicate coinbase to be not too high.
     // Up to 300 seems reasonable.
     int64_t duplicate_coinbase_height = fuzzed_data_provider.ConsumeIntegralInRange(0, 300);
-    // Always pad with OP_0 at the end to avoid bad-cb-length error
-    const CScript duplicate_coinbase_script = CScript() << duplicate_coinbase_height << OP_0;
+    // Avoid bad-cb-length error at heights <= 16. Pad the BIP34-encoded height
+    // with OP_0 to satisfy the minimum 2-byte coinbase scriptSig length.
+    CScript duplicate_coinbase_script = CScript() << duplicate_coinbase_height;
+    if (duplicate_coinbase_height <= 16) {
+        duplicate_coinbase_script << OP_0;
+    }
     // Mine the first block with this duplicate
     current_block = PrepareNextBlock();
     StoreLastTxo();
@@ -132,8 +145,7 @@ FUZZ_TARGET(utxo_total_supply)
 
     // Limit to avoid timeout, but enough to cover duplicate_coinbase_height
     // and CVE-2018-17144.
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes(), 2'00)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes(), 2'00) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/depend/bitcoin/src/test/fuzz/validation_load_mempool.cpp b/depend/bitcoin/src/test/fuzz/validation_load_mempool.cpp
index 9180945d..b859f245 100644
--- a/depend/bitcoin/src/test/fuzz/validation_load_mempool.cpp
+++ b/depend/bitcoin/src/test/fuzz/validation_load_mempool.cpp
@@ -41,7 +41,7 @@ FUZZ_TARGET(validation_load_mempool, .init = initialize_validation_load_mempool)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     FuzzedFileProvider fuzzed_file_provider{fuzzed_data_provider};
 
     bilingual_str error;
diff --git a/depend/bitcoin/src/test/fuzz/vecdeque.cpp b/depend/bitcoin/src/test/fuzz/vecdeque.cpp
index 30fc2da0..1756a859 100644
--- a/depend/bitcoin/src/test/fuzz/vecdeque.cpp
+++ b/depend/bitcoin/src/test/fuzz/vecdeque.cpp
@@ -52,7 +52,7 @@ void TestType(std::span<const uint8_t> buffer, uint64_t rng_tweak)
         }
     };
 
-    LIMITED_WHILE(provider.remaining_bytes(), MAX_OPERATIONS) {
+    LIMITED_WHILE (provider.remaining_bytes(), MAX_OPERATIONS) {
         int command = provider.ConsumeIntegral<uint8_t>() % 64;
         unsigned idx = real.empty() ? 0 : provider.ConsumeIntegralInRange<unsigned>(0, real.size() - 1);
         const size_t num_buffers = sim.size();
diff --git a/depend/bitcoin/src/test/fuzz/versionbits.cpp b/depend/bitcoin/src/test/fuzz/versionbits.cpp
index b68ef58a..a161f5b4 100644
--- a/depend/bitcoin/src/test/fuzz/versionbits.cpp
+++ b/depend/bitcoin/src/test/fuzz/versionbits.cpp
@@ -14,6 +14,7 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
+#include <test/util/versionbits.h>
 
 #include <cstdint>
 #include <limits>
@@ -31,7 +32,7 @@ class TestConditionChecker : public VersionBitsConditionChecker
     {
         assert(dep.period > 0);
         assert(dep.threshold <= dep.period);
-        assert(0 <= dep.bit && dep.bit < 32 && dep.bit < VERSIONBITS_NUM_BITS);
+        assert(0 <= dep.bit && dep.bit < 32 && dep.bit < VERSIONBITS_MAX_NUM_BITS);
         assert(0 <= dep.min_activation_height);
     }
 
@@ -126,7 +127,7 @@ FUZZ_TARGET(versionbits, .init = initialize)
         assert(0 < dep.threshold && dep.threshold <= dep.period); // must be able to both pass and fail threshold!
 
         // select deployment parameters: bit, start time, timeout
-        dep.bit = fuzzed_data_provider.ConsumeIntegralInRange<int>(0, VERSIONBITS_NUM_BITS - 1);
+        dep.bit = fuzzed_data_provider.ConsumeIntegralInRange<int>(0, VERSIONBITS_MAX_NUM_BITS - 1);
 
         if (always_active_test) {
             dep.nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
diff --git a/depend/bitcoin/src/test/hash_tests.cpp b/depend/bitcoin/src/test/hash_tests.cpp
index a5059a8f..a8a7d55a 100644
--- a/depend/bitcoin/src/test/hash_tests.cpp
+++ b/depend/bitcoin/src/test/hash_tests.cpp
@@ -2,17 +2,57 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <clientversion.h>
+#include <crypto/common.h>
 #include <crypto/siphash.h>
 #include <hash.h>
-#include <test/util/random.h>
+#include <test/data/siphash.json.h>
+#include <test/util/json.h>
 #include <test/util/setup_common.h>
+#include <uint256.h>
 #include <util/strencodings.h>
 
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(hash_tests, BasicTestingSetup)
 
+static uint64_t FromHex64(const UniValue& value) { return ToIntegral<uint64_t>(value.get_str(), /*base=*/16).value(); }
+static uint256 FromHex256(const UniValue& value) { return uint256{ParseHex(value.get_str())}; }
+static bool HasByteLength(const UniValue& value, size_t length) { return value.get_str().size() == 2 * length; }
+
+static uint64_t CalculateSipHash24(const UniValue& input, uint64_t k0, uint64_t k1)
+{
+    CSipHasher hasher{k0, k1};
+    for (auto& block : input.getValues()) {
+        hasher.Write(ParseHex(block.get_str()));
+    }
+    const uint64_t result{hasher.Finalize()};
+    BOOST_CHECK_EQUAL(hasher.Finalize(), result);
+    return result;
+}
+
+static uint64_t CalculateSipHash13UJ(const UniValue& input, uint64_t k0, uint64_t k1, bool normal_as_jumbo)
+{
+    SipHasher13UJ hasher{k0, k1};
+    for (auto& value : input.getValues()) {
+        const auto block{ParseHex(value.get_str())};
+        if (block.size() == sizeof(uint64_t)) {
+            if (!normal_as_jumbo) {
+                hasher.Write(ReadLE64(block.data()));
+            } else {
+                uint256 data256{};
+                WriteLE64(data256.data(), ReadLE64(block.data()));
+                hasher.WriteJumbo(data256);
+            }
+        } else {
+            BOOST_REQUIRE_EQUAL(block.size(), uint256::size());
+            hasher.WriteJumbo(uint256{block});
+        }
+    }
+    const uint64_t result{hasher.Finalize()};
+    BOOST_CHECK_EQUAL(hasher.Finalize(), result);
+    return result;
+}
+
 BOOST_AUTO_TEST_CASE(murmurhash3)
 {
 
@@ -57,7 +97,7 @@ BOOST_AUTO_TEST_CASE(murmurhash3)
    ...
    in = 00 01 02 ... 3e (63 bytes)
 
-   from: https://131002.net/siphash/siphash24.c
+   from: https://github.com/veorq/SipHash/blob/master/vectors.h
 */
 uint64_t siphash_4_2_testvec[] = {
     0x726fdb47dd0e0e31, 0x74f839c593dc67fd, 0x0d6c8009d9a94f5a, 0x85676696d7fb7e2d,
@@ -104,8 +144,6 @@ BOOST_AUTO_TEST_CASE(siphash)
     hasher.Write(0x2F2E2D2C2B2A2928ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0xe612a3cb9ecba951ull);
 
-    BOOST_CHECK_EQUAL(PresaltedSipHasher(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL)(uint256{"1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100"}), 0x7127512f72f27cceull);
-
     // Check test vectors from spec, one byte at a time
     CSipHasher hasher2(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
     for (uint8_t x=0; x<std::size(siphash_4_2_testvec); ++x)
@@ -129,24 +167,36 @@ BOOST_AUTO_TEST_CASE(siphash)
     tx.version = 1;
     ss << TX_WITH_WITNESS(tx);
     BOOST_CHECK_EQUAL(PresaltedSipHasher(1, 2)(ss.GetHash()), 0x79751e980c2a0a35ULL);
+}
 
-    // Check consistency between CSipHasher and PresaltedSipHasher.
-    FastRandomContext ctx;
-    for (int i = 0; i < 16; ++i) {
-        uint64_t k0 = ctx.rand64();
-        uint64_t k1 = ctx.rand64();
-        uint256 x = m_rng.rand256();
-
-        CSipHasher sip256(k0, k1);
-        sip256.Write(x);
-        BOOST_CHECK_EQUAL(PresaltedSipHasher(k0, k1)(x), sip256.Finalize());
-
-        CSipHasher sip288 = sip256;
-        uint32_t n = ctx.rand32();
-        uint8_t nb[4];
-        WriteLE32(nb, n);
-        sip288.Write(nb);
-        BOOST_CHECK_EQUAL(PresaltedSipHasher(k0, k1)(x, n), sip288.Finalize());
+BOOST_AUTO_TEST_CASE(siphash_test_vectors)
+{
+    for (UniValue tests{read_json(json_tests::siphash)}; auto& test : tests.getValues()) {
+        const uint64_t k0{FromHex64(test["key"][0])}, k1{FromHex64(test["key"][1])};
+        auto& input{test["input"]};
+        const bool starts_with_hash{!input.empty() && HasByteLength(input[0], uint256::size())};
+        const bool hash_only{starts_with_hash && input.size() == 1};
+        const bool hash_extra{starts_with_hash && input.size() == 2};
+        const uint64_t expected24{FromHex64(test["expected"]["siphash24"])};
+        BOOST_CHECK_EQUAL(CalculateSipHash24(input, k0, k1), expected24);
+        if (hash_only) {
+            BOOST_CHECK_EQUAL(PresaltedSipHasher(k0, k1)(FromHex256(input[0])), expected24);
+        } else if (hash_extra && HasByteLength(input[1], sizeof(uint32_t))) {
+            const auto extra{ParseHex(input[1].get_str())};
+            BOOST_CHECK_EQUAL(PresaltedSipHasher(k0, k1)(FromHex256(input[0]), ReadLE32(extra.data())), expected24);
+        }
+        if (auto& expected_value{test["expected"]["siphash13uj"]}; !expected_value.isNull()) {
+            const uint64_t expected13uj{FromHex64(expected_value)};
+            BOOST_CHECK_EQUAL(CalculateSipHash13UJ(input, k0, k1, /*normal_as_jumbo=*/false), expected13uj);
+            BOOST_CHECK_EQUAL(CalculateSipHash13UJ(input, k0, k1, /*normal_as_jumbo=*/true), expected13uj);
+            const SipHasher13UJ fixed_hasher{k0, k1};
+            if (hash_only) {
+                BOOST_CHECK_EQUAL(fixed_hasher.Hash(FromHex256(input[0])), expected13uj);
+            } else if (hash_extra && HasByteLength(input[1], sizeof(uint64_t))) {
+                const auto extra{ParseHex(input[1].get_str())};
+                BOOST_CHECK_EQUAL(fixed_hasher.Hash(FromHex256(input[0]), ReadLE64(extra.data())), expected13uj);
+            }
+        }
     }
 }
 
diff --git a/depend/bitcoin/src/test/httpserver_tests.cpp b/depend/bitcoin/src/test/httpserver_tests.cpp
index 030d48db..96d6c387 100644
--- a/depend/bitcoin/src/test/httpserver_tests.cpp
+++ b/depend/bitcoin/src/test/httpserver_tests.cpp
@@ -3,41 +3,1130 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <httpserver.h>
+#include <rpc/protocol.h>
 #include <test/util/common.h>
+#include <test/util/logging.h>
 #include <test/util/setup_common.h>
+#include <util/string.h>
+#include <util/threadpool.h>
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(httpserver_tests, BasicTestingSetup)
+using http_bitcoin::GetQueryParameterFromUri;
+using http_bitcoin::HTTPHeaders;
+using http_bitcoin::HTTPRemoteClient;
+using http_bitcoin::HTTPRequest;
+using http_bitcoin::HTTPResponse;
+using http_bitcoin::HTTPServer;
+using http_bitcoin::MAX_BODY_SIZE;
+using http_bitcoin::MAX_HEADERS_SIZE;
+using util::LineReader;
+
+// HTTP request captured from bitcoin-cli
+constexpr std::string_view full_request = "POST / HTTP/1.1\r\n"
+                                          "Host: 127.0.0.1\r\n"
+                                          "Connection: close\r\n"
+                                          "Content-Type: application/json\r\n"
+                                          "Authorization: Basic X19jb29raWVfXzo5OGQ5ODQ3MWNmNjg0NzAzYTkzN2EzNzk0ZDFlODQ1NjZmYTRkZjJiMzFkYjhhODI4ZGY4MjVjOTg5ZGI4OTVl\r\n"
+                                          "Content-Length: 46\r\n"
+                                          "\r\n"
+                                          R"({"method":"getblockcount","params":[],"id":1})""\n";
+
+BOOST_FIXTURE_TEST_SUITE(httpserver_tests, SocketTestingSetup)
 
 BOOST_AUTO_TEST_CASE(test_query_parameters)
 {
     std::string uri {};
 
+    // Tolerate a URI with invalid characters (% not followed by hex digits)
+    uri = "/rest/endpoint/someresource.json?p1=v1&p2=v2%";
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p1"), "v1");
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p2"), "v2%");
+
     // No parameters
     uri = "localhost:8080/rest/headers/someresource.json";
-    BOOST_CHECK(!GetQueryParameterFromUri(uri.c_str(), "p1").has_value());
+    BOOST_CHECK(!GetQueryParameterFromUri(uri, "p1"));
 
     // Single parameter
     uri = "localhost:8080/rest/endpoint/someresource.json?p1=v1";
-    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri.c_str(), "p1").value(), "v1");
-    BOOST_CHECK(!GetQueryParameterFromUri(uri.c_str(), "p2").has_value());
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p1"), "v1");
+    BOOST_CHECK(!GetQueryParameterFromUri(uri, "p2"));
 
     // Multiple parameters
     uri = "/rest/endpoint/someresource.json?p1=v1&p2=v2";
-    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri.c_str(), "p1").value(), "v1");
-    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri.c_str(), "p2").value(), "v2");
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p1"), "v1");
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p2"), "v2");
 
     // If the query string contains duplicate keys, the first value is returned
     uri = "/rest/endpoint/someresource.json?p1=v1&p1=v2";
-    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri.c_str(), "p1").value(), "v1");
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p1"), "v1");
 
     // Invalid query string syntax is the same as not having parameters
     uri = "/rest/endpoint/someresource.json&p1=v1&p2=v2";
-    BOOST_CHECK(!GetQueryParameterFromUri(uri.c_str(), "p1").has_value());
+    BOOST_CHECK(!GetQueryParameterFromUri(uri, "p1"));
+
+    // Multiple parameters, some characters encoded
+    uri = "/rest/endpoint/someresource.json?p1=v1%20&p2=100%25";
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p1"), "v1 ");
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p2"), "100%");
+
+    // Encoded query delimiters are part of the parameter value, not structure.
+    uri = "/rest/endpoint/someresource.json?p=a%26b%3Dc%23frag&other=x";
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "p"), "a&b=c#frag");
+    BOOST_CHECK_EQUAL(GetQueryParameterFromUri(uri, "other"), "x");
+
+    // An encoded question mark in the path does not introduce a query section.
+    uri = "/rest/endpoint/someresource.json%3Fp1%3Dv1%26p2%3D100%25";
+    BOOST_CHECK(!GetQueryParameterFromUri(uri, "p1"));
+}
+
+BOOST_AUTO_TEST_CASE(http_headers_tests)
+{
+    {
+        // Writing response headers
+        HTTPHeaders headers{};
+        BOOST_CHECK(!headers.FindFirst("Cache-Control"));
+        headers.Write("Cache-Control", "no-cache");
+        // Check case-insensitive key matching
+        BOOST_CHECK_EQUAL(headers.FindFirst("Cache-Control"), "no-cache");
+        BOOST_CHECK_EQUAL(headers.FindFirst("cache-control"), "no-cache");
+        // Additional values are appended, compared case-insensitive
+        headers.Write("cache-control", "max-age=60");
+        BOOST_CHECK_EQUAL(headers.FindFirst("Cache-Control"), "no-cache");
+        BOOST_CHECK((headers.FindAll("Cache-Control") == std::vector<std::string_view>{"no-cache", "max-age=60"}));
+        // Add a few more
+        headers.Write("Pie", "apple");
+        headers.Write("Sandwich", "ham");
+        headers.Write("Coffee", "black");
+        BOOST_CHECK_EQUAL(headers.FindFirst("Pie"), "apple");
+        // Remove
+        headers.RemoveAll("Pie");
+        BOOST_CHECK(!headers.FindFirst("Pie"));
+        // Combine for transmission
+        std::string headers_string{headers.Stringify()};
+        BOOST_CHECK_EQUAL(headers_string, "Cache-Control: no-cache\r\n"
+                                          "cache-control: max-age=60\r\n"
+                                          "Sandwich: ham\r\n"
+                                          "Coffee: black\r\n"
+                                          "\r\n");
+    }
+    {
+        // Reading request headers captured from bitcoin-cli
+        constexpr std::string_view bitcoin_cli_headers = "Host: 127.0.0.1\r\n"
+                                                         "Connection: close\r\n"
+                                                         "Content-Type: application/json\r\n"
+                                                         "Authorization: Basic X19jb29raWVfXzozYzJkNTAxNDFlMGJiYmVhMTI5ODg3NzI5MTM3NTRmNThkNjc2OWMwZTYxZjgzNTgyNzEwYTY1OGRkYjVmZGQ3\r\n"
+                                                         "Content-Length: 46\r\n";
+        util::LineReader reader(bitcoin_cli_headers, /*max_line_length=*/MAX_HEADERS_SIZE);
+        HTTPHeaders headers{};
+        headers.Read(reader);
+        BOOST_CHECK_EQUAL(headers.FindFirst("Host"), "127.0.0.1");
+        BOOST_CHECK_EQUAL(headers.FindFirst("Connection"), "close");
+        BOOST_CHECK_EQUAL(headers.FindFirst("Content-Type"), "application/json");
+        BOOST_CHECK_EQUAL(headers.FindFirst("Authorization"), "Basic X19jb29raWVfXzozYzJkNTAxNDFlMGJiYmVhMTI5ODg3NzI5MTM3NTRmNThkNjc2OWMwZTYxZjgzNTgyNzEwYTY1OGRkYjVmZGQ3");
+        BOOST_CHECK_EQUAL(headers.FindFirst("Content-Length"), "46");
+        BOOST_CHECK(!headers.FindFirst("Pizza"));
+    }
+    // Ensure invalid headers are rejected
+    {
+        // missing a colon
+        util::LineReader reader{"key value\n", /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"HTTP header missing colon (:)"});
+    }
+    {
+        // missing a key
+        util::LineReader reader{":value\n", /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"Empty HTTP header name"});
+    }
+    {
+        // contains NUL
+        util::LineReader reader{std::string_view{"X-Custom: foo\0bar\n", 18}, /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"Header contains invalid character"});
+    }
+    {
+        // contains bare \r (not followed by \n)
+        util::LineReader reader{std::string_view{"X-Custom: foo\rbar\n"}, /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"Header contains invalid character"});
+    }
+    {
+        // contains odd \r preceding the expected CRLF
+        util::LineReader reader{"X-Custom: foo\r\r\n", /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"Header contains invalid character"});
+    }
+    {
+        // key contains whitespace
+        util::LineReader reader{"key : value\n", /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"Invalid header field-name contains whitespace"});
+    }
+    {
+        // Individual lines are below MAX_HEADERS_SIZE but the total is excessive
+        std::string lines;
+        lines.reserve(820 * 10);
+        for (int i = 0; i < 820; ++i) {
+            lines.append("key:value\n");
+        }
+        std::string_view excessive_headers{lines};
+        BOOST_CHECK_GT(excessive_headers.size(), MAX_HEADERS_SIZE);
+        util::LineReader reader{excessive_headers, /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(HTTPHeaders{}.Read(reader), std::runtime_error, HasReason{"HTTP headers exceed size limit"});
+    }
+    {
+        // Ok
+        util::LineReader reader{"key: value\n", /*max_line_length=*/MAX_HEADERS_SIZE};
+        HTTPHeaders headers{};
+        headers.Read(reader);
+        BOOST_CHECK_EQUAL(headers.FindFirst("key"), "value");
+    }
+}
+
+BOOST_AUTO_TEST_CASE(http_response_tests)
+{
+    // Typical HTTP 1.1 response headers
+    HTTPHeaders headers{};
+    headers.Write("Content-Length", "41");
+
+    // Response points to headers which already exist because some of them
+    // are set before we even know what the response will be.
+    HTTPResponse res;
+    res.m_version = {.major = 1, .minor = 1};
+    res.m_status = HTTP_OK;
+    res.m_headers = std::move(headers);
+    BOOST_CHECK_EQUAL(
+        res.StringifyHeaders(),
+        "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 41\r\n"
+        "\r\n");
+}
+
+BOOST_AUTO_TEST_CASE(http_request_tests)
+{
+    {
+        HTTPRequest req;
+        LineReader reader(full_request, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+        BOOST_CHECK_EQUAL(req.m_method, HTTPRequestMethod::POST);
+        BOOST_CHECK_EQUAL(req.GetRequestMethod(), HTTPRequestMethod::POST);
+        BOOST_CHECK_EQUAL(req.m_target, "/");
+        BOOST_CHECK_EQUAL(req.GetURI(), "/");
+        BOOST_CHECK_EQUAL(req.m_version.major, 1);
+        BOOST_CHECK_EQUAL(req.m_version.minor, 1);
+        BOOST_CHECK_EQUAL(req.m_headers.FindFirst("Host"), "127.0.0.1");
+        BOOST_CHECK_EQUAL(req.m_headers.FindFirst("Connection"), "close");
+        BOOST_CHECK_EQUAL(req.m_headers.FindFirst("Content-Type"), "application/json");
+        BOOST_CHECK_EQUAL(req.m_headers.FindFirst("Authorization"), "Basic X19jb29raWVfXzo5OGQ5ODQ3MWNmNjg0NzAzYTkzN2EzNzk0ZDFlODQ1NjZmYTRkZjJiMzFkYjhhODI4ZGY4MjVjOTg5ZGI4OTVl");
+        BOOST_CHECK_EQUAL(req.m_headers.FindFirst("Content-Length"), "46");
+        BOOST_CHECK_EQUAL(req.m_body.size(), 46);
+        BOOST_CHECK_EQUAL(req.m_body, R"({"method":"getblockcount","params":[],"id":1})""\n");
+    }
+    {
+        // Malformed: no spaces between data
+        HTTPRequest req;
+        LineReader reader("GET/HTTP/1.0\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP request line too short"});
+    }
+    {
+        // Malformed: too many spaces
+        HTTPRequest req;
+        LineReader reader("GET / HTTP / 1.0\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP request line malformed"});
+    }
+    {
+        // Malformed: slash missing before version
+        HTTPRequest req;
+        LineReader reader("GET / HTTP1.0\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP request line too short"});
+    }
+    {
+        // Malformed: no decimal in version
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/11\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP request line too short"});
+    }
+    {
+        // Malformed: version is not a number
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.x\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP bad version"});
+    }
+    {
+        // Malformed: version is out of range
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/2.0\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP bad version"});
+    }
+    {
+        // Malformed: version is out of range
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/0.9\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP bad version"});
+    }
+    {
+        // Malformed: version is out of range
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/-1.0\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP bad version"});
+    }
+    {
+        // Malformed: version is not exactly two integers and a dot
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.00\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"HTTP bad version"});
+    }
+    {
+        // Malformed: contains NUL
+        HTTPRequest req;
+        LineReader reader{std::string_view{"GET /safe\0/etc/passwd HTTP/1.00\r\nHost: 127.0.0.1\r\n\r\n", 50}, MAX_HEADERS_SIZE};
+        BOOST_CHECK_EXCEPTION(req.LoadControlData(reader), std::runtime_error, HasReason{"Invalid request line contains NUL"});
+    }
+    {
+        // Malformed: differing Content-Length values, case insensitive
+        constexpr std::string_view differing_length = "GET / HTTP/1.1\n"
+                                                      "Host: 127.0.0.1\n"
+                                                      "Content-Length: 8\n"
+                                                      "content-length: 9\n\n"
+                                                      "12345678";
+        HTTPRequest req;
+        util::LineReader reader{differing_length, /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), std::runtime_error, HasReason{"Differing Content-Length values"});
+    }
+    {
+        // Ok: multiple same Content-Length values
+        constexpr std::string_view differing_length = "GET / HTTP/1.1\n"
+                                                      "Host: 127.0.0.1\n"
+                                                      "Content-Length: 8\n"
+                                                      "content-length: 8\n\n"
+                                                      "12345678";
+        HTTPRequest req;
+        util::LineReader reader{differing_length, /*max_line_length=*/MAX_HEADERS_SIZE};
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+    }
+    {
+        // Ok
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\nHost: 127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+        BOOST_CHECK_EQUAL(req.m_method, HTTPRequestMethod::GET);
+        BOOST_CHECK_EQUAL(req.m_target, "/");
+        BOOST_CHECK_EQUAL(req.m_version.major, 1);
+        BOOST_CHECK_EQUAL(req.m_version.minor, 0);
+        BOOST_CHECK_EQUAL(req.m_headers.FindFirst("Host"), "127.0.0.1");
+        // no body is OK
+        BOOST_CHECK_EQUAL(req.m_body.size(), 0);
+    }
+    {
+        // Malformed: missing colon
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\nHost=127.0.0.1\r\n\r\n", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadHeaders(reader), std::runtime_error, HasReason{"HTTP header missing colon (:)"});
+    }
+    {
+        // We might not have received enough data from the client which is not
+        // an error. We return false so the caller can try again later when the
+        // buffer has more data.
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\nHost: ", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(!req.LoadHeaders(reader));
+    }
+    {
+        // No Content-Length: body is not read
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\n\r\n" R"({"method":"getblockcount"})", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+        // Don't try to read request body if Content-Length is missing
+        BOOST_CHECK_EQUAL(req.m_body.size(), 0);
+    }
+    {
+        // Malformed: Content-Length is not a number
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\nContent-Length: eleven\r\n\r\n" R"({"method":"getblockcount"})", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), std::runtime_error, HasReason{"Cannot parse Content-Length value"});
+    }
+    {
+        // Malformed: Content-Length is negative
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\nContent-Length: -8\r\n\r\n" R"({"method":"getblockcount"})", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), std::runtime_error, HasReason{"Cannot parse Content-Length value"});
+    }
+    {
+        // Content-Length exceeds limit
+        constexpr auto excessive_size{MAX_BODY_SIZE + 1};
+        std::string huge_body(excessive_size, 'x');
+        const std::string request{"GET / HTTP/1.0\r\nContent-Length: " + util::ToString(excessive_size) + "\r\n\r\n" + std::move(huge_body)};
+        HTTPRequest req;
+        LineReader reader(request, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), http_bitcoin::ContentTooLargeError, HasReason{"Max body size exceeded"});
+    }
+    {
+        // Content-Length exactly on the limit
+        std::string max_body(MAX_BODY_SIZE, 'x');
+        const std::string request{"GET / HTTP/1.0\r\nContent-Length: " + util::ToString(MAX_BODY_SIZE) + "\r\n\r\n" + std::move(max_body)};
+        HTTPRequest req;
+        LineReader reader(request, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+    }
+    {
+        // Content-Length indicates more data than we have in the buffer.
+        // Not an error; we wait for more data before completing the body.
+        HTTPRequest req;
+        LineReader reader("GET / HTTP/1.0\r\nContent-Length: 1024\r\n\r\n" R"({"method":"getblockcount"})", MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(!req.LoadBody(reader));
+    }
+    {
+        // Support "chunked" transfer. Chunk lengths are ascii-encoded hex integers, whitespace ignored
+        HTTPRequest req;
+        std::string_view ok_chunked = "GET / HTTP/1.0\n"
+                                      "Transfer-Encoding: chunked\n"
+                                      "\n"
+                                      "10\n"
+                                      R"({"method":"getbl)""\n"
+                                      "   a    \n"
+                                      R"(ockcount"})""\n"
+                                      "0\n"
+                                      "\n";
+        LineReader reader(ok_chunked, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+        BOOST_CHECK_EQUAL(req.m_body, R"({"method":"getblockcount"})");
+    }
+    {
+        // Prevent "chunked" transfer from exceeding size limit
+        HTTPRequest req;
+        std::string_view excessive_chunk_size = "GET / HTTP/1.0\n"
+                                                "Transfer-Encoding: chunked\n"
+                                                "\n"
+                                                "10\n"
+                                                R"({"method":"getbl)""\n"
+                                                "20000000\n"
+                                                R"(ockcount"})""\n"
+                                                "0\n"
+                                                "\n";
+        LineReader reader(excessive_chunk_size, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), http_bitcoin::ContentTooLargeError, HasReason{"Chunk will exceed max body size"});
+    }
+    {
+        // Allow (but ignore) Chunk Extensions
+        HTTPRequest req;
+        std::string_view ok_chunked = "GET / HTTP/1.0\n"
+                                      "Transfer-Encoding: chunked\n"
+                                      "\n"
+                                      "10;sha256=715790e8a3b09d704ac9641f42d183a5ebc5fd939663de23da548519ac2165e5\n"
+                                      R"({"method":"getbl)""\n"
+                                      "   a   ;    compressed\n"
+                                      R"(ockcount"})""\n"
+                                      "0;why;would;anyone;do;this;\n"
+                                      "Expires: Wed, 21 Oct 2026 07:28:00 GMT\n"
+                                      "\n";
+        LineReader reader(ok_chunked, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK(req.LoadBody(reader));
+        BOOST_CHECK_EQUAL(req.m_body, R"({"method":"getblockcount"})");
+        // Chunk Trailer was parsed, but ignored
+        BOOST_CHECK_EQUAL(reader.Remaining(), 0);
+        BOOST_CHECK(!req.GetHeader("Expires").first);
+    }
+    {
+        // Invalid "chunked" transfer, using roman numerals instead of hex for chunk length
+        HTTPRequest req;
+        std::string_view invalid_chunked = "GET / HTTP/1.0\n"
+                                           "Transfer-Encoding: chunked\n"
+                                           "\n"
+                                           "XVI\n"
+                                           R"({"method":"getbl)""\n"
+                                           "X\n"
+                                           R"(ockcount"})""\n"
+                                           "0\n"
+                                           "\n";
+        LineReader reader(invalid_chunked, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), std::runtime_error, HasReason{"Cannot parse chunk length value"});
+    }
+    {
+        // Invalid "chunked" transfer, missing chunk termination \n
+        HTTPRequest req;
+        std::string_view invalid_chunked = "GET / HTTP/1.0\n"
+                                           "Transfer-Encoding: chunked\n"
+                                           "\n"
+                                           "10\n"
+                                           R"({"method":"getbl)"
+                                           "a\n" // interpreted as extra data at the end of `0x10`-sized chunk
+                                           R"(ockcount"})"
+                                           "0\n"
+                                           "\n";
+        LineReader reader(invalid_chunked, MAX_HEADERS_SIZE);
+        BOOST_CHECK(req.LoadControlData(reader));
+        BOOST_CHECK(req.LoadHeaders(reader));
+        BOOST_CHECK_EXCEPTION(req.LoadBody(reader), std::runtime_error, HasReason{"Improperly terminated chunk"});
+    }
+}
+
+BOOST_AUTO_TEST_CASE(http_request_state_tests)
+{
+    // For these tests we just need a receive buffer for the requests to read from.
+    class DummyClient : public HTTPRemoteClient
+    {
+    public:
+        DummyClient() : HTTPRemoteClient{/*id=*/0, /*addr=*/CService(), /*socket=*/CreateSock(0, 0, 0)} {}
+
+        void receive(std::string_view s)
+        {
+            m_recv_buffer.insert(
+                m_recv_buffer.end(),
+                s.begin(),
+                s.end());
+        }
+    };
+
+    {
+        // Step through state machine
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        client->receive("POST / HTTP/1.0\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsHeaders);
+
+        client->receive("Host: 127.0.0.1\n"
+                        "Content-Length: 10\n\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        client->receive("I miss you\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+    }
+    {
+        // Read body over multiple data pushes, multiple requests in same push
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        client->receive("POST / HTTP/1.0\n"
+                        "Host: 127.0.0.1\n"
+                        "Content-Length: 10\n\n"
+                        "I miss");
+        client->ReadRequest(*client->m_req);
+        // Because of the Content-Length header we know the body is not complete
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Finish sending first request and include second request in the same buffer
+        client->receive(" you"
+                        "GET /endpoint HTTP/1.0\n\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+        BOOST_CHECK_EQUAL(client->m_req->m_body, "I miss you");
+        // Next request sitting in buffer
+        BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 24);
+        // Complete first request hasn't been moved yet, expect no-op
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 24);
+
+        // Reset m_req
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        // Read second request
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+        BOOST_CHECK_EQUAL(client->m_req->m_target, "/endpoint");
+        BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 0);
+        // Buffer is cleared
+        BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 0);
+    }
+    {
+        // A Content-Length body is drained out of the receive buffer as it
+        // arrives, instead of accumulating there until the request is complete.
+
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        client->receive("POST / HTTP/1.0\n"
+                        "Content-Length: 30000\n\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Body arrives in 10kB pieces. Each one is copied onto m_body and
+        // erased from the receive buffer, which never holds more than one piece.
+        for (int i = 1; i <= 3; ++i) {
+            client->receive(std::string(10000, 'x'));
+            BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 10000);
+            client->ReadRequest(*client->m_req);
+            BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 10000 * i);
+            BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 0);
+        }
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+    }
+    {
+        // A body sent in the same push as the next request is split correctly
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        client->receive("POST / HTTP/1.0\n"
+                        "Content-Length: 4\n\n"
+                        "body"
+                        "GET /next HTTP/1.0\n\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+        BOOST_CHECK_EQUAL(client->m_req->m_body, "body");
+        // Only the second request is left over
+        BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 20);
+    }
+    {
+        // Chunked transfer with state
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+
+        BOOST_CHECK(!client->m_req->m_chunk_size);
+        BOOST_CHECK_EQUAL(client->m_req->m_chunk_read, 0);
+        BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 0);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        // First chunk is incomplete
+        client->receive("GET / HTTP/1.0\n"
+                        "Transfer-Encoding: chunked\n"
+                        "\n"
+                        "10\n"
+                        R"({"method)");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK(client->m_req->m_chunk_size);
+        BOOST_CHECK_EQUAL(*client->m_req->m_chunk_size, 16);
+        BOOST_CHECK_EQUAL(client->m_req->m_chunk_read, 8);
+        BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 8);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // More data arrives, chunk is completed.
+        client->receive(R"(":"getbl)""\n");
+        client->ReadRequest(*client->m_req);
+        // State is reset
+        BOOST_CHECK(!client->m_req->m_chunk_size);
+        BOOST_CHECK_EQUAL(client->m_req->m_chunk_read, 0);
+        // New data is added to body but body is still incomplete
+        BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 16);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Next chunk arrives without terminal CRLF
+        client->receive("a\n"
+                        R"(ockcount"})");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK(client->m_req->m_chunk_size);
+        BOOST_CHECK_EQUAL(*client->m_req->m_chunk_size, 10);
+        BOOST_CHECK_EQUAL(client->m_req->m_chunk_read, 10);
+        BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 26);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Chunk terminal CRLF arrives with final (size 0) chunk
+        client->receive("\n0\n\n");
+        client->ReadRequest(*client->m_req);
+        // Body size hasn't changed
+        BOOST_CHECK_EQUAL(client->m_req->m_body.size(), 26);
+        // We're done
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+        BOOST_CHECK_EQUAL(client->m_req->m_body, R"({"method":"getblockcount"})");
+    }
+    {
+        // Invalid headers: error state stops reading
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+
+        // Request is in the buffer
+        client->receive("POST / HTTP/1.0\n"
+                        "Host: 127.0.0.1\n"
+                        "Invalid header with no colon\n"
+                        "\n"
+                        "body is not read");
+        BOOST_CHECK(!client->m_recv_buffer.empty());
+
+        // Reading throws an error, sets state
+        BOOST_CHECK_EXCEPTION(client->ReadRequest(*client->m_req),
+                              std::runtime_error,
+                              HasReason{"HTTP header missing colon (:)"});
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Error);
+
+        // We read up to the invalid line
+        BOOST_CHECK_EQUAL(*client->m_req->m_headers.FindFirst("Host"), "127.0.0.1");
+        // Buffer was cleared, client should just be disconnected now
+        BOOST_CHECK(client->m_recv_buffer.empty());
+
+        // Even if more data comes in, trying to read again in error state is a no-op
+        client->receive("Content-Length: 2\n\nok");
+        BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 21);
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_recv_buffer.size(), 21);
+    }
+    {
+        // Headers sent in batches that are below MAX_HEADERS_SIZE but the total is excessive
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        client->receive("POST /huge HTTP/1.0\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsHeaders);
+
+        for (int i = 0; i < 410; ++i) {
+            client->receive("key:value\n");
+        }
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsHeaders);
+
+        for (int i = 0; i < 409; ++i) {
+            client->receive("key:value\n");
+        }
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsHeaders);
+
+        // We're at 819 x 10-byte headers
+        // The limit is 8192, three more bytes should throw.
+        client->receive("k:\n");
+        BOOST_CHECK_EXCEPTION(client->ReadRequest(*client->m_req),
+                              std::runtime_error,
+                              HasReason{"HTTP headers exceed size limit"});
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Error);
+    }
+    {
+        // Client sends chunks that are below the limit but the total is excessive
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Init);
+
+        client->receive("POST /huge HTTP/1.0\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsHeaders);
+
+        client->receive("Transfer-Encoding: chunked\n\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Send 16-byte chunk
+        client->receive("10\nno auto updates!\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // The next chunk will be of size 32MiB - 16 + 1, below the limit
+        // on its own but not if it were added to the total cumulative body so far.
+        // We don't need to actually send or prepare this amount of data.
+        client->receive("1fffff1\n");
+        BOOST_CHECK_EXCEPTION(client->ReadRequest(*client->m_req),
+                              http_bitcoin::ContentTooLargeError,
+                              HasReason{"Chunk will exceed max body size"});
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Error);
+    }
+    {
+        // Ensure chunk trailer is parsed over state lines
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+
+        // Send a 1-byte chunk then send the 0-chunk with a trailer but no terminal CRLF
+        client->receive("GET / HTTP/1.0\n"
+                        "Transfer-Encoding: chunked\n"
+                        "\n"
+                        "1\n"
+                        "x\n"
+                        "0\n"
+                        "Digest: sha-4=deadbeef\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Send first part of another trailer line
+        client->receive("Expires:");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // Finish the trailer line
+        client->receive("never\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
 
-    // URI with invalid characters (%) raises a runtime error regardless of which query parameter is queried
-    uri = "/rest/endpoint/someresource.json&p1=v1&p2=v2%";
-    BOOST_CHECK_EXCEPTION(GetQueryParameterFromUri(uri.c_str(), "p1"), std::runtime_error, HasReason("URI parsing failed, it likely contained RFC 3986 invalid characters"));
+        // Terminate
+        client->receive("\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Complete);
+        BOOST_CHECK_EQUAL(client->m_req->m_body, "x");
+    }
+    {
+        // Ensure chunk trailer counts towards the headers size limit
+        std::shared_ptr<DummyClient> client{std::make_shared<DummyClient>()};
+        client->m_req = std::make_unique<HTTPRequest>(client);
+
+        client->receive("POST /huge HTTP/1.0\n"
+                        "Transfer-Encoding: chunked\n"); //   27 bytes
+        for (int i = 0; i < 816; ++i) {
+            client->receive("key:value\n");              // 8160
+        }
+        client->receive("\n"                             //    1
+                        "1\n"
+                        "x\n"
+                        "0\n");
+        client->ReadRequest(*client->m_req);
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::NeedsBody);
+
+        // We're in the trailer section with a total of 8188 bytes of headers.
+        // The limit is 8192, five more bytes should throw.
+        client->receive("k:vv\n");
+        BOOST_CHECK_EXCEPTION(client->ReadRequest(*client->m_req),
+                              std::runtime_error,
+                              HasReason{"HTTP headers exceed size limit"});
+        BOOST_CHECK_EQUAL(client->m_req->GetState(), HTTPRequest::State::Error);
+    }
+}
+
+BOOST_AUTO_TEST_CASE(http_server_socket_tests)
+{
+    // Hard code the timestamp for the Date header in the HTTP response
+    // Wed Dec 11 00:47:09 2024 UTC
+    SetMockTime(1733878029);
+
+    // Prepare a request handler that just stores received requests so we can examine them.
+    // Mutex is required to prevent a race between this test's main thread and the server's I/O loop.
+    Mutex requests_mutex;
+    std::deque<std::unique_ptr<HTTPRequest>> requests;
+    auto StoreRequest = [&](std::unique_ptr<HTTPRequest>&& req) {
+        LOCK(requests_mutex);
+        requests.push_back(std::move(req));
+    };
+
+    HTTPServer server{StoreRequest};
+    server.InitHTTPAllowList();
+
+    {
+        // We can only bind to NET_IPV4 and NET_IPV6
+        CService onion_address{Lookup("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaam2dqd.onion", /*portDefault=*/0, /*fAllowLookup=*/false).value()};
+        auto result{server.BindAndStartListening(onion_address)};
+        BOOST_REQUIRE(!result);
+        BOOST_CHECK_EQUAL(result.error(), "Bind address family for aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaam2dqd.onion:0 not supported");
+    }
+
+    // This VALID address won't actually get used because we stubbed CreateSock()
+    CService addr_bind{Lookup("0.0.0.0", /*portDefault=*/0, /*fAllowLookup=*/false).value()};
+
+    // Init state
+    BOOST_REQUIRE_EQUAL(server.GetListeningSocketCount(), 0);
+    // Bind to mock Listening Socket
+    BOOST_REQUIRE(server.BindAndStartListening(addr_bind));
+    // We are bound and listening
+    BOOST_REQUIRE_EQUAL(server.GetListeningSocketCount(), 1);
+
+    // Start the I/O loop
+    server.StartSocketsThreads();
+
+    // No connections yet
+    BOOST_CHECK_EQUAL(server.GetConnectionsCount(), 0);
+
+    // Create a mock client with pre-loaded request data and add it to the local CreateSock queue.
+    // Keep a handle for the mock client's send and receive pipes so we can examine
+    // the data it "receives".
+    std::shared_ptr<DynSock::Pipes> mock_client_socket_pipes{ConnectClient(std::as_bytes(std::span(full_request)))};
+
+    // Wait up to a minute to find and connect the client in the I/O loop
+    int attempts{6000};
+    while (server.GetConnectionsCount() < 1) {
+        std::this_thread::sleep_for(10ms);
+        BOOST_REQUIRE(--attempts > 0);
+    }
+
+    // Prepare a pointer to the client, we'll assign it from the request itself.
+    std::shared_ptr<HTTPRemoteClient> client;
+
+    // Wait up to a minute to read the request from the client.
+    // Given that the mock client is itself a mock socket
+    // with hard-coded data it should only take a fraction of that.
+    attempts = 6000;
+    while (true) {
+        {
+            LOCK(requests_mutex);
+            // Connected client should have one request already from the static content.
+            if (requests.size() == 1) {
+                // Check the received request
+                BOOST_CHECK_EQUAL(requests.front()->m_body, R"({"method":"getblockcount","params":[],"id":1})""\n");
+                BOOST_CHECK_EQUAL(requests.front()->GetPeer().ToStringAddrPort(), "5.5.5.5:6789");
+
+                // Inspect the connection pointed to from the request
+                client = requests.front()->m_client.lock();
+                BOOST_REQUIRE(client);
+                BOOST_CHECK_EQUAL(client->m_origin, "5.5.5.5:6789");
+
+                // Respond to request
+                requests.front()->WriteReply(HTTP_OK, "874140\n");
+
+                break;
+            }
+        }
+        std::this_thread::sleep_for(10ms);
+        BOOST_REQUIRE(--attempts > 0);
+    }
+
+    // Check the sent response from the mock client at the other end of the mock socket
+    std::string actual;
+    // Wait up to one minute for all the bytes to appear in the "send" pipe.
+    char buf[0x10000] = {};
+    attempts = 6000;
+    while (attempts > 0)
+    {
+        ssize_t bytes_read = mock_client_socket_pipes->send.GetBytes(buf, sizeof(buf), 0);
+        if (bytes_read > 0) {
+            actual.append(buf, bytes_read);
+            if (actual.length() == 146) {
+                break;
+            }
+        }
+        std::this_thread::sleep_for(10ms);
+        --attempts;
+    }
+    BOOST_CHECK(actual.starts_with("HTTP/1.1 200 OK\r\n"));
+    BOOST_CHECK(actual.ends_with("\r\n874140\n"));
+    // Headers can be sorted in any order, and will be, since we use unordered_map
+    BOOST_CHECK(actual.find("Connection: close\r\n") != std::string::npos);
+    BOOST_CHECK(actual.find("Content-Length: 7\r\n") != std::string::npos);
+    BOOST_CHECK(actual.find("Content-Type: text/html; charset=ISO-8859-1\r\n") != std::string::npos);
+    BOOST_CHECK(actual.find("Date: Wed, 11 Dec 2024 00:47:09 GMT\r\n") != std::string::npos);
+
+    // Wait up to one minute for connection to be automatically closed, because
+    // keep-alive was not set by the client and we are done responding to their request.
+    attempts = 6000;
+    while (server.GetConnectionsCount() != 0) {
+        std::this_thread::sleep_for(10ms);
+        BOOST_REQUIRE(--attempts > 0);
+    }
+
+    // Stop the I/O loop and shutdown
+    server.InterruptNet();
+    // Wait for I/O loop to finish, after all connected sockets are closed
+    server.JoinSocketsThreads();
+    // Close all listening sockets
+    server.StopListening();
+}
+
+BOOST_AUTO_TEST_CASE(http_socket_error_tests)
+{
+    // Create a tiny threadpool for the HTTPRequest handler
+    ThreadPool workers("http");
+    workers.Start(1);
+
+    // Hard-code the server's request handler to respond to each request with
+    // an incremented block count. Handle the replies in the worker thread.
+    std::atomic<int> height{0};
+    HTTPServer server{[&](std::shared_ptr<HTTPRequest> req) {
+        auto item = [req, &height]() {
+            const int h = height.fetch_add(1);
+            req->WriteReply(HTTP_OK, strprintf("height: %d\n", h));
+        };
+        // Can't call BOOST_REQUIRE from worker thread
+        Assert(workers.Submit(std::move(item)));
+    }};
+    server.InitHTTPAllowList();
+
+    // All replies will be the same size
+    static constexpr std::size_t reply_length = std::string_view{
+        "HTTP/1.1 200 OK\r\n"
+        "Date: Thu, 01 Jan 2026 00:00:00 GMT\r\n"           // All RFC1123 dates are 29 characters
+        "Content-Length: 10\r\n"
+        "Content-Type: text/html; charset=ISO-8859-1\r\n"
+        "\r\n"
+        "height: 0\n"
+    }.size();
+
+    /**
+     * A mocked Sock derived from DynSock whose Send() only succeeds when there is more than
+     * one reply being sent (send buffer length > reply_length). Otherwise it returns
+     * a recoverable error (WSAEAGAIN).
+     *
+     * After it sends successfully once, it continues to always succeed.
+     *
+     * Useful for testing "try again" logic around non-blocking socket Send() failures.
+     */
+    class ErrorSock : public DynSock
+    {
+    public:
+        explicit ErrorSock(std::shared_ptr<Pipes> pipes) : DynSock{std::move(pipes)} {}
+        DynSock& operator=(Sock&&) override { assert(false); return *this; }
+
+        ssize_t Send(const void* buf, size_t len, int flags) const override
+        {
+            if (len <= reply_length && !m_have_sent) {
+                #ifdef WIN32
+                WSASetLastError(WSAEWOULDBLOCK);
+                #else
+                errno = WSAEAGAIN;
+                #endif
+                return -1;
+            } else {
+                m_have_sent = true;
+                return DynSock::Send(buf, len, flags);
+            }
+        }
+
+        mutable bool m_have_sent{false};
+    };
+
+    // Simpler server startup than the last test
+    CService addr_bind{Lookup("0.0.0.0", /*portDefault=*/0, /*fAllowLookup=*/false).value()};
+    BOOST_REQUIRE(server.BindAndStartListening(addr_bind));
+    server.StartSocketsThreads();
+
+    // Prepare initial requests
+    int num_requests = 2;
+    // Use keep-alive so the server holds the connection open for all requests.
+    std::string keepalive_request{full_request};
+    keepalive_request.replace(keepalive_request.find("Connection: close"), 17, "Connection: keep-alive");
+    // Combine all requests so they are read from the socket on a single iteration of the I/O loop
+    std::string all_requests;
+    for (int i = 0; i < num_requests; i++) {
+        all_requests += keepalive_request;
+    }
+
+    // Watch the log messages to ensure that the first two replies were sent
+    // together. This indicates the non-optimistic send path was used
+    // because a reply was already sitting in the send buffer when a second reply
+    // was added.
+    DebugLogHelper find_two_replies{strprintf("Sent %d bytes to client", reply_length * 2),
+                                    [&](const std::string* s) {
+                                        return true;
+                                    }};
+    // Last reply should be sent on its own by optimistic send path, because
+    // the send buffer was empty when the reply was written.
+    DebugLogHelper find_one_reply{strprintf("Sent %d bytes to client", reply_length),
+                                  [&](const std::string* s) {
+                                      return true;
+                                   }};
+
+    // Connect the ErrorSock as mock client with the preloaded data and get a handle on the I/O pipes
+    std::shared_ptr<ErrorSock::Pipes> mock_client_socket_pipes{
+        ConnectClient<ErrorSock>(std::as_bytes(std::span(all_requests)))
+    };
+
+    // Wait up to one minute for the last reply from the server
+    std::string actual;
+    char buf[0x10000] = {};
+    int attempts = 6000;
+    while (attempts > 0)
+    {
+        ssize_t bytes_read = mock_client_socket_pipes->send.GetBytes(buf, sizeof(buf), 0);
+        if (bytes_read > 0) {
+            actual.append(buf, bytes_read);
+            if (actual.find(strprintf("height: %d", num_requests - 1)) != std::string::npos) {
+                break;
+            }
+        }
+        std::this_thread::sleep_for(10ms);
+        --attempts;
+    }
+
+    // Send the third request.
+    // If there was a race between WriteReply() in the worker thread setting m_send_ready=true
+    // and SocketHandlerConnected() in the I/O thread flushing the send buffer,
+    // then the socket would be stuck in write mode with nothing to write,
+    // the server would never read from the socket, and this request would time out.
+    // Wait a second to ensure both the worker thread and I/O thread are idle.
+    // If we send the next request too soon it might get accepted by the server before
+    // it gets wedged shut.
+    std::this_thread::sleep_for(1000ms);
+    mock_client_socket_pipes->recv.PushBytes(keepalive_request.data(), keepalive_request.size());
+    num_requests++;
+
+    // Wait up to one minute for reply
+    attempts = 6000;
+    while (attempts > 0)
+    {
+        ssize_t bytes_read = mock_client_socket_pipes->send.GetBytes(buf, sizeof(buf), 0);
+        if (bytes_read > 0) {
+            actual.append(buf, bytes_read);
+            if (actual.find(strprintf("height: %d", num_requests - 1)) != std::string::npos) {
+                break;
+            }
+        }
+        std::this_thread::sleep_for(10ms);
+        --attempts;
+    }
+
+    // All replies were received
+    for (int i = 0; i < num_requests; i++) {
+        BOOST_REQUIRE(actual.find(strprintf("height: %d", i)) != std::string::npos);
+    }
+
+    // Close the keep-alive connection
+    server.DisconnectAllClients();
+
+    workers.Stop();
+
+    server.InterruptNet();
+    server.JoinSocketsThreads();
+    server.StopListening();
 }
+
+BOOST_AUTO_TEST_CASE(http_server_rejects_disallowed_client_before_read)
+{
+    // DynSock reports accepted connections as coming from 5.5.5.5.
+    gArgs.ForceSetArg("-rpcallowip", "4.4.4.4");
+
+    std::atomic_bool request_dispatched{false};
+    HTTPServer server{[&request_dispatched](std::unique_ptr<HTTPRequest>&&) {
+        request_dispatched = true;
+    }};
+    BOOST_REQUIRE(server.InitHTTPAllowList());
+
+    CService addr_bind{Lookup("0.0.0.0", /*portDefault=*/0, /*fAllowLookup=*/false).value()};
+    BOOST_REQUIRE(server.BindAndStartListening(addr_bind));
+    server.StartSocketsThreads();
+
+    // Queue a complete request; the server should never read from it.
+    std::shared_ptr<DynSock::Pipes> client_pipes{
+        ConnectClient(std::as_bytes(std::span(full_request)))};
+
+    // Wait for the socket to close with an EOF (bytes_read == 0)
+    // 'bytes_read > 0' means the server replied to the prohibited client
+    // 'bytes_read < 0' is an error, expected until the connection is fully processed by the I/O loop
+    ssize_t bytes_read{};
+    char buf[0x10000]{};
+    for (int attempts{0}; attempts != 1'000; ++attempts) {
+        bytes_read = client_pipes->send.GetBytes(&buf, sizeof(buf), MSG_PEEK);
+        if (bytes_read >= 0) break;
+        std::this_thread::sleep_for(10ms);
+    }
+
+    BOOST_CHECK_EQUAL(bytes_read, 0);
+    BOOST_CHECK(!request_dispatched);
+    BOOST_CHECK_EQUAL(server.GetConnectionsCount(), 0);
+
+    server.InterruptNet();
+    server.JoinSocketsThreads();
+    server.StopListening();
+
+    // 'recv' buffer still holds the client's request untouched which
+    // proves the server never called Recv()
+    const ssize_t recv_bytes{client_pipes->recv.GetBytes(&buf, sizeof(buf))};
+    BOOST_REQUIRE_EQUAL(recv_bytes, static_cast<ssize_t>(full_request.size()));
+    BOOST_CHECK_EQUAL(std::string_view(buf, recv_bytes), full_request);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/i2p_tests.cpp b/depend/bitcoin/src/test/i2p_tests.cpp
index 08f3fade..4f9c89ee 100644
--- a/depend/bitcoin/src/test/i2p_tests.cpp
+++ b/depend/bitcoin/src/test/i2p_tests.cpp
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(listen_ok_accept_fail)
                 // reply to STREAM ACCEPT
                 "STREAM STATUS RESULT=OK\n"
                 // continued reply to STREAM ACCEPT, violating the protocol described at
-                // https://geti2p.net/en/docs/api/samv3#Accept%20Response
+                // https://i2p.net/en/docs/api/samv3/#accept-response
                 // should be base64, something like
                 // "IchV608baDoXbqzQKSqFDmTXPVgoDbPAhZJvNRXXxi4hyFXrTxtoOhdurNApKoUOZNc9WCgNs8CFkm81FdfGLiHIVetPG2g6F26s0CkqhQ5k1z1YKA2zwIWSbzUV18YuIchV608baDoXbqzQKSqFDmTXPVgoDbPAhZJvNRXXxi4hyFXrTxtoOhdurNApKoUOZNc9WCgNs8CFkm81FdfGLiHIVetPG2g6F26s0CkqhQ5k1z1YKA2zwIWSbzUV18YuIchV608baDoXbqzQKSqFDmTXPVgoDbPAhZJvNRXXxi4hyFXrTxtoOhdurNApKoUOZNc9WCgNs8CFkm81FdfGLiHIVetPG2g6F26s0CkqhQ5k1z1YKA2zwIWSbzUV18YuIchV608baDoXbqzQKSqFDmTXPVgoDbPAhZJvNRXXxi4hyFXrTxtoOhdurNApKoUOZNc9WCgNs8CFkm81FdfGLlSreVaCuCS5sdb-8ToWULWP7kt~lRPDeUNxQMq3cRSBBQAEAAcAAA==\n"
                 "STREAM STATUS RESULT=I2P_ERROR MESSAGE=\"Session was closed\"\n"
diff --git a/depend/bitcoin/src/test/kernel/block_data.h b/depend/bitcoin/src/test/kernel/block_data.h
index f4d693c0..c033c276 100644
--- a/depend/bitcoin/src/test/kernel/block_data.h
+++ b/depend/bitcoin/src/test/kernel/block_data.h
@@ -7,211 +7,211 @@
 #include <array>
 #include <string_view>
 inline constexpr std::array<std::string_view, 206> REGTEST_BLOCK_DATA {
-"0000002006226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f295badc0bdd9a2bc0955d12f337491eae4c87ba4660078c0156310284d47c6ff9a242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020a629da61ccd6c9de14dd22d4dcf06ac4b98828801fb58275af1ed2c89e361b79677daedb5fc7781c5907a88133cd461b4865e9a4881fecfb362304ad1806acf3a7242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020621716dbbd2d4109ecf95e3ad14f2e205cc2dc52e286e127009b8941d255495a16bb39e1ed66dcf600fd7eabd1b8ee77ec894a77c2eac0dcc3ef2a4400707f56a7242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000204b272fa0400818325978161031fed250a9d9713471c9b99be3d10e2350bfd632ccf33dfd714ce243a48150fcf6281ac3563de5418112606ee2cc09632f1ea406a8242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000200e99bd4968d4c5e58887c3a6f1b5e3830eed6aed635a1d7275b0361d9d69c24394c11b2414977058cb5ff828a13c1e28b342bb947c47f8b1fc1c8886c6355e03a8242d66ffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000206fe9a1ea5c1b6cb5f0a2139cb187ed8c3477378f92838999f107f912de0bf92b4d7385d0a84e58f7f8d8d58e6aecff0928b0c8fc13009ab0faae02650f9726eca8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000207dd73a995a00c5babb1d3084216e607775a03b985ae25926daad86307b04235713e113fa98f8656fa83b8f91124a8f988ab826138358cbc3a9be9216be0194d8a8242d66ffff7f200600000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000204f6b4fdd4e99aa10a724cbeddefe323f0042f4a3f6e3bd057fd4bd7a5b3ded6f710365157ed17e65cdfd6e4a0ee0c73cfb582cb14dbb879db7465682fedb6868a9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000205b86722a8356305226f236b66d49447b771236d91a768cf9bc0773addfcd1a3e203d91dd647210a031046cfccd099edba94b5cb0203ab1e7c208158c1c04d7eea9242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020bc72fce0ab3196fd3b49be9cf4669700f9aa66cf257f046dcef175bb78a079219f52575cd5c0c93b5b37cf9377230c0f4dd62069fcc6ddab1a0cf35ec1c440eea9242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f9e09a49780b8e3ae1b5e0da63887e81528cede0a052fc0ce7e7fe44ad09ee4b676a90f97480ef4e447335f1b9376c944381fb06d69b778a47248e5760dedf62a9242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000208bfac22a1b801218b55cbd1a36c86ba707d495b52d968fe24a89ef430c6f9c05419a2754a90f35ebf699288adfc71568252fedf46a2b731c2cc787d55e44e3dea9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020da91c8b0a3772de6a794c9bd40cf7c1f8b21fac91f99490e7d995d7d0bd52a4f69ad11d9c347c0bf88430b128b39f27b954ffcd48bc38501eba0a99dffb7969ba9242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000203956d8b72a0b1c7c1d4368095f6c1db60573c50827830b648ad2d6741d41947c48e9d057ff732602042bb46933568292bd57e76761273b7af178baf926cebe60aa242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000209c4249925fa49bddcd6f0917f8c6444d899d2d958c65e33da450e25687d46c4a8efcab0bcce7a6b22485598a2eb928092262c95f2ea233beab343044013269ddaa242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002057d9cf496a6ad859d1ea07872d5252a23bbb538bc7d1b08c8d9f0974a85e5e02b3db6b3f80920bbe3b22af1be2e9aaadcf80a154efaaffdbe490dfacb4d3a451aa242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff026000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b6fc1a61f7be52633d0a4b4c4c19f771f10bee3fc56588432391c5e97b776f738ad2ba58d06082ebd00d230f18adc6ff1b93a1d3174ae38a06182420b42fdc3faa242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d85d1bf880c7990a81b9e0267b68a228b48cb64845a580143e82bd663d0a0978185fd95f0baa50fb47a74aa8cef8c1399c293494b43012d63d964105bf0093fbaa242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002068ffadd19d0280c45ed8f0b7590dd75fed9c1009e0475d4668a40d2e143bab669b7092044a52f2177565d265abe12345db9fe2547dc3e3cb383b448da633b1b4aa242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002097dc68fc9d81183e84448af957c1465f569cac8fb65c074c845d64f19bd554104171f67fbd239999b74fdceee35ccc71fc59ef34ae332dfd14552a5d8acb54fcab242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020fa4af9a0fc0b0e9a0ea56ef4057a1a63e28af0df0899331bb075e539ec56ed679c4c2ad7a53ca7b1f3b7ef31bf7d585f1ad9511bdf22079b91b0037506b12489ab242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000202d10953dee9089d3920de4d1b7493724d70356df3c857c7d68ad4b2d806ffa4cc7871c5ea175f0eeed32fed65ad39aff543ff56da564b92513d293c81ed49110ab242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020fb21d2eff50f7ca1bdd3cc0723ea65ee398360126353f003d6cb3ccdedb6280ac6f409e9aa8debfb95a59e6ecb9af657726d9ddcd0bd1f1ac24a8eafb9b94714ab242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000205f4c345ddef72b4ef5058caeacc0700a66cc39ea3c1a2a18c317648cabf8dc402cc83f2d67a467a8717aa1879c41c5677f480ccbec5a8e8016f1f9ccd56aafc0ab242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020310433ad6123b7d5d9abb3bbac99aa342bbfd500226fb0716aff55f3699f353f95c43168d3378b7887a2d1a24743cf657c91539d417366f27be40cdc63a601d3ab242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020bfc0947de2b6ade4585380f94beeaeccef09260f0f1dbb8c7dabad11eb32c97e4b029e0f3109e37889b0eced5a40e1b9194df469883750646d0acb8145a4b287ac242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000203b8193f8ff6a02b88cd464cffda63591cb1786b15b9e8258f60327f63993da034d96fa8c632da473f2abcd001184d1812709ed52e9c2585308b28743ab7508e1ac242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000204f79cf2c133c2cc73bd1b961cf050c05151f0eddfcc3697285fb9a7a6ea1a755f6e0ae2538360972f3e0c31d87776219377f2c1652ed388e29dba79997119346ac242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d9c3964f9739a489aec83b9d91e0491348ddc3496aeaed7d36cc80b4d3df73455c30e26ad3209af4fb1594a0425254b96c1d9bef301b3e144f56019afef54fbeac242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b90e7f5b1147bc7acec7273f9a257dce321f9d6cf585f65155e6c59290e6247f65b6adb2f6b7d66e9302a37f0becd2cfc3db5eafdc280085b08a1d087f558109ac242d66ffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b22d487dd491c29e60fc3e8ba3dd959c5ff05848a2af269a009a683c1c22c5618eb631e42ba03c2e5b37d623a4c1c32771a7a3b603031767002f9c4c843f1cf9ac242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03011f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002034685fbc27dee9ddf76106dd351ecf20a89c536d020ae5b8164e53b1de2eef03a9c2bde79aea6556b7ff42c0db3ee63b15b19f036578a40be5e29a4e563dc949ad242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020969d6801100c0cff27957f003d5994bb6fc3e80537273412c2375cbc59edfb1462def50ab47b73e04189b9314b32f18b23c21363bbb1700bde5d6f2da8d7dac7ad242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002060121e480f5e68740e4ad5e35e43a9af8f3eb909dfe7a80b861af047f3cf2931c46fdbbf4a9811813d7ef66ca70a89a93f377aec9e42f8c7bd13d20dc42ef4e6ad242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000209aa005700a68ccfdfc158c9be0d62b0ebd757634407c2480c905758f803cf95392df59ab811f3f6a5b3b2fd508b15029971cba8c76ab5aadd215baee41c1ad56ad242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002011d5aa6137f48aa4a2d029beed939afced99ef19ab01bf0aeab4d88b999cfa513daa30f857b99deb57009b0a2cf5d37180dae06571b8d97deb3877f4e4b488d1ad242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020596ceadcb769b05d2b7fca9dee997da1a32952c0601a787cb8e23f2d3311976fff761af1a0911827c1fee0c638f4675b54146a3f17ad65f3228b6328a59e572aad242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020cac001eb2c15d3867146858d9b620735c9943430c966ff7b43bad91e7f45b509420bac972f1288b190117f815de318c305b4882e7bc8e00c3806b456d7bc9706ae242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000205ff85ba1a9bca61ebaa89e99126a41c976ce9024c9c6ea0c1d97fccb5ecbcd48e4ff003414a88179becf0daefd0565b6648da3fa8b1e9862fb7254d6cbc92b43ae242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d3e4f3325a799d70e469c418e7fce0f325c52be2ee1c190b84ff5b39d567dd2c4d34d12f298026a275ef66faf05c083d36200208e06ef39df4de88faaf51a8a0ae242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002005e0364263bb17cb112c7a6b49807abc56766ca9f33fce8e4d4e1a87d2497518814aa83fb0c65f975b273b20c3283dfd5d0d92e0d744627e70e816693704b452ae242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000209de0116300caca1392ccb3afdbe22c0ba403795c7e68d29b0e032ac720d72b322160702e162edb0da7f535d46fc0e608879a1b6d8a3784f18332c7aa7bad2e9dae242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002035420343ac819c9d40e6e0bd55957637aed404fa2ed236f78b1d4b61fb277602e40ee1a3a4f5764d49f9b352a2e181ebe4ae767e0058d38fdebaf88e7da4e9e1ae242d66ffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020ec89afed1c02ee80c9004de715b1a1394474a122b327770b000dcb7c29b7282f1ba36b2e0780bd43225698622c3c48a9ab99dec79445d3e7bc8d5ae8133576ebaf242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d5d5ff8551565d2217e6f20d0eace67ce50337b42f7168bcac7e87d4156b2446cd3d8d5d7ff930c84a26e685b99c22c60e5a0bbe57001b01e9b4a2a696480a3baf242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d9ec6348ab3f33d8bb73506326da559802ab477437422a00b3a1199b504bc55bf5425b45c0026fec9c3e2e16e800aa75a220a27848c373ace3c20a18a34fea52af242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020c5e4baf7aa27a6d5147063ebccb77e381b0a16939d7982507701d3a3b3e88b1ea7660119cb01238504850c2528b3b371cd1f5895da5e620fc0a044836257bf64af242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03012f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002009254406ac2f1028ea8eb2693b2cdb1fea047cb349d7b270b91ead7af5014e04b71fdcf9152e76b76c1808877df7bb8e379536d46a289fbce9a99b201fd61868af242d66ffff7f200600000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d17eb50ed977c27229578a938313b3d86679668181a4e01732cb52f95c116508f755809aaf681a5c0f7839f65813aa6fc171b2e5dcd87f35b13b49b5639016aeaf242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020100d4bdda8d6187537d88e810ce2aadf581802775bb74a9acecb6958c75de5251f5b24d57fc19c7f73451a559f0758188af4ab7be72ecb22996be0225b0fb099b0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020c3333013d49f646c18537154844d37f81871444b3fce3a68f6e165d7095546115937b90ed72637588e4184942469a3ca1bf183fa65b9c2785b4592ea609c8b59b0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002017e241077f8cd618734503d66c0ce828b7d1add601903160a3ae1531b8ea1e4ce69c66d64563657224548f7ecfd7ed3571fd5f6976205ec806d72f9aad95d352b0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020fa40c6e3a15a659ef582ad24f4a2c0a1c801978da4b573a528bfb0fb73c3cf121796631d479c9fa6f6bcc0c5c1f0cc91e10ebb56e3b6c2b867c0052d0924432cb0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b356e0e5bcd4f6454ed9e6f1adf91b466723b45963b02dcecf2e89c0d1045a24d453cc476a5662964ce6eecddb78efb40e1616223d4c7fd54f6ca84abdc87e02b0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020ad91fd99ff639b89af585c3b8708062a48ad19660400d204ef099c2d66d1ca57b0349eb1a161d04fc8222cfbc02b8a1ab964abc5744f2cd726b8baaef1abcc4db0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020bacb69ed2f63b38dd103114bbc24dd9b609f8b6380f1f362a05c3f85f9e6cf102a391905e006fcba723d56c6a3eb27efa4396ede18f9c50e0be90dc1e928f163b1242d66ffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002024889501a0da6ffd4e6252fd87464b9eb54dbf7b1c759c2ad154152c3d7c5b2e8c3626fb538921b3f59786de9e6ca2487b3a1f5c80a3d9dd82c27a6b1a6eac5ab1242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002090ea4ed8d0f7b230fd2efa6b5ffb07e5ee1efd59754e7900ff4e24f793c2d926f8481e6e63a795f646f1d06cacdd2d2ce7b176afa589337e869c55e864dfec56b1242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002079f76972c386a45cbd62d5cd1f577e36b2d37895ea48ad4f25b2aa6c386e483404dfb68e4e8a1716e151c7028c8c0ea9e80e9871c3d7f2e1f22b3a3d719fb2a5b1242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000203e5fb23077ce93fb1412feb53b3c6cedecfea12edf96aea02a2fdec683564750419ff40c0af3e1f9bd992edf37118f709abc770458bb5f73e64a9068dd6aa285b1242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000201d517a82a9ae83660d8c57aeefb14b57efaf3b93b22b43735597bd216af66b161ef125e5eb8baa3ad71c6364e0b9fe078e29f1b39091c478abccc05944bf43fcb1242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000201cf4a4d875525be85ed64be8200b4149ba224652f880f050f155e3dd0f6dcd2d170c26d30263760e6ad9aa8194f9ea6995755a57e0596010faac244c63315c3cb2242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020fca7eee11cd55953e44151448a37793746c05ace49d1281bb6f27772ed638b2b67f5446d2067d394ab55d0e78e6503e0df4da7137a910a4c06690750156cef79b2242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03013f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002011ad845546ac709706716ea309ea4b5dc058cd1be347db517f1ae8ae50c9361943aa4fa21fe9f64d97e0ed3d93894339eb6a84e834ad7e075033707b15a09b42b2242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020e78aa3452cf4007ade84710d761445534b0246b2c3b5b00cb88811e001b22e0671dc09c26fa4f6e119dcd72c5c20126f2365a75dfab9689aa1b67e4a95a19ad0b2242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000203fd33c4ecd968f1c4610e6f6f60e7c0f1af838752ba5366ed32510cb26b3043c14ad22a3591f48182ee74f23a1750f137b135cb9475fb201098f2bb4c2f1fdd9b2242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d6a39793d31cbfd1af6b33552d9bc2d5e0815877419b6d860a6893b1ebb1c4212bedb144bd378fd4e5d3b8c0be92aae4e95d8ec8618c2fa5b1dd912d8c1d55e0b2242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020afdcdd52d9eb6de8cd062fda1c9421479edad871ae7c27b99c48ee589e13431a104b8c78e72462da96c7f39aba43f890a86530d4fb56aee3d96c99c242d524c0b3242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b63b5fbee3b85e33873d93dcbf1d566c9081d4a63c6eca84fc96bba1c862520b64934cd71d23a22f62b2496bea8c64f064c4931a6ef4b9384b4a5090b8e27612b3242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000201a2c83dba9834c76997b89f477b345a47a9600cbf30bedcf4b380a0a11bc8132b6f5e54d82ccd88e8bc1dc1124e42ec2f2b1d943572d7f719c55ea48d5805841b3242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020567483e2c2f091af7cd71d03aafb7b85c5032516ed8318ad970e4db324853b344cec6bada693600b655cf4ffcaee0d2df35f7809ed9958da8345783b52a0d459b3242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002034b16f266dee682239831dc610d03d10974d8ad400a41fead6be3d03b94acb7cfdf201cf64bc3631fb44b4618cb6720bc1512f6a43eb414c5b1158e0e8505528b3242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002096977882289042f845b7bb3350a36f55a39cbe0eb0176a52b5c79ba1a1866d28fb87c6e6e90c3bf164a95415a90ca7e2c70742c5d0695a9ed8018c91f81af9d3b3242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020e7e2590b376f0c6998588a75bf37f0fd0f314baf7e49bce637d3237a171b027cce5b0adb066fd5710c534c446ec42d5ab6ab1881de91f18895a1a73dc00b9490b4242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020c1df8ae18a085032270a7955b95779b3dc188c2b11d91f35043d5799822bd00e768988e363807504cb4ff2bee0b38767250aeb8e2a783efa9128aed67f9f0330b4242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000207c4cdc374b98412c61cb0a9ffc15ea2bc2b6c957bd64f30e7da78797a514f014da8d366066fdc30df791b7be1c73f97d762a3d1f1bde06507a39ba65e2216740b4242d66ffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000208ea0c30cd8e4285b6cecf7a013a9cb1fb5980cfa5361720094c3f46315ddea440201a7e278dc70cc188e58afae9a080f5e982254dc556f22f4f160cbfb2ce9b1b4242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b49f1f2813fe4cf60b84013a7a66ee8069fef8fde1589f1bb7491a800ce16d1d94386bf1300a238e3522886fc1804232b1323bf39cd63543be53739e96a67058b4242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b9c51fa82b5f3be2527b4f36642f998780ad7424acfddadc457082eb0c51af33d38e3e20e32a812798fb9c16d1ff5978bb6a9700efce13c171e6ca1e4c7c618cb4242d66ffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03014f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002050877e42ef334dbf296d7655f56d9597ddffa49c2649707819cd908916b316026e0e9f165fb96149dc1cc645ec651d2c487f34cc59b34abdaca55d0bb52448f0b5242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002002eba642217e71e94334723645a3db397f8c83a8b7df5b4c7d12d566dd859014f6c8a924f88f3aaea0dbacb410d9a9d79ddb2b2d84ceee104539ed2663f6ff68b5242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000201e772bcb91c42f43cb65fa81cc72876b4fd20e59d54ceadb928d3a0d01829824638fdd743a87363f19441bd7d3af1193ec94ee31da28289bc1bfc37ce6292756b5242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020cb684c4d09354f8d2173240f3e4080b11d814d8d64ab0b851d0dfca5b67c021264c0b4d218b63f9ef8febd0c822d0c609219687d9a1d6ac2c73f50501a4dd89cb5242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b776bbe12a01c8d1d9e30a8e4d564074e939af2c88e559cd1bcd88f99943ca33cf0e756cf03b0b23d9b65053e309a7a54a26e4403cd3a3d3d31524a8af1500e3b5242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000203d36bee9d695e4ec54b8442cb62ec3062cb056d95391fa73b69f4867e88c6b376984a42255079b96908aab4f4bc5175852f3d54001a493d4f7a9d09d4aff0ae3b5242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f912ba814881103501d49c3df38e24ff541f6bfc816d4f8bb6db1700edb6cb3db125a06204d5694baf2c13ccaa2f06941adc3ae7d7f2449212644cea8659cc6db6242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000208b911ff262dce74ee321bf09df07c39930d53a3a10fd83c74ee4ee6eae13a2355e47b7886c2839c9d582d49fdf356a5c298b3f7c879fe4467b01cf7f951620d8b6242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002012e1e9a299907113c100c34cf54bfaf57a02c0767ee571d0b0d586957b867632b121f1d6fc22dcfa6fd87cc5ac11579cf7f81554536c4e326eadad0ece3cdaa0b6242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f4ce3aa3f38aef3c886d517a63a16d47c4392600caa85ff656a0829380d03e32a1a1289f4216d88bb0514d5259b8f03dcd05fbad650bcfa59cb163ff5b698e8bb6242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f590ec1e4d4e3ef13a520a71d67175cad4b9a279b0dcccfac471c658c995af0488752ae773a4154022507aed806c7ee50445a92211b02c10ff86070d353ac930b6242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020fb36f60f0a788d22d25ad7962333e107e142c1e797614555a25b3fabf2a57633ede3caa7569617ffa444d6d4bd3e2dba7e31085b1976f16d94c537c1d3462c0ab6242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020c4f5c492ba5ee620cbdeced3d2ddd6c6b3cd394bacb1a917774a19048e1ee64732e54ea8502d51b05bca7f981c5ac0f3918dd02dc178206f36957e6daf2a8121b7242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020cf0e39e15de40d780ac3bb7eb658a2d93d3f6266fae114f919fc343d08374c096c4d12d3e956a95499d46bd5781b02561da3c74cdb7715f0e5c1b649197c7c86b7242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020ad64f0c519b59ead1dd2447eba48daccb1250ad83f9f1d2a4e687085d099181024529c67ba916443394c23138c7202970750c86f8edbc81e9903a75e509cbc41b7242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000205a1116da770d72fbda72b39179312f45b3d3fb71e2492de5401715d81216ef0877e24b23c538570850108445173cfba3c5baa6ee6af16f807e7f56b772bb2933b7242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03015f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000205133fd567593e6d4abd3599c4aafd0231415165f82d29a0a1cf4c43e7fdddb68a371d48b5af5147d8cf8f4489d626985d6420f851bda7e70ccded3f95566ccd9b7242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000208d41770bb44ea7f13f2a4b679dd3af01ffe76ffae2b4c3e26cee308c1b76bd5333a5038cd81caf8e515c5f6cbed94ad8905bad2b17bdfd0327bb1cf41f306accb7242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000202f33147ca2f755af1d9f2836059620db687b6d97cf85d832c22901aaaadaa42584b88b0732ce3d9f69ab206742b348ee96a6fbc63c288f14795a8221548cde6cb8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000209aba329a818d2eb01da985e497050eb3d381d104674eefeed2ea14f2531b8716668688a5f4545d86d00bdebb0a007cafc530603c1fbb6d6a9f069a1d5f109fd0b8242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002071c804f177410c9942f1df0bc891b9ae655082125488df7e5c79574c9ad5a83b8e7509e225f8970ecd5638f968934560a3b99f6a3ec03a5dca7a9db5331ca713b8242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020617c4698f1f9b2a52fe2182cec78f469324a711cecac03013aaad0089835a916f9126503be1001080102ab122a123a6ccdff5a94017c15a6f14012fbb8a8fd78b8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020e54649f5adf59dfb18fd1370434cc76ef9a453762b17a435dafb580a19a5b868cb067747f9a355804335084c652f93548867e02050fbcec3c0ccb05657ce666ab8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002067232d9858897d86a155b92fb94b42353d765f0d2eaa095460a1ce297c3863051e31f463b5077ebdac1295d56461028fec70e8022896c54cd172a1fa685ddaefb8242d66ffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000202945795c2dd6b0c47c96d8ce65f0083cf20cd5760622b59ee895eff33b8d1a36ec51a1a1a99a971437b3d24f06190608cc2646842e3b3fda0b00df450f59ebb2b9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000204a4dfd3ceab29299d0c607c812ab2626cc1a8416870f5acedb9b81bac3807271f400a1a56b15e990c516b29a50a9a3725ffa77ea1661fecd37cea2e74c8d2b9db9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020b3bfe4afe33b5e0bbe6f4368e2e2b88a2bae140c03c811e87ce5cca690e3e31406b87a9f1d8a9d7af6214f09167857f20c61c842d9f9231e5399e4336040fb04b9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020a32a6b2a892b689df14f7c9c03410d3d3f93170e7e52fde74d044c1e26a1263168b9d32cd7aa7507c31758104cc2615250fd24f3b52cb887666ff6f0ec67e81cb9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000208a6eba5ccecfd3497234d5a3e2613432219c17415974089a4bc57e2063a8ef05074c42c456bdf4c1c163f1c5f9449710ec4bdf2a235c8c77b8acb0ecdf13e9c5b9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002001acb70779eb9d2ea47e0f4d712f3c53ed5adce6a5648f3424f9fd45c3afe619e4f0e50d89b209a25fca681be53f69ea2be9a77f7f90dab1fedf189630913dc1b9242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d71e5b9e74a151b78b3a08b892fb6c42413e72678245b69fb336d05d2ce95e2e0a448aa97200b2d8ed8f31df63f6258c37cc4e57f10bf391513646f458830993ba242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020565de0257565202598c3f694bf1a7016d49a7c6ddeeb114476ec452fda62231928c5aa1ab310a7f56b5f2719f9329b2b4547a19b31a378b52d3583a961f1e961ba242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000201b719fad536a1e8d485b159afa8042912824cd38e30bb6e084cb2d267531f578df5ae1d4bd3c57f48af225d738ad22c741af78b77c80b58ba589ed86c214602fba242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f404df02ce88cd268ed66c9acb0d67468318534f1e27e77d97bd5b60390c9678a5b354db44b69a99df4a92e3c49cce01869df231013ddaaab5e3f1bc03d81294ba242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017100ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020283fce509e2ef4684d5111303f968fe5b3964c6d87ebad2c0f2fd454548149054dbe5c69140bc662c90ede02f18a5558adc0047ff8eacba64aaea4e040ed867dba242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017200ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002093eb737cdd90ca5821280cd71e2bfbdef549c1e6ba380f03fdc1cccac4059b2560035e74a3f897390f93b6ed88250a1c2136ed516feb5a2a47fbed955e98bd47ba242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017300ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020011fc8df4a0c62a841431c4c45f5432ae969288b81af3c1dabc8ee1bc86ef050375c54b2ae535467d9179fd386ee6d9c4b33b16ea12f88f6256526da1636f191bb242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017400ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020885c040fa44740515fbe3102ea30fb4c2baa117e84fec25d9216b011ea36d271c62fc55485223a484f89ea0d4dacf68cc53fbc6af98bf3175338c5db05a4cfc0bb242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017500ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020ef3fdac73d38f9446f5d2a1065dd9020c0269a44b5e35648f44e8b1b86d7c15c8eb10a613be613468b8db3c70fe2871fa67d6526a3b4f11e736922d8278a82c1bb242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017600ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000206ee6d94eebdb0974650cae85c9d4cd035e07031e6918128e7dafb808fb9dc41284653ff9bf84237ad6a84cf6cf9817d3a361d805db6cd3daf7665e92ed00421bbb242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017700ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020a8c7d8435a99871c45680b464b02d8618b23ab0ac3dfeb93926e54ccc91528633dc26cc6c6895abe5dab4a6302cd192f40e9df8404ad4b1425ca7d6c2b5c9c18bb242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017800ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000208880a1808163e847db25da39ea5e8a505d7ce390a3b2dd363b0232ae19896c274ca90749f6d4974ea23a247402d638479a5eacdc3c15a050691acb3fefa44a7fbb242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017900ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000207d58853ff94add55234809e82d5ed08b330ebbbb6f21587f0728e2a164531f735d9bac48f7069d5d36f8a6f39c41dce36c4faa1a0c6531802797bd8a32ae96afbc242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017a00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000203574bd3a510891f0203282179050926b511c020ec1360153e1755b5847c596410acdfca82eec932a8b4d8487b0401ca67e281f007f5ee16a283bb5c848d051e6bc242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017b00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000207e3269b3416c628d055c6f078959b491563acb9fa880e27dee1629579c0a5319ad12cb821d869154d368363e677329729794ad9ae554c1489fd7165feb2942d8bc242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017c00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000206785e999e70d485458ad511b5d2f16bd66595597ffd0b637ec00443bf5facb03c969e25f87b232fc4d256c1e2366052fc7f6ec34924f2d1ce74a9f8391cf13ddbc242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017d00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f381fa4bcbe9d7e2fd4d1732e3fe21f57d466dafd4bc847a1accaf549ed1ed2a9c6d6d16882a64c72ccca6a0f6ef5094950a2b2ac9de6839b9e4a8dc3f1f5a9ebc242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017e00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002015982b33b232e16e0639402194bfe59ca442fa5eee0908e17375a639e21976492753bcc20325ac44a5f486cd4c417dd469d165fd4edca4f6200845547dfadbdfbc242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03017f00ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020fdca1940e53d9d932dee8475fe4d22268ddf7c1f75792445fdb1d06c810f8232e7f4422c02d71850c1141da19d6f25f3cde4d98c43a718315b3ae49719b9db69bd242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402800000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d9ecf917131051e0e7b5e58c351d9720bd25eaba552d24bd8c82c6cd71526c0f8b6a35e7520982795e0048f2337b2575a7716cb4902835bf69e2e20fd0c8b8a0bd242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402810000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020e4ac0576eab0dadad615ce687cc92164368a8a024fd6cde8aa6b004d9e5e324d9d55711809456cbdd053aef9ecdaaa6b1ed01843fcd0180a7837593628ff6decbd242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402820000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020e0ea9b2cfff8a497718a1ec66d7257d56214e17fce3bcaf7d7507e6a104e5768af3f25f467a26ab1bcd44c627a61dd7c6143af2847778f9854049cec23d73420bd242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402830000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020a6eb927d1f8a6361f4653f99495cc271c7e9e70f58daa8d54022978e2c59ee2f4f58274192e2e88ee248b835ab8ad410817369c07e1217bb4bcb2f1b17edbf2ebd242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402840000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002051534f847263fcb38cc601f71f2db087f405314e4c9a0bf21bc14c20af62ee28dbf43502bdb7a355fda5697c33f6d0e1ea8a708a101862e690dac25310b766a5bd242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402850000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002039d1000f53fbc4dece3d9637e183ac36a38d67cd14ab9c79a30777b2722db65f6d0e0b35f1f52add619cc15086ca69e3070c2d1c1dc473315d23b1a6d86c82d2be242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402860000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020a594bd4cde746fc3598f9ec0862576190f71348a027f46261d1e04bc84f83e5ba43942886ee1ce5ef626ee17558c2a7a06a2c2d5d5fd3394ffddb331d232177ebe242d66ffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402870000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000204e2d5c0399ebc5c5322f88cd10141451ee5a57522b8ab36036d20d29e38cb31862674f09e5aee7956ee09e346e8b3edb1d818d08a0b24661e3bf5644a4281da9be242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402880000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002088900a6bf9bd6a461d065eeb99ad9dde564952cec1fe60e4bea6d8402861ad7d7b70bc1ad5e7635d58387e0be8dd25734aec644243460381ea1b033785ad9f12be242d66ffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402890000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020528104150f16fb36a4e6bb8c4d6016d856e578cad9c56ac22f85c0f1fdda9c1c718dd079b4d6a3c606ae1e1d154383ed6f817ebe20e3b960f5eafe7700d682b8be242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04028a0000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000205effbbe5e95135f6e92840b4d82f67d28c8a5cce1d05484d17f173f2ce6af77621f128761961890dcf6bd1a80e5917a3638268db765fbb62f1fdd0fa16fef98bbe242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04028b0000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000002028148a9f61d6297295c1226f8768ba16023a99f09f4a954c5423f3cbdea45d2818f9b10a859c938977e0770c9ec1f4a7bc8ddd5967d7b6e16a2c47f86211c5d3bf242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04028c0000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020f7ba22c801cc57274aec68c1a156c14d2b0e158aad723c51322ea6a3bd64605b136c0a30a4b8d8ae9fe01b8d919ecac7f402e2f80c1e8bc810c6ac0bd96079d9bf242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04028d0000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020d3069ec8d092fe171fe9b79495e8e7f24db5a43e8e8305dc07f996d1b1ce656d6b79597cb0a1d85caed7164c876f3ec67519c1a7fd2a4965308e27268cdd6167bf242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04028e0000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000020eef72272a0bb5ce0528e10c290245854e50c789001ac1609622e8f6488ace5373748c28419442c3e60383f1fc14e54d1c681c6681541a68c3e361fbc2fc523cdbf242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04028f0000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000306896592a3ea4dbf8c19e9998be4ffa03827943679a4204712120e3359fdad25c9614019ea5dd11c3d38422f8da66631fed6531ef5fcce927d81ea345b1fc679bbf242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402900000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030523c6ef8cff479608a467a02bca097b2961679f3de0cdfc57228fd95f4c03401fd0ae1181844f2dc4b81fd0866f072a97bce11a7722a2a1fff557abd06a36151bf242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402910000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003012ac3be42309dd4fbfcc02f207b6d5956561a09aeb4d982a22202f052a96494fbdc972daa895af0e662ac30583a35a82f69f584d9ee665e7ae772e3c785577dcc0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402920000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000303a366155345aa1cef44a5812ce6b2ff9c116fc23110ea771b9217bf2bb75b243c9fc73b65ca6afeabad323d62e01d206811438b3813cf3d7d74f00aad7f696dcc0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402930000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030afc514228a275473b190113664494a28813aaeb666d75ca024d35a07e11f0b6150e67c4abbf2b31ed6be994ee951a5d85fe749604b48215b137542c77340fd5bc0242d66ffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402940000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ca9cd2fea2556b65b16f8a3dc0df73f0aedfe3e9418c1da993e07a05b94b9b59ad94efec2ddbf4294b649020f9cb94354c589f52629aa96870e4e8f035f2e13ec0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402950000ffffffff0200f2052a010000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030782ca7554e8c8d7a68ec7c434ce41cf62317b392862f8d6359475d2f7636f02d5957028a93c2f78343a408b08780a1a1972734f3c638f413ab118e506057c176c0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402960000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030f3e0a0f98274250e5c5a56ada49bb294014c42f402f6a2a43b70d4fcd2a1047d78abb1f53c713cd9d7b882d90da4c5390a52c76100691cb934d70c268d0f6408c0242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402970000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030bf1e2925ae124de880bdeadbe4f1185e2efa1a260fdc035739edb6eccf765a3c559f1f38c185ec86dec065a565a5bfe3810aa5247fb101f32e19cb8935c61e31c1242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402980000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030f2b1ceae06ded56e1a1111960fdb03c65271cd43cc457e5f57ab3f42f23d721eb7bd2cf81b97147a112fbf47300df0a013fe558d0c2600aae71db8e39ec4a478c1242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402990000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030cbd7bfd6450022971e585d82c23d239822b4bd3da3906928ab19b9f44e5d1b42b7a7cea58cb4b63301e3bd15a9d5d58eeb7fba20a48323b0d9945cc683fe8874c1242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04029a0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000309e52161272efaede1503987717d6bfacd6594d2276683d4c099626e963455320bfebf0b2330ec760e02160572e43603f1e5e69d52af960792eb5a4ed4a9bc977c1242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04029b0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030c103628b91423bf5db4c914aecdd3d4e2c48fb5cb91ebf0cd708ef88c88cc371f81cd2e6fedf8a37b690c5821a11c8d03ef27807a051f5889bc9564468bb30abc1242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04029c0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000301f4dbf901f4f9d926be445a1f695ed3f9848d59b35c7c58832ee5ef494c20d12a3be96b275a338a754506c3065e5cb44f4fd811d2cfd2713cad39a9110666dc8c1242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04029d0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030f928d5d5385bbc2dfb5d47dfa27398852d3c94c44f9aa7450c8f1831f6bb851b25cb218eeadded201e0c24ec3253d76c9b2b1e2db5882f6f3c14e7e846ee9756c2242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04029e0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000305200b0568130df45b7557865de1951b9ba362d3aabd8dc05dde24df270a5d749076caa6557eaa0957a4bd26fb095f2a24953f050435d76225ce8aac830704fe5c2242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04029f0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000302412fe12a8b1840a603a75b37fdd993cb428cef5b80bbeb43f6f1708bcf27228d1ff6c324e38c591cdce25129abdf3aff8107b2977c6857cfa4156685ea4096ac2242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a00000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ed743e953e5b7dd2dbaa0cbb66a0522a82d95ba2ff25a106b0e0cea9467ac319fbc639f5973aeaf28baa746a9842cea53ba856f61cd3f8e15bc877c7d2e6bd54c2242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a10000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030c0470068ec5c8b7147f38056f2b86123cd8dfd4e2a31847deed98e6146960d5b97a8de23543b199d5d41a213fa2e7207f13c6b41ee813ed7c4923e6f9d18aeffc2242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a20000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030bb7e921ba07b033b3016a59f0231fdb867055c80a9a64f32c071ff1606e59e4389769b2d99c13d9ecc4dee5a2b526a5f7ec8adcb57b93194b24bd0ae0302dfe0c2242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a30000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003026a1fc16d183319d97d94cd2a7d08e720680d1b85efa2a1f17ba2768b4d4a74b08f1ae61c9e69a6ca2c7bdab9bce0dd62fb7910ebf9afb4d0a75a2e5ca764978c3242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a40000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030191d904eab263db4f41436d6fe042e19748d348bb607a55408f8666b2fef6f487b8a6baddc9abe0a4b2158dbb8cfa1bc8260f1efb1ea8d1aea5ccaaf96420ce7c3242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a50000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000303192c014b9f2c858461675988e01a7dfe902408257ad8db9467ad5494b0f80327aac980821ff362fb59cca122ba25d35bc825e61f22c09fa6b64f51d89115c6ac3242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a60000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030da309b9a623c525c5e01088abcabf0eae387a70631d69ddd2e2c1eaa366e7d08e1a0044ba616c9ceacc1f39c6e61b14bb43a87be69880f639f67b5a7812d6748c3242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a70000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030c3fc841e455cb7ab8e83c1b45a9230692fc6bf54219e39cc32bbcfe264f21f195eacb3bbfc83ff7a0cec7c88c37e9da4472a4281967559a84ae1fe977c639465c3242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a80000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030cafc627aeb714f3e3cbef65c5b159aed545850b9da4ef99d7f0385da2e913f2bc5c17aab7d0a0bd0324bf7e9e2ef88c63641d620846ffb18cc8e0f925028451ec3242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402a90000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ef971a009d01509dd152bea0007051559a58c301e9c3dc63535b944a7dcc330eec01b322a6a7ba1396e610c9f4da69779499325463e128822dac6d80bb62b268c4242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402aa0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030297d2fbcc84a9fb61effcf30564b348f2a51cb186e0b1ffd5079e9c3bd1939563f314e6e6b92d1c73edb47b21f8008aa225c8d87f59391d1bfd1f4acdce6f56cc4242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ab0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003022cfd9a1068f864ea0ca15f4b661085d383433208076ec04b6df4fcad5ce124bf648be1eb086be6bef7fd65911d9849acf56dd9cf24798e18054ab2088e27eabc4242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ac0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030972f66a342e8bd2e912aa28056a394e5bf005187001863d8167ea2c059164e2ea64d068a4a72431cd97fa126bddc9e3a6fc6262e131df47328156ba5ee2dc118c4242d66ffff7f200600000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ad0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030890dfceb5d573e6afb97b8c945a19fd9b6601b992f80015762a528af6626f8411de57cbc0f26848ec7c4541a263b2314a1877dfaaf53a6a0ab03ab0abe4fcf40c4242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ae0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030e54b3b165ef52498f0d9af5774a688138978efe75480aa01ce606dec5876e217c1c051b9ef4f7c236a2d892bf98e108f1193f7c67e163d748a321c5ac1d9d554c4242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402af0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030b87cbce490f46d3723f498d44df05c6613d44322acab1740e05a1d54bc2e0f44388078387e078f1a0be7317c7fe04d743947c5f3f9e06072a7a8f01f013e4e63c5242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b00000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003089c4d7eee1aaca1d091f31a4b465a16a450bc95f043a9214674f2564ae04086493e5c1d30bdf998345a6ccbd20201f78dee8972b439b228f02b590ae13b66f98c5242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b10000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ca6a1ebf54b1f62313cb32e7af2b6469135d8da9577123b62b334eb1ac8fb320367bcf29d785bfedb2cc1fa040c593783d35f7bcf6b70a9d98cedddfbaa61e8cc5242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b20000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000304fe071de37025d5868caf920761986ef0890a3891e053d5452b0852f01bc7a5b2dbe8a30d7a8285ff0e99e3b72237711fd0418d95a44600a4a5b78d8b5a6798cc5242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b30000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030642004a67b3c8fca45516672d59a145e74f3c02608b8da5998c27c8f2b05b43fb396262680ead34a6ba6f5ba19f617606b1701557179c21cfdb3e41f093e9343c5242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b40000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030dfdef61d552422cc6db6a31cb38c74efea160cdc926995461f47fd52faef3b22bbf9c570efdf15b90cd17669c4a8dc9525ee6242025979af18efa0be7d03edc5c5242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b50000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030614dfabfee3a6bc50d775748ac679472f0b1f708815fd172852baf66b7a64a410ecb1ad68cdd78f7240b80d015f922416560eca040398546a74c33106b27c791c6242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b60000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030d1f6ca10190578f7f789b8785fac043da1a06ad81e4055822cf20abdac7bd64fc5874b1816bbcd03595404faaa17564297bb17ef68b81ff29533c67d1b5c5346c6242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b70000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030eb118fc656ccb168532745325675f577f370656ec34e3303864084d4cdc9714b37c8b3a9d2547935a60a2f082d5d666177305c98056991dcedabd6ce41a75e42c6242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b80000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030881184d8fc0997d5e87cd069a1812ffbd938ffd2390885d15e408658e501da596adc753f17f3b1dd6817d1d593b6196e9696bfa90d179cd0d050dad2532d44adc6242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402b90000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000301aa44b363c58124b22d51178e70b86f976f8e94a5ffe9696715056e9b20e0c4914d14ac8da2625d3da070be3d2522164f9e3f34528526955d71565b5fa2a7bedc6242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ba0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030d5c81f5d6b9188adc202327d5c2769f00e6aafdf01e6910c676e99434d1c413449ea0d2ef2775f6ae5f5673b9db020e44d417e01ad9a691e105f5c9ae2f709b8c6242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402bb0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003055a4176e66b3e691ced84c0d7184d220a1fc7cf17832a2ed4892e801c713445463ebb3615a6113c2ddfd4e0f5b8fdcb2aae912569d3530f983f57950bbb9ca24c7242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402bc0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003013a50d5e9a17079b1bcedfb6426bf7c103cdf7ac353d196882dfb0a0f7dcf26d48418e7eccf5663344566ac283e4af41c74f503dd42048e1a731c3ce73c87485c7242d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402bd0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"000000303da965bc08fba52571473532c1ef4cb111e9344145fd7a6065c92d32c4e69079c88b8c63a7bd7ece3410226cda39d0fb5dc4e1b4cb560967f03e12d7f155aafac7242d66ffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402be0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030c8cf32d32cbc1e5fcb6c2b75520618a43dc714a16706d3a48ec68f56e8cc593adc15d4d1680537df08abcf0ac08661fc7ecd0b9267f207d7085a954a6ce2da8cc7242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402bf0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003004c981c749b4aca574fbeeba545cebc30f91e2b8df3ceb494646b0ecbf3ebb610afe1bfdd7ea9110220eb1f102ad69407d6c44026c4dd4bf9267d730c160d288c7242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c00000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030b0b058777dc496676cf990be016117d99fc5a93226d54b9b4f01bd08ef32736f707f2d27e9384ae46a08956185b5b080911b9eba89dfe48260276d09f910c3fcc7242d66ffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c10000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ea8cd2974aa0ac6360b960e089a6623b7bdd4152439d05c63bfba1599b64017d4d4173c3e12668297d23cf91d3141ee01292580dfdd70a2e6fa30c4764008f37c8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c20000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ee8db336dc2ba9f85bad141b115d9ce729ef0cf4e274adbc88947f3533e7ca569e6e65dea6c09c9f5e3c8d098550588cda81f92dc5d7ec04fc9965d97dd1ac6bc8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c30000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030a06a5e0b84c8e72a07ff38dbfe03fb8e7ce1f14f3f2632d4e12f573e6c61c756a7e21a865926b8cde1305c83dfda2e7a01591dae642a4402d2d298406349f39bc8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c40000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ecceafaf947906cc86bbedb1b9556aba9efcf4f12a19141421c2cfa030d5a17ae1e25e046cf69c4fb9eeb1d07289f46f0cacdf1301619850a3d693935476e819c8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c50000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003097e27bf8d0148c851ad5c3409a222a741ddcbc5c71f97df87384c3d1e316e46e427060a13cd91b94eb4bb2317db64406657ab250784a67fc783c00a24f3b6fabc8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c60000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"0000003098fff5fab49555cda5da113c679f2da07cc7c5696067c53d84d7bcaa71a5cc351cae4b9e2fd5902a4e0712ee59fd918a3813554eaa3ab06e73c189ae6f22b995c8242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c70000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030a1a12a3a010a3f69123a30427ce886f3d4ca42f9fbf820ebf6b00c2089a0b30ec547103ae3dc470f3a8b999ed75068d150750ac0c549f092c51c9689cb1bc1d2c9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c80000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030da2688ef7d466cedea6d3737af58fa34de69d022b5d1dc7bc0aaa20112b40a64a99d65b68f1c7f04efc082a98e14576c01427515cbafc1f5c3d31f03ee3bd6a8c9242d66ffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402c90000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030ce6cffae4dfd294aaea39faf38227c96dddbdb4886110e85a1210fdba385394c47701cf5bcc054e5735e889198512b4be2c715af77b490445b78841df7467cd76e252d66ffff7f200000000015020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ca0000ffffffff0204040395000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9edb28b5f3f52e0b50acdf4d68f04866607c565426ad9cf46532333e47e76c4e599012000000000000000000000000000000000000000000000000000000000000000000000000002000000000101d453cc476a5662964ce6eecddb78efb40e1616223d4c7fd54f6ca84abdc87e020000000000fdffffff0273101024010000001600140b500a01c9926e36f8913967382fd767a48309a200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902463043021f1921216d69304c9f523fabd39e12f98dc0c2d9d4598c28494c92b065d25a570220121ae3ff0feb349b7f357bc6bc98163da82ca63f6ae51fcf791ff0c40a068ac701210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc9000000020000000001018efcab0bcce7a6b22485598a2eb928092262c95f2ea233beab343044013269dd0000000000fdffffff02731010240100000016001462eb8d4bafe68555c2989cc1103e1066c9f276ef00e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022001c31890216ab85af755b4a2f2be55901da8a86ff32bbb7b7c2d126ac284d5f10220440873615edf764d686a4220533b1018e2b062dd0035adfc47833925c6d2863201210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101e40ee1a3a4f5764d49f9b352a2e181ebe4ae767e0058d38fdebaf88e7da4e9e10000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf9731010240100000016001430fc806efee1bc097ab6d0a7a40edb4fa6c5f875024730440220373c65fc214f2119d55b1fa4005d849271248764bbfa39aa1aef8246f34cd9db0220536563302153be01f6ae6bf5e44833eb6a73938777d555e94ef7ed67b55b39c901210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101a7660119cb01238504850c2528b3b371cd1f5895da5e620fc0a044836257bf640000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf97310102401000000160014fbc2a67ea3ea1bb1e77a9f198492301cde68808102473044022072fd8ce1b7342ebe2bf42f0b90304260f55ca21c22630a19ad0ac8ede04d42cb02200f00c7e9093ae0c38cd8d5ca52c19bac139205c535959065b77a49eedbcb588601210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101f9126503be1001080102ab122a123a6ccdff5a94017c15a6f14012fbb8a8fd780000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf97310102401000000160014cf9382f4d7b111dc9a6079a7ec4093579eb1ec4c02473044022043ed9deecd32f4ba5eda9dd6c5b22ca3ddd62b5088ad98cd1243141b40f24a0a02207b7f01853b52f43a5c0adbb9a298f2ada4a7d1c50626a590fdf4b8b814fa8c2801210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101f8481e6e63a795f646f1d06cacdd2d2ce7b176afa589337e869c55e864dfec560000000000fdffffff0273101024010000001600143cc73ce98fa4d14a97d520508ea35321261335c200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90247304402204783bb9fcb96defb632109c940467a4e1329141252d64337393e1423c021fbf902206346be30e066251f1e47d808889fab87f2cc4a0579c946b1f7e3180d4ff5207f01210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc90000000200000000010188752ae773a4154022507aed806c7ee50445a92211b02c10ff86070d353ac9300000000000fdffffff0273101024010000001600144599ebc57adaa82fce98d5f1f7bc4c5d0941229b00e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90247304402200b7dafde98de409ed4d17123a0d4c7d83f54cc80fa06286f2b0a8745b8e4591c022026e88d230997d26df64f424cbe615d4dce08346bff33b3b41c7e59b462a8695601210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc90000000200000000010104dfb68e4e8a1716e151c7028c8c0ea9e80e9871c3d7f2e1f22b3a3d719fb2a50000000000fdffffff0273101024010000001600147c32dc8f23a36d63db4625642b8c3f357b001a3300e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022042aceecb3bfce5af639f229767add6cb2170d0bb6e347f4690f5c1780fa83f7a02204f216de36e53bdc083c9a589562eea188dc57b686b61dc7da41ef13ac57a4b5401210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101419ff40c0af3e1f9bd992edf37118f709abc770458bb5f73e64a9068dd6aa2850000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf97310102401000000160014d6b971b45081c0582490c9f25fda175d1b259daa024730440220766457d5e220650cc2096f88c98008653d60bcff5819afba7da73258b9f29af8022035a7a8114c9c9049ddec62c8cd8667c1a9c001eb3c0e876c4018d9ad1c870c8801210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101a371d48b5af5147d8cf8f4489d626985d6420f851bda7e70ccded3f95566ccd90000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf973101024010000001600148685fceae319337a6699ef31db3d4491cf92d8fe0247304402206aa124c919ed0b528d63586f6d99c5e3967009eb1d3e1f9afac8060d3512b16c02202d704a606700a63a54dfc9a6ba4b4b00a0cbb4d9c3e0ef8a489d1d4123302d9701210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101f755809aaf681a5c0f7839f65813aa6fc171b2e5dcd87f35b13b49b5639016ae0000000000fdffffff027310102401000000160014dc3e3243ec881764f7f035964d76d8357e79b42b00e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90247304402206443a6518c03098a0bbd70c55da424db5a88a1a8cd80ef62ac82abc9b602008f02202ffba095af191735ca4c21b4ef47452e64444a33c02d0b03eb5a46dce698812b01210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc90000000200000000010177e24b23c538570850108445173cfba3c5baa6ee6af16f807e7f56b772bb29330000000000fdffffff027310102401000000160014b14bdfa016b84feaf1b05bd95e20c0068132b3c700e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90247304402202055189e7da96f886fd7c74a7b54b5c86ac43c6314d2fe632032cceb30a28d4902201561b8e26205aa1f511994e173d66faf0f9f7863a4e0871b0127f8995464c6a101210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc90000000200000000010132e54ea8502d51b05bca7f981c5ac0f3918dd02dc178206f36957e6daf2a81210000000000fdffffff027310102401000000160014003af378d78fa39853a9a1eb44f6eb9191e10e3500e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022009d2f74ba74478cb0448dae64c2556a201db593cecb3f8d3dc10e6de02c48c2702203cc1ca65ee946cc5f94124ea69e2d6e889023eb9420d5510758ef94d16a3b9d201210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc9000000020000000001012a391905e006fcba723d56c6a3eb27efa4396ede18f9c50e0be90dc1e928f1630000000000fdffffff0273101024010000001600148426ebef3d7b6a7387631e039f5d476d85d8a69300e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022040b80710239e68e217586fb076c08feb4a561ec2fac44c64ea95fad5b20832480220266c364a85ec127063f75ccf5a8315beaf27b68fe22c253eb354577754bc230a01210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc9000000020000000001018c3626fb538921b3f59786de9e6ca2487b3a1f5c80a3d9dd82c27a6b1a6eac5a0000000000fdffffff027310102401000000160014e5b0f788e3292352bf385cdfe9236227d906feed00e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022020ca43ccab85b1b847a25d4f51fd393bf4aa691b32e0fc80c91c3f893cb52b21022045de9177f9b686dc458411e5d1a8095e55c7251f55930f261c92c68374f5e9d401210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc9000000020000000001014d96fa8c632da473f2abcd001184d1812709ed52e9c2585308b28743ab7508e10000000000fdffffff0273101024010000001600142e6ce8b48bafa38443ac0a9a049c915a84d07a1d00e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022070429e86aea4db84db3c3eca4085efd777c36960bbd2f1be679db4f34a148ed3022068a0a3f902092661c0a5b42e7218b7719ec362b7dd48ad95b1c61c1072da858001210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101203d91dd647210a031046cfccd099edba94b5cb0203ab1e7c208158c1c04d7ee0000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf973101024010000001600142bb1130afbf9c9175db6e825ef21ff6ad967903a0247304402202f128ce7b6ee67bad85e4b1ff7bdc6dbd852dd0468073a0780d35e64e864ca9202203a50a4d0aabe6961696150e6dc2da7053c10a77b42b3dce93d1e168daa9a568d01210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101676a90f97480ef4e447335f1b9376c944381fb06d69b778a47248e5760dedf620000000000fdffffff027310102401000000160014ff27069bfa436a03f277a53da9ebe738cb4058d500e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf902473044022030cfaa5207e6d0a690ed5a2101a067c7e4d1b31f694886b427065c5c971d95a40220646cf63956dcc399c243ff6a207adfd34d4f2e409cd2ec4a48c531e214370c9901210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101295badc0bdd9a2bc0955d12f337491eae4c87ba4660078c0156310284d47c6ff0000000000fdffffff027310102401000000160014c34c2b12f2c5c3e3a061c5be9885e97be3d182ff00e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90247304402201de1a3579f63eacae93d919f6e7c6f388e33fe5228f7468a94070eae3908f1500220630a001126baa496362702eb675c1aa2244c5d6af2f3aadaca41eb09ef55b84001210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc900000002000000000101668688a5f4545d86d00bdebb0a007cafc530603c1fbb6d6a9f069a1d5f109fd00000000000fdffffff0200e1f505000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf97310102401000000160014a060ce2638c54cb65570779a62bd3d80a549967802473044022050d6d5b49102fb93cbb24fb53cf8e19e831a24f71b0877c3050ba2250020e89502201d6f37b61d60d1a0af32b5191887c1c56320cfc0d5bd9c064634a4fec810782e01210300d999684bd123d72074bf26bfaca11775eb371029bf714a60bdd4e976b1cc8fc9000000",
-"000000305e30a8502bdef4fae437335fd1e4cd0861689ba689d79397ec4e810ab28db2704c30745de8c0774b8f96087461dbd6efa19c1386bf15d1e7e305ebabd6c29cb177252d66ffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402cb0000ffffffff0200f90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-"00000030e274856b9c7452ea644c991d4f3de0498178315356c2492574117b3df2eecf1cb53ff53c08d6d3ec10c0a948b9dd2b4aae96743fc5d6bf2b1254e4407daaa3175c0f2e66ffff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402cc0000ffffffff028df90295000000001600141409745405c4e8310a875bcd602db6b9b3dc0cf90000000000000000266a24aa21a9ed2288e46fff34291c301c01e040e7bd468621d70a0078a11e422e616b70d51f4c012000000000000000000000000000000000000000000000000000000000000000000000000002000000000101087b234e0a26aa3265faaa7f7e507fbb01dc61381ded2547fdbefec295186c490100000000fdffffff02e62e1a1e01000000160014b0350ef1d06b91d681e33655611f4fce8b1f95e700e1f5050000000016001490d429043a6a97e1bb6775f702b677e21388a6a502473044022058d8b08b6c1dcf2d1593f8e2df011654b04009290744df42a81e263c1462b5dc02203f345708fb68d7c2c60db765cabb5ef9ad76b15e89212c23b9afa2b2f16ea58f01210225363b30257a7d3a27c4b03d312bc0568a263503107ebbd54b8d24c023c3dc2000000000",
-"0000003075d453e2fcdc9dd1dd0f1081b2e2fbd0400aae4b12412524a4ab6ced869e624a3b211101d7a99e85edd61cdd0a1ee167f2c5015e4296c692f50408c46b3156a356112e66ffff7f200000000004020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402cd0000ffffffff02a7fa029500000000160014eb82059311a807fc289d46a715ea4801608e56620000000000000000266a24aa21a9ed6152997cdf8a1f598b3b281f4c2371ff57f16adee387d2c6f9a1223294abbb860120000000000000000000000000000000000000000000000000000000000000000000000000020000000001010c8276e58415e63f76b5b9aee5dc13e36d2d86c5e6e96b668d9b029368ada71a0000000000fdffffff02594d241801000000160014657419c1c115140663bc9a3e5473704ae22aadeb00e1f50500000000160014cd0ba01721f6481d58acffb9c2c0558adacd9a81024730440220207cb42a792db108f61ab019695c2b5d19d6270046bd85497461c722753ca5f002206f83b571077cb6a683015ecd348eeb09536a6e61675a4062ee2775bc13ff4f6a012103fa84a8e735ee9ed2c56121406c3ab2a4b8c598a1d64ebf7ae8edaaaab8292638cc000000020000000001012c9e15682c8ee78bb37dfda591eafba313354b44dc36a96632623f43429a247e0000000000fdffffff02e62e1a1e01000000160014c975d60bc9d9edf51989e717ebe09cf140a3b19d00e1f505000000001600144c8af96210bc0e193e9b7d40353223485015e2b702473044022023a5dfb9afcb738ee1aca7c2b6893ced1cdf58bd8655b96c157fdea4a498be2702205a3bd361d9d2dc475ccac069f0775ea9dc6cdb630876a6cb79c67b28d550fb53012103fad0c0cdc5e4738ac2dc0d5f300a9d8fd095e1f2bb13291e6daa7cb6691b2780cc0000000200000000010113f36acf4eb116cd89b8709317d87c5a2daf00e5d6cf33c9eb0d9e3d290729ca0100000000fdffffff02e62e1a1e0100000016001479c3e84333847639f90325fd9a86de8dd40256a000e1f50500000000160014d149c03af86d5aa21213db620763ee7534c54ff60247304402201fd84faf54030f6e5df5b8b71f49b4e69dcc6856cd3ccd657f11481bf1a4fc8f022042d5b475f48d2e25a6ee206d7c8441493712d9d262d472c1df2c5b7c7fe9ffb1012102d0a810093c36ca0e815079ae76992d1bf5cf60573bec8b73572b20c89ebc9b45c1000000",
-"0000003055171be9b7f62e719a3d44daa56cf3a8903f66327b6854d57c6d6678d7b4e728c7c67566833f9b6109cb1a5eb50b811d1ae97a1f20c3912eb7d1c5fff72450092ac53866ffff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0402ce0000ffffffff02e8f9029500000000160014eb82059311a807fc289d46a715ea4801608e56620000000000000000266a24aa21a9edcb93aa8dfe2d28219d42caec8a367df5b1e1e4a1e2002bfdf439d83ca53dc08c012000000000000000000000000000000000000000000000000000000000000000000000000002000000000102bbbd77f0d8c5cbc2ccc39f0501828ad4ac3a6a933393876cae5a7e49bd5341230100000000fdffffff94e299c837e0e00644b9123d80c052159443907f663e746be7fe1e6c32c3ee9b0100000000fdffffff0218e0f50500000000225120d7bf24e13daf4d6ce0ac7a34ecefb4122f070a1561e8659d4071c52edb7c1cb300e1f505000000002251207ef15780916ae0f29a0bd34e48e1a0e817e7731b82f3009cfa89c87602cf1b2b02473044022014680d9a963868b03d25f84bd81af87e127f9d7990166dad5e1dd71be8797e3402205f79713b4faaff7184fb25d0976a37970f8d6b23f95d4041180a35aa291fc8dc012102a9dfaeeebad1f7ebca371a6f02e63a8b0de287c1b0608edc259c60583a03496e0247304402201f09ecdb89f311c3ad8b6d89a040a5796f83c9db2597962969392a3d9a5be46d022052243418a89831ca0e5ddd7ae575d787178126d8495f890414ab8b4d2a1b19d80121035368c752d3ee31d9570180a1ba285659af106f9430811ec58e3b86cf26c208f100000000",
+"0000002006226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f35b99ed4e2e165de2ad77f1bba48049358c9bb740445f3c83ebdb3e83aa5bca8d6100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025100feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+"0000002059c5550bee5edf11b04842e21938c9dad844f26610c526e209bc7aa4b05a237f9cf876c62dbbe036af4ea4a7363cd4ca1c14c8572095cba3b76a87daa1303ed8d7100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025200feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000001000000",
+"00000020efa863f0283f4d1e45a162a3932aa144d3a9176f21d004f917f8b57d8ce4f64f354352df0f2a5d635ca7d3a52064f9c95f070d2c13c0a6c087acba03dfeeae66d7100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025300feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000002000000",
+"000000202d3de63cf5a2b19f06fbb412d7d581d7b8968b65774177391bfb4489ed77043e7bd00ba57498a2dfcf4e3f0d7ef7f279b254fc422133f300a49aed3c8ed7717fd8100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025400feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000003000000",
+"00000020baedb67d1ff5ad32f79365fa1ca466e5039cc70198c655b439d44ffa24050966234318f09e4db9319ab61d8afc24cf0df33ae9080ce9163f77f7b342bc8bcb6cd8100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025500feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000004000000",
+"00000020053eec9d08bb197fe56c4f01bb5d530b66bc3436f13a976ee81698253039431c775c375f240fcd10dea3b6b2111e5e1372c612b4c2ad0ff22d6716ecdf9318bdd8100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025600feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000005000000",
+"00000020dbecc235b8d4e8833030d1d3a182a1fc7beda8e0f4575cc086eec1ad6d9fb7382e5d24f14a927f0f5fff33387c5c4bb2cfa5a8d206036aa8c5c8d6bb79f6350cd8100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025700feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000006000000",
+"000000205082c18fa4bdd033e7dabaeccf9f25e0c0805a9bad3bfbd6366438bc9498b33185619ba1f7fb3f5b6d382d1cae958669c6cc8e433e3aba365a191f8405912a2ad9100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025800feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000007000000",
+"0000002058e3e957d355907e76bed6bb0ef706e538590b405d72b4d72b8451736e227b1baa2fa14a3e3bb0e5641b0a9fb8450eb3de5800d4af14dfb51699a11fb57c583bd9100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025900feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000008000000",
+"000000204b5fcc372bab66fe73601a57ce49bb9d376ee3af0c9b7b8578f2a85b3e675610a7a03842e35012c96d80ed5c38a7ea1fd896aaf759a10e70b728b19b25565d0ed9100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025a00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000009000000",
+"000000209a3c198e1ae0a577423d144ec15ce84d8ceecb5d349e28d7b87a09cdb3a4a05ead780fea9fe30cc83303f6f7f7ad90eac0a303c7c8303238ab3e458bf667fb8bd9100e6affff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025b00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000000a000000",
+"000000207dcf7d20194b6b1eb2bc060bb7c51f68f196ddea6baf76a0dd08f349b27aa342dbd56ba114e8f185fe712e21c8291190d02dd4326756f01d6bc9bc2a1c80fdb5d9100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025c00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000000b000000",
+"000000205b61792a106aaae1f97c051c0103742301f6f2a2765c0c233eaf3f5a4991387d958d190ebd4cddfbc8c4a044c5a4fe4a54d706c60cc74e16cdeffff586adbc45d9100e6affff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025d00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000000c000000",
+"0000002086416e9e947b6b1f1ef66c3e8f508895703c75b9350d154de6108316221eb768b8618128d74c66e9a531448b8c4e8dfdebf7a555f183f7ef3834e27b32522809da100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025e00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000000d000000",
+"000000200568a0143a3d69b0c3eed35049f0b99759b21a0056f1cbaa952aaff81335fd6d3ea8ecfc436c7983679a96f17db811a27da51e78c76f503b4d1966b5d07a3793da100e6affff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025f00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000000e000000",
+"0000002083303f93223e35a9a63dc1c4ce9bf8a8bf855650c344c2ab26f415683895307f0964bbe9fb5eb9007a8b06c362bd4b872d3a6036855617d68852af47f3cb11b4da100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff026000feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000000f000000",
+"00000020daa42ebd14f6cc1d52d95c9425abf3b459e7e322ac2524a24e90f6bc6a301022202b383ff3349133f45172cec3dbb0955245c0ee223f15f3c1fc515f504fed29da100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020111feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000010000000",
+"000000205c42fed7abff056134b02d2d8542f82d55f2c83f4acedbe4ef7090200c712854cd0f57e3459b3552bd04bd40efd4b59f0a62842e6a5ead95e9403ab80a801f46da100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020112feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000011000000",
+"00000020406229ed13dcd19a3b4b51c82d955bfb62b6a5468e8426c7f52b0c33d6292c00f88cea73c895d7f926f031b4b5972b600a52bfd233906381ed48a80d063ea94fda100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020113feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000012000000",
+"000000201a32a0aca641ec559a1f5ef91409421ef5282860080a0fc08f3e35c7471bec6521018853d8f3525de02022e9720181e80dfb1894deda0aaa705870dd6fc43eb9db100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020114feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000013000000",
+"00000020cf6a4cbc3222c89105c2bcd207288eb98893ba06df846bf46d523cbdd2a38644fc87a92bca4cf8659482e711acb36aaf9cea95e051d543d4316d33e359516440db100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020115feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000014000000",
+"000000207265e11adfa95ffd445c59412fd255b79e4eb6710841d81ca827faf36e48c3458cba02c1001cd972d722104d26f50e7a68c6dccbb88d08b972ca09510461e8fedb100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020116feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000015000000",
+"00000020d328b5d1d2682fb93debba31b4bd82586c79867191cda9d5705d8701ab341754a48c6b85fa94b15d6af9883d5f84bc5bba220afd18990df067e2bd30983829f7db100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020117feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000016000000",
+"000000205c7f4cf1d34ce4b0466f196780a538eb797495738bcda00e902dbcd8b16911117ab12f4b9993023a7e5e25747a3085430cf7a9d1f909157da8dbd826610bd80cdb100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020118feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000017000000",
+"00000020b72af8505376c70dc765fd19fcdb7a910895edb81474b5292926b016f621a0540404f062a9e7bd54a91a3719e217940b0bf0b010d58a79bd010a02b4c22e33bddb100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020119feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000018000000",
+"00000020ac427c363962f4d5dc00f9965ffe23ca5f6db6e983464bd2699eaf213e18b50bac7b2f37a1b174564e145df2b6ec753439445c9290e135e12f974c79926717a8dc100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02011afeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000019000000",
+"000000203bb631aa6b67c5fa135caf9fc086cef71cc6ea38589f45a1aec750f691bcb24c1940ba94d0af1a8e6d3b956fb9fe8bc2a7e148178903ac0fc15262b04d805a58dc100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02011bfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000001a000000",
+"00000020c7a81492959e78ffd064abb576131f1ced7630d3f8c0afe7e818294f8b2d394e11d8a658612ae7465434d6f79c4508f3fce6efb6a7eebbd568d11f9ab76eb0e9dc100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02011cfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000001b000000",
+"0000002007acd9eecd85186948ddcc0b8283e2dd425b5feae4899b5236d21a0527a04076bd3d4ed60ab1e24b49c863d156b25871ca60c6e7fb5ed95798ab8255edbc55dedc100e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02011dfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000001c000000",
+"00000020aba02971419abe248b1d632457f329f9f20bcf44a30b897ad5dde2c09d8efc177c8f26fd7b1a81b4ebc373b9ae15cd3d78f83669e40c82359c9004bb464c3ecedc100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02011efeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000001d000000",
+"000000201d70ddbcfb753a78ca242c2de83fa39c3e082743f8d8be615d9835877807840719adaeeb28cb2169f601e0b85573f32b98d169c21ed9110c1bab1f20519948aedc100e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02011ffeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000001e000000",
+"00000020e7b97ce31a31f00a8a374755264c28d81827a345e195d822dd0b22ea2e1b587ae63699cffdd1e4f8a0de09477d3a7da93db7b261f86d49d0f2d53c5d1fbf4e49dd100e6affff7f200600000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020120feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000001f000000",
+"00000020ce8ee47716db5c5cf13fd0e14eeb099420440a7f24d495c7cbfe828af821252d812942b26b60cafad526bcf6430e4c90a38c4d6a8be3d10faf62368fdae13844dd100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020121feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000020000000",
+"00000020e8281e66c7a90944f66442af95364999600726b716a053341c9356af7bdfa356d5ca4cea3e5d1a0ec513e24baca1addde8e55894290751d1114451cdab1c26d8dd100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020122feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000021000000",
+"0000002065e115e89a2228e1dbd8b00a8af001070e2ea9ff5b6ae3de4f69ea2d806f7044995968981f61f703131c43e583309ee8be070a5de50a236caf64d1b1dbeecbcddd100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020123feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000022000000",
+"00000020b30ae385a60ec12bbffbb03822af9cd4f83e550f75270de3c020ad6114edc205c174991475dd066c3980c2cb55d123cfd9a3d9a3c4826e5766840c37b394993bdd100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020124feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000023000000",
+"0000002054398be35132d9fc50f833d93d0f35ed6f904c5b81b6c09a2731fb2cf39173290ade0fe44064f85879602d2b9a6e50e3ef4b16db80c142f6f128377002637363dd100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020125feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000024000000",
+"00000020e5f61b069282e40d1c5d18939d93f2a32bb4c75a552c09b6254e0ff9981b6636579eb0770933601c6d19924244dfcb9e83c49bc96aaf616b61d678c50cd84f6cde100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020126feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000025000000",
+"000000209aff311033f89a6055f70643add76e1e02b019b51f0f189605d0d40cabedc6429cc3ad3b2c1d3af15ac6126471dc7de4feb702b1f1046feeeec44d5b927b8443de100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020127feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000026000000",
+"00000020434e5b7cbe3c2001b533f2af690441a08fabe80070ed6b927a2a8948058d6852a8c0cb2cdad87b80f572ecc214cf78f19f5a8312bc5df37ce2fcf7e296b18d84de100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020128feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000027000000",
+"00000020e6f7c7405590041020539b16227171fea3c11c3914358d3e96a3a1b22490bc3e2f4d46a405e6d9753323badb285037342c364aaeabd8d69faa04a4c69f3b4b7cde100e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020129feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000028000000",
+"00000020190aaae9669d182dc492d6e21a08922038c3189867897b522a497beb16569b26dfb0d0291b88a147edf2fd6e686ff55be2543d3a81d3e5e5b4a2f0fb47043de0de100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02012afeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000029000000",
+"0000002009470e46ec0ccbac254bf28ba56ee0ade41ad6ceeacea07155a431fd3f1f4d77f36a5069059df6fb793a9f9e3aea963dad2c9adea23622983c0f0d8509061e0fde100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02012bfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000002a000000",
+"00000020864b28210ea6a72048407b2d3894e6215b411901de08b1a78cc6016dfdb9963311f945b13b178b683b7e4e4b9bbd7061ee0902510746f68097573fd4801f6f45df100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02012cfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000002b000000",
+"00000020c7e083abcd9d3d6794ca7b04ea1760f9163c75ed7531c54931f328fc88f38111ec8a3042e2a635672e7af06947e7cab9c0f85c3cf3b46671e5a2b93970d5f10edf100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02012dfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000002c000000",
+"000000200e4a69bf3761c51d3199d605f9feeba424a7316a030919d568ec09e19f16874b44e6630da3df8769aabd383670e70919fdddcc9d58bb746036985bed91307230df100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02012efeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000002d000000",
+"0000002030dca078673da4dd19b86a4ca96b1b3d34d457887e3480672e88d9a799fe2417027c6aee4536994d178632e7fe56ea0e89154978a25baf50128d0c1caba9ff1ddf100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02012ffeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000002e000000",
+"0000002088313980f335a2419cbb3f5433bc25e0c8dd5e9e490290f5fa1670385582596c0bd7bd7dfa6c013203667009dd051cf8cc62110c8ce569f74f349aa3da64329adf100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020130feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000002f000000",
+"0000002076ce3c401c2b018c03e5bc7b2c5d9bda6cb3faf9d24235818d891bfa6796112406f921f22c01239ca2ecc3d8f82c3ea610f51e39f82478c13008ba3d5952d5e9df100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020131feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000030000000",
+"00000020f061f150df8cc56e38742413b7326b8f2c8e4905604f62ffa06ac2acaf62ce1dcdbd85e688c53c0856df641eb141c4fb601ddc9586e57f1b8d321b43c4b8adb2e0100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020132feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000031000000",
+"000000200829983349e6660a34905eb05c4fe0d713b3433dcfaf12d25a7b69a3f68d4a15b95cbbd895c756aae0fc9faa7c93ed168c8e86376cefcfff19e8a264004a04a7e0100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020133feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000032000000",
+"00000020e1b029dd93c27820159848fc6a97fa78003e2d1e9c4231ca11ecbcc7ff18e6295c78c2d5a54f3a4c08fd41d2c3fff167ca3bccc1f627ae32100408292adf0c6de0100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020134feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000033000000",
+"000000207e1b79cb6b346dca5857089587ee999ff5b4ba767f13adb89e5543dc26c4954711a79c876d36fc17093bf8e8b29fa9709205fb2cfbf8a35f20ec3736ed1362ace0100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020135feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000034000000",
+"0000002048348836a585cb7e08db894059293fc7a7190aa2681d5708a118c4d43571482e6532886119847c3e687d0bc6e2937050fc87406f3b73e12b7c894340649af4f3e0100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020136feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000035000000",
+"000000202b39c41139c07ecfa05b42464dd418092d7b1b9507c4c3c1b55baf1a141aae16b9e05212e4200d98520c44c9912fbd27cb761fefec945e1188b4c53fd5e2f30ae0100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020137feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000036000000",
+"00000020cffa4752fbb0b15685cfe71d458de32bd34a2fbc607445f121a30f912de7b524db5586a99d77110e35dcfdd35fb92bfddb241fc122475df13d43dad14fdcd17de1100e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020138feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000037000000",
+"00000020baf6391a7006e46901397025a338cddafc0cc188da5a484d8bc246605be1852d422557c29899d2c49f846ce9c90bad3a646ff78b851051c6826425a5ee3ebf4be1100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020139feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000038000000",
+"000000207255a9768884fbabc8368c8a8893910056a1049b3635fc2d9c7ef63278f5ca4904bd3e33a53bb1fdf8b3e88a6fa21b24e85f8e52fc6164367a09610fb72de94de1100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02013afeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000039000000",
+"0000002088fc3f785f79f67da21fb4b3aa9f1118370cafac5f073ed3774f206bdae8e358195097eab4ce22d6c0ee34d5402482d0f8c6bda57db1bd7befea50bd8537a7f7e1100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02013bfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000003a000000",
+"000000202aba74f63578052603efcfed12cb6cbcbbd1b3b12409da9f66d1bc2fdc16872c77c6e905f61fbdf68a203f8a69ffd0f6478775e1aa39c06e95483a759d962331e1100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02013cfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000003b000000",
+"00000020dd2d40317eed9fa18216937111b0e8dcbc4e6afcd21024cdc2f78860d7b0bc400f0cf9c0c12137cf512778e03228e784d0cdadce76a1b3fc618d943f1e77fc5ae1100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02013dfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000003c000000",
+"00000020e66c4067eeb1fe28f1969b74431ed9de92b41d8672e8b6ef95f69eec8d6597627e344167e50fd8197024535d912ed7b7854b1392db54cd144448ae08a4fafb98e2100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02013efeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000003d000000",
+"000000205811fb5821a15350f97123e3dabe38eeec927e869879cb934d5f7d6df78afd556657405d7b92de24027547499fbc0e954f6cf1fe23b71c481b5ffd817c86b09ae2100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02013ffeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000003e000000",
+"00000020ef500848ce71d3f68cc2fd57fd76d8e95a03a83b91d90dab2ad78d60152e9b25807c0293ffb90021de477db9251392b535c971607059a14c16821ab0f83cf590e2100e6affff7f200700000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020140feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000003f000000",
+"000000206880e98945c54770f6d433d25e19a94c60ae313d06fc6856547c551a96b940430ee052c67fdee894d8e4a332385cab2dfd824281548b97d48c19395d6e5d453de2100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020141feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000040000000",
+"00000020b43fd67eb462115448fbda3ac601581659655b1fd3b4da92dacd2ed64b03e760354a64768006b19f41492fa9453465b672e516c4cea6fe36a766561e287ef449e2100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020142feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000041000000",
+"00000020da060b8a7c0e13e768a3ed1d048c51ce932eacb4347fdca1dfc229d483e0297ee9686773dcfa84cd28f333a89ce5971b93d47b3eaf58ac10cba7d45809661cf7e2100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020143feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000042000000",
+"000000209960297b31a17c50c7ecbf9f31aed36d806527925a87c87abd19d9d2e8940167c50dcaed206a63a5110ae6167ff27215e460be5b694ed4dd6d311907ef0fb96ee3100e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020144feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000043000000",
+"00000020e830f4a7932838176183c2d285b0ac04dd8786c04981fd97b277c9154cee02752dc69a3ae0f435909e955e45f5de830580e1aaa84530dfe5c49d19da03f892ece3100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020145feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000044000000",
+"000000203cf239fcd668ed98a80847536e8866c0b0b33075eb572c8133fd426226d0624b0e39899913270434f6f0ae54902f4ec8ad2980d2795bf561ea2f13f6357b6e63e3100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020146feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000045000000",
+"00000020988b41510caf76251f9c1fd0b5f750fbde345d6c75f3ce061fd8f539db79ab26327189bc089b1a91e27e62f29ac48d70c715d2cd66553f171a79b87251ad92abe3100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020147feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000046000000",
+"0000002045ee95e3ea08924291bc45dc3e3f162fa29579801916b53f3ef8465a340c8c7fb90ce6bf12519d00ff89d29a0ee918c6d7378286957bb5e657f2fe5c47e29751e3100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020148feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000047000000",
+"00000020c2e894b8ba7887f8f67afd678aeabd72d2b9c858fecbd395f01c143eaf877b72131e25df1f18e2dd4c7f37c9f6d03c78e316e3f230df2cd2312ec7c4fe99ed42e3100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020149feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000048000000",
+"00000020631ed5c8a34fdf8dd6327c3c9fd09989829ef34ceb3b354fb984cea449b3c226ca10019304c18ffca33bb006571018e71365891ccbc77c63575eb5f824dd1ae1e4100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02014afeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000049000000",
+"0000002025e4939f6c37aad1bf0c9b65c0718af6409a1bbc1b49280ec17accd9ad3b290a5cfa848ef60f60e6336cd2a184d565cf2418fae8dc017e25d36f835167a35f4de4100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02014bfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000004a000000",
+"00000020ddbdad4b2a83adb0f9d23e8cb89710c8510c5cdced61d76c40519525a67d367ea222c873717fb466e0cd11489601b789de0311bc15095c49117feb5946881216e4100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02014cfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000004b000000",
+"00000020875f91e3176b04b28dc56d2863a129ee614668498aa543aee11f07b26a78d11b68c088d3e3bc40fef5dad3581846943054f61b10fe5f9ace45f2481d637d17d9e4100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02014dfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000004c000000",
+"000000207d3dfa2e15f184aab640af2f30c52279e42436bf56277e51444bef30652c6161dede8a680ed95795bd96c54ed739a3f3de226d53df498adcdff958448adce116e4100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02014efeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000004d000000",
+"0000002096afe81e0795d4b2f4b31523b87199e482e772a7effac245c0a5d181300dd83d794d022c6b81c787354ad7c55a7dfee1e40b562cdb5049f7fd8322bb80ceca14e4100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02014ffeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000004e000000",
+"000000201628cdc6c17d5938957b720d5ce48a0546c01da76330092cb9d2a57ba52cb03003359f8d7abcd4de923dbb88f7861c8c6712b678472a85d41efa4e68c99a2b1ee5100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020150feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000004f000000",
+"0000002064cfa910f0a958260f2ab1bd3cf452bd8f06717c37d290300079cd6cab3de55759cf309b92a0b12013b734e29f544ec010361ac8c80fb86493f0bb964ba48633e5100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020151feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000050000000",
+"00000020916d1ab763f059e4f29baadf4456dc69c09157a4c573acd73aa6493ce8bfb517039b7c495c149ac044e0158eb1431d9a3186a050dd37fd84a200e8de8b7f82a7e5100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020152feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000051000000",
+"00000020e80148c77afd45c184fbe0db3e3ef01c6d4ca5fea68bf2254554de0ce07fd5627fbd5b2867d6077d9651532c7ed8f23c801e23ff2085c529c6241be979569c60e5100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020153feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000052000000",
+"00000020886215346fd0e98b8ec36776f1c419cc074a65ac3a7ddec1a9050debe4500f08cb822d2332494210d31950933766012fdcb3e1bd7a9baed75487b8d53ddea780e5100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020154feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000053000000",
+"00000020c4ce7ea6e078c50e080342bb2e79995076b2c841937770d12f4e811045a8f11f5f58b060d3f8fe39f611919278ad0ee235479f0c92ce1aaa18eaffaf46ff8fd1e5100e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020155feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000054000000",
+"0000002030b27e0213a8d7e7718011ed6683d3e80f3403dc8a05d8fc6b7458fa436d4d3159a6f63e0126cff2cd9778ffd1d8d85727c97dc32b6760ddd60503e87cda027ee6100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020156feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000055000000",
+"000000203056961edc0ffcbb22cf24c9fbf7e2af5983163092b5baf3bcad2eb04586be5fc45ca7e6400528fcd40ccb818cbf29b087b9f53eaab8a25bb3c6c8d4272eabc8e6100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020157feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000056000000",
+"000000202a89aa271a521e93d95b504f644a1759e40832df334d88aa8989336293b5f8246cf3b99828e68a9b53ab8a03e5fb728e2e040e69fb4e73796d69419740926cd4e6100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020158feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000057000000",
+"0000002028a029cf60a91d7457159014b6cab0d02b8d5a971a19b69890856d6067115424fad43781e0321c24d099635a44d4cd71ea74bf4a9b9f8a804b2fd9b64d8d2fe1e6100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020159feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000058000000",
+"000000201b24e895584978ebfadf26ee56ce8258c1e66d18e30b3fd6a92227f88cabe20c49df97653a283afec27b9f65df02c50a6788d59e63b20047e7435c1720dbf302e6100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02015afeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000059000000",
+"000000206126b35c06aeabcfd88db845f3cd8a6d937affe16e0a9c0b7599437a3e1a521e14fa0d24555acbdd2851849841f2ec33d840d257da8f1af7f9fed5c14199ce3fe6100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02015bfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000005a000000",
+"00000020b2d2ae00e96855edea8c4b6d2a771463971d2aee81f541de73ff60735ef79512306b01f7623c13d113d6ea7746f3bf8e70a599b9e32389cef73571260bc73f10e7100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02015cfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000005b000000",
+"0000002000f06a2f5506b888d434607d8e86a4ce94087c37cbcb39d5b8f2e664aee53872df2f9dde920bf18a81dab14a9e51a922398b21bfb64811a8e655c1372dfdcb8fe7100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02015dfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000005c000000",
+"0000002038f59314db676cf5d46363b06305eb0d1a3d4d8ff3d52e9c4ecf38adbc63b2489b9ff9e41c17a3b327b932f3475e7bbdb2b586156237e81c68784315cfaf0c79e7100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02015efeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000005d000000",
+"000000208a9ddebae9174c0fa496f667f03e90177d3f65b7cebf26dd83d5fe5ef5139151122d7dd215db6283325daaa3976f4504b37271c55b3cddd8b11f822ff016aa2be7100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02015ffeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000005e000000",
+"00000020cbd2d475eb9eca4a918b79ad504a0bfe1b03dc362afde08a8f731ad58118cf264b0748e0ce18d5b4ef9443375bf84d12c95a8615d748702f0fc42bd3fb490120e7100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020160feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000005f000000",
+"000000207277488c249cb9ed6d8609129495a4468642f7488e44e09b5c613f849d220752eb4516f1b30df956a8722eee1ea9c0f109df8dc8e7c3fc78f58941f4bd0027dae7100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020161feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000060000000",
+"000000202b43e6f5bffa26099dd092ac68d989538ff1cd1edc15ca09901c6e3ec0ea060b5249edb75e74b6196e5ffd64a801a33db919158405fc415dfef7989e077e0988e8100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020162feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000061000000",
+"00000020e6b87fd2a983dfcba7c6d23fc3b0de5c1bae0c3179d97205b706c2ceb7abf4331b526c2b3325de32114ae439c62dddc4859bea00db338b21f329371942e6702ce8100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020163feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000062000000",
+"0000002031686388d7c89ff891e72798b1bf32e14b855bf32389d5eec1605a8ada449a2c5bc5eb9665ddf63511ba8fd5095f0c1b44f3dc5bc47ad6509c21b8ec319ea93fe8100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020164feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000063000000",
+"00000020ecc5aea17dd30470ef919193b68f86bfcf26fa9d8227171693f54fb845a432530218051bd6c697290706006f1e7250a12e375e0ca21fe2899914c10e9012e069e8100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020165feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000064000000",
+"00000020d4cc34986f77c72a934d056ace82b8af987ac20057fdcdadd975c688a84f1814022e80f2e10fbe7ba661e4cd8d18a412dc9ddf7a21c655c8813ec4e8fcdb1b39e8100e6affff7f20000000000b020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020166feffffff024066062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed2f864cd5375883182e0e6a59198c1993f82d146f56bb8c0dded7f6f36888917c0120000000000000000000000000000000000000000000000000000000000000000065000000020000000135b99ed4e2e165de2ad77f1bba48049358c9bb740445f3c83ebdb3e83aa5bca8000000006a473044022065979a33424a28269bbb5a58977a5ccb0120351e10f051763b7eb78ee59bb2c402203f006b8c7aa0654fc2cf62a43092a5f43126100a4ab7352894cde17d75963fba01210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffdffffff02e4ff0f2401000000160014d82b204b3ab58963cc5a5a1629e76f67399003d400e1f50500000000160014f266c9e8347f3454e683945524cde58e147baa5e6500000002000000000101c6a498ef37cf0274907d6745c16c60565de843116c28fe17f7513461b89967870000000000fdffffff02e0131a1e010000001600142bb83a509f36fe04a6193015e67f42e95617640a00e1f50500000000160014ffef8d288d8f7ccaeebc12ca4d09ce28ae579b1f0247304402206c9ee6765212e8b9d48a567eb0c8ff0f38ed8853704db1033a0786f8f446ff490220507e76064f4747f6bbe6ba1d51aa8db193a37d35fc56a33445d2a4ba52b0a99001210376e741c8fbb37f852c27d1d6ccfe2ace8b54cdf2daa4721436d6707b012310da65000000020000000001019131dc43dcd9f58edbe4da8e74b87b30ced7d0a9278618b4e5821c647e89dd6c0000000000fdffffff02dc272418010000001600142e804ce3c99facccff6fb9fceab8424ea9f5729300e1f5050000000016001442c6de968c59a99b66369ec03c281ab6dfe4c2f202473044022059d52e1a77e8ad43367376021bdda7dbaa51d9d5e406367d5287e612c176368502203e0bf43ac17099ddbce0fd40ea74b8d033898b6171095c6e52b5d2869733369b012102e390006c172a80b1f6e7cbda657fd49020048523377610bcfca0476ac5fa90583e0000000200000000010132dc23bf17aee9dd2530bbc453d71c25a03c9fb819f02c7bdb224a86e89223030000000000fdffffff0200e1f50500000000160014ebc20f4bd4e18911f9d6c4f2c25f4af0b776e4b8d83b2e1201000000160014fba25c902febd09fa03877a6a47a7fa0e1ddb31a0247304402204457f04b4c6f44a44967ac1fbb369853ffdefa869911d4d45843fd6495e4f376022059037f3974f9a0ab1750049dad1a276211d4f93b26a3ea40b6c644711ee71e1c012103609f5ba261399ac32a87eb70e7fe01c5cdfa3567732a03a27160f11ff74073746500000002000000000101e28ed3fb61a1003c3f25fcb8bafd642b46938b3af118d0fa5243a66c2d6e14010100000000fdffffff0200e1f50500000000160014d7bdf4e934ef8fbbd5e8b97cc4f8772620734cdcd44f380c010000001600146ce40018cbc5fb901d6856a53b8c0e306f8aa1200247304402205a4bd770400aa6c43565d4883947368b6b7a7e6528d7289a70b20f4628d9bc8502202ae92a6f1ca3ecc36d92b299b15d5117b63a01171b25e62096e817364f0cb331012102f475591cb338f8b62df7179d7b86f0a2fc618fd8ae0ed0d3271be4d9594ebbc13b00000002000000000101e1c762655156e6a697ff0dd0d12205ecf46ebfcfd868f0490ced1a640a0267f80100000000fdffffff0200e1f505000000001600146ab595980124bbd405d93d8b014296fdc6701abbd063420601000000160014f5b1cb87a2f12b2913ec3ab36ce68e38e16f90ee024730440220568628cc61044c59c1e4caceacf21921e95562eabeee378b28719794c622d86a02207e9d4ed399c43a585f23b8fcd7c7e66f12a33177cc103fd5cf5664d00037ad380121037047cd9df445b7893be6a7fdc5916b9fb6dd67a43022bdade66324b040d3d83d650000000200000000010152c83ecc3c7c7f3fe8ae4eaead7fb8e8705a4446183974782aacd23bedab44480100000000fdffffff02cc774c0001000000160014f59ddf89afd7f388e1fa92ee61d6b339b99b4cd700e1f50500000000160014c5019d07b869a737a925f9f238c2f520f2958b04024730440220755df1969fa7fd3d10c048a3667df5f7b4aec67dab8a11cd00831ba9eeeff4c702204d0154f06b043b90e51fa89e83c18da500403cc1b249628391c9f53f10baddcb0121020363ec07d35a75df13b090324b237456d9f7d3de45c9199dd754beb2ca5c0b396500000002000000000101c0a7bfa9098832776c2aa7858451a525f7dfc9857790d2afac2defb248a843580000000000fdffffff02c88b56fa000000001600143d29965330c3fdcca7312e4b25914e2e48fc17ea00e1f50500000000160014bf91ee934e7d9aad0b71bdb928f90d11c1035ffc0247304402206d42c2393c3611fd4677d9864481bc22997cd9ee8478ce31c7b43ca5323b2fbf022026d066b3056e1ee5e75bb24b58b677453b6d40380335cafea003888811c0d2c6012103dff2e5ad358fe3fd7f3084b192111eaee74ac90973d07f0cc8bbe195168cf3d965000000020000000001010773e5544354b584dae5afa4131fccbfa8123c2cf8b8fd2bb1e84463daa0d8900000000000fdffffff0200e1f505000000001600144a8ea9085f5e810f590e95e16d7379e9d90a1bf3c49f60f400000000160014a657c824b3bdad220f74e885cc17b163d8a6c19102473044022022264fb5d53fb5bc52b783438c978ea1034138185909a2e00dc3731d576337b902204f1a90f624b1e66bd47bae538a5b91b0230c6dd723c31e938cbd92b2d0cd7e440121020a3b066a7ad75030af6e00dd14b2beb30aa687d3bb9101f96a37b12e7f6d67c565000000020000000001010e39cca4186227390ecc45d1d5b0342e56215c9e4582e05f99a6eaa8300be7880100000000fdffffff02c0b36aee0000000016001480cdb2042dd3cc6d15df7a8848a514072de10eaa00e1f50500000000160014959ad8bcbd9e14007cf4afef66070699d5d6beeb0247304402203e329b6ae67b46b4680f5f1965874fd0c137609e0ff50405b8fa8c9c5cfd112302205eaeb060ac5b7f8d1b86c8fadb962a9e1a33fa51ec164e8c4a46e0716e1ab3a2012102c99f63ab2f790c5428c2b3351f7868f8a5e9406afcd7e8440513e827c401072265000000",
+"00000020efba4e611e1e2e56fa652e78306a76a6cdccb988c889801307c6d9771bf99543d288ed951a09af4d2d5780f3756bfea832b543195c2b38c789c73b83ef7c7934e8100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020167feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000066000000",
+"00000020e3b42aee7f0b7dddb821411bf97ee4eec25a13a4a15d93be844b440f76d0eb51f52b4b18f1b4a4670c51fba6d8e41c785dde8e1c4a883bee5b98ca2cdda25f69e9100e6affff7f200100000007020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020168feffffff029034062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edfd3b4906dafbcfec299ee45adeae3db8866ed8992eb011188df3f78f229e151801200000000000000000000000000000000000000000000000000000000000000000670000000200000000010152c83ecc3c7c7f3fe8ae4eaead7fb8e8705a4446183974782aacd23bedab44480000000000fdffffff0280f0fa020000000016001449f33963010119c7724c13f7fef94d0f79acc0a57ce5fa0200000000160014dcdd5f457b54f9301218624b4d1323fd8de309880247304402205368d72da2e54e0b6f56b433e858d4ef03ba4bafae9d34d37510df4fcb984f750220435e7feece102a71e61328142da03ca86b089cb30741f88bfe9c321c8412d0950121020fc2d829e289339e183cfd519cf8a2d704a7d0df2bae20a46beff2837cf11ae46600000002000000000101e28ed3fb61a1003c3f25fcb8bafd642b46938b3af118d0fa5243a66c2d6e14010000000000fdffffff0280f0fa0200000000160014e823c940c8de2e422389c9bfa55e6292bcdff1d77ce5fa0200000000160014d6023e8eb8662c5f5e3bc3ad8c4bb3753bc3c0300247304402202024e471c38f6a9bfaded863d85606c889f84dcef706f1456e4ac4550593a5f50220301eefb7a6d98103ab5dbae0306162bcfd0b0ddd128ca558cdf5ae3faa9d517d012102e2bc36d30e9b641bf35f25832656d900d25648a41b8c32b2d38b04dbf98564f16600000002000000000101016b52789d88829eeb8fb5c7c8261bda50aef5169039e70d531b7ea4d19604cd0100000000fdffffff027ce5fa0200000000160014f8a1ab32d0e83a067206e710b1fff109af42503380f0fa0200000000160014bdf9e9476d9c57ff7fc59ef816cb91eb67027ef30247304402207573cf3f56ec059df39a3b015648db1329acc0e69452087d661e4cefe646211302204d2682f7fabd90272157c5119bb6fb590a9acaeda3546216e62123d898bc76ff012103fba8f4886d3b52b526d156b65262310598e722444f19fcdfcefcfbff7d25810b3a00000002000000000101c6a498ef37cf0274907d6745c16c60565de843116c28fe17f7513461b89967870100000000fdffffff0280f0fa0200000000160014c7bd0ccffd300590f00ebdde6b1085f9d78c277b7ce5fa0200000000160014fac1533346e606cb432313d01d499041f3590ae8024730440220044f5962ef2d1777cd172727d601461b934eac80d75d3513981ea97794eec949022042f63009796cd4d2931735023ed021978cdeb373744d72750991866ac853334d01210262633eb02efaff452e6d7a219bf3dbe356eabe66383aa19dc78116dd1b9a734f66000000020000000001019131dc43dcd9f58edbe4da8e74b87b30ced7d0a9278618b4e5821c647e89dd6c0100000000fdffffff0280f0fa02000000001600145fa234d6418c452ee8f9824c4ffc07a58a482f837ce5fa0200000000160014de05615a4dcfe171d55eae08ccf7ba9e1272b1e70247304402201254668a49832dea4d587383056919a3726ced278b892f9502d23e78e28a20fd02205f140bf2dd3029253d4f2a57da3ee05ae074b2bf82684714753aa1b024c29ab001210344d30f898b00b9c40536ad8eacba1612afd4021805f6c9b4a1aecfa4d82fecbf6600000002000000000101016b52789d88829eeb8fb5c7c8261bda50aef5169039e70d531b7ea4d19604cd0000000000fdffffff0244e67ee2000000001976a914352d1f714a48427d54b40bde13fb211d8198549a88ac00c2eb0b000000001976a91475bd3d4460e27dbd00b47c1cfcb0558a181400ff88ac02473044022063df2072c4433486eeeeeee8d5b79ce196793426af3e359acab97435bd52d06402207fb50aa21471909e9d2eb051661af3195480eb251c56b4f48cf6577c04db3650012103c20d8bec9f58c5eb06bc8f5c38a0d0a37b5b0c8c402677670df2cc4b6a71b51d40000000",
+"00000020fdf95819f147bd741bf8ef7bc8a75bcc11764c7c60956eea407b285aa7d4b4247de4ac845f72dd42cb0d2ef0b546a83e650cfe610f6871df25747b504b076c3ce9100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020169feffffff021c03062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed9b8179551e1c41cc1cfe53ecbd9773975f8d68d9b20ef4c636a323161acb1dc50120000000000000000000000000000000000000000000000000000000000000000068000000020000000169720358b80cbe260fca180dbe044e4472cb5c555674b43f91e5e5ded2bbc296000000006a4730440220627fd2185983962d7b518ee6e6ac311e9461a1879189d2cd898a0f42bdb9c28f02203944e7599ec3bd1c034495c3ce161ebfd6e532f3a3f7d634e675e979a6fc3f6f012103c4583f15fec5b47654b304238f42dcdc8d946f893eb41a0d0ee28516d45c2e09fdffffff0200c2eb0b0000000016001475bd3d4460e27dbd00b47c1cfcb0558a181400ff281393d600000000160014a3c41024988de432c0d883412cb5129d90fc61a568000000",
+"00000020eda7da628f2bc837a134698303dc5bfd653cbe81cbeadb4202e26f8bef4a4d74c386caf6a41722070a6fdd3d1e9f8f426a65ad2fc507c60cef884b7843ca83a3e9100e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02016afeffffff022cfd052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edf225e56c0dcee01991178fd2f3e4c86f2d655d7fdd48a823b9f4fbb2d5500112012000000000000000000000000000000000000000000000000000000000000000006900000002000000000101c2c5fd2e05f13767c586b55854c12b72156d3277a4da953248205c1ceca0c9550100000000fdffffff0200e1f5050000000017a9142e38c9c474e37010270046da38ce190a596ba32f87fc269dd00000000017a9144702c92e076a0e999c36c93afd2042f70c75082f870247304402205ad99865ef664fc3a517a42af3d08a6d99fa28776c3ebc10cc3d5c354a8fa4eb0220772054a42c1e41c927fa32191349198af12fcc52b152de102f6d23e75e0c6a05012103299da6a488c24513e5aa2fb5e9cdb2590b93ca607c1250928281f2f2a2625d6e69000000",
+"00000020559c136e3452b97b706d97f0ff5b63c57d321aca1a130d446ba16b0ace488e2dff45412a8e51ec2c342921d3e11a9e8b051ed02cca034d408d7e74e86369412fe9100e6affff7f200200000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02016bfeffffff02b000062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9eda58b9a3d1bdc62737e9514fe4e645fb5f63de3e869e700649c3abdd390875e1d012000000000000000000000000000000000000000000000000000000000000000006a0000000200000000010144b550d93ae99a2b86caf749508f7220ef37e1abb32c58020f9e4ce2fb92340101000000171600143f196850d8aceee83f4130355ad25063ca2ecb3bfdffffff024c4e0295000000002251206ed91a6bb9b5008ea78714852eebab2790c319df6f83040297c20fced3f40b2900ca9a3b000000002200208a17955ecbf395b3f5ac88a4f0c9e1e41d898f90eaf4dd65306e37c153ce730d0247304402207d95d022ea59747604a80214a01a7a32778f7433ef92b592723fba543ca140a902207b937a7688573ad84c12a39d334d3d9767a075237c933b2584de6d78b95ab4a8012102c67a45d0c4c41b83a3ba16b5c6459cd35edf6a95edc4a59c917c3a7aacb8663122000000",
+"00000020da1a825b0e292596649de2a69f34b38bfa8c2a5e1eea5c82cfd8c4a98b9b6579bb8cfdd90081f3862bb8eefc9df595a7ea984ccf6658dfffd723533705357c72e9100e6affff7f200200000006020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02016cfeffffff02943a062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9eddb68b510e02c31f86a26aa9ba4036b3a2d01daab15e100f6c8eed2e87f755720012000000000000000000000000000000000000000000000000000000000000000006b00000002000000000101f6eeef32873cb2c5d4ab91d609a31fce62e733b50c2c8c5a50ca934dc70c4d670000000000fdffffff0200ca9a3b000000001600143a71e26ba710f7bdcb24de28d8b279cbb77ef675107a6759000000001600148480fe9e9b951fda8340b355827298485967ef4401404ec3c7092d8ca5f2c5f0498970534e6db86ce3caa74b44494681457f4ba83558acbb3400136e45bfc80202e06097c25209e4ed6e371adea94004b90235d33b486b00000002000000012e5d24f14a927f0f5fff33387c5c4bb2cfa5a8d206036aa8c5c8d6bb79f6350c000000006a47304402202ecd177f334881e838b470bdc78e610964df79111c7b8003a2614385b0611f0e02206758c9502f516c55af76d1f82c2a4813a011f9cc06416b795840d5a60140b69a01210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffdffffff02e4166bee000000001600146489ad212f36ea36b562b174a842c51c8e2d7bbc00ca9a3b00000000160014bc90503713fd19ec0d7dc7b6314080725dc1574b6b00000002000000000101e358022f444ad1e79866b5e6400c2d38e6f496498a1a1d50310b2191402f40b60100000000fdffffff0168c19a3b000000001600142e2e0e5aad28f5da93a6f0e56f9039cafae32e6e0247304402207dfb79ddef8b9e53b991c543a915e79ad241834ec96c285cf4d409ae8c2b0866022048e963ab8e40fba652da10a67eca89151cc545479b23f2797ad8405643be494801210284b3623888d642976cb32c05c4307854d43024797c68bc0eba5bbb13d9a698536b00000002000000019cf876c62dbbe036af4ea4a7363cd4ca1c14c8572095cba3b76a87daa1303ed8000000006a473044022074140601c8b9187430cf9bd4146a38a4862ad504e037d1fef797702c5427ed4c0220110accbfbc63f5a9cc51b7d54972c185381c5768368ebd5550fefc1196d03ae601210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffdffffff0200ca9a3b000000001600144c59bded8707fb330f73658f36fd97f61fc86bb9e4166bee0000000016001413a91643115e64b7c20f16575b3bd568896d9a476b0000000200000001775c375f240fcd10dea3b6b2111e5e1372c612b4c2ad0ff22d6716ecdf9318bd000000006a473044022057cba3d0aa7b309d0543818102482b6ad88496d9ff067fead75f70009db00841022075b1a70440b25572235633ffdb2924c1fbdb24382089f9cf9a2f7b87b3a7b7bf01210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffdffffff03781c1a1e010000001600142d4a8cdb95170a6341904daf82ac73f4f3e3cd0400e1f505000000001600143a71e26ba710f7bdcb24de28d8b279cbb77ef67500e1f505000000001600144c59bded8707fb330f73658f36fd97f61fc86bb96b000000",
+"000000204638a3a33172197fc2962fbaccc6fd25464b4a1a69e5227c60b4252d8be1a118f3b581856a99775b2af9fa4f47ce7691580376d1063a013604fa1bab13677191e9100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02016dfeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000006c000000",
+"00000020170eff60bfd9762474ae174d6fa69e2a5f3f3c0f76092857d91120750fe056546443407cf796b355b08ab3f7a45d79671b045056eadee1deab45dd1a8917ed31ea100e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02016efeffffff024002062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed23ad3c685ddb3d91c292fd9eb0aaa592a1bf8d35e788fbbb8a0a5ce1dbe2e80b012000000000000000000000000000000000000000000000000000000000000000006d000000020000000001027cf8a28f02e0cc4c27d4313c86c294f988425ba4075ac352ab8b2f33289bb6f70000000000fdffffffa42bb798ce73920fb75ecb8ce627aed5ea2e40a0e5e463fb93d43b47b28251f40000000000fdffffff02a8d7fa02000000001600140803b596e705d9a715763712976820c2ea75fd7700ca9a3b0000000016001437f0163527bf88d7a16ba6ad24c2b82770de44c602473044022051e39b673b5cb1f5c7fb05ed858688b8f062045c56632e7951e28c8485ee408c0220331947e28f9d7485e305dff740982a3b691305e29d1bcefacc754ae951b39c21012103289d77616994ba1127df8e1d6e538efb48d96afba1783fe45fe071cb744a6da302473044022008bd0f74407b79c08cf41f19e3fefcd71bac9054005addace5734e99736eab2302205ea89d784f17a4626442a07679b78da14157b960d9883d9ba3318b8924532490012102c9e7b3fc6905da070bfb40a88a02eb00290c80f92a03f9a6e4bd635362f507286d000000",
+"0000002029db353a90f2142622b92b842505c8213cc5a5539ec62dc67921347c8fa77d211091e13210b4d513aef608e5bc68277be4fd049f99fda40f77b6ab0d889d5206ea100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02016ffeffffff0200f2052a0100000023210399101199e321e2af21f3a7948599207524c26e77edaddb0b2b257912f9724b94ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000006e000000",
+"00000020642d44bb6fec140780b8ba3a3229964ef255c84f7fdf4e5b095af3560b60d34829232d2b7a84fb77eba972cf7af9fea2b9f2b5afe6de2d001d16141c48a36acaea100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020170feffffff0204fd052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed8b8a2beab6576895194fcc315d64299c438f9d60273dc145ac7119fe1b5eac1b012000000000000000000000000000000000000000000000000000000000000000006f00000002000000000101e7e4f83090eede73180e782588763ad365c2008f3d47fe752d25d0437b722c8b0100000000fdffffff02fcdda435000000001600146f2037208aa2f561d3e23f093ff9a978d20afa4600e1f505000000001600146b5e363b998789731fbbb38ac9e68a435499864b0247304402207b45f1487cd6c0f7aaf4516e28ed1496f7803882142fc4ec216e223d033a3d19022018473b01274b8bde298ad3f89176df9dfa465e1cd546481be6dcd9e93731d2e10121039c4437956680d771132f31827010da89a1bb2c2a6e1abe25ef2f2d9a279d087b1d000000",
+"00000020745d1dd8a71926daa1a15bcca6e7cda0fb7cf374ae0bd33a561138f9fed3c13135a86a9702055e81394003c0d6c1607c059b16aa175f0513d2a4aa966f5798f4ea100e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020171feffffff0204fd052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed0caece0cb03bc51dfc7fd0ed41c8ed37ff4de5d65c18e1071c4e7ad15b6ee59e01200000000000000000000000000000000000000000000000000000000000000000700000000200000000010174b251bc96206fae8e90d603405593d0d456ccc91c411cde1695d87d5037165c0100000000fdffffff020c8e71530000000016001461d1b750dfdb48880e4bf1dc5dfeb9d403c907dc00e1f50500000000160014d24ed5efb3cfe7ba4bf2f22de30e50bb5a8b294a02473044022019c2cf13d8585fd50448f5715e3833610602d61317f3401aac005309b6f2a1c2022003d8397d7779a4b6f02c953e02f7c9a99227a7e250c3b6bbe825df986b2b2a7e012102874326a37e7f6938fd1bf98eaae31099909fc12e7297d595c1cbb587deacd74b70000000",
+"000000203aa0116acc53af2ebf73a0942efd27f2dbbe6dab834314259243253382e2dc1d56c8767bf35e79cba22af3de81bfb5840682bc217877a5f3b3319acfb9a920e5ea100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020172feffffff024202062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed4458bbe451285682ff78f7134475aaed522f727d94de1bf4286f5104ad274082012000000000000000000000000000000000000000000000000000000000000000007100000002000000000102bb096d805a3654e2811d017e7ec5a8b540eaa1d9e4a06cb7a20738de7a6857720000000000fdffffffdcba74a87fa4355e0399879a69e717809ff6b26333c6a0f649de333ba196ab1e0200000000fdffffff02beb99a3b00000000160014e92aa29664a039c96283df11c8373b270110057700e1f5050000000016001429c7cd05cdeb60b6cfae5310f41e1ecebd09a8470247304402200a74d96056951ad0e39cf69a64b68f42f4a24af3644d9526ef0d397a7104cc9c02204c63a82315679d2df1f351ccdbba7e79718cdade126a667365f1f4b5e5246d98012103580757b749e726d595a93ac8e0088d69eb983cf7d10e924b9e6a6f19f91dc9370247304402205a594ba6485d0e060d7ee5b3e9d124b5b73b4c7c73ca227e0aca5d5735ffae7402207fec5e2085c19e85a749edff084729720072aa9759fbc0b816f1b8ee7e1025fd012103580757b749e726d595a93ac8e0088d69eb983cf7d10e924b9e6a6f19f91dc93771000000",
+"000000200ec08dae9db4f6554b956ed853cd29b8afff8fffee9173fa4a4e4e99befde42931af3e5cf850bea99220c3b1d5edf16bd0ac8feef0ebe93c5990a9db39ab1491ea100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020173feffffff0206fd052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed873df78e5e9da60f7b25769f7d5d0301e67dfb27f9e7724e6e9761ec55b17d33012000000000000000000000000000000000000000000000000000000000000000007200000002000000000101fc8b910035b3e53f07bf283decec5b60131f479506b8bc023f837b295e4d50ff0000000000fdffffff0200e1f50500000000160014591c29d10b2d0629250c4b676d54381724a07c9ff6f1ae2f00000000160014e84a583379a98c4f4ae97dd30f796946decd72ca0247304402200b0c581fe593db0304f7ca7ec7cd5a95f1965df138f13102d90c38fc32b57862022023d6adea6e9e206058f18041760253d909ae0b490f8271b03a2b34bece8fc41b012103d02d6a7667293054883c6da8d71047a467d88cf9ca22b892609e20ecb22da1ae72000000",
+"000000201fa6b119852531ba466b8aa455a1435449a317202d24402ffe8c868ff250e00c6b5b59f8f3679f894ca1cbb6be665d34000f08c3a13b9d42b4b68a8e1d5dd34beb100e6affff7f200000000003020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020174feffffff02490d062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed7773a7fb00e673c49837f27f123a84214bab80d8a44eae958260186e6c71d4d2012000000000000000000000000000000000000000000000000000000000000000007300000002000000000101a96c7fd62b7e5968f7735901077d30f195b28e1669236cec0528a0ab2e0914660100000000fdffffff02f043cd1d00000000160014c6fb945c392b03261b8b10ee71d56c9815309b9e00a3e11100000000160014746f68850933cd31eb082f5820a36b0eacd4061f02473044022021357f9915c6d8b4891251dad0c45f3a48b2600f8f6ba3434b5c52d5ca23569802201b8d4f4b562a100c40d24cdfcf4521830d941efb6a4c5a7edfaf9e9e4220f94a012102a62b45f7432fe291c8fcae5e724e0925302d7a1fa0718bff430928daa7e397b17300000002000000000102dcba74a87fa4355e0399879a69e717809ff6b26333c6a0f649de333ba196ab1e0000000000fdffffff48470b70682fa6413abe3fd1bbcb87f2cc68c0f9ef9464094eb60dc1f4ef8cee0000000000fdffffff02b53a2915010000001600146ccb572af87f6f19b17f291818d919aaf460ab4100c2eb0b0000000016001422c3c781d8c8e6bf8aedf6db875a3f2d02025eb802473044022075ac6ea07c47262a4bda5414287ff794b0745970c6b8c8d22f41ff60c85c146802202aa57162e1f9de551184a5dbfc999114276c935b8c7033cb41421287f70e6f460121037d9dc96d4a8a0352946b7567ac13ccdd617cd392605193887d70bbbdc819a9cb02473044022030acd3daa739e010df2591bbe6f0657351a6444553e7d56d5d455425a9b536d5022063f876b01a1fe406c97e183f2805bc00eb5cdd5b378a84235e79ffb3e3b6aa42012103a576ba12e84f19754553c891c4377fd32c9ce86b30157b6872cef1b23cca7d5273000000",
+"00000020dd0e828c8babf682db338ab6c2ace2804c562a317d89a8e4f2c9d7e67ed77a7218cc6caee005d813c8f312981a3324f9ee7ab8bdae6491e2130a812e805924abeb100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020175feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000074000000",
+"00000020cd74132ad0cd91658fed7018d123c062bf09890c82a963429f3543e9b4a7767bd4abd50f57dbd939cf3d58748c5039bf2f81f2a2fcad23be05651e6b1fa5d18feb100e6affff7f200100000003020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020176feffffff023208062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed22180d3cef514517f569e9fa88942949b8629934f18212779cee40e97254ea5f012000000000000000000000000000000000000000000000000000000000000000007500000002000000000101c555c29b258698eddf60890799c73efc40366fa0a4dbc379f5b0eae2a1aa12670000000000fdffffff02876d3d090100000017a914ecf2e92fb5a79bda1ade29714d3e14db3062d4828700c2eb0b0000000017a914e4e81bc4e8792afd6325ddeaa2653494cd10be308702473044022040cc01ebe3d493afaa76b5ea508e1aec2485237ede7d369a8c0c4e2fabef7d0702204aff2d040780af955127ceb46abd3254b5489c6e69efec2902f41c012b2284cb012102f24e8f1654a4ee264381dfdf81aa5f925fac470bcd952654fb74b0ae9066fcdd000000000200000000010191bed3a310caa666b133d4d0adff6f3db51dffe4ee63a2e1d4ba1a17c1b8fd490100000000fdffffff02fcd5f50500000000160014bcd74664ba672e88a5496651280e04dbea664cb800c2eb0b000000001600146365d0cb3cd01b9f5a04f09630fdb5c94e87430c0247304402200efe52f9793f099931ff7244bffabf2a3cd1ac046a02576363ca015b9d06264602205170b30b0476024c6db2688fe346f4589232c09f389b038626fbed2d224db58001210348986ab0238535eeaeb7faf156570f833002de937c36a17407dfca7c94761e5700000000",
+"00000020e9e1fa6f8d48282a7a2f34ccedd05124207062ef9eb56dad30f42f707ccbae283b9fe2121dafccbead8c934889e75f7289639772c057207b4a62aa64fdc221f5eb100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020177feffffff02e6fe052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed28af5c0a2b5e4a9781acacd36e8c92855fbfcd394c81abb1d6d3a3e3338bc417012000000000000000000000000000000000000000000000000000000000000000007600000002000000000101d2ea6189259c36b9f0f17a532b678dca52a7010ee1d1d434e3b57dacea5f9ad60000000000fdffffff0226de8f41000000002251204c25a804eb9f53e329bd48bbe78527fac93a279e5594d4de289ad5cc9d75c52a00a3e11100000000220020c43f2113ec233e201b348594d9cb6e0885bc167d019205ce798a9038d983609102473044022036491374035475f422b262d0d85d76e47354e7b5ebe84fde1f3101e2e8d04c5102203a00b2c8b33fe9878ecbc6eea2da54e8a1c79e24d5c3bcb51039dbc7284ea151012103b33fbb51d5b57c2b5b171659b6cc92ac421fc41286c10242d34ead72ef52353800000000",
+"00000020c4769fedca3eb65581abc21b4d9f870d27d51e47bdfec446a63e417ce58b786ea252ed1727830a49691aae359c487ef49298c9a61cd7f315632f65384267e30eeb100e6affff7f200200000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020178feffffff023efc052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed5b2f64661e874f1c9afa87902b16cc26c04d5a4f8c30953a1dc553075f0c9d53012000000000000000000000000000000000000000000000000000000000000000007700000002000000000101f54b2b8059c5b6ca96a9579701d82264b04db888b5262eb624e13daf948a2c950000000000fdffffff02e809f50500000000160014ede8e0883d113ca8c102678a66d6c1999cee331900ca9a3b00000000160014d54cc6fade0ddefef3d967455a64042e559c3f2f0140f81e7a4eba4f54cf7e9503b7971bb945ac6ead4eef5789fce44c2a74fb3062de20ed53d9173a8681e9835d011834eb7ae0ac9ea38ae3eef2b2897f361848e7ad77000000",
+"00000020197f216be59b0718ab58b70fd8f0fe3810a1610ced8a3bf10b003de7d789a004d2fbf0fddbe549297ae7d2e2aef69179ce51b12ec9bad3f94f0b76e456c379e6eb100e6affff7f200200000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff020179feffffff021019062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed032564a5f505d43279ae33aab1bc2a41791d8d6b35d174bf1427413e87d053750120000000000000000000000000000000000000000000000000000000000000000078000000020000000001017b6bec5a4cdff535e4f1c3293474b78edd0cadc30981a50ec5b73cceef5a7ea70100000000fdffffff01f0a29a3b000000001600140b5a81417f08e340868fc0ce244201a50895ae1f02473044022029e52bc8bc6d8b378d3ba06ca8eb5d8c6fcbd1b5e02a5302eee96b31e03c2ead022031f7f1508df185273ef68171a5972014ab8b75327b771808f73dfc0c3e132a3d012102d692279beb2d00d1a9179d838e788eea8db7dfafc3fc291028fe3ea10318e54600000000",
+"00000020161824374fddb9faf36eb6ba7054bdbbc87f68f372c7576c64533ca85fdaa479223d2c96475d940ce159053cf5e4c83562e97b470afd3b0d675d41d9fd36ec7eec100e6affff7f200000000003020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02017afeffffff02db09062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edcc0869144f8e6e8cc6216b8cceb3c1791fbcc7cd6dff1b909c83829143b4098f01200000000000000000000000000000000000000000000000000000000000000000790000000200000000010191bed3a310caa666b133d4d0adff6f3db51dffe4ee63a2e1d4ba1a17c1b8fd490000000000fdffffff02e976e11100000000160014346e3f7e659751ee9618868dc6053ed0fff874fb00c2eb0b000000001600149503fd0f27789042b283ca8ff565e346f43f8c6f02473044022027923a6e3323331edb8c4aa674becefc793c938c735275e3c6f196a7f77fcc7702204df7ec98b32f6372f058d82adbfe4134676c339044592c7d8543fea5a4334d81012102dad87450bf680215acbbc826358b98b4c9112ef32fbea8822ca0c60435348e857900000002000000000101dc28345e00d30237a9a96de27a4e01d747ec2c49110519ca46db0a7726c7994e00000000171600145df30d8c551ed8b6b63d26a19bbddb4d212a4743fdffffff0200c2eb0b00000000160014e02c91621e4d39d9bd2eda35bd405839b60ca9bab39e51fd00000000160014df594a303a1df9fdadb310b2d5bb43ecd274092f0247304402203e2814f7acc9a51d5d143fec7ef90c20afe33b158e0a4cfb83b73fdb44e993d602205719eec36238c131e89ef2877bcd6a8810976b7bc64308d1835cf0327841f1fb01210289343a60a0544a3ae2bfe20e5958235c686397a64a5fadcfe893f7ce1f4ce4c379000000",
+"00000020c9f98deb84598257e2e323970dd5102d27348e12d48c97fa9804fac4265eb7627a6f4f369231f104093d4ef99cb347e8fecdb8fcd9291483237a0ea46d6fc3f1ec100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02017bfeffffff029bfa052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed434c0b6ac1ff212424b0d14c8e4bb169aa47c2a96ab1153d3755edde3a39e6cd012000000000000000000000000000000000000000000000000000000000000000007a00000002000000000101596d092a6e61a812d7621ab5b6cd5d9837a1ee17a7376e1deb20fbe8d065827e0000000000fdffffff0165b9eb0b00000000160014b5181ea3cf59c6dd8c5b0b1c2dbcbd51d7d1468f0247304402207693ecead372288f579c173c7448dc97748b74b366d8b11bb249bb5179d1f5b9022031870d1a9ce4985040c2e764f4302640ad51dfc99ce9e8676014605231ae832001210351d65edcf208db77130fd6dc9028e5736b46843c8adae5217c97222c8842c2117a000000",
+"000000207b5fd9a7bde66eae89a4e820a9bb846a071cd1ccd3b544388e0188b3340f6f1bba1b5f1148778b8a36c5dec6384ed01f5394d5ccc90917e904c4e5dca21899bcec100e6affff7f200000000004020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02017cfeffffff02e415062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed298ec1244d104c666bb59e2952da300cd20b3416932634835b4846e2beb9d76b012000000000000000000000000000000000000000000000000000000000000000007b000000020000000001011aa7e488b611e5e51d17fe121f66fe080f2e60d0f5cb053e7b95acbf586e73b60100000000fdffffff0168b9eb0b0000000016001420aba5066bfda57d38df2403fcb03777d1189ee80247304402203fcb0e7b248c64b8b7ef8b5b2fcedacd7b9f9f0c075cb263456f3e075bea10c702205d6d4a190e03a41df10d86c7a6016e017425f87018043141da2b172569c0677d01210392bd995993277dff85703eb9dd7a4098d0950dcacb0fc605611239aa0c5ec6760000000002000000000101596d092a6e61a812d7621ab5b6cd5d9837a1ee17a7376e1deb20fbe8d065827e0100000000fdffffff02acb25bf700000000160014463ef2a53b3fdaea6d5f676d643af472c908e88c00e1f505000000001600149503fd0f27789042b283ca8ff565e346f43f8c6f0247304402202f366f83c5b5174344a4c6469eb8f5d479b36dec499ad8d23be619950574661102206f13a61b40345f7bcb4ee07d9d11d3a477901d5a9d99d8e249ec5f6b13430a98012103ddb92a635016cf0f393882271d249ee39ae4b0549361c3c3c120408603ef76d17b00000002000000000102e7e4f83090eede73180e782588763ad365c2008f3d47fe752d25d0437b722c8b0000000000fdffffff7b6bec5a4cdff535e4f1c3293474b78edd0cadc30981a50ec5b73cceef5a7ea70000000000fdffffff024bf0f90200000000160014b149ee23990afb7557c178d64889101d75e5434d00e1f50500000000160014e02c91621e4d39d9bd2eda35bd405839b60ca9ba02473044022039f28fa06be477a5844ee764f37bb38240816a3388c1f03869837d50f02a0f940220327a06e70f5afbb0655334c7eb1c74077bf9fff2460b20f55c6d4d987cf953ee0121034d4debc459ed68821a01b8b3341e097a2b1ed2ec86016ff9bcebe8fd6848c53b024730440220535b8514cc164b13b3d720df8079d68758ade9eeb8e7296fb8ffbd6e44f6f974022055a35a9b0231ea308554af014e7646b82b2978616fb6f31d8735017bed918729012102714828ae4335017322eed8d0b9156c8753896198be8ed0d732d56eb922d861c67b000000",
+"000000200b90adcaec9e439f5904feb5833a862defbd987a9c7bf83adfa927718205c2731d2c480a213645bbc29d4b3b62b8a869ef7535b8f65d3784eb0dea7e53f38a6eec100e6affff7f200300000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02017dfeffffff0207fd052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edb1c6a16603914be713e14c44b3c16b1bb89e19d062968d442751b6144b44bc20012000000000000000000000000000000000000000000000000000000000000000007c00000002000000000101bb096d805a3654e2811d017e7ec5a8b540eaa1d9e4a06cb7a20738de7a6857720100000000fdffffff0200c2eb0b00000000160014e693bfa29ee1c1c9c29c35e2e031261cacbfd4f9dd497fe20000000016001485aa1a2571065bd299fdc578b7517fba899f6fc202473044022014ae855a86c82016ce3f99fccd9694de867f39448c4b4b49086c99b087ceade702207dad3e0fd18f91d7d9fdb17beb8d783e2d3a36e41ace6f75fc3cfc77fea08847012103c1f935aebac9d08e7b6a16fb26502b3029c0b9832dc083dea037ce47f987aade7c000000",
+"00000020bb3c5fcc8bbcaae784b94657e2637bf51d88520ac317aeff3f086402d3e24c4afe2ba041178b5cd0ab20ef943f382eeff071af69523cd4863bd452bd66265341ec100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02017efeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000007d000000",
+"00000020b9c5f199a4ffab26142389ee736cd05f30ec8ee61ffeb110cb515193a8da24037d3e10ff6e8e90524aa89c7555165e02c78e8892845e2a84cb6e672733318592ec100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff02017ffeffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000007e000000",
+"00000020ba98796e8142d7d899d3ef9f6b209bf783c52517f9554be4e99fc7f30eb4eb40de86ecb9f97069cf41bacb9e1b78e4987296f7c129292bfde5cc2192778ca060ed100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028000feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000007f000000",
+"000000209118283332a552031fb6b17ec2b5cdcb974aca7244feb9a0fbccd5cb52306e609366b563ca6153ec334f25420e89d1c6db5f2174f17accb614f903bf07b62993ed100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028100feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000080000000",
+"000000209a725b1d20ccd6d832742840cfa3c193a2fa94933e86fda4ee1f38d3c4cd8d5e925160ec9098986198ef22804e7568bea7f41d4c093b1510dd02fc229fc3723aed100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028200feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000081000000",
+"00000020e9551933934104b4e4c1e7e47ec8df2f3c897ce4c5cbabfaa0e5a2e2533c0f668b0b1b0471bd03cc230007aea758cef5593988438623b27f083d1923a0c1082eed100e6affff7f200100000003020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028300feffffff02c712062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed2f7601569d9a9c7694c8d57b1aa69071b31b76d5b306c7fc99b2577844bfdd2f0120000000000000000000000000000000000000000000000000000000000000000082000000020000000001016c4e277508059d14d172737292721b3d0691e4a6faefbfa02bf161d7a4224f900000000000fdffffff023ad3f505000000001600141f1ea08ac424134000f668446ece00deb983bd0500e1f50500000000160014e5096808c1adabb44bcbd8f64ae8fa11c6a5217f0247304402202775766623faac01a614dae7512ec2145cab6c98c16fe8e73c9ffc27b34918d402203b573959b37602052df3885ab76573fed0f9614acf8a3a4fd9fef9f6d4f23a10012102fab0347587093e91152c34429a1d3106b04ee4c2f29803f06930d11f4a08eb53600000000200000001a48c6b85fa94b15d6af9883d5f84bc5bba220afd18990df067e2bd30983829f7000000006a47304402204bca62a7e967f43d6f4c5cc440156f9ae5f63100f65073b1bf6c4e8ba1e0273f02202d8b905c8344a0bf3f28e85dae5e1b202e4802fc5e89e9980bbd4476c211ddbc01210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffdffffff020065cd1d000000002200205b4dfb53f3304a10880548b4ae77c05edbc1b92ffadf898e8ea5922e48dd7712ff79380c01000000225120a5ea779862ce5601bae6ec8fd2c4de16ca64e91caaa6a62d837a60474c161b8982000000",
+"00000020792396a78fae05a55d887ae41e10707eb38a2c27091c1052b0e36fd1c6e34c4613ef2648d5ba86f328e7bf512156f1b1ce60a8975831cd9598043b392826f535ed100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028400feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000083000000",
+"00000020a24c3f3ccd6e5e437101f1290e313c0a36541b64c22ec996dad6c3d3fbb6d9484305091e9cc1a9d9e4a06133277bcd66fc8dd1f481628ffd83f3d59da0707375ed100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028500feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000084000000",
+"0000002007913f670b29716c7b587c35a700323c313f502c03a87478dc5c4b530ac5e349d67be035c1f6bc199f454fdc72abb3a3464367cc3b4fbd82a39c9b3ea68a7f3eee100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028600feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000085000000",
+"00000020537e22ee6c04e1742318c9c40b7902d84b81cce6b3dcd0f73dcb2924bf7c46424d4922fd1b3fe98e4aad094f7c791bd975ace22acf734d921c9608df988e4cc8ee100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028700feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000086000000",
+"00000020fd75e5bfe02e041f208652b02d34e847efc8d7ac26ff853e5dc830d7111b4c52bebadb070b92217d6a7d7a66c746822ac756ee31ffb2cc48e2df4df696b3a9b5ee100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028800feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000087000000",
+"00000020d6fa6f6de16b28b686a9088fb041f4c5008da276109e1c3db917d4478bee7152fb2d9fceeca085a3f86d258b846719c261db8577bcfd7e99d6e2562422780b2fee100e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028900feffffff023608062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edff0591ec341ea72a4de1f7f9a739cb6a66fa6206a6232e082bc3abefcb1d74d1012000000000000000000000000000000000000000000000000000000000000000008800000002000000000101373a2a8ed1f2fe90fc91f11a2ed5e3e1b53d7913f09fd2c8fd994f7d3d71374d0100000000fdffffff0500e1f50500000000220020a659119e407acec5101ea8b88d513a3425a48dda512619d35957f4ca6f27802300e1f5050000000022002012d16047d9aabd4108a5635051e6f36331d34066a3acdacfb05719c31fc7b61dc93c7fe2000000002251206ea067b971dcb2d6206bf4bc90da1b0999ed1e2c7b683e4dcfc384485e97ee0600c2eb0b00000000220020cc56f040c6a89ac7c202c1f805a3ee60a4b90fd0b5a4e8611c6caaf23a7a853900a3e11100000000220020d733761ff60d37a9b9854288abad2470cae6b7ac37d48cfa8ab115427de416b00140f15ef8a844954fe1f2794a46ed4e1763d085bf0ab1d2c4e18d0e2d0a793dc5b9baefd70e5e6fae9b0b9e208ecb39ac06894e3932212bd7174395dc38037b43e188000000",
+"000000200fee514ba51f73f49983541cbed954c2f4eee146c9b4aed8482617c5dfc46d5482ebb54dc78b1c8ff0e615556daeef70af4cebc9447e5b8b9f1c615efd15ae61ee100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028a00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000089000000",
+"00000020b49ed3123b760ad964298bb03636bb61b15b15acd634c606d0f6cd72b7b932642fee289f8573fb290900f0faf8dc8cdf7ff9b797ff4bcc52b0c591492ab33e83ee100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028b00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000008a000000",
+"000000200dc26db041d9fa1793201115dc8d01f7ba60ef8942684af9d4a92f6f33f3445c1ac9b9f5a3513d2d1f1a5858c72ede5f53f1b54aa7c3dc9689d98d38030f924aef100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028c00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000008b000000",
+"000000203e3eef1a96e1e133bd5c773c8ba171d34666fa73dbd37269c1087ff04a672347e0fbe28949f2e6f75dc8e5f8205e69d5af6355cb3b4acab280a9d86c4425d5a6ef100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028d00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000008c000000",
+"0000002023f8b687f76c69a919d24723b43bd49fbcf501bd668a1b29ce90030fb153dd44e49e852ab3a173d1da84247078d0f89cc78acefc29d74835af104fb8c89a5e49ef100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028e00feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000008d000000",
+"000000208e73565ef7c54eb873c993a55775b27e0040c3a3a3296e7a6e3b862467139134f1abf0670bfa62757e5544304667a658bdfd0bb1493ad3ed3b4a4695b67f49dfef100e6affff7f200000000003020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03028f00feffffff024610062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edc7c09f30c85b4215d1eedf64228a9b430d2b1e9d688a007deeca07798d5b6702012000000000000000000000000000000000000000000000000000000000000000008e000000020000000001015bd6a871af1559abc1278256111717326653704e5f644532074ad8956941eb780200000000fdffffff0200e1f50500000000220020e8c263d01b353fa1b9a3c6d1ba3cf0f7e83052fccf5115fdf1f5796e2b4e6c1aa94f89dc000000002251207e37198c75ea150e8eabcae55648a388dfc16334b3de7bf1a919fb35ccd0a0d90140b1c96f2d316e92519d69dfc3a46c933fb1ce484fc5890f2c16f2dc8a012164de1eb4ed8bb33e748ae5507f578a7192f6f15c45bdef179d79ad21f531df86dc608e000000020000000001025cd681c087a1a500542d6809a59d1b68a9522bc7cac9dcb4cb3242849f3892cb0100000000fdffffffe358022f444ad1e79866b5e6400c2d38e6f496498a1a1d50310b2191402f40b60000000000fdffffff023e1470eb00000000225120dfbabe8da1133014ca338a28e90ae8e3618ebaa0fa685727911cd648a1dd5cb700e1f5050000000022002068ff53d1799b8593451d3e8e4321e33a361ffc94b73e31dcf1c6f1bd285a15ac0247304402204b324312b586a2099395311559cfb723fae19c998141f05afcf26485c017bdb702204a0190d2d552c9ae07d85d023218e5117c911e02006582590da351038247bb5c0121032249f202c958a7e2077798d084316ab82bf4b3ec78d23f78e493b12e2b91cf900247304402206b924a970863a1a72d551a15faad543b4e77bcf98d1e960bf86ffb4e0d8634b2022052f8eb67e7b596bfb34c000cffff5c8af608def255e07257f6cbf1e958ff31eb0121036995d6c31a9426b9e4b78bd7a02f52e8ce3f31692bff1c657e7784aa85c0d11b70000000",
+"000000308ca616ff5734d61c8323f22b1a21c258d7654d46583faff9a07e7d15b4006233b231360a002a52358e645c11b618aa6ee8ea1af5eaa953f7225430788c13bb2def100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029000feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000008f000000",
+"0000003089151044fe44ebf4fc4b0127f1b775064abda67f6209763ceed6c24de4188e0ed2173b8a496f44622762f3e43d1f1389e44126a9dd5a986cca1182c4f24bf69bef100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029100feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000090000000",
+"00000030372b71cbf187ef2f7988aa11d622925a706a6ce8fac6bd9a88dce5f473a3f10bf74ddce118d77cb3229b5318221fe7c194387d215112635a86d1f6e04be53a77f0100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029200feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000091000000",
+"00000030cbc03f02fb0b436f5883859d1ac7a22f4f1b6a48c8e486b75a39518e217a3114f5b83afcee3f89666a2c9ac267a7ac10db8083c7f3b38142ce7e51a7303bb69af0100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029300feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000092000000",
+"00000030b846baa588528c50055f45dc2bf289bd29f7cb658720b0d93426a0f239183a132fae5b16097453cfb5804230b9536df1c940a21ce7c00bb09b7b930e535111f1f0100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029400feffffff0200f2052a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000093000000",
+"0000003015243e7e0c1da1599bae9306ccf2d3e5dbba9afd362752cfbb58e6191562965b126e81cd4144467260fcc6c324f7089711c41b4c2738066934ca5d0b8676ff97f2100e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029500feffffff027c07062a010000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed5824061e2d6b1f0bb354b90d7aad9415d39c5bc1d8732720166ceb94a069f98f012000000000000000000000000000000000000000000000000000000000000000009400000002000000000102dc17042145bf1a6d8efd801e7bdb43d545ed5875d2bd80e89360cb5b6a7c1d170100000000fdffffff72f07121417f5c172d08422d9d4027fa64a3199662af284a13332bc6ba02b4a30000000000fdffffff0300e1f50500000000220020e8c263d01b353fa1b9a3c6d1ba3cf0f7e83052fccf5115fdf1f5796e2b4e6c1ac06878040000000022002068ff53d1799b8593451d3e8e4321e33a361ffc94b73e31dcf1c6f1bd285a15acc4627d0100000000160014e27f1ec30e5ac3bd7fa933a44b9b74fcd693f38602473044022029858887aa31964317847bac52132826e9dca196fe548f99f688c614bff0cdfc022024d314f519b5911cdccc84d5e15e57dcf481d5192e877553575a16559feacb3e012421020ebd36f9085a608b7b3cbcf0a80f831d4bbfd7dd99973086701f8969fe5d90e2ad510300473044022049f5134baca560a7f22d4f03db1ee46e989bb602cdc23e1e960c09525ceb3e1f022063395841b31b16cc7adf98356a68605462454e45c70078ec19431e11560ceec5014821020ebd36f9085a608b7b3cbcf0a80f831d4bbfd7dd99973086701f8969fe5d90e2ac7c21029ffbe722b147f3035c87cb1c60b9a5947dd49c774cc31e94773478711a929ac0ac9b00000000",
+"000000309737030a18ca95bab1211743a7a971d388119e7ba9bc6e269b8a00e88569e65af50c7a9c56d299c3992c7f476d9b177e3dbd290842ff92d1e3a4f7dbf8cfbba1f2100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029600feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000095000000",
+"00000030c14a26a94c794dae5ddbad7c1a4d96e2a56a7f72f7b438ca78063743d6e3190bdb5b50075b6ae343b3cc24e0006ce5b07db3b2cc00b1eaa952b2b7ddf809452ff2100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029700feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000096000000",
+"00000030d8d5d6b0813a8ed9e7f58a4db86b581216da1ed05e6b172f1b337999d57db84c666615479c6f8a458e8f2eaaa5f0df67def23ab64cea4ab87822f3597799b126f2100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029800feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000097000000",
+"000000304eb6dead0afa6dc0621f63e6e4533c827512ec2b47c8043db937fb2508a5620f44f5fd4fd9d0369bd48e6df2853e1fe2746611a04a66ae926e296087ea8708ebf2100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029900feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000098000000",
+"00000030889c7aa82fa3a108bf1fc9b832f5d3acec3b1820e653cbed010482d76f1da37bf7c3721c9ac8b48de7f8feb415aa8d6a267b67eee602c1134954d0ea81b185d5f2100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029a00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000099000000",
+"00000030f6b37a15ead31c8f5eebfb11dcdcf80fb5da14cc16d31a2543f677fdc7219f75ad5f034b70b323e9c9a1e41ae539e3885ec5811f22a5c8e75c6a1b942133eb91f3100e6affff7f200100000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029b00feffffff02db0b0395000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed052e1d59f32f3e9010e964be5706b962d29ef6c33374487a4c14873d4f553d53012000000000000000000000000000000000000000000000000000000000000000009a0000000200000000010172f07121417f5c172d08422d9d4027fa64a3199662af284a13332bc6ba02b4a30100000000fdffffff0400e1f50500000000225120348bdaab8db70bdf0fe70b0366cbd2c378469ee671493cfb3bcc9f01ef87b1ee00c2eb0b0000000022512063dcb4ba49077606dd3f7c122c4f4989db046fcc28a01d499aeef1dae2db200200a3e11100000000225120bae32da4c88083dfbb2826e579d34a1cd83febe301bfb44dc45611f972bf659ccef6c5b80000000022512070a3dabdcfce09ec0bc18d24bf890368bb31222f7fed23d1493a2c81e6a8a28a014087b7a82e5a8b67f3900c01ffa5690a42fc528764ac812d7a2c0db3e55aae404a8f5a60a032ea3b8ff8543f2dcf7b39ee48c2c1c0f948ccd742d3b048c107577b9a000000",
+"00000030a8db1c39a80dc8af041306cc1381bfd145677ae48f6ce7615e634f92df9acb4daf28f01f8fd4c8562851c3c671c02d0eb0199cfcbe6dabd00ebb7f3d64c8afb9f3100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029c00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000009b000000",
+"0000003086991a53214c1c271adacb3ee272d049a598fcf247e969a3ace9a44e50150f5e0a181072c386db27ba496b64a2f795696f3434466258698803959b8fdfb51404f3100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029d00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000009c000000",
+"0000003063ea8a959f6d12244b45d1791c739e5bede2708e8f58b8b9deffcd44de8e802ff857a99f1c75c14cec774fdfb0d3df0a49b74df84d7df611619bcd77b37476aef3100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029e00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000009d000000",
+"0000003086d58b62c36ff1b79ce985e7c44d1d54e9a18ee9c7380d914ca63fcea591dd3512883e9e753b013fe3f2d8b03c725e35b4ebb41411f42bbcf89768e9828df6d2f3100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03029f00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000009e000000",
+"00000030b945d26e39f311f22410d64d43e11c572c0bacafffdcbbf82d89dac6de97a466808ff6404c00a4d0de6512513cc2daf1a733214a7f4285f440c0d54768a1b36af3100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a000feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9012000000000000000000000000000000000000000000000000000000000000000009f000000",
+"00000030c54279bf2b5641b7a8034759178b378cab77f035ea9b568c3d23c77403b3570bff275b01b9b7a2e3e2418948b32c22b9545fca127dbff8fee64cecfd02bdf6e0ff100e6affff7f200300000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a100feffffff022c040395000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed994e4557adf13fef1b6c6df17aea6e5016181c456a668d49fe3a5f305d11ce7901200000000000000000000000000000000000000000000000000000000000000000a000000002000000000101e745368c6c4fda9b9134eca91fdf3e10d463c779647037aa2c17f6101490062f0000000000fdffffff0254e5fa02000000001600147907132f32c142950815317e4399dc56e2808fd080f0fa0200000000225120348bdaab8db70bdf0fe70b0366cbd2c378469ee671493cfb3bcc9f01ef87b1ee014051cf689739ecc919b1c1a94892cccf8cefadb86ad88e963ffd7ae6559ff7220191ec9263bd9f4828245f97197e8e4469533d10a5874129bf4014b5624dd22fb800000000",
+"00000030e04578850f74bad11d992872c4ffd8412bdd9856d38890ce917364c0aacef6757f94d93d1f042175df29c1f12babddf7b14c251d40e4344806b00bcbe9724333ff100e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a200feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a1000000",
+"00000030c5505b6ca36a3f05994e66add9759fa7a0fa37d8efeeb28deb7a2adde803b0599c2ed1a53d20d7b795178feb5b0bc21e420969987cc1e2034e7934effb2d444fff100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a300feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a2000000",
+"0000003005654f5af001d12380805421c9a8bcf697d1780fdc8748eb0ef3cf43534e2a6cc47a815cdb2c0a37f2a7607d36d1f6c87389e101d6bc8171e6867ae64a4c4a95ff100e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a400feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a3000000",
+"000000302421897107384f4cf4980cb66626d50f142ab2a2f2e7451c5f0e1dbf4a148a3ebe8a331275762703352353de92448b7c5136a5a148c2efdcb36a836fbe6fe918ff100e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a500feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a4000000",
+"00000030e7bd66bb173cfc1ab9a0b0fbec4db0625beefc505a0329c159f7e1c66e85e07fdc63cb909c9fa1daaf8db120424fd94748234d0f0187ba5c81eab0b19b08b747ff100e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a600feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a5000000",
+"0000003076f9ba4e52a578219a4288d2b82f101cd3bf9c6d588aafbe3f572b882d216862a4b939c6303d1e99b98f46880b0a5df0ac3786fe69d9e94b9684fb4ca8a5ae8f00110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a700feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a6000000",
+"0000003005037f2ffdab000355145e196d1e4f1fc190f226d05bb0901159eb6ccf2c666e36d3c07804bc526a7698fb93ca20facd4a174762000f380b2ca3548d3a3ffc2400110e6affff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a800feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a7000000",
+"000000300a3ede9fe6590e044e5e22c3fb69a3c5e53df229c20a2b94dd269805236e1964c33511b94f2e5eb5fb9f1afbff3b00f0426a066f643a30aca6120f3eb8be0c8800110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302a900feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a8000000",
+"000000307d813120c4f27dd498b8da7f204c26fcfb502c94127fd88ef1db7688c88bd32cb925a601ba6613f59049d62e542a89c731cb2c622be77ee482818cde559f6db400110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302aa00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000a9000000",
+"0000003091c85adc1e3b4c53b533c59c06cb1466de4eb9e64aca16f291c1ac50a0b0e44b3bd632ea9f2fc7cc94cb09cc36bfa65346694976f9853870abe4c21f067eecae00110e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ab00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000aa000000",
+"00000030ceba3e05c0cc80af461c679bbbcb5f80d1b0d1ba2034c9a8b81e4f6ca483074f58e5cf1b2deb4c12f8851a2dd1e198245f5ee5d7a55208ade34ac60360e9ed7d00110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ac00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000ab000000",
+"000000307f48f9f4bd29165d27b60e84e2fbebdfc5a0db7425eb51e5a582235d51170f4178dc040b91bcf43971c5481c7260ae8cdbffe41c70b4ea39d31a4640241a2b6901110e6affff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ad00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000ac000000",
+"000000300b66394cba6df59f4be16944a8d01bf050ca22f51052cae7212ee29830e52b1d2d72b3f19f2d522bd4c01e6a20c43161ca0e4bc378b98ad8a33f90ce8ee6edc201110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ae00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000ad000000",
+"00000030fc07716e36a5e200daca55834c592e022ecd410af2159d5116b027fd9861a570c78034dd7a2a92dc69dec1a49f79a41f1ca3aa51e008a3c70140467ccac2cb4001110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302af00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000ae000000",
+"00000030750f60b1993dd5ac841ddaf329d278d1ea988d0b2f0a50b3e17e9b31b6c64b46bad2c0960a1eede776f850fd11ea817569d07a06d754b8998e44fefc38b7536901110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b000feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000af000000",
+"00000030c29a1d224b50b5c89209c7d916f0e7fad72de9a88fead7f9d48e4698e18f9a45834637eea4373b005441a127cfca038e6c52df894f6c709557e3372b78be06e901110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b100feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b0000000",
+"00000030a3ffca59c306c4e1e4f3c2cb5ab96cb44660cbe0457cd00846fbf9c88073b402158756b77e0043ec5825553ac9cd86249db27e51e3eb04fc2cf905e50efbaf0e01110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b200feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b1000000",
+"000000301b04872982ad49397a8c6d01ec20a9e4022e608a07343b2a6e2d9c864baf590101ff082e29028c7fe6457903f3c5edf75e5259bdd427d672efed5b14e47f5eb602110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b300feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b2000000",
+"000000300a1beecb2cbfb99c0ed4c7420fcfdceeb8c0d26713885ea45825b9a87a836c38969dc8513c20c1fb34c22ad08d57dd277a8ad1e851bee389d6da526c2ae8d5e702110e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b400feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b3000000",
+"000000308b42fa755fa49121035c08939341cbff8a429b81c48fee84759dd7a8f6eaa00a07758618581420039216e6840ca689668df66ddda584815e85cd4e94892c05be02110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b500feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b4000000",
+"0000003002f237e7d032fe3f5706066428430560c817a9177bebbe17e743ff662264c442a689ad951fcb5c7dc9dcf35de013ccdf72faff80f79b2ef8b446cf4f2ec685f602110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b600feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b5000000",
+"0000003026f5cf05c09ada07441ebd3df2f6b1cfcf8e6efde699d06ebddf0db17b48170eb61ddb8b7b6c6b83cb819f29c1bbe9f5e699c45d67872d06b8f397f7ad5f87cb02110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b700feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b6000000",
+"00000030b9f3b3740dd9e05afdecad568c0dc0089fd0c073ddf37582cad978a9c5bacd611d52c334166d28655f8d359ad836b53ff00c294397be35810614951c721dcc9602110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b800feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b7000000",
+"00000030ed6f465612cb47bc1b0f0b55298d64359288e8ea4f4cb0f2b5f20dba934ae904117497f9ee014f773521edb8bc18f9ec4bdf57dc9badfc988662509966bd734a03110e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302b900feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b8000000",
+"0000003035bb336c8ad721bacdf4ac3e6b2e65d519a038122c1f3202ba3edaf0dc5e9734139642435de386aa440b2ffdb573bb98cec992f05797018a3ee0b818eb7b856203110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ba00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000b9000000",
+"00000030da21ed1aa8e129f6a282305e7572b2edb25ec3b6c8a3f1126ac0daa7c4732f1a57ba74d69c85e1dee8342feac97f45659644bddc30224099b19ae274b4a2da5303110e6affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302bb00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000ba000000",
+"00000030e0b2af8d69f5fb2f3e6457605926cc304d79c62385eba021742f5344aeb90b194a07c612fb0c6ed62d6c007c3b4755043e798ae0899075c2796773dc9210bf2803110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302bc00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000bb000000",
+"000000302001ba0173b7f2865a7bcfd78ae09b5883743bbd39ed79fc46ea667e3e0e8131a540d0f418d609c9cde776e33518b6957f9ae73ff48acd2a01eb6e6409d3062103110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302bd00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000bc000000",
+"00000030555412ca2f7fcbaec62795beefcc5c03b8a83d13ee5c55fac4ff5ed2bf832648743844533bf1b2af6383b21359de273540b92c135fdda421a92b4520bdb2646403110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302be00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000bd000000",
+"0000003021aad413b02ac80b992290f5c44ad1cd403af92c23a74e9e30c7aa5104eef10342758b8961e60f0ca8d4fea3680f4ac573f6ac6478c4096ad2c1081a9f9b66e504110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302bf00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000be000000",
+"000000305d265de4dc6bd166d9e5429686940ec2f2c469e6136d0c7a13f03565e9841d35472431cab600e43dd3b744da6b56709dd9c6311d21c8bce5d452f8845137184c04110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c000feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000bf000000",
+"000000304e1e1e596928aac44a068a263823030859e6a30f3fe11652bf2da8aa0b732f7937c93ebc99d7e53794993df4aa6c5b5ca81f2c0d53032adfef3bef16f9982f0604110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c100feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c0000000",
+"00000030bc6df3737b42dd109d088ef5898ed10179faec89d1ba94b38cd192c338cd36089fe67454081b0c08d2ff9a2aa873a708a3213754727ac7c4972c25d9b45b249804110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c200feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c1000000",
+"000000309380624d711df058952aff0af1b4427134a3849111e70fa15aa86414e1d69f384f75a19d8fb9aebbe36326f3cdc1cec57e357cc5986467794a45f49bbdc70bf304110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c300feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c2000000",
+"000000307b581de84f54773af5dd7178f710a01ccb9ab144e91db3a0165a39cfae49ae2dfd67fd16de4d926c6c76268330e664103bed5c19ba93c3333b027b2fc7fff62004110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c400feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c3000000",
+"00000030f05121c30144af24ac2c026cb784bce883bdc65748fc3b0f67a27e030cfac16b82ca6668a3879b42c8ade2e237bfd0d3572b9811eb4104d0d8f6f7f712d23ccd05110e6affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c500feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c4000000",
+"0000003073f8786690618560f223f32d0a805d32fc0f1203575dd5e51215f8cafced13435f33ea220110edd2566762b5ed3d5cc8ee4a86f8f3cc3b5dda33c5951544f0c205110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c600feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c5000000",
+"000000300ed51fce02fd57091777896eb1b2216f8ec689bd67f37787505fd812dbc61f75e028d8c70d2d753ea0ecbd91975c250b11c9898606856de5fd9704910b83dfb905110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c700feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c6000000",
+"00000030415bc5f05df226e2c6b36325c5c10e70d8268c4e59ae03be465aa1ce7ccc8d386494432be49c30a12af3d4d8dad26cf9c545cf8ff33e644515d1be68e2a9f1f105110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c800feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c7000000",
+"000000303aa04b95cfe5375101ffcef31279e4c3b7d6c817a9f3933031efc6b0c63aa4783aa7a37e39d55c3454932263c92ccb488543e6881268fcce96eb0df30d688b8d05110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302c900feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c8000000",
+"0000003089bea591f2a36abc8b9c3a795a476ba072b3b815849aa2b0b1ea45de0831bc5268a5d9eb173c66b07a6107809a098b1fe6b1b93c32dc6902ada2ae7af1b3776305110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ca00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000c9000000",
+"000000300606230798637839aa25460ec66aa3a62d5fbfb12cda61eeb8c19d7512449e32fabb03b8c364246e80ea5f8f721c5a083e0f941ae4b7e681ea17caf2daf2ca5806110e6affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302cb00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000ca000000",
+"0000003044247f0e280d232be97a8e07c3e9f4097de339a3bf81d018c2a639b54c6e6825b5a12819c79f70e41bcdeeb274eac663dbe0f2f4278bf78828d85d10416698d206110e6affff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302cc00feffffff0200f90295000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf901200000000000000000000000000000000000000000000000000000000000000000cb000000",
+"0000003082a05ee73b3c345f74515dd7bc3cdf061835387c261e5dfac8395e01772db903082fd51b06b96e43ab074abbfca5f6f518cd175277189397ada068e0a3577bba06110e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302cd00feffffff0241030395000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed13f11444bf728589721cd0799831733abad56be9a33932cb3e79fa4353dd59bf01200000000000000000000000000000000000000000000000000000000000000000cc00000002000000000101e745368c6c4fda9b9134eca91fdf3e10d463c779647037aa2c17f6101490062f0300000000fdffffff0200e1f505000000001600148239827d894ad1bce050a83b0ac6cfab8b99670e8d0bd0b2000000001600143c4ec2a32cf8472f16242566b2f614e30977bce90140fb86ceba6ec1c3fea6ccf6daef2613a878282b5436699a906eeda64e0d9fe456d3ed15172bbeaf7a381dd4684265610599a98d51c5e58a0ed816101ef1e41bc3cc000000",
+"000000305c93f992d6040ecb3e1164cc11d6463fa4eb05d850cead2777a2ea37159b2d5f4b9fdb61be7d374f42b9a21132752eba23eeebb8c0fa6d50cdf55053883c6ab106110e6affff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0302ce00feffffff0241030395000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed19a31ce10a3dbf46e11da3687a1ccf18782c81a5ae087bdbdcb91718295f72b401200000000000000000000000000000000000000000000000000000000000000000cd00000002000000000101dc17042145bf1a6d8efd801e7bdb43d545ed5875d2bd80e89360cb5b6a7c1d170000000000fdffffff02fd287ae500000000160014a0538caa44b128c31f7d90d357cac16efcce1b6e00e1f505000000001600149316ed6ef4fd7a44a402626a6be44b85ec729fcb01403637f36c8da16b37fa9632ad8a701853e4ff4a4f8058f6eda8b13738af3595dad053296a938cc6ae0cccffbd7079b0f21c16d810264e57f807c6598f4a5ba009cd000000",
 };
 #endif // BITCOIN_TEST_KERNEL_BLOCK_DATA_H
diff --git a/depend/bitcoin/src/test/kernel/test_kernel.cpp b/depend/bitcoin/src/test/kernel/test_kernel.cpp
index 97b0b91f..8b919c91 100644
--- a/depend/bitcoin/src/test/kernel/test_kernel.cpp
+++ b/depend/bitcoin/src/test/kernel/test_kernel.cpp
@@ -4,6 +4,7 @@
 
 #include <kernel/bitcoinkernel.h>
 #include <kernel/bitcoinkernel_wrapper.h>
+#include <util/byte_units.h>
 #include <util/fs.h>
 
 #define BOOST_TEST_MODULE Bitcoin Kernel Test Suite
@@ -120,16 +121,6 @@ class TestKernelNotifications : public KernelNotifications
         BOOST_CHECK_GT(timestamp, 0);
     }
 
-    void WarningSetHandler(Warning warning, std::string_view message) override
-    {
-        std::cout << "Kernel warning is set: " << message << std::endl;
-    }
-
-    void WarningUnsetHandler(Warning warning) override
-    {
-        std::cout << "Kernel warning was unset." << std::endl;
-    }
-
     void FlushErrorHandler(std::string_view error) override
     {
         std::cout << error << std::endl;
@@ -513,6 +504,33 @@ BOOST_AUTO_TEST_CASE(btck_transaction_input)
     OutPoint point_0 = input_0.OutPoint();
     OutPoint point_1 = input_1.OutPoint();
     CheckHandle(point_0, point_1);
+
+    WitnessStackView ws_0 = input_0.GetWitnessStack();
+    BOOST_CHECK_EQUAL(ws_0.CountItems(), 0);
+    BOOST_CHECK(ws_0.Items().empty());
+
+    // P2PKH: DER sig + compressed pubkey push.
+    BOOST_CHECK(input_0.GetScriptSig() == hex_string_to_byte_vec("473044022004893432347f39beaa280e99da595681ddb20fc45010176897e6e055d716dbfa022040a9e46648a5d10c33ef7cee5e6cf4b56bd513eae3ae044f0039824b02d0f44c012102982331a52822fd9b62e9b5d120da1d248558fac3da3a3c51cd7d9c8ad3da760e"));
+    BOOST_CHECK(input_1.GetScriptSig() == hex_string_to_byte_vec("473044022068bcedc7fe39c9f21ad318df2c2da62c2dc9522a89c28c8420ff9d03d2e6bf7b0220132afd752754e5cb1ea2fd0ed6a38ec666781e34b0e93dc9a08f2457842cf5660121033aeb9c079ea3e08ea03556182ab520ce5c22e6b0cb95cee6435ee17144d860cd"));
+
+    // P2WSH input: OP_0, sig, sig, redeem_script (0, 71, 71, 105 bytes); no scriptSig.
+    Transaction segwit_tx{hex_string_to_byte_vec("010000000001011f97548fbbe7a0db7588a66e18d803d0089315aa7d4cc28360b6ec50ef36718a0100000000ffffffff02df1776000000000017a9146c002a686959067f4866b8fb493ad7970290ab728757d29f0000000000220020701a8d401c84fb13e6baf169d59684e17abd9fa216c8cc5b9fc63d622ff8c58d04004730440220565d170eed95ff95027a69b313758450ba84a01224e1f7f130dda46e94d13f8602207bdd20e307f062594022f12ed5017bbf4a055a06aea91c10110a0e3bb23117fc014730440220647d2dc5b15f60bc37dc42618a370b2a1490293f9e5c8464f53ec4fe1dfe067302203598773895b4b16d37485cbe21b337f4e4b650739880098c592553add7dd4355016952210375e00eb72e29da82b89367947f29ef34afb75e8654f6ea368e0acdfd92976b7c2103a1b26313f430c4b15bb1fdce663207659d8cac749a0e53d70eff01874496feff2103c96d495bfdd5ba4145e3e046fee45e84a8a48ad05bd8dbb395c011a32cf9f88053ae00000000")};
+    TransactionInputView segwit_input = segwit_tx.GetInput(0);
+    WitnessStackView ws = segwit_input.GetWitnessStack();
+    BOOST_CHECK_EQUAL(ws.CountItems(), 4);
+    BOOST_CHECK(ws.GetItem(0).empty());
+    BOOST_CHECK(ws.GetItem(1) == hex_string_to_byte_vec("30440220565d170eed95ff95027a69b313758450ba84a01224e1f7f130dda46e94d13f8602207bdd20e307f062594022f12ed5017bbf4a055a06aea91c10110a0e3bb23117fc01"));
+    BOOST_CHECK(ws.GetItem(2) == hex_string_to_byte_vec("30440220647d2dc5b15f60bc37dc42618a370b2a1490293f9e5c8464f53ec4fe1dfe067302203598773895b4b16d37485cbe21b337f4e4b650739880098c592553add7dd435501"));
+    BOOST_CHECK(ws.GetItem(3) == hex_string_to_byte_vec("52210375e00eb72e29da82b89367947f29ef34afb75e8654f6ea368e0acdfd92976b7c2103a1b26313f430c4b15bb1fdce663207659d8cac749a0e53d70eff01874496feff2103c96d495bfdd5ba4145e3e046fee45e84a8a48ad05bd8dbb395c011a32cf9f88053ae"));
+    auto items = ws.Items();
+    BOOST_CHECK_EQUAL(items.size(), 4);
+    for (size_t i = 0; i < items.size(); ++i) {
+        BOOST_CHECK(items[i] == ws.GetItem(i));
+    }
+    WitnessStack owned_ws_0{ws_0};
+    WitnessStack owned_ws{ws};
+    CheckHandle(owned_ws_0, owned_ws);
+    BOOST_CHECK(segwit_input.GetScriptSig().empty());
 }
 
 BOOST_AUTO_TEST_CASE(btck_precomputed_txdata) {
@@ -651,6 +669,13 @@ BOOST_AUTO_TEST_CASE(logging_tests)
     Logger logger{std::make_unique<TestLog>()};
 }
 
+BOOST_AUTO_TEST_CASE(btck_chainparams_tests)
+{
+    ChainParams params_signet{ChainType::SIGNET};
+    ChainParams params_signet_challenge{hex_string_to_byte_vec("51")};
+    CheckHandle(params_signet, params_signet_challenge);
+}
+
 BOOST_AUTO_TEST_CASE(btck_context_tests)
 {
     { // test default context
@@ -683,10 +708,6 @@ BOOST_AUTO_TEST_CASE(btck_block_header_tests)
     BlockHeader header_1{hex_string_to_byte_vec("00c00020e7cb7b4de21d26d55bd384017b8bb9333ac3b2b55bed00000000000000000000d91b4484f801b99f03d36b9d26cfa83420b67f81da12d7e6c1e7f364e743c5ba9946e268b4dd011799c8533d")};
     CheckHandle(header_0, header_1);
 
-    // Test error handling for invalid data
-    BOOST_CHECK_THROW(BlockHeader{hex_string_to_byte_vec("00")}, std::runtime_error);
-    BOOST_CHECK_THROW(BlockHeader{hex_string_to_byte_vec("")}, std::runtime_error);
-
     // Test all header field accessors using mainnet block 1
     auto mainnet_block_1_header = hex_string_to_byte_vec("010000006fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000982051fd1e4ba744bbbe680e1fee14677ba1a3c3540bf7b1cdb606e857233e0e61bc6649ffff001d01e36299");
     BlockHeader header{mainnet_block_1_header};
@@ -724,6 +745,12 @@ BOOST_AUTO_TEST_CASE(btck_block)
     CheckHandle(block, block_100);
     Block block_tx{hex_string_to_byte_vec(REGTEST_BLOCK_DATA[205])};
     CheckRange(block_tx.Transactions(), block_tx.CountTransactions());
+    auto transactions{block_tx.Transactions()};
+    auto transactions_copy{transactions};
+    BOOST_CHECK(transactions.begin() == transactions_copy.begin());
+    BOOST_CHECK(transactions.begin() == block_tx.Transactions().begin());
+    auto transaction_it{transactions.begin()};
+    BOOST_CHECK((*transaction_it).Txid() == block_tx.GetTransaction(0).Txid());
     auto invalid_data = hex_string_to_byte_vec("012300");
     BOOST_CHECK_THROW(Block{invalid_data}, std::runtime_error);
     auto empty_data = hex_string_to_byte_vec("");
@@ -780,6 +807,9 @@ BOOST_AUTO_TEST_CASE(btck_chainman_tests)
 
     ChainstateManagerOptions chainman_opts{context, PathToString(test_directory.m_directory), PathToString(test_directory.m_directory / "blocks")};
     chainman_opts.SetWorkerThreads(4);
+    BOOST_CHECK(!chainman_opts.SetDatabaseCacheBytes(4_MiB - 1));
+    if constexpr (sizeof(void*) == 4) BOOST_CHECK(!chainman_opts.SetDatabaseCacheBytes(2_GiB));
+    BOOST_CHECK(chainman_opts.SetDatabaseCacheBytes(4_MiB));
     BOOST_CHECK(!chainman_opts.SetWipeDbs(/*wipe_block_tree=*/true, /*wipe_chainstate=*/false));
     BOOST_CHECK(chainman_opts.SetWipeDbs(/*wipe_block_tree=*/true, /*wipe_chainstate=*/true));
     BOOST_CHECK(chainman_opts.SetWipeDbs(/*wipe_block_tree=*/false, /*wipe_chainstate=*/true));
@@ -1102,10 +1132,9 @@ BOOST_AUTO_TEST_CASE(btck_chainman_regtest_tests)
         for (const auto& data : REGTEST_BLOCK_DATA) {
             Block block{hex_string_to_byte_vec(data)};
             BlockHeader header = block.GetHeader();
-            BlockValidationState state{};
-            BOOST_CHECK(state.GetBlockValidationResult() == BlockValidationResult::UNSET);
-            BOOST_CHECK(chainman->ProcessBlockHeader(header, state));
+            BlockValidationState state = chainman->ProcessBlockHeader(header);
             BOOST_CHECK(state.GetValidationMode() == ValidationMode::VALID);
+            BOOST_CHECK(state.GetBlockValidationResult() == BlockValidationResult::UNSET);
             BlockTreeEntry entry{*chainman->GetBlockTreeEntry(header.Hash())};
             BOOST_CHECK(!chainman->GetChain().Contains(entry));
             BlockTreeEntry best_entry{chainman->GetBestEntry()};
@@ -1220,15 +1249,15 @@ BOOST_AUTO_TEST_CASE(btck_chainman_regtest_tests)
     // Validate coin properties
     TransactionOutputView output = coin.GetOutput();
     uint32_t coin_height = coin.GetConfirmationHeight();
-    BOOST_CHECK_EQUAL(coin_height, 205);
-    BOOST_CHECK_EQUAL(output.Amount(), 100000000);
+    BOOST_CHECK_EQUAL(coin_height, 143);
+    BOOST_CHECK_EQUAL(output.Amount(), 3949990974);
 
     // Test script pubkey serialization
     auto script_pubkey = output.GetScriptPubkey();
     auto script_pubkey_bytes{script_pubkey.ToBytes()};
-    BOOST_CHECK_EQUAL(script_pubkey_bytes.size(), 22);
+    BOOST_CHECK_EQUAL(script_pubkey_bytes.size(), 34);
     auto round_trip_script_pubkey{ScriptPubkey(script_pubkey_bytes)};
-    BOOST_CHECK_EQUAL(round_trip_script_pubkey.ToBytes().size(), 22);
+    BOOST_CHECK_EQUAL(round_trip_script_pubkey.ToBytes().size(), 34);
 
     for (const auto tx_spent_outputs : block_spent_outputs.TxsSpentOutputs()) {
         for (const auto coins : tx_spent_outputs.Coins()) {
@@ -1266,3 +1295,176 @@ BOOST_AUTO_TEST_CASE(btck_chainman_regtest_tests)
     fs::remove(test_directory.m_directory / "blocks" / "rev00000.dat");
     BOOST_CHECK_THROW(chainman->ReadBlockSpentOutputs(tip), std::runtime_error);
 }
+
+// -----------------------------------------------------------------------------
+// CheckTransaction tests
+//
+// Transaction hex below is copied from src/test/data/tx_invalid.json (entries
+// marked "BADTX") and tx_valid.json. CheckTransaction performs only basic context-free
+// consensus checks and can only produce two outcomes:
+//   - VALID  (ValidationMode::VALID, TxValidationResult::UNSET)
+//   - INVALID (ValidationMode::INVALID, TxValidationResult::CONSENSUS)
+// Other TxValidationResult values are set by higher-level validation and are
+// not reachable through btck_transaction_check.
+// -----------------------------------------------------------------------------
+BOOST_AUTO_TEST_CASE(btck_transaction_check_tests)
+{
+    using namespace btck;
+
+    constexpr std::string_view valid_tx_hex{
+        "01000000010001000000000000000000000000000000000000000000000000000000000000"
+        "000000006a473044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b92"
+        "4f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e9"
+        "9e883e7a012103ba8c8b86dea131c22ab967e6dd99bdae8eff7a1f75a2c35f1f944109e3"
+        "fe5e22ffffffff010000000000000000015100000000"};
+    constexpr std::string_view no_outputs_tx_hex{
+        "01000000010001000000000000000000000000000000000000000000000000000000000000"
+        "000000006d483045022100f16703104aab4e4088317c862daec83440242411b039d14280e0"
+        "3dd33b487ab802201318a7be236672c5c56083eb7a5a195bc57a40af7923ff8545016cd3b5"
+        "71e2a601232103c40e5d339df3f30bf753e7e04450ae4ef76c9e45587d1d993bdc4cd06f06"
+        "51c7acffffffff0000000000"};
+
+    auto expect_valid = [](std::string_view hex) {
+        Transaction tx{hex_string_to_byte_vec(hex)};
+        TxValidationState st;
+        BOOST_CHECK(CheckTransaction(tx, st));
+        BOOST_CHECK(st.GetValidationMode() == ValidationMode::VALID);
+        BOOST_CHECK(st.GetTxValidationResult() == TxValidationResult::UNSET);
+    };
+
+    auto expect_invalid = [](std::string_view hex) {
+        Transaction tx{hex_string_to_byte_vec(hex)};
+        TxValidationState st;
+        BOOST_CHECK(!CheckTransaction(tx, st));
+        BOOST_CHECK(st.GetValidationMode() == ValidationMode::INVALID);
+        BOOST_CHECK(st.GetTxValidationResult() == TxValidationResult::CONSENSUS);
+    };
+
+    // Valid: simple 1-in 1-out transaction (from tx_valid.json)
+    expect_valid(valid_tx_hex);
+
+    // Valid coinbase with scriptSig size 2 (from tx_valid.json)
+    expect_valid(
+        "01000000010000000000000000000000000000000000000000000000000000000000000000"
+        "ffffffff025151ffffffff010000000000000000015100000000");
+
+    // No outputs (BADTX from tx_invalid.json)
+    expect_invalid(no_outputs_tx_hex);
+
+    {
+        Transaction valid_tx{hex_string_to_byte_vec(valid_tx_hex)};
+        Transaction invalid_tx{hex_string_to_byte_vec(no_outputs_tx_hex)};
+        TxValidationState state;
+
+        BOOST_CHECK(btck_transaction_check(valid_tx.get(), state.get()) == 1);
+        BOOST_CHECK(state.GetValidationMode() == ValidationMode::VALID);
+        BOOST_CHECK(state.GetTxValidationResult() == TxValidationResult::UNSET);
+
+        BOOST_CHECK(btck_transaction_check(invalid_tx.get(), state.get()) == 0);
+        BOOST_CHECK(state.GetValidationMode() == ValidationMode::INVALID);
+        BOOST_CHECK(state.GetTxValidationResult() == TxValidationResult::CONSENSUS);
+    }
+
+    // Negative output (BADTX)
+    expect_invalid(
+        "01000000010001000000000000000000000000000000000000000000000000000000000000"
+        "000000006d4830450220063222cbb128731fc09de0d7323746539166544d6c1df84d867cce"
+        "a84bcc8903022100bf568e8552844de664cd41648a031554327aa8844af34b4f27397c65b9"
+        "2c04de0123210243ec37dee0e2e053a9c976f43147e79bc7d9dc606ea51010af1ac80db6b0"
+        "69e1acffffffff01ffffffffffffffff015100000000");
+
+    // MAX_MONEY + 1 output (BADTX)
+    expect_invalid(
+        "01000000010001000000000000000000000000000000000000000000000000000000000000"
+        "000000006e493046022100e1eadba00d9296c743cb6ecc703fd9ddc9b3cd12906176a226ae"
+        "4c18d6b00796022100a71aef7d2874deff681ba6080f1b278bac7bb99c61b08a85f4311970"
+        "ffe7f63f012321030c0588dc44d92bdcbf8e72093466766fdc265ead8db64517b0c542275b"
+        "70fffbacffffffff010140075af0750700015100000000");
+
+    // MAX_MONEY output + 1 output: sum exceeds MAX_MONEY (BADTX)
+    expect_invalid(
+        "01000000010001000000000000000000000000000000000000000000000000000000000000"
+        "000000006d483045022027deccc14aa6668e78a8c9da3484fbcd4f9dcc9bb7d1b85146314b"
+        "21b9ae4d86022100d0b43dece8cfb07348de0ca8bc5b86276fa88f7f2138381128b7c36ab2"
+        "e42264012321029bb13463ddd5d2cc05da6e84e37536cb9525703cfd8f43afdb414988987a"
+        "92f6acffffffff020040075af075070001510001000000000000015100000000");
+
+    // Duplicate inputs (BADTX)
+    expect_invalid(
+        "01000000020001000000000000000000000000000000000000000000000000000000000000"
+        "000000006c47304402204bb1197053d0d7799bf1b30cd503c44b58d6240cccbdc85b6fe76d"
+        "087980208f02204beeed78200178ffc6c74237bb74b3f276bbb4098b5605d814304fe128bf"
+        "1431012321039e8815e15952a7c3fada1905f8cf55419837133bd7756c0ef14fc8dfe50c0d"
+        "eaacffffffff0001000000000000000000000000000000000000000000000000000000000000"
+        "000000006c47304402202306489afef52a6f62e90bf750bbcdf40c06f5c6b138286e6b6b8617"
+        "6bb9341802200dba98486ea68380f47ebb19a7df173b99e6bc9c681d6ccf3bde31465d1f16"
+        "b3012321039e8815e15952a7c3fada1905f8cf55419837133bd7756c0ef14fc8dfe50c0dea"
+        "acffffffff010000000000000000015100000000");
+
+    // Coinbase with scriptSig size 1: too small (BADTX)
+    expect_invalid(
+        "01000000010000000000000000000000000000000000000000000000000000000000000000"
+        "ffffffff0151ffffffff010000000000000000015100000000");
+
+    // Coinbase with scriptSig size 101: too large (BADTX)
+    expect_invalid(
+        "01000000010000000000000000000000000000000000000000000000000000000000000000"
+        "ffffffff6551515151515151515151515151515151515151515151515151515151515151515151"
+        "515151515151515151515151515151515151515151515151515151515151515151515151515151"
+        "51515151515151515151515151515151515151515151515151515151ffffffff01000000000000"
+        "0000015100000000");
+
+    // Null prevout in non-coinbase: two inputs, one is null (BADTX)
+    expect_invalid(
+        "01000000020000000000000000000000000000000000000000000000000000000000000000"
+        "ffffffff00ffffffff000100000000000000000000000000000000000000000000000000000000"
+        "00000000000000ffffffff010000000000000000015100000000");
+}
+
+class KernelMockTime
+{
+public:
+    explicit KernelMockTime(std::chrono::seconds timestamp) { set(timestamp); }
+    ~KernelMockTime()
+    {
+        set_mock_time(std::chrono::seconds{0});
+    }
+
+    KernelMockTime(const KernelMockTime&) = delete;
+    KernelMockTime& operator=(const KernelMockTime&) = delete;
+
+    void set(std::chrono::seconds timestamp) { set_mock_time(timestamp); }
+};
+
+BOOST_AUTO_TEST_CASE(btck_set_mock_time_tests)
+{
+    // Out-of-range timestamps throw
+    BOOST_CHECK_EXCEPTION(set_mock_time(std::chrono::seconds{-1}), std::runtime_error, HasReason("timestamp out of range"));
+    constexpr std::chrono::seconds max_time{std::numeric_limits<uint32_t>::max()};
+    BOOST_CHECK_EXCEPTION(set_mock_time(max_time + std::chrono::seconds{1}), std::runtime_error, HasReason("timestamp out of range"));
+
+    // Confirm the mock time actually takes effect by exercising the header future-time check
+    auto test_directory{TestDirectory{"set_mock_time_test_bitcoin_kernel"}};
+    auto notifications{std::make_shared<TestKernelNotifications>()};
+    auto context{create_context(notifications, ChainType::REGTEST)};
+    auto chainman{create_chainman(
+        test_directory, /*reindex=*/false, /*wipe_chainstate=*/false,
+        /*block_tree_db_in_memory=*/true, /*chainstate_db_in_memory=*/true, context)};
+
+    Block block{hex_string_to_byte_vec(REGTEST_BLOCK_DATA[0])};
+    BlockHeader header{block.GetHeader()};
+    const std::chrono::seconds block_time{header.Timestamp()};
+
+    // With the time set 3h before the header, the kernel must see the header as >2h in the future and reject it
+    KernelMockTime mock_time{block_time - std::chrono::hours{3}};
+    BlockValidationState future_state{chainman->ProcessBlockHeader(header)};
+    BOOST_CHECK(future_state.GetValidationMode() == ValidationMode::INVALID);
+    BOOST_CHECK(future_state.GetBlockValidationResult() == BlockValidationResult::TIME_FUTURE);
+
+    // At the upper bound the header is far in the past and must be accepted; this also
+    // confirms the future-time check's "now + 2h" computation doesn't overflow when now is at its max.
+    mock_time.set(max_time);
+    BlockValidationState ok_state{chainman->ProcessBlockHeader(header)};
+    BOOST_CHECK(ok_state.GetValidationMode() == ValidationMode::VALID);
+    BOOST_CHECK(ok_state.GetBlockValidationResult() == BlockValidationResult::UNSET);
+}
diff --git a/depend/bitcoin/src/test/key_tests.cpp b/depend/bitcoin/src/test/key_tests.cpp
index b0c052af..75173e4b 100644
--- a/depend/bitcoin/src/test/key_tests.cpp
+++ b/depend/bitcoin/src/test/key_tests.cpp
@@ -41,13 +41,17 @@ BOOST_FIXTURE_TEST_SUITE(key_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(key_test1)
 {
     CKey key1  = DecodeSecret(strSecret1);
-    BOOST_CHECK(key1.IsValid() && !key1.IsCompressed());
+    BOOST_CHECK(key1.IsValid());
+    BOOST_CHECK(!key1.IsCompressed());
     CKey key2  = DecodeSecret(strSecret2);
-    BOOST_CHECK(key2.IsValid() && !key2.IsCompressed());
+    BOOST_CHECK(key2.IsValid());
+    BOOST_CHECK(!key2.IsCompressed());
     CKey key1C = DecodeSecret(strSecret1C);
-    BOOST_CHECK(key1C.IsValid() && key1C.IsCompressed());
+    BOOST_CHECK(key1C.IsValid());
+    BOOST_CHECK(key1C.IsCompressed());
     CKey key2C = DecodeSecret(strSecret2C);
-    BOOST_CHECK(key2C.IsValid() && key2C.IsCompressed());
+    BOOST_CHECK(key2C.IsValid());
+    BOOST_CHECK(key2C.IsCompressed());
     CKey bad_key = DecodeSecret(strAddressBad);
     BOOST_CHECK(!bad_key.IsValid());
 
diff --git a/depend/bitcoin/src/test/logging_tests.cpp b/depend/bitcoin/src/test/logging_tests.cpp
index 37a43e97..701b9c2c 100644
--- a/depend/bitcoin/src/test/logging_tests.cpp
+++ b/depend/bitcoin/src/test/logging_tests.cpp
@@ -166,7 +166,7 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacros_CategoryName, LogSetup)
     const auto category_names = SplitString(concatenated_category_names, ',');
     for (const auto& category_name : category_names) {
         const auto trimmed_category_name = TrimString(category_name);
-        const auto category{*Assert(GetLogCategory(trimmed_category_name))};
+        const auto category{*Assert(BCLog::Logger::GetLogCategory(trimmed_category_name))};
         expected_category_names.emplace_back(category, trimmed_category_name);
     }
 
@@ -268,6 +268,13 @@ BOOST_FIXTURE_TEST_CASE(logging_Conf, LogSetup)
         BOOST_CHECK(http_it != category_levels.end());
         BOOST_CHECK_EQUAL(http_it->second, BCLog::Level::Info);
     }
+
+    // Removed categories (like "libevent") should not store a category-specific level
+    {
+        ResetLogger();
+        BOOST_CHECK(LogInstance().SetCategoryLogLevel(/*category_str=*/"libevent", /*level_str=*/"trace"));
+        BOOST_CHECK(LogInstance().CategoryLevels().empty());
+    }
 }
 
 struct ScopedScheduler {
@@ -382,7 +389,7 @@ void LogFromLocation(Location location, const std::string& message) {
         LogDebug(BCLog::LogFlags::HTTP, "%s\n", message);
         return;
     case Location::INFO_NOLIMIT:
-        LogPrintLevel_(BCLog::LogFlags::ALL, BCLog::Level::Info, /*should_ratelimit=*/false, "%s\n", message);
+        LogInfo(util::log::NO_RATE_LIMIT, "%s\n", message);
         return;
     } // no default case, so the compiler can warn about missing cases
     assert(false);
diff --git a/depend/bitcoin/src/test/mempool_tests.cpp b/depend/bitcoin/src/test/mempool_tests.cpp
index 77024c3e..0d1e6b77 100644
--- a/depend/bitcoin/src/test/mempool_tests.cpp
+++ b/depend/bitcoin/src/test/mempool_tests.cpp
@@ -24,6 +24,32 @@ class MemPoolTest final : public CTxMemPool
     using CTxMemPool::GetMinFee;
 };
 
+BOOST_AUTO_TEST_CASE(MempoolLookupTest)
+{
+    auto& pool = static_cast<MemPoolTest&>(*Assert(m_node.mempool));
+    LOCK2(cs_main, pool.cs);
+    TestMemPoolEntryHelper entry;
+
+    CMutableTransaction tx = CMutableTransaction();
+    tx.vin.resize(1);
+    tx.vin[0].scriptSig = CScript() << OP_1;
+    tx.vout.resize(1);
+    tx.vout[0].scriptPubKey = CScript() << OP_1 << OP_EQUAL;
+    tx.vout[0].nValue = 10 * COIN;
+
+    // Not in the mempool, so can't find it by txid or wtxid
+    BOOST_CHECK(!pool.get(tx.GetHash()));
+    BOOST_CHECK(!pool.get(CTransaction(tx).GetWitnessHash()));
+
+    TryAddToMempool(pool, entry.Fee(1000LL).FromTx(tx));
+
+    // Lookup by Txid
+    BOOST_CHECK(pool.get(tx.GetHash()));
+
+    // Lookup by Wtxid
+    BOOST_CHECK(pool.get(CTransaction(tx).GetWitnessHash()));
+}
+
 BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
 {
     // Test CTxMemPool::remove functionality
@@ -252,29 +278,29 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     TryAddToMempool(pool, entry.Fee(900LL).FromTx(tx7));
 
     std::vector<CTransactionRef> vtx;
-    NodeClockContext clock_ctx{42s};
+    FakeNodeClock clock{42s};
     constexpr std::chrono::seconds HALFLIFE{CTxMemPool::ROLLING_FEE_HALFLIFE};
-    clock_ctx += HALFLIFE;
+    clock += HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE);
     // ... we should keep the same min fee until we get a block
     pool.removeForBlock(vtx, 1);
-    clock_ctx += HALFLIFE;
+    clock += HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE)/2.0));
     // ... then feerate should drop 1/2 each halflife
 
-    clock_ctx += HALFLIFE / 2;
+    clock += HALFLIFE / 2;
     BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 5 / 2).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE)/4.0));
     // ... with a 1/2 halflife when mempool is < 1/2 its target size
 
-    clock_ctx += HALFLIFE / 4;
+    clock += HALFLIFE / 4;
     BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 9 / 2).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE)/8.0));
     // ... with a 1/4 halflife when mempool is < 1/4 its target size
 
-    clock_ctx += 5 * HALFLIFE;
+    clock += 5 * HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), DEFAULT_INCREMENTAL_RELAY_FEE);
     // ... but feerate should never drop below DEFAULT_INCREMENTAL_RELAY_FEE
 
-    clock_ctx += HALFLIFE;
+    clock += HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), 0);
     // ... unless it has gone all the way to 0 (after getting past DEFAULT_INCREMENTAL_RELAY_FEE/2)
 }
diff --git a/depend/bitcoin/src/test/miner_tests.cpp b/depend/bitcoin/src/test/miner_tests.cpp
index 6b4e85a5..90df73b4 100644
--- a/depend/bitcoin/src/test/miner_tests.cpp
+++ b/depend/bitcoin/src/test/miner_tests.cpp
@@ -3,40 +3,58 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <addresstype.h>
+#include <chain.h>
 #include <coins.h>
-#include <common/system.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
 #include <interfaces/mining.h>
+#include <interfaces/types.h>
+#include <kernel/chainparams.h>
 #include <node/miner.h>
+#include <node/mining_args.h>
+#include <node/mining_types.h>
+#include <policy/feerate.h>
 #include <policy/policy.h>
-#include <test/util/random.h>
+#include <pow.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <random.h>
+#include <script/script.h>
+#include <serialize.h>
+#include <sync.h>
+#include <test/util/common.h>
+#include <test/util/setup_common.h>
 #include <test/util/transaction_utils.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/feefrac.h>
 #include <util/strencodings.h>
-#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <versionbits.h>
-#include <pow.h>
 
-#include <test/util/common.h>
-#include <test/util/setup_common.h>
+#include <boost/test/unit_test.hpp>
 
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
 #include <memory>
+#include <optional>
+#include <span>
+#include <stdexcept>
+#include <string>
 #include <vector>
 
-#include <boost/test/unit_test.hpp>
-
 using namespace util::hex_literals;
 using interfaces::BlockTemplate;
 using interfaces::Mining;
 using node::BlockAssembler;
+using node::BlockCreateOptions;
 
 namespace miner_tests {
 struct MinerTestingSetup : public TestingSetup {
@@ -115,9 +133,9 @@ void MinerTestingSetup::TestPackageSelection(const CScript& scriptPubKey, const
 {
     CTxMemPool& tx_mempool{MakeMempool()};
     auto mining{MakeMining()};
-    BlockAssembler::Options options;
-    options.coinbase_output_script = scriptPubKey;
-    options.include_dummy_extranonce = true;
+    BlockCreateOptions options{
+        .coinbase_output_script = scriptPubKey,
+    };
 
     LOCK(tx_mempool.cs);
     BOOST_CHECK(tx_mempool.size() == 0);
@@ -167,6 +185,27 @@ void MinerTestingSetup::TestPackageSelection(const CScript& scriptPubKey, const
     const auto high_fee_tx{entry.Fee(50000).Time(Now<NodeSeconds>()).SpendsCoinbase(false).FromTx(tx)};
     TryAddToMempool(tx_mempool, high_fee_tx);
 
+    // Test getTransactionsByTxID()
+    const std::vector<Txid> tx_id_list{
+        hashParentTx,
+        Txid::FromUint256(uint256::ZERO) // non-existing tx
+    };
+    auto raw_txs = mining->getTransactionsByTxID(tx_id_list);
+    BOOST_REQUIRE_EQUAL(raw_txs.size(), tx_id_list.size());
+    BOOST_CHECK(raw_txs[0]);
+    BOOST_CHECK(raw_txs[0]->GetHash() == hashParentTx);
+    BOOST_CHECK(!raw_txs[1]);
+    // Test getTransactionsByWitnessID()
+    // tx has no witness, so just cast to Wtxid
+    const std::vector<Wtxid> wtx_id_list{
+        Wtxid::FromUint256(hashParentTx.ToUint256()),
+        Wtxid::FromUint256(uint256::ZERO)
+    };
+    raw_txs = mining->getTransactionsByWitnessID(wtx_id_list);
+    BOOST_REQUIRE_EQUAL(raw_txs.size(), tx_id_list.size());
+    BOOST_CHECK(raw_txs[0]);
+    BOOST_CHECK(raw_txs[0]->GetHash() == hashParentTx);
+    BOOST_CHECK(!raw_txs[1]);
     block_template = mining->createNewBlock(options, /*cooldown=*/false);
     BOOST_REQUIRE(block_template);
     block = block_template->getBlock();
@@ -176,7 +215,12 @@ void MinerTestingSetup::TestPackageSelection(const CScript& scriptPubKey, const
     BOOST_CHECK(block.vtx[3]->GetHash() == hashMediumFeeTx);
 
     // Test the inclusion of package feerates in the block template and ensure they are sequential.
-    const auto block_package_feerates = BlockAssembler{m_node.chainman->ActiveChainstate(), &tx_mempool, options}.CreateNewBlock()->m_package_feerates;
+    // Can't use the Mining interface because it needs access to m_package_feerates.
+    const auto block_package_feerates = BlockAssembler{
+        m_node.chainman->ActiveChainstate(),
+        &tx_mempool,
+        MergeMiningOptions(options, m_node.mining_args),
+    }.CreateNewBlock()->m_package_feerates;
     BOOST_CHECK(block_package_feerates.size() == 2);
 
     // parent_tx and high_fee_tx are added to the block as a package.
@@ -320,6 +364,8 @@ std::vector<CTransactionRef> CreateBigSigOpsCluster(const CTransactionRef& first
 
 void MinerTestingSetup::TestBasicMining(const CScript& scriptPubKey, const std::vector<CTransactionRef>& txFirst, int baseheight)
 {
+    FakeNodeClock clock{};
+
     Txid hash;
     CMutableTransaction tx;
     TestMemPoolEntryHelper entry;
@@ -334,9 +380,9 @@ void MinerTestingSetup::TestBasicMining(const CScript& scriptPubKey, const std::
     auto mining{MakeMining()};
     BOOST_REQUIRE(mining);
 
-    BlockAssembler::Options options;
-    options.coinbase_output_script = scriptPubKey;
-    options.include_dummy_extranonce = true;
+    BlockCreateOptions options{
+        .coinbase_output_script = scriptPubKey,
+    };
 
     {
         CTxMemPool& tx_mempool{MakeMempool()};
@@ -543,7 +589,7 @@ void MinerTestingSetup::TestBasicMining(const CScript& scriptPubKey, const std::
     LOCK(tx_mempool.cs);
 
     // non-final txs in mempool
-    SetMockTime(m_node.chainman->ActiveChain().Tip()->GetMedianTimePast() + 1);
+    clock.set(std::chrono::seconds{m_node.chainman->ActiveChain().Tip()->GetMedianTimePast() + 1});
     const int flags{LOCKTIME_VERIFY_SEQUENCE};
     // height map
     std::vector<int> prevheights;
@@ -648,7 +694,7 @@ void MinerTestingSetup::TestBasicMining(const CScript& scriptPubKey, const std::
         ancestor->nTime += SEQUENCE_LOCK_TIME; // Trick the MedianTimePast
     }
     m_node.chainman->ActiveChain().Tip()->nHeight++;
-    SetMockTime(m_node.chainman->ActiveChain().Tip()->GetMedianTimePast() + 1);
+    clock.set(std::chrono::seconds{m_node.chainman->ActiveChain().Tip()->GetMedianTimePast() + 1});
 
     block_template = mining->createNewBlock(options, /*cooldown=*/false);
     BOOST_REQUIRE(block_template);
@@ -661,9 +707,9 @@ void MinerTestingSetup::TestPrioritisedMining(const CScript& scriptPubKey, const
     auto mining{MakeMining()};
     BOOST_REQUIRE(mining);
 
-    BlockAssembler::Options options;
-    options.coinbase_output_script = scriptPubKey;
-    options.include_dummy_extranonce = true;
+    BlockCreateOptions options{
+        .coinbase_output_script = scriptPubKey,
+    };
 
     CTxMemPool& tx_mempool{MakeMempool()};
     LOCK(tx_mempool.cs);
@@ -751,13 +797,20 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 
     // Note that by default, these tests run with size accounting enabled.
     CScript scriptPubKey = CScript() << "04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f"_hex << OP_CHECKSIG;
-    BlockAssembler::Options options;
-    options.coinbase_output_script = scriptPubKey;
-    options.include_dummy_extranonce = true;
+    BlockCreateOptions options{
+        .coinbase_output_script = scriptPubKey,
+    };
 
     // Create and check a simple template
     std::unique_ptr<BlockTemplate> block_template = mining->createNewBlock(options, /*cooldown=*/false);
     BOOST_REQUIRE(block_template);
+
+    BlockCreateOptions invalid_options{options};
+    invalid_options.block_max_weight = DEFAULT_BLOCK_RESERVED_WEIGHT - 1;
+    BOOST_CHECK_EXCEPTION(mining->createNewBlock(invalid_options, /*cooldown=*/false),
+                          std::runtime_error,
+                          HasReason("block_reserved_weight (8000) exceeds block_max_weight (7999)"));
+
     {
         CBlock block{block_template->getBlock()};
         {
@@ -829,14 +882,29 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
             block.hashMerkleRoot = BlockMerkleRoot(block);
             block.nNonce = bi.nonce;
         }
-        std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
-        // Alternate calls between Chainman's ProcessNewBlock and submitSolution
-        // via the Mining interface. The former is used by net_processing as well
-        // as the submitblock RPC.
+        // Alternate calls between submitBlock and submitSolution via the
+        // Mining interface.
+        std::string reason{"stale reason"};
+        std::string debug{"stale debug"};
         if (current_height % 2 == 0) {
-            BOOST_REQUIRE(Assert(m_node.chainman)->ProcessNewBlock(shared_pblock, /*force_processing=*/true, /*min_pow_checked=*/true, nullptr));
+            BOOST_REQUIRE(mining->submitBlock(block, reason, debug));
+            BOOST_REQUIRE_EQUAL(reason, "");
+            BOOST_REQUIRE_EQUAL(debug, "");
+
+            reason = "stale reason";
+            debug = "stale debug";
+            BOOST_REQUIRE(!mining->submitBlock(block, reason, debug));
+            BOOST_REQUIRE_EQUAL(reason, "duplicate");
+            BOOST_REQUIRE_EQUAL(debug, "");
         } else {
-            BOOST_REQUIRE(block_template->submitSolution(block.nVersion, block.nTime, block.nNonce, MakeTransactionRef(txCoinbase)));
+            reason = "stale reason";
+            debug = "stale debug";
+            BOOST_REQUIRE(block_template->submitSolution(block.nVersion, block.nTime, block.nNonce, MakeTransactionRef(txCoinbase), reason, debug));
+            BOOST_REQUIRE_EQUAL(reason, "");
+            BOOST_REQUIRE_EQUAL(debug, "");
+            BOOST_CHECK_THROW(block_template->submitSolutionOld7(block.nVersion, block.nTime, block.nNonce,
+                                                                 MakeTransactionRef(txCoinbase)),
+                              std::runtime_error);
         }
         {
             LOCK(cs_main);
@@ -859,12 +927,10 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     TestBasicMining(scriptPubKey, txFirst, baseheight);
 
     m_node.chainman->ActiveChain().Tip()->nHeight--;
-    SetMockTime(0);
 
     TestPackageSelection(scriptPubKey, txFirst);
 
     m_node.chainman->ActiveChain().Tip()->nHeight--;
-    SetMockTime(0);
 
     TestPrioritisedMining(scriptPubKey, txFirst);
 }
diff --git a/depend/bitcoin/src/test/miniscript_tests.cpp b/depend/bitcoin/src/test/miniscript_tests.cpp
index 6dac2aa9..d593fc3b 100644
--- a/depend/bitcoin/src/test/miniscript_tests.cpp
+++ b/depend/bitcoin/src/test/miniscript_tests.cpp
@@ -636,13 +636,15 @@ BOOST_AUTO_TEST_CASE(fixed_tests)
     ms_stack_limit += "pk(" + HexStr(g_testdata->pubkeys[0]) + ")";
     ms_stack_limit.insert(ms_stack_limit.end(), count, ')');
     const auto ms_stack_ok{miniscript::FromString(ms_stack_limit, tap_converter)};
-    BOOST_CHECK(ms_stack_ok && ms_stack_ok->CheckStackSize());
+    BOOST_REQUIRE(ms_stack_ok);
+    BOOST_CHECK(ms_stack_ok->CheckStackSize());
     Test(ms_stack_limit, "?", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG | TESTMODE_P2WSH_INVALID, 4 * count + 1, 1, {}, {}, 1 + count + 1);
     // But one more element on the stack during execution will make it fail. And we'd detect that.
     count++;
     ms_stack_limit = "and_b(older(1),a:" + ms_stack_limit + ")";
     const auto ms_stack_nok{miniscript::FromString(ms_stack_limit, tap_converter)};
-    BOOST_CHECK(ms_stack_nok && !ms_stack_nok->CheckStackSize());
+    BOOST_REQUIRE(ms_stack_nok);
+    BOOST_CHECK(!ms_stack_nok->CheckStackSize());
     Test(ms_stack_limit, "?", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG | TESTMODE_P2WSH_INVALID, 4 * count + 1, 1, {}, {}, 1 + count + 1);
 
     // Misc unit tests
@@ -677,32 +679,45 @@ BOOST_AUTO_TEST_CASE(fixed_tests)
     // (for now) have 'd:' be 'u'. This tests we can't use a 'd:' wrapper for a thresh, which requires
     // its subs to all be 'u' (taken from https://github.com/rust-bitcoin/rust-miniscript/discussions/341).
     const auto ms_minimalif = miniscript::FromString("thresh(3,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),sc:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556),sc:pk_k(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798),sdv:older(32))", wsh_converter);
-    BOOST_CHECK(ms_minimalif && !ms_minimalif->IsValid());
+    BOOST_REQUIRE(ms_minimalif);
+    BOOST_CHECK(!ms_minimalif->IsValid());
     // A Miniscript with duplicate keys is not sane
     const auto ms_dup1 = miniscript::FromString("and_v(v:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65))", wsh_converter);
-    BOOST_CHECK(ms_dup1);
-    BOOST_CHECK(!ms_dup1->IsSane() && !ms_dup1->CheckDuplicateKey());
+    BOOST_REQUIRE(ms_dup1);
+    BOOST_CHECK(!ms_dup1->IsSane());
+    BOOST_CHECK(!ms_dup1->CheckDuplicateKey());
     // Same with a disjunction, and different key nodes (pk and pkh)
     const auto ms_dup2 = miniscript::FromString("or_b(c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),ac:pk_h(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65))", wsh_converter);
-    BOOST_CHECK(ms_dup2 && !ms_dup2->IsSane() && !ms_dup2->CheckDuplicateKey());
+    BOOST_REQUIRE(ms_dup2);
+    BOOST_CHECK(!ms_dup2->IsSane());
+    BOOST_CHECK(!ms_dup2->CheckDuplicateKey());
     // Same when the duplicates are leaves or a larger tree
     const auto ms_dup3 = miniscript::FromString("or_i(and_b(pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),s:pk(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556)),and_b(older(1),s:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)))", wsh_converter);
-    BOOST_CHECK(ms_dup3 && !ms_dup3->IsSane() && !ms_dup3->CheckDuplicateKey());
+    BOOST_REQUIRE(ms_dup3);
+    BOOST_CHECK(!ms_dup3->IsSane());
+    BOOST_CHECK(!ms_dup3->CheckDuplicateKey());
     // Same when the duplicates are on different levels in the tree
     const auto ms_dup4 = miniscript::FromString("thresh(2,pkh(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),s:pk(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556),a:and_b(dv:older(1),s:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)))", wsh_converter);
-    BOOST_CHECK(ms_dup4 && !ms_dup4->IsSane() && !ms_dup4->CheckDuplicateKey());
+    BOOST_REQUIRE(ms_dup4);
+    BOOST_CHECK(!ms_dup4->IsSane());
+    BOOST_CHECK(!ms_dup4->CheckDuplicateKey());
     // Sanity check the opposite is true, too. An otherwise sane Miniscript with no duplicate keys is sane.
     const auto ms_nondup = miniscript::FromString("pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)", wsh_converter);
-    BOOST_CHECK(ms_nondup && ms_nondup->CheckDuplicateKey() && ms_nondup->IsSane());
+    BOOST_REQUIRE(ms_nondup);
+    BOOST_CHECK(ms_nondup->CheckDuplicateKey());
+    BOOST_CHECK(ms_nondup->IsSane());
     // Test we find the first insane sub closer to be a leaf node. This fragment is insane for two reasons:
     // 1. It can be spent without a signature
     // 2. It contains timelock mixes
     // We'll report the timelock mix error, as it's "deeper" (closer to be a leaf node) than the "no 's' property"
     // error is.
     const auto ms_ins = miniscript::FromString("or_i(and_b(after(1),a:after(1000000000)),pk(03cdabb7f2dce7bfbd8a0b9570c6fd1e712e5d64045e9d6b517b3d5072251dc204))", wsh_converter);
-    BOOST_CHECK(ms_ins && ms_ins->IsValid() && !ms_ins->IsSane());
+    BOOST_REQUIRE(ms_ins);
+    BOOST_CHECK(ms_ins->IsValid());
+    BOOST_CHECK(!ms_ins->IsSane());
     const auto insane_sub = ms_ins->FindInsaneSub();
-    BOOST_CHECK(insane_sub && *insane_sub->ToString(wsh_converter) == "and_b(after(1),a:after(1000000000))");
+    BOOST_REQUIRE(insane_sub);
+    BOOST_CHECK(*insane_sub->ToString(wsh_converter) == "and_b(after(1),a:after(1000000000))");
 
     // Numbers can't be prefixed by a sign.
     BOOST_CHECK(!miniscript::FromString("after(-1)", wsh_converter));
diff --git a/depend/bitcoin/src/test/mock_process.cpp b/depend/bitcoin/src/test/mock_process.cpp
deleted file mode 100644
index c9100c9f..00000000
--- a/depend/bitcoin/src/test/mock_process.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2025-present The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or https://opensource.org/license/mit/.
-
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-BOOST_AUTO_TEST_SUITE(mock_process, *boost::unit_test::disabled())
-
-BOOST_AUTO_TEST_CASE(valid_json, *boost::unit_test::disabled())
-{
-    std::cout << R"({"success": true})" << std::endl;
-}
-
-BOOST_AUTO_TEST_CASE(nonzeroexit_nooutput, *boost::unit_test::disabled())
-{
-    BOOST_FAIL("Test unconditionally fails.");
-}
-
-BOOST_AUTO_TEST_CASE(nonzeroexit_stderroutput, *boost::unit_test::disabled())
-{
-    std::cerr << "err\n";
-    BOOST_FAIL("Test unconditionally fails.");
-}
-
-BOOST_AUTO_TEST_CASE(invalid_json, *boost::unit_test::disabled())
-{
-    std::cout << "{\n";
-}
-
-BOOST_AUTO_TEST_CASE(pass_stdin_to_stdout, *boost::unit_test::disabled())
-{
-    std::string s;
-    std::getline(std::cin, s);
-    std::cout << s << std::endl;
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/net_tests.cpp b/depend/bitcoin/src/test/net_tests.cpp
index 32801d97..523115ee 100644
--- a/depend/bitcoin/src/test/net_tests.cpp
+++ b/depend/bitcoin/src/test/net_tests.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <addrman.h>
+#include <bip324.h>
 #include <chainparams.h>
 #include <clientversion.h>
 #include <common/args.h>
@@ -252,8 +253,7 @@ BOOST_AUTO_TEST_CASE(cnetaddr_basic)
     BOOST_CHECK(!addr.SetSpecial("udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v\0wtf.b32.i2p"s));
 
     // I2P, valid but unsupported (56 Base32 characters)
-    // See "Encrypted LS with Base 32 Addresses" in
-    // https://geti2p.net/spec/encryptedleaseset.txt
+    // See https://i2p.net/en/docs/specs/b32encrypted
     BOOST_CHECK(
         !addr.SetSpecial("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscsad.b32.i2p"));
 
@@ -802,6 +802,41 @@ BOOST_AUTO_TEST_CASE(LocalAddress_BasicLifecycle)
     BOOST_CHECK(!IsLocal(addr));
 }
 
+BOOST_AUTO_TEST_CASE(LocalAddress_nScore_Overflow)
+{
+    g_reachable_nets.Add(NET_IPV4);
+    const CService addr{UtilBuildAddress(0x002, 0x001, 0x001, 0x001), 1000}; // 2.1.1.1:1000
+
+    const auto get_score = [](const CService& service) -> int {
+        LOCK(g_maplocalhost_mutex);
+        const auto it = mapLocalHost.find(service);
+        return it != mapLocalHost.end() ? it->second.nScore : 0;
+    };
+
+    const int initial_score = 1000;
+    BOOST_REQUIRE(AddLocal(addr, initial_score));
+    BOOST_REQUIRE(IsLocal(addr));
+    BOOST_CHECK_EQUAL(get_score(addr), initial_score);
+
+    // SeenLocal should increment nScore by 1.
+    BOOST_CHECK(SeenLocal(addr));
+    BOOST_CHECK_EQUAL(get_score(addr), initial_score + 1);
+
+    // AddLocal() saturates nScore when updating an existing entry at INT_MAX.
+    BOOST_REQUIRE(AddLocal(addr, std::numeric_limits<int>::max()));
+    BOOST_CHECK_EQUAL(get_score(addr), std::numeric_limits<int>::max());
+
+    BOOST_CHECK(AddLocal(addr, std::numeric_limits<int>::max()));
+    BOOST_CHECK_EQUAL(get_score(addr), std::numeric_limits<int>::max());
+
+    // SeenLocal() also saturates at INT_MAX.
+    BOOST_CHECK(SeenLocal(addr));
+    BOOST_CHECK_EQUAL(get_score(addr), std::numeric_limits<int>::max());
+
+    RemoveLocal(addr);
+    BOOST_CHECK(!IsLocal(addr));
+}
+
 BOOST_AUTO_TEST_CASE(initial_advertise_from_version_message)
 {
     LOCK(NetEventsInterface::g_msgproc_mutex);
@@ -1347,14 +1382,16 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
     for (int i = 0; i < 10; ++i) {
         V2TransportTester tester(m_rng, true);
         auto ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.SendKey();
         tester.SendGarbage();
         tester.ReceiveKey();
         tester.SendGarbageTerm();
         tester.SendVersion();
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.ReceiveGarbage();
         tester.ReceiveVersion();
         tester.CompareSessionIDs();
@@ -1364,10 +1401,15 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         tester.SendMessage(0, {}); // Invalidly encoded message
         tester.SendMessage("tx", msg_data_2); // 12-character encoded message type
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->size() == 3);
-        BOOST_CHECK((*ret)[0] && (*ret)[0]->m_type == "cmpctblock" && std::ranges::equal((*ret)[0]->m_recv, MakeByteSpan(msg_data_1)));
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->size() == 3);
+        BOOST_REQUIRE((*ret)[0]);
+        BOOST_CHECK((*ret)[0]->m_type == "cmpctblock");
+        BOOST_CHECK(std::ranges::equal((*ret)[0]->m_recv, MakeByteSpan(msg_data_1)));
         BOOST_CHECK(!(*ret)[1]);
-        BOOST_CHECK((*ret)[2] && (*ret)[2]->m_type == "tx" && std::ranges::equal((*ret)[2]->m_recv, MakeByteSpan(msg_data_2)));
+        BOOST_REQUIRE((*ret)[2]);
+        BOOST_CHECK((*ret)[2]->m_type == "tx");
+        BOOST_CHECK(std::ranges::equal((*ret)[2]->m_recv, MakeByteSpan(msg_data_2)));
 
         // Then send a message with a bit error, expecting failure. It's possible this failure does
         // not occur immediately (when the length descriptor was modified), but it should come
@@ -1390,12 +1432,14 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         tester.SendKey();
         tester.SendGarbage();
         auto ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.ReceiveKey();
         tester.SendGarbageTerm();
         tester.SendVersion();
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.ReceiveGarbage();
         tester.ReceiveVersion();
         tester.CompareSessionIDs();
@@ -1404,9 +1448,14 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         tester.SendMessage(uint8_t(14), msg_data_1); // inv short id
         tester.SendMessage(uint8_t(19), msg_data_2); // pong short id
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->size() == 2);
-        BOOST_CHECK((*ret)[0] && (*ret)[0]->m_type == "inv" && std::ranges::equal((*ret)[0]->m_recv, MakeByteSpan(msg_data_1)));
-        BOOST_CHECK((*ret)[1] && (*ret)[1]->m_type == "pong" && std::ranges::equal((*ret)[1]->m_recv, MakeByteSpan(msg_data_2)));
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->size() == 2);
+        BOOST_REQUIRE((*ret)[0]);
+        BOOST_CHECK((*ret)[0]->m_type == "inv");
+        BOOST_CHECK(std::ranges::equal((*ret)[0]->m_recv, MakeByteSpan(msg_data_1)));
+        BOOST_REQUIRE((*ret)[1]);
+        BOOST_CHECK((*ret)[1]->m_type == "pong");
+        BOOST_CHECK(std::ranges::equal((*ret)[1]->m_recv, MakeByteSpan(msg_data_2)));
 
         // Then send a too-large message.
         auto msg_data_3 = m_rng.randbytes<uint8_t>(4005000);
@@ -1435,7 +1484,8 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
             tester.SendGarbage(garb_len);
         }
         auto ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         if (!send_immediately) {
             tester.SendKey();
             tester.SendGarbage(garb_len);
@@ -1449,7 +1499,8 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         }
         tester.SendVersion(ver_data, false);
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.ReceiveGarbage();
         tester.ReceiveVersion();
         tester.CompareSessionIDs();
@@ -1470,11 +1521,18 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         tester.SendMessage("foobar", {}); // test receiving unknown message type
         tester.AddMessage("barfoo", {}); // test sending unknown message type
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->size() == 4);
-        BOOST_CHECK((*ret)[0] && (*ret)[0]->m_type == "addrv2" && std::ranges::equal((*ret)[0]->m_recv, MakeByteSpan(msg_data_1)));
-        BOOST_CHECK((*ret)[1] && (*ret)[1]->m_type == "headers" && std::ranges::equal((*ret)[1]->m_recv, MakeByteSpan(msg_data_2)));
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->size() == 4);
+        BOOST_REQUIRE((*ret)[0]);
+        BOOST_CHECK((*ret)[0]->m_type == "addrv2");
+        BOOST_CHECK(std::ranges::equal((*ret)[0]->m_recv, MakeByteSpan(msg_data_1)));
+        BOOST_REQUIRE((*ret)[1]);
+        BOOST_CHECK((*ret)[1]->m_type == "headers");
+        BOOST_CHECK(std::ranges::equal((*ret)[1]->m_recv, MakeByteSpan(msg_data_2)));
         BOOST_CHECK(!(*ret)[2]);
-        BOOST_CHECK((*ret)[3] && (*ret)[3]->m_type == "foobar" && (*ret)[3]->m_recv.empty());
+        BOOST_REQUIRE((*ret)[3]);
+        BOOST_CHECK((*ret)[3]->m_type == "foobar");
+        BOOST_CHECK((*ret)[3]->m_recv.empty());
         tester.ReceiveMessage("barfoo", {});
     }
 
@@ -1482,7 +1540,8 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
     {
         V2TransportTester tester(m_rng, true);
         auto ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.SendKey();
         tester.SendGarbage(V2Transport::MAX_GARBAGE_LEN + 1);
         tester.ReceiveKey();
@@ -1497,7 +1556,8 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         tester.SendKey();
         tester.SendGarbage(V2Transport::MAX_GARBAGE_LEN + 1);
         auto ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.ReceiveKey();
         tester.SendGarbageTerm();
         ret = tester.Interact();
@@ -1508,7 +1568,8 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
     {
         V2TransportTester tester(m_rng, true);
         auto ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.SendKey();
         tester.ReceiveKey();
         /** The number of random garbage bytes before the included first 15 bytes of terminator. */
@@ -1527,19 +1588,23 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
         tester.SendGarbageTerm();
         tester.SendVersion();
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->empty());
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->empty());
         tester.ReceiveGarbage();
         tester.ReceiveVersion();
         tester.CompareSessionIDs();
         auto msg_data_1 = m_rng.randbytes<uint8_t>(4000000); // test that receiving 4M payload works
         auto msg_data_2 = m_rng.randbytes<uint8_t>(4000000); // test that sending 4M payload works
-        tester.SendMessage(uint8_t(m_rng.randrange(223) + 33), {}); // unknown short id
+        tester.SendMessage(uint8_t(m_rng.randrange(256 - BIP324_SHORTIDS_IMPLEMENTED) + BIP324_SHORTIDS_IMPLEMENTED), {}); // unknown short id
         tester.SendMessage(uint8_t(2), msg_data_1); // "block" short id
         tester.AddMessage("blocktxn", msg_data_2); // schedule blocktxn to be sent to us
         ret = tester.Interact();
-        BOOST_REQUIRE(ret && ret->size() == 2);
+        BOOST_REQUIRE(ret);
+        BOOST_REQUIRE(ret->size() == 2);
         BOOST_CHECK(!(*ret)[0]);
-        BOOST_CHECK((*ret)[1] && (*ret)[1]->m_type == "block" && std::ranges::equal((*ret)[1]->m_recv, MakeByteSpan(msg_data_1)));
+        BOOST_REQUIRE((*ret)[1]);
+        BOOST_CHECK((*ret)[1]->m_type == "block");
+        BOOST_CHECK(std::ranges::equal((*ret)[1]->m_recv, MakeByteSpan(msg_data_1)));
         tester.ReceiveMessage(uint8_t(3), msg_data_2); // "blocktxn" short id
     }
 
@@ -1590,4 +1655,47 @@ BOOST_AUTO_TEST_CASE(private_broadcast_version_does_not_update_addrman_services)
     m_node.peerman->FinalizeNode(node);
 }
 
+BOOST_AUTO_TEST_CASE(addlocal_onlynet_externalip)
+{
+    // Test that `-externalip` addresses bypass `-onlynet`, but score alone does
+    // not.
+
+    CAddress addr_onion;
+    BOOST_REQUIRE(addr_onion.SetSpecial("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion"));
+    BOOST_REQUIRE(addr_onion.IsValid());
+    BOOST_REQUIRE(addr_onion.IsTor());
+
+    const auto reachable_nets_at_start{g_reachable_nets.All()};
+    const bool discover_orig{fDiscover};
+
+    // Simulate using -onlynet=ipv4 -externalip=<onion>
+    g_reachable_nets.RemoveAll();
+    g_reachable_nets.Add(NET_IPV4);
+    fDiscover = false;
+
+    // Now AddLocal with a non-manual score should fail for an unreachable network.
+    BOOST_CHECK(!AddLocal(addr_onion, LOCAL_BIND));
+    BOOST_CHECK(!IsLocal(addr_onion));
+
+    BOOST_CHECK(!AddLocal(addr_onion, LOCAL_MANUAL));
+    BOOST_CHECK(!IsLocal(addr_onion));
+
+    // Whereas AddLocal for -externalip should succeed.
+    BOOST_CHECK(AddLocal(addr_onion, LOCAL_MANUAL, /*add_even_if_unreachable=*/true));
+    BOOST_CHECK(IsLocal(addr_onion));
+
+    // Normal AddLocal on a reachable network still works.
+    const CNetAddr addr_ipv4{LookupHost("1.2.3.4", false).value()};
+    BOOST_CHECK(AddLocal(addr_ipv4, LOCAL_MANUAL));
+    BOOST_CHECK(IsLocal(CService{addr_ipv4, GetListenPort()}));
+
+    RemoveLocal(CService{addr_ipv4, GetListenPort()});
+    RemoveLocal(addr_onion);
+    g_reachable_nets.RemoveAll();
+    for (const auto& net : reachable_nets_at_start) {
+        g_reachable_nets.Add(net);
+    }
+    fDiscover = discover_orig;
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/node_init_tests.cpp b/depend/bitcoin/src/test/node_init_tests.cpp
index 44635dd4..fb9bce6c 100644
--- a/depend/bitcoin/src/test/node_init_tests.cpp
+++ b/depend/bitcoin/src/test/node_init_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <init.h>
 #include <interfaces/init.h>
+#include <logging.h>
 #include <rpc/server.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/depend/bitcoin/src/test/orphanage_tests.cpp b/depend/bitcoin/src/test/orphanage_tests.cpp
index f001360a..c09f987a 100644
--- a/depend/bitcoin/src/test/orphanage_tests.cpp
+++ b/depend/bitcoin/src/test/orphanage_tests.cpp
@@ -432,7 +432,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
     FillableSigningProvider keystore;
     BOOST_CHECK(keystore.AddKey(key));
 
-    NodeClockContext clock_ctx{};
+    FakeNodeClock clock{};
 
     std::vector<CTransactionRef> orphans_added;
 
diff --git a/depend/bitcoin/src/test/pcp_tests.cpp b/depend/bitcoin/src/test/pcp_tests.cpp
index 51b004a5..e70b4b14 100644
--- a/depend/bitcoin/src/test/pcp_tests.cpp
+++ b/depend/bitcoin/src/test/pcp_tests.cpp
@@ -49,7 +49,10 @@ class PCPTestingSetup : public BasicTestingSetup
         const std::optional<CService> local_ipv6{Lookup("2a10:1234:5678:9abc:def0:1234:5678:9abc", 1, false)};
         const std::optional<CService> gateway_ipv4{Lookup("192.168.0.1", 1, false)};
         const std::optional<CService> gateway_ipv6{Lookup("2a10:1234:5678:9abc:def0:0000:0000:0000", 1, false)};
-        BOOST_REQUIRE(local_ipv4 && local_ipv6 && gateway_ipv4 && gateway_ipv6);
+        BOOST_REQUIRE(local_ipv4);
+        BOOST_REQUIRE(local_ipv6);
+        BOOST_REQUIRE(gateway_ipv4);
+        BOOST_REQUIRE(gateway_ipv6);
         default_local_ipv4 = *local_ipv4;
         default_local_ipv6 = *local_ipv6;
         default_gateway_ipv4 = *gateway_ipv4;
@@ -92,7 +95,6 @@ class PCPTestSock final : public Sock
           m_local_ip(local_ip),
           m_gateway_ip(gateway_ip)
     {
-        ElapseTime(std::chrono::seconds(0)); // start mocking steady time
         PrepareOp();
     }
 
@@ -192,14 +194,14 @@ class PCPTestSock final : public Sock
               Event* occurred = nullptr) const override
     {
         // Only handles receive events.
-        if (AtEndOfScript() || requested != Sock::RECV) {
-            ElapseTime(timeout);
+        if (AtEndOfScript() || requested != Sock::RecvEvent) {
+            m_clock += timeout;
         } else {
             std::chrono::milliseconds delay = std::min(m_time_left, timeout);
-            ElapseTime(delay);
+            m_clock += delay;
             m_time_left -= delay;
             if (CurOp().op == TestOp::RECV && m_time_left == 0s && occurred != nullptr) {
-                *occurred = Sock::RECV;
+                *occurred = Sock::RecvEvent;
             }
             if (CurOp().op == TestOp::NOP) {
                 // This was a pure delay operation, move to the next op.
@@ -223,18 +225,12 @@ class PCPTestSock final : public Sock
     const std::vector<TestOp> m_script;
     mutable size_t m_script_ptr = 0;
     mutable std::chrono::milliseconds m_time_left;
-    mutable std::chrono::milliseconds m_time{MockableSteadyClock::INITIAL_MOCK_TIME};
+    mutable FakeSteadyClock m_clock{};
     mutable bool m_connected{false};
     mutable CService m_bound;
     mutable CNetAddr m_local_ip;
     mutable CNetAddr m_gateway_ip;
 
-    void ElapseTime(std::chrono::milliseconds duration) const
-    {
-        m_time += duration;
-        MockableSteadyClock::SetMockTime(m_time);
-    }
-
     bool AtEndOfScript() const { return m_script_ptr == m_script.size(); }
     const TestOp &CurOp() const {
         BOOST_REQUIRE(m_script_ptr < m_script.size());
diff --git a/depend/bitcoin/src/test/peerman_tests.cpp b/depend/bitcoin/src/test/peerman_tests.cpp
index e391e8b9..a2d88ea5 100644
--- a/depend/bitcoin/src/test/peerman_tests.cpp
+++ b/depend/bitcoin/src/test/peerman_tests.cpp
@@ -2,30 +2,42 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
+#include <chain.h>
 #include <chainparams.h>
-#include <node/miner.h>
+#include <consensus/params.h>
+#include <interfaces/mining.h>
 #include <net_processing.h>
 #include <pow.h>
+#include <primitives/block.h>
+#include <protocol.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
+#include <util/check.h>
 #include <validation.h>
+#include <validationinterface.h>
 
 #include <boost/test/unit_test.hpp>
 
+#include <cstdint>
+#include <memory>
+
 BOOST_FIXTURE_TEST_SUITE(peerman_tests, RegTestingSetup)
 
 /** Window, in blocks, for connecting to NODE_NETWORK_LIMITED peers */
 static constexpr int64_t NODE_NETWORK_LIMITED_ALLOW_CONN_BLOCKS = 144;
 
-static void mineBlock(const node::NodeContext& node, std::chrono::seconds block_time)
+static void mineBlock(node::NodeContext& node, FakeNodeClock& clock, std::chrono::seconds block_time)
 {
     auto curr_time = GetTime<std::chrono::seconds>();
-    node::BlockAssembler::Options options;
-    options.include_dummy_extranonce = true;
-    SetMockTime(block_time); // update time so the block is created with it
-    CBlock block = node::BlockAssembler{node.chainman->ActiveChainstate(), nullptr, options}.CreateNewBlock()->block;
+    clock.set(block_time); // update time so the block is created with it
+    auto mining{interfaces::MakeMining(node)};
+    auto block_template{mining->createNewBlock({}, /*cooldown=*/false)};
+    BOOST_REQUIRE(block_template);
+    CBlock block{block_template->getBlock()};
     while (!CheckProofOfWork(block.GetHash(), block.nBits, node.chainman->GetConsensus())) ++block.nNonce;
     block.fChecked = true; // little speedup
-    SetMockTime(curr_time); // process block at current time
+    clock.set(curr_time); // process block at current time
     Assert(node.chainman->ProcessNewBlock(std::make_shared<const CBlock>(block), /*force_processing=*/true, /*min_pow_checked=*/true, nullptr));
     node.validation_signals->SyncWithValidationInterfaceQueue(); // drain events queue
 }
@@ -33,6 +45,7 @@ static void mineBlock(const node::NodeContext& node, std::chrono::seconds block_
 // Verifying when network-limited peer connections are desirable based on the node's proximity to the tip
 BOOST_AUTO_TEST_CASE(connections_desirable_service_flags)
 {
+    FakeNodeClock clock{};
     std::unique_ptr<PeerManager> peerman = PeerManager::make(*m_node.connman, *m_node.addrman, nullptr, *m_node.chainman, *m_node.mempool, *m_node.warnings, {});
     auto consensus = m_node.chainman->GetParams().GetConsensus();
 
@@ -46,15 +59,15 @@ BOOST_AUTO_TEST_CASE(connections_desirable_service_flags)
     int tip_block_height = tip->nHeight;
     peerman->SetBestBlock(tip_block_height, std::chrono::seconds{tip_block_time});
 
-    SetMockTime(tip_block_time + 1); // Set node time to tip time
+    clock.set(std::chrono::seconds{tip_block_time + 1}); // Set node time to tip time
     BOOST_CHECK(peerman->GetDesirableServiceFlags(peer_flags) == ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS));
 
     // Check we don't disallow limited peers connections when we are behind but still recoverable (below the connection safety window)
-    SetMockTime(GetTime<std::chrono::seconds>() + std::chrono::seconds{consensus.nPowTargetSpacing * (NODE_NETWORK_LIMITED_ALLOW_CONN_BLOCKS - 1)});
+    clock += std::chrono::seconds{consensus.nPowTargetSpacing * (NODE_NETWORK_LIMITED_ALLOW_CONN_BLOCKS - 1)};
     BOOST_CHECK(peerman->GetDesirableServiceFlags(peer_flags) == ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS));
 
     // Check we disallow limited peers connections when we are further than the limited peers safety window
-    SetMockTime(GetTime<std::chrono::seconds>() + std::chrono::seconds{consensus.nPowTargetSpacing * 2});
+    clock += std::chrono::seconds{consensus.nPowTargetSpacing * 2};
     BOOST_CHECK(peerman->GetDesirableServiceFlags(peer_flags) == ServiceFlags(NODE_NETWORK | NODE_WITNESS));
 
     // By now, we tested that the connections desirable services flags change based on the node's time proximity to the tip.
@@ -63,15 +76,15 @@ BOOST_AUTO_TEST_CASE(connections_desirable_service_flags)
 
     // First, verify a block in the past doesn't enable limited peers connections
     // At this point, our time is (NODE_NETWORK_LIMITED_ALLOW_CONN_BLOCKS + 1) * 10 minutes ahead the tip's time.
-    mineBlock(m_node, /*block_time=*/std::chrono::seconds{tip_block_time + 1});
+    mineBlock(m_node, clock, /*block_time=*/std::chrono::seconds{tip_block_time + 1});
     BOOST_CHECK(peerman->GetDesirableServiceFlags(peer_flags) == ServiceFlags(NODE_NETWORK | NODE_WITNESS));
 
     // Verify a block close to the tip enables limited peers connections
-    mineBlock(m_node, /*block_time=*/GetTime<std::chrono::seconds>());
+    mineBlock(m_node, clock, /*block_time=*/GetTime<std::chrono::seconds>());
     BOOST_CHECK(peerman->GetDesirableServiceFlags(peer_flags) == ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS));
 
     // Lastly, verify the stale tip checks can disallow limited peers connections after not receiving blocks for a prolonged period.
-    SetMockTime(GetTime<std::chrono::seconds>() + std::chrono::seconds{consensus.nPowTargetSpacing * NODE_NETWORK_LIMITED_ALLOW_CONN_BLOCKS + 1});
+    clock += std::chrono::seconds{consensus.nPowTargetSpacing * NODE_NETWORK_LIMITED_ALLOW_CONN_BLOCKS + 1};
     BOOST_CHECK(peerman->GetDesirableServiceFlags(peer_flags) == ServiceFlags(NODE_NETWORK | NODE_WITNESS));
 }
 
diff --git a/depend/bitcoin/src/test/pow_tests.cpp b/depend/bitcoin/src/test/pow_tests.cpp
index f6123401..e75d1e34 100644
--- a/depend/bitcoin/src/test/pow_tests.cpp
+++ b/depend/bitcoin/src/test/pow_tests.cpp
@@ -172,7 +172,8 @@ void sanity_check_chainparams(const ArgsManager& args, ChainType chain_type)
     arith_uint256 pow_compact;
     bool neg, over;
     pow_compact.SetCompact(chainParams->GenesisBlock().nBits, &neg, &over);
-    BOOST_CHECK(!neg && pow_compact != 0);
+    BOOST_CHECK(!neg);
+    BOOST_CHECK(pow_compact != 0);
     BOOST_CHECK(!over);
     BOOST_CHECK(UintToArith256(consensus.powLimit) >= pow_compact);
 
diff --git a/depend/bitcoin/src/test/private_broadcast_tests.cpp b/depend/bitcoin/src/test/private_broadcast_tests.cpp
index 048284b2..94e68d74 100644
--- a/depend/bitcoin/src/test/private_broadcast_tests.cpp
+++ b/depend/bitcoin/src/test/private_broadcast_tests.cpp
@@ -5,11 +5,23 @@
 #include <primitives/transaction.h>
 #include <private_broadcast.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/time.h>
 
 #include <algorithm>
+#include <ostream>
 #include <boost/test/unit_test.hpp>
 
+std::ostream& operator<<(std::ostream& os, PrivateBroadcast::AddResult r)
+{
+    switch (r) {
+    case PrivateBroadcast::AddResult::Added: return os << "Added";
+    case PrivateBroadcast::AddResult::AlreadyPresent: return os << "AlreadyPresent";
+    case PrivateBroadcast::AddResult::QueueFull: return os << "QueueFull";
+    } // no default case, so the compiler can warn about missing cases
+    assert(false);
+}
+
 BOOST_FIXTURE_TEST_SUITE(private_broadcast_tests, BasicTestingSetup)
 
 static CTransactionRef MakeDummyTx(uint32_t id, size_t num_witness)
@@ -26,7 +38,7 @@ static CTransactionRef MakeDummyTx(uint32_t id, size_t num_witness)
 
 BOOST_AUTO_TEST_CASE(basic)
 {
-    SetMockTime(Now<NodeSeconds>());
+    FakeNodeClock clock{};
 
     PrivateBroadcast pb;
     const NodeId recipient1{1};
@@ -43,15 +55,15 @@ BOOST_AUTO_TEST_CASE(basic)
     // Make a transaction and add it.
     const auto tx1{MakeDummyTx(/*id=*/1, /*num_witness=*/0)};
 
-    BOOST_CHECK(pb.Add(tx1));
-    BOOST_CHECK(!pb.Add(tx1));
+    BOOST_CHECK_EQUAL(pb.Add(tx1), PrivateBroadcast::AddResult::Added);
+    BOOST_CHECK_EQUAL(pb.Add(tx1), PrivateBroadcast::AddResult::AlreadyPresent);
 
     // Make another transaction with same txid, different wtxid and add it.
     const auto tx2{MakeDummyTx(/*id=*/1, /*num_witness=*/1)};
     BOOST_REQUIRE(tx1->GetHash() == tx2->GetHash());
     BOOST_REQUIRE(tx1->GetWitnessHash() != tx2->GetWitnessHash());
 
-    BOOST_CHECK(pb.Add(tx2));
+    BOOST_CHECK_EQUAL(pb.Add(tx2), PrivateBroadcast::AddResult::Added);
     const auto find_tx_info{[](auto& infos, const CTransactionRef& tx) -> const PrivateBroadcast::TxBroadcastInfo& {
         const auto it{std::ranges::find(infos, tx->GetWitnessHash(), [](const auto& info) { return info.tx->GetWitnessHash(); })};
         BOOST_REQUIRE(it != infos.end());
@@ -94,7 +106,7 @@ BOOST_AUTO_TEST_CASE(basic)
     BOOST_CHECK_EQUAL(pb.GetStale().size(), 0);
 
     // 2. Fast-forward the mock clock past the INITIAL_STALE_DURATION.
-    SetMockTime(Now<NodeSeconds>() + PrivateBroadcast::INITIAL_STALE_DURATION + 1min);
+    clock += PrivateBroadcast::INITIAL_STALE_DURATION + 1min;
 
     // 3. Now that the initial duration has passed, both unconfirmed transactions should be stale.
     BOOST_CHECK_EQUAL(pb.GetStale().size(), 2);
@@ -125,7 +137,7 @@ BOOST_AUTO_TEST_CASE(basic)
     BOOST_CHECK_EQUAL(stale_state.size(), 1);
     BOOST_CHECK_EQUAL(stale_state[0], tx_for_recipient2);
 
-    SetMockTime(Now<NodeSeconds>() + 10h);
+    clock += 10h;
 
     BOOST_CHECK_EQUAL(pb.GetStale().size(), 2);
 
@@ -141,20 +153,152 @@ BOOST_AUTO_TEST_CASE(basic)
 
 BOOST_AUTO_TEST_CASE(stale_unpicked_tx)
 {
-    SetMockTime(Now<NodeSeconds>());
+    FakeNodeClock clock{};
 
     PrivateBroadcast pb;
     const auto tx{MakeDummyTx(/*id=*/42, /*num_witness=*/0)};
-    BOOST_REQUIRE(pb.Add(tx));
+    BOOST_REQUIRE_EQUAL(pb.Add(tx), PrivateBroadcast::AddResult::Added);
 
     // Unpicked transactions use the longer INITIAL_STALE_DURATION.
     BOOST_CHECK_EQUAL(pb.GetStale().size(), 0);
-    SetMockTime(Now<NodeSeconds>() + PrivateBroadcast::INITIAL_STALE_DURATION - 1min);
+    clock += PrivateBroadcast::INITIAL_STALE_DURATION - 1min;
     BOOST_CHECK_EQUAL(pb.GetStale().size(), 0);
-    SetMockTime(Now<NodeSeconds>() + 2min);
+    clock += 2min;
     const auto stale_state{pb.GetStale()};
     BOOST_REQUIRE_EQUAL(stale_state.size(), 1);
     BOOST_CHECK_EQUAL(stale_state[0], tx);
 }
 
+BOOST_AUTO_TEST_CASE(send_attempt_limit)
+{
+    FakeNodeClock clock{};
+
+    constexpr size_t max_attempts{5};
+    PrivateBroadcast pb{PrivateBroadcast::MAX_TRANSACTIONS, max_attempts};
+    const auto tx{MakeDummyTx(/*id=*/1, /*num_witness=*/0)};
+    BOOST_REQUIRE_EQUAL(pb.Add(tx), PrivateBroadcast::AddResult::Added);
+
+    in_addr ipv4_addr;
+    ipv4_addr.s_addr = 0xa0b0c001;
+    const CService address{ipv4_addr, 1111};
+
+    NodeId node_id{0};
+    for (size_t attempt{0}; attempt < max_attempts; ++attempt) {
+        BOOST_CHECK(pb.HavePendingTransactions());
+        BOOST_REQUIRE_EQUAL(pb.PickTxForSend(/*will_send_to_nodeid=*/node_id++, address).value(), tx);
+    }
+
+    // The transaction and its complete send history remain available, but no
+    // further connections should be opened for it.
+    BOOST_CHECK(!pb.HavePendingTransactions());
+    BOOST_CHECK(!pb.PickTxForSend(/*will_send_to_nodeid=*/node_id++, address).has_value());
+    const auto info{pb.GetBroadcastInfo()};
+    BOOST_REQUIRE_EQUAL(info.size(), 1);
+    BOOST_CHECK_EQUAL(info[0].peers.size(), max_attempts);
+    BOOST_CHECK_EQUAL(info[0].attempts_remaining, 0);
+
+    clock += PrivateBroadcast::INITIAL_STALE_DURATION + 1min;
+    BOOST_CHECK(pb.GetStale().empty());
+
+    // An exhausted transaction does not prevent another transaction from being sent.
+    const auto next_tx{MakeDummyTx(/*id=*/2, /*num_witness=*/0)};
+    BOOST_REQUIRE_EQUAL(pb.Add(next_tx), PrivateBroadcast::AddResult::Added);
+    BOOST_CHECK(pb.HavePendingTransactions());
+    BOOST_REQUIRE_EQUAL(pb.PickTxForSend(/*will_send_to_nodeid=*/node_id++, address).value(), next_tx);
+
+    // Re-adding an exhausted transaction resets its state and starts a fresh
+    // initial stale period.
+    BOOST_REQUIRE_EQUAL(pb.Add(tx), PrivateBroadcast::AddResult::Added);
+    BOOST_CHECK(pb.HavePendingTransactions());
+    BOOST_CHECK(pb.GetStale().empty());
+    const auto reset_info{pb.GetBroadcastInfo()};
+    const auto reset_tx_info{std::ranges::find(reset_info, tx->GetWitnessHash(), [](const auto& entry) { return entry.tx->GetWitnessHash(); })};
+    BOOST_REQUIRE(reset_tx_info != reset_info.end());
+    BOOST_CHECK(reset_tx_info->peers.empty());
+    BOOST_CHECK_EQUAL(reset_tx_info->attempts_remaining, max_attempts);
+    BOOST_REQUIRE_EQUAL(pb.PickTxForSend(/*will_send_to_nodeid=*/node_id++, address).value(), tx);
+}
+
+BOOST_AUTO_TEST_CASE(reset_with_equivalent_transaction_reference)
+{
+    PrivateBroadcast pb{PrivateBroadcast::MAX_TRANSACTIONS, /*max_send_attempts=*/1};
+    const auto tx{MakeDummyTx(/*id=*/1, /*num_witness=*/0)};
+    const auto equivalent_tx{MakeDummyTx(/*id=*/1, /*num_witness=*/0)};
+    BOOST_REQUIRE(tx != equivalent_tx);
+    BOOST_REQUIRE(tx->GetWitnessHash() == equivalent_tx->GetWitnessHash());
+
+    in_addr ipv4_addr;
+    ipv4_addr.s_addr = 0xa0b0c001;
+    const CService address{ipv4_addr, 1111};
+    BOOST_REQUIRE_EQUAL(pb.Add(tx), PrivateBroadcast::AddResult::Added);
+    BOOST_REQUIRE_EQUAL(pb.PickTxForSend(/*will_send_to_nodeid=*/0, address).value(), tx);
+    pb.NodeConfirmedReception(/*nodeid=*/0);
+    BOOST_CHECK(pb.DidNodeConfirmReception(/*nodeid=*/0));
+    BOOST_CHECK(!pb.HavePendingTransactions());
+
+    // A distinct CTransactionRef with the same WTXID must reset the exhausted
+    // transaction, including its send and confirmation history.
+    BOOST_REQUIRE_EQUAL(pb.Add(equivalent_tx), PrivateBroadcast::AddResult::Added);
+    BOOST_CHECK(pb.HavePendingTransactions());
+    BOOST_CHECK(!pb.GetTxForNode(/*nodeid=*/0).has_value());
+    BOOST_CHECK(!pb.DidNodeConfirmReception(/*nodeid=*/0));
+    const auto info{pb.GetBroadcastInfo()};
+    BOOST_REQUIRE_EQUAL(info.size(), 1);
+    BOOST_CHECK(info[0].tx->GetWitnessHash() == tx->GetWitnessHash());
+    BOOST_CHECK(info[0].peers.empty());
+    BOOST_CHECK_EQUAL(pb.Remove(equivalent_tx).value(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(rejection_at_cap)
+{
+    PrivateBroadcast pb;
+    constexpr size_t num_cap{PrivateBroadcast::MAX_TRANSACTIONS};
+    constexpr size_t num_over{5};
+
+    // Fill the queue exactly to the cap; every distinct Add() succeeds.
+    std::vector<CTransactionRef> txs;
+    txs.reserve(num_cap);
+    for (size_t i{0}; i < num_cap; ++i) {
+        auto tx{MakeDummyTx(/*id=*/static_cast<uint32_t>(i), /*num_witness=*/0)};
+        BOOST_REQUIRE_EQUAL(pb.Add(tx), PrivateBroadcast::AddResult::Added);
+        txs.push_back(std::move(tx));
+    }
+    BOOST_CHECK_EQUAL(pb.GetBroadcastInfo().size(), num_cap);
+
+    // Further distinct transactions are rejected, and the queue is unchanged.
+    for (size_t i{0}; i < num_over; ++i) {
+        const auto tx{MakeDummyTx(/*id=*/static_cast<uint32_t>(num_cap + i), /*num_witness=*/0)};
+        BOOST_CHECK_EQUAL(pb.Add(tx), PrivateBroadcast::AddResult::QueueFull);
+    }
+    BOOST_CHECK_EQUAL(pb.GetBroadcastInfo().size(), num_cap);
+
+    // Nothing was evicted: all originally-added transactions are still present.
+    const auto infos{pb.GetBroadcastInfo()};
+    std::set<uint256> present_wtxids;
+    for (const auto& info : infos) {
+        present_wtxids.insert(info.tx->GetWitnessHash().ToUint256());
+    }
+    BOOST_CHECK_EQUAL(present_wtxids.size(), infos.size());
+    for (size_t i{0}; i < num_cap; ++i) {
+        BOOST_CHECK_MESSAGE(present_wtxids.contains(txs[i]->GetWitnessHash().ToUint256()),
+                            "tx index " << i << " should still be present");
+    }
+
+    // Re-adding an already-present tx is AlreadyPresent even at the cap (not QueueFull).
+    BOOST_CHECK_EQUAL(pb.Add(txs[0]), PrivateBroadcast::AddResult::AlreadyPresent);
+    BOOST_CHECK_EQUAL(pb.GetBroadcastInfo().size(), num_cap);
+
+    // Removing one frees exactly one slot for a new transaction.
+    BOOST_REQUIRE(pb.Remove(txs[0]).has_value());
+    BOOST_CHECK_EQUAL(pb.GetBroadcastInfo().size(), num_cap - 1);
+    const auto fresh{MakeDummyTx(/*id=*/0xffffffff, /*num_witness=*/0)};
+    BOOST_CHECK_EQUAL(pb.Add(fresh), PrivateBroadcast::AddResult::Added);
+    BOOST_CHECK_EQUAL(pb.GetBroadcastInfo().size(), num_cap);
+
+    // A previously-removed tx can be added again as a brand-new entry.
+    BOOST_REQUIRE(pb.Remove(fresh).has_value());
+    BOOST_CHECK_EQUAL(pb.Add(fresh), PrivateBroadcast::AddResult::Added);
+    BOOST_CHECK_EQUAL(pb.GetBroadcastInfo().size(), num_cap);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/psbt_tests.cpp b/depend/bitcoin/src/test/psbt_tests.cpp
new file mode 100644
index 00000000..86f4a120
--- /dev/null
+++ b/depend/bitcoin/src/test/psbt_tests.cpp
@@ -0,0 +1,315 @@
+// Copyright (c) 2022 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+#include <addresstype.h>
+#include <key.h>
+#include <psbt.h>
+#include <script/descriptor.h>
+#include <script/script.h>
+#include <script/signingprovider.h>
+#include <script/solver.h>
+#include <test/util/setup_common.h>
+#include <util/strencodings.h>
+#include <util/string.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+#include <vector>
+
+BOOST_FIXTURE_TEST_SUITE(psbt_tests, BasicTestingSetup)
+
+static PSBTProprietary MakeProprietary(uint64_t subtype, uint8_t key_data, uint8_t value)
+{
+    return PSBTProprietary{
+        .subtype = subtype,
+        .identifier = {'p', 's', 'b', 't'},
+        .key = {key_data},
+        .value = {value},
+    };
+}
+
+void CheckTimeLock(const std::string& base64_psbt, std::optional<uint32_t> timelock)
+{
+    util::Result<PartiallySignedTransaction> psbt = DecodeBase64PSBT(base64_psbt);
+    BOOST_CHECK(psbt);
+
+    std::optional<uint32_t> computed_timelock = psbt->ComputeTimeLock();
+    std::optional<CMutableTransaction> tx = psbt->GetUnsignedTx();
+    if (timelock) {
+        BOOST_CHECK(computed_timelock);
+        BOOST_CHECK_EQUAL(*computed_timelock, *timelock);
+        BOOST_CHECK(tx);
+        BOOST_CHECK_EQUAL(tx->nLockTime, *timelock);
+    } else {
+        BOOST_CHECK(!computed_timelock);
+        BOOST_CHECK(!tx);
+    }
+}
+
+BOOST_AUTO_TEST_CASE(psbt2_timelock_test)
+{
+    CheckTimeLock("cHNidP8BAgQCAAAAAQQBAQEFAQIB+wQCAAAAAAEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==", 0);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAAAAQ4gOhs7PIN9ZInqejHY5sfdUDwAG+8+BpWOdXSAjWjKeKUBDwQAAAAAAAEDCE+TNXcAAAAAAQQWABQLE1LKzQPPaqG388jWOIZxs0peEQA=", 0);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEgQQJwAAAAEOIDobOzyDfWSJ6nox2ObH3VA8ABvvPgaVjnV0gI1oynilAQ8EAAAAAAABAwhPkzV3AAAAAAEEFgAUCxNSys0Dz2qht/PI1jiGcbNKXhEA", 10000);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEgQQJwAAAAEOIDobOzyDfWSJ6nox2ObH3VA8ABvvPgaVjnV0gI1oynilAQ8EAAAAAAESBCgjAAAAAQMIT5M1dwAAAAABBBYAFAsTUsrNA89qobfzyNY4hnGzSl4RAA==", 10000);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEgQQJwAAAAEOIDobOzyDfWSJ6nox2ObH3VA8ABvvPgaVjnV0gI1oynilAQ8EAAAAAAERBIyNxGIBEgQoIwAAAAEDCE+TNXcAAAAAAQQWABQLE1LKzQPPaqG388jWOIZxs0peEQA=", 10000);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEQSLjcRiARIEECcAAAABDiA6Gzs8g31kiep6Mdjmx91QPAAb7z4GlY51dICNaMp4pQEPBAAAAAABEQSMjcRiARIEKCMAAAABAwhPkzV3AAAAAAEEFgAUCxNSys0Dz2qht/PI1jiGcbNKXhEA", 10000);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEQSLjcRiAAEOIDobOzyDfWSJ6nox2ObH3VA8ABvvPgaVjnV0gI1oynilAQ8EAAAAAAERBIyNxGIBEgQoIwAAAAEDCE+TNXcAAAAAAQQWABQLE1LKzQPPaqG388jWOIZxs0peEQA=", 1657048460);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEQSLjcRiARIEECcAAAABDiA6Gzs8g31kiep6Mdjmx91QPAAb7z4GlY51dICNaMp4pQEPBAAAAAABEQSMjcRiAAEDCE+TNXcAAAAAAQQWABQLE1LKzQPPaqG388jWOIZxs0peEQA=", 1657048460);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAAAAQ4gOhs7PIN9ZInqejHY5sfdUDwAG+8+BpWOdXSAjWjKeKUBDwQAAAAAAREEjI3EYgABAwhPkzV3AAAAAAEEFgAUCxNSys0Dz2qht/PI1jiGcbNKXhEA", 1657048460);
+    CheckTimeLock("cHNidP8BAgQCAAAAAQMEAAAAAAEEAQIBBQEBAfsEAgAAAAABDiAPdY2/vU2nwWyKMwnDyB4RAPVh6mRttbAXUsSF4b3enwEPBAEAAAABEgQQJwAAAAEOIDobOzyDfWSJ6nox2ObH3VA8ABvvPgaVjnV0gI1oynilAQ8EAAAAAAERBIyNxGIAAQMIT5M1dwAAAAABBBYAFAsTUsrNA89qobfzyNY4hnGzSl4RAA==", std::nullopt);
+}
+
+BOOST_AUTO_TEST_CASE(psbt2_addinput)
+{
+    FastRandomContext rng(/*fDeterministic=*/true);
+
+    CMutableTransaction mtx;
+    PartiallySignedTransaction psbt(mtx, /*version=*/2);
+    psbt.m_tx_modifiable.emplace();
+    psbt.m_tx_modifiable->set(0, true);
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 0);
+
+    // Same PSBT version is required
+    uint256 txid;
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin_v0(/*psbt_version=*/0, Txid::FromUint256(txid), /*prev_out=*/0);
+    BOOST_CHECK(!psbt.AddInput(psbtin_v0));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 0);
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    BOOST_CHECK(psbt.AddInput(psbtin));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 1);
+
+    // Duplicates are not allowed
+    BOOST_CHECK(!psbt.AddInput(psbtin));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 1);
+
+    // Input with a unique txid is allowed
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin2(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    BOOST_CHECK(psbt.AddInput(psbtin2));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 2);
+
+    // Disabling inputs modifiable flag prevents adding new inputs
+    psbt.m_tx_modifiable->set(0, false);
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin3(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    BOOST_CHECK(!psbt.AddInput(psbtin3));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 2);
+    psbt.m_tx_modifiable->set(0, true);
+
+    // Make sure that timelock compatibility checks are working
+    // No previous required timelocks, new input with both height and time timelocks is allowed
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin4(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    psbtin4.time_locktime = LOCKTIME_THRESHOLD;
+    psbtin4.height_locktime = 100;
+    BOOST_CHECK(psbt.AddInput(psbtin4));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 3);
+
+    // Input with only a time timelock is allowed
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin5(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    psbtin5.time_locktime = LOCKTIME_THRESHOLD + 1;
+    BOOST_CHECK(psbt.AddInput(psbtin5));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 4);
+
+    // Input with only a height timelock is not allowed because of previous
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin6(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    psbtin6.height_locktime = 100;
+    BOOST_CHECK(!psbt.AddInput(psbtin6));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 4);
+
+    // Adding an input that already has a signature is allowed
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin7(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    psbtin7.final_script_sig << OP_1;
+    BOOST_CHECK(psbt.AddInput(psbtin7));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+
+    // Same thing, but with other things that have signatures
+    psbtin7.final_script_sig.clear();
+    psbtin7.final_script_witness.stack.emplace_back();
+    BOOST_CHECK(!psbt.AddInput(psbtin7));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+    psbtin7.final_script_witness.SetNull();
+    psbtin7.partial_sigs.emplace();
+    BOOST_CHECK(!psbt.AddInput(psbtin7));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+    psbtin7.partial_sigs.clear();
+    psbtin7.m_tap_key_sig.push_back(0);
+    BOOST_CHECK(!psbt.AddInput(psbtin7));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+    psbtin7.m_tap_key_sig.clear();
+    psbtin7.m_tap_script_sigs.emplace();
+    BOOST_CHECK(!psbt.AddInput(psbtin7));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+    psbtin7.m_tap_script_sigs.clear();
+    psbtin7.m_musig2_partial_sigs.emplace();
+    BOOST_CHECK(!psbt.AddInput(psbtin7));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+
+    // Adding an input that changes the timelock is no longer allowed
+    rng.fillrand(MakeWritableByteSpan(txid));
+    PSBTInput psbtin8(/*psbt_version=*/2, Txid::FromUint256(txid), /*prev_out=*/0);
+    psbtin8.time_locktime = LOCKTIME_THRESHOLD + 2;
+    BOOST_CHECK(!psbt.AddInput(psbtin8));
+    BOOST_CHECK_EQUAL(psbt.inputs.size(), 5);
+}
+
+BOOST_AUTO_TEST_CASE(psbt2_addoutput)
+{
+    CMutableTransaction mtx;
+    PartiallySignedTransaction psbt(mtx, /*version=*/2);
+    psbt.m_tx_modifiable.emplace();
+    psbt.m_tx_modifiable->set(1, true);
+    BOOST_CHECK_EQUAL(psbt.outputs.size(), 0);
+
+    // Same PSBT version is required
+    PSBTOutput psbtout_v0(/*psbt_version=*/0, /*amount=*/1, CScript());
+    BOOST_CHECK(!psbt.AddOutput(psbtout_v0));
+    BOOST_CHECK_EQUAL(psbt.outputs.size(), 0);
+    PSBTOutput psbtout(/*psbt_version=*/2, /*amount=*/1, CScript());
+    BOOST_CHECK(psbt.AddOutput(psbtout));
+    BOOST_CHECK_EQUAL(psbt.outputs.size(), 1);
+
+    // Disabling outputs modifiable flag prevents adding new outputs
+    psbt.m_tx_modifiable->set(1, false);
+    PSBTOutput psbtout2(/*psbt_version=*/2, /*amount=*/1, CScript());
+    BOOST_CHECK(!psbt.AddOutput(psbtout2));
+    BOOST_CHECK_EQUAL(psbt.outputs.size(), 1);
+    psbt.m_tx_modifiable->set(1, true);
+    PSBTOutput psbtout3(/*psbt_version=*/2, /*amount=*/1, CScript());
+    BOOST_CHECK(psbt.AddOutput(psbtout3));
+    BOOST_CHECK_EQUAL(psbt.outputs.size(), 2);
+}
+
+BOOST_AUTO_TEST_CASE(merge_proprietary_fields)
+{
+    CMutableTransaction tx;
+    tx.vin.emplace_back(COutPoint{});
+    tx.vout.emplace_back(0, CScript{});
+
+    PartiallySignedTransaction left(tx);
+    PartiallySignedTransaction right(tx);
+
+    const auto left_prop = MakeProprietary(/*subtype=*/1, /*key_data=*/0x01, /*value=*/0xaa);
+    const auto right_prop = MakeProprietary(/*subtype=*/2, /*key_data=*/0x02, /*value=*/0xbb);
+
+    left.m_proprietary.insert(left_prop);
+    left.inputs[0].m_proprietary.insert(left_prop);
+    left.outputs[0].m_proprietary.insert(left_prop);
+
+    right.m_proprietary.insert(right_prop);
+    right.inputs[0].m_proprietary.insert(right_prop);
+    right.outputs[0].m_proprietary.insert(right_prop);
+
+    BOOST_REQUIRE(left.Merge(right));
+
+    BOOST_REQUIRE_EQUAL(left.m_proprietary.size(), 2U);
+    BOOST_REQUIRE_EQUAL(left.inputs[0].m_proprietary.size(), 2U);
+    BOOST_REQUIRE_EQUAL(left.outputs[0].m_proprietary.size(), 2U);
+
+    const auto global_it = left.m_proprietary.find(right_prop);
+    BOOST_REQUIRE(global_it != left.m_proprietary.end());
+    BOOST_CHECK(global_it->value == right_prop.value);
+
+    const auto input_it = left.inputs[0].m_proprietary.find(right_prop);
+    BOOST_REQUIRE(input_it != left.inputs[0].m_proprietary.end());
+    BOOST_CHECK(input_it->value == right_prop.value);
+
+    const auto output_it = left.outputs[0].m_proprietary.find(right_prop);
+    BOOST_REQUIRE(output_it != left.outputs[0].m_proprietary.end());
+    BOOST_CHECK(output_it->value == right_prop.value);
+}
+
+struct PSBTOutputTest {
+    CPubKey pubkey;
+    FlatSigningProvider provider;
+    CScript script_pubkey;
+
+    explicit PSBTOutputTest(std::string descriptor)
+    {
+        CKey key{GenerateRandomKey()};
+        pubkey = key.GetPubKey();
+        provider.keys.emplace(pubkey.GetID(), key);
+
+        util::ReplaceAll(descriptor, "<KEY>", HexStr(pubkey));
+        std::string error;
+        auto descriptors{Parse(descriptor, provider, error, /*require_checksum=*/false)};
+        BOOST_REQUIRE_MESSAGE(!descriptors.empty(), error);
+        std::vector<CScript> output_scripts;
+        BOOST_REQUIRE(descriptors[0]->Expand(/*pos=*/0, provider, output_scripts, provider));
+        BOOST_REQUIRE_EQUAL(output_scripts.size(), 1);
+        script_pubkey = output_scripts[0];
+    }
+
+    PSBTOutput UpdateOutput(bool has_input) const
+    {
+        CMutableTransaction tx;
+        if (has_input) tx.vin.emplace_back();
+        tx.vout.emplace_back(0, script_pubkey);
+        PartiallySignedTransaction psbt{tx};
+        UpdatePSBTOutput(provider, psbt, 0);
+        return psbt.outputs[0];
+    }
+};
+
+BOOST_AUTO_TEST_CASE(update_psbt_output_keypaths)
+{
+    for (bool has_input : {false, true}) {
+        for (const auto& descriptor : {"pkh(<KEY>)", "wpkh(<KEY>)"}) {
+            PSBTOutputTest test{descriptor};
+            auto out{test.UpdateOutput(has_input)};
+            BOOST_CHECK(out.hd_keypaths.contains(test.pubkey));
+            BOOST_CHECK(out.redeem_script.empty());
+            BOOST_CHECK(out.witness_script.empty());
+        }
+    }
+}
+
+BOOST_AUTO_TEST_CASE(update_psbt_output_redeem_script)
+{
+    for (bool has_input : {false, true}) {
+        PSBTOutputTest test{"sh(wpkh(<KEY>))"};
+        auto out{test.UpdateOutput(has_input)};
+        BOOST_CHECK(out.redeem_script == GetScriptForDestination(WitnessV0KeyHash{test.pubkey}));
+        BOOST_CHECK(out.hd_keypaths.contains(test.pubkey));
+    }
+}
+
+BOOST_AUTO_TEST_CASE(update_psbt_output_witness_script)
+{
+    for (bool has_input : {false, true}) {
+        PSBTOutputTest test{"wsh(pk(<KEY>))"};
+        auto out{test.UpdateOutput(has_input)};
+        BOOST_CHECK(out.witness_script == GetScriptForRawPubKey(test.pubkey));
+        BOOST_CHECK(out.hd_keypaths.contains(test.pubkey));
+    }
+}
+
+BOOST_AUTO_TEST_CASE(update_psbt_output_miniscript_timelock)
+{
+    for (bool has_input : {false, true}) {
+        PSBTOutputTest test{"wsh(and_v(v:pk(<KEY>),older(144)))"};
+        auto out{test.UpdateOutput(has_input)};
+        BOOST_CHECK(GetScriptForDestination(WitnessV0ScriptHash{out.witness_script}) == test.script_pubkey);
+        BOOST_CHECK(out.hd_keypaths.contains(test.pubkey));
+    }
+}
+
+BOOST_AUTO_TEST_CASE(update_psbt_output_taproot)
+{
+    for (bool has_input : {false, true}) {
+        PSBTOutputTest test{"rawtr(<KEY>)"};
+        auto out{test.UpdateOutput(has_input)};
+        BOOST_CHECK(out.m_tap_bip32_paths.contains(XOnlyPubKey{test.pubkey}));
+        BOOST_CHECK(out.hd_keypaths.empty());
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/raii_event_tests.cpp b/depend/bitcoin/src/test/raii_event_tests.cpp
deleted file mode 100644
index 3a797dff..00000000
--- a/depend/bitcoin/src/test/raii_event_tests.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2016-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.
-
-#include <event2/event.h>
-
-#include <cstdlib>
-#include <map>
-
-#include <support/events.h>
-
-#include <test/util/setup_common.h>
-
-#include <boost/test/unit_test.hpp>
-
-BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
-
-#ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-
-static std::map<void*, short> tags;
-static std::map<void*, uint16_t> orders;
-static uint16_t tagSequence = 0;
-
-static void* tag_malloc(size_t sz) {
-    void* mem = malloc(sz);
-    if (!mem) return mem;
-    tags[mem]++;
-    orders[mem] = tagSequence++;
-    return mem;
-}
-
-static void tag_free(void* mem) {
-    tags[mem]--;
-    orders[mem] = tagSequence++;
-    free(mem);
-}
-
-BOOST_AUTO_TEST_CASE(raii_event_creation)
-{
-    event_set_mem_functions(tag_malloc, realloc, tag_free);
-
-    void* base_ptr = nullptr;
-    {
-        auto base = obtain_event_base();
-        base_ptr = (void*)base.get();
-        BOOST_CHECK(tags[base_ptr] == 1);
-    }
-    BOOST_CHECK(tags[base_ptr] == 0);
-
-    void* event_ptr = nullptr;
-    {
-        auto base = obtain_event_base();
-        auto event = obtain_event(base.get(), -1, 0, nullptr, nullptr);
-
-        base_ptr = (void*)base.get();
-        event_ptr = (void*)event.get();
-
-        BOOST_CHECK(tags[base_ptr] == 1);
-        BOOST_CHECK(tags[event_ptr] == 1);
-    }
-    BOOST_CHECK(tags[base_ptr] == 0);
-    BOOST_CHECK(tags[event_ptr] == 0);
-
-    event_set_mem_functions(malloc, realloc, free);
-}
-
-BOOST_AUTO_TEST_CASE(raii_event_order)
-{
-    event_set_mem_functions(tag_malloc, realloc, tag_free);
-
-    void* base_ptr = nullptr;
-    void* event_ptr = nullptr;
-    {
-        auto base = obtain_event_base();
-        auto event = obtain_event(base.get(), -1, 0, nullptr, nullptr);
-
-        base_ptr = (void*)base.get();
-        event_ptr = (void*)event.get();
-
-        // base should have allocated before event
-        BOOST_CHECK(orders[base_ptr] < orders[event_ptr]);
-    }
-    // base should be freed after event
-    BOOST_CHECK(orders[base_ptr] > orders[event_ptr]);
-
-    event_set_mem_functions(malloc, realloc, free);
-}
-
-#endif  // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/rbf_tests.cpp b/depend/bitcoin/src/test/rbf_tests.cpp
index e2a95148..15134791 100644
--- a/depend/bitcoin/src/test/rbf_tests.cpp
+++ b/depend/bitcoin/src/test/rbf_tests.cpp
@@ -121,11 +121,6 @@ BOOST_FIXTURE_TEST_CASE(rbf_helper_functions, TestChain100Setup)
     BOOST_CHECK_EQUAL(entry8_high->GetFee(), high_fee);
 
     CTxMemPool::setEntries set_12_normal{entry1_normal, entry2_normal};
-    CTxMemPool::setEntries set_34_cpfp{entry3_low, entry4_high};
-    CTxMemPool::setEntries set_56_low{entry5_low, entry6_low_prioritised};
-    CTxMemPool::setEntries set_78_high{entry7_high, entry8_high};
-    CTxMemPool::setEntries all_entries{entry1_normal, entry2_normal, entry3_low, entry4_high,
-                                       entry5_low, entry6_low_prioritised, entry7_high, entry8_high};
     CTxMemPool::setEntries empty_set;
 
     const auto unused_txid = Txid::FromUint256(GetRandHash());
diff --git a/depend/bitcoin/src/test/rpc_tests.cpp b/depend/bitcoin/src/test/rpc_tests.cpp
index 1b6dbda0..d574e1e2 100644
--- a/depend/bitcoin/src/test/rpc_tests.cpp
+++ b/depend/bitcoin/src/test/rpc_tests.cpp
@@ -11,6 +11,7 @@
 #include <rpc/util.h>
 #include <test/util/common.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <univalue.h>
 #include <util/time.h>
 
@@ -135,6 +136,39 @@ BOOST_AUTO_TEST_CASE(rpc_namedonlyparams)
                           HasJSON(R"({"code":-8,"message":"Parameter options specified twice both as positional and named argument"})"));
 }
 
+BOOST_AUTO_TEST_CASE(rpc_remove_command_cleans_up_empty_entry)
+{
+    CRPCTable table;
+    RpcMethodFnType method{
+        []() -> RPCMethod {
+            return RPCMethod{
+                "method",
+                "Test RPC method.\n",
+                {},
+                RPCResult{RPCResult::Type::STR, "", ""},
+                RPCExamples{""},
+                [](const RPCMethod&, const JSONRPCRequest&) -> UniValue { return "ok"; },
+            };
+        }
+    };
+    CRPCCommand command{"test", method};
+
+    table.appendCommand(command.name, &command);
+    BOOST_CHECK(table.removeCommand(command.name, &command));
+
+    bool found{false};
+    for (const auto& name : table.listCommands()) {
+        if (name == command.name) {
+            found = true;
+            break;
+        }
+    }
+    BOOST_CHECK(!found);
+
+    UniValue doc{table.buildOpenRPCDoc()};
+    BOOST_CHECK(doc.isObject());
+}
+
 BOOST_AUTO_TEST_CASE(rpc_rawparams)
 {
     // Test raw transaction API argument handling
@@ -341,10 +375,9 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
 
     BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
 
-    auto now = 10'000s;
-    SetMockTime(now);
+    FakeNodeClock clock{10'000s};
     BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 127.0.0.0/24 add 200")));
-    SetMockTime(now += 2s);
+    clock += 2s;
     const int64_t time_remaining_expected{198};
     BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
@@ -355,7 +388,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
     const int64_t ban_duration{o1.find_value("ban_duration").getInt<int64_t>()};
     const int64_t time_remaining{o1.find_value("time_remaining").getInt<int64_t>()};
     BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
-    BOOST_CHECK_EQUAL(banned_until, time_remaining_expected + now.count());
+    BOOST_CHECK_EQUAL(banned_until, time_remaining_expected + TicksSinceEpoch<std::chrono::seconds>(NodeClock::now()));
     BOOST_CHECK_EQUAL(ban_duration, banned_until - ban_created);
     BOOST_CHECK_EQUAL(time_remaining, time_remaining_expected);
 
diff --git a/depend/bitcoin/src/test/scheduler_tests.cpp b/depend/bitcoin/src/test/scheduler_tests.cpp
index c106eca6..aa957620 100644
--- a/depend/bitcoin/src/test/scheduler_tests.cpp
+++ b/depend/bitcoin/src/test/scheduler_tests.cpp
@@ -209,7 +209,8 @@ BOOST_AUTO_TEST_CASE(mockforward)
     auto now = std::chrono::steady_clock::now();
     int delta = std::chrono::duration_cast<std::chrono::seconds>(first - now).count();
     // should be between 2 & 3 minutes from now
-    BOOST_CHECK(delta > 2*60 && delta < 3*60);
+    BOOST_CHECK(delta > 2*60);
+    BOOST_CHECK(delta < 3*60);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/script_p2sh_tests.cpp b/depend/bitcoin/src/test/script_p2sh_tests.cpp
index f80090aa..df59385b 100644
--- a/depend/bitcoin/src/test/script_p2sh_tests.cpp
+++ b/depend/bitcoin/src/test/script_p2sh_tests.cpp
@@ -354,125 +354,141 @@ BOOST_AUTO_TEST_CASE(ValidateInputsStandardness)
 
     AddCoins(coins, CTransaction(txFrom), 0);
 
-    CMutableTransaction txTo;
-    txTo.vout.resize(1);
-    txTo.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+    {
+        CMutableTransaction txTo;
+        txTo.vout.resize(1);
+        txTo.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+
+        txTo.vin.resize(5);
+        for (int i = 0; i < 5; i++)
+        {
+            txTo.vin[i].prevout.n = i;
+            txTo.vin[i].prevout.hash = txFrom.GetHash();
+        }
+        SignatureData empty;
+        BOOST_CHECK(SignSignature(keystore, CTransaction(txFrom), txTo, 0, SIGHASH_ALL, empty));
+        SignatureData empty_b;
+        BOOST_CHECK(SignSignature(keystore, CTransaction(txFrom), txTo, 1, SIGHASH_ALL, empty_b));
+        SignatureData empty_c;
+        BOOST_CHECK(SignSignature(keystore, CTransaction(txFrom), txTo, 2, SIGHASH_ALL, empty_c));
+        // SignSignature doesn't know how to sign these. We're
+        // not testing validating signatures, so just create
+        // dummy signatures that DO include the correct P2SH scripts:
+        txTo.vin[3].scriptSig << OP_11 << OP_11 << std::vector<unsigned char>(oneAndTwo.begin(), oneAndTwo.end());
+        txTo.vin[4].scriptSig << std::vector<unsigned char>(fifteenSigops.begin(), fifteenSigops.end());
+
+        BOOST_CHECK(::ValidateInputsStandardness(CTransaction(txTo), coins).IsValid());
+        // 22 P2SH sigops for all inputs (1 for vin[0], 6 for vin[3], 15 for vin[4]
+        BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txTo), coins), 22U);
+    }
 
-    txTo.vin.resize(5);
-    for (int i = 0; i < 5; i++)
     {
-        txTo.vin[i].prevout.n = i;
-        txTo.vin[i].prevout.hash = txFrom.GetHash();
+        CMutableTransaction coinbase_tx_mut;
+        coinbase_tx_mut.vin.resize(1);
+        CTransaction coinbase_tx{coinbase_tx_mut};
+        BOOST_CHECK(coinbase_tx.IsCoinBase());
+        BOOST_CHECK_EQUAL(GetP2SHSigOpCount(coinbase_tx, coins), 0U);
     }
-    SignatureData empty;
-    BOOST_CHECK(SignSignature(keystore, CTransaction(txFrom), txTo, 0, SIGHASH_ALL, empty));
-    SignatureData empty_b;
-    BOOST_CHECK(SignSignature(keystore, CTransaction(txFrom), txTo, 1, SIGHASH_ALL, empty_b));
-    SignatureData empty_c;
-    BOOST_CHECK(SignSignature(keystore, CTransaction(txFrom), txTo, 2, SIGHASH_ALL, empty_c));
-    // SignSignature doesn't know how to sign these. We're
-    // not testing validating signatures, so just create
-    // dummy signatures that DO include the correct P2SH scripts:
-    txTo.vin[3].scriptSig << OP_11 << OP_11 << std::vector<unsigned char>(oneAndTwo.begin(), oneAndTwo.end());
-    txTo.vin[4].scriptSig << std::vector<unsigned char>(fifteenSigops.begin(), fifteenSigops.end());
-
-    BOOST_CHECK(::ValidateInputsStandardness(CTransaction(txTo), coins).IsValid());
-    // 22 P2SH sigops for all inputs (1 for vin[0], 6 for vin[3], 15 for vin[4]
-    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txTo), coins), 22U);
-
-    CMutableTransaction coinbase_tx_mut;
-    coinbase_tx_mut.vin.resize(1);
-    CTransaction coinbase_tx{coinbase_tx_mut};
-    BOOST_CHECK(coinbase_tx.IsCoinBase());
-    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(coinbase_tx, coins), 0U);
 
     // TxoutType::SCRIPTHASH
-    CMutableTransaction txToNonStd1;
-    txToNonStd1.vout.resize(1);
-    txToNonStd1.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
-    txToNonStd1.vout[0].nValue = 1000;
-    txToNonStd1.vin.resize(1);
-    txToNonStd1.vin[0].prevout.n = 5;
-    txToNonStd1.vin[0].prevout.hash = txFrom.GetHash();
-    txToNonStd1.vin[0].scriptSig << std::vector<unsigned char>(sixteenSigops.begin(), sixteenSigops.end());
-
-    const auto txToNonStd1_res = ::ValidateInputsStandardness(CTransaction(txToNonStd1), coins);
-    BOOST_CHECK(txToNonStd1_res.IsInvalid());
-    BOOST_CHECK_EQUAL(txToNonStd1_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
-    BOOST_CHECK_EQUAL(txToNonStd1_res.GetDebugMessage(), "p2sh redeemscript sigops exceed limit (input 0: 16 > 15)");
-
-    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd1), coins), 16U);
-
-    CMutableTransaction txToNonStd2;
-    txToNonStd2.vout.resize(1);
-    txToNonStd2.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
-    txToNonStd2.vout[0].nValue = 1000;
-    txToNonStd2.vin.resize(1);
-    txToNonStd2.vin[0].prevout.n = 6;
-    txToNonStd2.vin[0].prevout.hash = txFrom.GetHash();
-    txToNonStd2.vin[0].scriptSig << std::vector<unsigned char>(twentySigops.begin(), twentySigops.end());
-
-    const auto txToNonStd2_res = ::ValidateInputsStandardness(CTransaction(txToNonStd2), coins);
-    BOOST_CHECK(txToNonStd2_res.IsInvalid());
-    BOOST_CHECK_EQUAL(txToNonStd2_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
-    BOOST_CHECK_EQUAL(txToNonStd2_res.GetDebugMessage(), "p2sh redeemscript sigops exceed limit (input 0: 20 > 15)");
-    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2), coins), 20U);
-
-    CMutableTransaction txToNonStd2_no_scriptSig;
-    txToNonStd2_no_scriptSig.vout.resize(1);
-    txToNonStd2_no_scriptSig.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
-    txToNonStd2_no_scriptSig.vout[0].nValue = 1000;
-    txToNonStd2_no_scriptSig.vin.resize(1);
-    txToNonStd2_no_scriptSig.vin[0].prevout.n = 6;
-    txToNonStd2_no_scriptSig.vin[0].prevout.hash = txFrom.GetHash();
-
-    const auto txToNonStd2_no_scriptSig_res = ::ValidateInputsStandardness(CTransaction(txToNonStd2_no_scriptSig), coins);
-    BOOST_CHECK(txToNonStd2_no_scriptSig_res.IsInvalid());
-    BOOST_CHECK_EQUAL(txToNonStd2_no_scriptSig_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
-    BOOST_CHECK_EQUAL(txToNonStd2_no_scriptSig_res.GetDebugMessage(), "input 0 P2SH redeemscript missing");
-    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2), coins), 20U);
+    {
+        CMutableTransaction txToNonStd1;
+        txToNonStd1.vout.resize(1);
+        txToNonStd1.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+        txToNonStd1.vout[0].nValue = 1000;
+        txToNonStd1.vin.resize(1);
+        txToNonStd1.vin[0].prevout.n = 5;
+        txToNonStd1.vin[0].prevout.hash = txFrom.GetHash();
+        txToNonStd1.vin[0].scriptSig << std::vector<unsigned char>(sixteenSigops.begin(), sixteenSigops.end());
+
+        const auto txToNonStd1_res = ::ValidateInputsStandardness(CTransaction(txToNonStd1), coins);
+        BOOST_CHECK(txToNonStd1_res.IsInvalid());
+        BOOST_CHECK_EQUAL(txToNonStd1_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+        BOOST_CHECK_EQUAL(txToNonStd1_res.GetDebugMessage(), "p2sh redeemscript sigops exceed limit (input 0: 16 > 15)");
+
+        BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd1), coins), 16U);
+    }
+
+    {
+        CMutableTransaction txToNonStd2;
+        txToNonStd2.vout.resize(1);
+        txToNonStd2.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+        txToNonStd2.vout[0].nValue = 1000;
+        txToNonStd2.vin.resize(1);
+        txToNonStd2.vin[0].prevout.n = 6;
+        txToNonStd2.vin[0].prevout.hash = txFrom.GetHash();
+        txToNonStd2.vin[0].scriptSig << std::vector<unsigned char>(twentySigops.begin(), twentySigops.end());
+
+        const auto txToNonStd2_res = ::ValidateInputsStandardness(CTransaction(txToNonStd2), coins);
+        BOOST_CHECK(txToNonStd2_res.IsInvalid());
+        BOOST_CHECK_EQUAL(txToNonStd2_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+        BOOST_CHECK_EQUAL(txToNonStd2_res.GetDebugMessage(), "p2sh redeemscript sigops exceed limit (input 0: 20 > 15)");
+        BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2), coins), 20U);
+    }
+
+    {
+        CMutableTransaction txToNonStd2_no_scriptSig;
+        txToNonStd2_no_scriptSig.vout.resize(1);
+        txToNonStd2_no_scriptSig.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+        txToNonStd2_no_scriptSig.vout[0].nValue = 1000;
+        txToNonStd2_no_scriptSig.vin.resize(1);
+        txToNonStd2_no_scriptSig.vin[0].prevout.n = 6;
+        txToNonStd2_no_scriptSig.vin[0].prevout.hash = txFrom.GetHash();
+
+        const auto txToNonStd2_no_scriptSig_res = ::ValidateInputsStandardness(CTransaction(txToNonStd2_no_scriptSig), coins);
+        BOOST_CHECK(txToNonStd2_no_scriptSig_res.IsInvalid());
+        BOOST_CHECK_EQUAL(txToNonStd2_no_scriptSig_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+        BOOST_CHECK_EQUAL(txToNonStd2_no_scriptSig_res.GetDebugMessage(), "input 0 P2SH redeemscript missing");
+        BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2_no_scriptSig), coins), 0U);
+    }
 
     // TxoutType::NONSTANDARD
-    CMutableTransaction txToNonStd3;
-    txToNonStd3.vout.resize(1);
-    txToNonStd3.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
-    txToNonStd3.vout[0].nValue = 1000;
-    txToNonStd3.vin.resize(1);
-    txToNonStd3.vin[0].prevout.n = 7;
-    txToNonStd3.vin[0].prevout.hash = txFrom.GetHash();
-
-    const auto txToNonStd3_res = ::ValidateInputsStandardness(CTransaction(txToNonStd3), coins);
-    BOOST_CHECK(txToNonStd3_res.IsInvalid());
-    BOOST_CHECK_EQUAL(txToNonStd3_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
-    BOOST_CHECK_EQUAL(txToNonStd3_res.GetDebugMessage(), "input 0 script unknown");
+    {
+        CMutableTransaction txToNonStd3;
+        txToNonStd3.vout.resize(1);
+        txToNonStd3.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+        txToNonStd3.vout[0].nValue = 1000;
+        txToNonStd3.vin.resize(1);
+        txToNonStd3.vin[0].prevout.n = 7;
+        txToNonStd3.vin[0].prevout.hash = txFrom.GetHash();
+
+        const auto txToNonStd3_res = ::ValidateInputsStandardness(CTransaction(txToNonStd3), coins);
+        BOOST_CHECK(txToNonStd3_res.IsInvalid());
+        BOOST_CHECK_EQUAL(txToNonStd3_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+        BOOST_CHECK_EQUAL(txToNonStd3_res.GetDebugMessage(), "input 0 script unknown");
+    }
 
     // TxoutType::INCORRECT_SCRIPTSIG
-    CMutableTransaction txToNonStd4;
-    txToNonStd4.vout.resize(1);
-    txToNonStd4.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
-    txToNonStd4.vout[0].nValue = 1000;
-    txToNonStd4.vin.resize(1);
-    txToNonStd4.vin[0].prevout.n = 8;
-    txToNonStd4.vin[0].prevout.hash = txFrom.GetHash();
-    txToNonStd4.vin[0].scriptSig = op_return_script;
-
-    const auto txToNonStd4_res = ::ValidateInputsStandardness(CTransaction(txToNonStd4), coins);
-    BOOST_CHECK(txToNonStd4_res.IsInvalid());
-    BOOST_CHECK_EQUAL(txToNonStd4_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
-    BOOST_CHECK_EQUAL(txToNonStd4_res.GetDebugMessage(), "p2sh scriptsig malformed (input 0: OP_RETURN was encountered)");
+    {
+        CMutableTransaction txToNonStd4;
+        txToNonStd4.vout.resize(1);
+        txToNonStd4.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+        txToNonStd4.vout[0].nValue = 1000;
+        txToNonStd4.vin.resize(1);
+        txToNonStd4.vin[0].prevout.n = 8;
+        txToNonStd4.vin[0].prevout.hash = txFrom.GetHash();
+        txToNonStd4.vin[0].scriptSig = op_return_script;
+
+        const auto txToNonStd4_res = ::ValidateInputsStandardness(CTransaction(txToNonStd4), coins);
+        BOOST_CHECK(txToNonStd4_res.IsInvalid());
+        BOOST_CHECK_EQUAL(txToNonStd4_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+        BOOST_CHECK_EQUAL(txToNonStd4_res.GetDebugMessage(), "p2sh scriptsig malformed (input 0: OP_RETURN was encountered)");
+    }
 
     // TxoutType::WITNESS_UNKNOWN
-    CMutableTransaction txWitnessUnknown;
-    txWitnessUnknown.vout.resize(1);
-    txWitnessUnknown.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
-    txWitnessUnknown.vout[0].nValue = 1000;
-    txWitnessUnknown.vin.resize(1);
-    txWitnessUnknown.vin[0].prevout.n = 9;
-    txWitnessUnknown.vin[0].prevout.hash = txFrom.GetHash();
-    const auto txWitnessUnknown_res = ::ValidateInputsStandardness(CTransaction(txWitnessUnknown), coins);
-    BOOST_CHECK(txWitnessUnknown_res.IsInvalid());
-    BOOST_CHECK_EQUAL(txWitnessUnknown_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
-    BOOST_CHECK_EQUAL(txWitnessUnknown_res.GetDebugMessage(), "input 0 witness program is undefined");
+    {
+        CMutableTransaction txWitnessUnknown;
+        txWitnessUnknown.vout.resize(1);
+        txWitnessUnknown.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+        txWitnessUnknown.vout[0].nValue = 1000;
+        txWitnessUnknown.vin.resize(1);
+        txWitnessUnknown.vin[0].prevout.n = 9;
+        txWitnessUnknown.vin[0].prevout.hash = txFrom.GetHash();
+        const auto txWitnessUnknown_res = ::ValidateInputsStandardness(CTransaction(txWitnessUnknown), coins);
+        BOOST_CHECK(txWitnessUnknown_res.IsInvalid());
+        BOOST_CHECK_EQUAL(txWitnessUnknown_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+        BOOST_CHECK_EQUAL(txWitnessUnknown_res.GetDebugMessage(), "input 0 witness program is undefined");
+    }
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/script_standard_tests.cpp b/depend/bitcoin/src/test/script_standard_tests.cpp
index a1e0c46a..21743df5 100644
--- a/depend/bitcoin/src/test/script_standard_tests.cpp
+++ b/depend/bitcoin/src/test/script_standard_tests.cpp
@@ -439,15 +439,20 @@ BOOST_AUTO_TEST_CASE(script_standard_taproot_builder)
     constexpr uint256 hash_3{"31fe7061656bea2a36aa60a2f7ef940578049273746935d296426dc0afd86b68"};
 
     TaprootBuilder builder;
-    BOOST_CHECK(builder.IsValid() && builder.IsComplete());
+    BOOST_CHECK(builder.IsValid());
+    BOOST_CHECK(builder.IsComplete());
     builder.Add(2, script_2, 0xc0);
-    BOOST_CHECK(builder.IsValid() && !builder.IsComplete());
+    BOOST_CHECK(builder.IsValid());
+    BOOST_CHECK(!builder.IsComplete());
     builder.AddOmitted(2, hash_3);
-    BOOST_CHECK(builder.IsValid() && !builder.IsComplete());
+    BOOST_CHECK(builder.IsValid());
+    BOOST_CHECK(!builder.IsComplete());
     builder.Add(1, script_1, 0xc0);
-    BOOST_CHECK(builder.IsValid() && builder.IsComplete());
+    BOOST_CHECK(builder.IsValid());
+    BOOST_CHECK(builder.IsComplete());
     builder.Finalize(key_inner);
-    BOOST_CHECK(builder.IsValid() && builder.IsComplete());
+    BOOST_CHECK(builder.IsValid());
+    BOOST_CHECK(builder.IsComplete());
     BOOST_CHECK_EQUAL(EncodeDestination(builder.GetOutput()), "bc1pj6gaw944fy0xpmzzu45ugqde4rz7mqj5kj0tg8kmr5f0pjq8vnaqgynnge");
 }
 
diff --git a/depend/bitcoin/src/test/script_tests.cpp b/depend/bitcoin/src/test/script_tests.cpp
index ffb7acd2..37ca862a 100644
--- a/depend/bitcoin/src/test/script_tests.cpp
+++ b/depend/bitcoin/src/test/script_tests.cpp
@@ -2,10 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <test/data/script_tests.json.h>
-#include <test/data/bip341_wallet_vectors.json.h>
-
 #include <common/system.h>
+#include <compressor.h>
 #include <core_io.h>
 #include <key.h>
 #include <rpc/util.h>
@@ -16,25 +14,26 @@
 #include <script/sign.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
+#include <secp256k1.h>
 #include <streams.h>
+#include <test/data/bip341_wallet_vectors.json.h>
+#include <test/data/script_tests.json.h>
+#include <test/util/common.h>
 #include <test/util/json.h>
 #include <test/util/random.h>
-#include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <test/util/transaction_utils.h>
+#include <univalue.h>
 #include <util/fs.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 
+#include <boost/test/unit_test.hpp>
+
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include <boost/test/unit_test.hpp>
-
-#include <secp256k1.h>
-#include <univalue.h>
-
 // Uncomment if you want to output updated JSON tests.
 // #define UPDATE_JSON_TESTS
 
diff --git a/depend/bitcoin/src/test/scriptnum10.h b/depend/bitcoin/src/test/scriptnum10.h
index 40260671..a49693b3 100644
--- a/depend/bitcoin/src/test/scriptnum10.h
+++ b/depend/bitcoin/src/test/scriptnum10.h
@@ -31,7 +31,7 @@ class CScriptNum10
         m_value = n;
     }
 
-    static const size_t nDefaultMaxNumSize = 4;
+    static constexpr size_t nDefaultMaxNumSize{4};
 
     explicit CScriptNum10(const std::vector<unsigned char>& vch, bool fRequireMinimal,
                         const size_t nMaxNumSize = nDefaultMaxNumSize)
diff --git a/depend/bitcoin/src/test/serialize_tests.cpp b/depend/bitcoin/src/test/serialize_tests.cpp
index f646ba5f..9c2f16f0 100644
--- a/depend/bitcoin/src/test/serialize_tests.cpp
+++ b/depend/bitcoin/src/test/serialize_tests.cpp
@@ -9,6 +9,7 @@
 #include <test/util/setup_common.h>
 #include <util/strencodings.h>
 
+#include <algorithm>
 #include <cstdint>
 #include <string>
 
@@ -241,6 +242,40 @@ BOOST_AUTO_TEST_CASE(noncanonical)
     BOOST_CHECK_EXCEPTION(ReadCompactSize(ss), std::ios_base::failure, isCanonicalException);
 }
 
+BOOST_AUTO_TEST_CASE(string_view)
+{
+    const std::string_view sv{"hello, world"};
+    DataStream ss;
+    ss << sv;
+    std::string s;
+    ss >> s;
+    BOOST_CHECK_EQUAL(sv, s);
+}
+
+BOOST_AUTO_TEST_CASE(limited_vector)
+{
+    const std::vector<int> v = {1,2,3,4,-5,-6,-7,-8,-9,-10,10000,20000,-30000};
+
+    auto check = [&]<size_t N>() {
+        DataStream ss;
+        ss << v;
+        try {
+            std::vector<int> r;
+            ss >> LIMITED_VECTOR(r, N);
+            BOOST_CHECK_LE(r.size(), N);
+            BOOST_CHECK(std::ranges::equal(r, v));
+        } catch (const std::ios_base::failure&) {
+            BOOST_CHECK_GT(v.size(), N);
+        }
+    };
+    check.operator()<0>();
+    check.operator()<10>();
+    check.operator()<12>();
+    check.operator()<13>();
+    check.operator()<14>();
+    check.operator()<100>();
+}
+
 BOOST_AUTO_TEST_CASE(class_methods)
 {
     int intval(100);
diff --git a/depend/bitcoin/src/test/settings_tests.cpp b/depend/bitcoin/src/test/settings_tests.cpp
index 54d3b058..0d8e3b1b 100644
--- a/depend/bitcoin/src/test/settings_tests.cpp
+++ b/depend/bitcoin/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/depend/bitcoin/src/test/skiplist_tests.cpp b/depend/bitcoin/src/test/skiplist_tests.cpp
index ce44b3e3..e7cf3b62 100644
--- a/depend/bitcoin/src/test/skiplist_tests.cpp
+++ b/depend/bitcoin/src/test/skiplist_tests.cpp
@@ -6,7 +6,9 @@
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
 
+#include <algorithm>
 #include <vector>
+#include <utility>
 
 #include <boost/test/unit_test.hpp>
 
@@ -182,10 +184,109 @@ BOOST_AUTO_TEST_CASE(findearliestatleast_edge_test)
     BOOST_CHECK(!chain.FindEarliestAtLeast(0, 9));
 
     CBlockIndex* ret1 = chain.FindEarliestAtLeast(100, 2);
-    BOOST_CHECK(ret1->nTimeMax >= 100 && ret1->nHeight == 2);
+    BOOST_CHECK(ret1->nTimeMax >= 100);
+    BOOST_CHECK(ret1->nHeight == 2);
     BOOST_CHECK(!chain.FindEarliestAtLeast(300, 9));
     CBlockIndex* ret2 = chain.FindEarliestAtLeast(200, 4);
-    BOOST_CHECK(ret2->nTimeMax >= 200 && ret2->nHeight == 4);
+    BOOST_CHECK(ret2->nTimeMax >= 200);
+    BOOST_CHECK(ret2->nHeight == 4);
+}
+
+BOOST_AUTO_TEST_CASE(build_skip_height_test)
+{
+    // clang-format off
+    const std::pair<int, int> TEST_DATA[]{
+        // EVEN values: the rightmost set bit is zeroed
+        // Various even values with at least 2 bits set
+        { 0b00010010 ,
+          0b00010000 },
+        { 0b00100010 ,
+          0b00100000 },
+        { 0b01000010 ,
+          0b01000000 },
+        { 0b00010100 ,
+          0b00010000 },
+        { 0b00011000 ,
+          0b00010000 },
+        { 0b10101010 ,
+          0b10101000 },
+        // ODD values: the 2nd and 3rd set bits are zeroed
+        // Various odd values with at least 4 bits set
+        { 0b10010011 ,
+          0b10000001 },
+        { 0b10100011 ,
+          0b10000001 },
+        { 0b11000011 ,
+          0b10000001 },
+        { 0b10010101 ,
+          0b10000001 },
+        { 0b10011001 ,
+          0b10000001 },
+        { 0b10101011 ,
+          0b10100001 },
+        // Some longer random values (even and odd)
+        { 0b0001011101101000 ,
+          0b0001011101100000 },
+        { 0b0001011101101001 ,
+          0b0001011101000001 },
+        { 0b0110101101011000 ,
+          0b0110101101010000 },
+        { 0b0110101101011001 ,
+          0b0110101101000001 },
+        // All values 1-20
+        {  1,  0 },
+        {  2,  0 },
+        {  3,  1 },
+        {  4,  0 },
+        {  5,  1 },
+        {  6,  4 },
+        {  7,  1 },
+        {  8,  0 },
+        {  9,  1 },
+        { 10,  8 },
+        { 11,  1 },
+        { 12,  8 },
+        { 13,  1 },
+        { 14, 12 },
+        { 15,  9 },
+        { 16,  0 },
+        { 17,  1 },
+        { 18, 16 },
+        { 19,  1 },
+        { 20, 16 },
+    };
+    // clang-format on
+
+    // Test `CBlockIndex::BuildSkip()` and that the skip height conforms to expected logic.
+    // It tests that:
+    // - `pprev` field is set (to an earlier block index),
+    // - the skip is to the index as dictated by the `GetSkipHeight()` bit-manipulation logic,
+    // - `GetAncestor()` works as expected (indirectly).
+
+    // Build a chain (up to the highest test input value)
+    const auto max_test_input{std::ranges::max_element(TEST_DATA, [](auto& a, auto& b) { return a.first < b.first; })};
+    const int chain_size{max_test_input->first + 1};
+    std::vector<CBlockIndex> block_index(chain_size);
+    for (auto i{0}; i < chain_size; ++i) {
+        // pprev and nHeight are used by BuildSkip()
+        block_index[i].pprev = i == 0 ? nullptr : &block_index[i - 1];
+        block_index[i].nHeight = i;
+        block_index[i].BuildSkip();
+        BOOST_CHECK(block_index[i].pskip || i == 0);
+    }
+
+    for (auto& [input, expected] : TEST_DATA) {
+        BOOST_REQUIRE_LT(input, chain_size);
+        BOOST_REQUIRE_GT(input, 0);
+        BOOST_REQUIRE_LT(expected, input);
+        BOOST_REQUIRE(block_index[input].pskip);
+
+        const int skip_height{block_index[input].pskip->nHeight};
+        BOOST_CHECK_EQUAL(skip_height, expected);
+    }
+
+    // Special value: height 0 (genesis) has no skip
+    BOOST_CHECK(!block_index[0].pskip);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/sock_tests.cpp b/depend/bitcoin/src/test/sock_tests.cpp
index 35914a41..d9ebc4af 100644
--- a/depend/bitcoin/src/test/sock_tests.cpp
+++ b/depend/bitcoin/src/test/sock_tests.cpp
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(wait)
 {
     TcpSocketPair socks = TcpSocketPair{};
 
-    std::thread waiter([&socks]() { (void)socks.receiver.Wait(24h, Sock::RECV); });
+    std::thread waiter([&socks]() { (void)socks.receiver.Wait(24h, Sock::RecvEvent); });
 
     BOOST_REQUIRE_EQUAL(socks.sender.Send("a", 1, 0), 1);
 
diff --git a/depend/bitcoin/src/test/streams_tests.cpp b/depend/bitcoin/src/test/streams_tests.cpp
index 6a6026bf..6a3be3cc 100644
--- a/depend/bitcoin/src/test/streams_tests.cpp
+++ b/depend/bitcoin/src/test/streams_tests.cpp
@@ -88,6 +88,24 @@ BOOST_AUTO_TEST_CASE(obfuscation_empty)
     BOOST_CHECK(non_null_obf);
 }
 
+BOOST_AUTO_TEST_CASE(streams_scoped_data_stream_usage)
+{
+    DataStream stream{};
+    {
+        ScopedDataStreamUsage usage{stream};
+        stream << uint8_t{42};
+        BOOST_CHECK_GT(stream.size(), 0U);
+    }
+    BOOST_CHECK(stream.empty());
+
+    {
+        ScopedDataStreamUsage usage{stream};
+        stream << uint16_t{42};
+        BOOST_CHECK_GT(stream.size(), 0U);
+    }
+    BOOST_CHECK(stream.empty());
+}
+
 BOOST_AUTO_TEST_CASE(xor_file)
 {
     fs::path xor_path{m_args.GetDataDirBase() / "test_xor.bin"};
diff --git a/depend/bitcoin/src/test/system_ram_tests.cpp b/depend/bitcoin/src/test/system_ram_tests.cpp
index 4eb4e1e3..ec1ca873 100644
--- a/depend/bitcoin/src/test/system_ram_tests.cpp
+++ b/depend/bitcoin/src/test/system_ram_tests.cpp
@@ -3,24 +3,17 @@
 // file COPYING or https://opensource.org/license/mit/.
 
 #include <common/system.h>
-#include <test/util/setup_common.h>
+#include <util/byte_units.h>
 
 #include <boost/test/unit_test.hpp>
 
-#include <cstdint>
-#include <optional>
-
 BOOST_AUTO_TEST_SUITE(system_ram_tests)
 
 BOOST_AUTO_TEST_CASE(total_ram)
 {
-    const auto total{GetTotalRAM()};
-    if (!total) {
-        BOOST_WARN_MESSAGE(false, "skipping total_ram: total RAM unknown");
-        return;
-    }
-
-    BOOST_CHECK_GE(*total, 1000_MiB);
+    const auto total{TryGetTotalRam()};
+    BOOST_REQUIRE(total);
+    BOOST_CHECK_GE(*total, 1_GiB);
     BOOST_CHECK_LT(*total, 10'000_GiB); // ~10 TiB memory is unlikely
 }
 
diff --git a/depend/bitcoin/src/test/system_tests.cpp b/depend/bitcoin/src/test/system_tests.cpp
index 408666d6..0a6711fb 100644
--- a/depend/bitcoin/src/test/system_tests.cpp
+++ b/depend/bitcoin/src/test/system_tests.cpp
@@ -3,41 +3,67 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
 
-#include <bitcoin-build-config.h> // IWYU pragma: keep
-
 #include <common/run_command.h>
 #include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <univalue.h>
 #include <util/string.h>
 
-#ifdef ENABLE_EXTERNAL_SIGNER
+#include <cstdlib>
+#include <iostream>
+#include <string_view>
+
 #include <util/subprocess.h>
-#endif // ENABLE_EXTERNAL_SIGNER
 
-#include <boost/cstdlib.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <string>
 
-BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup)
+namespace {
+// When set in the environment, test_bitcoin acts as a mock subprocess for the
+// run_command test below instead of running unit tests.
+constexpr const char* MOCK_PROCESS_ENV = "BITCOIN_TEST_MOCK_PROCESS";
+
+const bool g_maybe_run_mock_dispatcher_before_main{[]() {
+    const char* name = std::getenv(MOCK_PROCESS_ENV);
+    if (!name) return false;
+    const std::string_view n{name};
+    if (n == "valid_json") {
+        std::cout << R"({"success": true})" << std::endl;
+        std::_Exit(EXIT_SUCCESS);
+    }
+    if (n == "nonzeroexit_nooutput") {
+        std::_Exit(EXIT_FAILURE);
+    }
+    if (n == "nonzeroexit_stderroutput") {
+        std::cerr << "err" << std::endl;
+        std::_Exit(EXIT_FAILURE);
+    }
+    if (n == "invalid_json") {
+        std::cout << "{" << std::endl;
+        std::_Exit(EXIT_SUCCESS);
+    }
+    if (n == "pass_stdin_to_stdout") {
+        std::string s;
+        std::getline(std::cin, s);
+        std::cout << s << std::endl;
+        std::_Exit(EXIT_SUCCESS);
+    }
+    std::cerr << "Unknown mock process: " << n << std::endl;
+    std::_Exit(EXIT_FAILURE);
+}()};
+} // namespace
 
-#ifdef ENABLE_EXTERNAL_SIGNER
+BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup)
 
-static std::vector<std::string> mock_executable(std::string name)
+static std::vector<std::string> mock_executable(const std::string& name)
 {
-    // Invoke the mock_process/* test case with all unsolicited output suppressed.
-    return {
-        boost::unit_test::framework::master_test_suite().argv[0],
-        // Disable false-positive memory leak dumps to stderr
-        // in debug builds when using the Windows UCRT.
-        "--detect_memory_leaks=0",
-        // Disable logging to stdout.
-        "--log_level=nothing",
-        // Disable the test report to stderr.
-        "--report_level=no",
-        "--run_test=mock_process/" + name,
-    };
+#if defined(WIN32)
+    _putenv_s(MOCK_PROCESS_ENV, name.c_str());
+#else
+    setenv(MOCK_PROCESS_ENV, name.c_str(), /*overwrite=*/1);
+#endif
+    return {boost::unit_test::framework::master_test_suite().argv[0]};
 }
 
 BOOST_AUTO_TEST_CASE(run_command)
@@ -67,7 +93,7 @@ BOOST_AUTO_TEST_CASE(run_command)
         const std::vector<std::string> command = mock_executable("nonzeroexit_nooutput");
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
             const std::string what{e.what()};
-            BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %d: \n", util::Join(command, " "), boost::exit_test_failure)) != std::string::npos);
+            BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %d: \n", util::Join(command, " "), EXIT_FAILURE)) != std::string::npos);
             return true;
         });
     }
@@ -77,7 +103,7 @@ BOOST_AUTO_TEST_CASE(run_command)
         const std::string expected{"err"};
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
             const std::string what(e.what());
-            BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %s: %s", util::Join(command, " "), boost::exit_test_failure, "err")) != std::string::npos);
+            BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %s: %s", util::Join(command, " "), EXIT_FAILURE, "err")) != std::string::npos);
             BOOST_CHECK(what.find(expected) != std::string::npos);
             return true;
         });
@@ -95,6 +121,5 @@ BOOST_AUTO_TEST_CASE(run_command)
         BOOST_CHECK_EQUAL(success.get_bool(), true);
     }
 }
-#endif // ENABLE_EXTERNAL_SIGNER
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/testnet4_miner_tests.cpp b/depend/bitcoin/src/test/testnet4_miner_tests.cpp
index 1bfc19db..ecaec1d1 100644
--- a/depend/bitcoin/src/test/testnet4_miner_tests.cpp
+++ b/depend/bitcoin/src/test/testnet4_miner_tests.cpp
@@ -2,9 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <common/system.h>
+#include <chain.h>
 #include <interfaces/mining.h>
-#include <node/miner.h>
+#include <node/mining_types.h>
+#include <primitives/block.h>
+#include <sync.h>
 #include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <test/util/time.h>
@@ -13,9 +15,10 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include <memory>
+
 using interfaces::BlockTemplate;
 using interfaces::Mining;
-using node::BlockAssembler;
 using node::BlockWaitOptions;
 
 namespace testnet4_miner_tests {
@@ -35,15 +38,13 @@ BOOST_AUTO_TEST_CASE(MiningInterface)
     auto mining{MakeMining()};
     BOOST_REQUIRE(mining);
 
-    BlockAssembler::Options options;
-    options.include_dummy_extranonce = true;
     std::unique_ptr<BlockTemplate> block_template;
 
     // Set node time a few minutes past the testnet4 genesis block
     const auto template_time{3min + WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->Time())};
-    NodeClockContext clock_ctx{template_time};
+    FakeNodeClock clock{template_time};
 
-    block_template = mining->createNewBlock(options, /*cooldown=*/false);
+    block_template = mining->createNewBlock({}, /*cooldown=*/false);
     BOOST_REQUIRE(block_template);
 
     // The template should use the mocked system time
@@ -56,14 +57,14 @@ BOOST_AUTO_TEST_CASE(MiningInterface)
     BOOST_REQUIRE(should_be_nullptr == nullptr);
 
     // This remains the case when exactly 20 minutes have gone by
-    clock_ctx += 17min;
+    clock += 17min;
     should_be_nullptr = block_template->waitNext(wait_options);
     BOOST_REQUIRE(should_be_nullptr == nullptr);
 
     // One second later the difficulty drops and it returns a new template
     // Note that we can't test the actual difficulty change, because the
     // difficulty is already at 1.
-    clock_ctx += 1s;
+    clock += 1s;
     block_template = block_template->waitNext(wait_options);
     BOOST_REQUIRE(block_template);
 }
diff --git a/depend/bitcoin/src/test/transaction_tests.cpp b/depend/bitcoin/src/test/transaction_tests.cpp
index a8a596f5..cd81c344 100644
--- a/depend/bitcoin/src/test/transaction_tests.cpp
+++ b/depend/bitcoin/src/test/transaction_tests.cpp
@@ -382,7 +382,8 @@ BOOST_AUTO_TEST_CASE(basic_transaction_tests)
     CMutableTransaction tx;
     SpanReader{vch} >> TX_WITH_WITNESS(tx);
     TxValidationState state;
-    BOOST_CHECK_MESSAGE(CheckTransaction(CTransaction(tx), state) && state.IsValid(), "Simple deserialized transaction should be valid.");
+    BOOST_CHECK_MESSAGE(CheckTransaction(CTransaction(tx), state), "Simple deserialized transaction should be valid.");
+    BOOST_CHECK_MESSAGE(state.IsValid(), "Simple deserialized transaction should be valid.");
 
     // Check that duplicate txins fail
     tx.vin.push_back(tx.vin[0]);
@@ -1089,6 +1090,7 @@ BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
     AddCoins(coins, CTransaction(tx_create_p2pk), 0, false);
 
     // The transaction now contains exactly 2500 sigops, the check should pass.
+    BOOST_CHECK_EQUAL(p2sh_inputs_count * MAX_P2SH_SIGOPS + p2pk_inputs_count * 1, MAX_TX_LEGACY_SIGOPS);
     BOOST_CHECK(::ValidateInputsStandardness(CTransaction(tx_max_sigops), coins).IsValid());
 
     // Now, add some Segwit inputs. We add one for each defined Segwit output type. The limit
diff --git a/depend/bitcoin/src/test/txgraph_tests.cpp b/depend/bitcoin/src/test/txgraph_tests.cpp
index 444e2185..d29eb725 100644
--- a/depend/bitcoin/src/test/txgraph_tests.cpp
+++ b/depend/bitcoin/src/test/txgraph_tests.cpp
@@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(txgraph_trim_big_singletons)
     BOOST_CHECK(graph->IsOversized(TxGraph::Level::TOP));
 
     // Call Trim() to remove transactions and bring the cluster back within limits.
-    auto removed_refs = graph->Trim();
+    graph->Trim();
     graph->SanityCheck();
     BOOST_CHECK_EQUAL(graph->GetTransactionCount(TxGraph::Level::TOP), NUM_TOTAL_TX - 6);
     BOOST_CHECK(!graph->IsOversized(TxGraph::Level::TOP));
diff --git a/depend/bitcoin/src/test/txindex_tests.cpp b/depend/bitcoin/src/test/txindex_tests.cpp
index 46711e08..9254adbd 100644
--- a/depend/bitcoin/src/test/txindex_tests.cpp
+++ b/depend/bitcoin/src/test/txindex_tests.cpp
@@ -3,28 +3,144 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <addresstype.h>
+#include <chain.h>
 #include <chainparams.h>
+#include <common/args.h>
+#include <consensus/amount.h>
+#include <consensus/validation.h>
+#include <crypto/hex_base.h>
+#include <dbwrapper.h>
+#include <flatfile.h>
+#include <index/disktxpos.h>
 #include <index/txindex.h>
+#include <index/txindex_key.h>
 #include <interfaces/chain.h>
+#include <key.h>
+#include <node/blockstorage.h>
+#include <primitives/block.h>
+#include <script/script.h>
+#include <streams.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
 #include <util/byte_units.h>
+#include <util/check.h>
+#include <util/strencodings.h>
 #include <validation.h>
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
 #include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_SUITE(txindex_tests)
 
+// Grants tests access to the otherwise non-public txindex database handle.
+class TxIndexTest
+{
+public:
+    static CDBWrapper& GetDB(const TxIndex& txindex) { return txindex.GetDB(); }
+    static CBlockLocator ReadBestBlock(const TxIndex& txindex) { return txindex.GetDB().ReadBestBlock(); }
+    static void WriteBestBlock(const TxIndex& txindex, const CBlockLocator& locator)
+    {
+        auto& db{txindex.GetDB()};
+        CDBBatch batch{db};
+        db.WriteBestBlock(batch, locator);
+        db.WriteBatch(batch);
+    }
+};
+
+namespace {
+
+SipHasher13UJ ReadHasher(const CDBWrapper& db)
+{
+    std::pair<uint64_t, uint64_t> salt;
+    BOOST_REQUIRE(db.Read(txindex::DB_TXID_HASH_SALT, salt));
+    return SipHasher13UJ{salt.first, salt.second};
+}
+
+std::vector<txindex::BlockTxPosition> BucketPositions(CDBWrapper& db, txindex::TxHashKeyPrefix prefix)
+{
+    std::vector<txindex::BlockTxPosition> positions;
+    std::unique_ptr<CDBIterator> it{db.NewIterator()};
+    txindex::DBKey key{prefix, {}};
+    for (it->Seek(key); it->Valid() && it->GetKey(key) && key.hash_prefix == prefix; it->Next()) {
+        positions.push_back(key.pos);
+    }
+    return positions;
+}
+
+FlatFilePos BlockFilePos(const ChainstateManager& chainman, uint32_t height)
+{
+    LOCK(cs_main);
+    const CBlockIndex* block_index{chainman.ActiveChain()[height]};
+    BOOST_REQUIRE(block_index);
+    return {block_index->nFile, block_index->nDataPos};
+}
+
+uint256 LookupTx(const TxIndex& txindex, const Txid& txid)
+{
+    const auto result{txindex.FindTx(txid)};
+    BOOST_REQUIRE(result);
+    BOOST_CHECK(result->tx->GetHash() == txid);
+    return result->block_hash;
+}
+
+void InvalidateBlock(ChainstateManager& chainman, const uint256& block_hash)
+{
+    CBlockIndex* block_index{WITH_LOCK(cs_main, return chainman.m_blockman.LookupBlockIndex(block_hash))};
+    BOOST_REQUIRE(block_index);
+    BlockValidationState state;
+    BOOST_REQUIRE(chainman.ActiveChainstate().InvalidateBlock(state, block_index));
+}
+
+} // namespace
+
+BOOST_AUTO_TEST_CASE(txindex_position_encoding)
+{
+    constexpr struct { txindex::BlockTxPosition position; std::string_view encoded; } test_vectors[]{
+        {{0, 0}, "00000000"},
+        {{1, 2}, "01000002"},
+        {{10'000'000, 123}, "83e1ac0000007b"},
+        {{456, 3'999'999}, "82483d08ff"},
+    };
+
+    for (const auto& [position, encoded] : test_vectors) {
+        BOOST_CHECK_EQUAL(HexStr(DataStream{} << position), encoded);
+
+        txindex::BlockTxPosition decoded;
+        BOOST_CHECK((DataStream{ParseHex(encoded)} >> decoded).empty());
+        BOOST_CHECK(decoded == position);
+    }
+
+    // Pin the full key encodings, including the type prefixes.
+    BOOST_CHECK_EQUAL(HexStr(DataStream{} << txindex::BlockSeqKey{1}), "7301");
+    BOOST_CHECK_EQUAL(HexStr(DataStream{} << txindex::DBKey{0x0102030405, {1, 2}}),
+                      "78010203040501000002");
+
+    BOOST_CHECK_EQUAL(txindex::BLOCK_HEADER_SIZE, GetSerializeSize(CBlockHeader{}));
+}
+
+BOOST_AUTO_TEST_CASE(txindex_hash_prefix)
+{
+    BOOST_CHECK_EQUAL(
+        txindex::CreateKeyPrefix(
+            SipHasher13UJ{0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL},
+            Txid{"1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100"}),
+        0xc67d87b08cULL);
+}
+
 BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
 {
-    TxIndex txindex(interfaces::MakeChain(m_node), 1_MiB, true);
+    TxIndex txindex(interfaces::MakeChain(m_node), /*n_cache_size=*/1_MiB, /*f_memory=*/true);
     BOOST_REQUIRE(txindex.Init());
 
-    CTransactionRef tx_disk;
-    uint256 block_hash;
-
     // Transaction should not be found in the index before it is started.
     for (const auto& txn : m_coinbase_txns) {
-        BOOST_CHECK(!txindex.FindTx(txn->GetHash(), block_hash, tx_disk));
+        BOOST_CHECK(!txindex.FindTx(txn->GetHash()));
     }
 
     // BlockUntilSyncedToCurrentChain should return false before txindex is started.
@@ -35,16 +151,12 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
     // Check that txindex excludes genesis block transactions.
     const CBlock& genesis_block = Params().GenesisBlock();
     for (const auto& txn : genesis_block.vtx) {
-        BOOST_CHECK(!txindex.FindTx(txn->GetHash(), block_hash, tx_disk));
+        BOOST_CHECK(!txindex.FindTx(txn->GetHash()));
     }
 
     // Check that txindex has all txs that were in the chain before it started.
     for (const auto& txn : m_coinbase_txns) {
-        if (!txindex.FindTx(txn->GetHash(), block_hash, tx_disk)) {
-            BOOST_ERROR("FindTx failed");
-        } else if (tx_disk->GetHash() != txn->GetHash()) {
-            BOOST_ERROR("Read incorrect tx");
-        }
+        LookupTx(txindex, txn->GetHash());
     }
 
     // Check that new transactions in new blocks make it into the index.
@@ -55,15 +167,189 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
         const CTransaction& txn = *block.vtx[0];
 
         BOOST_CHECK(txindex.BlockUntilSyncedToCurrentChain());
-        if (!txindex.FindTx(txn.GetHash(), block_hash, tx_disk)) {
-            BOOST_ERROR("FindTx failed");
-        } else if (tx_disk->GetHash() != txn.GetHash()) {
-            BOOST_ERROR("Read incorrect tx");
-        }
+        LookupTx(txindex, txn.GetHash());
     }
 
     // shutdown sequence (c.f. Shutdown() in init.cpp)
     txindex.Stop();
 }
 
+BOOST_FIXTURE_TEST_CASE(txindex_collision_scan_path, TestChain100Setup)
+{
+    // On-disk, so the legacy-entry probe at construction runs against a fresh
+    // database, as it would on a node whose index was created by this version.
+    TxIndex txindex(interfaces::MakeChain(m_node), /*n_cache_size=*/1_MiB, /*f_memory=*/false);
+    BOOST_REQUIRE(txindex.Init());
+    txindex.Sync();
+
+    CDBWrapper& db{TxIndexTest::GetDB(txindex)};
+    const SipHasher13UJ hasher{ReadHasher(db)};
+
+    // Lookups scan candidates in descending sequence order, so entries of
+    // later-connected blocks are tried first. Forge a colliding entry under the
+    // first coinbase's prefix pointing at the last coinbase, so looking up the
+    // first tx must scan that false positive first.
+    const Txid fake_txid{m_coinbase_txns.back()->GetHash()};
+    const Txid target_txid{m_coinbase_txns.front()->GetHash()};
+    const auto fake_prefix{txindex::CreateKeyPrefix(hasher, fake_txid)};
+    const auto target_prefix{txindex::CreateKeyPrefix(hasher, target_txid)};
+    // Distinct prefixes guarantee the target's bucket initially holds only the target.
+    BOOST_REQUIRE(fake_prefix != target_prefix);
+
+    // Read the last coinbase's encoded position straight from its bucket.
+    const auto fake_bucket{BucketPositions(db, fake_prefix)};
+    BOOST_REQUIRE_EQUAL(fake_bucket.size(), 1U);
+    const txindex::BlockTxPosition fake_pos{fake_bucket.front()};
+
+    db.Write(txindex::DBKey{target_prefix, fake_pos}, txindex::EMPTY_VALUE);
+
+    // The target's bucket now holds the real target first (lower sequence
+    // number), then the forged false positive, which the descending scan tries first.
+    const auto target_bucket{BucketPositions(db, target_prefix)};
+    BOOST_REQUIRE_EQUAL(target_bucket.size(), 2U);
+    BOOST_CHECK(target_bucket[0] != fake_pos);
+    BOOST_CHECK(target_bucket[1] == fake_pos);
+
+    LookupTx(txindex, target_txid);
+
+    // A database created fresh by this version cannot contain legacy entries, so
+    // lookups skip the legacy fallback: drop the last coinbase's hashed entry and
+    // re-add it under the old 't' + txid schema (a physical CDiskTxPos), then
+    // confirm the lookup misses even though the legacy row exists.
+    // BlockTxPosition offsets are from the block start (header included), while
+    // the legacy CDiskTxPos.nTxOffset is measured after the header.
+    const CDiskTxPos fake_physical{BlockFilePos(*m_node.chainman, fake_pos.block_seq + 1), fake_pos.tx_offset_in_block - txindex::BLOCK_HEADER_SIZE};
+    db.Erase(txindex::DBKey{fake_prefix, fake_pos});
+    db.Write(txindex::LegacyTxKey(fake_txid), fake_physical);
+    BOOST_CHECK(!txindex.FindTx(fake_txid));
+
+    txindex.Stop();
+}
+
+BOOST_FIXTURE_TEST_CASE(txindex_legacy_fallback, TestChain100Setup)
+{
+    // Seed the on-disk database with a legacy ('t' + txid) entry before the index
+    // is opened, as if it had been written by a pre-hashing version.
+    const Txid legacy_txid{m_coinbase_txns.front()->GetHash()};
+    // The block at height 1 holds only the coinbase, so the tx starts right after
+    // the header and the 1-byte tx count.
+    const CDiskTxPos legacy_pos{BlockFilePos(*m_node.chainman, 1), 1};
+    {
+        CDBWrapper db{DBParams{.path = gArgs.GetDataDirNet() / "indexes" / "txindex", .cache_bytes = 1_MiB}};
+        db.Write(txindex::LegacyTxKey(legacy_txid), legacy_pos);
+    }
+
+    TxIndex txindex(interfaces::MakeChain(m_node), /*n_cache_size=*/1_MiB, /*f_memory=*/false);
+    BOOST_REQUIRE(txindex.Init());
+    txindex.Sync();
+
+    // Drop the hashed entries so only the legacy row remains, then confirm the
+    // lookup succeeds through the fallback.
+    CDBWrapper& db{TxIndexTest::GetDB(txindex)};
+    const auto prefix{txindex::CreateKeyPrefix(ReadHasher(db), legacy_txid)};
+    const auto bucket{BucketPositions(db, prefix)};
+    BOOST_REQUIRE(!bucket.empty());
+    for (const auto& pos : bucket) db.Erase(txindex::DBKey{prefix, pos});
+
+    LookupTx(txindex, legacy_txid);
+
+    txindex.Stop();
+}
+
+BOOST_FIXTURE_TEST_CASE(txindex_locator_upgrade, TestChain100Setup)
+{
+    uint256 legacy_hash, new_hash;
+    {
+        LOCK(cs_main);
+        legacy_hash = Assert(m_node.chainman->ActiveChain()[1])->GetBlockHash();
+        new_hash = Assert(m_node.chainman->ActiveChain().Tip())->GetBlockHash();
+    }
+    CBlockLocator legacy_locator{{legacy_hash}}, new_locator{{new_hash}};
+    { CDBWrapper{DBParams{.path = gArgs.GetDataDirNet() / "indexes" / "txindex", .cache_bytes = 1_MiB}}.Write(uint8_t{'B'}, legacy_locator); }
+
+    TxIndex txindex(interfaces::MakeChain(m_node), /*n_cache_size=*/1_MiB, /*f_memory=*/false);
+    BOOST_CHECK(TxIndexTest::ReadBestBlock(txindex).vHave == legacy_locator.vHave);
+
+    TxIndexTest::WriteBestBlock(txindex, new_locator);
+    BOOST_CHECK(TxIndexTest::ReadBestBlock(txindex).vHave == new_locator.vHave);
+
+    CBlockLocator stored_legacy_locator;
+    BOOST_REQUIRE(TxIndexTest::GetDB(txindex).Read(uint8_t{'B'}, stored_legacy_locator));
+    BOOST_CHECK(stored_legacy_locator.vHave == legacy_locator.vHave);
+}
+
+BOOST_FIXTURE_TEST_CASE(txindex_reorg_keeps_stale_entries, TestChain100Setup)
+{
+    TxIndex txindex(interfaces::MakeChain(m_node), /*n_cache_size=*/1_MiB, /*f_memory=*/true);
+    BOOST_REQUIRE(txindex.Init());
+    txindex.Sync();
+
+    const CScript coinbase_script{CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG};
+
+    // Mine a unique (non-coinbase) transaction into a new block at height 101.
+    CMutableTransaction unique_mtx{CreateValidMempoolTransaction(
+        /*input_transaction=*/m_coinbase_txns[0],
+        /*input_vout=*/0,
+        /*input_height=*/1,
+        /*input_signing_key=*/coinbaseKey,
+        /*output_destination=*/CScript() << OP_TRUE,
+        /*output_amount=*/CAmount{1 * COIN},
+        /*submit=*/false)};
+    const Txid unique_txid{MakeTransactionRef(unique_mtx)->GetHash()};
+    const uint256 stale_block_hash{CreateAndProcessBlock({unique_mtx}, coinbase_script).GetHash()};
+    BOOST_REQUIRE(txindex.BlockUntilSyncedToCurrentChain());
+
+    BOOST_CHECK(LookupTx(txindex, unique_txid) == stale_block_hash);
+
+    CDBWrapper& db{TxIndexTest::GetDB(txindex)};
+    const auto prefix{txindex::CreateKeyPrefix(ReadHasher(db), unique_txid)};
+    const auto original_bucket{BucketPositions(db, prefix)};
+    BOOST_REQUIRE_EQUAL(original_bucket.size(), 1U);
+
+    ChainstateManager& chainman{*m_node.chainman};
+
+    // Invalidate the block holding the unique transaction.
+    InvalidateBlock(chainman, stale_block_hash);
+    BOOST_REQUIRE(txindex.BlockUntilSyncedToCurrentChain());
+
+    // The disconnected transaction is still found, in the now-stale block.
+    BOOST_CHECK(LookupTx(txindex, unique_txid) == stale_block_hash);
+    {
+        LOCK(cs_main);
+        const CBlockIndex* stale_index{chainman.m_blockman.LookupBlockIndex(stale_block_hash)};
+        BOOST_REQUIRE(stale_index);
+        BOOST_CHECK(!chainman.ActiveChain().Contains(*stale_index));
+    }
+
+    // Mine the same transaction into a replacement branch, which gets a later
+    // sequence number. The lookup must now return the branch block in the active chain.
+    const uint256 branch_block_hash{CreateAndProcessBlock({unique_mtx}, CScript() << OP_TRUE).GetHash()};
+    CreateAndProcessBlock({}, coinbase_script);
+    BOOST_REQUIRE(txindex.BlockUntilSyncedToCurrentChain());
+    BOOST_CHECK(LookupTx(txindex, unique_txid) == branch_block_hash);
+
+    // Reorg back to the original branch. The original branch block must be
+    // now be preferred even though the replacement branch has a later sequence.
+    {
+        LOCK(cs_main);
+        chainman.ActiveChainstate().ResetBlockFailureFlags(chainman.m_blockman.LookupBlockIndex(stale_block_hash));
+    }
+    InvalidateBlock(chainman, branch_block_hash);
+    {
+        BlockValidationState state;
+        BOOST_REQUIRE(chainman.ActiveChainstate().ActivateBestChain(state));
+    }
+    BOOST_REQUIRE(txindex.BlockUntilSyncedToCurrentChain());
+    BOOST_CHECK(WITH_LOCK(cs_main, return chainman.ActiveChain().Tip()->GetBlockHash()) == stale_block_hash);
+
+    BOOST_CHECK(LookupTx(txindex, unique_txid) == stale_block_hash);
+
+    // Reconnecting the original block must not create duplicate entries.
+    const auto reorg_bucket{BucketPositions(db, prefix)};
+    BOOST_REQUIRE_EQUAL(reorg_bucket.size(), 2U);
+    BOOST_CHECK(reorg_bucket.front() == original_bucket.front());
+
+    txindex.Stop();
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/txpackage_tests.cpp b/depend/bitcoin/src/test/txpackage_tests.cpp
index 06c5816b..781d242f 100644
--- a/depend/bitcoin/src/test/txpackage_tests.cpp
+++ b/depend/bitcoin/src/test/txpackage_tests.cpp
@@ -1161,7 +1161,8 @@ BOOST_AUTO_TEST_CASE(package_rbf_tests)
             child_key, child_spk, coinbase_value - 199 - 1300, /*submit=*/false));
 
         // In all packages, the parents conflict with each other
-        BOOST_CHECK(tx_parent_1->GetHash() != tx_parent_2->GetHash() && tx_parent_2->GetHash() != tx_parent_3->GetHash());
+        BOOST_CHECK(tx_parent_1->GetHash() != tx_parent_2->GetHash());
+        BOOST_CHECK(tx_parent_2->GetHash() != tx_parent_3->GetHash());
 
         // 1 parent paying 200sat, 1 child paying 200sat.
         Package package1{tx_parent_1, tx_child_1};
diff --git a/depend/bitcoin/src/test/util/CMakeLists.txt b/depend/bitcoin/src/test/util/CMakeLists.txt
index 5d9832fc..2658809d 100644
--- a/depend/bitcoin/src/test/util/CMakeLists.txt
+++ b/depend/bitcoin/src/test/util/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(test_util STATIC EXCLUDE_FROM_ALL
 target_link_libraries(test_util
   PRIVATE
     core_interface
-    Boost::headers
+    $<TARGET_NAME_IF_EXISTS:Boost::headers>
     $<$<BOOL:${ENABLE_WALLET}>:SQLite3::SQLite3>
   PUBLIC
     univalue
diff --git a/depend/bitcoin/src/test/util/chainstate.h b/depend/bitcoin/src/test/util/chainstate.h
index db11d565..7846726d 100644
--- a/depend/bitcoin/src/test/util/chainstate.h
+++ b/depend/bitcoin/src/test/util/chainstate.h
@@ -6,18 +6,18 @@
 #define BITCOIN_TEST_UTIL_CHAINSTATE_H
 
 #include <clientversion.h>
-#include <logging.h>
 #include <node/context.h>
 #include <node/utxo_snapshot.h>
 #include <rpc/blockchain.h>
 #include <test/util/setup_common.h>
 #include <util/byte_units.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <univalue.h>
 
-const auto NoMalleation = [](AutoFile& file, node::SnapshotMetadata& meta){};
+inline constexpr auto NoMalleation = [](AutoFile& file, node::SnapshotMetadata& meta){};
 
 /**
  * Create and activate a UTXO snapshot, optionally providing a function to
@@ -80,7 +80,7 @@ CreateAndActivateUTXOSnapshot(
             node.chainman->ResetChainstates();
             node.chainman->InitializeChainstate(node.mempool.get());
             Chainstate& chain = node.chainman->ActiveChainstate();
-            Assert(chain.LoadGenesisBlock());
+            Assert(node.chainman->LoadGenesisBlock());
             // These cache values will be corrected shortly in `MaybeRebalanceCaches`.
             chain.InitCoinsDB(1_MiB, /*in_memory=*/true, /*should_wipe=*/false);
             chain.InitCoinsCache(1_MiB);
diff --git a/depend/bitcoin/src/test/util/cluster_linearize.h b/depend/bitcoin/src/test/util/cluster_linearize.h
index b3f639e8..6e2ae130 100644
--- a/depend/bitcoin/src/test/util/cluster_linearize.h
+++ b/depend/bitcoin/src/test/util/cluster_linearize.h
@@ -17,9 +17,7 @@
 #include <utility>
 #include <vector>
 
-namespace {
-
-using namespace cluster_linearize;
+namespace cluster_linearize {
 
 using TestBitSet = BitSet<32>;
 
@@ -99,7 +97,7 @@ using TestBitSet = BitSet<32>;
 struct DepGraphFormatter
 {
     /** Convert x>=0 to 2x (even), x<0 to -2x-1 (odd). */
-    [[maybe_unused]] static uint64_t SignedToUnsigned(int64_t x) noexcept
+    static uint64_t SignedToUnsigned(int64_t x) noexcept
     {
         if (x < 0) {
             return 2 * uint64_t(-(x + 1)) + 1;
@@ -109,7 +107,7 @@ struct DepGraphFormatter
     }
 
     /** Convert even x to x/2 (>=0), odd x to -(x/2)-1 (<0). */
-    [[maybe_unused]] static int64_t UnsignedToSigned(uint64_t x) noexcept
+    static int64_t UnsignedToSigned(uint64_t x) noexcept
     {
         if (x & 1) {
             return -int64_t(x / 2) - 1;
@@ -416,6 +414,6 @@ inline uint64_t MaxOptimalLinearizationCost(DepGraphIndex cluster_count)
     return COSTS[cluster_count] * 2;
 }
 
-} // namespace
+} // namespace cluster_linearize
 
 #endif // BITCOIN_TEST_UTIL_CLUSTER_LINEARIZE_H
diff --git a/depend/bitcoin/src/test/util/logging.h b/depend/bitcoin/src/test/util/logging.h
index ed3ee19e..6df208d8 100644
--- a/depend/bitcoin/src/test/util/logging.h
+++ b/depend/bitcoin/src/test/util/logging.h
@@ -39,6 +39,6 @@ class DebugLogHelper
     MatchFn m_match;
 };
 
-#define ASSERT_DEBUG_LOG(message) DebugLogHelper UNIQUE_NAME(debugloghelper)(message)
+#define ASSERT_DEBUG_LOG(message) DebugLogHelper BITCOIN_UNIQUE_NAME(debugloghelper)(message)
 
 #endif // BITCOIN_TEST_UTIL_LOGGING_H
diff --git a/depend/bitcoin/src/test/util/mining.cpp b/depend/bitcoin/src/test/util/mining.cpp
index c4823bce..45436de1 100644
--- a/depend/bitcoin/src/test/util/mining.cpp
+++ b/depend/bitcoin/src/test/util/mining.cpp
@@ -4,34 +4,40 @@
 
 #include <test/util/mining.h>
 
+#include <addresstype.h>
+#include <chain.h>
 #include <chainparams.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
+#include <interfaces/mining.h>
 #include <key_io.h>
 #include <node/context.h>
 #include <pow.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/script.h>
+#include <uint256.h>
 #include <util/check.h>
 #include <validation.h>
 #include <validationinterface.h>
 #include <versionbits.h>
 
-#include <algorithm>
+#include <cstdint>
 #include <memory>
+#include <optional>
+#include <utility>
 
-using node::BlockAssembler;
 using node::NodeContext;
 
 COutPoint generatetoaddress(const NodeContext& node, const std::string& address)
 {
     const auto dest = DecodeDestination(address);
     assert(IsValidDestination(dest));
-    BlockAssembler::Options assembler_options;
-    assembler_options.coinbase_output_script = GetScriptForDestination(dest);
-    assembler_options.include_dummy_extranonce = true;
-
-    return MineBlock(node, assembler_options);
+    return MineBlock(node, {
+        .coinbase_output_script = GetScriptForDestination(dest),
+    });
 }
 
 std::vector<std::shared_ptr<CBlock>> CreateBlockChain(size_t total_height, const CChainParams& params)
@@ -69,7 +75,48 @@ std::vector<std::shared_ptr<CBlock>> CreateBlockChain(size_t total_height, const
     return ret;
 }
 
-COutPoint MineBlock(const NodeContext& node, const node::BlockAssembler::Options& assembler_options)
+bool BuildChain(const NodeContext& node, const CBlockIndex* pindex,
+    const CScript& coinbase_script_pub_key,
+    size_t length,
+    std::vector<std::shared_ptr<CBlock>>& chain)
+{
+    auto mining{interfaces::MakeMining(node)};
+    const Consensus::Params& consensus{Assert(node.chainman)->GetConsensus()};
+
+    chain.resize(length);
+    for (auto& chain_block : chain) {
+        auto block_template{mining->createNewBlock({
+            .use_mempool = false,
+            .coinbase_output_script = coinbase_script_pub_key,
+        }, /*cooldown=*/false)};
+        CBlock block{Assert(block_template)->getBlock()};
+
+        // The template is built on the active tip, so repoint it at pindex and
+        // redo the fields that depend on the predecessor.
+        block.hashPrevBlock = pindex->GetBlockHash();
+        block.nTime = pindex->nTime + 1;
+        {
+            CMutableTransaction tx_coinbase{*block.vtx.at(0)};
+            tx_coinbase.nLockTime = static_cast<uint32_t>(pindex->nHeight);
+            tx_coinbase.vin.at(0).scriptSig = CScript{} << pindex->nHeight + 1;
+            block.vtx.at(0) = MakeTransactionRef(std::move(tx_coinbase));
+            block.hashMerkleRoot = BlockMerkleRoot(block);
+        }
+
+        while (!CheckProofOfWork(block.GetHash(), block.nBits, consensus)) ++block.nNonce;
+
+        chain_block = std::make_shared<CBlock>(std::move(block));
+
+        BlockValidationState state;
+        if (!Assert(node.chainman)->ProcessNewBlockHeaders({{*chain_block}}, true, state, &pindex)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+COutPoint MineBlock(const NodeContext& node, const node::BlockCreateOptions& assembler_options)
 {
     auto block = PrepareBlock(node, assembler_options);
     auto valid = MineBlock(node, block);
@@ -123,12 +170,11 @@ COutPoint ProcessBlock(const NodeContext& node, const std::shared_ptr<CBlock>& b
 }
 
 std::shared_ptr<CBlock> PrepareBlock(const NodeContext& node,
-                                     const BlockAssembler::Options& assembler_options)
+                                     const node::BlockCreateOptions& assembler_options)
 {
-    auto block = std::make_shared<CBlock>(
-        BlockAssembler{Assert(node.chainman)->ActiveChainstate(), Assert(node.mempool.get()), assembler_options}
-            .CreateNewBlock()
-            ->block);
+    auto mining = interfaces::MakeMining(node);
+    auto block_template = mining->createNewBlock(assembler_options, /*cooldown=*/false);
+    auto block = std::make_shared<CBlock>(Assert(block_template)->getBlock());
 
     LOCK(cs_main);
     block->nTime = Assert(node.chainman)->ActiveChain().Tip()->GetMedianTimePast() + 1;
@@ -136,11 +182,3 @@ std::shared_ptr<CBlock> PrepareBlock(const NodeContext& node,
 
     return block;
 }
-std::shared_ptr<CBlock> PrepareBlock(const NodeContext& node, const CScript& coinbase_scriptPubKey)
-{
-    BlockAssembler::Options assembler_options;
-    assembler_options.coinbase_output_script = coinbase_scriptPubKey;
-    assembler_options.include_dummy_extranonce = true;
-    ApplyArgsManOptions(*node.args, assembler_options);
-    return PrepareBlock(node, assembler_options);
-}
diff --git a/depend/bitcoin/src/test/util/mining.h b/depend/bitcoin/src/test/util/mining.h
index 9be01507..3effca7e 100644
--- a/depend/bitcoin/src/test/util/mining.h
+++ b/depend/bitcoin/src/test/util/mining.h
@@ -5,26 +5,34 @@
 #ifndef BITCOIN_TEST_UTIL_MINING_H
 #define BITCOIN_TEST_UTIL_MINING_H
 
-#include <node/miner.h>
-
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <vector>
 
 class CBlock;
+class CBlockIndex;
 class CChainParams;
 class COutPoint;
 class CScript;
 namespace node {
+struct BlockCreateOptions;
 struct NodeContext;
 } // namespace node
 
 /** Create a blockchain, starting from genesis */
 std::vector<std::shared_ptr<CBlock>> CreateBlockChain(size_t total_height, const CChainParams& params);
 
+/**
+ * Build a chain of `length` coinbase-only blocks on top of `pindex` (which need
+ * not be the active tip, allowing forks to be created) and submit their headers.
+ * The blocks themselves are returned in `chain` for the caller to process.
+ */
+bool BuildChain(const node::NodeContext& node, const CBlockIndex* pindex, const CScript& coinbase_script_pub_key, size_t length, std::vector<std::shared_ptr<CBlock>>& chain);
+
 /** Returns the generated coin */
 COutPoint MineBlock(const node::NodeContext&,
-                    const node::BlockAssembler::Options& assembler_options);
+                    const node::BlockCreateOptions& assembler_options);
 
 /**
  * Returns the generated coin (or Null if the block was invalid).
@@ -38,9 +46,8 @@ COutPoint MineBlock(const node::NodeContext&, std::shared_ptr<CBlock>& block);
 COutPoint ProcessBlock(const node::NodeContext&, const std::shared_ptr<CBlock>& block);
 
 /** Prepare a block to be mined */
-std::shared_ptr<CBlock> PrepareBlock(const node::NodeContext&);
 std::shared_ptr<CBlock> PrepareBlock(const node::NodeContext& node,
-                                     const node::BlockAssembler::Options& assembler_options);
+                                     const node::BlockCreateOptions& assembler_options);
 
 /** RPC-like helper function, returns the generated coin */
 COutPoint generatetoaddress(const node::NodeContext&, const std::string& address);
diff --git a/depend/bitcoin/src/test/util/net.cpp b/depend/bitcoin/src/test/util/net.cpp
index c4850c64..de1de042 100644
--- a/depend/bitcoin/src/test/util/net.cpp
+++ b/depend/bitcoin/src/test/util/net.cpp
@@ -56,7 +56,7 @@ void ConnmanTestMsg::Handshake(CNode& node,
     FlushSendBuffer(node); // Drop the verack message added by SendMessages.
     if (node.fDisconnect) return;
     assert(node.nVersion == version);
-    assert(node.GetCommonVersion() == std::min(version, PROTOCOL_VERSION));
+    assert(node.GetCommonVersion() == std::min(version, node.AdvertisedVersion()));
     CNodeStateStats statestats;
     assert(peerman.GetNodeStateStats(node.GetId(), statestats));
     assert(statestats.m_relay_txs == (relay_txs && !node.IsBlockOnlyConn()));
@@ -400,17 +400,17 @@ bool DynSock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_
     for (;;) {
         // Check all sockets for readiness without waiting.
         for (auto& [sock, events] : events_per_sock) {
-            if ((events.requested & Sock::SEND) != 0) {
+            if ((events.requested & Sock::SendEvent) != 0) {
                 // Always ready for Send().
-                events.occurred |= Sock::SEND;
+                events.occurred |= Sock::SendEvent;
                 at_least_one_event_occurred = true;
             }
 
-            if ((events.requested & Sock::RECV) != 0) {
+            if ((events.requested & Sock::RecvEvent) != 0) {
                 auto dyn_sock = reinterpret_cast<const DynSock*>(sock.get());
                 uint8_t b;
                 if (dyn_sock->m_pipes->recv.GetBytes(&b, 1, MSG_PEEK) == 1 || (dyn_sock->m_accept_sockets && !dyn_sock->m_accept_sockets->Empty())) {
-                    events.occurred |= Sock::RECV;
+                    events.occurred |= Sock::RecvEvent;
                     at_least_one_event_occurred = true;
                 }
             }
diff --git a/depend/bitcoin/src/test/util/net.h b/depend/bitcoin/src/test/util/net.h
index 8954e631..8014bbcc 100644
--- a/depend/bitcoin/src/test/util/net.h
+++ b/depend/bitcoin/src/test/util/net.h
@@ -118,7 +118,7 @@ struct ConnmanTestMsg : public CConnman {
         EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
 };
 
-constexpr ServiceFlags ALL_SERVICE_FLAGS[]{
+inline constexpr ServiceFlags ALL_SERVICE_FLAGS[]{
     NODE_NONE,
     NODE_NETWORK,
     NODE_BLOOM,
@@ -128,7 +128,7 @@ constexpr ServiceFlags ALL_SERVICE_FLAGS[]{
     NODE_P2P_V2,
 };
 
-constexpr NetPermissionFlags ALL_NET_PERMISSION_FLAGS[]{
+inline constexpr NetPermissionFlags ALL_NET_PERMISSION_FLAGS[]{
     NetPermissionFlags::None,
     NetPermissionFlags::BloomFilter,
     NetPermissionFlags::Relay,
@@ -141,7 +141,7 @@ constexpr NetPermissionFlags ALL_NET_PERMISSION_FLAGS[]{
     NetPermissionFlags::All,
 };
 
-constexpr ConnectionType ALL_CONNECTION_TYPES[]{
+inline constexpr ConnectionType ALL_CONNECTION_TYPES[]{
     ConnectionType::INBOUND,
     ConnectionType::OUTBOUND_FULL_RELAY,
     ConnectionType::MANUAL,
@@ -151,7 +151,7 @@ constexpr ConnectionType ALL_CONNECTION_TYPES[]{
     ConnectionType::PRIVATE_BROADCAST,
 };
 
-constexpr auto ALL_NETWORKS = std::array{
+inline constexpr auto ALL_NETWORKS = std::array{
     Network::NET_UNROUTABLE,
     Network::NET_IPV4,
     Network::NET_IPV6,
diff --git a/depend/bitcoin/src/test/util/random.cpp b/depend/bitcoin/src/test/util/random.cpp
index 90ddf66c..2df7de46 100644
--- a/depend/bitcoin/src/test/util/random.cpp
+++ b/depend/bitcoin/src/test/util/random.cpp
@@ -4,10 +4,10 @@
 
 #include <test/util/random.h>
 
-#include <logging.h>
 #include <random.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/depend/bitcoin/src/test/util/script.h b/depend/bitcoin/src/test/util/script.h
index 44d9acd9..e3b58118 100644
--- a/depend/bitcoin/src/test/util/script.h
+++ b/depend/bitcoin/src/test/util/script.h
@@ -9,8 +9,8 @@
 #include <script/script.h>
 #include <script/verify_flags.h>
 
-static const std::vector<uint8_t> WITNESS_STACK_ELEM_OP_TRUE{uint8_t{OP_TRUE}};
-static const CScript P2WSH_OP_TRUE{
+inline const std::vector<uint8_t> WITNESS_STACK_ELEM_OP_TRUE{uint8_t{OP_TRUE}};
+inline const CScript P2WSH_OP_TRUE{
     CScript{}
     << OP_0
     << ToByteVector([] {
@@ -19,8 +19,8 @@ static const CScript P2WSH_OP_TRUE{
            return hash;
        }())};
 
-static const std::vector<uint8_t> EMPTY{};
-static const CScript P2WSH_EMPTY{
+inline const std::vector<uint8_t> EMPTY{};
+inline const CScript P2WSH_EMPTY{
     CScript{}
     << OP_0
     << ToByteVector([] {
@@ -28,8 +28,8 @@ static const CScript P2WSH_EMPTY{
            CSHA256().Write(EMPTY.data(), EMPTY.size()).Finalize(hash.begin());
            return hash;
        }())};
-static const std::vector<std::vector<uint8_t>> P2WSH_EMPTY_TRUE_STACK{{static_cast<uint8_t>(OP_TRUE)}, {}};
-static const std::vector<std::vector<uint8_t>> P2WSH_EMPTY_TWO_STACK{{static_cast<uint8_t>(OP_2)}, {}};
+inline const std::vector<std::vector<uint8_t>> P2WSH_EMPTY_TRUE_STACK{{static_cast<uint8_t>(OP_TRUE)}, {}};
+inline const std::vector<std::vector<uint8_t>> P2WSH_EMPTY_TWO_STACK{{static_cast<uint8_t>(OP_2)}, {}};
 
 /** Flags that are not forbidden by an assert in script validation */
 bool IsValidFlagCombination(script_verify_flags flags);
diff --git a/depend/bitcoin/src/test/util/setup_common.cpp b/depend/bitcoin/src/test/util/setup_common.cpp
index 39c691c3..6c4d80fe 100644
--- a/depend/bitcoin/src/test/util/setup_common.cpp
+++ b/depend/bitcoin/src/test/util/setup_common.cpp
@@ -6,50 +6,68 @@
 
 #include <addrman.h>
 #include <banman.h>
+#include <chain.h>
 #include <chainparams.h>
+#include <coins.h>
 #include <common/system.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
-#include <consensus/params.h>
 #include <consensus/validation.h>
-#include <crypto/sha256.h>
+#include <crypto/hex_base.h>
+#include <dbwrapper.h>
 #include <init.h>
-#include <init/common.h>
 #include <interfaces/chain.h>
-#include <kernel/mempool_entry.h>
+#include <interfaces/mining.h>
+#include <kernel/caches.h>
+#include <kernel/context.h>
+#include <key.h>
 #include <logging.h>
 #include <net.h>
 #include <net_processing.h>
+#include <netbase.h>
+#include <netgroup.h>
 #include <node/blockstorage.h>
 #include <node/chainstate.h>
 #include <node/context.h>
 #include <node/kernel_notifications.h>
-#include <node/mempool_args.h>
 #include <node/miner.h>
+#include <node/mining_args.h>
+#include <node/mining_types.h>
 #include <node/peerman_args.h>
 #include <node/warnings.h>
 #include <noui.h>
-#include <policy/fees/block_policy_estimator.h>
+#include <policy/feerate.h>
+#include <policy/policy.h>
 #include <pow.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <random.h>
-#include <rpc/blockchain.h>
 #include <rpc/register.h>
 #include <rpc/server.h>
 #include <scheduler.h>
-#include <script/sigcache.h>
+#include <script/interpreter.h>
+#include <script/script.h>
+#include <script/sign.h>
+#include <script/signingprovider.h>
+#include <serialize.h>
+#include <span.h>
 #include <streams.h>
+#include <sync.h>
 #include <test/util/coverage.h>
 #include <test/util/net.h>
 #include <test/util/random.h>
-#include <test/util/transaction_utils.h>
 #include <test/util/txmempool.h>
-#include <txdb.h>
+#include <tinyformat.h>
 #include <txmempool.h>
+#include <uint256.h>
 #include <util/chaintype.h>
 #include <util/check.h>
+#include <util/fs.h>
 #include <util/fs_helpers.h>
 #include <util/rbf.h>
+#include <util/result.h>
+#include <util/signalinterrupt.h>
 #include <util/strencodings.h>
-#include <util/string.h>
 #include <util/task_runner.h>
 #include <util/thread.h>
 #include <util/threadnames.h>
@@ -58,16 +76,27 @@
 #include <util/vector.h>
 #include <validation.h>
 #include <validationinterface.h>
-#include <walletinitinterface.h>
 
 #include <algorithm>
-#include <future>
+#include <array>
+#include <atomic>
+#include <cstdlib>
+#include <deque>
 #include <functional>
+#include <future>
+#include <iostream>
+#include <iterator>
+#include <map>
+#include <numeric>
+#include <span>
 #include <stdexcept>
+#include <string_view>
+#include <thread>
+#include <tuple>
+#include <utility>
 
 using namespace util::hex_literals;
 using node::ApplyArgsManOptions;
-using node::BlockAssembler;
 using node::BlockManager;
 using node::KernelNotifications;
 using node::LoadChainstate;
@@ -136,7 +165,6 @@ BasicTestingSetup::BasicTestingSetup(const ChainType chainType, TestOpts opts)
             "-logthreadnames",
             "-loglevel=trace",
             "-debug",
-            "-debugexclude=libevent",
             "-debugexclude=leveldb",
         },
         opts.extra_args);
@@ -199,6 +227,10 @@ BasicTestingSetup::BasicTestingSetup(const ChainType chainType, TestOpts opts)
     m_args.ForceSetArg("-datadir", fs::PathToString(m_path_root));
     gArgs.ForceSetArg("-datadir", fs::PathToString(m_path_root));
 
+    // Avoid non-loopback network traffic during tests.
+    gArgs.ForceSetArg("-dnsseed", "0"); // DNS queries are usually forwarded to upstream DNS servers.
+    gArgs.ForceSetArg("-natpmp", "0"); // NATPMP sends packets to the router.
+
     SelectParams(chainType);
     InitLogging(*m_node.args);
     AppInitParameterInteraction(*m_node.args);
@@ -275,8 +307,10 @@ ChainTestingSetup::ChainTestingSetup(const ChainType chainType, TestOpts opts)
             .check_block_index = 1,
             .notifications = *m_node.notifications,
             .signals = m_node.validation_signals.get(),
-            // Use no worker threads while fuzzing to avoid non-determinism
+            // Use no worker threads while fuzzing to avoid racy non-determinism
+            // and dangling thread handles if AFL forks after initialization.
             .worker_threads_num = EnableFuzzDeterminism() ? 0 : 2,
+            .prevoutfetch_threads_num = EnableFuzzDeterminism() ? 0 : 2,
         };
         if (opts.min_validation_cache) {
             chainman_opts.script_execution_cache_bytes = 0;
@@ -331,6 +365,8 @@ void ChainTestingSetup::LoadVerifyActivateChainstate()
     std::tie(status, error) = VerifyLoadedChainstate(chainman, options);
     assert(status == node::ChainstateLoadStatus::SUCCESS);
 
+    m_node.notifications->setChainstateLoaded(true);
+
     BlockValidationState state;
     if (!chainman.ActiveChainstate().ActivateBestChain(state)) {
         throw std::runtime_error(strprintf("ActivateBestChain failed. (%s)", state.ToString()));
@@ -358,6 +394,9 @@ TestingSetup::TestingSetup(
                                                m_node.args->GetIntArg("-checkaddrman", 0));
     m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
     m_node.connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman, Params()); // Deterministic randomness for tests.
+    auto mining_args{node::ReadMiningArgs(*m_node.args)};
+    Assert(mining_args);
+    m_node.mining_args = std::move(*mining_args);
     PeerManager::Options peerman_opts;
     ApplyArgsManOptions(*m_node.args, peerman_opts);
     peerman_opts.deterministic_rng = true;
@@ -378,7 +417,6 @@ TestChain100Setup::TestChain100Setup(
     TestOpts opts)
     : TestingSetup{ChainType::REGTEST, opts}
 {
-    SetMockTime(1598887952);
     constexpr std::array<unsigned char, 32> vchKey = {
         {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}};
     coinbaseKey.Set(vchKey.begin(), vchKey.end(), true);
@@ -390,7 +428,7 @@ TestChain100Setup::TestChain100Setup(
         LOCK(::cs_main);
         assert(
             m_node.chainman->ActiveChain().Tip()->GetBlockHash().ToString() ==
-            "0c8c5f79505775a0f6aed6aca2350718ceb9c6f2c878667864d5c7a6d8ffa2a6");
+            "0ee6e270d6594249e548110619f7bd690695beb219b915da4a2e84e2b61ed60f");
     }
 }
 
@@ -400,20 +438,22 @@ void TestChain100Setup::mineBlocks(int num_blocks)
     for (int i = 0; i < num_blocks; i++) {
         std::vector<CMutableTransaction> noTxns;
         CBlock b = CreateAndProcessBlock(noTxns, scriptPubKey);
-        SetMockTime(GetTime() + 1);
+        m_clock += 1s;
         m_coinbase_txns.push_back(b.vtx[0]);
     }
 }
 
 CBlock TestChain100Setup::CreateBlock(
     const std::vector<CMutableTransaction>& txns,
-    const CScript& scriptPubKey,
-    Chainstate& chainstate)
+    const CScript& scriptPubKey)
 {
-    BlockAssembler::Options options;
-    options.coinbase_output_script = scriptPubKey;
-    options.include_dummy_extranonce = true;
-    CBlock block = BlockAssembler{chainstate, nullptr, options}.CreateNewBlock()->block;
+    auto mining{interfaces::MakeMining(m_node)};
+    auto block_template{mining->createNewBlock({
+        .use_mempool = false,
+        .coinbase_output_script = scriptPubKey,
+    }, /*cooldown=*/false)};
+    Assert(block_template);
+    CBlock block{block_template->getBlock()};
 
     Assert(block.vtx.size() == 1);
     for (const CMutableTransaction& tx : txns) {
@@ -428,14 +468,9 @@ CBlock TestChain100Setup::CreateBlock(
 
 CBlock TestChain100Setup::CreateAndProcessBlock(
     const std::vector<CMutableTransaction>& txns,
-    const CScript& scriptPubKey,
-    Chainstate* chainstate)
+    const CScript& scriptPubKey)
 {
-    if (!chainstate) {
-        chainstate = &Assert(m_node.chainman)->ActiveChainstate();
-    }
-
-    CBlock block = this->CreateBlock(txns, scriptPubKey, *chainstate);
+    CBlock block = this->CreateBlock(txns, scriptPubKey);
     std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
     Assert(m_node.chainman)->ProcessNewBlock(shared_pblock, true, true, nullptr);
 
@@ -605,6 +640,29 @@ std::vector<CTransactionRef> TestChain100Setup::PopulateMempool(FastRandomContex
     return mempool_transactions;
 }
 
+SocketTestingSetup::SocketTestingSetup()
+{
+    // HTTPServer is not integrated into NodeContext yet and still pulls global args.
+    // This is the IP address DynSock claims to be from when connecting.
+    gArgs.ForceSetArg("-rpcallowip", "5.5.5.5");
+
+    // "back up" the current CreateSock() so we can restore it after the test
+    m_create_sock_orig = CreateSock;
+
+    CreateSock = [this](int, int, int) {
+        // This is a mock Listening Socket that a server can "bind" to and
+        // listen to for incoming connections. We won't need to access its I/O
+        // pipes because we don't read or write directly to it. It will return
+        // Connected Sockets from the queue via its Accept() method.
+        return std::make_unique<DynSock>(std::make_shared<DynSock::Pipes>(), &m_accepted_sockets);
+    };
+};
+
+SocketTestingSetup::~SocketTestingSetup()
+{
+    CreateSock = m_create_sock_orig;
+}
+
 /**
  * @returns a real block (0000000000013b8ab2cd513b0261a14096412195a72a0c4827d229dcc7e0f7af)
  *      with 9 txs.
diff --git a/depend/bitcoin/src/test/util/setup_common.h b/depend/bitcoin/src/test/util/setup_common.h
index 8b1b0632..7e763424 100644
--- a/depend/bitcoin/src/test/util/setup_common.h
+++ b/depend/bitcoin/src/test/util/setup_common.h
@@ -6,34 +6,31 @@
 #define BITCOIN_TEST_UTIL_SETUP_COMMON_H
 
 #include <common/args.h> // IWYU pragma: export
+#include <consensus/amount.h>
 #include <kernel/caches.h>
-#include <kernel/context.h>
 #include <key.h>
 #include <node/caches.h>
 #include <node/context.h> // IWYU pragma: export
-#include <optional>
-#include <ostream>
 #include <primitives/transaction.h>
-#include <pubkey.h>
-#include <stdexcept>
+#include <random.h>
+#include <test/util/net.h>
 #include <test/util/random.h>
+#include <test/util/time.h>
 #include <util/chaintype.h> // IWYU pragma: export
-#include <util/check.h>
 #include <util/fs.h>
 #include <util/signalinterrupt.h>
-#include <util/string.h>
 #include <util/vector.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <functional>
-#include <type_traits>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
 #include <vector>
 
-class arith_uint256;
 class CFeeRate;
-class Chainstate;
-class FastRandomContext;
-class uint160;
-class uint256;
 
 /** Retrieve the command line arguments. */
 extern const std::function<std::vector<const char*>()> G_TEST_COMMAND_LINE_ARGUMENTS;
@@ -41,7 +38,7 @@ extern const std::function<std::vector<const char*>()> G_TEST_COMMAND_LINE_ARGUM
 /** Retrieve the unit test name. */
 extern const std::function<std::string()> G_TEST_GET_FULL_NAME;
 
-static constexpr CAmount CENT{1000000};
+inline constexpr CAmount CENT{1'000'000};
 
 /** Register common test args. Shared across binaries that rely on the test framework. */
 void SetupCommonTestArgs(ArgsManager& argsman);
@@ -134,7 +131,6 @@ struct Testnet4Setup : public TestingSetup {
 };
 
 class CBlock;
-struct CMutableTransaction;
 class CScript;
 
 /**
@@ -148,11 +144,9 @@ struct TestChain100Setup : public TestingSetup {
     /**
      * Create a new block with just given transactions, coinbase paying to
      * scriptPubKey, and try to add it to the current chain.
-     * If no chainstate is specified, default to the active.
      */
     CBlock CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns,
-                                 const CScript& scriptPubKey,
-                                 Chainstate* chainstate = nullptr);
+                                 const CScript& scriptPubKey);
 
     /**
      * Create a new block with just given transactions, coinbase paying to
@@ -160,8 +154,7 @@ struct TestChain100Setup : public TestingSetup {
      */
     CBlock CreateBlock(
         const std::vector<CMutableTransaction>& txns,
-        const CScript& scriptPubKey,
-        Chainstate& chainstate);
+        const CScript& scriptPubKey);
 
     //! Mine a series of new blocks on the active chain.
     void mineBlocks(int num_blocks);
@@ -235,6 +228,7 @@ struct TestChain100Setup : public TestingSetup {
      */
     std::vector<CTransactionRef> PopulateMempool(FastRandomContext& det_rand, size_t num_transactions, bool submit);
 
+    FakeNodeClock m_clock{std::chrono::seconds{1598887952}}; // 2020-08-31, arbitrary
     std::vector<CTransactionRef> m_coinbase_txns; // For convenience, coinbase transactions
     CKey coinbaseKey; // private/public key needed to spend coinbase transactions
 };
@@ -256,6 +250,34 @@ std::unique_ptr<T> MakeNoLogFileContext(const ChainType chain_type = ChainType::
     return std::make_unique<T>(chain_type, opts);
 }
 
+class SocketTestingSetup : public BasicTestingSetup
+{
+public:
+    explicit SocketTestingSetup();
+    ~SocketTestingSetup();
+
+    /**
+     * Connect to the socket with a mock client and send pre-loaded data.
+     * Returns the I/O pipes from the mock client so we can read response data sent to it.
+     * Template parameter selects the socket type: DynSock by default.
+     */
+    template <typename T = DynSock>
+    std::shared_ptr<typename T::Pipes> ConnectClient(std::span<const std::byte> data)
+    {
+        auto connected_socket_pipes(std::make_shared<typename T::Pipes>());
+        connected_socket_pipes->recv.PushBytes(data.data(), data.size());
+        m_accepted_sockets.Push(std::make_unique<T>(connected_socket_pipes));
+        return connected_socket_pipes;
+    }
+
+private:
+    //! Save the original value of CreateSock here and restore it when the test ends.
+    decltype(CreateSock) m_create_sock_orig;
+
+    //! Queue of connected sockets returned by listening socket (represents network interface)
+    DynSock::Queue m_accepted_sockets;
+};
+
 CBlock getBlock13b8a();
 
 #endif // BITCOIN_TEST_UTIL_SETUP_COMMON_H
diff --git a/depend/bitcoin/src/test/util/time.h b/depend/bitcoin/src/test/util/time.h
index 8cd9a1da..e20df3fa 100644
--- a/depend/bitcoin/src/test/util/time.h
+++ b/depend/bitcoin/src/test/util/time.h
@@ -8,22 +8,36 @@
 #include <util/check.h>
 #include <util/time.h>
 
+/// CRTP Helper to limit a class to at most one at a time.
+template <class T>
+class LimitOne
+{
+public:
+    LimitOne() { Assert(g_T_available) = false; }
+    ~LimitOne() { g_T_available = true; }
+    LimitOne(const LimitOne&) = delete;
+    LimitOne& operator=(const LimitOne&) = delete;
+
+private:
+    static inline bool g_T_available{true};
+};
+
 
 /// Helper to initialize the global MockableSteadyClock, let a duration elapse,
 /// and reset it after use in a test.
-class SteadyClockContext
+class FakeSteadyClock : public LimitOne<FakeSteadyClock>
 {
     MockableSteadyClock::mock_time_point::duration t{MockableSteadyClock::INITIAL_MOCK_TIME};
 
 public:
     /** Initialize with INITIAL_MOCK_TIME. */
-    explicit SteadyClockContext() { (*this) += 0s; }
+    explicit FakeSteadyClock() { (*this) += 0s; }
 
     /** Unset mocktime */
-    ~SteadyClockContext() { MockableSteadyClock::ClearMockTime(); }
+    ~FakeSteadyClock() { MockableSteadyClock::ClearMockTime(); }
 
-    SteadyClockContext(const SteadyClockContext&) = delete;
-    SteadyClockContext& operator=(const SteadyClockContext&) = delete;
+    FakeSteadyClock(const FakeSteadyClock&) = delete;
+    FakeSteadyClock& operator=(const FakeSteadyClock&) = delete;
 
     /** Change mocktime by the given duration delta */
     void operator+=(std::chrono::milliseconds d)
@@ -36,22 +50,22 @@ class SteadyClockContext
 
 /// Helper to initialize the global NodeClock, let a duration elapse,
 /// and reset it after use in a test.
-class NodeClockContext
+class FakeNodeClock : public LimitOne<FakeNodeClock>
 {
     NodeSeconds m_t{std::chrono::seconds::max()};
 
 public:
     /// Initialize with the given time.
-    explicit NodeClockContext(NodeSeconds init_time) { set(init_time); }
-    explicit NodeClockContext(std::chrono::seconds init_time) { set(init_time); }
-    /// Initialize with current time, using the next tick to avoid going back by rounding to seconds.
-    explicit NodeClockContext() { set(++Now<NodeSeconds>().time_since_epoch()); }
+    explicit FakeNodeClock(NodeSeconds init_time) { set(init_time); }
+    explicit FakeNodeClock(std::chrono::seconds init_time) { set(init_time); }
+    /// Initialize with current time.
+    explicit FakeNodeClock() { set(Now<NodeSeconds>()); }
 
     /// Unset mocktime.
-    ~NodeClockContext() { set(0s); }
+    ~FakeNodeClock() { set(0s); }
 
-    NodeClockContext(const NodeClockContext&) = delete;
-    NodeClockContext& operator=(const NodeClockContext&) = delete;
+    FakeNodeClock(const FakeNodeClock&) = delete;
+    FakeNodeClock& operator=(const FakeNodeClock&) = delete;
 
     /// Set mocktime.
     void set(NodeSeconds t) { SetMockTime(m_t = t); }
@@ -62,4 +76,10 @@ class NodeClockContext
     void operator-=(std::chrono::seconds d) { set(m_t -= d); }
 };
 
+inline FakeNodeClock& GetFakeNodeClock()
+{
+    static FakeNodeClock g_fake_node_clock{0s};
+    return g_fake_node_clock;
+}
+
 #endif // BITCOIN_TEST_UTIL_TIME_H
diff --git a/depend/bitcoin/src/test/util/transaction_utils.cpp b/depend/bitcoin/src/test/util/transaction_utils.cpp
index b65a9568..cf4ed934 100644
--- a/depend/bitcoin/src/test/util/transaction_utils.cpp
+++ b/depend/bitcoin/src/test/util/transaction_utils.cpp
@@ -7,7 +7,7 @@
 #include <script/signingprovider.h>
 #include <test/util/transaction_utils.h>
 
-CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey, int nValue)
+CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey, CAmount nValue)
 {
     CMutableTransaction txCredit;
     txCredit.version = 1;
diff --git a/depend/bitcoin/src/test/util/transaction_utils.h b/depend/bitcoin/src/test/util/transaction_utils.h
index 867554f8..ca643f0b 100644
--- a/depend/bitcoin/src/test/util/transaction_utils.h
+++ b/depend/bitcoin/src/test/util/transaction_utils.h
@@ -15,7 +15,7 @@ class CCoinsViewCache;
 
 // create crediting transaction
 // [1 coinbase input => 1 output with given scriptPubkey and value]
-CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey, int nValue = 0);
+CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey, CAmount nValue = 0);
 
 // create spending transaction
 // [1 input with referenced transaction outpoint, scriptSig, scriptWitness =>
diff --git a/depend/bitcoin/src/test/util/validation.cpp b/depend/bitcoin/src/test/util/validation.cpp
index 7e09597e..61a16657 100644
--- a/depend/bitcoin/src/test/util/validation.cpp
+++ b/depend/bitcoin/src/test/util/validation.cpp
@@ -4,12 +4,25 @@
 
 #include <test/util/validation.h>
 
+#include <coins.h>
+#include <consensus/consensus.h>
 #include <node/blockstorage.h>
+#include <node/mining_types.h>
+#include <test/util/mining.h>
+#include <test/util/script.h>
+#include <test/util/setup_common.h>
+#include <test/util/time.h>
+#include <test/util/txmempool.h>
+#include <txmempool.h>
 #include <util/check.h>
 #include <util/time.h>
 #include <validation.h>
 #include <validationinterface.h>
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 using kernel::ChainstateRole;
 
 void TestBlockManager::CleanupForFuzzing()
@@ -91,3 +104,31 @@ void TestChainstateManager::ResetBestInvalid()
 {
     m_best_invalid = nullptr;
 }
+
+std::vector<std::pair<COutPoint, CAmount>> ResetChainmanAndMempool(TestingSetup& setup)
+{
+    GetFakeNodeClock().set(setup.m_node.chainman->GetParams().GenesisBlock().Time());
+
+    bilingual_str error{};
+    setup.m_node.mempool.reset();
+    setup.m_node.mempool = std::make_unique<CTxMemPool>(MemPoolOptionsForTest(setup.m_node), error);
+    Assert(error.empty());
+
+    setup.m_node.chainman.reset();
+    setup.m_make_chainman();
+    setup.LoadVerifyActivateChainstate();
+
+    node::BlockCreateOptions options;
+    options.coinbase_output_script = P2WSH_OP_TRUE;
+
+    std::vector<std::pair<COutPoint, CAmount>> mature_coinbase;
+    for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
+        COutPoint prevout{MineBlock(setup.m_node, options)};
+        if (i < COINBASE_MATURITY) {
+            LOCK(cs_main);
+            CAmount subsidy{setup.m_node.chainman->ActiveChainstate().CoinsTip().GetCoin(prevout)->out.nValue};
+            mature_coinbase.emplace_back(prevout, subsidy);
+        }
+    }
+    return mature_coinbase;
+}
diff --git a/depend/bitcoin/src/test/util/validation.h b/depend/bitcoin/src/test/util/validation.h
index 1be3f6a6..87a2d2ef 100644
--- a/depend/bitcoin/src/test/util/validation.h
+++ b/depend/bitcoin/src/test/util/validation.h
@@ -5,12 +5,18 @@
 #ifndef BITCOIN_TEST_UTIL_VALIDATION_H
 #define BITCOIN_TEST_UTIL_VALIDATION_H
 
+#include <consensus/amount.h>
+#include <primitives/transaction.h>
 #include <validation.h>
 
+#include <utility>
+#include <vector>
+
 namespace node {
 class BlockManager;
 }
 class CValidationInterface;
+struct TestingSetup;
 
 struct TestBlockManager : public node::BlockManager {
     /** Test-only method to clear internal state for fuzzing */
@@ -41,4 +47,6 @@ class ValidationInterfaceTest
         const CBlockIndex* pindex);
 };
 
+std::vector<std::pair<COutPoint, CAmount>> ResetChainmanAndMempool(TestingSetup& setup);
+
 #endif // BITCOIN_TEST_UTIL_VALIDATION_H
diff --git a/depend/bitcoin/src/test/util/versionbits.h b/depend/bitcoin/src/test/util/versionbits.h
new file mode 100644
index 00000000..c1f7e458
--- /dev/null
+++ b/depend/bitcoin/src/test/util/versionbits.h
@@ -0,0 +1,13 @@
+// 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.
+
+#ifndef BITCOIN_TEST_UTIL_VERSIONBITS_H
+#define BITCOIN_TEST_UTIL_VERSIONBITS_H
+
+#include <versionbits.h>
+
+/** Total possible bits available for versionbits per original BIP 9 specification */
+inline constexpr int VERSIONBITS_MAX_NUM_BITS{29};
+
+#endif // BITCOIN_TEST_UTIL_VERSIONBITS_H
diff --git a/depend/bitcoin/src/test/util_string_tests.cpp b/depend/bitcoin/src/test/util_string_tests.cpp
index 3835904d..894c592e 100644
--- a/depend/bitcoin/src/test/util_string_tests.cpp
+++ b/depend/bitcoin/src/test/util_string_tests.cpp
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE(case_insensitive_equal_test)
 BOOST_AUTO_TEST_CASE(line_reader_test)
 {
     {
-        // Check three lines terminated by \n and \r\n, trimming whitespace
+        // Check three lines terminated by \n and \r\n, preserving whitespace
         std::string_view input = "once upon a time\n there was a dog \r\nwho liked food\n";
         LineReader reader(input, /*max_line_length=*/128);
         BOOST_CHECK_EQUAL(reader.Consumed(), 0);
@@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
         BOOST_CHECK(line3);
         BOOST_CHECK(!line4);
         BOOST_CHECK_EQUAL(line1.value(), "once upon a time");
-        BOOST_CHECK_EQUAL(line2.value(), "there was a dog");
+        BOOST_CHECK_EQUAL(line2.value(), " there was a dog ");
         BOOST_CHECK_EQUAL(line3.value(), "who liked food");
         BOOST_CHECK_EQUAL(reader.Consumed(), 51);
         BOOST_CHECK_EQUAL(reader.Remaining(), 0);
@@ -229,6 +229,13 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
         LineReader reader(input, /*max_line_length=*/1024);
         BOOST_CHECK(!reader.ReadLine());
     }
+    {
+        // Don't trim any more than \r\n
+        std::string_view input = "\r\r\n";
+        LineReader reader(input, /*max_line_length=*/1024);
+        BOOST_CHECK_EQUAL(reader.ReadLine(), "\r");
+        BOOST_CHECK(!reader.ReadLine());
+    }
     {
         // Even one character is too long, if it's not \n
         std::string_view input = "ab\n";
diff --git a/depend/bitcoin/src/test/util_tests.cpp b/depend/bitcoin/src/test/util_tests.cpp
index 5747c3b0..90510e3d 100644
--- a/depend/bitcoin/src/test/util_tests.cpp
+++ b/depend/bitcoin/src/test/util_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <clientversion.h>
 #include <common/signmessage.h>
+#include <compat/compat.h>
 #include <hash.h>
 #include <key.h>
 #include <script/parsing.h>
@@ -25,6 +26,7 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/time.h>
+#include <util/tokenbucket.h>
 #include <util/vector.h>
 
 #include <array>
@@ -587,7 +589,7 @@ BOOST_AUTO_TEST_CASE(strprintf_numbers)
 
 BOOST_AUTO_TEST_CASE(util_mocktime)
 {
-    NodeClockContext clock_ctx{111s};
+    FakeNodeClock clock{111s};
     // Check that mock time does not change after a sleep
     for (const auto& num_sleep : {0ms, 1ms}) {
         UninterruptibleSleep(num_sleep);
@@ -883,8 +885,7 @@ BOOST_AUTO_TEST_CASE(test_ToIntegralHex)
     BOOST_CHECK_EQUAL(*n, 0);
     n = ToIntegral<uint64_t>("FfFfFfFfFfFfFfFf", 16);
     BOOST_CHECK_EQUAL(*n, 0xFfFfFfFfFfFfFfFfULL);
-    n = ToIntegral<int64_t>("-1", 16);
-    BOOST_CHECK_EQUAL(*n, -1);
+    BOOST_CHECK_EQUAL(*ToIntegral<int64_t>("-1", 16), -1);
     // Invalid values
     BOOST_CHECK(!ToIntegral<uint64_t>("", 16));
     BOOST_CHECK(!ToIntegral<uint64_t>("-1", 16));
@@ -1930,4 +1931,135 @@ BOOST_AUTO_TEST_CASE(gib_string_literal_test)
     BOOST_CHECK_EQUAL(32_GiB, 32768_MiB);
 }
 
+BOOST_AUTO_TEST_CASE(token_bucket_initial_value)
+{
+    // Initial value is clamped to cap
+    util::TokenBucket<NodeClock> b1(/*rate=*/1, /*value=*/100, /*cap=*/10);
+    BOOST_CHECK_EQUAL(b1.value(), 10);
+
+    // Initial value below cap is kept as-is
+    util::TokenBucket<NodeClock> b2(/*rate=*/1, /*value=*/5, /*cap=*/10);
+    BOOST_CHECK_EQUAL(b2.value(), 5);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_first_increment)
+{
+    // First increment establishes the time baseline but does not refill
+    util::TokenBucket<NodeClock> b(/*rate=*/100, /*value=*/0, /*cap=*/1000);
+    b.increment(NodeClock::time_point{10s});
+    BOOST_CHECK_EQUAL(b.value(), 0);
+
+    // Second increment refills based on elapsed time
+    b.increment(NodeClock::time_point{15s});
+    BOOST_CHECK_EQUAL(b.value(), 500); // 100/s * 5s
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_refill_caps)
+{
+    util::TokenBucket<NodeClock> b(/*rate=*/10, /*value=*/90, /*cap=*/100);
+    b.increment(NodeClock::time_point{1s});
+    b.increment(NodeClock::time_point{100s}); // would add 990, but cap is 100
+    BOOST_CHECK_EQUAL(b.value(), 100);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_time_backwards)
+{
+    util::TokenBucket<NodeClock> b(/*rate=*/10, /*value=*/50, /*cap=*/200);
+    b.increment(NodeClock::time_point{10s});
+    b.increment(NodeClock::time_point{5s}); // backwards, no change
+    BOOST_CHECK_EQUAL(b.value(), 50);
+    b.increment(NodeClock::time_point{15s}); // forwards takes backwards into account
+    BOOST_CHECK_EQUAL(b.value(), 150);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_decrement_no_debt)
+{
+    // Default debt=0: returns false at exactly 0
+    util::TokenBucket<NodeClock> b(/*rate=*/1, /*value=*/3, /*cap=*/10);
+    BOOST_CHECK(b.decrement(1));  // 3 -> 2
+    BOOST_CHECK(b.decrement(1));  // 2 -> 1
+    BOOST_CHECK(!b.decrement(1)); // 1 -> 0, at floor
+    BOOST_CHECK_EQUAL(b.value(), 0);
+    BOOST_CHECK(!b.decrement(1)); // 0 -> -1, despite being at floor
+    BOOST_CHECK_EQUAL(b.value(), -1);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_decrement_with_debt)
+{
+    util::TokenBucket<NodeClock> b(/*rate=*/1, /*value=*/2, /*cap=*/10);
+    BOOST_CHECK(b.decrement(1, -3));  // 2 -> 1
+    BOOST_CHECK(b.decrement(1, -3));  // 1 -> 0
+    BOOST_CHECK(b.decrement(1, -3));  // 0 -> -1, still above -3
+    BOOST_CHECK(b.decrement(1, -3));  // -1 -> -2, still above -3
+    BOOST_CHECK(!b.decrement(1, -3)); // -2 -> -3, at floor
+    BOOST_CHECK_EQUAL(b.value(), -3);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_drain_and_refill)
+{
+    util::TokenBucket<NodeClock> b(/*rate=*/10, /*value=*/20, /*cap=*/100);
+    b.decrement(20); // drain to 0
+    BOOST_CHECK_EQUAL(b.value(), 0);
+
+    b.increment(NodeClock::time_point{1s});
+    b.increment(NodeClock::time_point{4s}); // +30
+    BOOST_CHECK_EQUAL(b.value(), 30);
+}
+
+
+BOOST_AUTO_TEST_CASE(token_bucket_first_increment_at_epoch)
+{
+    // The first increment establishes the baseline (no refill) even when it
+    // lands exactly on the clock epoch; later increments then refill normally.
+    util::TokenBucket<NodeClock> b(/*rate=*/100, /*value=*/0, /*cap=*/1000);
+    b.increment(NodeClock::time_point{0s});
+    BOOST_CHECK_EQUAL(b.value(), 0);
+    b.increment(NodeClock::time_point{5s});
+    BOOST_CHECK_EQUAL(b.value(), 500); // 100/s * 5s
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_at_cap_advances_baseline)
+{
+    util::TokenBucket<NodeClock> b(/*rate=*/10, /*value=*/100, /*cap=*/100);
+    BOOST_CHECK_EQUAL(b.value(), 100); // already at cap
+    b.increment(NodeClock::time_point{1s});   // baseline established at 1s
+    b.increment(NodeClock::time_point{100s}); // 99s spent at the cap; baseline -> 100s
+    BOOST_CHECK_EQUAL(b.value(), 100);
+
+    b.decrement(100); // drain to 0
+    BOOST_CHECK_EQUAL(b.value(), 0);
+
+    // refill doesn't "bank" the extra 99s we were at cap
+    b.increment(NodeClock::time_point{101s});
+    BOOST_CHECK_EQUAL(b.value(), 10);
+
+    // And when real time genuinely elapses, a single increment refills straight
+    // back to the cap immediately.
+    b.increment(NodeClock::time_point{200s}); // 99s elapsed -> +990, clamped to cap
+    BOOST_CHECK_EQUAL(b.value(), 100);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_fractional_refill)
+{
+    // Sub-second elapsed time accumulates fractional tokens via double math.
+    util::TokenBucket<NodeClock> b(/*rate=*/10, /*value=*/0, /*cap=*/100);
+    b.increment(NodeClock::time_point{1s});
+    b.increment(NodeClock::time_point{1250ms}); // 10/s * 0.25s = 2.5
+    BOOST_CHECK_EQUAL(b.value(), 2.5);
+}
+
+BOOST_AUTO_TEST_CASE(token_bucket_refill_from_debt)
+{
+    // Refilling from a negative (debt) balance accrues normally and still
+    // clamps to the cap rather than to debt + increment.
+    util::TokenBucket<NodeClock> b(/*rate=*/10, /*value=*/0, /*cap=*/100);
+    BOOST_CHECK(!b.decrement(50)); // -> -50, below floor 0
+    BOOST_CHECK_EQUAL(b.value(), -50);
+    b.increment(NodeClock::time_point{1s});   // baseline
+    b.increment(NodeClock::time_point{4s});   // +30 -> -20
+    BOOST_CHECK_EQUAL(b.value(), -20);
+    b.increment(NodeClock::time_point{100s}); // +960 but clamped to cap
+    BOOST_CHECK_EQUAL(b.value(), 100);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/util_threadnames_tests.cpp b/depend/bitcoin/src/test/util_threadnames_tests.cpp
index f22eb12d..e10553b8 100644
--- a/depend/bitcoin/src/test/util_threadnames_tests.cpp
+++ b/depend/bitcoin/src/test/util_threadnames_tests.cpp
@@ -17,7 +17,7 @@ using util::ToString;
 
 BOOST_AUTO_TEST_SUITE(util_threadnames_tests)
 
-const std::string TEST_THREAD_NAME_BASE = "test_thread.";
+const std::string TEST_THREAD_NAME_BASE = "test_thrd.";
 
 /**
  * Run a bunch of threads to all call util::ThreadRename.
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(util_threadnames_test_rename_threaded)
 
     BOOST_CHECK_EQUAL(names.size(), 100U);
 
-    // Names "test_thread.[n]" should exist for n = [0, 99]
+    // Names "test_thrd.[n]" should exist for n = [0, 99]
     for (int i = 0; i < 100; ++i) {
         BOOST_CHECK(names.contains(TEST_THREAD_NAME_BASE + ToString(i)));
     }
diff --git a/depend/bitcoin/src/test/validation_block_tests.cpp b/depend/bitcoin/src/test/validation_block_tests.cpp
index 083a32da..5de89376 100644
--- a/depend/bitcoin/src/test/validation_block_tests.cpp
+++ b/depend/bitcoin/src/test/validation_block_tests.cpp
@@ -2,26 +2,39 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <boost/test/unit_test.hpp>
-
+#include <chain.h>
 #include <chainparams.h>
+#include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <node/miner.h>
+#include <interfaces/mining.h>
+#include <node/blockstorage.h>
 #include <pow.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <random.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/common.h>
-#include <test/util/random.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
-#include <util/time.h>
+#include <txmempool.h>
+#include <uint256.h>
+#include <util/check.h>
 #include <validation.h>
 #include <validationinterface.h>
 
+#include <boost/test/unit_test.hpp>
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <span>
 #include <thread>
+#include <utility>
+#include <vector>
 
 using kernel::ChainstateRole;
-using node::BlockAssembler;
 
 namespace validation_block_tests {
 struct MinerTestingSetup : public RegTestingSetup {
@@ -67,11 +80,12 @@ std::shared_ptr<CBlock> MinerTestingSetup::Block(const uint256& prev_hash)
     static int i = 0;
     static uint64_t time = Params().GenesisBlock().nTime;
 
-    BlockAssembler::Options options;
-    options.coinbase_output_script = CScript{} << i++ << OP_TRUE;
-    options.include_dummy_extranonce = true;
-    auto ptemplate = BlockAssembler{m_node.chainman->ActiveChainstate(), m_node.mempool.get(), options}.CreateNewBlock();
-    auto pblock = std::make_shared<CBlock>(ptemplate->block);
+    auto mining{interfaces::MakeMining(m_node)};
+    auto block_template{mining->createNewBlock({
+        .coinbase_output_script = CScript{} << i++ << OP_TRUE,
+    }, /*cooldown=*/false)};
+    BOOST_REQUIRE(block_template);
+    auto pblock = std::make_shared<CBlock>(block_template->getBlock());
     pblock->hashPrevBlock = prev_hash;
     pblock->nTime = ++time;
 
@@ -336,11 +350,12 @@ BOOST_AUTO_TEST_CASE(witness_commitment_index)
     LOCK(Assert(m_node.chainman)->GetMutex());
     CScript pubKey;
     pubKey << 1 << OP_TRUE;
-    BlockAssembler::Options options;
-    options.coinbase_output_script = pubKey;
-    options.include_dummy_extranonce = true;
-    auto ptemplate = BlockAssembler{m_node.chainman->ActiveChainstate(), m_node.mempool.get(), options}.CreateNewBlock();
-    CBlock pblock = ptemplate->block;
+    auto mining{interfaces::MakeMining(m_node)};
+    auto block_template{mining->createNewBlock({
+        .coinbase_output_script = pubKey,
+    }, /*cooldown=*/false)};
+    BOOST_REQUIRE(block_template);
+    CBlock pblock{block_template->getBlock()};
 
     CTxOut witness;
     witness.scriptPubKey.resize(MINIMUM_WITNESS_COMMITMENT);
diff --git a/depend/bitcoin/src/test/validation_chainstate_tests.cpp b/depend/bitcoin/src/test/validation_chainstate_tests.cpp
index 38a04d8e..bcbb553d 100644
--- a/depend/bitcoin/src/test/validation_chainstate_tests.cpp
+++ b/depend/bitcoin/src/test/validation_chainstate_tests.cpp
@@ -2,27 +2,34 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
+#include <chain.h>
 #include <chainparams.h>
+#include <coins.h>
 #include <consensus/amount.h>
 #include <consensus/validation.h>
+#include <node/blockstorage.h>
 #include <node/kernel_notifications.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <random.h>
-#include <rpc/blockchain.h>
 #include <script/script.h>
 #include <sync.h>
 #include <test/util/chainstate.h>
-#include <test/util/common.h>
 #include <test/util/coins.h>
-#include <test/util/random.h>
+#include <test/util/common.h>
 #include <test/util/setup_common.h>
+#include <tinyformat.h>
 #include <uint256.h>
-#include <util/byte_units.h>
 #include <util/check.h>
 #include <validation.h>
 
+#include <boost/test/unit_test.hpp>
+
+#include <memory>
+#include <optional>
 #include <vector>
 
-#include <boost/test/unit_test.hpp>
+class CTxMemPool;
 
 BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, ChainTestingSetup)
 
@@ -36,7 +43,7 @@ BOOST_AUTO_TEST_CASE(validation_chainstate_resize_caches)
     c1.InitCoinsDB(
         /*cache_size_bytes=*/8_MiB, /*in_memory=*/true, /*should_wipe=*/false);
     WITH_LOCK(::cs_main, c1.InitCoinsCache(8_MiB));
-    BOOST_REQUIRE(c1.LoadGenesisBlock()); // Need at least one block loaded to be able to flush caches
+    BOOST_REQUIRE(manager.LoadGenesisBlock()); // Need at least one block loaded to be able to flush caches
 
     // Add a coin to the in-memory cache, upsize once, then downsize.
     {
@@ -83,7 +90,7 @@ BOOST_FIXTURE_TEST_CASE(connect_tip_does_not_cache_inputs_on_failed_connect, Tes
     tx.vout.emplace_back(MAX_MONEY, CScript{} << OP_TRUE);
 
     const auto tip{WITH_LOCK(cs_main, return chainstate.m_chain.Tip()->GetBlockHash())};
-    const CBlock block{CreateBlock({tx}, CScript{} << OP_TRUE, chainstate)};
+    const CBlock block{CreateBlock({tx}, CScript{} << OP_TRUE)};
     BOOST_CHECK(Assert(m_node.chainman)->ProcessNewBlock(std::make_shared<CBlock>(block), true, true, nullptr));
 
     LOCK(cs_main);
diff --git a/depend/bitcoin/src/test/validation_chainstatemanager_tests.cpp b/depend/bitcoin/src/test/validation_chainstatemanager_tests.cpp
index 9818b51e..9b14344c 100644
--- a/depend/bitcoin/src/test/validation_chainstatemanager_tests.cpp
+++ b/depend/bitcoin/src/test/validation_chainstatemanager_tests.cpp
@@ -117,6 +117,15 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager, TestChain100Setup)
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
 }
 
+BOOST_FIXTURE_TEST_CASE(chainstatemanager_delete_chainstate_no_mempool, ChainTestingSetup)
+{
+    auto& manager{*Assert(m_node.chainman)};
+    auto& validated{WITH_LOCK(::cs_main, return manager.InitializeChainstate(/*mempool=*/nullptr))};
+    auto& snapshot{WITH_LOCK(::cs_main, return manager.AddChainstate(std::make_unique<Chainstate>(nullptr, manager.m_blockman, manager, uint256::ONE)))};
+    WITH_LOCK(::cs_main, validated.SetTargetBlock(nullptr));
+    BOOST_CHECK(WITH_LOCK(::cs_main, return manager.DeleteChainstate(snapshot))); // Accept Kernel's null mempool
+}
+
 //! Test rebalancing the caches associated with each chainstate.
 BOOST_FIXTURE_TEST_CASE(chainstatemanager_rebalance_caches, TestChain100Setup)
 {
@@ -991,6 +1000,12 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_args, BasicTestingSetup)
 
     BOOST_CHECK(!get_opts({"-minimumchainwork=xyz"}));                                                               // invalid hex characters
     BOOST_CHECK(!get_opts({"-minimumchainwork=01234567890123456789012345678901234567890123456789012345678901234"})); // > 64 hex chars
+
+    BOOST_CHECK_EQUAL(get_valid_opts({}).prevoutfetch_threads_num, DEFAULT_PREVOUTFETCH_THREADS);
+    BOOST_CHECK_EQUAL(get_valid_opts({"-prevoutfetchthreads=0"}).prevoutfetch_threads_num, 0);
+    BOOST_CHECK_EQUAL(get_valid_opts({"-prevoutfetchthreads=3"}).prevoutfetch_threads_num, 3);
+    BOOST_CHECK_EQUAL(get_valid_opts({"-prevoutfetchthreads=100"}).prevoutfetch_threads_num, MAX_PREVOUTFETCH_THREADS);
+    BOOST_CHECK(!get_opts({"-prevoutfetchthreads=-1"}));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/depend/bitcoin/src/test/validation_flush_tests.cpp b/depend/bitcoin/src/test/validation_flush_tests.cpp
index c35cef7f..263edd8b 100644
--- a/depend/bitcoin/src/test/validation_flush_tests.cpp
+++ b/depend/bitcoin/src/test/validation_flush_tests.cpp
@@ -18,33 +18,33 @@ BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, TestingSetup)
 //! then with additional mempool head-room.
 BOOST_AUTO_TEST_CASE(getcoinscachesizestate)
 {
+    constexpr uint64_t MAX_COINS_BYTES{8_MiB};
+    constexpr uint64_t MAX_MEMPOOL_BYTES{4_MiB};
+    constexpr uint64_t MAX_ATTEMPTS{50'000};
     Chainstate& chainstate{m_node.chainman->ActiveChainstate()};
 
     LOCK(::cs_main);
+    BOOST_REQUIRE(chainstate.ResizeCoinsCaches(MAX_COINS_BYTES, /*coinsdb_size=*/1_MiB));
     CCoinsViewCache& view{chainstate.CoinsTip()};
 
     // Sanity: an empty cache should be ≲ 1 chunk (~ 256 KiB).
     BOOST_CHECK_LT(view.DynamicMemoryUsage() / (256 * 1024.0), 1.1);
 
-    constexpr size_t MAX_COINS_BYTES{8_MiB};
-    constexpr size_t MAX_MEMPOOL_BYTES{4_MiB};
-    constexpr size_t MAX_ATTEMPTS{50'000};
-
     // Run the same growth-path twice: first with 0 head-room, then with extra head-room
-    for (size_t max_mempool_size_bytes : {size_t{0}, MAX_MEMPOOL_BYTES}) {
+    for (uint64_t max_mempool_size_bytes : {uint64_t{0}, MAX_MEMPOOL_BYTES}) {
         const int64_t full_cap{int64_t(MAX_COINS_BYTES + max_mempool_size_bytes)};
         const int64_t large_cap{LargeCoinsCacheThreshold(full_cap)};
 
         // OK → LARGE
         auto state{chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, max_mempool_size_bytes)};
-        for (size_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= large_cap; ++i) {
+        for (uint64_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= large_cap; ++i) {
             BOOST_CHECK_EQUAL(state, CoinsCacheSizeState::OK);
             AddTestCoin(m_rng, view);
             state = chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, max_mempool_size_bytes);
         }
 
         // LARGE → CRITICAL
-        for (size_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= full_cap; ++i) {
+        for (uint64_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= full_cap; ++i) {
             BOOST_CHECK_EQUAL(state, CoinsCacheSizeState::LARGE);
             AddTestCoin(m_rng, view);
             state = chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, max_mempool_size_bytes);
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(getcoinscachesizestate)
         BOOST_CHECK_EQUAL(state, CoinsCacheSizeState::CRITICAL);
     }
 
-    // Default thresholds (no explicit limits) permit many more coins.
+    // Unused mempool space permits many more coins.
     for (int i{0}; i < 1'000; ++i) {
         AddTestCoin(m_rng, view);
         BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(), CoinsCacheSizeState::OK);
@@ -60,6 +60,7 @@ BOOST_AUTO_TEST_CASE(getcoinscachesizestate)
 
     // CRITICAL → OK via Flush
     BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, /*max_mempool_size_bytes=*/0), CoinsCacheSizeState::CRITICAL);
+    BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(), CoinsCacheSizeState::OK);
     view.SetBestBlock(m_rng.rand256());
     view.Flush();
     BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, /*max_mempool_size_bytes=*/0), CoinsCacheSizeState::OK);
diff --git a/depend/bitcoin/src/test/validation_tests.cpp b/depend/bitcoin/src/test/validation_tests.cpp
index b1e204f1..268529fd 100644
--- a/depend/bitcoin/src/test/validation_tests.cpp
+++ b/depend/bitcoin/src/test/validation_tests.cpp
@@ -142,11 +142,11 @@ BOOST_AUTO_TEST_CASE(test_assumeutxo)
     }
 
     const auto out110 = *params->AssumeutxoForHeight(110);
-    BOOST_CHECK_EQUAL(out110.hash_serialized.ToString(), "b952555c8ab81fec46f3d4253b7af256d766ceb39fb7752b9d18cdf4a0141327");
+    BOOST_CHECK_EQUAL(out110.hash_serialized.ToString(), "86e9a1205b418b16dde3a18a78c730e30137e28466bda5dbf6b33ab8fc05447c");
     BOOST_CHECK_EQUAL(out110.m_chain_tx_count, 111U);
 
-    const auto out110_2 = *params->AssumeutxoForBlockhash(uint256{"6affe030b7965ab538f820a56ef56c8149b7dc1d1c144af57113be080db7c397"});
-    BOOST_CHECK_EQUAL(out110_2.hash_serialized.ToString(), "b952555c8ab81fec46f3d4253b7af256d766ceb39fb7752b9d18cdf4a0141327");
+    const auto out110_2 = *params->AssumeutxoForBlockhash(uint256{"135eec25a6fb277884e5824e7aa7d052c4868161c99a5122170b5266f86c273d"});
+    BOOST_CHECK_EQUAL(out110_2.hash_serialized.ToString(), "86e9a1205b418b16dde3a18a78c730e30137e28466bda5dbf6b33ab8fc05447c");
     BOOST_CHECK_EQUAL(out110_2.m_chain_tx_count, 111U);
 }
 
diff --git a/depend/bitcoin/src/test/versionbits_tests.cpp b/depend/bitcoin/src/test/versionbits_tests.cpp
index ad792053..2cf11600 100644
--- a/depend/bitcoin/src/test/versionbits_tests.cpp
+++ b/depend/bitcoin/src/test/versionbits_tests.cpp
@@ -8,6 +8,7 @@
 #include <test/util/random.h>
 #include <test/util/common.h>
 #include <test/util/setup_common.h>
+#include <test/util/versionbits.h>
 #include <util/chaintype.h>
 #include <versionbits.h>
 #include <versionbits_impl.h>
@@ -294,7 +295,8 @@ void check_computeblockversion(VersionBitsCache& versionbitscache, const Consens
     BOOST_REQUIRE(nStartTime < nTimeout);
     BOOST_REQUIRE(nStartTime >= 0);
     BOOST_REQUIRE(nTimeout <= std::numeric_limits<uint32_t>::max() || nTimeout == Consensus::BIP9Deployment::NO_TIMEOUT);
-    BOOST_REQUIRE(0 <= bit && bit < 32);
+    BOOST_REQUIRE(0 <= bit);
+    BOOST_REQUIRE(bit < 32);
     // Make sure that no deployment tries to set an invalid bit.
     BOOST_REQUIRE(((1 << bit) & VERSIONBITS_TOP_MASK) == 0);
     BOOST_REQUIRE(min_activation_height >= 0);
@@ -454,9 +456,20 @@ BOOST_FIXTURE_TEST_CASE(versionbits_computeblockversion, BlockVersionTest)
             // not take precedence over STARTED/LOCKED_IN. So all softforks on
             // the same bit might overlap, even when non-overlapping start-end
             // times are picked.
-            const uint32_t dep_mask{uint32_t{1} << chainParams->GetConsensus().vDeployments[dep].bit};
+            const auto& dep_info = chainParams->GetConsensus().vDeployments[dep];
+            const uint32_t dep_mask{uint32_t{1} << dep_info.bit};
             BOOST_CHECK(!(chain_all_vbits & dep_mask));
             chain_all_vbits |= dep_mask;
+            BOOST_CHECK(0 <= dep_info.bit);
+            BOOST_CHECK(dep_info.bit < VERSIONBITS_MAX_NUM_BITS);
+            if (chain_type != ChainType::REGTEST) {
+                if (dep == Consensus::DEPLOYMENT_TESTDUMMY) {
+                    BOOST_CHECK_EQUAL(dep_info.nStartTime, Consensus::BIP9Deployment::NEVER_ACTIVE);
+                    BOOST_CHECK_EQUAL(dep_info.nTimeout, Consensus::BIP9Deployment::NO_TIMEOUT);
+                } else {
+                    BOOST_CHECK(dep_info.bit < VERSIONBITS_NUM_BITS);
+                }
+            }
             check_computeblockversion(vbcache, chainParams->GetConsensus(), dep);
         }
     }
diff --git a/depend/bitcoin/src/tinyformat.h b/depend/bitcoin/src/tinyformat.h
index 29b0f9e3..444cd6de 100644
--- a/depend/bitcoin/src/tinyformat.h
+++ b/depend/bitcoin/src/tinyformat.h
@@ -232,7 +232,7 @@ struct is_convertible
         // the overload set only if the version taking a T2 doesn't match.
         // Then we compare the sizes of the return types to check which
         // function matched.  Very neat, in a disgusting kind of way :)
-        static const bool value =
+        static constexpr bool value =
             sizeof(tryConvert(makeT1())) == sizeof(succeed);
 #       ifdef _MSC_VER
 #       pragma warning(pop)
diff --git a/depend/bitcoin/src/torcontrol.cpp b/depend/bitcoin/src/torcontrol.cpp
index 0893596d..6f05ea4b 100644
--- a/depend/bitcoin/src/torcontrol.cpp
+++ b/depend/bitcoin/src/torcontrol.cpp
@@ -10,7 +10,6 @@
 #include <common/args.h>
 #include <compat/compat.h>
 #include <crypto/hmac_sha256.h>
-#include <logging.h>
 #include <net.h>
 #include <netaddress.h>
 #include <netbase.h>
@@ -18,6 +17,7 @@
 #include <tinyformat.h>
 #include <util/check.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/readwritefile.h>
 #include <util/strencodings.h>
 #include <util/string.h>
@@ -133,23 +133,23 @@ bool TorControlConnection::WaitForData(std::chrono::milliseconds timeout)
     if (!m_sock) return false;
 
     Sock::Event event{0};
-    if (!m_sock->Wait(timeout, Sock::RECV, &event)) {
+    if (!m_sock->Wait(timeout, Sock::RecvEvent, &event)) {
         return false;
     }
-    if (event & Sock::ERR) {
+    if (event & Sock::ErrorEvent) {
         LogDebug(BCLog::TOR, "Socket error detected");
         Disconnect();
         return false;
     }
 
-    return (event & Sock::RECV);
+    return (event & Sock::RecvEvent);
 }
 
 bool TorControlConnection::ReceiveAndProcess()
 {
     if (!m_sock) return false;
 
-    std::byte buf[4096];
+    char buf[4096];
     ssize_t nread = m_sock->Recv(buf, sizeof(buf), MSG_DONTWAIT);
 
     if (nread < 0) {
@@ -179,7 +179,6 @@ bool TorControlConnection::ReceiveAndProcess()
 bool TorControlConnection::ProcessBuffer()
 {
     util::LineReader reader(m_recv_buffer, MAX_LINE_LENGTH);
-    auto start = reader.it;
 
     while (auto line = reader.ReadLine()) {
         if (m_message.lines.size() == MAX_LINE_COUNT) {
@@ -191,7 +190,7 @@ bool TorControlConnection::ProcessBuffer()
         // Parse: <code><separator><data>
         // <status>(-|+| )<data>
         m_message.code = ToIntegral<int>(line->substr(0, 3)).value_or(0);
-        m_message.lines.push_back(line->substr(4));
+        m_message.lines.emplace_back(line->substr(4));
         char separator = (*line)[3]; // '-', '+', or ' '
 
         if (separator == ' ') {
@@ -210,7 +209,7 @@ bool TorControlConnection::ProcessBuffer()
         }
     }
 
-    m_recv_buffer.erase(m_recv_buffer.begin(), m_recv_buffer.begin() + std::distance(start, reader.it));
+    m_recv_buffer.erase(m_recv_buffer.begin(), m_recv_buffer.begin() + reader.Consumed());
     return true;
 }
 
diff --git a/depend/bitcoin/src/torcontrol.h b/depend/bitcoin/src/torcontrol.h
index 75b81b87..8a1a5b6e 100644
--- a/depend/bitcoin/src/torcontrol.h
+++ b/depend/bitcoin/src/torcontrol.h
@@ -21,15 +21,15 @@
 #include <thread>
 #include <vector>
 
-constexpr uint16_t DEFAULT_TOR_SOCKS_PORT{9050};
-constexpr int DEFAULT_TOR_CONTROL_PORT = 9051;
+inline constexpr uint16_t DEFAULT_TOR_SOCKS_PORT{9050};
+inline constexpr int DEFAULT_TOR_CONTROL_PORT = 9051;
 extern const std::string DEFAULT_TOR_CONTROL;
-static const bool DEFAULT_LISTEN_ONION = true;
+inline constexpr bool DEFAULT_LISTEN_ONION = true;
 
 /** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */
-constexpr int TOR_REPLY_OK{250};
-constexpr int TOR_REPLY_UNRECOGNIZED{510};
-constexpr int TOR_REPLY_SYNTAX_ERROR{512}; //!< Syntax error in command argument
+inline constexpr int TOR_REPLY_OK{250};
+inline constexpr int TOR_REPLY_UNRECOGNIZED{510};
+inline constexpr int TOR_REPLY_SYNTAX_ERROR{512}; //!< Syntax error in command argument
 
 CService DefaultOnionServiceTarget(uint16_t port);
 
@@ -109,7 +109,7 @@ class TorControlConnection
     /** Response handlers */
     std::deque<ReplyHandlerCB> m_reply_handlers;
     /** Buffer for incoming data */
-    std::vector<std::byte> m_recv_buffer;
+    std::string m_recv_buffer;
     /** Process complete lines from the receive buffer */
     bool ProcessBuffer();
 };
@@ -151,7 +151,8 @@ class TorController
     std::vector<uint8_t> m_cookie;
     /** ClientNonce for SAFECOOKIE auth */
     std::vector<uint8_t> m_client_nonce;
-    /** Main control thread */
+
+    /// \anchor torcontrol
     void ThreadControl();
 
 public:
diff --git a/depend/bitcoin/src/txdb.cpp b/depend/bitcoin/src/txdb.cpp
index a41dfd16..8ea0407b 100644
--- a/depend/bitcoin/src/txdb.cpp
+++ b/depend/bitcoin/src/txdb.cpp
@@ -14,10 +14,14 @@
 #include <uint256.h>
 #include <util/byte_units.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>
 
@@ -56,11 +60,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();
@@ -175,6 +190,30 @@ 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);
+}
+
+std::shared_future<void> CCoinsViewDB::CompactFullAsync()
+{
+    AssertLockHeld(::cs_main);
+    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 */
 class CCoinsViewDBCursor: public CCoinsViewCursor
 {
diff --git a/depend/bitcoin/src/txdb.h b/depend/bitcoin/src/txdb.h
index b19b312a..04dd2307 100644
--- a/depend/bitcoin/src/txdb.h
+++ b/depend/bitcoin/src/txdb.h
@@ -15,8 +15,10 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <future>
 #include <memory>
 #include <optional>
+#include <string>
 #include <vector>
 
 class COutPoint;
@@ -25,7 +27,7 @@ class uint256;
 //! User-controlled performance and debug options.
 struct CoinsViewOptions {
     //! Maximum database write batch size in bytes.
-    size_t batch_write_bytes{DEFAULT_DB_CACHE_BATCH};
+    uint64_t batch_write_bytes{DEFAULT_DB_CACHE_BATCH};
     //! If non-zero, randomly exit when the database is flushed with (1/ratio) probability.
     int simulate_crash_ratio{0};
 };
@@ -36,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;
     std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override;
@@ -46,14 +52,21 @@ class CCoinsViewDB final : public CCoinsView
     uint256 GetBestBlock() const override;
     std::vector<uint256> GetHeadBlocks() const override;
     void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override;
-    std::unique_ptr<CCoinsViewCursor> Cursor() const override;
+    //! Get a cursor to iterate over the whole state.
+    std::unique_ptr<CCoinsViewCursor> Cursor() const;
 
     //! Whether an unsupported database format is used.
     bool NeedsUpgrade();
     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 full compaction of the underlying LevelDB on a one-shot background thread.
+    std::shared_future<void> CompactFullAsync() 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);
 };
 
 #endif // BITCOIN_TXDB_H
diff --git a/depend/bitcoin/src/txgraph.cpp b/depend/bitcoin/src/txgraph.cpp
index ca12bca6..3ca0aaa1 100644
--- a/depend/bitcoin/src/txgraph.cpp
+++ b/depend/bitcoin/src/txgraph.cpp
@@ -14,6 +14,7 @@
 #include <compare>
 #include <functional>
 #include <memory>
+#include <ranges>
 #include <set>
 #include <span>
 #include <unordered_set>
@@ -496,9 +497,8 @@ class TxGraphImpl final : public TxGraph
         const auto& entry_a = m_entries[a];
         const auto& entry_b = m_entries[b];
         // Compare chunk feerates, and return result if it differs.
-        auto feerate_cmp = FeeRateCompare(entry_b.m_main_chunk_feerate, entry_a.m_main_chunk_feerate);
-        if (feerate_cmp < 0) return std::strong_ordering::less;
-        if (feerate_cmp > 0) return std::strong_ordering::greater;
+        auto feerate_cmp = ByRatio{entry_b.m_main_chunk_feerate} <=> ByRatio{entry_a.m_main_chunk_feerate};
+        if (feerate_cmp != 0) return feerate_cmp;
         // Compare equal-feerate chunk prefix size for comparing equal chunk feerates. This does two
         // things: it distinguishes equal-feerate chunks within the same cluster (because later
         // ones will always have a higher prefix size), and it may distinguish equal-feerate chunks
@@ -1100,7 +1100,7 @@ void GenericClusterImpl::Updated(TxGraphImpl& graph, int level, bool rename) noe
             Assume(chunk_count > 0);
             // Update equal_feerate_chunk_feerate to include this chunk, starting over when the
             // feerate changed.
-            if (chunk.feerate << equal_feerate_chunk_feerate) {
+            if (ByRatio{chunk.feerate} < ByRatio{equal_feerate_chunk_feerate}) {
                 equal_feerate_chunk_feerate = chunk.feerate;
             } else {
                 // Note that this is adding fees to fees, and sizes to sizes, so the overall
@@ -1213,8 +1213,8 @@ std::vector<Cluster*> TxGraphImpl::GetConflicts() const noexcept
         }
     }
     // Deduplicate the result (the same Cluster may appear multiple times).
-    std::sort(ret.begin(), ret.end(), [](Cluster* a, Cluster* b) noexcept { return CompareClusters(a, b) < 0; });
-    ret.erase(std::unique(ret.begin(), ret.end()), ret.end());
+    std::ranges::sort(ret, [](Cluster* a, Cluster* b) noexcept { return CompareClusters(a, b) < 0; });
+    ret.erase(std::ranges::unique(ret).begin(), ret.end());
     return ret;
 }
 
@@ -1559,7 +1559,7 @@ void SingletonClusterImpl::Merge(TxGraphImpl&, int, Cluster&) noexcept
 void GenericClusterImpl::ApplyDependencies(TxGraphImpl& graph, int level, std::span<std::pair<GraphIndex, GraphIndex>> to_apply) noexcept
 {
     // Sort the list of dependencies to apply by child, so those can be applied in batch.
-    std::sort(to_apply.begin(), to_apply.end(), [](auto& a, auto& b) { return a.second < b.second; });
+    std::ranges::sort(to_apply, [](auto& a, auto& b) { return a.second < b.second; });
     // Iterate over groups of to-be-added dependencies with the same child.
     auto it = to_apply.begin();
     while (it != to_apply.end()) {
@@ -1721,7 +1721,7 @@ void TxGraphImpl::ApplyRemovals(int up_to_level) noexcept
             }
         }
         // Group the set of to-be-removed entries by Cluster::m_sequence.
-        std::sort(to_remove.begin(), to_remove.end(), [&](GraphIndex a, GraphIndex b) noexcept {
+        std::ranges::sort(to_remove, [&](GraphIndex a, GraphIndex b) noexcept {
             Cluster* cluster_a = m_entries[a].m_locator[level].cluster;
             Cluster* cluster_b = m_entries[b].m_locator[level].cluster;
             return CompareClusters(cluster_a, cluster_b) < 0;
@@ -1792,7 +1792,7 @@ void TxGraphImpl::Compact() noexcept
     // ones get processed first. This means earlier-processed GraphIndexes will not cause moving of
     // later-processed ones during the "swap with end of m_entries" step below (which might
     // invalidate them).
-    std::sort(m_unlinked.begin(), m_unlinked.end(), std::greater{});
+    std::ranges::sort(m_unlinked, std::greater{});
 
     std::vector<Cluster*> affected_main;
     auto last = GraphIndex(-1);
@@ -1818,7 +1818,7 @@ void TxGraphImpl::Compact() noexcept
 
     // Update the affected clusters, to fixup Entry::m_main_max_chunk_fallback values which may
     // have become outdated due to the compaction above.
-    std::sort(affected_main.begin(), affected_main.end());
+    std::ranges::sort(affected_main);
     affected_main.erase(std::unique(affected_main.begin(), affected_main.end()), affected_main.end());
     for (Cluster* cluster : affected_main) {
         cluster->Updated(*this, /*level=*/0, /*rename=*/true);
@@ -1902,10 +1902,10 @@ void TxGraphImpl::GroupClusters(int level) noexcept
     }
     // Sort and deduplicate an_clusters, so we end up with a sorted list of all involved Clusters
     // to which dependencies apply, or which are oversized.
-    std::sort(an_clusters.begin(), an_clusters.end(), [](auto& a, auto& b) noexcept { return a.second < b.second; });
-    an_clusters.erase(std::unique(an_clusters.begin(), an_clusters.end()), an_clusters.end());
+    std::ranges::sort(an_clusters, [](auto& a, auto& b) noexcept { return a.second < b.second; });
+    an_clusters.erase(std::ranges::unique(an_clusters).begin(), an_clusters.end());
     // Sort an_deps by applying the same order to the involved child cluster.
-    std::sort(an_deps.begin(), an_deps.end(), [&](auto& a, auto& b) noexcept { return a.second < b.second; });
+    std::ranges::sort(an_deps, [&](auto& a, auto& b) noexcept { return a.second < b.second; });
 
     // Run the union-find algorithm to find partitions of the input Clusters which need to be
     // grouped together. See https://en.wikipedia.org/wiki/Disjoint-set_data_structure.
@@ -2018,8 +2018,8 @@ void TxGraphImpl::GroupClusters(int level) noexcept
 
     // Sort both an_clusters and an_deps by sequence number of the representative of the
     // partition they are in, grouping all those applying to the same partition together.
-    std::sort(an_deps.begin(), an_deps.end(), [](auto& a, auto& b) noexcept { return a.second < b.second; });
-    std::sort(an_clusters.begin(), an_clusters.end(), [](auto& a, auto& b) noexcept { return a.second < b.second; });
+    std::ranges::sort(an_deps, [](auto& a, auto& b) noexcept { return a.second < b.second; });
+    std::ranges::sort(an_clusters, [](auto& a, auto& b) noexcept { return a.second < b.second; });
 
     // Translate the resulting cluster groups to the m_group_data structure, and the dependencies
     // back to m_deps_to_add.
@@ -2490,7 +2490,7 @@ std::vector<TxGraph::Ref*> TxGraphImpl::GetAncestorsUnion(std::span<const Ref* c
         matches.emplace_back(cluster, m_entries[GetRefIndex(*arg)].m_locator[cluster_level].index);
     }
     // Group by Cluster.
-    std::sort(matches.begin(), matches.end(), [](auto& a, auto& b) noexcept { return CompareClusters(a.first, b.first) < 0; });
+    std::ranges::sort(matches, [](auto& a, auto& b) noexcept { return CompareClusters(a.first, b.first) < 0; });
     // Dispatch to the Clusters.
     std::span match_span(matches);
     std::vector<TxGraph::Ref*> ret;
@@ -2523,7 +2523,7 @@ std::vector<TxGraph::Ref*> TxGraphImpl::GetDescendantsUnion(std::span<const Ref*
         matches.emplace_back(cluster, m_entries[GetRefIndex(*arg)].m_locator[cluster_level].index);
     }
     // Group by Cluster.
-    std::sort(matches.begin(), matches.end(), [](auto& a, auto& b) noexcept { return CompareClusters(a.first, b.first) < 0; });
+    std::ranges::sort(matches, [](auto& a, auto& b) noexcept { return CompareClusters(a.first, b.first) < 0; });
     // Dispatch to the Clusters.
     std::span match_span(matches);
     std::vector<TxGraph::Ref*> ret;
@@ -2710,9 +2710,9 @@ void TxGraphImpl::CommitStaging() noexcept
     m_main_clusterset.m_deps_to_add = std::move(m_staging_clusterset->m_deps_to_add);
     m_main_clusterset.m_to_remove = std::move(m_staging_clusterset->m_to_remove);
     m_main_clusterset.m_group_data = std::move(m_staging_clusterset->m_group_data);
-    m_main_clusterset.m_oversized = std::move(m_staging_clusterset->m_oversized);
-    m_main_clusterset.m_txcount = std::move(m_staging_clusterset->m_txcount);
-    m_main_clusterset.m_txcount_oversized = std::move(m_staging_clusterset->m_txcount_oversized);
+    m_main_clusterset.m_oversized = m_staging_clusterset->m_oversized;
+    m_main_clusterset.m_txcount = m_staging_clusterset->m_txcount;
+    m_main_clusterset.m_txcount_oversized = m_staging_clusterset->m_txcount_oversized;
     // Delete the old staging graph, after all its information was moved to main.
     m_staging_clusterset.reset();
     Compact();
@@ -2797,7 +2797,7 @@ TxGraph::GraphIndex TxGraphImpl::CountDistinctClusters(std::span<const Ref* cons
         if (cluster != nullptr) clusters.push_back(cluster);
     }
     // Count the number of distinct elements in clusters.
-    std::sort(clusters.begin(), clusters.end(), [](Cluster* a, Cluster* b) noexcept { return CompareClusters(a, b) < 0; });
+    std::ranges::sort(clusters, [](Cluster* a, Cluster* b) noexcept { return CompareClusters(a, b) < 0; });
     Cluster* last{nullptr};
     GraphIndex ret{0};
     for (Cluster* cluster : clusters) {
@@ -2828,8 +2828,8 @@ std::pair<std::vector<FeeFrac>, std::vector<FeeFrac>> TxGraphImpl::GetMainStagin
         }
     }
     // Sort both by decreasing feerate to obtain diagrams, and return them.
-    std::sort(main_feerates.begin(), main_feerates.end(), [](auto& a, auto& b) { return a > b; });
-    std::sort(staging_feerates.begin(), staging_feerates.end(), [](auto& a, auto& b) { return a > b; });
+    std::ranges::sort(main_feerates, std::greater<ByRatioNegSize<FeeFrac>>{});
+    std::ranges::sort(staging_feerates, std::greater<ByRatioNegSize<FeeFrac>>{});
     return std::make_pair(std::move(main_feerates), std::move(staging_feerates));
 }
 
@@ -2875,10 +2875,10 @@ void GenericClusterImpl::SanityCheck(const TxGraphImpl& graph, int level) const
                 ++chunk_num;
                 assert(chunk_num < linchunking.size());
                 chunk_pos = 0;
-                if (linchunking[chunk_num].feerate << equal_feerate_prefix) {
+                if (ByRatio{linchunking[chunk_num].feerate} < ByRatio{equal_feerate_prefix}) {
                     equal_feerate_prefix = linchunking[chunk_num].feerate;
                 } else {
-                    assert(!(linchunking[chunk_num].feerate >> equal_feerate_prefix));
+                    assert(ByRatio{linchunking[chunk_num].feerate} == ByRatio{equal_feerate_prefix});
                     equal_feerate_prefix += linchunking[chunk_num].feerate;
                 }
             }
@@ -2939,6 +2939,8 @@ void TxGraphImpl::SanityCheck() const
     std::set<GraphIndex> expected_removed[MAX_LEVELS];
     /** Which Cluster::m_sequence values have been encountered. */
     std::set<uint64_t> sequences;
+    /** Which Clusters are live in ClusterSet::m_clusters up to the level being checked. */
+    std::set<const Cluster*> live_clusters;
     /** Which GraphIndexes ought to occur in m_main_chunkindex, based on m_entries. */
     std::set<GraphIndex> expected_chunkindex;
     /** Whether compaction is possible in the current state. */
@@ -3000,6 +3002,7 @@ void TxGraphImpl::SanityCheck() const
             // ... for all clusters in them ...
             for (ClusterSetIndex setindex = 0; setindex < quality_clusters.size(); ++setindex) {
                 const auto& cluster = *quality_clusters[setindex];
+                live_clusters.insert(&cluster);
                 // The number of transactions in a Cluster cannot exceed m_max_cluster_count.
                 assert(cluster.GetTxCount() <= m_max_cluster_count);
                 // The level must match the Cluster's own idea of what level it is in (but GetLevel
@@ -3062,6 +3065,16 @@ void TxGraphImpl::SanityCheck() const
         // Verify that the actually encountered clusters match the ones occurring in Entry vector.
         assert(actual_clusters == expected_clusters[level]);
 
+        // Validate m_group_data cluster pointers refer to live clusters at this
+        // level or below (staging group data may reference not-yet-pulled-in
+        // main clusters).
+        if (clusterset.m_group_data.has_value()) {
+            for (const Cluster* cl : clusterset.m_group_data->m_group_clusters) {
+                assert(live_clusters.contains(cl));
+                assert(cl->GetTxCount() > 0);
+                assert(FindCluster(cl->GetClusterEntry(0), level) == cl);
+            }
+        }
         // Verify that the contents of m_removed matches what was expected based on the Entry vector.
         std::set<GraphIndex> actual_removed(clusterset.m_removed.begin(), clusterset.m_removed.end());
         for (auto i : expected_unlinked) {
@@ -3103,7 +3116,7 @@ void TxGraphImpl::SanityCheck() const
         actual_chunkindex.insert(idx);
         auto chunk_feerate = m_entries[idx].m_main_chunk_feerate;
         if (!last_chunk_feerate.IsEmpty()) {
-            assert(FeeRateCompare(last_chunk_feerate, chunk_feerate) >= 0);
+            assert(ByRatio{last_chunk_feerate} >= ByRatio{FeeFrac{chunk_feerate}});
         }
         last_chunk_feerate = chunk_feerate;
     }
@@ -3338,7 +3351,7 @@ std::vector<TxGraph::Ref*> TxGraphImpl::Trim() noexcept
         // We do not need to sort by cluster or within clusters, because due to the implicit
         // dependency between consecutive linearization elements, no two transactions from the
         // same Cluster will ever simultaneously be in the heap.
-        return a->m_chunk_feerate < b->m_chunk_feerate;
+        return ByRatioNegSize{a->m_chunk_feerate} < ByRatioNegSize{b->m_chunk_feerate};
     };
 
     /** Given a TrimTxData entry, find the representative of the partition it is in. */
@@ -3402,7 +3415,7 @@ std::vector<TxGraph::Ref*> TxGraphImpl::Trim() noexcept
         // Sort the trim data by GraphIndex. In what follows, we will treat this sorted vector as
         // a map from GraphIndex to TrimTxData via locate_fn, and its ordering will not change
         // anymore.
-        std::sort(trim_data.begin(), trim_data.end(), [](auto& a, auto& b) noexcept { return a.m_index < b.m_index; });
+        std::ranges::sort(trim_data, [](auto& a, auto& b) noexcept { return a.m_index < b.m_index; });
 
         // Add the explicitly added dependencies to deps_by_child.
         deps_by_child.insert(deps_by_child.end(),
@@ -3411,7 +3424,7 @@ std::vector<TxGraph::Ref*> TxGraphImpl::Trim() noexcept
 
         // Sort deps_by_child by child transaction GraphIndex. The order will not be changed
         // anymore after this.
-        std::sort(deps_by_child.begin(), deps_by_child.end(), [](auto& a, auto& b) noexcept { return a.second < b.second; });
+        std::ranges::sort(deps_by_child, [](auto& a, auto& b) noexcept { return a.second < b.second; });
         // Fill m_parents_count and m_parents_offset in trim_data, as well as m_deps_left, and
         // initially populate trim_heap. Because of the sort above, all dependencies involving the
         // same child are grouped together, so a single linear scan suffices.
@@ -3435,7 +3448,7 @@ std::vector<TxGraph::Ref*> TxGraphImpl::Trim() noexcept
         // Construct deps_by_parent, sorted by parent transaction GraphIndex. The order will not be
         // changed anymore after this.
         deps_by_parent = deps_by_child;
-        std::sort(deps_by_parent.begin(), deps_by_parent.end(), [](auto& a, auto& b) noexcept { return a.first < b.first; });
+        std::ranges::sort(deps_by_parent, [](auto& a, auto& b) noexcept { return a.first < b.first; });
         // Fill m_children_offset and m_children_count in trim_data. Because of the sort above, all
         // dependencies involving the same parent are grouped together, so a single linear scan
         // suffices.
@@ -3483,8 +3496,8 @@ std::vector<TxGraph::Ref*> TxGraphImpl::Trim() noexcept
                 Assume(chl == entry.m_index);
                 current_deps.push_back(find_fn(&*locate_fn(par)));
             }
-            std::sort(current_deps.begin(), current_deps.end());
-            current_deps.erase(std::unique(current_deps.begin(), current_deps.end()), current_deps.end());
+            std::ranges::sort(current_deps);
+            current_deps.erase(std::ranges::unique(current_deps).begin(), current_deps.end());
 
             // Compute resource counts.
             uint32_t new_count = 1;
diff --git a/depend/bitcoin/src/txgraph.h b/depend/bitcoin/src/txgraph.h
index f76915c8..174ff560 100644
--- a/depend/bitcoin/src/txgraph.h
+++ b/depend/bitcoin/src/txgraph.h
@@ -15,7 +15,7 @@
 #ifndef BITCOIN_TXGRAPH_H
 #define BITCOIN_TXGRAPH_H
 
-static constexpr unsigned MAX_CLUSTER_COUNT_LIMIT{64};
+inline constexpr unsigned MAX_CLUSTER_COUNT_LIMIT{64};
 
 /** Data structure to encapsulate fees, sizes, and dependencies for a set of transactions.
  *
diff --git a/depend/bitcoin/src/txmempool.cpp b/depend/bitcoin/src/txmempool.cpp
index a22cd2b1..e5ec3b32 100644
--- a/depend/bitcoin/src/txmempool.cpp
+++ b/depend/bitcoin/src/txmempool.cpp
@@ -458,7 +458,7 @@ void CTxMemPool::check(const CCoinsViewCache& active_coins_tip, int64_t spendhei
     assert(diagram.size() <= score_with_topo.size() + 1);
     assert(diagram.size() >= 1);
 
-    std::optional<Wtxid> last_wtxid = std::nullopt;
+    std::optional<txiter> last_iter = std::nullopt;
     auto diagram_iter = diagram.cbegin();
 
     for (const auto& it : score_with_topo) {
@@ -480,11 +480,10 @@ void CTxMemPool::check(const CCoinsViewCache& active_coins_tip, int64_t spendhei
         innerUsage += it->DynamicMemoryUsage();
         const CTransaction& tx = it->GetTx();
 
-        // CompareMiningScoreWithTopology should agree with GetSortedScoreWithTopology()
-        if (last_wtxid) {
-            assert(CompareMiningScoreWithTopology(*last_wtxid, tx.GetWitnessHash()));
+        if (last_iter) {
+            assert(m_txgraph->CompareMainOrder(**last_iter, *it) < 0);
         }
-        last_wtxid = tx.GetWitnessHash();
+        last_iter = it;
 
         std::set<CTxMemPoolEntry::CTxMemPoolEntryRef, CompareIteratorByHash> setParentCheck;
         std::set<CTxMemPoolEntry::CTxMemPoolEntryRef, CompareIteratorByHash> setParentsStored;
@@ -553,20 +552,62 @@ void CTxMemPool::check(const CCoinsViewCache& active_coins_tip, int64_t spendhei
     assert(innerUsage == cachedInnerUsage);
 }
 
-bool CTxMemPool::CompareMiningScoreWithTopology(const Wtxid& hasha, const Wtxid& hashb) const
+std::vector<CTxMemPool::txiter> CTxMemPool::ExtractBestByMiningScoreWithTopology(std::vector<Wtxid>& wtxids, size_t n_to_sort) const
 {
-    /* Return `true` if hasha should be considered sooner than hashb, namely when:
-     *     a is not in the mempool but b is, or
-     *     both are in the mempool but a is sorted before b in the total mempool ordering
-     *     (which takes dependencies and (chunk) feerates into account).
+    /* This function takes a vector of `wtxids`, and returns the
+     * best mempool entries corresponding to those `wtxids` (by mining
+     * score/topology). It updates the input `wtxids` so that multiple
+     * calls with the same vector will drain that vector to empty.
+     *
+     * It operates under the following constraints:
+     *   - wtxids that do not correspond to a mempool entry are dropped
+     *   - the return vector contains no duplicates, either with itself
+     *     or with the updated `wtxids` input.
+     *   - the return vector will have `n_to_sort` entries (or `wtxids`
+           will become empty).
+     *   - the `wtxids` vector will be reduced by at least `n_to_sort`
+     *     entries (or will become empty).
      */
-    LOCK(cs);
-    auto j{GetIter(hashb)};
-    if (!j.has_value()) return false;
-    auto i{GetIter(hasha)};
-    if (!i.has_value()) return true;
 
-    return m_txgraph->CompareMainOrder(*i.value(), *j.value()) < 0;
+    auto cmp = [&](const auto& a, const auto& b) EXCLUSIVE_LOCKS_REQUIRED(cs) noexcept { return m_txgraph->CompareMainOrder(*a, *b) < 0; };
+
+    std::vector<txiter> res;
+
+    n_to_sort = std::min(wtxids.size(), n_to_sort);
+    if (n_to_sort > 0) {
+        res.reserve(wtxids.size());
+        std::sort(wtxids.begin(), wtxids.end());
+        for (auto it = wtxids.begin(); it != wtxids.end(); ++it) {
+            // skip duplicates
+            auto itnext = it + 1;
+            if (itnext != wtxids.end() && *it == *itnext) continue;
+
+            if (auto i{GetIter(*it)}; i.has_value()) {
+                res.push_back(i.value());
+            }
+        }
+        wtxids.clear();
+
+        if (!res.empty()) {
+            auto begin = res.begin();
+            auto end = res.end();
+            auto middle = end;
+            if (n_to_sort >= res.size()) {
+                // use regular sort when sorting everything
+                std::sort(begin, end, cmp);
+            } else {
+                middle = begin + n_to_sort;
+                std::partial_sort(begin, middle, end, cmp);
+            }
+            auto it = middle;
+            while (it != end) {
+                wtxids.push_back((*it)->GetTx().GetWitnessHash());
+                ++it;
+            }
+            res.erase(middle, end);
+        }
+    }
+    return res;
 }
 
 std::vector<CTxMemPool::indexed_transaction_set::const_iterator> CTxMemPool::GetSortedScoreWithTopology() const
@@ -627,6 +668,15 @@ CTransactionRef CTxMemPool::get(const Txid& hash) const
     return i->GetSharedTx();
 }
 
+CTransactionRef CTxMemPool::get(const Wtxid& hash) const
+{
+    LOCK(cs);
+    const auto& wtxid_map{mapTx.get<index_by_wtxid>()};
+    const auto it{wtxid_map.find(hash)};
+    if (it == wtxid_map.end()) return nullptr;
+    return it->GetSharedTx();
+}
+
 void CTxMemPool::PrioritiseTransaction(const Txid& hash, const CAmount& nFeeDelta)
 {
     {
diff --git a/depend/bitcoin/src/txmempool.h b/depend/bitcoin/src/txmempool.h
index ae59057c..35339d3f 100644
--- a/depend/bitcoin/src/txmempool.h
+++ b/depend/bitcoin/src/txmempool.h
@@ -47,15 +47,15 @@ class ValidationSignals;
 struct bilingual_str;
 
 /** Fake height value used in Coin to signify they are only in the memory pool (since 0.8) */
-static const uint32_t MEMPOOL_HEIGHT = 0x7FFFFFFF;
+inline constexpr uint32_t MEMPOOL_HEIGHT = 0x7FFFFFFF;
 
 /** How much linearization cost required for TxGraph clusters to have
  * "acceptable" quality, if they cannot be optimally linearized with less cost. */
-static constexpr uint64_t ACCEPTABLE_COST = 75'000;
+inline constexpr uint64_t ACCEPTABLE_COST = 75'000;
 
 /** How much work we ask TxGraph to do after a mempool change occurs (either
  * due to a changeset being applied, a new block being found, or a reorg). */
-static constexpr uint64_t POST_CHANGE_COST = 5 * ACCEPTABLE_COST;
+inline constexpr uint64_t POST_CHANGE_COST = 5 * ACCEPTABLE_COST;
 
 /**
  * Test whether the LockPoints height and time are still valid on the current chain
@@ -209,7 +209,7 @@ class CTxMemPool
 
 public:
 
-    static const int ROLLING_FEE_HALFLIFE = 60 * 60 * 12; // public only for testing
+    static constexpr int ROLLING_FEE_HALFLIFE{60 * 60 * 12}; // public only for testing
 
     using indexed_transaction_set = boost::multi_index_container<
         CTxMemPoolEntry,
@@ -331,7 +331,19 @@ class CTxMemPool
     void removeForReorg(CChain& chain, std::function<bool(txiter)> filter_final_and_mature) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    bool CompareMiningScoreWithTopology(const Wtxid& hasha, const Wtxid& hashb) const;
+    /** Look up wtxids in the mempool and (partially) sort by mining score.
+     *
+     * The @p n_to_sort best entries are removed from @p wtxids and their
+     * corresponding txiter entries are returned. In addition wtxids
+     * that are duplicates or were not found in the mempool are silently
+     * dropped from @p wtxids. The returned vector is ordered from best
+     * to worst (by CompareMainOrder). Entries remaining in @p wtxids
+     * are in unspecified order.
+     *
+     * Note that the returned `txiter` values may become invalidated once
+     * mempool.cs is released.
+     */
+    std::vector<txiter> ExtractBestByMiningScoreWithTopology(std::vector<Wtxid>& wtxids, size_t n_to_sort) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     bool isSpent(const COutPoint& outpoint) const;
     unsigned int GetTransactionsUpdated() const;
     void AddTransactionsUpdated(unsigned int n);
@@ -512,8 +524,22 @@ class CTxMemPool
 
     const CTxMemPoolEntry* GetEntry(const Txid& txid) const LIFETIMEBOUND EXCLUSIVE_LOCKS_REQUIRED(cs);
 
+    /**
+     * Return a mempool transaction with a given hash.
+     *
+     * @param[in] hash      the txid
+     * @returns             the tx if found, otherwise nullptr
+     */
     CTransactionRef get(const Txid& hash) const;
 
+    /**
+     * Return a mempool transaction with a given witness hash.
+     *
+     * @param[in] hash      the wtxid
+     * @returns             the tx if found, otherwise nullptr
+     */
+    CTransactionRef get(const Wtxid& hash) const;
+
     template <TxidOrWtxid T>
     TxMempoolInfo info(const T& id) const
     {
diff --git a/depend/bitcoin/src/txrequest.h b/depend/bitcoin/src/txrequest.h
index 93972a88..4e149379 100644
--- a/depend/bitcoin/src/txrequest.h
+++ b/depend/bitcoin/src/txrequest.h
@@ -56,7 +56,7 @@
  *              cap on the number of tracked announcements per peer. As failed requests in response to announcements
  *              from honest peers should be rare, this almost solely hinders attackers.
  *              Transaction censoring attacks can be done by announcing transactions quickly while not answering
- *              requests for them. See https://allquantor.at/blockchainbib/pdf/miller2015topology.pdf for more
+ *              requests for them. See https://www.cs.umd.edu/projects/coinscope/coinscope.pdf for more
  *              information.
  *
  * - Transactions are not requested from a peer until its reqtime has passed.
diff --git a/depend/bitcoin/src/uint256.h b/depend/bitcoin/src/uint256.h
index 3fe44ab7..d7229169 100644
--- a/depend/bitcoin/src/uint256.h
+++ b/depend/bitcoin/src/uint256.h
@@ -15,6 +15,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <compare>
 #include <cstdint>
 #include <cstring>
 #include <optional>
@@ -58,14 +59,13 @@ class base_blob
         std::fill(m_data.begin(), m_data.end(), 0);
     }
 
+    constexpr bool operator==(const base_blob&) const = default;
+
     /** Lexicographic ordering
      * @note Does NOT match the ordering on the corresponding \ref
      *       base_uint::CompareTo, which starts comparing from the end.
      */
-    constexpr int Compare(const base_blob& other) const { return std::memcmp(m_data.data(), other.m_data.data(), WIDTH); }
-
-    friend constexpr bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; }
-    friend constexpr bool operator<(const base_blob& a, const base_blob& b) { return a.Compare(b) < 0; }
+    constexpr std::strong_ordering operator<=>(const base_blob& other) const = default;
 
     /** @name Hex representation
      *
diff --git a/depend/bitcoin/src/univalue/include/univalue_escapes.h b/depend/bitcoin/src/univalue/include/univalue_escapes.h
index 7f4d89b0..edce915c 100644
--- a/depend/bitcoin/src/univalue/include/univalue_escapes.h
+++ b/depend/bitcoin/src/univalue/include/univalue_escapes.h
@@ -5,7 +5,7 @@
 
 #ifndef BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_ESCAPES_H
 #define BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_ESCAPES_H
-static const char *escapes[256] = {
+inline constexpr const char* escapes[256]{
     "\\u0000",
     "\\u0001",
     "\\u0002",
diff --git a/depend/bitcoin/src/util/bip32.cpp b/depend/bitcoin/src/util/bip32.cpp
index 2488eacf..a9aa32df 100644
--- a/depend/bitcoin/src/util/bip32.cpp
+++ b/depend/bitcoin/src/util/bip32.cpp
@@ -7,9 +7,11 @@
 #include <tinyformat.h>
 #include <util/strencodings.h>
 
+#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <optional>
+#include <span>
 #include <sstream>
 
 bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath)
@@ -17,7 +19,7 @@ bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypa
     std::stringstream ss(keypath_str);
     std::string item;
     bool first = true;
-    while (std::getline(ss, item, '/')) {
+    while (std::getline(ss, item, '/') || std::getline(ss, item, 'h')) {
         if (item.compare("m") == 0) {
             if (first) {
                 first = false;
@@ -28,6 +30,9 @@ bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypa
         // Finds whether it is hardened
         uint32_t path = 0;
         size_t pos = item.find('\'');
+        if (pos == std::string::npos) {
+            pos = item.find('h');
+        }
         if (pos != std::string::npos) {
             // The hardened tick can only be in the last index of the string
             if (pos != item.size() - 1) {
@@ -42,6 +47,11 @@ bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypa
         if (!number) {
             return false;
         }
+        // A BIP32 child index is 31 bits; the top bit is reserved for the
+        // hardened marker, so the numeric part must not exceed 2^31 - 1.
+        if (*number > 0x7fffffff) {
+            return false;
+        }
         path |= *number;
 
         keypath.push_back(path);
@@ -64,3 +74,10 @@ std::string WriteHDKeypath(const std::vector<uint32_t>& keypath, bool apostrophe
 {
     return "m" + FormatHDKeypath(keypath, apostrophe);
 }
+
+bool HasHardenedDerivation(std::span<const uint32_t> keypath)
+{
+    return std::any_of(keypath.begin(), keypath.end(), [](uint32_t index) {
+        return index >> 31;
+    });
+}
diff --git a/depend/bitcoin/src/util/bip32.h b/depend/bitcoin/src/util/bip32.h
index af48147a..fb26eab0 100644
--- a/depend/bitcoin/src/util/bip32.h
+++ b/depend/bitcoin/src/util/bip32.h
@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_BIP32_H
 
 #include <cstdint>
+#include <span>
 #include <string>
 #include <vector>
 
@@ -16,4 +17,7 @@
 std::string WriteHDKeypath(const std::vector<uint32_t>& keypath, bool apostrophe = false);
 std::string FormatHDKeypath(const std::vector<uint32_t>& path, bool apostrophe = false);
 
+/** Whether a parsed HD keypath contains at least one hardened derivation step. */
+bool HasHardenedDerivation(std::span<const uint32_t> keypath);
+
 #endif // BITCOIN_UTIL_BIP32_H
diff --git a/depend/bitcoin/src/btcsignals.h b/depend/bitcoin/src/util/btcsignals.h
similarity index 80%
rename from depend/bitcoin/src/btcsignals.h
rename to depend/bitcoin/src/util/btcsignals.h
index ebe7a5ac..1da40298 100644
--- a/depend/bitcoin/src/btcsignals.h
+++ b/depend/bitcoin/src/util/btcsignals.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_BTCSIGNALS_H
-#define BITCOIN_BTCSIGNALS_H
+#ifndef BITCOIN_UTIL_BTCSIGNALS_H
+#define BITCOIN_UTIL_BTCSIGNALS_H
 
 #include <sync.h>
 
@@ -30,21 +30,23 @@
 
 namespace btcsignals {
 
-/*
- * optional_last_value is the default and only supported combiner.
- * As such, its behavior is embedded into the signal functor.
- *
- * Because optional<void> is undefined, void must be special-cased.
- */
+/// The default combiner, which only returns void.
+class null_value
+{
+public:
+    using result_type = void;
+};
 
-template <typename T>
-class optional_last_value
+/// A combiner, which checks if at least one callback returned true.
+class any_of
 {
 public:
-    using result_type = std::conditional_t<std::is_void_v<T>, void, std::optional<T>>;
+    // This is the only supported combiner with a non-void return type. As
+    // such, its behavior is embedded into the signal functor.
+    using result_type = bool;
 };
 
-template <typename Signature, typename Combiner = optional_last_value<typename std::function<Signature>::result_type>>
+template <typename Signature, typename Combiner = null_value>
 class signal;
 
 /*
@@ -120,14 +122,14 @@ class scoped_connection
     connection m_conn;
 
 public:
-    scoped_connection(connection rhs) noexcept : m_conn{std::move(rhs)} {}
+    explicit scoped_connection(connection rhs) noexcept : m_conn{std::move(rhs)} {}
 
     scoped_connection(scoped_connection&&) noexcept = default;
-    scoped_connection& operator=(scoped_connection&&) noexcept = default;
 
     /**
-     * For simplicity, disable copy assignment and construction.
+     * For simplicity, disable copy construction and copy/move assignment.
      */
+    scoped_connection& operator=(scoped_connection&&) = delete;
     scoped_connection& operator=(const scoped_connection&) = delete;
     scoped_connection(const scoped_connection&) = delete;
 
@@ -150,8 +152,6 @@ class signal
 {
     using function_type = std::function<Signature>;
 
-    static_assert(std::is_same_v<Combiner, optional_last_value<typename function_type::result_type>>, "only the optional_last_value combiner is supported");
-
     /*
      * Helper struct for maintaining a callback and its associated connection liveness
      */
@@ -184,9 +184,7 @@ class signal
 
     /*
      * Execute all enabled callbacks for the signal. Rather than allowing for
-     * custom combiners, the behavior of optional_last_value is hard-coded
-     * here. Return the value of the last executed callback, or nullopt if none
-     * were executed.
+     * custom combiners, the behavior of any_of is hard-coded here.
      *
      * Callbacks which return void require special handling.
      *
@@ -200,7 +198,7 @@ class signal
      * more than one callback is enabled.
      */
     template <typename... Args>
-    result_type operator()(Args&&... args) const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    [[nodiscard]] result_type operator()(Args&&... args) const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
     {
         std::vector<std::shared_ptr<connection_holder>> connections;
         {
@@ -208,16 +206,22 @@ class signal
             connections = m_connections;
         }
         if constexpr (std::is_void_v<result_type>) {
+            static_assert(std::is_same_v<result_type, typename function_type::result_type>,
+                          "Callback result type must be equal to the combiner result type (void).");
             for (const auto& connection : connections) {
                 if (connection->connected()) {
                     connection->m_callback(args...);
                 }
             }
         } else {
-            result_type ret{std::nullopt};
+            static_assert(std::is_same_v<Combiner, any_of>,
+                          "only the any_of combiner is supported and hard-coded into this functor.");
+            static_assert(std::is_same_v<result_type, typename function_type::result_type>,
+                          "Callback result type must be equal to the combiner result type (bool).");
+            result_type ret{false};
             for (const auto& connection : connections) {
                 if (connection->connected()) {
-                    ret.emplace(connection->m_callback(args...));
+                    ret |= connection->m_callback(args...);
                 }
             }
             return ret;
@@ -254,4 +258,4 @@ class signal
 
 } // namespace btcsignals
 
-#endif // BITCOIN_BTCSIGNALS_H
+#endif // BITCOIN_UTIL_BTCSIGNALS_H
diff --git a/depend/bitcoin/src/util/check.h b/depend/bitcoin/src/util/check.h
index 4f5b0010..e4d39bfa 100644
--- a/depend/bitcoin/src/util/check.h
+++ b/depend/bitcoin/src/util/check.h
@@ -18,14 +18,14 @@
 #include <type_traits>
 #include <utility>
 
-constexpr bool G_FUZZING_BUILD{
+inline constexpr bool G_FUZZING_BUILD{
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     true
 #else
     false
 #endif
 };
-constexpr bool G_ABORT_ON_FAILED_ASSUME{G_FUZZING_BUILD ||
+inline constexpr bool G_ABORT_ON_FAILED_ASSUME{G_FUZZING_BUILD ||
 #ifdef ABORT_ON_FAILED_ASSUME
     true
 #else
@@ -64,8 +64,8 @@ class NonFatalCheckError : public std::runtime_error
     NonFatalCheckError(std::string_view msg, const std::source_location& loc);
 };
 
-/** Internal helper */
-void assertion_fail(const std::source_location& loc, std::string_view assertion);
+/// Internal helper. The noreturn enables optimizers to discard invalid paths.
+[[noreturn]] void assertion_fail(const std::source_location& loc, std::string_view assertion);
 
 /** Helper for CHECK_NONFATAL() */
 template <typename T>
diff --git a/depend/bitcoin/src/util/exec.cpp b/depend/bitcoin/src/util/exec.cpp
index 87d11237..69361fbc 100644
--- a/depend/bitcoin/src/util/exec.cpp
+++ b/depend/bitcoin/src/util/exec.cpp
@@ -14,8 +14,6 @@
 #include <system_error>
 
 #ifdef WIN32
-#include <codecvt>
-#include <locale>
 #include <process.h>
 #include <windows.h>
 #else
@@ -28,17 +26,16 @@ int ExecVp(const char* file, char* const argv[])
 #ifndef WIN32
     return execvp(file, argv);
 #else
-    std::vector<std::wstring> escaped_args;
-    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+    std::vector<std::string> escaped_args;
     for (char* const* arg_ptr{argv}; *arg_ptr; ++arg_ptr) {
-        subprocess::util::quote_argument(converter.from_bytes(*arg_ptr), escaped_args.emplace_back(), false);
+        subprocess::util::quote_argument(std::string{*arg_ptr}, escaped_args.emplace_back(), /*force=*/false);
     }
 
-    std::vector<const wchar_t*> new_argv;
+    std::vector<const char*> new_argv;
     new_argv.reserve(escaped_args.size() + 1);
     for (const auto& s : escaped_args) new_argv.push_back(s.c_str());
     new_argv.push_back(nullptr);
-    return _wexecvp(converter.from_bytes(file).c_str(), new_argv.data());
+    return _execvp(file, new_argv.data());
 #endif
 }
 
diff --git a/depend/bitcoin/src/util/feefrac.cpp b/depend/bitcoin/src/util/feefrac.cpp
index 088149be..8a61d8ef 100644
--- a/depend/bitcoin/src/util/feefrac.cpp
+++ b/depend/bitcoin/src/util/feefrac.cpp
@@ -44,17 +44,17 @@ std::partial_ordering CompareChunks(std::span<const FeeFrac> chunks0, std::span<
 
         const auto slope_ap = point_p - point_a;
         Assume(slope_ap.size > 0);
-        std::weak_ordering cmp = std::weak_ordering::equivalent;
+        auto cmp = std::strong_ordering::equivalent;
         if (done_0 || done_1) {
             // If a single side has no points left, act as if AB has slope tail_feerate(of 0).
             Assume(!(done_0 && done_1));
-            cmp = FeeRateCompare(slope_ap, FeeFrac(0, 1));
+            cmp = ByRatio{slope_ap} <=> ByRatio{FeeFrac(0, 1)};
         } else {
             // If both sides have points left, compute B, and the slope of AB explicitly.
             const FeeFrac& point_b = next_point(!unproc_side);
             const auto slope_ab = point_b - point_a;
             Assume(slope_ab.size >= slope_ap.size);
-            cmp = FeeRateCompare(slope_ap, slope_ab);
+            cmp = ByRatio{slope_ap} <=> ByRatio{slope_ab};
 
             // If B and P have the same size, B can be marked as processed (in addition to P, see
             // below), as we've already performed a comparison at this size.
diff --git a/depend/bitcoin/src/util/feefrac.h b/depend/bitcoin/src/util/feefrac.h
index 30ec6b02..f9c9a0a8 100644
--- a/depend/bitcoin/src/util/feefrac.h
+++ b/depend/bitcoin/src/util/feefrac.h
@@ -9,33 +9,14 @@
 #include <util/overflow.h>
 
 #include <compare>
+#include <concepts>
 #include <cstdint>
 #include <span>
 #include <utility>
 
-/** Data structure storing a fee and size, ordered by increasing fee/size.
+/** Data structure storing a fee and size.
  *
  * The size of a FeeFrac cannot be zero unless the fee is also zero.
- *
- * FeeFracs have a total ordering, first by increasing feerate (ratio of fee over size), and then
- * by decreasing size. The empty FeeFrac (fee and size both 0) sorts last. So for example, the
- * following FeeFracs are in sorted order:
- *
- * - fee=0 size=1 (feerate 0)
- * - fee=1 size=2 (feerate 0.5)
- * - fee=2 size=3 (feerate 0.667...)
- * - fee=2 size=2 (feerate 1)
- * - fee=1 size=1 (feerate 1)
- * - fee=3 size=2 (feerate 1.5)
- * - fee=2 size=1 (feerate 2)
- * - fee=0 size=0 (undefined feerate)
- *
- * A FeeFrac is considered "better" if it sorts after another, by this ordering. All standard
- * comparison operators (<=>, ==, !=, >, <, >=, <=) respect this ordering.
- *
- * The FeeRateCompare, and >> and << operators only compare feerate and treat equal feerate but
- * different size as equivalent. The empty FeeFrac is neither lower or higher in feerate than any
- * other.
  */
 struct FeeFrac
 {
@@ -154,35 +135,6 @@ struct FeeFrac
         return a.fee == b.fee && a.size == b.size;
     }
 
-    /** Compare two FeeFracs just by feerate. */
-    friend inline std::weak_ordering FeeRateCompare(const FeeFrac& a, const FeeFrac& b) noexcept
-    {
-        auto cross_a = Mul(a.fee, b.size), cross_b = Mul(b.fee, a.size);
-        return cross_a <=> cross_b;
-    }
-
-    /** Check if a FeeFrac object has strictly lower feerate than another. */
-    friend inline bool operator<<(const FeeFrac& a, const FeeFrac& b) noexcept
-    {
-        auto cross_a = Mul(a.fee, b.size), cross_b = Mul(b.fee, a.size);
-        return cross_a < cross_b;
-    }
-
-    /** Check if a FeeFrac object has strictly higher feerate than another. */
-    friend inline bool operator>>(const FeeFrac& a, const FeeFrac& b) noexcept
-    {
-        auto cross_a = Mul(a.fee, b.size), cross_b = Mul(b.fee, a.size);
-        return cross_a > cross_b;
-    }
-
-    /** Compare two FeeFracs. <, >, <=, and >= are auto-generated from this. */
-    friend inline std::strong_ordering operator<=>(const FeeFrac& a, const FeeFrac& b) noexcept
-    {
-        auto cross_a = Mul(a.fee, b.size), cross_b = Mul(b.fee, a.size);
-        if (cross_a == cross_b) return b.size <=> a.size;
-        return cross_a <=> cross_b;
-    }
-
     /** Swap two FeeFracs. */
     friend inline void swap(FeeFrac& a, FeeFrac& b) noexcept
     {
@@ -256,4 +208,107 @@ using FeePerVSize = FeePerUnit<VSizeTag>;
 struct WeightTag {};
 using FeePerWeight = FeePerUnit<WeightTag>;
 
+/** Wrapper around FeeFrac & derived types, which adds a feerate-based ordering which treats
+ *  equal-feerate but distinct-size FeeFracs as equals.
+ *
+ *  This is not included inside FeeFrac itself, because it is not a total ordering (as would be
+ *  expected for built-in comparison operators).
+ */
+template<std::derived_from<FeeFrac> T>
+class ByRatio
+{
+    const T& m_feefrac;
+
+public:
+    constexpr ByRatio(const T& feefrac) noexcept : m_feefrac{feefrac} {}
+
+    friend bool operator==(const ByRatio& a, const ByRatio& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        return cross_a == cross_b;
+    }
+
+    // Note that we can use std::strong_ordering here, because even though FeeFrac{1,2} and
+    // FeeFrac{2,4} are distinct as FeeFracs, they are indistinguishable from ByRatio's perspective
+    // (operator== also treats them as equal).
+    friend std::strong_ordering operator<=>(const ByRatio& a, const ByRatio& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        return cross_a <=> cross_b;
+    }
+
+    // Specialized versions for efficiency. GCC 15+ and Clang 11+ produce operator<=>-derived
+    // versions that are equally efficient as this at -O2, but earlier versions do not.
+    friend bool operator<(const ByRatio& a, const ByRatio& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        return cross_a < cross_b;
+    }
+    friend bool operator>(const ByRatio& a, const ByRatio& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        return cross_a > cross_b;
+    }
+    friend bool operator<=(const ByRatio& a, const ByRatio& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        return cross_a <= cross_b;
+    }
+    friend bool operator>=(const ByRatio& a, const ByRatio& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        return cross_a >= cross_b;
+    }
+};
+
+/** Wrapper around FeeFrac & derived types, which adds a total ordering which first sorts by feerate
+ *  and then by reversed size (i.e., larger sizes come first).
+ *
+ *  This is not included inside FeeFrac itself, because it is not the most natural behavior, so it
+ *  is better to make code using it invoke this explicitly.
+ *
+ *  The empty FeeFrac (fee and size both 0) sorts last. So for example, the following FeeFracs are
+ *  in sorted order:
+ *
+ *   - fee=0 size=1 (feerate 0)
+ *   - fee=1 size=2 (feerate 0.5)
+ *   - fee=2 size=3 (feerate 0.667...)
+ *   - fee=2 size=2 (feerate 1)
+ *   - fee=1 size=1 (feerate 1)
+ *   - fee=3 size=2 (feerate 1.5)
+ *   - fee=2 size=1 (feerate 2)
+ *   - fee=0 size=0 (undefined feerate)
+ */
+template<std::derived_from<FeeFrac> T>
+class ByRatioNegSize
+{
+    const T& m_feefrac;
+
+public:
+    constexpr ByRatioNegSize(const T& feefrac) noexcept : m_feefrac{feefrac} {}
+
+    friend bool operator==(const ByRatioNegSize& a, const ByRatioNegSize& b) noexcept
+    {
+        return a.m_feefrac == b.m_feefrac;
+    }
+
+    friend std::strong_ordering operator<=>(const ByRatioNegSize& a, const ByRatioNegSize& b) noexcept
+    {
+        auto cross_a = T::Mul(a.m_feefrac.fee, b.m_feefrac.size);
+        auto cross_b = T::Mul(b.m_feefrac.fee, a.m_feefrac.size);
+        auto cmp = cross_a <=> cross_b;
+        if (cmp != 0) return cmp;
+        return b.m_feefrac.size <=> a.m_feefrac.size;
+    }
+
+    // Support conversion back to underlying FeeFrac, which allows using std::max().
+    operator const T&() const noexcept { return m_feefrac; }
+};
+
 #endif // BITCOIN_UTIL_FEEFRAC_H
diff --git a/depend/bitcoin/src/util/fs_helpers.cpp b/depend/bitcoin/src/util/fs_helpers.cpp
index a41bf65a..bc0179b5 100644
--- a/depend/bitcoin/src/util/fs_helpers.cpp
+++ b/depend/bitcoin/src/util/fs_helpers.cpp
@@ -6,18 +6,22 @@
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
 #include <util/fs_helpers.h>
-
+#include <random.h>
 #include <sync.h>
+#include <tinyformat.h>
 #include <util/byte_units.h> // IWYU pragma: keep
+#include <util/check.h>
 #include <util/fs.h>
 #include <util/log.h>
 #include <util/syserror.h>
 
 #include <cerrno>
 #include <fstream>
+#include <limits>
 #include <map>
 #include <memory>
 #include <optional>
+#include <stdexcept>
 #include <string>
 #include <system_error>
 #include <utility>
@@ -152,27 +156,40 @@ bool TruncateFile(FILE* file, unsigned int length)
 #endif
 }
 
-/**
- * this function tries to raise the file descriptor limit to the requested number.
- * It returns the actual file descriptor limit (which may be more or less than nMinFD)
- */
-int RaiseFileDescriptorLimit(int nMinFD)
+int RaiseFileDescriptorLimit(int min_fd)
 {
+    Assert(min_fd >= 0);
 #if defined(WIN32)
     return 2048;
 #else
     struct rlimit limitFD;
     if (getrlimit(RLIMIT_NOFILE, &limitFD) != -1) {
-        if (limitFD.rlim_cur < (rlim_t)nMinFD) {
-            limitFD.rlim_cur = nMinFD;
-            if (limitFD.rlim_cur > limitFD.rlim_max)
+        // If the current soft limit is already higher, don't raise it
+        if (limitFD.rlim_cur != RLIM_INFINITY && std::cmp_less(limitFD.rlim_cur, min_fd)) {
+            const auto current_limit{limitFD.rlim_cur};
+            static_assert(std::in_range<rlim_t>(std::numeric_limits<int>::max()));
+            limitFD.rlim_cur = static_cast<rlim_t>(min_fd);
+            // Don't raise soft limit beyond hard limit
+            if ((limitFD.rlim_max != RLIM_INFINITY) && (limitFD.rlim_cur > limitFD.rlim_max)) {
                 limitFD.rlim_cur = limitFD.rlim_max;
-            setrlimit(RLIMIT_NOFILE, &limitFD);
-            getrlimit(RLIMIT_NOFILE, &limitFD);
+            }
+            if (current_limit != limitFD.rlim_cur) {
+                setrlimit(RLIMIT_NOFILE, &limitFD);
+                getrlimit(RLIMIT_NOFILE, &limitFD);
+            }
+        }
+        // Check the (possibly raised) current soft limit against the special
+        // value of RLIM_INFINITY. Some platforms implement this as the maximum
+        // uint64, others as int64 (-1). Avoid casting even if the return type
+        // is changed to uint64_t. We also cap unlikely but possible values
+        // that would overflow int.
+        if (limitFD.rlim_cur == RLIM_INFINITY ||
+            std::cmp_greater_equal(limitFD.rlim_cur, std::numeric_limits<int>::max())) {
+            return std::numeric_limits<int>::max();
         }
-        return limitFD.rlim_cur;
+        return static_cast<int>(limitFD.rlim_cur);
     }
-    return nMinFD; // getrlimit failed, assume it's fine
+    return min_fd; // getrlimit failed, assume it's fine
 #endif
 }
 
@@ -306,6 +323,29 @@ std::optional<fs::perms> InterpretPermString(const std::string& s)
     }
 }
 
+bool IsDirWritable(const fs::path& dir_path)
+{
+    // Attempt to create a tmp file in the directory
+    if (!fs::is_directory(dir_path)) throw std::runtime_error(strprintf("Path %s is not a directory", fs::PathToString(dir_path)));
+    FastRandomContext rng;
+    const auto tmp = dir_path / fs::PathFromString(strprintf(".tmp_%d", rng.rand64()));
+
+    const char* mode;
+#ifdef __MINGW64__
+    mode = "w"; // Temporary workaround for https://github.com/bitcoin/bitcoin/issues/30210
+#else
+    mode = "wx";
+#endif
+
+    if (const auto created{fsbridge::fopen(tmp, mode)}) {
+        std::fclose(created);
+        std::error_code ec;
+        fs::remove(tmp, ec); // clean up, ignore errors
+        return true;
+    }
+    return false;
+}
+
 #ifdef __APPLE__
 FSType GetFilesystemType(const fs::path& path)
 {
diff --git a/depend/bitcoin/src/util/fs_helpers.h b/depend/bitcoin/src/util/fs_helpers.h
index face17fd..a2399d4e 100644
--- a/depend/bitcoin/src/util/fs_helpers.h
+++ b/depend/bitcoin/src/util/fs_helpers.h
@@ -45,7 +45,18 @@ bool FileCommit(FILE* file);
 void DirectoryCommit(const fs::path& dirname);
 
 bool TruncateFile(FILE* file, unsigned int length);
-int RaiseFileDescriptorLimit(int nMinFD);
+
+/**
+ * Try to raise the file descriptor limit to the requested number.
+ *
+ * @param[in] min_fd  The requested minimum number of file descriptors.
+ * @returns           The actual file descriptor limit. It may be lower or
+ *                    higher than min_fd. Returns std::numeric_limits<int>::max()
+ *                    if the OS imposes no limit (RLIM_INFINITY).
+ *
+ */
+int RaiseFileDescriptorLimit(int min_fd);
+
 void AllocateFileRange(FILE* file, unsigned int offset, unsigned int length);
 
 /**
@@ -94,6 +105,14 @@ std::string PermsToSymbolicString(fs::perms p);
  */
 std::optional<fs::perms> InterpretPermString(const std::string& s);
 
+/** Check if a directory is writable by creating a temporary file on it.
+ *
+ * @param[in] dir_path Path of the directory to test
+ * @return true if a temporary file could be created and removed, false otherwise.
+ * @throw std::runtime_error if dir_path is not a directory.
+ */
+bool IsDirWritable(const fs::path& dir_path);
+
 #ifdef WIN32
 fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
 #endif
diff --git a/depend/bitcoin/src/util/hasher.cpp b/depend/bitcoin/src/util/hasher.cpp
index b12f7451..8e70b2a3 100644
--- a/depend/bitcoin/src/util/hasher.cpp
+++ b/depend/bitcoin/src/util/hasher.cpp
@@ -22,9 +22,9 @@ SaltedWtxidHasher::SaltedWtxidHasher() : m_hasher{
     FastRandomContext().rand64()}
 {}
 
-SaltedOutpointHasher::SaltedOutpointHasher(bool deterministic) : m_hasher{
-    deterministic ? 0x8e819f2607a18de6 : FastRandomContext().rand64(),
-    deterministic ? 0xf4020d2e3983b0eb : FastRandomContext().rand64()}
+SaltedOutpointHasher::SaltedOutpointHasher() : m_hasher{
+    FastRandomContext().rand64(),
+    FastRandomContext().rand64()}
 {}
 
 SaltedSipHasher::SaltedSipHasher() :
diff --git a/depend/bitcoin/src/util/hasher.h b/depend/bitcoin/src/util/hasher.h
index 7e74c676..b4488a93 100644
--- a/depend/bitcoin/src/util/hasher.h
+++ b/depend/bitcoin/src/util/hasher.h
@@ -58,7 +58,7 @@ class SaltedOutpointHasher
     const PresaltedSipHasher m_hasher;
 
 public:
-    SaltedOutpointHasher(bool deterministic = false);
+    SaltedOutpointHasher();
 
     /**
      * Having the hash noexcept allows libstdc++'s unordered_map to recalculate
diff --git a/depend/bitcoin/src/util/log.h b/depend/bitcoin/src/util/log.h
index 9394161f..130e740c 100644
--- a/depend/bitcoin/src/util/log.h
+++ b/depend/bitcoin/src/util/log.h
@@ -43,6 +43,12 @@ namespace util::log {
 /** Opaque to util::log; interpreted by consumers (e.g., BCLog::LogFlags). */
 using Category = uint64_t;
 
+//! Structure and constant for tagging not to rate limit.
+struct NoRateLimitTag {
+    explicit NoRateLimitTag() = default;
+};
+inline constexpr NoRateLimitTag NO_RATE_LIMIT{};
+
 enum class Level {
     Trace = 0, // High-volume or detailed logging for development/debugging
     Debug,     // Reasonably noisy logging, but still usable in production
@@ -62,21 +68,19 @@ struct Entry {
     std::string message;
 };
 
-/** Return whether messages with specified category and level should be logged. Applications using
- * the logging library need to provide this. */
-bool ShouldLog(Category category, Level level);
+/// Return whether messages with specified category should be debug logged.
+/// Applications using the logging library need to provide this.
+bool ShouldDebugLog(Category category);
+
+/// Return whether messages with specified category should be trace logged.
+/// Applications using the logging library need to provide this.
+bool ShouldTraceLog(Category category);
 
 /** Send message to be logged. Applications using the logging library need to provide this. */
 void Log(Entry entry);
-} // namespace util::log
-
-namespace BCLog {
-//! Alias for compatibility. Prefer util::log::Level over BCLog::Level in new code.
-using Level = util::log::Level;
-} // namespace BCLog
 
 template <typename... Args>
-inline void LogPrintFormatInternal(SourceLocation&& source_loc, BCLog::LogFlags flag, BCLog::Level level, bool should_ratelimit, util::ConstevalFormatString<sizeof...(Args)> fmt, const Args&... args)
+inline void LogPrintFormatInternal_(SourceLocation&& source_loc, BCLog::LogFlags flag, util::log::Level level, bool should_ratelimit, util::ConstevalFormatString<sizeof...(Args)> fmt, const Args&... args)
 {
     std::string log_msg;
     try {
@@ -92,17 +96,35 @@ inline void LogPrintFormatInternal(SourceLocation&& source_loc, BCLog::LogFlags
         .message = std::move(log_msg)});
 }
 
+template <typename... Args>
+inline void LogPrintFormatInternal(SourceLocation&& source_loc, BCLog::LogFlags flag, util::log::Level level, util::ConstevalFormatString<sizeof...(Args)> fmt, const Args&... args)
+{
+    return LogPrintFormatInternal_(std::move(source_loc), flag, level, /*should_ratelimit=*/true, fmt, args...);
+}
+
+template <typename... Args>
+inline void LogPrintFormatInternal(SourceLocation&& source_loc, BCLog::LogFlags flag, util::log::Level level, util::log::NoRateLimitTag, util::ConstevalFormatString<sizeof...(Args)> fmt, const Args&... args)
+{
+    return LogPrintFormatInternal_(std::move(source_loc), flag, level, /*should_ratelimit=*/false, fmt, args...);
+}
+} // namespace util::log
+
+namespace BCLog {
+//! Alias for compatibility. Prefer util::log::Level over BCLog::Level in new code.
+using Level = util::log::Level;
+} // namespace BCLog
+
 // Allow __func__ to be used in any context without warnings:
 // NOLINTNEXTLINE(bugprone-lambda-function-name)
-#define LogPrintLevel_(category, level, should_ratelimit, ...) LogPrintFormatInternal(SourceLocation{__func__}, category, level, should_ratelimit, __VA_ARGS__)
+#define detail_LogWithSrcLoc(category, level, ...) util::log::LogPrintFormatInternal(SourceLocation{__func__}, category, level, __VA_ARGS__)
 
 // Log unconditionally. Uses basic rate limiting to mitigate disk filling attacks.
 // Be conservative when using functions that unconditionally log to debug.log!
 // It should not be the case that an inbound peer can fill up a user's storage
 // with debug.log entries.
-#define LogInfo(...) LogPrintLevel_(BCLog::LogFlags::ALL, BCLog::Level::Info, /*should_ratelimit=*/true, __VA_ARGS__)
-#define LogWarning(...) LogPrintLevel_(BCLog::LogFlags::ALL, BCLog::Level::Warning, /*should_ratelimit=*/true, __VA_ARGS__)
-#define LogError(...) LogPrintLevel_(BCLog::LogFlags::ALL, BCLog::Level::Error, /*should_ratelimit=*/true, __VA_ARGS__)
+#define LogInfo(...) detail_LogWithSrcLoc(BCLog::LogFlags::ALL, util::log::Level::Info, __VA_ARGS__)
+#define LogWarning(...) detail_LogWithSrcLoc(BCLog::LogFlags::ALL, util::log::Level::Warning, __VA_ARGS__)
+#define LogError(...) detail_LogWithSrcLoc(BCLog::LogFlags::ALL, util::log::Level::Error, __VA_ARGS__)
 
 // Use a macro instead of a function for conditional logging to prevent
 // evaluating arguments when logging for the category is not enabled.
@@ -110,17 +132,15 @@ inline void LogPrintFormatInternal(SourceLocation&& source_loc, BCLog::LogFlags
 // Log by prefixing the output with the passed category name and severity level. This logs conditionally if
 // the category is allowed. No rate limiting is applied, because users specifying -debug are assumed to be
 // developers or power users who are aware that -debug may cause excessive disk usage due to logging.
-#define detail_LogIfCategoryAndLevelEnabled(category, level, ...)      \
-    do {                                                               \
-        if (util::log::ShouldLog((category), (level))) {               \
-            bool rate_limit{level >= BCLog::Level::Info};              \
-            Assume(!rate_limit); /*Only called with the levels below*/ \
-            LogPrintLevel_(category, level, rate_limit, __VA_ARGS__);  \
-        }                                                              \
+#define detail_LogIfCategoryAndLevelEnabled(category, shouldlog, level, ...)                  \
+    do {                                                                                      \
+        if (shouldlog(category)) {                                                            \
+            detail_LogWithSrcLoc((category), (level), util::log::NO_RATE_LIMIT, __VA_ARGS__); \
+        }                                                                                     \
     } while (0)
 
 // Log conditionally, prefixing the output with the passed category name.
-#define LogDebug(category, ...) detail_LogIfCategoryAndLevelEnabled(category, BCLog::Level::Debug, __VA_ARGS__)
-#define LogTrace(category, ...) detail_LogIfCategoryAndLevelEnabled(category, BCLog::Level::Trace, __VA_ARGS__)
+#define LogDebug(category, ...) detail_LogIfCategoryAndLevelEnabled(category, util::log::ShouldDebugLog, util::log::Level::Debug, __VA_ARGS__)
+#define LogTrace(category, ...) detail_LogIfCategoryAndLevelEnabled(category, util::log::ShouldTraceLog, util::log::Level::Trace, __VA_ARGS__)
 
 #endif // BITCOIN_UTIL_LOG_H
diff --git a/depend/bitcoin/src/util/macros.h b/depend/bitcoin/src/util/macros.h
index 9ad2fa6e..eedd23c6 100644
--- a/depend/bitcoin/src/util/macros.h
+++ b/depend/bitcoin/src/util/macros.h
@@ -8,7 +8,7 @@
 #define PASTE(x, y) x ## y
 #define PASTE2(x, y) PASTE(x, y)
 
-#define UNIQUE_NAME(name) PASTE2(name, __COUNTER__)
+#define BITCOIN_UNIQUE_NAME(name) PASTE2(name, __COUNTER__)
 
 /**
  * Converts the parameter X to a string after macro replacement on X has been performed.
diff --git a/depend/bitcoin/src/util/overflow.h b/depend/bitcoin/src/util/overflow.h
index 274ba045..48732838 100644
--- a/depend/bitcoin/src/util/overflow.h
+++ b/depend/bitcoin/src/util/overflow.h
@@ -13,10 +13,9 @@
 #include <optional>
 #include <type_traits>
 
-template <class T>
+template <std::integral T>
 [[nodiscard]] bool AdditionOverflow(const T i, const T j) noexcept
 {
-    static_assert(std::is_integral_v<T>, "Integral required.");
     if constexpr (std::numeric_limits<T>::is_signed) {
         return (i > 0 && j > std::numeric_limits<T>::max() - i) ||
                (i < 0 && j < std::numeric_limits<T>::min() - i);
@@ -41,7 +40,7 @@ template <std::unsigned_integral T, std::unsigned_integral U>
     return true;
 }
 
-template <class T>
+template <std::integral T>
 [[nodiscard]] T SaturatingAdd(const T i, const T j) noexcept
 {
     if constexpr (std::numeric_limits<T>::is_signed) {
diff --git a/depend/bitcoin/src/util/rbf.h b/depend/bitcoin/src/util/rbf.h
index 387ca5bd..44fa3ec9 100644
--- a/depend/bitcoin/src/util/rbf.h
+++ b/depend/bitcoin/src/util/rbf.h
@@ -9,7 +9,7 @@
 
 class CTransaction;
 
-static constexpr uint32_t MAX_BIP125_RBF_SEQUENCE{0xfffffffd};
+inline constexpr uint32_t MAX_BIP125_RBF_SEQUENCE{0xfffffffd};
 
 /** Check whether the sequence numbers on this transaction are signaling opt-in to replace-by-fee,
  * according to BIP 125.  Allow opt-out of transaction replacement by setting nSequence >
diff --git a/depend/bitcoin/src/util/sock.cpp b/depend/bitcoin/src/util/sock.cpp
index 8e0c0f47..da26ca54 100644
--- a/depend/bitcoin/src/util/sock.cpp
+++ b/depend/bitcoin/src/util/sock.cpp
@@ -26,11 +26,6 @@
 #include <poll.h>
 #endif
 
-static inline bool IOErrorIsPermanent(int err)
-{
-    return err != WSAEAGAIN && err != WSAEINTR && err != WSAEWOULDBLOCK && err != WSAEINPROGRESS;
-}
-
 Sock::Sock(SOCKET s) : m_socket(s) {}
 
 Sock::Sock(Sock&& other)
@@ -77,15 +72,15 @@ int Sock::Listen(int backlog) const
 std::unique_ptr<Sock> Sock::Accept(sockaddr* addr, socklen_t* addr_len) const
 {
 #ifdef WIN32
-    static constexpr auto ERR = INVALID_SOCKET;
+    static constexpr auto accept_error = INVALID_SOCKET;
 #else
-    static constexpr auto ERR = SOCKET_ERROR;
+    static constexpr auto accept_error = SOCKET_ERROR;
 #endif
 
     std::unique_ptr<Sock> sock;
 
     const auto socket = accept(m_socket, addr, addr_len);
-    if (socket != ERR) {
+    if (socket != accept_error) {
         try {
             sock = std::make_unique<Sock>(socket);
         } catch (const std::exception&) {
@@ -173,10 +168,10 @@ bool Sock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_per
         pfds.emplace_back();
         auto& pfd = pfds.back();
         pfd.fd = sock->m_socket;
-        if (events.requested & RECV) {
+        if (events.requested & RecvEvent) {
             pfd.events |= POLLIN;
         }
-        if (events.requested & SEND) {
+        if (events.requested & SendEvent) {
             pfd.events |= POLLOUT;
         }
     }
@@ -191,13 +186,13 @@ bool Sock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_per
         assert(sock->m_socket == static_cast<SOCKET>(pfds[i].fd));
         events.occurred = 0;
         if (pfds[i].revents & POLLIN) {
-            events.occurred |= RECV;
+            events.occurred |= RecvEvent;
         }
         if (pfds[i].revents & POLLOUT) {
-            events.occurred |= SEND;
+            events.occurred |= SendEvent;
         }
         if (pfds[i].revents & (POLLERR | POLLHUP)) {
-            events.occurred |= ERR;
+            events.occurred |= ErrorEvent;
         }
         ++i;
     }
@@ -217,10 +212,10 @@ bool Sock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_per
             return false;
         }
         const auto& s = sock->m_socket;
-        if (events.requested & RECV) {
+        if (events.requested & RecvEvent) {
             FD_SET(s, &recv);
         }
-        if (events.requested & SEND) {
+        if (events.requested & SendEvent) {
             FD_SET(s, &send);
         }
         FD_SET(s, &err);
@@ -237,13 +232,13 @@ bool Sock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_per
         const auto& s = sock->m_socket;
         events.occurred = 0;
         if (FD_ISSET(s, &recv)) {
-            events.occurred |= RECV;
+            events.occurred |= RecvEvent;
         }
         if (FD_ISSET(s, &send)) {
-            events.occurred |= SEND;
+            events.occurred |= SendEvent;
         }
         if (FD_ISSET(s, &err)) {
-            events.occurred |= ERR;
+            events.occurred |= ErrorEvent;
         }
     }
 
@@ -288,7 +283,7 @@ void Sock::SendComplete(std::span<const unsigned char> data,
         // Wait for a short while (or the socket to become ready for sending) before retrying
         // if nothing was sent.
         const auto wait_time = std::min(deadline - now, std::chrono::milliseconds{MAX_WAIT_FOR_IO});
-        (void)Wait(wait_time, SEND);
+        (void)Wait(wait_time, SendEvent);
     }
 }
 
@@ -378,7 +373,7 @@ std::string Sock::RecvUntilTerminator(uint8_t terminator,
 
         // Wait for a short while (or the socket to become ready for reading) before retrying.
         const auto wait_time = std::min(deadline - now, std::chrono::milliseconds{MAX_WAIT_FOR_IO});
-        (void)Wait(wait_time, RECV);
+        (void)Wait(wait_time, RecvEvent);
     }
 }
 
diff --git a/depend/bitcoin/src/util/sock.h b/depend/bitcoin/src/util/sock.h
index e20b31e1..66243970 100644
--- a/depend/bitcoin/src/util/sock.h
+++ b/depend/bitcoin/src/util/sock.h
@@ -21,7 +21,12 @@ class CThreadInterrupt;
  * Maximum time to wait for I/O readiness.
  * It will take up until this time to break off in case of an interruption.
  */
-static constexpr auto MAX_WAIT_FOR_IO = 1s;
+inline constexpr auto MAX_WAIT_FOR_IO = 1s;
+
+inline bool IOErrorIsPermanent(int err)
+{
+    return err != WSAEAGAIN && err != WSAEINTR && err != WSAEWOULDBLOCK && err != WSAEINPROGRESS;
+}
 
 /**
  * RAII helper class that manages a socket and closes it automatically when it goes out of scope.
@@ -143,25 +148,25 @@ class Sock
     /**
      * If passed to `Wait()`, then it will wait for readiness to read from the socket.
      */
-    static constexpr Event RECV = 0b001;
+    static constexpr Event RecvEvent = 0b001;
 
     /**
      * If passed to `Wait()`, then it will wait for readiness to send to the socket.
      */
-    static constexpr Event SEND = 0b010;
+    static constexpr Event SendEvent = 0b010;
 
     /**
      * Ignored if passed to `Wait()`, but could be set in the occurred events if an
      * exceptional condition has occurred on the socket or if it has been disconnected.
      */
-    static constexpr Event ERR = 0b100;
+    static constexpr Event ErrorEvent = 0b100;
 
     /**
      * Wait for readiness for input (recv) or output (send).
      * @param[in] timeout Wait this much for at least one of the requested events to occur.
-     * @param[in] requested Wait for those events, bitwise-or of `RECV` and `SEND`.
+     * @param[in] requested Wait for those events, bitwise-or of `RecvEvent` and `SendEvent`.
      * @param[out] occurred If not nullptr and the function returns `true`, then this
-     * indicates which of the requested events occurred (`ERR` will be added, even if
+     * indicates which of the requested events occurred (`ErrorEvent` will be added, even if
      * not requested, if an exceptional event occurs on the socket).
      * A timeout is indicated by return value of `true` and `occurred` being set to 0.
      * @return true on success (or timeout, if `occurred` of 0 is returned), false otherwise
diff --git a/depend/bitcoin/src/util/stdmutex.h b/depend/bitcoin/src/util/stdmutex.h
index 2cc05013..d2ac1ba1 100644
--- a/depend/bitcoin/src/util/stdmutex.h
+++ b/depend/bitcoin/src/util/stdmutex.h
@@ -38,8 +38,6 @@ class LOCKABLE StdMutex : public std::mutex
 };
 
 // Provide STDLOCK(..) wrapper around StdMutex::Guard that checks the lock is not already held
-#define STDLOCK(cs) StdMutex::Guard UNIQUE_NAME(criticalblock){StdMutex::CheckNotHeld(cs)}
-
-using StdLockGuard = StdMutex::Guard; // TODO: remove, provided for backwards compat only
+#define STDLOCK(cs) StdMutex::Guard BITCOIN_UNIQUE_NAME(criticalblock){StdMutex::CheckNotHeld(cs)}
 
 #endif // BITCOIN_UTIL_STDMUTEX_H
diff --git a/depend/bitcoin/src/util/strencodings.cpp b/depend/bitcoin/src/util/strencodings.cpp
index 5edc686c..47574b1f 100644
--- a/depend/bitcoin/src/util/strencodings.cpp
+++ b/depend/bitcoin/src/util/strencodings.cpp
@@ -10,7 +10,6 @@
 #include <util/check.h>
 #include <util/overflow.h>
 
-#include <compare>
 #include <limits>
 #include <optional>
 #include <sstream>
diff --git a/depend/bitcoin/src/util/strencodings.h b/depend/bitcoin/src/util/strencodings.h
index 30770e6d..d9bc4d5a 100644
--- a/depend/bitcoin/src/util/strencodings.h
+++ b/depend/bitcoin/src/util/strencodings.h
@@ -17,6 +17,7 @@
 #include <charconv>
 #include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <limits>
 #include <optional>
 #include <span>
@@ -214,18 +215,10 @@ bool TimingResistantEqual(const T& a, const T& b)
  */
 [[nodiscard]] bool ParseFixedPoint(std::string_view, int decimals, int64_t *amount_out);
 
-namespace {
-/** Helper class for the default infn argument to ConvertBits (just returns the input). */
-struct IntIdentity
-{
-    [[maybe_unused]] int operator()(int x) const { return x; }
-};
-
-} // namespace
-
 /** Convert from one power-of-2 number base to another. */
-template<int frombits, int tobits, bool pad, typename O, typename It, typename I = IntIdentity>
-bool ConvertBits(O outfn, It it, It end, I infn = {}) {
+template <int frombits, int tobits, bool pad, typename O, typename It, typename I = std::identity>
+bool ConvertBits(O outfn, It it, It end, I infn = {})
+{
     size_t acc = 0;
     size_t bits = 0;
     constexpr size_t maxv = (1 << tobits) - 1;
diff --git a/depend/bitcoin/src/util/string.cpp b/depend/bitcoin/src/util/string.cpp
index d1ef7a18..d9d59ef5 100644
--- a/depend/bitcoin/src/util/string.cpp
+++ b/depend/bitcoin/src/util/string.cpp
@@ -17,62 +17,61 @@ void ReplaceAll(std::string& in_out, const std::string& search, const std::strin
     in_out = std::regex_replace(in_out, std::regex(search), substitute);
 }
 
-LineReader::LineReader(std::span<const std::byte> buffer, size_t max_line_length)
-    : start(buffer.begin()), end(buffer.end()), max_line_length(max_line_length), it(buffer.begin()) {}
+LineReader::LineReader(std::string_view str, size_t max_line_length)
+    : m_str{str}, m_max_line_length{max_line_length}, m_it{str.begin()} {}
 
-std::optional<std::string> LineReader::ReadLine()
+std::optional<std::string_view> LineReader::ReadLine()
 {
-    if (it == end) {
+    if (m_it == m_str.end()) {
         return std::nullopt;
     }
 
-    auto line_start = it;
-    size_t count = 0;
-    while (it != end) {
+    const auto line_start = m_it;
+    while (m_it != m_str.end()) {
         // Read a character from the incoming buffer and increment the iterator
-        auto c = static_cast<char>(*it);
-        ++it;
-        ++count;
+        const bool new_line{*m_it == '\n'};
+        ++m_it;
         // If the character we just consumed was \n, the line is terminated.
         // The \n itself does not count against max_line_length.
-        if (c == '\n') {
-            const std::string_view untrimmed_line(reinterpret_cast<const char*>(std::to_address(line_start)), count);
-            const std::string_view line = TrimStringView(untrimmed_line); // delete leading and trailing whitespace including \r and \n
-            return std::string(line);
+        if (new_line) {
+            std::string_view line{line_start, m_it - 1};
+            if (!line.empty() && line.back() == '\r')
+                line.remove_suffix(1);
+            return line;
         }
         // If the character we just consumed gives us a line length greater
         // than max_line_length, and we are not at the end of the line (or buffer) yet,
         // that means the line we are currently reading is too long, and we throw.
-        if (count > max_line_length) {
+        if (static_cast<size_t>(std::distance(line_start, m_it)) > m_max_line_length) {
             // Reset iterator
-            it = line_start;
+            m_it = line_start;
             throw std::runtime_error("max_line_length exceeded by LineReader");
         }
     }
     // End of buffer reached without finding a \n or exceeding max_line_length.
     // Reset the iterator so the rest of the buffer can be read granularly
     // with ReadLength() and return null to indicate a line was not found.
-    it = line_start;
+    m_it = line_start;
     return std::nullopt;
 }
 
 // Ignores max_line_length but won't overflow
-std::string LineReader::ReadLength(size_t len)
+std::string_view LineReader::ReadLength(size_t len)
 {
-    if (len == 0) return "";
+    if (len == 0) return {};
     if (Remaining() < len) throw std::runtime_error("Not enough data in buffer");
-    std::string out(reinterpret_cast<const char*>(std::to_address(it)), len);
-    it += len;
+    std::string_view out(std::to_address(m_it), len);
+    m_it += len;
     return out;
 }
 
 size_t LineReader::Remaining() const
 {
-    return std::distance(it, end);
+    return std::distance(m_it, m_str.end());
 }
 
 size_t LineReader::Consumed() const
 {
-    return std::distance(start, it);
+    return std::distance(m_str.begin(), m_it);
 }
 } // namespace util
diff --git a/depend/bitcoin/src/util/string.h b/depend/bitcoin/src/util/string.h
index da4ce5a3..218d9928 100644
--- a/depend/bitcoin/src/util/string.h
+++ b/depend/bitcoin/src/util/string.h
@@ -18,10 +18,12 @@
 #include <string_view>
 #include <vector>
 
+#include <attributes.h>
+
 namespace util {
 namespace detail {
 template <unsigned num_params>
-constexpr static void CheckNumFormatSpecifiers(const char* str)
+constexpr void CheckNumFormatSpecifiers(const char* str)
 {
     unsigned count_normal{0}; // Number of "normal" specifiers, like %s
     unsigned count_pos{0};    // Max number in positional specifier, like %8$s
@@ -263,14 +265,14 @@ template <typename T1, size_t PREFIX_LEN>
            std::equal(std::begin(prefix), std::end(prefix), std::begin(obj));
 }
 
-struct LineReader {
-    const std::span<const std::byte>::iterator start;
-    const std::span<const std::byte>::iterator end;
-    const size_t max_line_length;
-    std::span<const std::byte>::iterator it;
+class LineReader
+{
+    const std::string_view m_str;
+    const size_t m_max_line_length;
+    std::string_view::iterator m_it;
 
-    explicit LineReader(std::span<const std::byte> buffer, size_t max_line_length);
-    explicit LineReader(std::string_view str, size_t max_line_length) : LineReader{std::as_bytes(std::span{str}), max_line_length} {}
+public:
+    explicit LineReader(std::string_view str, size_t max_line_length);
 
     /**
      * Returns a string from current iterator position up to (but not including) next \n
@@ -280,7 +282,7 @@ struct LineReader {
      *          std::nullopt if end of buffer is reached without finding a \n.
      * @throws a std::runtime_error if max_line_length + 1 bytes are read without finding \n.
      */
-    std::optional<std::string> ReadLine();
+    std::optional<std::string_view> ReadLine() LIFETIMEBOUND;
 
     /**
      * Returns string from current iterator position of specified length
@@ -290,7 +292,7 @@ struct LineReader {
      * @returns a string of the expected length.
      * @throws a std::runtime_error if there is not enough data in the buffer.
      */
-    std::string ReadLength(size_t len);
+    std::string_view ReadLength(size_t len) LIFETIMEBOUND;
 
     /**
      * Returns remaining size of bytes in buffer
diff --git a/depend/bitcoin/src/util/subprocess.h b/depend/bitcoin/src/util/subprocess.h
index 3d01f4b7..8c25685b 100644
--- a/depend/bitcoin/src/util/subprocess.h
+++ b/depend/bitcoin/src/util/subprocess.h
@@ -48,22 +48,16 @@ Documentation for C++ subprocessing library.
 #include <future>
 #include <initializer_list>
 #include <iostream>
-#include <locale>
 #include <map>
 #include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#ifdef WIN32
-  #include <codecvt>
-#endif
-
 extern "C" {
 #ifdef WIN32
   #include <windows.h>
   #include <io.h>
-  #include <cwchar>
 #else
   #include <sys/wait.h>
   #include <unistd.h>
@@ -116,12 +110,12 @@ namespace subprocess {
 
 // Max buffer size allocated on stack for read error
 // from pipe
-static const size_t SP_MAX_ERR_BUF_SIZ = 1024;
+inline constexpr size_t SP_MAX_ERR_BUF_SIZ = 1024;
 
 // Default buffer capacity for OutBuffer and ErrBuffer.
 // If the data exceeds this capacity, the buffer size is grown
 // by 1.5 times its previous capacity
-static const size_t DEFAULT_BUF_CAP_BYTES = 8192;
+inline constexpr size_t DEFAULT_BUF_CAP_BYTES = 8192;
 
 
 /*-----------------------------------------------
@@ -168,9 +162,12 @@ class OSError: public std::runtime_error
 namespace util
 {
 #ifdef WIN32
-  inline void quote_argument(const std::wstring &argument, std::wstring &command_line,
+  inline void quote_argument(const std::string &argument, std::string &command_line,
                       bool force)
   {
+    constexpr char quote = '"';
+    constexpr char backslash = '\\';
+
     //
     // Unless we're told otherwise, don't quote unless we actually
     // need to do so --- hopefully avoid problems if programs won't
@@ -178,16 +175,16 @@ namespace util
     //
 
     if (force == false && argument.empty() == false &&
-        argument.find_first_of(L" \t\n\v") == argument.npos) {
+        argument.find_first_of(" \t\n\v") == argument.npos) {
       command_line.append(argument);
     }
     else {
-      command_line.push_back(L'"');
+      command_line.push_back(quote);
 
       for (auto it = argument.begin();; ++it) {
         unsigned number_backslashes = 0;
 
-        while (it != argument.end() && *it == L'\\') {
+        while (it != argument.end() && *it == backslash) {
           ++it;
           ++number_backslashes;
         }
@@ -200,17 +197,17 @@ namespace util
           // as a metacharacter.
           //
 
-          command_line.append(number_backslashes * 2, L'\\');
+          command_line.append(number_backslashes * 2, backslash);
           break;
         }
-        else if (*it == L'"') {
+        else if (*it == quote) {
 
           //
           // Escape all backslashes and the following
           // double quotation mark.
           //
 
-          command_line.append(number_backslashes * 2 + 1, L'\\');
+          command_line.append(number_backslashes * 2 + 1, backslash);
           command_line.push_back(*it);
         }
         else {
@@ -219,12 +216,12 @@ namespace util
           // Backslashes aren't special here.
           //
 
-          command_line.append(number_backslashes, L'\\');
+          command_line.append(number_backslashes, backslash);
           command_line.push_back(*it);
         }
       }
 
-      command_line.push_back(L'"');
+      command_line.push_back(quote);
     }
   }
 
@@ -1085,37 +1082,36 @@ inline void Popen::execute_process() noexcept(false)
   }
   this->exe_name_ = vargs_[0];
 
-  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
-  std::wstring argument;
-  std::wstring command_line;
+  std::string argument;
+  std::string command_line;
   bool first_arg = true;
 
   for (auto arg : this->vargs_) {
     if (!first_arg) {
-      command_line += L" ";
+      command_line += " ";
     } else {
       first_arg = false;
     }
-    argument = converter.from_bytes(arg);
-    util::quote_argument(argument, command_line, false);
+    argument = arg;
+    util::quote_argument(argument, command_line, /*force=*/false);
   }
 
-  // CreateProcessW can modify szCmdLine so we allocate needed memory
-  wchar_t *szCmdline = new wchar_t[command_line.size() + 1];
-  wcscpy_s(szCmdline, command_line.size() + 1, command_line.c_str());
+  // CreateProcessA can modify szCmdLine so we allocate needed memory
+  char *szCmdline = new char[command_line.size() + 1];
+  strcpy_s(szCmdline, command_line.size() + 1, command_line.c_str());
   PROCESS_INFORMATION piProcInfo;
-  STARTUPINFOW siStartInfo;
+  STARTUPINFOA siStartInfo;
   BOOL bSuccess = FALSE;
-  DWORD creation_flags = CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW;
+  DWORD creation_flags = CREATE_NO_WINDOW;
 
   // Set up members of the PROCESS_INFORMATION structure.
   ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION));
 
-  // Set up members of the STARTUPINFOW structure.
+  // Set up members of the STARTUPINFOA structure.
   // This structure specifies the STDIN and STDOUT handles for redirection.
 
-  ZeroMemory(&siStartInfo, sizeof(STARTUPINFOW));
-  siStartInfo.cb = sizeof(STARTUPINFOW);
+  ZeroMemory(&siStartInfo, sizeof(STARTUPINFOA));
+  siStartInfo.cb = sizeof(STARTUPINFOA);
 
   siStartInfo.hStdError = this->stream_.g_hChildStd_ERR_Wr;
   siStartInfo.hStdOutput = this->stream_.g_hChildStd_OUT_Wr;
@@ -1124,7 +1120,7 @@ inline void Popen::execute_process() noexcept(false)
   siStartInfo.dwFlags |= STARTF_USESTDHANDLES;
 
   // Create the child process.
-  bSuccess = CreateProcessW(NULL,
+  bSuccess = CreateProcessA(NULL,
                             szCmdline,    // command line
                             NULL,         // process security attributes
                             NULL,         // primary thread security attributes
@@ -1132,7 +1128,7 @@ inline void Popen::execute_process() noexcept(false)
                             creation_flags, // creation flags
                             NULL,         // use parent's environment
                             NULL,         // use parent's current directory
-                            &siStartInfo, // STARTUPINFOW pointer
+                            &siStartInfo, // STARTUPINFOA pointer
                             &piProcInfo); // receives PROCESS_INFORMATION
 
   // If an error occurs, exit the application.
diff --git a/depend/bitcoin/src/util/threadnames.cpp b/depend/bitcoin/src/util/threadnames.cpp
index 0615b331..a9a3649b 100644
--- a/depend/bitcoin/src/util/threadnames.cpp
+++ b/depend/bitcoin/src/util/threadnames.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <util/threadnames.h>
+#include <util/check.h>
 
 #include <algorithm>
 #include <cstring>
@@ -53,6 +54,7 @@ static void SetInternalName(const std::string& name)
 
 void util::ThreadRename(const std::string& name)
 {
+    Assume(name.size() <= 13); // Linux keeps 15 bytes
     SetThreadName(("b-" + name).c_str());
     SetInternalName(name);
 }
diff --git a/depend/bitcoin/src/util/threadpool.h b/depend/bitcoin/src/util/threadpool.h
index ff0590f8..6c168515 100644
--- a/depend/bitcoin/src/util/threadpool.h
+++ b/depend/bitcoin/src/util/threadpool.h
@@ -112,7 +112,7 @@ class ThreadPool
         // Create workers
         m_workers.reserve(num_workers);
         for (int i = 0; i < num_workers; i++) {
-            m_workers.emplace_back(&util::TraceThread, strprintf("%s_pool_%d", m_name, i), [this] { WorkerThread(); });
+            m_workers.emplace_back(&util::TraceThread, strprintf("%s.%02d", m_name, i), [this] { WorkerThread(); });
         }
     }
 
diff --git a/depend/bitcoin/src/util/time.h b/depend/bitcoin/src/util/time.h
index 119c47a4..7df7c39a 100644
--- a/depend/bitcoin/src/util/time.h
+++ b/depend/bitcoin/src/util/time.h
@@ -23,7 +23,7 @@
 using namespace std::chrono_literals;
 
 /// Version of the system clock that is mockable in the context of tests (via
-/// NodeClockContext or ::SetMockTime), otherwise the system clock.
+/// FakeNodeClock or ::SetMockTime), otherwise the system clock.
 struct NodeClock : public std::chrono::system_clock {
     using time_point = std::chrono::time_point<NodeClock>;
     /** Return current system time or mocked time, if set */
@@ -42,7 +42,7 @@ using SteadyMicroseconds = std::chrono::time_point<std::chrono::steady_clock, st
 using SystemClock = std::chrono::system_clock;
 
 /// Version of SteadyClock that is mockable in the context of tests (via
-/// SteadyClockContext, or Self::SetMockTime), otherwise the system steady
+/// FakeSteadyClock, or Self::SetMockTime), otherwise the system steady
 /// clock.
 struct MockableSteadyClock : public std::chrono::steady_clock {
     using time_point = std::chrono::time_point<MockableSteadyClock>;
diff --git a/depend/bitcoin/src/util/tokenbucket.h b/depend/bitcoin/src/util/tokenbucket.h
new file mode 100644
index 00000000..ae8e8b53
--- /dev/null
+++ b/depend/bitcoin/src/util/tokenbucket.h
@@ -0,0 +1,69 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_UTIL_TOKENBUCKET_H
+#define BITCOIN_UTIL_TOKENBUCKET_H
+
+#include <util/time.h>
+
+namespace util {
+
+/** A token bucket rate limiter.
+ *
+ * Tokens are added at a steady rate (m_rate per second) up to a capacity
+ * cap (m_cap). Tokens are removed by calling decrement(), which returns
+ * false if the bucket is emptied.
+ *
+ * Typical usage:
+ *   bucket.increment(now);   // refill based on elapsed time
+ *   if (bucket.value() >= 1) bucket.decrement(1);  // consume a token
+ */
+template <typename Clock>
+class TokenBucket
+{
+public:
+    using clock = Clock;
+    using time_point = typename Clock::time_point;
+    using duration = typename Clock::duration;
+
+    const double m_rate{1};     //!< Tokens added per second
+    const double m_cap{0};      //!< Maximum token balance
+
+    /** @param rate   Tokens added per second.
+     *  @param value  Initial token balance (clamped to cap).
+     *  @param cap    Maximum token balance. */
+    TokenBucket(double rate, double value, double cap) : m_rate{rate}, m_cap{cap}, m_value{std::min(value, cap)} {}
+
+    /** Refill tokens based on elapsed time since last call. No refill
+     *  occurs on the first call (establishes the time baseline). */
+    void increment(const time_point& now)
+    {
+        if (now > m_last_updated) {
+            if (m_value < m_cap && m_last_updated > MIN_TIME) {
+                double inc = m_rate * std::chrono::duration_cast<SecondsDouble>(now - m_last_updated).count();
+                m_value = std::min(m_cap, m_value + inc);
+            }
+        }
+        m_last_updated = now;
+    }
+
+    /** Consume n tokens. Returns false if the balance dropped to/below the given floor. */
+    bool decrement(double n = 1.0, double floor = 0.0)
+    {
+        m_value -= n;
+        return (m_value > floor);
+    }
+
+    /** Current token balance. */
+    double value() const { return m_value; }
+
+private:
+    static constexpr time_point MIN_TIME{time_point::min()};
+    time_point m_last_updated{MIN_TIME};
+    double m_value{0};
+};
+
+} // namespace util
+
+#endif // BITCOIN_UTIL_TOKENBUCKET_H
diff --git a/depend/bitcoin/src/validation.cpp b/depend/bitcoin/src/validation.cpp
index f85a834f..09cb93c9 100644
--- a/depend/bitcoin/src/validation.cpp
+++ b/depend/bitcoin/src/validation.cpp
@@ -60,6 +60,7 @@
 #include <util/signalinterrupt.h>
 #include <util/strencodings.h>
 #include <util/string.h>
+#include <util/threadpool.h>
 #include <util/time.h>
 #include <util/trace.h>
 #include <util/translation.h>
@@ -113,6 +114,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);
@@ -987,8 +995,6 @@ bool MemPoolAccept::ReplacementChecks(Workspace& ws)
     const Txid& hash = ws.m_hash;
     TxValidationState& state = ws.m_state;
 
-    CFeeRate newFeeRate(ws.m_modified_fees, ws.m_vsize);
-
     CTxMemPool::setEntries all_conflicts;
 
     // Calculate all conflicting entries and enforce Rule #5.
@@ -1261,7 +1267,9 @@ bool MemPoolAccept::SubmitPackage(const ATMPArgs& args, std::vector<Workspace>&
             package_state.Invalid(PackageValidationResult::PCKG_MEMPOOL_ERROR,
                                   strprintf("BUG! PolicyScriptChecks succeeded but ConsensusScriptChecks failed: %s",
                                             ws.m_ptx->GetHash().ToString()));
-            // Remove the transaction from the mempool.
+        }
+        // Remove first failing tx and all subsequent in package
+        if (!all_submitted) {
             if (!m_subpackage.m_changeset) m_subpackage.m_changeset = m_pool.GetChangeSet();
             m_subpackage.m_changeset->StageRemoval(m_pool.GetIter(ws.m_ptx->GetHash()).value());
         }
@@ -1850,11 +1858,16 @@ CoinsViews::CoinsViews(DBParams db_params, CoinsViewOptions options)
     : m_dbview{std::move(db_params), std::move(options)},
       m_catcherview(&m_dbview) {}
 
-void CoinsViews::InitCache()
+void CoinsViews::InitCache(int32_t prevoutfetch_threads)
 {
     AssertLockHeld(::cs_main);
     m_cacheview = std::make_unique<CCoinsViewCache>(&m_catcherview);
-    m_connect_block_view = std::make_unique<CoinsViewOverlay>(&*m_cacheview);
+    auto thread_pool{std::make_shared<ThreadPool>("prevout")};
+    if (prevoutfetch_threads > 0) {
+        thread_pool->Start(prevoutfetch_threads);
+        LogInfo("Block input prevout fetching uses %d additional threads", prevoutfetch_threads);
+    }
+    m_connect_block_view = std::make_unique<CoinsViewOverlay>(&*m_cacheview, std::move(thread_pool));
 }
 
 Chainstate::Chainstate(
@@ -1930,7 +1943,7 @@ void Chainstate::InitCoinsCache(size_t cache_size_bytes)
     AssertLockHeld(::cs_main);
     assert(m_coins_views != nullptr);
     m_coinstip_cache_size_bytes = cache_size_bytes;
-    m_coins_views->InitCache();
+    m_coins_views->InitCache(m_chainman.m_options.prevoutfetch_threads_num);
 }
 
 // Lock-free: depends on `m_cached_is_ibd`, which is latched by `UpdateIBDStatus()`.
@@ -2508,11 +2521,10 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
     // in multiple threads). Preallocate the vector size so a new allocation
     // doesn't invalidate pointers into the vector, and keep txsdata in scope
     // for as long as `control`.
+    std::vector<PrecomputedTransactionData> txsdata(block.vtx.size());
     std::optional<CCheckQueueControl<CScriptCheck>> control;
     if (auto& queue = m_chainman.GetCheckQueue(); queue.HasThreads() && fScriptChecks) control.emplace(queue);
 
-    std::vector<PrecomputedTransactionData> txsdata(block.vtx.size());
-
     std::vector<int> prevheights;
     CAmount nFees = 0;
     int nInputs = 0;
@@ -2714,7 +2726,6 @@ bool Chainstate::FlushStateToDisk(
         bool fFlushForPrune = false;
 
         CoinsCacheSizeState cache_state = GetCoinsCacheSizeState();
-        LOCK(m_blockman.cs_LastBlockFile);
         if (m_blockman.IsPruneMode() && (m_blockman.m_check_for_pruning || nManualPruneHeight > 0) && m_chainman.m_blockman.m_blockfiles_indexed) {
             // make sure we don't prune above any of the prune locks bestblocks
             // pruning is height-based
@@ -2810,6 +2821,7 @@ bool Chainstate::FlushStateToDisk(
                 }
                 // Flush the chainstate (which may refer to block index entries).
                 empty_cache ? CoinsTip().Flush() : CoinsTip().Sync();
+                m_last_flushed_block = m_blockman.LookupBlockIndex(CoinsTip().GetBestBlock());
                 full_flush_completed = true;
                 TRACEPOINT(utxocache, flush,
                     int64_t{Ticks<std::chrono::microseconds>(NodeClock::now() - nNow)},
@@ -2825,9 +2837,18 @@ 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) {
+            m_chainman.m_options.signals->ChainStateFlushed(this->GetRole(), GetLocator(m_last_flushed_block));
+        }
+
+        if (!m_chainman.m_interrupt && ShouldCompactChainstate(m_chainman.IsInitialBlockDownload())) {
+            try {
+                CoinsDB().CompactFullAsync();
+            } catch (const std::exception& e) {
+                LogWarning("Failed to start chainstate compaction (%s)", e.what());
+            }
+        }
     }
     } catch (const std::runtime_error& e) {
         return FatalError(m_chainman.GetNotifications(), state, strprintf(_("System error while flushing: %s"), e.what()));
@@ -2864,8 +2885,8 @@ static void UpdateTipLog(
 
     AssertLockHeld(::cs_main);
 
-    // Disable rate limiting in LogPrintLevel_ so this source location may log during IBD.
-    LogPrintLevel_(BCLog::LogFlags::ALL, util::log::Level::Info, /*should_ratelimit=*/false, "%s%s: new best=%s height=%d version=0x%08x log2_work=%f tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)%s\n",
+    // Disable rate limiting as this may log frequently during IBD.
+    LogInfo(util::log::NO_RATE_LIMIT, "%s%s: new best=%s height=%d version=0x%08x log2_work=%f tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)%s\n",
                    prefix, func_name,
                    tip->GetBlockHash().ToString(), tip->nHeight, tip->nVersion,
                    log(tip->nChainWork.getdouble()) / log(2.0), tip->m_chain_tx_count,
@@ -3029,8 +3050,8 @@ bool Chainstate::ConnectTip(
     LogDebug(BCLog::BENCH, "  - Load block from disk: %.2fms\n",
              Ticks<MillisecondsDouble>(time_2 - time_1));
     {
-        CCoinsViewCache& view{*m_coins_views->m_connect_block_view};
-        const auto reset_guard{view.CreateResetGuard()};
+        CoinsViewOverlay& view{*m_coins_views->m_connect_block_view};
+        const auto reset_guard{view.StartFetching(*block_to_connect)};
         bool rv = ConnectBlock(*block_to_connect, state, pindexNew, view);
         if (m_chainman.m_options.signals) {
             m_chainman.m_options.signals->BlockChecked(block_to_connect, state);
@@ -3141,12 +3162,15 @@ CBlockIndex* Chainstate::FindMostWorkChain()
                 }
                 // Remove the entire chain from the set.
                 for (CBlockIndex *pindexFailed = pindexNew; pindexFailed != pindexTest; pindexFailed = pindexFailed->pprev) {
+                    // If we're missing data and not a descendant of an invalid block,
+                    // then add back to m_blocks_unlinked, so that if the block arrives in the future
+                    // we can try adding to setBlockIndexCandidates again.
                     if (fMissingData && !fFailedChain) {
-                        // If we're missing data and not a descendant of an invalid block,
-                        // then add back to m_blocks_unlinked, so that if the block arrives in the future
-                        // we can try adding to setBlockIndexCandidates again.
-                        m_blockman.m_blocks_unlinked.insert(
-                            std::make_pair(pindexFailed->pprev, pindexFailed));
+                        // Avoid duplicate entries in m_blocks_unlinked. If the same entry is
+                        // processed twice in ReceivedBlockTransactions(), it may be re-added to
+                        // setBlockIndexCandidates with a modified nSequenceId, breaking ordering
+                        // guarantees and leading to undefined behavior.
+                        m_blockman.AddUnlinkedBlock(pindexFailed);
                     }
                     setBlockIndexCandidates.erase(pindexFailed);
                 }
@@ -3810,7 +3834,7 @@ void ChainstateManager::ReceivedBlockTransactions(const CBlock& block, CBlockInd
         }
     } else {
         if (pindexNew->pprev && pindexNew->pprev->IsValid(BLOCK_VALID_TREE)) {
-            m_blockman.m_blocks_unlinked.insert(std::make_pair(pindexNew->pprev, pindexNew));
+            m_blockman.AddUnlinkedBlock(pindexNew);
         }
     }
 }
@@ -4378,7 +4402,14 @@ bool ChainstateManager::AcceptBlock(const std::shared_ptr<const CBlock>& pblock,
     // the block files may be pruned, so we can just call this on one
     // chainstate (particularly if we haven't implemented pruning with
     // background validation yet).
-    ActiveChainstate().FlushStateToDisk(state, FlushStateMode::NONE);
+    //
+    // Flush errors (e.g. low disk space during pruning) are ignored, so that
+    // callers can't mistreat a flush failure as a block validation failure.
+    // The fatal error notification inside FlushStateToDisk still fires,
+    // so the node will shut down on unrecoverable flush errors regardless.
+    // For state a dummy value is used, and the return value is ignored.
+    BlockValidationState flush_state_ignore;
+    (void)ActiveChainstate().FlushStateToDisk(flush_state_ignore, FlushStateMode::NONE);
 
     CheckBlockIndex();
 
@@ -4551,6 +4582,7 @@ bool Chainstate::LoadChainTip()
     }
     m_chain.SetTip(*pindex);
     m_chainman.UpdateIBDStatus();
+    m_last_flushed_block = pindex;
     tip = m_chain.Tip();
 
     // nSequenceId is one of the keys used to sort setBlockIndexCandidates. Ensure all
@@ -4726,7 +4758,10 @@ VerifyDBResult CVerifyDB::VerifyDB(
         }
     }
 
-    LogInfo("Verification: No coin database inconsistencies in last %i blocks (%i transactions)", block_count, nGoodTransactions);
+    LogInfo("Verification: checked last %i blocks at level %i", block_count, nCheckLevel);
+    if (nCheckLevel >= 3 && !skipped_l3_checks) {
+        LogInfo("Verification: no coin database inconsistencies (%i transactions)", nGoodTransactions);
+    }
 
     if (skipped_l3_checks) {
         return VerifyDBResult::SKIPPED_L3_CHECKS;
@@ -4913,30 +4948,30 @@ bool ChainstateManager::LoadBlockIndex()
     return true;
 }
 
-bool Chainstate::LoadGenesisBlock()
+bool ChainstateManager::LoadGenesisBlock()
 {
     LOCK(cs_main);
 
-    const CChainParams& params{m_chainman.GetParams()};
+    const CBlock& genesis_block{GetParams().GenesisBlock()};
 
     // Check whether we're already initialized by checking for genesis in
-    // m_blockman.m_block_index. Note that we can't use m_chain here, since it is
+    // m_blockman.m_block_index. Note that we can't use a chainstate's m_chain here, since it is
     // set based on the coins db, not the block index db, which is the only
     // thing loaded at this point.
-    if (m_blockman.m_block_index.contains(params.GenesisBlock().GetHash()))
+    if (m_blockman.m_block_index.contains(genesis_block.GetHash())) {
         return true;
+    }
 
     try {
-        const CBlock& block = params.GenesisBlock();
-        FlatFilePos blockPos{m_blockman.WriteBlock(block, 0)};
+        FlatFilePos blockPos{m_blockman.WriteBlock(genesis_block, 0)};
         if (blockPos.IsNull()) {
-            LogError("%s: writing genesis block to disk failed\n", __func__);
+            LogError("Writing genesis block to disk failed");
             return false;
         }
-        CBlockIndex* pindex = m_blockman.AddToBlockIndex(block, m_chainman.m_best_header);
-        m_chainman.ReceivedBlockTransactions(block, pindex, blockPos);
+        CBlockIndex* pindex{m_blockman.AddToBlockIndex(genesis_block, m_best_header)};
+        ReceivedBlockTransactions(genesis_block, pindex, blockPos);
     } catch (const std::runtime_error& e) {
-        LogError("%s: failed to write genesis block: %s\n", __func__, e.what());
+        LogError("Failed to write genesis block: %s", e.what());
         return false;
     }
 
@@ -5337,13 +5372,12 @@ void ChainstateManager::CheckBlockIndex() const
         // Check whether this block is in m_blocks_unlinked.
         auto rangeUnlinked{m_blockman.m_blocks_unlinked.equal_range(pindex->pprev)};
         bool foundInUnlinked = false;
-        while (rangeUnlinked.first != rangeUnlinked.second) {
-            assert(rangeUnlinked.first->first == pindex->pprev);
-            if (rangeUnlinked.first->second == pindex) {
+        for (auto it = rangeUnlinked.first; it != rangeUnlinked.second; ++it) {
+            assert(it->first == pindex->pprev);
+            if (it->second == pindex) {
+                assert(!foundInUnlinked); // No duplicates in m_blocks_unlinked
                 foundInUnlinked = true;
-                break;
             }
-            rangeUnlinked.first++;
         }
         if (pindex->pprev && (pindex->nStatus & BLOCK_HAVE_DATA) && pindexFirstNeverProcessed != nullptr && pindexFirstInvalid == nullptr) {
             // If this block has block data available, some parent was never received, and has no invalid parents, it must be in m_blocks_unlinked.
@@ -5811,7 +5845,7 @@ util::Result<void> ChainstateManager::PopulateAndValidateSnapshot(
                     return util::Error{Untranslated(strprintf("Bad snapshot data after deserializing %d coins - bad tx out value",
                               coins_count - coins_left))};
                 }
-                coins_cache.EmplaceCoinInternalDANGER(std::move(outpoint), std::move(coin));
+                coins_cache.EmplaceCoinInternalDANGER(outpoint, std::move(coin));
 
                 --coins_left;
                 ++coins_processed;
@@ -5884,7 +5918,7 @@ util::Result<void> ChainstateManager::PopulateAndValidateSnapshot(
 
     // As above, okay to immediately release cs_main here since no other context knows
     // about the snapshot_chainstate.
-    CCoinsViewDB* snapshot_coinsdb = WITH_LOCK(::cs_main, return &snapshot_chainstate.CoinsDB());
+    const CCoinsViewDB& snapshot_coinsdb = WITH_LOCK(::cs_main, return snapshot_chainstate.CoinsDB());
 
     std::optional<CCoinsStats> maybe_stats;
 
@@ -6025,7 +6059,7 @@ SnapshotCompletionResult ChainstateManager::MaybeValidateSnapshot(Chainstate& va
     try {
         validated_cs_stats = ComputeUTXOStats(
             CoinStatsHashType::HASH_SERIALIZED,
-            &validated_coins_db,
+            validated_coins_db,
             m_blockman,
             [&interrupt = m_interrupt] { SnapshotUTXOHashBreakpoint(interrupt); });
     } catch (StopHashingException const&) {
@@ -6232,7 +6266,7 @@ bool ChainstateManager::DeleteChainstate(Chainstate& chainstate)
     }
     std::unique_ptr<Chainstate> prev_chainstate{Assert(RemoveChainstate(chainstate))};
     Chainstate& curr_chainstate{CurrentChainstate()};
-    assert(prev_chainstate->m_mempool->size() == 0);
+    assert(!prev_chainstate->m_mempool || prev_chainstate->m_mempool->size() == 0);
     assert(!curr_chainstate.m_mempool);
     std::swap(curr_chainstate.m_mempool, prev_chainstate->m_mempool);
     return true;
diff --git a/depend/bitcoin/src/validation.h b/depend/bitcoin/src/validation.h
index 4cb5dc63..d1141afe 100644
--- a/depend/bitcoin/src/validation.h
+++ b/depend/bitcoin/src/validation.h
@@ -73,9 +73,9 @@ class SignalInterrupt;
 } // namespace util
 
 /** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of ActiveChain().Tip() will not be pruned. */
-static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
-static const signed int DEFAULT_CHECKBLOCKS = 6;
-static constexpr int DEFAULT_CHECKLEVEL{3};
+inline constexpr unsigned int MIN_BLOCKS_TO_KEEP = 288;
+inline constexpr signed int DEFAULT_CHECKBLOCKS = 6;
+inline constexpr int DEFAULT_CHECKLEVEL{3};
 // Require that user allocate at least 550 MiB for block & undo files (blk???.dat and rev???.dat)
 // At 1MB per block, 288 blocks = 288MB.
 // Add 15% for Undo data = 331MB
@@ -84,10 +84,13 @@ static constexpr int DEFAULT_CHECKLEVEL{3};
 // full block file chunks, we need the high water mark which triggers the prune to be
 // one 128MB block file + added 15% undo data = 147MB greater for a total of 545MB
 // Setting the target to >= 550 MiB will make it likely we can respect the target.
-static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES{550_MiB};
+inline constexpr uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES{550_MiB};
 
 /** Maximum number of dedicated script-checking threads allowed */
-static constexpr int MAX_SCRIPTCHECK_THREADS{15};
+inline constexpr int MAX_SCRIPTCHECK_THREADS{15};
+
+/** Maximum number of dedicated threads allowed for prefetching block input prevouts */
+inline constexpr int32_t MAX_PREVOUTFETCH_THREADS{16};
 
 /** Current sync state passed to tip changed callbacks. */
 enum class SynchronizationState {
@@ -503,7 +506,7 @@ class CoinsViews {
     CoinsViews(DBParams db_params, CoinsViewOptions options);
 
     //! Initialize the CCoinsViewCache member.
-    void InitCache() EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    void InitCache(int32_t prevoutfetch_threads) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 };
 
 enum class CoinsCacheSizeState
@@ -809,8 +812,6 @@ class Chainstate
 
     /** Whether the chain state needs to be redownloaded due to lack of witness data */
     [[nodiscard]] bool NeedsRedownload() const EXCLUSIVE_LOCKS_REQUIRED(cs_main);
-    /** Ensures we have a genesis block in the block tree, possibly writing one to disk. */
-    bool LoadGenesisBlock();
 
     /** Add a block to the candidate set if it has as much work as the current tip. */
     void TryAddBlockIndexCandidate(CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
@@ -839,6 +840,9 @@ class Chainstate
 
     std::string ToString() EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
+    //! Get the last block that was flushed to disk.
+    const CBlockIndex* GetLastFlushedBlock() const EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { return m_last_flushed_block; }
+
     //! Indirection necessary to make lock annotations work with an optional mempool.
     RecursiveMutex* MempoolMutex() const LOCK_RETURNED(m_mempool->cs)
     {
@@ -889,6 +893,7 @@ class Chainstate
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     NodeClock::time_point m_next_write{NodeClock::time_point::max()};
+    const CBlockIndex* m_last_flushed_block GUARDED_BY(::cs_main){nullptr};
 
     /**
      * In case of an invalid snapshot, rename the coins leveldb directory so
@@ -1085,6 +1090,9 @@ class ChainstateManager
     //! coins databases. This will be split somehow across chainstates.
     size_t m_total_coinsdb_cache{0};
 
+    /// Ensures a genesis block is in the block tree, possibly writing one to disk.
+    [[nodiscard]] bool LoadGenesisBlock();
+
     //! Instantiate a new chainstate.
     //!
     //! @param[in] mempool              The mempool to pass to the chainstate
diff --git a/depend/bitcoin/src/validationinterface.cpp b/depend/bitcoin/src/validationinterface.cpp
index 45f38b37..ec2f2047 100644
--- a/depend/bitcoin/src/validationinterface.cpp
+++ b/depend/bitcoin/src/validationinterface.cpp
@@ -171,7 +171,7 @@ void ValidationSignals::SyncWithValidationInterfaceQueue()
     } while (0)
 
 #define LOG_MSG(fmt, ...) \
-    (ShouldLog(BCLog::VALIDATION, BCLog::Level::Debug) ? tfm::format((fmt), __VA_ARGS__) : std::string{})
+    (util::log::ShouldDebugLog(BCLog::VALIDATION) ? tfm::format((fmt), __VA_ARGS__) : std::string{})
 
 #define LOG_EVENT(fmt, ...) \
     LogDebug(BCLog::VALIDATION, fmt, __VA_ARGS__)
diff --git a/depend/bitcoin/src/versionbits.h b/depend/bitcoin/src/versionbits.h
index 59b0cbee..6e3743c2 100644
--- a/depend/bitcoin/src/versionbits.h
+++ b/depend/bitcoin/src/versionbits.h
@@ -16,13 +16,13 @@
 class CChainParams;
 
 /** What block version to use for new blocks (pre versionbits) */
-static const int32_t VERSIONBITS_LAST_OLD_BLOCK_VERSION = 4;
+inline constexpr int32_t VERSIONBITS_LAST_OLD_BLOCK_VERSION = 4;
 /** What bits to set in version for versionbits blocks */
-static const int32_t VERSIONBITS_TOP_BITS = 0x20000000UL;
+inline constexpr int32_t VERSIONBITS_TOP_BITS = 0x20000000UL;
 /** What bitmask determines whether versionbits is in use */
-static const int32_t VERSIONBITS_TOP_MASK = 0xE0000000UL;
-/** Total bits available for versionbits */
-static const int32_t VERSIONBITS_NUM_BITS = 29;
+inline constexpr int32_t VERSIONBITS_TOP_MASK = 0xE0000000UL;
+/** Total bits available for versionbits (BIP 323) */
+inline constexpr int32_t VERSIONBITS_NUM_BITS = 5;
 
 /** Opaque type for BIP9 state. See versionbits_impl.h for details. */
 enum class ThresholdState : uint8_t;
@@ -72,7 +72,8 @@ struct BIP9GBTStatus {
 };
 
 /** BIP 9 allows multiple softforks to be deployed in parallel. We cache
- *  per-period state for every one of them. */
+ *  per-period state for every one we implement and warning state for each
+ *  BIP 323 allowed bit. */
 class VersionBitsCache
 {
 private:
diff --git a/depend/bitcoin/src/wallet/CMakeLists.txt b/depend/bitcoin/src/wallet/CMakeLists.txt
index 36fd3ef9..040569f7 100644
--- a/depend/bitcoin/src/wallet/CMakeLists.txt
+++ b/depend/bitcoin/src/wallet/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(bitcoin_wallet STATIC EXCLUDE_FROM_ALL
   crypter.cpp
   db.cpp
   dump.cpp
+  export.cpp
   external_signer_scriptpubkeyman.cpp
   feebumper.cpp
   fees.cpp
diff --git a/depend/bitcoin/src/wallet/coincontrol.h b/depend/bitcoin/src/wallet/coincontrol.h
index f329de68..d30cbe1c 100644
--- a/depend/bitcoin/src/wallet/coincontrol.h
+++ b/depend/bitcoin/src/wallet/coincontrol.h
@@ -19,13 +19,13 @@
 #include <set>
 
 namespace wallet {
-const int DEFAULT_MIN_DEPTH = 0;
-const int DEFAULT_MAX_DEPTH = 9999999;
+inline constexpr int DEFAULT_MIN_DEPTH = 0;
+inline constexpr int DEFAULT_MAX_DEPTH = 9'999'999;
 
-const int DEFAULT_WALLET_TX_VERSION = CTransaction::CURRENT_VERSION;
+inline constexpr int DEFAULT_WALLET_TX_VERSION = CTransaction::CURRENT_VERSION;
 
 //! Default for -avoidpartialspends
-static constexpr bool DEFAULT_AVOIDPARTIALSPENDS = false;
+inline constexpr bool DEFAULT_AVOIDPARTIALSPENDS = false;
 
 class PreselectedInput
 {
diff --git a/depend/bitcoin/src/wallet/coinselection.cpp b/depend/bitcoin/src/wallet/coinselection.cpp
index d6ea6851..8d69957c 100644
--- a/depend/bitcoin/src/wallet/coinselection.cpp
+++ b/depend/bitcoin/src/wallet/coinselection.cpp
@@ -8,9 +8,9 @@
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <interfaces/chain.h>
-#include <logging.h>
 #include <policy/feerate.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 
 #include <numeric>
@@ -54,25 +54,47 @@ struct {
  * set that can pay for the spending target and does not exceed the spending target by more than the
  * cost of creating and spending a change output. The algorithm uses a depth-first search on a binary
  * tree. In the binary tree, each node corresponds to the inclusion or the omission of a UTXO. UTXOs
- * are sorted by their effective values and the tree is explored deterministically per the inclusion
- * branch first. At each node, the algorithm checks whether the selection is within the target range.
+ * are sorted by their effective values, tie-broken by their waste score, and the tree is explored deterministically per the inclusion
+ * branch first. For each new input set candidate, the algorithm checks whether the selection is within the target range.
  * While the selection has not reached the target range, more UTXOs are included. When a selection's
- * value exceeds the target range, the complete subtree deriving from this selection can be omitted.
+ * value exceeds the target range, the complete subtree deriving from this selection prefix can be omitted.
  * At that point, the last included UTXO is deselected and the corresponding omission branch explored
- * instead. The search ends after the complete tree has been searched or after a limited number of tries.
+ * instead starting by adding the subsequent UTXO. The search ends after the complete tree has been searched or after a limited number of tries.
  *
- * The search continues to search for better solutions after one solution has been found. The best
- * solution is chosen by minimizing the waste metric. The waste metric is defined as the cost to
+ * The algorithm continues to search for better solutions after one solution has been found. The best
+ * solution is chosen by minimal waste score. The waste metric is defined as the cost to
  * spend the current inputs at the given fee rate minus the long term expected cost to spend the
- * inputs, plus the amount by which the selection exceeds the spending target:
+ * inputs, plus the amount by which the selection exceeds the spending target (the "excess"):
  *
- * waste = selectionTotal - target + inputs × (currentFeeRate - longTermFeeRate)
+ *    excess = selected_amount - target
+ *    waste = inputs × (currentFeeRate - longTermFeeRate) + excess
  *
- * The algorithm uses two additional optimizations. A lookahead keeps track of the total value of
- * the unexplored UTXOs. A subtree is not explored if the lookahead indicates that the target range
- * cannot be reached. Further, it is unnecessary to test equivalent combinations. This allows us
- * to skip testing the inclusion of UTXOs that match the effective value and waste of an omitted
- * predecessor.
+ * Note that this means that at fee rates higher than longTermFeeRate additional inputs increase the
+ * waste score, while at fee rates lower than longTermFeeRate additional inputs decrease the waste
+ * score.
+ *
+ * The algorithm uses the following optimizations:
+ * 1. Lookahead: The lookahead stores the total remaining effective value of the undecided UTXOs for
+ *    every depth of the search tree. Whenever the currently selected amount plus the potential
+ *    amount from the lookahead falls short of the target, we can immediately stop searching the
+ *    subtree as no more input set candidates can be found in it.
+ * 2. Skip clones: When two UTXOs match in weight and effective value ("are clones"), naive
+ *    exploration would cause redundant work: e.g., given the UTXOs A, A', and B, where A and A' are
+ *    clones, naive exploration would combine (read underscore as omission):
+ *    [{}, {A}, {A, A'}, {A, A', B}, {A, _, B}, {_, A'}, {_, A', B}, {_, _, B}].
+ *    In this case the input set candidates {A} and {A'} as well as {A, B} and {A', B} are
+ *    equivalent. It is sufficient to explore combinations that select either both UTXOs or the
+ *    first UTXO. Whenever the first UTXO is omitted, we can also skip the clone as we have already
+ *    explored a set of equivalent combination as the one we could generate with the second clone.
+ *    Concretely, we skip a UTXO when its predecessor is omitted and the UTXO matches the
+ *    effective value and the waste of the predecessor.
+ * 3. Skip similar UTXOs that are more wasteful: This search algorithm operates on the list of UTXOs
+ *    sorted by effective value, tie-broken to prefer lower waste. This means that among two
+ *    subsequent UTXOs with the same effective value, the second UTXO’s waste score will either be
+ *    equal _or higher_ than the first UTXO’s. This allows us to apply the clone skipping idea more
+ *    broadly: any combination with the second UTXO is equivalent _or worse_ than what we already
+ *    combined with the first UTXO. We skip a UTXO if its predecessor is omitted and the predecessor
+ *    matches in effective value.
  *
  * The Branch and Bound algorithm is described in detail in Murch's Master Thesis:
  * https://murch.one/wp-content/uploads/2016/11/erhardt2016coinselection.pdf
@@ -93,113 +115,165 @@ static const size_t TOTAL_TRIES = 100000;
 util::Result<SelectionResult> SelectCoinsBnB(std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const CAmount& cost_of_change,
                                              int max_selection_weight)
 {
-    SelectionResult result(selection_target, SelectionAlgorithm::BNB);
-    CAmount curr_value = 0;
-    std::vector<size_t> curr_selection; // selected utxo indexes
-    int curr_selection_weight = 0; // sum of selected utxo weight
-
-    // Calculate curr_available_value
-    CAmount curr_available_value = 0;
-    for (const OutputGroup& utxo : utxo_pool) {
-        // Assert that this utxo is not negative. It should never be negative,
-        // effective value calculation should have removed it
-        assert(utxo.GetSelectionAmount() > 0);
-        curr_available_value += utxo.GetSelectionAmount();
+    std::sort(utxo_pool.begin(), utxo_pool.end(), descending);
+    // The sum of UTXO amounts after this UTXO index, e.g. lookahead[5] = Σ(UTXO[6+].amount)
+    std::vector<CAmount> lookahead(utxo_pool.size());
+
+    // Calculate lookahead values, and check that there are sufficient funds
+    CAmount total_available = 0;
+    for (int index = static_cast<int>(utxo_pool.size()) - 1; index >= 0; --index) {
+        lookahead[index] = total_available;
+        // UTXOs with non-positive effective value must have been filtered
+        Assume(utxo_pool[index].GetSelectionAmount() > 0);
+        total_available += utxo_pool[index].GetSelectionAmount();
     }
-    if (curr_available_value < selection_target) {
+
+    if (total_available < selection_target) {
+        // Insufficient funds
         return util::Error();
     }
 
-    // Sort the utxo_pool
-    std::sort(utxo_pool.begin(), utxo_pool.end(), descending);
 
-    CAmount curr_waste = 0;
+    // The current selection and the best input set found so far, stored as the utxo_pool indices of the UTXOs forming them
+    std::vector<size_t> curr_selection;
     std::vector<size_t> best_selection;
+
+    // The currently selected effective amount
+    CAmount curr_amount = 0;
+
+    // The waste score of the current selection, and the best waste score so far
+    CAmount curr_selection_waste = 0;
     CAmount best_waste = MAX_MONEY;
 
-    bool is_feerate_high = utxo_pool.at(0).fee > utxo_pool.at(0).long_term_fee;
+    // The weight of the currently selected input set
+    int curr_weight = 0;
+
+    // Whether the input sets generated during this search have exceeded the maximum transaction weight at any point
     bool max_tx_weight_exceeded = false;
 
-    // Depth First search loop for choosing the UTXOs
-    for (size_t curr_try = 0, utxo_pool_index = 0; curr_try < TOTAL_TRIES; ++curr_try, ++utxo_pool_index) {
-        // Conditions for starting a backtrack
-        bool backtrack = false;
-        if (curr_value + curr_available_value < selection_target || // Cannot possibly reach target with the amount remaining in the curr_available_value.
-            curr_value > selection_target + cost_of_change || // Selected value is out of range, go back and try other branch
-            (curr_waste > best_waste && is_feerate_high)) { // Don't select things which we know will be more wasteful if the waste is increasing
-            backtrack = true;
-        } else if (curr_selection_weight > max_selection_weight) { // Selected UTXOs weight exceeds the maximum weight allowed, cannot find more solutions by adding more inputs
-            max_tx_weight_exceeded = true; // at least one selection attempt exceeded the max weight
-            backtrack = true;
-        } else if (curr_value >= selection_target) {       // Selected value is within range
-            curr_waste += (curr_value - selection_target); // This is the excess value which is added to the waste for the below comparison
-            // Adding another UTXO after this check could bring the waste down if the long term fee is higher than the current fee.
-            // However we are not going to explore that because this optimization for the waste is only done when we have hit our target
-            // value. Adding any more UTXOs will be just burning the UTXO; it will go entirely to fees. Thus we aren't going to
-            // explore any more UTXOs to avoid burning money like that.
+    // Index of the next UTXO to consider in utxo_pool
+    size_t next_utxo = 0;
+
+    auto deselect_last = [&]() {
+        OutputGroup& utxo = utxo_pool[curr_selection.back()];
+        curr_amount -= utxo.GetSelectionAmount();
+        curr_weight -= utxo.m_weight;
+        curr_selection_waste -= utxo.fee - utxo.long_term_fee;
+        curr_selection.pop_back();
+    };
+
+    size_t curr_try = 0;
+    SelectionResult result(selection_target, SelectionAlgorithm::BNB);
+    bool is_done = false;
+    // We don’t have access to the feerate here, but fee to long_term_fee is as feerate to LTFRE
+    bool is_feerate_high = utxo_pool.at(0).fee > utxo_pool.at(0).long_term_fee;
+    while (!is_done) {
+        bool should_shift{false}, should_cut{false};
+        // Select `next_utxo`
+        OutputGroup& utxo = utxo_pool[next_utxo];
+        curr_amount += utxo.GetSelectionAmount();
+        curr_weight += utxo.m_weight;
+        curr_selection_waste += utxo.fee - utxo.long_term_fee;
+        curr_selection.push_back(next_utxo);
+        ++next_utxo;
+        ++curr_try;
+
+        // EVALUATE current selection: check for solutions and see whether we can CUT or SHIFT before EXPLORING further
+        if (curr_amount + lookahead[curr_selection.back()] < selection_target) {
+            // Insufficient funds with lookahead: CUT
+            should_cut = true;
+        } else if (curr_weight > max_selection_weight) {
+            // max_weight exceeded: SHIFT
+            max_tx_weight_exceeded = true;
+            should_shift = true;
+        } else if (curr_amount > selection_target + cost_of_change) {
+            // Overshot target range: SHIFT
+            should_shift = true;
+        } else if (is_feerate_high && curr_selection_waste > best_waste) {
+            // At high feerates adding more inputs will increase the waste score. If the current waste is already worse
+            // than the best selection’s while we have insufficient funds, it is impossible for this partial selection
+            // to beat the best selection by adding more inputs: SHIFT
+            // At low feerates, additional inputs lower the waste score, and using this would cause us to skip exploring
+            // combinations with more inputs of lower amounts.
+            should_shift = true;
+        } else if (curr_amount >= selection_target) {
+            // Selection is within target window: potential solution
+            // Adding more UTXOs only increases fees and cannot be better: SHIFT
+            should_shift = true;
+            // The amount exceeding the selection_target (the "excess"), would be dropped to the fees: it is waste.
+            CAmount curr_excess = curr_amount - selection_target;
+            CAmount curr_waste = curr_selection_waste + curr_excess;
             if (curr_waste <= best_waste) {
+                // New best solution
                 best_selection = curr_selection;
                 best_waste = curr_waste;
             }
-            curr_waste -= (curr_value - selection_target); // Remove the excess value as we will be selecting different coins now
-            backtrack = true;
         }
 
-        if (backtrack) { // Backtracking, moving backwards
-            if (curr_selection.empty()) { // We have walked back to the first utxo and no branch is untraversed. All solutions searched
-                break;
-            }
+        if (curr_try >= TOTAL_TRIES) {
+            // Solution is not guaranteed to be optimal if `curr_try` hit TOTAL_TRIES
+            result.SetAlgoCompleted(false);
+            break;
+        }
 
-            // Add omitted UTXOs back to lookahead before traversing the omission branch of last included UTXO.
-            for (--utxo_pool_index; utxo_pool_index > curr_selection.back(); --utxo_pool_index) {
-                curr_available_value += utxo_pool.at(utxo_pool_index).GetSelectionAmount();
-            }
+        if (next_utxo == utxo_pool.size()) {
+            // Last added UTXO was end of UTXO pool, nothing left to add on inclusion or omission branch: CUT
+            should_cut = true;
+        }
 
-            // Output was included on previous iterations, try excluding now.
-            assert(utxo_pool_index == curr_selection.back());
-            OutputGroup& utxo = utxo_pool.at(utxo_pool_index);
-            curr_value -= utxo.GetSelectionAmount();
-            curr_waste -= utxo.fee - utxo.long_term_fee;
-            curr_selection_weight -= utxo.m_weight;
-            curr_selection.pop_back();
-        } else { // Moving forwards, continuing down this branch
-            OutputGroup& utxo = utxo_pool.at(utxo_pool_index);
-
-            // Remove this utxo from the curr_available_value utxo amount
-            curr_available_value -= utxo.GetSelectionAmount();
-
-            if (curr_selection.empty() ||
-                // The previous index is included and therefore not relevant for exclusion shortcut
-                (utxo_pool_index - 1) == curr_selection.back() ||
-                // Avoid searching a branch if the previous UTXO has the same value and same waste and was excluded.
-                // Since the ratio of fee to long term fee is the same, we only need to check if one of those values match in order to know that the waste is the same.
-                utxo.GetSelectionAmount() != utxo_pool.at(utxo_pool_index - 1).GetSelectionAmount() ||
-                utxo.fee != utxo_pool.at(utxo_pool_index - 1).fee)
-            {
-                // Inclusion branch first (Largest First Exploration)
-                curr_selection.push_back(utxo_pool_index);
-                curr_value += utxo.GetSelectionAmount();
-                curr_waste += utxo.fee - utxo.long_term_fee;
-                curr_selection_weight += utxo.m_weight;
+        if (should_cut) {
+            // Neither adding to the current selection nor exploring the omission branch of the last selected UTXO can
+            // find any solutions. Redirect to exploring the Omission branch of the penultimate selected UTXO (i.e.
+            // set `next_utxo` to one after the penultimate selected, then deselect the last two selected UTXOs)
+            deselect_last();
+            should_shift = true;
+        }
+
+        while (should_shift) {
+            if (curr_selection.empty()) {
+                // Exhausted search space before running into attempt limit
+                is_done = true;
+                result.SetAlgoCompleted(true);
+                break;
+            }
+            // Set `next_utxo` to one after last selected, then deselect last selected UTXO
+            next_utxo = curr_selection.back() + 1;
+            deselect_last();
+            should_shift = false;
+
+            // After SHIFTing to an omission branch, the `next_utxo` might have the same effective value as the
+            // UTXO we just omitted. Since lower waste is our tiebreaker on UTXOs with equal effective value for sorting, if it
+            // ties on the effective value, it _must_ have the same waste (i.e. be a "clone" of the prior UTXO) or a
+            // higher waste.  If so, selecting `next_utxo` would produce an equivalent or worse
+            // selection as one we previously evaluated. In that case, increment `next_utxo` until we find a UTXO with a
+            // differing amount.
+            Assume(next_utxo < utxo_pool.size());
+            while (utxo_pool[next_utxo - 1].GetSelectionAmount() == utxo_pool[next_utxo].GetSelectionAmount()) {
+                if (next_utxo >= utxo_pool.size() - 1) {
+                    // Reached end of UTXO pool skipping clones: SHIFT instead
+                    should_shift = true;
+                    break;
+                }
+                // Skip clone: previous UTXO is equivalent and unselected
+                ++next_utxo;
             }
         }
     }
 
-    // Check for solution
+    result.SetSelectionsEvaluated(curr_try);
+
     if (best_selection.empty()) {
         return max_tx_weight_exceeded ? ErrorMaxWeightExceeded() : util::Error();
     }
 
-    // Set output set
     for (const size_t& i : best_selection) {
         result.AddInput(utxo_pool.at(i));
     }
-    result.RecalculateWaste(cost_of_change, cost_of_change, CAmount{0});
-    assert(best_waste == result.GetWaste());
 
     return result;
 }
 
+
 /*
  * TL;DR: Coin Grinder is a DFS-based algorithm that deterministically searches for the minimum-weight input set to fund
  * the transaction. The algorithm is similar to the Branch and Bound algorithm, but will produce a transaction _with_ a
@@ -529,7 +603,7 @@ class MinOutputGroupComparator
 public:
     int operator() (const OutputGroup& group1, const OutputGroup& group2) const
     {
-        return group1.GetSelectionAmount() > group2.GetSelectionAmount();
+        return descending_effval_weight(group1, group2);
     }
 };
 
@@ -732,7 +806,7 @@ util::Result<SelectionResult> KnapsackSolver(std::vector<OutputGroup>& groups, c
             result.AddInput(*lowest_larger);
         }
 
-        if (LogAcceptCategory(BCLog::SELECTCOINS, BCLog::Level::Debug)) {
+        if (util::log::ShouldDebugLog(BCLog::SELECTCOINS)) {
             std::string log_message{"Coin selection best subset: "};
             for (unsigned int i = 0; i < applicable_groups.size(); i++) {
                 if (vfBest[i]) {
diff --git a/depend/bitcoin/src/wallet/coinselection.h b/depend/bitcoin/src/wallet/coinselection.h
index 2457cf95..a6206331 100644
--- a/depend/bitcoin/src/wallet/coinselection.h
+++ b/depend/bitcoin/src/wallet/coinselection.h
@@ -20,9 +20,9 @@
 
 namespace wallet {
 //! lower bound for randomly-chosen target change amount
-static constexpr CAmount CHANGE_LOWER{50000};
+inline constexpr CAmount CHANGE_LOWER{50'000};
 //! upper bound for randomly-chosen target change amount
-static constexpr CAmount CHANGE_UPPER{1000000};
+inline constexpr CAmount CHANGE_UPPER{1'000'000};
 
 /** A UTXO under consideration for use in funding a new transaction. */
 struct COutput {
diff --git a/depend/bitcoin/src/wallet/crypter.h b/depend/bitcoin/src/wallet/crypter.h
index 90871245..03fd8325 100644
--- a/depend/bitcoin/src/wallet/crypter.h
+++ b/depend/bitcoin/src/wallet/crypter.h
@@ -11,9 +11,9 @@
 
 
 namespace wallet {
-const unsigned int WALLET_CRYPTO_KEY_SIZE = 32;
-const unsigned int WALLET_CRYPTO_SALT_SIZE = 8;
-const unsigned int WALLET_CRYPTO_IV_SIZE = 16;
+inline constexpr unsigned int WALLET_CRYPTO_KEY_SIZE = 32;
+inline constexpr unsigned int WALLET_CRYPTO_SALT_SIZE = 8;
+inline constexpr unsigned int WALLET_CRYPTO_IV_SIZE = 16;
 
 /**
  * Private key encryption is done based on a CMasterKey,
diff --git a/depend/bitcoin/src/wallet/db.cpp b/depend/bitcoin/src/wallet/db.cpp
index cad3d7b5..3af0f1ca 100644
--- a/depend/bitcoin/src/wallet/db.cpp
+++ b/depend/bitcoin/src/wallet/db.cpp
@@ -5,8 +5,8 @@
 
 #include <chainparams.h>
 #include <common/args.h>
-#include <logging.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <wallet/db.h>
 
 #include <algorithm>
diff --git a/depend/bitcoin/src/wallet/export.cpp b/depend/bitcoin/src/wallet/export.cpp
new file mode 100644
index 00000000..67bd7eb4
--- /dev/null
+++ b/depend/bitcoin/src/wallet/export.cpp
@@ -0,0 +1,196 @@
+// Copyright (c) 2026-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+#include <wallet/export.h>
+
+#include <key_io.h>
+#include <util/fs.h>
+#include <util/expected.h>
+#include <wallet/scriptpubkeyman.h>
+#include <wallet/context.h>
+#include <wallet/sqlite.h>
+#include <wallet/wallet.h>
+
+#include <fstream>
+
+namespace wallet {
+util::Expected<std::vector<WalletDescInfo>, std::string> ExportDescriptors(const CWallet& wallet, bool export_private)
+{
+    AssertLockHeld(wallet.cs_wallet);
+    std::vector<WalletDescInfo> wallet_descriptors;
+    for (const auto& spk_man : wallet.GetAllScriptPubKeyMans()) {
+        const auto desc_spk_man = dynamic_cast<DescriptorScriptPubKeyMan*>(spk_man);
+        if (!desc_spk_man) {
+            return util::Unexpected{"Unexpected ScriptPubKey manager type."};
+        }
+        LOCK(desc_spk_man->cs_desc_man);
+        const auto& wallet_descriptor = desc_spk_man->GetWalletDescriptor();
+        std::string descriptor;
+        if (!Assume(desc_spk_man->GetDescriptorString(descriptor, export_private))) {
+            return util::Unexpected{"Can't get descriptor string."};
+        }
+        const bool is_range = wallet_descriptor.descriptor->IsRange();
+        wallet_descriptors.emplace_back(
+            descriptor,
+            wallet_descriptor.creation_time,
+            wallet.IsActiveScriptPubKeyMan(*desc_spk_man),
+            wallet.IsInternalScriptPubKeyMan(desc_spk_man),
+            is_range ? std::optional(std::make_pair(wallet_descriptor.range_start, wallet_descriptor.range_end)) : std::nullopt,
+            wallet_descriptor.next_index
+        );
+    }
+    return wallet_descriptors;
+}
+
+util::Result<std::string> ExportWatchOnlyWallet(const CWallet& wallet, const fs::path& destination, WalletContext& context)
+{
+    AssertLockHeld(wallet.cs_wallet);
+
+    if (destination.empty()) {
+        return util::Error{_("Error: Export destination cannot be empty")};
+    }
+    if (fs::exists(destination)) {
+        return util::Error{strprintf(_("Error: Export destination '%s' already exists"), fs::PathToString(destination))};
+    }
+    if (!std::ofstream{fs::PathToString(destination)}) {
+        return util::Error{strprintf(_("Error: Could not create file '%s'"), fs::PathToString(destination))};
+    }
+    bool success = false;
+    auto cleanup_destination = interfaces::MakeCleanupHandler([&success, &destination] {
+        if (!success) fs::remove(destination);
+    });
+
+    // Get the descriptors from this wallet
+    util::Expected<std::vector<WalletDescInfo>, std::string> exported = ExportDescriptors(wallet, /*export_private=*/false);
+    if (!exported) {
+        return util::Error{Untranslated(exported.error())};
+    }
+    if (exported->empty()) {
+        return util::Error{_("Error: Wallet has no descriptors to export")};
+    }
+
+    // Make the wallet with the same flags as this wallet, but without private keys
+    const uint64_t create_flags = wallet.GetWalletFlags() | WALLET_FLAG_DISABLE_PRIVATE_KEYS;
+
+    // Create the temporary watchonly wallet in memory to avoid leaving files on disk
+    std::vector<bilingual_str> warnings;
+    bilingual_str error;
+    WalletContext empty_context;
+    empty_context.args = context.args;
+    std::shared_ptr<CWallet> watchonly_wallet = CWallet::CreateNew(empty_context, /*name=*/wallet.GetName() + "_watchonly_temp", MakeInMemoryWalletDatabase(), create_flags, /*born_encrypted=*/false, error, warnings);
+    if (!watchonly_wallet) {
+        return util::Error{strprintf(_("Error: Failed to create new watchonly wallet. %s"), error)};
+    }
+
+    {
+        LOCK(watchonly_wallet->cs_wallet);
+
+        // Parse the descriptors and add them to the new wallet
+        for (const WalletDescInfo& desc_info : *Assert(exported)) {
+            // Parse the descriptor
+            FlatSigningProvider dummy_keys;
+            std::string dummy_err;
+            std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_info.descriptor, dummy_keys, dummy_err, /*require_checksum=*/true);
+            CHECK_NONFATAL(descs.size() == 1); // All of our descriptors should be valid, and not multipath
+            CHECK_NONFATAL(dummy_keys.keys.size() == 0); // No private keys should be present in our exported descriptors
+
+            // Get the range if there is one
+            int32_t range_start = 0;
+            int32_t range_end = 0;
+            if (desc_info.range) {
+                range_start = desc_info.range->first;
+                range_end = desc_info.range->second;
+            }
+
+            WalletDescriptor w_desc(std::move(descs.at(0)), desc_info.creation_time, range_start, range_end, desc_info.next_index);
+
+            // For descriptors that cannot self expand (i.e. needs private keys or cache), retrieve the cache
+            uint256 desc_id = w_desc.id;
+            if (!w_desc.descriptor->CanSelfExpand()) {
+                DescriptorScriptPubKeyMan* desc_spkm = dynamic_cast<DescriptorScriptPubKeyMan*>(wallet.GetScriptPubKeyMan(desc_id));
+                w_desc.cache = WITH_LOCK(desc_spkm->cs_desc_man, return desc_spkm->GetWalletDescriptor().cache);
+            }
+
+            // Add to the watchonly wallet
+            if (auto spkm_res = watchonly_wallet->AddWalletDescriptor(w_desc, dummy_keys, /*label=*/"", /*internal=*/false); !spkm_res) {
+                return util::Error{util::ErrorString(spkm_res)};
+            }
+
+            // Set active spkms as active
+            if (desc_info.active) {
+                // Determine whether this descriptor is internal
+                // This is only set for active spkms
+                bool internal = false;
+                if (desc_info.internal) {
+                    internal = *desc_info.internal;
+                }
+                watchonly_wallet->AddActiveScriptPubKeyMan(desc_id, *Assert(w_desc.descriptor->GetOutputType()), internal);
+            }
+        }
+
+        // Copy locked coins that are persisted
+        for (const auto& [coin, persisted] : wallet.m_locked_coins) {
+            if (!persisted) continue;
+            watchonly_wallet->LockCoin(coin, persisted);
+        }
+
+        {
+            // Make a WalletBatch for the watchonly wallet so that everything else can be written atomically
+            WalletBatch watchonly_batch(watchonly_wallet->GetDatabase());
+            if (!watchonly_batch.TxnBegin()) {
+                return util::Error{strprintf(_("Error: database transaction cannot be executed for new watchonly wallet %s"), watchonly_wallet->GetName())};
+            }
+
+            // Copy orderPosNext
+            watchonly_batch.WriteOrderPosNext(wallet.nOrderPosNext);
+
+            // Write the best block locator to avoid rescanning on reload
+            CBlockLocator best_block_locator;
+            {
+                WalletBatch local_wallet_batch(wallet.GetDatabase());
+                if (!local_wallet_batch.ReadBestBlock(best_block_locator)) {
+                    return util::Error{_("Error: Unable to read wallet's best block locator record")};
+                }
+            }
+            if (!watchonly_batch.WriteBestBlock(best_block_locator)) {
+                return util::Error{_("Error: Unable to write watchonly wallet best block locator record")};
+            }
+
+            // Copy the transactions
+            for (const auto& [txid, wtx] : wallet.mapWallet) {
+                DataStream wtx_ser;
+                wtx_ser << wtx;
+                CWalletTx copy_wtx(deserialize, wtx_ser, wtx.GetTxs());
+                if (!watchonly_wallet->LoadToWallet(std::move(copy_wtx))) {
+                    return util::Error{strprintf(_("Error: Could not add tx %s to watchonly wallet"), txid.GetHex())};
+                }
+                watchonly_batch.WriteTx(watchonly_wallet->mapWallet.at(txid));
+            }
+
+            // Copy address book
+            for (const auto& [dest, entry] : wallet.m_address_book) {
+                auto address{EncodeDestination(dest)};
+                if (entry.purpose) watchonly_batch.WritePurpose(address, PurposeToString(*entry.purpose));
+                if (entry.label) watchonly_batch.WriteName(address, *entry.label);
+                for (const auto& [id, request] : entry.receive_requests) {
+                    watchonly_batch.WriteAddressReceiveRequest(dest, id, request);
+                }
+                if (entry.previously_spent) watchonly_batch.WriteAddressPreviouslySpent(dest, true);
+            }
+
+            if (!watchonly_batch.TxnCommit()) {
+                return util::Error{_("Error: cannot commit db transaction for watchonly wallet export")};
+            }
+        }
+
+        // Make a backup of this wallet at the specified destination directory
+        if (!watchonly_wallet->BackupWallet(fs::PathToString(destination))) {
+            return util::Error{_("Error: Unable to write the exported wallet")};
+        }
+        success = true;
+    }
+
+    return fs::PathToString(destination);
+}
+} // namespace wallet
diff --git a/depend/bitcoin/src/wallet/export.h b/depend/bitcoin/src/wallet/export.h
new file mode 100644
index 00000000..5f228930
--- /dev/null
+++ b/depend/bitcoin/src/wallet/export.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2026-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_WALLET_EXPORT_H
+#define BITCOIN_WALLET_EXPORT_H
+
+#include <threadsafety.h>
+#include <util/expected.h>
+#include <wallet/wallet.h>
+
+#include <optional>
+#include <vector>
+
+namespace wallet {
+// Struct containing all of the info from WalletDescriptor, except with the descriptor as a string,
+// and without its ID or cache.
+// Used when exporting descriptors from the wallet.
+struct WalletDescInfo {
+    std::string descriptor;
+    uint64_t creation_time;
+    bool active;
+    std::optional<bool> internal;
+    std::optional<std::pair<int64_t,int64_t>> range;
+    int64_t next_index;
+};
+
+//! Export the descriptors from a wallet so that they can be imported elsewhere
+util::Expected<std::vector<WalletDescInfo>, std::string> ExportDescriptors(const CWallet& wallet, bool export_private) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet);
+
+//! Make a new watchonly wallet file containing the public descriptors from this wallet
+//! The exported watchonly wallet file will be named and placed at the path specified in 'destination'
+util::Result<std::string> ExportWatchOnlyWallet(const CWallet& wallet, const fs::path& destination, WalletContext& context) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet);
+} // namespace wallet
+
+#endif // BITCOIN_WALLET_EXPORT_H
diff --git a/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.cpp b/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.cpp
index f9fa46b9..758be582 100644
--- a/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.cpp
+++ b/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -21,28 +21,35 @@
 using common::PSBTError;
 
 namespace wallet {
-bool ExternalSignerScriptPubKeyMan::SetupDescriptor(WalletBatch& batch, std::unique_ptr<Descriptor> desc)
+std::unique_ptr<ExternalSignerScriptPubKeyMan> ExternalSignerScriptPubKeyMan::LoadFromStorage(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys)
 {
-    LOCK(cs_desc_man);
-    assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
-    assert(m_storage.IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER));
+    return std::unique_ptr<ExternalSignerScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(storage, descriptor, keypool_size, keys, ckeys));
+}
+
+std::unique_ptr<ExternalSignerScriptPubKeyMan> ExternalSignerScriptPubKeyMan::CreateNew(WalletStorage& storage, WalletBatch& batch, int64_t keypool_size, std::unique_ptr<Descriptor> desc)
+{
+    auto spkm = std::unique_ptr<ExternalSignerScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(storage, keypool_size));
+
+    LOCK(spkm->cs_desc_man);
+    assert(storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
+    assert(storage.IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER));
 
     int64_t creation_time = GetTime();
 
     // Make the descriptor
     WalletDescriptor w_desc(std::move(desc), creation_time, 0, 0, 0);
-    m_wallet_descriptor = w_desc;
+    spkm->m_wallet_descriptor = w_desc;
 
     // Store the descriptor
-    if (!batch.WriteDescriptor(GetID(), m_wallet_descriptor)) {
+    if (!batch.WriteDescriptor(spkm->GetID(), spkm->m_wallet_descriptor)) {
         throw std::runtime_error(std::string(__func__) + ": writing descriptor failed");
     }
 
     // TopUp
-    TopUpWithDB(batch);
+    spkm->TopUpWithDB(batch);
 
-    m_storage.UnsetBlankWalletFlag(batch);
-    return true;
+    storage.UnsetBlankWalletFlag(batch);
+    return spkm;
 }
 
  util::Result<ExternalSigner> ExternalSignerScriptPubKeyMan::GetExternalSigner() {
diff --git a/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.h b/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.h
index 634b3bdb..8a3ae3df 100644
--- a/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.h
+++ b/depend/bitcoin/src/wallet/external_signer_scriptpubkeyman.h
@@ -15,18 +15,19 @@ struct bilingual_str;
 namespace wallet {
 class ExternalSignerScriptPubKeyMan : public DescriptorScriptPubKeyMan
 {
-  public:
-  ExternalSignerScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size)
-      :   DescriptorScriptPubKeyMan(storage, descriptor, keypool_size)
-      {}
-  ExternalSignerScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size)
-      :   DescriptorScriptPubKeyMan(storage, keypool_size)
-      {}
-
-  /** Provide a descriptor at setup time
-  * Returns false if already setup or setup fails, true if setup is successful
-  */
-  bool SetupDescriptor(WalletBatch& batch, std::unique_ptr<Descriptor>desc);
+private:
+    //! Create an ExternalSPKM from existing wallet data
+    ExternalSignerScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys)
+        : DescriptorScriptPubKeyMan(storage, descriptor, keypool_size, keys, ckeys)
+    {}
+
+    ExternalSignerScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size)
+        : DescriptorScriptPubKeyMan(storage, keypool_size)
+    {}
+
+public:
+    static std::unique_ptr<ExternalSignerScriptPubKeyMan> LoadFromStorage(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys);
+    static std::unique_ptr<ExternalSignerScriptPubKeyMan> CreateNew(WalletStorage& storage, WalletBatch& batch, int64_t keypool_size, std::unique_ptr<Descriptor> desc);
 
   static util::Result<ExternalSigner> GetExternalSigner();
 
diff --git a/depend/bitcoin/src/wallet/feebumper.cpp b/depend/bitcoin/src/wallet/feebumper.cpp
index 85e5f778..c3e422b3 100644
--- a/depend/bitcoin/src/wallet/feebumper.cpp
+++ b/depend/bitcoin/src/wallet/feebumper.cpp
@@ -2,6 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <wallet/feebumper.h>
+
+#include <coins.h>
 #include <common/system.h>
 #include <consensus/validation.h>
 #include <interfaces/chain.h>
@@ -11,7 +14,6 @@
 #include <util/rbf.h>
 #include <util/translation.h>
 #include <wallet/coincontrol.h>
-#include <wallet/feebumper.h>
 #include <wallet/fees.h>
 #include <wallet/receive.h>
 #include <wallet/spend.h>
@@ -22,7 +24,7 @@ namespace wallet {
 //! mined, or conflicts with a mined transaction. Return a feebumper::Result.
 static feebumper::Result PreconditionChecks(const CWallet& wallet, const CWalletTx& wtx, bool require_mine, std::vector<bilingual_str>& errors) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
 {
-    if (wallet.HasWalletSpend(wtx.tx)) {
+    if (wallet.HasWalletSpend(wtx.GetTx())) {
         errors.emplace_back(Untranslated("Transaction has descendants in the wallet"));
         return feebumper::Result::INVALID_PARAMETER;
     }
@@ -39,15 +41,15 @@ static feebumper::Result PreconditionChecks(const CWallet& wallet, const CWallet
         return feebumper::Result::WALLET_ERROR;
     }
 
-    if (wtx.mapValue.contains("replaced_by_txid")) {
-        errors.push_back(Untranslated(strprintf("Cannot bump transaction %s which was already bumped by transaction %s", wtx.GetHash().ToString(), wtx.mapValue.at("replaced_by_txid"))));
+    if (wtx.m_replaced_by_txid) {
+        errors.push_back(Untranslated(strprintf("Cannot bump transaction %s which was already bumped by transaction %s", wtx.GetHash().ToString(), wtx.m_replaced_by_txid->ToString())));
         return feebumper::Result::WALLET_ERROR;
     }
 
     if (require_mine) {
         // check that original tx consists entirely of our inputs
         // if not, we can't bump the fee, because the wallet has no way of knowing the value of the other inputs (thus the fee)
-        if (!AllInputsMine(wallet, *wtx.tx)) {
+        if (!AllInputsMine(wallet, *wtx.GetTx())) {
             errors.emplace_back(Untranslated("Transaction contains inputs that don't belong to this wallet"));
             return feebumper::Result::WALLET_ERROR;
         }
@@ -121,7 +123,7 @@ static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, con
     // Get the fee rate of the original transaction. This is calculated from
     // the tx fee/vsize, so it may have been rounded down. Add 1 satoshi to the
     // result.
-    int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
+    int64_t txSize = GetVirtualTransactionSize(*(wtx.GetTx()));
     CFeeRate feerate(old_fee, txSize);
     feerate += CFeeRate(1);
 
@@ -176,9 +178,10 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
         return Result::INVALID_ADDRESS_OR_KEY;
     }
     const CWalletTx& wtx = it->second;
+    const CTransactionRef& tx = wtx.GetTx();
 
     // Make sure that original_change_index is valid
-    if (original_change_index.has_value() && original_change_index.value() >= wtx.tx->vout.size()) {
+    if (original_change_index.has_value() && original_change_index.value() >= tx->vout.size()) {
         errors.emplace_back(Untranslated("Change position is out of range"));
         return Result::INVALID_PARAMETER;
     }
@@ -188,11 +191,11 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
     std::map<COutPoint, Coin> coins;
     CAmount input_value = 0;
     std::vector<CTxOut> spent_outputs;
-    for (const CTxIn& txin : wtx.tx->vin) {
+    for (const CTxIn& txin : tx->vin) {
         coins[txin.prevout]; // Create empty map entry keyed by prevout.
     }
     wallet.chain().findCoins(coins);
-    for (const CTxIn& txin : wtx.tx->vin) {
+    for (const CTxIn& txin : tx->vin) {
         const Coin& coin = coins.at(txin.prevout);
         if (coin.out.IsNull()) {
             errors.emplace_back(Untranslated(strprintf("%s:%u is already spent", txin.prevout.hash.GetHex(), txin.prevout.n)));
@@ -208,9 +211,9 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
 
     // Figure out if we need to compute the input weight, and do so if necessary
     PrecomputedTransactionData txdata;
-    txdata.Init(*wtx.tx, std::move(spent_outputs), /* force=*/ true);
-    for (unsigned int i = 0; i < wtx.tx->vin.size(); ++i) {
-        const CTxIn& txin = wtx.tx->vin.at(i);
+    txdata.Init(*tx, std::move(spent_outputs), /* force=*/ true);
+    for (unsigned int i = 0; i < tx->vin.size(); ++i) {
+        const CTxIn& txin = tx->vin.at(i);
         const Coin& coin = coins.at(txin.prevout);
 
         if (new_coin_control.IsExternalSelected(txin.prevout)) {
@@ -221,7 +224,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
             // In order to do this, we verify the script with a special SignatureChecker which
             // will observe the signatures verified and record their sizes.
             SignatureWeights weights;
-            TransactionSignatureChecker tx_checker(wtx.tx.get(), i, coin.out.nValue, txdata, MissingDataBehavior::FAIL);
+            TransactionSignatureChecker tx_checker(tx.get(), i, coin.out.nValue, txdata, MissingDataBehavior::FAIL);
             SignatureWeightChecker size_checker(weights, tx_checker);
             VerifyScript(txin.scriptSig, coin.out.scriptPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, size_checker);
             // Add the difference between max and current to input_weight so that it represents the largest the input could be
@@ -237,7 +240,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
 
     // Calculate the old output amount.
     CAmount output_value = 0;
-    for (const auto& old_output : wtx.tx->vout) {
+    for (const auto& old_output : tx->vout) {
         output_value += old_output.nValue;
     }
 
@@ -248,7 +251,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
     // outputs with its contents, otherwise use original outputs.
     std::vector<CRecipient> recipients;
     CAmount new_outputs_value = 0;
-    const auto& txouts = outputs.empty() ? wtx.tx->vout : outputs;
+    const auto& txouts = outputs.empty() ? tx->vout : outputs;
     for (size_t i = 0; i < txouts.size(); ++i) {
         const CTxOut& output = txouts.at(i);
         CTxDestination dest;
@@ -280,7 +283,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
         // The user provided a feeRate argument.
         // We calculate this here to avoid compiler warning on the cs_wallet lock
         // We need to make a temporary transaction with no input witnesses as the dummy signer expects them to be empty for external inputs
-        CMutableTransaction temp_mtx{*wtx.tx};
+        CMutableTransaction temp_mtx{*tx};
         for (auto& txin : temp_mtx.vin) {
             txin.scriptSig.clear();
             txin.scriptWitness.SetNull();
@@ -303,7 +306,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const Txid& txid, const CCoinC
     // A2 and A3 where A2 and A3 don't conflict (or alternatively bump A to A2 and A2
     // to A3 where A and A3 don't conflict). If both later get confirmed then the sender
     // has accidentally double paid.
-    for (const auto& inputs : wtx.tx->vin) {
+    for (const auto& inputs : tx->vin) {
         new_coin_control.Select(COutPoint(inputs.prevout));
     }
     new_coin_control.m_allow_other_inputs = true;
@@ -368,10 +371,7 @@ Result CommitTransaction(CWallet& wallet, const Txid& txid, CMutableTransaction&
 
     // commit/broadcast the tx
     CTransactionRef tx = MakeTransactionRef(std::move(mtx));
-    mapValue_t mapValue = oldWtx.mapValue;
-    mapValue["replaces_txid"] = oldWtx.GetHash().ToString();
-
-    wallet.CommitTransaction(tx, std::move(mapValue), oldWtx.vOrderForm);
+    wallet.CommitTransaction(tx, oldWtx.GetHash(), oldWtx.m_comment, oldWtx.m_comment_to, oldWtx.m_messages, oldWtx.m_payment_requests);
 
     // mark the original tx as bumped
     bumped_txid = tx->GetHash();
diff --git a/depend/bitcoin/src/wallet/init.cpp b/depend/bitcoin/src/wallet/init.cpp
index ccd82e7a..74e433a3 100644
--- a/depend/bitcoin/src/wallet/init.cpp
+++ b/depend/bitcoin/src/wallet/init.cpp
@@ -74,7 +74,7 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const
 #if HAVE_SYSTEM
     argsman.AddArg("-walletnotify=<cmd>", "Execute command when a wallet transaction changes. %s in cmd is replaced by TxID, %w is replaced by wallet name, %b is replaced by the hash of the block including the transaction (set to 'unconfirmed' if the transaction is not included) and %h is replaced by the block height (-1 if not included). %w is not currently implemented on windows. On systems where %w is supported, it should NOT be quoted because this would break shell escaping used to invoke the command.", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
 #endif
-    argsman.AddArg("-walletrbf", strprintf("Send transactions with full-RBF opt-in enabled (RPC only, default: %u)", DEFAULT_WALLET_RBF), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
+    argsman.AddArg("-walletrbf", strprintf("(DEPRECATED) Send transactions with full-RBF opt-in enabled (default: %u)", DEFAULT_WALLET_RBF), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
 
     argsman.AddArg("-unsafesqlitesync", "Set SQLite synchronous=OFF to disable waiting for the database to sync to disk. This is unsafe and can cause data loss and corruption. This option is only used by tests to improve their performance (default: false)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::WALLET_DEBUG_TEST);
 
diff --git a/depend/bitcoin/src/wallet/interfaces.cpp b/depend/bitcoin/src/wallet/interfaces.cpp
index 4eee155c..b5ee124c 100644
--- a/depend/bitcoin/src/wallet/interfaces.cpp
+++ b/depend/bitcoin/src/wallet/interfaces.cpp
@@ -21,6 +21,7 @@
 #include <util/ui_change_type.h>
 #include <wallet/coincontrol.h>
 #include <wallet/context.h>
+#include <wallet/export.h>
 #include <wallet/feebumper.h>
 #include <wallet/fees.h>
 #include <wallet/load.h>
@@ -44,11 +45,9 @@ using interfaces::WalletAddress;
 using interfaces::WalletBalances;
 using interfaces::WalletLoader;
 using interfaces::WalletMigrationResult;
-using interfaces::WalletOrderForm;
 using interfaces::WalletTx;
 using interfaces::WalletTxOut;
 using interfaces::WalletTxStatus;
-using interfaces::WalletValueMap;
 
 namespace wallet {
 // All members of the classes in this namespace are intentionally public, as the
@@ -59,15 +58,15 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
 {
     LOCK(wallet.cs_wallet);
     WalletTx result;
-    result.tx = wtx.tx;
-    result.txin_is_mine.reserve(wtx.tx->vin.size());
-    for (const auto& txin : wtx.tx->vin) {
+    result.tx = wtx.GetTx();
+    result.txin_is_mine.reserve(result.tx->vin.size());
+    for (const auto& txin : result.tx->vin) {
         result.txin_is_mine.emplace_back(InputIsMine(wallet, txin));
     }
-    result.txout_is_mine.reserve(wtx.tx->vout.size());
-    result.txout_address.reserve(wtx.tx->vout.size());
-    result.txout_address_is_mine.reserve(wtx.tx->vout.size());
-    for (const auto& txout : wtx.tx->vout) {
+    result.txout_is_mine.reserve(result.tx->vout.size());
+    result.txout_address.reserve(result.tx->vout.size());
+    result.txout_address_is_mine.reserve(result.tx->vout.size());
+    for (const auto& txout : result.tx->vout) {
         result.txout_is_mine.emplace_back(wallet.IsMine(txout));
         result.txout_is_change.push_back(OutputIsChange(wallet, txout));
         result.txout_address.emplace_back();
@@ -79,7 +78,10 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
     result.debit = CachedTxGetDebit(wallet, wtx, /*avoid_reuse=*/true);
     result.change = CachedTxGetChange(wallet, wtx);
     result.time = wtx.GetTxTime();
-    result.value_map = wtx.mapValue;
+    result.from = wtx.m_from;
+    result.message = wtx.m_message;
+    result.comment = wtx.m_comment;
+    result.comment_to = wtx.m_comment_to;
     result.is_coinbase = wtx.IsCoinBase();
     return result;
 }
@@ -98,7 +100,7 @@ WalletTxStatus MakeWalletTxStatus(const CWallet& wallet, const CWalletTx& wtx)
     result.blocks_to_maturity = wallet.GetTxBlocksToMaturity(wtx);
     result.depth_in_main_chain = wallet.GetTxDepthInMainChain(wtx);
     result.time_received = wtx.nTimeReceived;
-    result.lock_time = wtx.tx->nLockTime;
+    result.lock_time = wtx.GetTx()->nLockTime;
     result.is_trusted = CachedTxIsTrusted(wallet, wtx);
     result.is_abandoned = wtx.isAbandoned();
     result.is_coinbase = wtx.IsCoinBase();
@@ -113,7 +115,7 @@ WalletTxOut MakeWalletTxOut(const CWallet& wallet,
     int depth) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
 {
     WalletTxOut result;
-    result.txout = wtx.tx->vout[n];
+    result.txout = wtx.GetTx()->vout[n];
     result.time = wtx.GetTxTime();
     result.depth_in_main_chain = depth;
     result.is_spent = wallet.IsSpent(COutPoint(wtx.GetHash(), n));
@@ -265,12 +267,10 @@ class WalletImpl : public Wallet
         LOCK(m_wallet->cs_wallet);
         return CreateTransaction(*m_wallet, recipients, change_pos, coin_control, sign);
     }
-    void commitTransaction(CTransactionRef tx,
-        WalletValueMap value_map,
-        WalletOrderForm order_form) override
+    void commitTransaction(CTransactionRef tx, const std::vector<std::string>& messages) override
     {
         LOCK(m_wallet->cs_wallet);
-        m_wallet->CommitTransaction(std::move(tx), std::move(value_map), std::move(order_form));
+        m_wallet->CommitTransaction(std::move(tx), /*replaces_txid=*/std::nullopt, /*comment=*/std::nullopt, /*comment_to=*/std::nullopt, messages);
     }
     bool transactionCanBeAbandoned(const Txid& txid) override { return m_wallet->TransactionCanBeAbandoned(txid); }
     bool abandonTransaction(const Txid& txid) override
@@ -306,7 +306,7 @@ class WalletImpl : public Wallet
         LOCK(m_wallet->cs_wallet);
         auto mi = m_wallet->mapWallet.find(txid);
         if (mi != m_wallet->mapWallet.end()) {
-            return mi->second.tx;
+            return mi->second.GetTx();
         }
         return {};
     }
@@ -349,7 +349,8 @@ class WalletImpl : public Wallet
     }
     WalletTx getWalletTxDetails(const Txid& txid,
         WalletTxStatus& tx_status,
-        WalletOrderForm& order_form,
+        std::vector<std::string>& messages,
+        std::vector<std::string>& payment_requests,
         bool& in_mempool,
         int& num_blocks) override
     {
@@ -358,7 +359,8 @@ class WalletImpl : public Wallet
         if (mi != m_wallet->mapWallet.end()) {
             num_blocks = m_wallet->GetLastBlockHeight();
             in_mempool = mi->second.InMempool();
-            order_form = mi->second.vOrderForm;
+            messages = mi->second.m_messages;
+            payment_requests = mi->second.m_payment_requests;
             tx_status = MakeWalletTxStatus(*m_wallet, mi->second);
             return MakeWalletTx(*m_wallet, mi->second);
         }
@@ -521,6 +523,12 @@ class WalletImpl : public Wallet
     }
     CWallet* wallet() override { return m_wallet.get(); }
 
+    util::Result<std::string> exportWatchOnlyWallet(const fs::path& destination) override {
+        LOCK(m_wallet->cs_wallet);
+        m_wallet->TopUpKeyPool();
+        return ExportWatchOnlyWallet(*m_wallet, destination, m_context);
+    }
+
     WalletContext& m_context;
     std::shared_ptr<CWallet> m_wallet;
 };
@@ -544,6 +552,7 @@ class WalletLoaderImpl : public WalletLoader
                 wallet_request.context = &m_context;
                 return command.actor(wallet_request, result, last_handler);
             }, command.argNames, command.unique_id);
+            m_rpc_commands.back().metadata_fn = command.metadata_fn;
             m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
         }
     }
@@ -599,14 +608,14 @@ class WalletLoaderImpl : public WalletLoader
         }
         return wallet;
     }
-    util::Result<WalletMigrationResult> migrateWallet(const std::string& name, const SecureString& passphrase) override
+    util::Result<WalletMigrationResult> migrateWallet(const std::string& name, const SecureString& passphrase, bool load_wallet) override
     {
-        auto res = wallet::MigrateLegacyToDescriptor(name, passphrase, m_context);
+        auto res = wallet::MigrateLegacyToDescriptor(name, passphrase, m_context, load_wallet);
         if (!res) return util::Error{util::ErrorString(res)};
         WalletMigrationResult out{
             .wallet = MakeWallet(m_context, res->wallet),
-            .watchonly_wallet_name = res->watchonly_wallet ? std::make_optional(res->watchonly_wallet->GetName()) : std::nullopt,
-            .solvables_wallet_name = res->solvables_wallet ? std::make_optional(res->solvables_wallet->GetName()) : std::nullopt,
+            .watchonly_wallet_name = res->watchonly_wallet_name,
+            .solvables_wallet_name = res->solvables_wallet_name,
             .backup_path = res->backup_path,
         };
         return out;
diff --git a/depend/bitcoin/src/wallet/migrate.cpp b/depend/bitcoin/src/wallet/migrate.cpp
index 1869a456..6e5f8a49 100644
--- a/depend/bitcoin/src/wallet/migrate.cpp
+++ b/depend/bitcoin/src/wallet/migrate.cpp
@@ -4,8 +4,8 @@
 
 #include <compat/byteswap.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <streams.h>
+#include <util/log.h>
 #include <util/translation.h>
 #include <wallet/migrate.h>
 
@@ -567,7 +567,7 @@ void BerkeleyRODatabase::Open()
 
     // Check all Log Sequence Numbers (LSN) point to file 0 and offset 1 which indicates that the LSNs were
     // reset and that the log files are not necessary to get all of the data in the database.
-    for (uint32_t i = 0; i < outer_meta.last_page; ++i) {
+    for (uint32_t i = 0; i <= outer_meta.last_page; ++i) {
         // The LSN is composed of 2 32-bit ints, the first is a file id, the second an offset
         // It will always be the first 8 bytes of a page, so we deserialize it directly for every page
         uint32_t file;
@@ -626,16 +626,24 @@ void BerkeleyRODatabase::Open()
     if (inner_meta.last_page > outer_meta.last_page) {
         throw std::runtime_error("Subdatabase last page is greater than database last page");
     }
+    uint64_t max_data_size = static_cast<uint64_t>(outer_meta.last_page) * page_size;
 
     // Make sure encryption is disabled
     if (inner_meta.encrypt_algo != 0) {
         throw std::runtime_error("BDB builtin encryption is not supported");
     }
 
+    // Read the root's level from its header
+    // Note that we will read the root page twice in order to process it.
+    SeekToPage(db_file, inner_meta.root, page_size);
+    PageHeader root_header(inner_meta.root, inner_meta.other_endian);
+    db_file >> root_header;
+
     // Do a DFS through the BTree, starting at root
-    std::vector<uint32_t> pages{inner_meta.root};
+    // We track the expected level of each page in order to avoid loops
+    std::vector<std::pair<uint32_t, uint32_t>> pages{{inner_meta.root, root_header.level}};
     while (pages.size() > 0) {
-        uint32_t curr_page = pages.back();
+        auto [curr_page, expected_level] = pages.back();
         // It turns out BDB completely ignores this last_page field and doesn't actually update it to the correct
         // last page. While we should be checking this, we can't.
         // This is left commented out as a reminder to not accidentally implement this in the future.
@@ -646,17 +654,23 @@ void BerkeleyRODatabase::Open()
         SeekToPage(db_file, curr_page, page_size);
         PageHeader header(curr_page, inner_meta.other_endian);
         db_file >> header;
+        if (header.level != expected_level) {
+            throw std::runtime_error("BTree page has an unexpected level");
+        }
         switch (header.type) {
         case PageType::BTREE_INTERNAL: {
             InternalPage int_page(header);
             db_file >> int_page;
             for (const InternalRecord& rec : int_page.records) {
                 if (rec.m_header.deleted) continue;
-                pages.push_back(rec.page_num);
+                pages.emplace_back(rec.page_num, header.level - 1);
             }
             break;
         }
         case PageType::BTREE_LEAF: {
+            if (header.level != 1) {
+                throw std::runtime_error("BTree Leaf page is not at level 1");
+            }
             RecordsPage rec_page(header);
             db_file >> rec_page;
             if (rec_page.records.size() % 2 != 0) {
@@ -673,6 +687,9 @@ void BerkeleyRODatabase::Open()
                 } else if (const OverflowRecord* orec = std::get_if<OverflowRecord>(&rec)) {
                     if (orec->m_header.deleted) continue;
                     uint32_t next_page = orec->page_number;
+                    if (orec->item_len > max_data_size) {
+                        throw std::runtime_error("Overflow record has an impossible length");
+                    }
                     while (next_page != 0) {
                         SeekToPage(db_file, next_page, page_size);
                         PageHeader opage_header(next_page, inner_meta.other_endian);
@@ -683,6 +700,9 @@ void BerkeleyRODatabase::Open()
                         OverflowPage opage(opage_header);
                         db_file >> opage;
                         data.insert(data.end(), opage.data.begin(), opage.data.end());
+                        if (data.size() > orec->item_len) {
+                            throw std::runtime_error("Overflow record data is larger than stated size");
+                        }
                         next_page = opage_header.next_page;
                     }
                 }
diff --git a/depend/bitcoin/src/wallet/receive.cpp b/depend/bitcoin/src/wallet/receive.cpp
index 86bc63f8..4559eb9d 100644
--- a/depend/bitcoin/src/wallet/receive.cpp
+++ b/depend/bitcoin/src/wallet/receive.cpp
@@ -14,8 +14,8 @@ bool InputIsMine(const CWallet& wallet, const CTxIn& txin)
 {
     AssertLockHeld(wallet.cs_wallet);
     const CWalletTx* prev = wallet.GetWalletTx(txin.prevout.hash);
-    if (prev && txin.prevout.n < prev->tx->vout.size()) {
-        return wallet.IsMine(prev->tx->vout[txin.prevout.n]);
+    if (prev && txin.prevout.n < prev->GetTx()->vout.size()) {
+        return wallet.IsMine(prev->GetTx()->vout[txin.prevout.n]);
     }
     return false;
 }
@@ -101,7 +101,7 @@ static CAmount GetCachableAmount(const CWallet& wallet, const CWalletTx& wtx, CW
 {
     auto& amount = wtx.m_amounts[type];
     if (!amount.IsCached(avoid_reuse)) {
-        amount.Set(avoid_reuse, type == CWalletTx::DEBIT ? wallet.GetDebit(*wtx.tx) : TxGetCredit(wallet, *wtx.tx));
+        amount.Set(avoid_reuse, type == CWalletTx::DEBIT ? wallet.GetDebit(*wtx.GetTx()) : TxGetCredit(wallet, *wtx.GetTx()));
         wtx.m_is_cache_empty = false;
     }
     return amount.Get(avoid_reuse);
@@ -121,7 +121,7 @@ CAmount CachedTxGetCredit(const CWallet& wallet, const CWalletTx& wtx, bool avoi
 
 CAmount CachedTxGetDebit(const CWallet& wallet, const CWalletTx& wtx, bool avoid_reuse)
 {
-    if (wtx.tx->vin.empty())
+    if (wtx.GetTx()->vin.empty())
         return 0;
 
     return GetCachableAmount(wallet, wtx, CWalletTx::DEBIT, avoid_reuse);
@@ -131,7 +131,7 @@ CAmount CachedTxGetChange(const CWallet& wallet, const CWalletTx& wtx)
 {
     if (wtx.fChangeCached)
         return wtx.nChangeCached;
-    wtx.nChangeCached = TxGetChange(wallet, *wtx.tx);
+    wtx.nChangeCached = TxGetChange(wallet, *wtx.GetTx());
     wtx.fChangeCached = true;
     return wtx.nChangeCached;
 }
@@ -149,15 +149,15 @@ void CachedTxGetAmounts(const CWallet& wallet, const CWalletTx& wtx,
     CAmount nDebit = CachedTxGetDebit(wallet, wtx, /*avoid_reuse=*/false);
     if (nDebit > 0) // debit>0 means we signed/sent this transaction
     {
-        CAmount nValueOut = wtx.tx->GetValueOut();
+        CAmount nValueOut = wtx.GetTx()->GetValueOut();
         nFee = nDebit - nValueOut;
     }
 
     LOCK(wallet.cs_wallet);
     // Sent/received.
-    for (unsigned int i = 0; i < wtx.tx->vout.size(); ++i)
+    for (unsigned int i = 0; i < wtx.GetTx()->vout.size(); ++i)
     {
-        const CTxOut& txout = wtx.tx->vout[i];
+        const CTxOut& txout = wtx.GetTx()->vout[i];
         bool ismine = wallet.IsMine(txout);
         // Only need to handle txouts if AT LEAST one of these is true:
         //   1) they debit from us (sent)
@@ -196,7 +196,7 @@ void CachedTxGetAmounts(const CWallet& wallet, const CWalletTx& wtx,
 bool CachedTxIsFromMe(const CWallet& wallet, const CWalletTx& wtx)
 {
     if (!wtx.m_cached_from_me.has_value()) {
-        wtx.m_cached_from_me = wallet.IsFromMe(*wtx.tx);
+        wtx.m_cached_from_me = wallet.IsFromMe(*wtx.GetTx());
     }
     return wtx.m_cached_from_me.value();
 }
@@ -218,12 +218,12 @@ bool CachedTxIsTrusted(const CWallet& wallet, const CWalletTx& wtx, std::set<Txi
     if (!wtx.InMempool()) return false;
 
     // Trusted if all inputs are from us and are in the mempool:
-    for (const CTxIn& txin : wtx.tx->vin)
+    for (const CTxIn& txin : wtx.GetTx()->vin)
     {
         // Transactions not sent by us: not trusted
         const CWalletTx* parent = wallet.GetWalletTx(txin.prevout.hash);
         if (parent == nullptr) return false;
-        const CTxOut& parentOut = parent->tx->vout[txin.prevout.n];
+        const CTxOut& parentOut = parent->GetTx()->vout[txin.prevout.n];
         // Check that this specific input being spent is trusted
         if (!wallet.IsMine(parentOut)) return false;
         // If we've already trusted this parent, continue
@@ -332,16 +332,16 @@ std::set< std::set<CTxDestination> > GetAddressGroupings(const CWallet& wallet)
     {
         const CWalletTx& wtx = walletEntry.second;
 
-        if (wtx.tx->vin.size() > 0)
+        if (wtx.GetTx()->vin.size() > 0)
         {
             bool any_mine = false;
             // group all input addresses with each other
-            for (const CTxIn& txin : wtx.tx->vin)
+            for (const CTxIn& txin : wtx.GetTx()->vin)
             {
                 CTxDestination address;
                 if(!InputIsMine(wallet, txin)) /* If this input isn't mine, ignore it */
                     continue;
-                if(!ExtractDestination(wallet.mapWallet.at(txin.prevout.hash).tx->vout[txin.prevout.n].scriptPubKey, address))
+                if(!ExtractDestination(wallet.mapWallet.at(txin.prevout.hash).GetTx()->vout[txin.prevout.n].scriptPubKey, address))
                     continue;
                 grouping.insert(address);
                 any_mine = true;
@@ -350,7 +350,7 @@ std::set< std::set<CTxDestination> > GetAddressGroupings(const CWallet& wallet)
             // group change with input addresses
             if (any_mine)
             {
-               for (const CTxOut& txout : wtx.tx->vout)
+               for (const CTxOut& txout : wtx.GetTx()->vout)
                    if (OutputIsChange(wallet, txout))
                    {
                        CTxDestination txoutAddr;
@@ -367,7 +367,7 @@ std::set< std::set<CTxDestination> > GetAddressGroupings(const CWallet& wallet)
         }
 
         // group lone addrs by themselves
-        for (const auto& txout : wtx.tx->vout)
+        for (const auto& txout : wtx.GetTx()->vout)
             if (wallet.IsMine(txout))
             {
                 CTxDestination address;
diff --git a/depend/bitcoin/src/wallet/rpc/addresses.cpp b/depend/bitcoin/src/wallet/rpc/addresses.cpp
index ed966d89..171c10fa 100644
--- a/depend/bitcoin/src/wallet/rpc/addresses.cpp
+++ b/depend/bitcoin/src/wallet/rpc/addresses.cpp
@@ -365,6 +365,51 @@ static UniValue DescribeWalletAddress(const CWallet& wallet, const CTxDestinatio
     return ret;
 }
 
+static std::vector<RPCResult> GetAddressInfoBaseFields()
+{
+    return {
+        {RPCResult::Type::STR, "address", /*optional=*/true, "The bitcoin address of the embedded script."},
+        {RPCResult::Type::STR_HEX, "scriptPubKey", /*optional=*/true, "The hex-encoded output script generated by the address."},
+        {RPCResult::Type::BOOL, "isscript", /*optional=*/true, "If the key is a script."},
+        {RPCResult::Type::BOOL, "iswitness", /*optional=*/true, "If the address is a witness address."},
+        {RPCResult::Type::NUM, "witness_version", /*optional=*/true, "The version number of the witness program."},
+        {RPCResult::Type::STR_HEX, "witness_program", /*optional=*/true, "The hex value of the witness program."},
+        {RPCResult::Type::STR, "script", /*optional=*/true,
+            "The output script type. Only if isscript is true and the redeemscript is known. Possible\n"
+            "types: nonstandard, pubkey, pubkeyhash, scripthash, multisig, nulldata, witness_v0_keyhash,\n"
+            "witness_v0_scripthash, witness_unknown."},
+        {RPCResult::Type::STR_HEX, "hex", /*optional=*/true, "The redeemscript for the p2sh address."},
+        {RPCResult::Type::ARR, "pubkeys", /*optional=*/true,
+            "Array of pubkeys associated with the known redeemscript (only if script is multisig).",
+            {
+                {RPCResult::Type::STR, "pubkey", ""},
+            }},
+        {RPCResult::Type::NUM, "sigsrequired", /*optional=*/true,
+            "The number of signatures required to spend multisig output (only if script is multisig)."},
+        {RPCResult::Type::STR_HEX, "pubkey", /*optional=*/true,
+            "The hex value of the raw public key for single-key addresses (possibly embedded in P2SH or P2WSH)."},
+        {RPCResult::Type::BOOL, "iscompressed", /*optional=*/true, "If the pubkey is compressed."},
+    };
+}
+
+static std::vector<RPCResult> GetAddressInfoEmbeddedFields(bool include_nested)
+{
+    auto fields = GetAddressInfoBaseFields();
+
+    if (include_nested) {
+        auto nested = GetAddressInfoBaseFields();
+        fields.emplace_back(
+            RPCResult::Type::OBJ,
+            "embedded",
+            /*optional=*/true,
+            "Information about the address embedded in P2SH or P2WSH, if relevant and known.",
+            std::move(nested)
+        );
+    }
+
+    return fields;
+}
+
 RPCMethod getaddressinfo()
 {
     return RPCMethod{
@@ -399,11 +444,13 @@ RPCMethod getaddressinfo()
                         }},
                         {RPCResult::Type::NUM, "sigsrequired", /*optional=*/true, "The number of signatures required to spend multisig output (only if script is multisig)."},
                         {RPCResult::Type::STR_HEX, "pubkey", /*optional=*/true, "The hex value of the raw public key for single-key addresses (possibly embedded in P2SH or P2WSH)."},
-                        {RPCResult::Type::OBJ, "embedded", /*optional=*/true, "Information about the address embedded in P2SH or P2WSH, if relevant and known.",
-                        {
-                            {RPCResult::Type::ELISION, "", "Includes all getaddressinfo output fields for the embedded address, excluding metadata (timestamp, hdkeypath, hdseedid)\n"
-                            "and relation to the wallet (ismine)."},
-                        }},
+                        {RPCResult::Type::OBJ, "embedded", /*optional=*/true,
+                        "Information about the address embedded in P2SH or P2WSH, if relevant and known.",
+                        ElideGroup(
+                            GetAddressInfoEmbeddedFields(/*include_nested=*/true),
+                            "Includes all getaddressinfo output fields for the embedded address, excluding metadata (timestamp, hdkeypath, hdseedid)\n"
+                            "and relation to the wallet (ismine)."
+                        )},
                         {RPCResult::Type::BOOL, "iscompressed", /*optional=*/true, "If the pubkey is compressed."},
                         {RPCResult::Type::NUM_TIME, "timestamp", /*optional=*/true, "The creation time of the key, if available, expressed in " + UNIX_EPOCH_TIME + "."},
                         {RPCResult::Type::STR, "hdkeypath", /*optional=*/true, "The HD keypath, if the key is HD and available."},
diff --git a/depend/bitcoin/src/wallet/rpc/backup.cpp b/depend/bitcoin/src/wallet/rpc/backup.cpp
index 4b87ba23..70bc3bde 100644
--- a/depend/bitcoin/src/wallet/rpc/backup.cpp
+++ b/depend/bitcoin/src/wallet/rpc/backup.cpp
@@ -21,6 +21,7 @@
 #include <util/fs.h>
 #include <util/time.h>
 #include <util/translation.h>
+#include <wallet/export.h>
 #include <wallet/rpc/util.h>
 #include <wallet/wallet.h>
 
@@ -95,6 +96,7 @@ RPCMethod removeprunedfunds()
 {
     return RPCMethod{
         "removeprunedfunds",
+        "(DEPRECATED) This feature will be removed in the next major release. Start bitcoind with the `-deprecatedrpc=removeprunedfunds` option in order to use this.\n"
         "Deletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will affect wallet balances.\n",
                 {
                     {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The hex-encoded id of the transaction you are deleting"},
@@ -110,6 +112,10 @@ RPCMethod removeprunedfunds()
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
 
+    if (!pwallet->chain().rpcEnableDeprecated("removeprunedfunds")) {
+        throw JSONRPCError(RPC_METHOD_DEPRECATED, "DEPRECATION WARNING: This feature will be removed in the next major release. Start bitcoind with the `-deprecatedrpc=removeprunedfunds` option in order to use this.");
+    }
+
     LOCK(pwallet->cs_wallet);
 
     Txid hash{Txid::FromUint256(ParseHashV(request.params[0], "txid"))};
@@ -232,37 +238,45 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
             } else if (parsed_descs.size() > 2) {
                 CHECK_NONFATAL(!desc_internal);
             }
-            // Need to ExpandPrivate to check if private keys are available for all pubkeys
+            // Expand to check whether the descriptor can be derived at the first index.
             FlatSigningProvider expand_keys;
             std::vector<CScript> scripts;
             if (!parsed_desc->Expand(0, keys, scripts, expand_keys)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Cannot expand descriptor. Probably because of hardened derivations without private keys provided");
             }
-            parsed_desc->ExpandPrivate(0, keys, expand_keys);
 
             for (const auto& w : parsed_desc->Warnings()) {
                warnings.push_back(w);
             }
 
-            // Check if all private keys are provided
-            bool have_all_privkeys = !expand_keys.keys.empty();
-            for (const auto& entry : expand_keys.origins) {
-                const CKeyID& key_id = entry.first;
-                CKey key;
-                if (!expand_keys.GetKey(key_id, key)) {
-                    have_all_privkeys = false;
-                    break;
-                }
-            }
-
             // If private keys are enabled, check some things.
             if (!wallet.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
-               if (keys.keys.empty()) {
+                if (keys.keys.empty()) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import descriptor without private keys to a wallet with private keys enabled");
-               }
-               if (!have_all_privkeys) {
-                   warnings.push_back("Not all private keys provided. Some wallet functionality may return unexpected errors");
-               }
+                }
+                if (!parsed_desc->HavePrivateKeys(keys)) {
+                    warnings.push_back("Not all private keys provided. Some wallet functionality may return unexpected errors");
+                }
+            }
+
+            // If this is an unused(KEY) descriptor, check that the wallet doesn't already have other descriptors with this key
+            if (!parsed_desc->HasScripts()) {
+                if (wallet.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import unused() to wallet without private keys enabled");
+                }
+                // Unused descriptors must contain a single key.
+                // Earlier checks will have enforced that this key is either a private key when private keys are enabled,
+                // or that this key is a public key when private keys are disabled.
+                // If we can retrieve the corresponding private key from the wallet, then this key is already in the wallet
+                // and we should not import it.
+                std::set<CPubKey> pubkeys;
+                std::set<CExtPubKey> extpubs;
+                parsed_desc->GetPubKeys(pubkeys, extpubs);
+                std::transform(extpubs.begin(), extpubs.end(), std::inserter(pubkeys, pubkeys.begin()), [](const CExtPubKey& xpub) { return xpub.pubkey; });
+                CHECK_NONFATAL(pubkeys.size() == 1);
+                if (wallet.GetKey(pubkeys.begin()->GetID())) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import an unused() descriptor when its private key is already in the wallet");
+                }
             }
 
             WalletDescriptor w_desc(std::move(parsed_desc), timestamp, range_start, range_end, next_index);
@@ -360,15 +374,15 @@ RPCMethod importdescriptors()
     if (!pwallet) return UniValue::VNULL;
     CWallet& wallet{*pwallet};
 
-    // Make sure the results are valid at least up to the most recent block
-    // the user could have gotten from another RPC command prior to now
-    wallet.BlockUntilSyncedToCurrentChain();
-
     WalletRescanReserver reserver(*pwallet);
     if (!reserver.reserve(/*with_passphrase=*/true)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Wallet is currently rescanning. Abort existing rescan or wait.");
     }
 
+    // Make sure the results are valid at least up to the most recent block
+    // the user could have gotten from another RPC command prior to now
+    wallet.BlockUntilSyncedToCurrentChain();
+
     // Ensure that the wallet is not locked for the remainder of this RPC, as
     // the passphrase is used to top up the keypool.
     LOCK(pwallet->m_relock_mutex);
@@ -407,7 +421,7 @@ RPCMethod importdescriptors()
 
     // Rescan the blockchain using the lowest timestamp
     if (rescan) {
-        int64_t scanned_time = pwallet->RescanFromTime(lowest_timestamp, reserver, /*update=*/true);
+        int64_t scanned_time = pwallet->RescanFromTime(lowest_timestamp, reserver);
         pwallet->ResubmitWalletTransactions(node::TxBroadcast::MEMPOOL_NO_BROADCAST, /*force=*/true);
 
         if (pwallet->IsAbortingRescan()) {
@@ -506,38 +520,11 @@ RPCMethod listdescriptors()
     }
 
     LOCK(wallet->cs_wallet);
-
-    const auto active_spk_mans = wallet->GetActiveScriptPubKeyMans();
-
-    struct WalletDescInfo {
-        std::string descriptor;
-        uint64_t creation_time;
-        bool active;
-        std::optional<bool> internal;
-        std::optional<std::pair<int64_t,int64_t>> range;
-        int64_t next_index;
-    };
-
-    std::vector<WalletDescInfo> wallet_descriptors;
-    for (const auto& spk_man : wallet->GetAllScriptPubKeyMans()) {
-        const auto desc_spk_man = dynamic_cast<DescriptorScriptPubKeyMan*>(spk_man);
-        if (!desc_spk_man) {
-            throw JSONRPCError(RPC_WALLET_ERROR, "Unexpected ScriptPubKey manager type.");
-        }
-        LOCK(desc_spk_man->cs_desc_man);
-        const auto& wallet_descriptor = desc_spk_man->GetWalletDescriptor();
-        std::string descriptor;
-        CHECK_NONFATAL(desc_spk_man->GetDescriptorString(descriptor, priv));
-        const bool is_range = wallet_descriptor.descriptor->IsRange();
-        wallet_descriptors.push_back({
-            descriptor,
-            wallet_descriptor.creation_time,
-            active_spk_mans.contains(desc_spk_man),
-            wallet->IsInternalScriptPubKeyMan(desc_spk_man),
-            is_range ? std::optional(std::make_pair(wallet_descriptor.range_start, wallet_descriptor.range_end)) : std::nullopt,
-            wallet_descriptor.next_index
-        });
+    util::Expected<std::vector<WalletDescInfo>, std::string> exported = ExportDescriptors(*wallet, priv);
+    if (!exported) {
+        throw JSONRPCError(RPC_WALLET_ERROR, exported.error());
     }
+    std::vector<WalletDescInfo> wallet_descriptors = *exported;
 
     std::sort(wallet_descriptors.begin(), wallet_descriptors.end(), [](const auto& a, const auto& b) {
         return a.descriptor < b.descriptor;
diff --git a/depend/bitcoin/src/wallet/rpc/coins.cpp b/depend/bitcoin/src/wallet/rpc/coins.cpp
index ab869b0d..677ac8f6 100644
--- a/depend/bitcoin/src/wallet/rpc/coins.cpp
+++ b/depend/bitcoin/src/wallet/rpc/coins.cpp
@@ -66,7 +66,7 @@ static CAmount GetReceived(const CWallet& wallet, const UniValue& params, bool b
             continue;
         }
 
-        for (const CTxOut& txout : wtx.tx->vout) {
+        for (const CTxOut& txout : wtx.GetTx()->vout) {
             if (output_scripts.contains(txout.scriptPubKey)) {
                 amount += txout.nValue;
             }
@@ -169,7 +169,8 @@ RPCMethod getbalance()
                 "The available balance is what the wallet considers currently spendable, and is\n"
                 "thus affected by options which limit spendability such as -spendzeroconfchange.\n",
                 {
-                    {"dummy", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Remains for backward compatibility. Must be excluded or set to \"*\"."},
+                    {"dummy", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Remains for backward compatibility. Must be excluded or set to \"*\".",
+                        RPCArgOptions{.placeholder = true}},
                     {"minconf", RPCArg::Type::NUM, RPCArg::Default{0}, "Only include transactions confirmed at least this many times."},
                     {"include_watchonly", RPCArg::Type::BOOL, RPCArg::Default{false}, "No longer used"},
                     {"avoid_reuse", RPCArg::Type::BOOL, RPCArg::Default{true}, "(only available if avoid_reuse wallet flag is set) Do not include balance in dirty outputs; addresses are considered dirty if they have previously been used in a transaction."},
@@ -309,7 +310,7 @@ RPCMethod lockunspent()
 
         const CWalletTx& trans = it->second;
 
-        if (outpt.n >= trans.tx->vout.size()) {
+        if (outpt.n >= trans.GetTx()->vout.size()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout index out of bounds");
         }
 
diff --git a/depend/bitcoin/src/wallet/rpc/encrypt.cpp b/depend/bitcoin/src/wallet/rpc/encrypt.cpp
index 68a80eb8..49490d57 100644
--- a/depend/bitcoin/src/wallet/rpc/encrypt.cpp
+++ b/depend/bitcoin/src/wallet/rpc/encrypt.cpp
@@ -60,8 +60,8 @@ RPCMethod walletpassphrase()
         if (nSleepTime < 0) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Timeout cannot be negative.");
         }
-        // Clamp timeout
-        constexpr int64_t MAX_SLEEP_TIME = 100000000; // larger values trigger a macos/libevent bug?
+        // Clamp timeout to ~3 years to avoid overflow when computing the relock time
+        constexpr int64_t MAX_SLEEP_TIME = 100000000;
         if (nSleepTime > MAX_SLEEP_TIME) {
             nSleepTime = MAX_SLEEP_TIME;
         }
diff --git a/depend/bitcoin/src/wallet/rpc/spend.cpp b/depend/bitcoin/src/wallet/rpc/spend.cpp
index af121c12..cb90dfac 100644
--- a/depend/bitcoin/src/wallet/rpc/spend.cpp
+++ b/depend/bitcoin/src/wallet/rpc/spend.cpp
@@ -109,7 +109,7 @@ static UniValue FinishTransaction(const std::shared_ptr<CWallet> pwallet, const
     }
 
     // Make a blank psbt
-    PartiallySignedTransaction psbtx(rawTx);
+    PartiallySignedTransaction psbtx(rawTx, /*version=*/2);
 
     // First fill transaction with our data without signing,
     // so external signers are not asked to sign more than once.
@@ -139,7 +139,7 @@ static UniValue FinishTransaction(const std::shared_ptr<CWallet> pwallet, const
         CTransactionRef tx(MakeTransactionRef(std::move(mtx)));
         result.pushKV("txid", tx->GetHash().GetHex());
         if (add_to_wallet && !psbt_opt_in) {
-            pwallet->CommitTransaction(tx, {}, /*orderForm=*/{});
+            pwallet->CommitTransaction(tx);
         } else {
             result.pushKV("hex", hex);
         }
@@ -168,12 +168,16 @@ static void PreventOutdatedOptions(const UniValue& options)
     }
 }
 
-UniValue SendMoney(CWallet& wallet, const CCoinControl &coin_control, std::vector<CRecipient> &recipients, mapValue_t map_value, bool verbose)
+UniValue SendMoney(CWallet& wallet, const CCoinControl &coin_control, std::vector<CRecipient> &recipients, std::optional<std::string> comment, std::optional<std::string> comment_to, bool verbose)
 {
     EnsureWalletIsUnlocked(wallet);
 
     // This function is only used by sendtoaddress and sendmany.
-    // This should always try to sign, if we don't have private keys, don't try to do anything here.
+    // This should always try to sign, if we don't have (all) private keys, don't
+    // try to do anything here.
+    if (wallet.IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
+        throw JSONRPCError(RPC_WALLET_ERROR, "Error: sendtoaddress and sendmany are not supported for wallets with external signers; use send instead");
+    }
     if (wallet.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: Private keys are disabled for this wallet");
     }
@@ -187,7 +191,7 @@ UniValue SendMoney(CWallet& wallet, const CCoinControl &coin_control, std::vecto
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, util::ErrorString(res).original);
     }
     const CTransactionRef& tx = res->tx;
-    wallet.CommitTransaction(tx, std::move(map_value), /*orderForm=*/{});
+    wallet.CommitTransaction(tx, /*replaces_txid=*/std::nullopt, comment, comment_to);
     if (verbose) {
         UniValue entry(UniValue::VOBJ);
         entry.pushKV("txid", tx->GetHash().GetHex());
@@ -297,11 +301,12 @@ RPCMethod sendtoaddress()
     LOCK(pwallet->cs_wallet);
 
     // Wallet comments
-    mapValue_t mapValue;
+    std::optional<std::string> comment;
+    std::optional<std::string> comment_to;
     if (!request.params[2].isNull() && !request.params[2].get_str().empty())
-        mapValue["comment"] = request.params[2].get_str();
+        comment = request.params[2].get_str();
     if (!request.params[3].isNull() && !request.params[3].get_str().empty())
-        mapValue["to"] = request.params[3].get_str();
+        comment_to = request.params[3].get_str();
 
     CCoinControl coin_control;
     if (!request.params[5].isNull()) {
@@ -328,7 +333,7 @@ RPCMethod sendtoaddress()
     std::vector<CRecipient> recipients{CreateRecipients(ParseOutputs(address_amounts), sffo_set)};
     const bool verbose{request.params[10].isNull() ? false : request.params[10].get_bool()};
 
-    return SendMoney(*pwallet, coin_control, recipients, mapValue, verbose);
+    return SendMoney(*pwallet, coin_control, recipients, comment, comment_to, verbose);
 },
     };
 }
@@ -342,13 +347,15 @@ RPCMethod sendmany()
                     {"dummy", RPCArg::Type::STR, RPCArg::Default{"\"\""}, "Must be set to \"\" for backwards compatibility.",
                      RPCArgOptions{
                          .oneline_description = "\"\"",
+                         .placeholder = true,
                      }},
                     {"amounts", RPCArg::Type::OBJ_USER_KEYS, RPCArg::Optional::NO, "The addresses and amounts",
                         {
                             {"address", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The bitcoin address is the key, the numeric amount (can be string) in " + CURRENCY_UNIT + " is the value"},
                         },
                     },
-                    {"minconf", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "Ignored dummy value"},
+                    {"minconf", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "Ignored dummy value",
+                        RPCArgOptions{.placeholder = true}},
                     {"comment", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "A comment"},
                     {"subtractfeefrom", RPCArg::Type::ARR, RPCArg::Optional::OMITTED, "The addresses.\n"
                                        "The fee will be equally deducted from the amount of each selected address.\n"
@@ -405,9 +412,9 @@ RPCMethod sendmany()
     }
     UniValue sendTo = request.params[1].get_obj();
 
-    mapValue_t mapValue;
+    std::optional<std::string> comment;
     if (!request.params[3].isNull() && !request.params[3].get_str().empty())
-        mapValue["comment"] = request.params[3].get_str();
+        comment = request.params[3].get_str();
 
     CCoinControl coin_control;
     if (!request.params[5].isNull()) {
@@ -422,7 +429,7 @@ RPCMethod sendmany()
     );
     const bool verbose{request.params[9].isNull() ? false : request.params[9].get_bool()};
 
-    return SendMoney(*pwallet, coin_control, recipients, std::move(mapValue), verbose);
+    return SendMoney(*pwallet, coin_control, recipients, comment, /*comment_to=*/std::nullopt, verbose);
 },
     };
 }
@@ -479,10 +486,7 @@ CreatedTransactionResult FundTransaction(CWallet& wallet, const CMutableTransact
     std::optional<unsigned int> change_position;
     bool lockUnspents = false;
     if (!options.isNull()) {
-        if (options.type() == UniValue::VBOOL) {
-            // backward compatibility bool only fallback, does nothing
-        } else {
-            RPCTypeCheckObj(options,
+        RPCTypeCheckObj(options,
                 {
                     {"add_inputs", UniValueType(UniValue::VBOOL)},
                     {"include_unsafe", UniValueType(UniValue::VBOOL)},
@@ -514,83 +518,82 @@ CreatedTransactionResult FundTransaction(CWallet& wallet, const CMutableTransact
                 },
                 true, true);
 
-            if (options.exists("add_inputs")) {
-                coinControl.m_allow_other_inputs = options["add_inputs"].get_bool();
-            }
-
-            if (options.exists("changeAddress") || options.exists("change_address")) {
-                const std::string change_address_str = (options.exists("change_address") ? options["change_address"] : options["changeAddress"]).get_str();
-                CTxDestination dest = DecodeDestination(change_address_str);
+        if (options.exists("add_inputs")) {
+            coinControl.m_allow_other_inputs = options["add_inputs"].get_bool();
+        }
 
-                if (!IsValidDestination(dest)) {
-                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Change address must be a valid bitcoin address");
-                }
+        if (options.exists("changeAddress") || options.exists("change_address")) {
+            const std::string change_address_str = (options.exists("change_address") ? options["change_address"] : options["changeAddress"]).get_str();
+            CTxDestination dest = DecodeDestination(change_address_str);
 
-                coinControl.destChange = dest;
+            if (!IsValidDestination(dest)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Change address must be a valid bitcoin address");
             }
 
-            if (options.exists("changePosition") || options.exists("change_position")) {
-                int pos = (options.exists("change_position") ? options["change_position"] : options["changePosition"]).getInt<int>();
-                if (pos < 0 || (unsigned int)pos > recipients.size()) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
-                }
-                change_position = (unsigned int)pos;
-            }
+            coinControl.destChange = dest;
+        }
 
-            if (options.exists("change_type")) {
-                if (options.exists("changeAddress") || options.exists("change_address")) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both change address and address type options");
-                }
-                if (std::optional<OutputType> parsed = ParseOutputType(options["change_type"].get_str())) {
-                    coinControl.m_change_type.emplace(parsed.value());
-                } else {
-                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Unknown change type '%s'", options["change_type"].get_str()));
-                }
+        if (options.exists("changePosition") || options.exists("change_position")) {
+            int pos = (options.exists("change_position") ? options["change_position"] : options["changePosition"]).getInt<int>();
+            if (pos < 0 || (unsigned int)pos > recipients.size()) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
             }
+            change_position = (unsigned int)pos;
+        }
 
-            if (options.exists("lockUnspents") || options.exists("lock_unspents")) {
-                lockUnspents = (options.exists("lock_unspents") ? options["lock_unspents"] : options["lockUnspents"]).get_bool();
+        if (options.exists("change_type")) {
+            if (options.exists("changeAddress") || options.exists("change_address")) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both change address and address type options");
             }
-
-            if (options.exists("include_unsafe")) {
-                coinControl.m_include_unsafe_inputs = options["include_unsafe"].get_bool();
+            if (std::optional<OutputType> parsed = ParseOutputType(options["change_type"].get_str())) {
+                coinControl.m_change_type.emplace(parsed.value());
+            } else {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Unknown change type '%s'", options["change_type"].get_str()));
             }
+        }
 
-            if (options.exists("feeRate")) {
-                if (options.exists("fee_rate")) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both fee_rate (" + CURRENCY_ATOM + "/vB) and feeRate (" + CURRENCY_UNIT + "/kvB)");
-                }
-                if (options.exists("conf_target")) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both conf_target and feeRate. Please provide either a confirmation target in blocks for automatic fee estimation, or an explicit fee rate.");
-                }
-                if (options.exists("estimate_mode")) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both estimate_mode and feeRate");
-                }
-                coinControl.m_feerate = CFeeRate(AmountFromValue(options["feeRate"]));
-                coinControl.fOverrideFeeRate = true;
-            }
+        if (options.exists("lockUnspents") || options.exists("lock_unspents")) {
+            lockUnspents = (options.exists("lock_unspents") ? options["lock_unspents"] : options["lockUnspents"]).get_bool();
+        }
+
+        if (options.exists("include_unsafe")) {
+            coinControl.m_include_unsafe_inputs = options["include_unsafe"].get_bool();
+        }
 
-            if (options.exists("replaceable")) {
-                coinControl.m_signal_bip125_rbf = options["replaceable"].get_bool();
+        if (options.exists("feeRate")) {
+            if (options.exists("fee_rate")) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both fee_rate (" + CURRENCY_ATOM + "/vB) and feeRate (" + CURRENCY_UNIT + "/kvB)");
             }
+            if (options.exists("conf_target")) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both conf_target and feeRate. Please provide either a confirmation target in blocks for automatic fee estimation, or an explicit fee rate.");
+            }
+            if (options.exists("estimate_mode")) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both estimate_mode and feeRate");
+            }
+            coinControl.m_feerate = CFeeRate(AmountFromValue(options["feeRate"]));
+            coinControl.fOverrideFeeRate = true;
+        }
 
-            if (options.exists("minconf")) {
-                coinControl.m_min_depth = options["minconf"].getInt<int>();
+        if (options.exists("replaceable")) {
+            coinControl.m_signal_bip125_rbf = options["replaceable"].get_bool();
+        }
 
-                if (coinControl.m_min_depth < 0) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative minconf");
-                }
+        if (options.exists("minconf")) {
+            coinControl.m_min_depth = options["minconf"].getInt<int>();
+
+            if (coinControl.m_min_depth < 0) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative minconf");
             }
+        }
 
-            if (options.exists("maxconf")) {
-                coinControl.m_max_depth = options["maxconf"].getInt<int>();
+        if (options.exists("maxconf")) {
+            coinControl.m_max_depth = options["maxconf"].getInt<int>();
 
-                if (coinControl.m_max_depth < coinControl.m_min_depth) {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("maxconf can't be lower than minconf: %d < %d", coinControl.m_max_depth, coinControl.m_min_depth));
-                }
+            if (coinControl.m_max_depth < coinControl.m_min_depth) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("maxconf can't be lower than minconf: %d < %d", coinControl.m_max_depth, coinControl.m_min_depth));
             }
-            SetFeeEstimateMode(wallet, coinControl, options["conf_target"], options["estimate_mode"], options["fee_rate"], override_min_fee);
         }
+        SetFeeEstimateMode(wallet, coinControl, options["conf_target"], options["estimate_mode"], options["fee_rate"], override_min_fee);
     }
 
     if (options.exists("solving_data")) {
@@ -767,7 +770,6 @@ RPCMethod fundrawtransaction()
                         },
                         FundTxDoc()),
                         RPCArgOptions{
-                            .skip_type_check = true,
                             .oneline_description = "options",
                         }},
                     {"iswitness", RPCArg::Type::BOOL, RPCArg::DefaultHint{"depends on heuristic tests"}, "Whether the transaction hex is a serialized witness transaction.\n"
@@ -979,6 +981,7 @@ static RPCMethod bumpfee_helper(std::string method_name)
         {
             {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The txid to be bumped"},
             {"options", RPCArg::Type::OBJ_NAMED_PARAMS, RPCArg::Optional::OMITTED, "",
+                Cat(
                 {
                     {"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks\n"},
                     {"fee_rate", RPCArg::Type::AMOUNT, RPCArg::DefaultHint{"not set, fall back to wallet fee estimation"},
@@ -1007,6 +1010,8 @@ static RPCMethod bumpfee_helper(std::string method_name)
                                                                                                                             "original change output. The change output’s amount can increase if bumping the transaction "
                                                                                                                             "adds new inputs, otherwise it will decrease. Cannot be used in combination with the 'outputs' option."},
                 },
+                want_psbt ? std::vector<RPCArg>{{"psbt_version", RPCArg::Type::NUM, RPCArg::Default(2), "The PSBT version number to use."}} : std::vector<RPCArg>()
+                ),
                 RPCArgOptions{.oneline_description="options"}},
         },
         RPCResult{
@@ -1045,6 +1050,8 @@ static RPCMethod bumpfee_helper(std::string method_name)
 
     std::optional<uint32_t> original_change_index;
 
+    uint32_t psbt_version = 2;
+
     if (!request.params[1].isNull()) {
         UniValue options = request.params[1];
         RPCTypeCheckObj(options,
@@ -1056,6 +1063,7 @@ static RPCMethod bumpfee_helper(std::string method_name)
                 {"estimate_mode", UniValueType(UniValue::VSTR)},
                 {"outputs", UniValueType()}, // will be checked by AddOutputs()
                 {"original_change_index", UniValueType(UniValue::VNUM)},
+                {"psbt_version", UniValueType(UniValue::VNUM)},
             },
             true, true);
 
@@ -1083,6 +1091,13 @@ static RPCMethod bumpfee_helper(std::string method_name)
         if (options.exists("original_change_index")) {
             original_change_index = options["original_change_index"].getInt<uint32_t>();
         }
+
+        if (options.exists("psbt_version")) {
+            psbt_version = options["psbt_version"].getInt<uint32_t>();
+        }
+        if (psbt_version != 2 && psbt_version != 0) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "The PSBT version can only be 2 or 0");
+        }
     }
 
     // Make sure the results are valid at least up to the most recent block
@@ -1136,7 +1151,7 @@ static RPCMethod bumpfee_helper(std::string method_name)
 
         result.pushKV("txid", txid.GetHex());
     } else {
-        PartiallySignedTransaction psbtx(mtx);
+        PartiallySignedTransaction psbtx(mtx, psbt_version);
         bool complete = false;
         const auto err{pwallet->FillPSBT(psbtx, {.sign = false, .bip32_derivs = true}, complete)};
         CHECK_NONFATAL(!err);
@@ -1166,8 +1181,7 @@ RPCMethod send()
 {
     return RPCMethod{
         "send",
-        "EXPERIMENTAL warning: this call may be changed in future releases.\n"
-        "\nSend a transaction.\n",
+        "Send a transaction.\n",
         {
             {"outputs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The outputs specified as key-value pairs.\n"
                     "Each key may only appear once, i.e. there can only be one 'data' output, and no address may be duplicated.\n"
@@ -1289,8 +1303,7 @@ RPCMethod send()
 RPCMethod sendall()
 {
     return RPCMethod{"sendall",
-        "EXPERIMENTAL warning: this call may be changed in future releases.\n"
-        "\nSpend the value of all (or specific) confirmed UTXOs and unconfirmed change in the wallet to one or more recipients.\n"
+        "Spend the value of all (or specific) confirmed UTXOs and unconfirmed change in the wallet to one or more recipients.\n"
         "Unconfirmed inbound UTXOs and locked UTXOs will not be spent. Sendall will respect the avoid_reuse wallet flag.\n"
         "If your wallet contains many small inputs, either because it received tiny payments or as a result of accumulating change, consider using `send_max` to exclude inputs that are worth less than the fees needed to spend them.\n",
         {
@@ -1462,17 +1475,17 @@ RPCMethod sendall()
                         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input not available. UTXO (%s:%d) was already spent.", input.prevout.hash.ToString(), input.prevout.n));
                     }
                     const CWalletTx* tx{pwallet->GetWalletTx(input.prevout.hash)};
-                    if (!tx || input.prevout.n >= tx->tx->vout.size() || !pwallet->IsMine(tx->tx->vout[input.prevout.n])) {
+                    if (!tx || input.prevout.n >= tx->GetTx()->vout.size() || !pwallet->IsMine(tx->GetTx()->vout[input.prevout.n])) {
                         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input not found. UTXO (%s:%d) is not part of wallet.", input.prevout.hash.ToString(), input.prevout.n));
                     }
                     if (pwallet->GetTxDepthInMainChain(*tx) == 0) {
-                        if (tx->tx->version == TRUC_VERSION && coin_control.m_version != TRUC_VERSION) {
+                        if (tx->GetTx()->version == TRUC_VERSION && coin_control.m_version != TRUC_VERSION) {
                             throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Can't spend unconfirmed version 3 pre-selected input with a version %d tx", coin_control.m_version));
-                        } else if (coin_control.m_version == TRUC_VERSION && tx->tx->version != TRUC_VERSION) {
-                            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Can't spend unconfirmed version %d pre-selected input with a version 3 tx", tx->tx->version));
+                        } else if (coin_control.m_version == TRUC_VERSION && tx->GetTx()->version != TRUC_VERSION) {
+                            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Can't spend unconfirmed version %d pre-selected input with a version 3 tx", tx->GetTx()->version));
                         }
                     }
-                    total_input_value += tx->tx->vout[input.prevout.n].nValue;
+                    total_input_value += tx->GetTx()->vout[input.prevout.n].nValue;
                 }
             } else {
                 CoinFilterParams coins_params;
@@ -1485,7 +1498,7 @@ RPCMethod sendall()
                     if (output.depth == 0 && coin_control.m_version == TRUC_VERSION) {
                         coin_control.m_max_tx_weight = TRUC_CHILD_MAX_WEIGHT;
                     }
-                    CTxIn input(output.outpoint.hash, output.outpoint.n, CScript(), rbf ? MAX_BIP125_RBF_SEQUENCE : CTxIn::SEQUENCE_FINAL);
+                    CTxIn input(output.outpoint.hash, output.outpoint.n, CScript(), rbf ? MAX_BIP125_RBF_SEQUENCE : CTxIn::MAX_SEQUENCE_NONFINAL);
                     rawTx.vin.push_back(input);
                     total_input_value += output.txout.nValue;
                 }
@@ -1618,11 +1631,11 @@ RPCMethod walletprocesspsbt()
     wallet.BlockUntilSyncedToCurrentChain();
 
     // Unserialize the transaction
-    PartiallySignedTransaction psbtx;
-    std::string error;
-    if (!DecodeBase64PSBT(psbtx, request.params[0].get_str(), error)) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", error));
+    util::Result<PartiallySignedTransaction> psbt_res = DecodeBase64PSBT(request.params[0].get_str());
+    if (!psbt_res) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed %s", util::ErrorString(psbt_res).original));
     }
+    PartiallySignedTransaction psbtx = *psbt_res;
 
     // Get the sighash type
     std::optional<int> nHashType = ParseSighashString(request.params[2]);
@@ -1723,6 +1736,7 @@ RPCMethod walletcreatefundedpsbt()
                         RPCArgOptions{.oneline_description="options"}},
                     {"bip32derivs", RPCArg::Type::BOOL, RPCArg::Default{true}, "Include BIP 32 derivation paths for public keys if we know them"},
                     {"version", RPCArg::Type::NUM, RPCArg::Default{DEFAULT_WALLET_TX_VERSION}, "Transaction version"},
+                    {"psbt_version", RPCArg::Type::NUM, RPCArg::Default(2), "The PSBT version number to use."},
                 },
                 RPCResult{
                     RPCResult::Type::OBJ, "", "",
@@ -1772,7 +1786,15 @@ RPCMethod walletcreatefundedpsbt()
     auto txr = FundTransaction(wallet, rawTx, recipients, options, coin_control, /*override_min_fee=*/true);
 
     // Make a blank psbt
-    PartiallySignedTransaction psbtx(CMutableTransaction(*txr.tx));
+    uint32_t psbt_version = 2;
+    if (!request.params[6].isNull()) {
+        psbt_version = request.params[6].getInt<int>();
+    }
+    if (psbt_version != 2 && psbt_version != 0) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "The PSBT version can only be 2 or 0");
+    }
+
+    PartiallySignedTransaction psbtx(CMutableTransaction(*txr.tx), psbt_version);
 
     // Fill transaction with out data but don't sign
     bool bip32derivs = request.params[4].isNull() ? true : request.params[4].get_bool();
diff --git a/depend/bitcoin/src/wallet/rpc/transactions.cpp b/depend/bitcoin/src/wallet/rpc/transactions.cpp
index 1a7480b8..1db66beb 100644
--- a/depend/bitcoin/src/wallet/rpc/transactions.cpp
+++ b/depend/bitcoin/src/wallet/rpc/transactions.cpp
@@ -38,6 +38,12 @@ static void WalletTxToJSON(const CWallet& wallet, const CWalletTx& wtx, UniValue
     }
     entry.pushKV("txid", wtx.GetHash().GetHex());
     entry.pushKV("wtxid", wtx.GetWitnessHash().GetHex());
+    UniValue alternate_wtxids(UniValue::VARR);
+    for (const auto& [wtxid, _] : wtx.GetTxs()) {
+        if (wtxid == wtx.GetWitnessHash()) continue;
+        alternate_wtxids.push_back(wtxid.GetHex());
+    }
+    entry.pushKV("alternate_wtxids", alternate_wtxids);
     UniValue conflicts(UniValue::VARR);
     for (const Txid& conflict : wallet.GetTxConflicts(wtx))
         conflicts.push_back(conflict.GetHex());
@@ -50,18 +56,22 @@ static void WalletTxToJSON(const CWallet& wallet, const CWalletTx& wtx, UniValue
     entry.pushKV("timereceived", wtx.nTimeReceived);
 
     // Add opt-in RBF status
-    std::string rbfStatus = "no";
-    if (confirms <= 0) {
-        RBFTransactionState rbfState = chain.isRBFOptIn(*wtx.tx);
-        if (rbfState == RBFTransactionState::UNKNOWN)
-            rbfStatus = "unknown";
-        else if (rbfState == RBFTransactionState::REPLACEABLE_BIP125)
-            rbfStatus = "yes";
+    if (chain.rpcEnableDeprecated("bip125")) {
+        std::string rbfStatus = "no";
+        if (confirms <= 0) {
+            RBFTransactionState rbfState = chain.isRBFOptIn(*wtx.GetTx());
+            if (rbfState == RBFTransactionState::UNKNOWN)
+                rbfStatus = "unknown";
+            else if (rbfState == RBFTransactionState::REPLACEABLE_BIP125)
+                rbfStatus = "yes";
+        }
+        entry.pushKV("bip125-replaceable", rbfStatus);
     }
-    entry.pushKV("bip125-replaceable", rbfStatus);
 
-    for (const std::pair<const std::string, std::string>& item : wtx.mapValue)
-        entry.pushKV(item.first, item.second);
+    if (wtx.m_comment) entry.pushKV("comment", *wtx.m_comment);
+    if (wtx.m_comment_to) entry.pushKV("to", *wtx.m_comment_to);
+    if (wtx.m_replaces_txid) entry.pushKV("replaces_txid", wtx.m_replaces_txid->ToString());
+    if (wtx.m_replaced_by_txid) entry.pushKV("replaced_by_txid", wtx.m_replaced_by_txid->ToString());
 }
 
 struct tallyitem
@@ -106,7 +116,7 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons
             continue;
         }
 
-        for (const CTxOut& txout : wtx.tx->vout) {
+        for (const CTxOut& txout : wtx.GetTx()->vout) {
             CTxDestination address;
             if (!ExtractDestination(txout.scriptPubKey, address))
                 continue;
@@ -129,12 +139,17 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons
     UniValue ret(UniValue::VARR);
     std::map<std::string, tallyitem> label_tally;
 
-    const auto& func = [&](const CTxDestination& address, const std::string& label, bool is_change, const std::optional<AddressPurpose>& purpose) {
+    const auto& func = [&](const CTxDestination& address, const std::string& label, bool is_change,
+                            const std::optional<AddressPurpose>& purpose) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet) {
         if (is_change) return; // no change addresses
 
+        // Entries in mapTally are only ever added for wallet.IsMine() addresses (see the tally
+        // loop above), so it's only addresses missing from mapTally that need the IsMine() check.
         auto it = mapTally.find(address);
-        if (it == mapTally.end() && !fIncludeEmpty)
-            return;
+        if (it == mapTally.end()) {
+            if (!fIncludeEmpty) return;
+            if (!wallet.IsMine(address)) return; // exclude addresses not owned by the wallet (e.g. "send" purpose)
+        }
 
         CAmount nAmount = 0;
         int nConf = std::numeric_limits<int>::max();
@@ -350,7 +365,7 @@ static void ListTransactions(const CWallet& wallet, const CWalletTx& wtx, int nM
             }
             UniValue entry(UniValue::VOBJ);
             MaybePushAddress(entry, r.destination);
-            PushParentDescriptors(wallet, wtx.tx->vout.at(r.vout).scriptPubKey, entry);
+            PushParentDescriptors(wallet, wtx.GetTx()->vout.at(r.vout).scriptPubKey, entry);
             if (wtx.IsCoinBase())
             {
                 if (wallet.GetTxDepthInMainChain(wtx) < 1)
@@ -391,6 +406,10 @@ static std::vector<RPCResult> TransactionDescriptionString()
            {RPCResult::Type::NUM_TIME, "blocktime", /*optional=*/true, "The block time expressed in " + UNIX_EPOCH_TIME + "."},
            {RPCResult::Type::STR_HEX, "txid", "The transaction id."},
            {RPCResult::Type::STR_HEX, "wtxid", "The hash of serialized transaction, including witness data."},
+           {RPCResult::Type::ARR, "alternate_wtxids", "The wtxids of transactions with different witness data but the same txid.",
+           {
+               {RPCResult::Type::STR_HEX, "wtxid", "The witness transaction id."},
+           }},
            {RPCResult::Type::ARR, "walletconflicts", "Confirmed transactions that have been detected by the wallet to conflict with this transaction.",
            {
                {RPCResult::Type::STR_HEX, "txid", "The transaction id."},
@@ -405,7 +424,7 @@ static std::vector<RPCResult> TransactionDescriptionString()
            {RPCResult::Type::NUM_TIME, "time", "The transaction time expressed in " + UNIX_EPOCH_TIME + "."},
            {RPCResult::Type::NUM_TIME, "timereceived", "The time received expressed in " + UNIX_EPOCH_TIME + "."},
            {RPCResult::Type::STR, "comment", /*optional=*/true, "If a comment is associated with the transaction, only present if not empty."},
-           {RPCResult::Type::STR, "bip125-replaceable", "(\"yes|no|unknown\") Whether this transaction signals BIP125 replaceability or has an unconfirmed ancestor signaling BIP125 replaceability.\n"
+           {RPCResult::Type::STR, "bip125-replaceable", /*optional=*/true, "(\"yes|no|unknown\") (DEPRECATED) Whether this transaction signals BIP125 replaceability or has an unconfirmed ancestor signaling BIP125 replaceability.\n"
                "May be unknown for unconfirmed transactions not in the mempool because their unconfirmed ancestors are unknown."},
            {RPCResult::Type::ARR, "parent_descs", /*optional=*/true, "Only if 'category' is 'received'. List of parent descriptors for the output script of this coin.", {
                {RPCResult::Type::STR, "desc", "The descriptor string."},
@@ -521,6 +540,33 @@ RPCMethod listtransactions()
     };
 }
 
+static std::vector<RPCResult> ListSinceBlockTxFields()
+{
+    return Cat<std::vector<RPCResult>>(
+        {
+            {RPCResult::Type::STR, "address", /*optional=*/true, "The bitcoin address of the transaction (not returned if the output does not have an address, e.g. OP_RETURN null data)."},
+            {RPCResult::Type::STR, "category", "The transaction category.\n"
+                "\"send\"                  Transactions sent.\n"
+                "\"receive\"               Non-coinbase transactions received.\n"
+                "\"generate\"              Coinbase transactions received with more than 100 confirmations.\n"
+                "\"immature\"              Coinbase transactions received with 100 or fewer confirmations.\n"
+                "\"orphan\"                Orphaned coinbase transactions received."},
+            {RPCResult::Type::STR_AMOUNT, "amount", "The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
+                "for all other categories"},
+            {RPCResult::Type::NUM, "vout", "the vout value"},
+            {RPCResult::Type::STR_AMOUNT, "fee", /*optional=*/true, "The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the\n"
+                 "'send' category of transactions."},
+        },
+        Cat(
+            TransactionDescriptionString(),
+            std::vector<RPCResult>{
+                {RPCResult::Type::BOOL, "abandoned", "'true' if the transaction has been abandoned (inputs are respendable)."},
+                {RPCResult::Type::STR, "label", /*optional=*/true, "A comment for the address/transaction, if any"},
+            }
+        )
+    );
+}
+
 RPCMethod listsinceblock()
 {
     return RPCMethod{
@@ -542,30 +588,13 @@ RPCMethod listsinceblock()
                     {
                         {RPCResult::Type::ARR, "transactions", "",
                         {
-                            {RPCResult::Type::OBJ, "", "", Cat(Cat<std::vector<RPCResult>>(
-                            {
-                                {RPCResult::Type::STR, "address",  /*optional=*/true, "The bitcoin address of the transaction (not returned if the output does not have an address, e.g. OP_RETURN null data)."},
-                                {RPCResult::Type::STR, "category", "The transaction category.\n"
-                                    "\"send\"                  Transactions sent.\n"
-                                    "\"receive\"               Non-coinbase transactions received.\n"
-                                    "\"generate\"              Coinbase transactions received with more than 100 confirmations.\n"
-                                    "\"immature\"              Coinbase transactions received with 100 or fewer confirmations.\n"
-                                    "\"orphan\"                Orphaned coinbase transactions received."},
-                                {RPCResult::Type::STR_AMOUNT, "amount", "The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
-                                    "for all other categories"},
-                                {RPCResult::Type::NUM, "vout", "the vout value"},
-                                {RPCResult::Type::STR_AMOUNT, "fee", /*optional=*/true, "The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the\n"
-                                     "'send' category of transactions."},
-                            },
-                            TransactionDescriptionString()),
-                            {
-                                {RPCResult::Type::BOOL, "abandoned", "'true' if the transaction has been abandoned (inputs are respendable)."},
-                                {RPCResult::Type::STR, "label", /*optional=*/true, "A comment for the address/transaction, if any"},
-                            })},
+                            {RPCResult::Type::OBJ, "", "", ListSinceBlockTxFields()},
                         }},
                         {RPCResult::Type::ARR, "removed", /*optional=*/true, "<structure is the same as \"transactions\" above, only present if include_removed=true>\n"
-                            "Note: transactions that were re-added in the active chain will appear as-is in this array, and may thus have a positive confirmation count."
-                        , {{RPCResult::Type::ELISION, "", ""},}},
+                            "Note: transactions that were re-added in the active chain will appear as-is in this array, and may thus have a positive confirmation count.",
+                        {
+                            {RPCResult::Type::OBJ, "", "", ListSinceBlockTxFields(), {.print_elision = std::string{}}},
+                        }},
                         {RPCResult::Type::STR_HEX, "lastblock", "The hash of the block (target_confirmations-1) from the best block on the main chain, or the genesis hash if the referenced block does not exist yet. This is typically used to feed back into listsinceblock the next time you call it. So you would generally use a target_confirmations of say 6, so you will be continually re-notified of transactions until they've reached 6 confirmations plus any new ones"},
                     }
                 },
@@ -741,7 +770,7 @@ RPCMethod gettransaction()
     CAmount nCredit = CachedTxGetCredit(*pwallet, wtx, /*avoid_reuse=*/false);
     CAmount nDebit = CachedTxGetDebit(*pwallet, wtx, /*avoid_reuse=*/false);
     CAmount nNet = nCredit - nDebit;
-    CAmount nFee = (CachedTxIsFromMe(*pwallet, wtx) ? wtx.tx->GetValueOut() - nDebit : 0);
+    CAmount nFee = (CachedTxIsFromMe(*pwallet, wtx) ? wtx.GetTx()->GetValueOut() - nDebit : 0);
 
     entry.pushKV("amount", ValueFromAmount(nNet - nFee));
     if (CachedTxIsFromMe(*pwallet, wtx))
@@ -753,11 +782,11 @@ RPCMethod gettransaction()
     ListTransactions(*pwallet, wtx, 0, false, details, /*filter_label=*/std::nullopt);
     entry.pushKV("details", std::move(details));
 
-    entry.pushKV("hex", EncodeHexTx(*wtx.tx));
+    entry.pushKV("hex", EncodeHexTx(*wtx.GetTx()));
 
     if (verbose) {
         UniValue decoded(UniValue::VOBJ);
-        TxToUniv(*wtx.tx,
+        TxToUniv(*wtx.GetTx(),
                 /*block_hash=*/uint256(),
                 /*entry=*/decoded,
                 /*include_hex=*/false,
@@ -897,7 +926,7 @@ RPCMethod rescanblockchain()
     }
 
     CWallet::ScanResult result =
-        pwallet->ScanForWalletTransactions(start_block, start_height, stop_height, reserver, /*fUpdate=*/true, /*save_progress=*/false);
+        pwallet->ScanForWalletTransactions(start_block, start_height, stop_height, reserver, /*save_progress=*/false);
     switch (result.status) {
     case CWallet::ScanResult::SUCCESS:
         break;
diff --git a/depend/bitcoin/src/wallet/rpc/util.h b/depend/bitcoin/src/wallet/rpc/util.h
index 88fdc663..49c23e1e 100644
--- a/depend/bitcoin/src/wallet/rpc/util.h
+++ b/depend/bitcoin/src/wallet/rpc/util.h
@@ -21,13 +21,12 @@ class UniValue;
 struct bilingual_str;
 
 namespace wallet {
-class LegacyScriptPubKeyMan;
 enum class DatabaseStatus;
 struct WalletContext;
 
 extern const std::string HELP_REQUIRING_PASSPHRASE;
 
-static const RPCResult RESULT_LAST_PROCESSED_BLOCK { RPCResult::Type::OBJ, "lastprocessedblock", "hash and height of the block this information was generated on",{
+inline const RPCResult RESULT_LAST_PROCESSED_BLOCK { RPCResult::Type::OBJ, "lastprocessedblock", "hash and height of the block this information was generated on",{
     {RPCResult::Type::STR_HEX, "hash", "hash of the block this information was generated on"},
     {RPCResult::Type::NUM, "height", "height of the block this information was generated on"}}
 };
diff --git a/depend/bitcoin/src/wallet/rpc/wallet.cpp b/depend/bitcoin/src/wallet/rpc/wallet.cpp
index b6c9179d..054ab6b7 100644
--- a/depend/bitcoin/src/wallet/rpc/wallet.cpp
+++ b/depend/bitcoin/src/wallet/rpc/wallet.cpp
@@ -5,25 +5,34 @@
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
+#include <wallet/rpc/wallet.h>
+
+#include <coins.h>
 #include <core_io.h>
+#include <key.h>
 #include <key_io.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <univalue.h>
+#include <util/bip32.h>
 #include <util/translation.h>
 #include <wallet/context.h>
+#include <wallet/export.h>
 #include <wallet/receive.h>
 #include <wallet/rpc/util.h>
-#include <wallet/rpc/wallet.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
+#include <algorithm>
 #include <optional>
 #include <string_view>
 
 
 namespace wallet {
 
+using HDPubKeyMap = CWallet::HDPubKeyMap;
+using HDKeyFilter = CWallet::HDKeyFilter;
+
 static const std::map<uint64_t, std::string> WALLET_FLAG_CAVEATS{
     {WALLET_FLAG_AVOID_REUSE,
      "You need to rescan the blockchain in order to correctly mark used "
@@ -593,6 +602,7 @@ static RPCMethod migratewallet()
         {
             {"wallet_name", RPCArg::Type::STR, RPCArg::DefaultHint{"the wallet name from the RPC endpoint"}, "The name of the wallet to migrate. If provided both here and in the RPC endpoint, the two must be identical."},
             {"passphrase", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "The wallet passphrase"},
+            {"load_wallet", RPCArg::Type::BOOL, RPCArg::Default{true}, "Load the wallet after migration."},
         },
         RPCResult{
             RPCResult::Type::OBJ, "", "",
@@ -617,19 +627,21 @@ static RPCMethod migratewallet()
                 wallet_pass = std::string_view{request.params[1].get_str()};
             }
 
+            const bool loadwallet = self.Arg<bool>("load_wallet");
+
             WalletContext& context = EnsureWalletContext(request.context);
-            util::Result<MigrationResult> res = MigrateLegacyToDescriptor(wallet_name, wallet_pass, context);
+            util::Result<MigrationResult> res = MigrateLegacyToDescriptor(wallet_name, wallet_pass, context, loadwallet);
             if (!res) {
                 throw JSONRPCError(RPC_WALLET_ERROR, util::ErrorString(res).original);
             }
 
             UniValue r{UniValue::VOBJ};
             r.pushKV("wallet_name", res->wallet_name);
-            if (res->watchonly_wallet) {
-                r.pushKV("watchonly_name", res->watchonly_wallet->GetName());
+            if (res->watchonly_wallet_name.has_value()) {
+                r.pushKV("watchonly_name", res->watchonly_wallet_name.value());
             }
-            if (res->solvables_wallet) {
-                r.pushKV("solvables_name", res->solvables_wallet->GetName());
+            if (res->solvables_wallet_name.has_value()) {
+                r.pushKV("solvables_name", res->solvables_wallet_name.value());
             }
             r.pushKV("backup_path", res->backup_path.utf8string());
 
@@ -683,31 +695,15 @@ RPCMethod gethdkeys()
                 EnsureWalletIsUnlocked(*wallet);
             }
 
-
-            std::set<ScriptPubKeyMan*> spkms;
-            if (active_only) {
-                spkms = wallet->GetActiveScriptPubKeyMans();
-            } else {
-                spkms = wallet->GetAllScriptPubKeyMans();
-            }
-
             std::map<CExtPubKey, std::set<std::tuple<std::string, bool, bool>>> wallet_xpubs;
             std::map<CExtPubKey, CExtKey> wallet_xprvs;
-            for (auto* spkm : spkms) {
-                auto* desc_spkm{dynamic_cast<DescriptorScriptPubKeyMan*>(spkm)};
-                CHECK_NONFATAL(desc_spkm);
-                LOCK(desc_spkm->cs_desc_man);
-                WalletDescriptor w_desc = desc_spkm->GetWalletDescriptor();
-
-                // Retrieve the pubkeys from the descriptor
-                std::set<CPubKey> desc_pubkeys;
-                std::set<CExtPubKey> desc_xpubs;
-                w_desc.descriptor->GetPubKeys(desc_pubkeys, desc_xpubs);
-                for (const CExtPubKey& xpub : desc_xpubs) {
+            for (const auto& [xpub, spkms] : wallet->GetHDPubKeys(active_only ? HDKeyFilter::Active : HDKeyFilter::All)) {
+                for (auto* desc_spkm : spkms) {
+                    LOCK(desc_spkm->cs_desc_man);
                     std::string desc_str;
                     bool ok = desc_spkm->GetDescriptorString(desc_str, /*priv=*/false);
                     CHECK_NONFATAL(ok);
-                    wallet_xpubs[xpub].emplace(desc_str, wallet->IsActiveScriptPubKeyMan(*spkm), desc_spkm->HasPrivKey(xpub.pubkey.GetID()));
+                    wallet_xpubs[xpub].emplace(desc_str, wallet->IsActiveScriptPubKeyMan(*desc_spkm), desc_spkm->HasPrivKey(xpub.pubkey.GetID()));
                     if (std::optional<CKey> key = priv ? desc_spkm->GetKey(xpub.pubkey.GetID()) : std::nullopt) {
                         wallet_xprvs[xpub] = CExtKey(xpub, *key);
                     }
@@ -794,11 +790,11 @@ static RPCMethod createwalletdescriptor()
 
             CExtPubKey xpub;
             if (hdkey.isNull()) {
-                std::set<CExtPubKey> active_xpubs = pwallet->GetActiveHDPubKeys();
+                HDPubKeyMap active_xpubs = pwallet->GetHDPubKeys(HDKeyFilter::Active);
                 if (active_xpubs.size() != 1) {
                     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to determine which HD key to use from active descriptors. Please specify with 'hdkey'");
                 }
-                xpub = *active_xpubs.begin();
+                xpub = active_xpubs.begin()->first;
             } else {
                 xpub = DecodeExtPubKey(hdkey.get_str());
                 if (!xpub.pubkey.IsValid()) {
@@ -840,6 +836,243 @@ static RPCMethod createwalletdescriptor()
     };
 }
 
+RPCMethod addhdkey()
+{
+    return RPCMethod{
+        "addhdkey",
+        "Add a BIP 32 HD key to the wallet that can be used with 'createwalletdescriptor'\n",
+        {
+            {"hdkey", RPCArg::Type::STR, RPCArg::DefaultHint{"Automatically generated new key"}, "The BIP 32 extended private key to add. If none is provided, a randomly generated one will be added."},
+        },
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::STR, "xpub", "The xpub of the HD key that was added to the wallet"}
+            },
+        },
+        RPCExamples{
+            HelpExampleCli("addhdkey", "xprv") + HelpExampleRpc("addhdkey", "xprv")
+        },
+        [&](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
+        {
+            std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
+            if (!wallet) return UniValue::VNULL;
+
+            if (wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "addhdkey is not available for wallets without private keys");
+            }
+
+            EnsureWalletIsUnlocked(*wallet);
+
+            CExtKey hdkey;
+            if (request.params[0].isNull()) {
+                CKey seed_key = GenerateRandomKey();
+                hdkey.SetSeed(seed_key);
+            } else {
+                hdkey = DecodeExtKey(request.params[0].get_str());
+                if (!hdkey.key.IsValid()) {
+                    // Check if the user gave us an xpub and give a more descriptive error if so
+                    CExtPubKey xpub = DecodeExtPubKey(request.params[0].get_str());
+                    if (xpub.pubkey.IsValid()) {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Extended public key (xpub) provided, but extended private key (xprv) is required");
+                    } else {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Could not parse HD key");
+                    }
+                }
+            }
+
+            LOCK(wallet->cs_wallet);
+            std::string desc_str = "unused(" + EncodeExtKey(hdkey) + ")";
+            FlatSigningProvider keys;
+            std::string error;
+            std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, keys, error, false);
+            CHECK_NONFATAL(!descs.empty());
+            WalletDescriptor w_desc(std::move(descs.at(0)), GetTime(), 0, 0, 0);
+            if (wallet->GetDescriptorScriptPubKeyMan(w_desc) != nullptr) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "HD key already exists");
+            }
+
+            auto spkm = wallet->AddWalletDescriptor(w_desc, keys, /*label=*/"", /*internal=*/false);
+            if (!spkm) {
+                throw JSONRPCError(RPC_WALLET_ERROR, util::ErrorString(spkm).original);
+            }
+
+            UniValue response(UniValue::VOBJ);
+            const DescriptorScriptPubKeyMan& desc_spkm = spkm->get();
+            LOCK(desc_spkm.cs_desc_man);
+            std::set<CPubKey> pubkeys;
+            std::set<CExtPubKey> extpubs;
+            desc_spkm.GetWalletDescriptor().descriptor->GetPubKeys(pubkeys, extpubs);
+            CHECK_NONFATAL(pubkeys.size() == 0);
+            CHECK_NONFATAL(extpubs.size() == 1);
+            response.pushKV("xpub", EncodeExtPubKey(*extpubs.begin()));
+
+            return response;
+        },
+    };
+}
+
+static RPCMethod exportwatchonlywallet()
+{
+    return RPCMethod{"exportwatchonlywallet",
+        "Creates a wallet file at the specified destination containing a watchonly version "
+        "of the current wallet. This watchonly wallet contains the wallet's public descriptors, "
+        "its transactions, and address book data. Descriptors that use hardened derivation will "
+        "only have a limited number of derived keys included in the export due to hardened "
+        "derivation requiring private keys. Descriptors with unhardened derivation do not have "
+        "this limitation. The watchonly wallet can be imported into another node using 'restorewallet'.",
+        {
+            {"destination", RPCArg::Type::STR, RPCArg::Optional::NO, "The path to the filename the exported watchonly wallet will be saved to"},
+        },
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::STR, "exported_file", "The full path that the file has been exported to"},
+            },
+        },
+        RPCExamples{
+            HelpExampleCli("exportwatchonlywallet", "\"/path/to/export.dat\"")
+            + HelpExampleRpc("exportwatchonlywallet", "\"/path/to/export.dat\"")
+        },
+        [&](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
+        {
+            std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
+            if (!pwallet) return UniValue::VNULL;
+            WalletContext& context = EnsureWalletContext(request.context);
+
+            std::string dest = request.params[0].get_str();
+
+            LOCK(pwallet->cs_wallet);
+            pwallet->TopUpKeyPool();
+            util::Result<std::string> exported = ExportWatchOnlyWallet(*pwallet, fs::PathFromString(dest), context);
+            if (!exported) {
+                throw JSONRPCError(RPC_WALLET_ERROR, util::ErrorString(exported).original);
+            }
+            UniValue out{UniValue::VOBJ};
+            out.pushKV("exported_file", *exported);
+            return out;
+        }
+    };
+}
+
+RPCMethod derivehdkey()
+{
+    return RPCMethod{
+        "derivehdkey",
+        "Derive extended public or private key from HD key in the wallet at a given path.\n"
+        "Derivation uses wallet private key material.\n"
+        + HELP_REQUIRING_PASSPHRASE,
+        {
+            {"path", RPCArg::Type::STR, RPCArg::Optional::NO, "BIP 32 derivation path with at least one hardened step."},
+            {"options", RPCArg::Type::OBJ_NAMED_PARAMS, RPCArg::Optional::OMITTED, "", {
+                {"private", RPCArg::Type::BOOL, RPCArg::Default{false}, "Show private key"},
+                {"hdkey", RPCArg::Type::STR, RPCArg::DefaultHint{"Either the HD key of an unused(KEY) descriptor, or any other active descriptor."}, "The HD key that the wallet knows the private key of, listed using 'gethdkeys', to use for derivation"},
+            }},
+        },
+        RPCResult{
+            RPCResult::Type::OBJ, "", "", {
+                {RPCResult::Type::STR, "origin", "Fingerprint and path for use in descriptors"},
+                {RPCResult::Type::STR, "xpub", "The extended public key"},
+                {RPCResult::Type::STR, "xprv", /*optional=*/true, "The extended private key if \"private\" is true"},
+            },
+        },
+        RPCExamples{
+            HelpExampleCli("derivehdkey", "m/87h/0h/0h") + HelpExampleRpc("derivehdkey", "\"m/87h/0h/0h\"")
+            + HelpExampleCliNamed("derivehdkey", {{"path", "m/87h/0h/0h"}, {"private", "true"}})
+            + HelpExampleRpcNamed("derivehdkey", {{"path", "m/87h/0h/0h"}, {"private", "true"}})
+        },
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
+        {
+            const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
+            if (!wallet) return UniValue::VNULL;
+
+            if (wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+                // Watch-only wallets can't contain unused(KEY) descriptors
+                throw JSONRPCError(RPC_WALLET_ERROR, "derivehdkey is not available for watch-only wallets");
+            }
+
+            std::vector<uint32_t> path = ParsePathBIP32(request.params[0].get_str());
+            UniValue options{request.params[1].isNull() ? UniValue::VOBJ : request.params[1]};
+            const bool priv{options.exists("private") ? options["private"].get_bool() : false};
+            UniValue hdkey{options["hdkey"]};
+            if (!HasHardenedDerivation(path)) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Derivation path requires at least one hardened step");
+            }
+
+            LOCK(wallet->cs_wallet);
+
+            // The RPC requires a hardened derivation step, so always unlock
+            // the wallet.
+            EnsureWalletIsUnlocked(*wallet);
+
+            CExtPubKey xpub;
+            if (!hdkey.isNull()) {
+                xpub = DecodeExtPubKey(hdkey.get_str());
+                if (!xpub.pubkey.IsValid()) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to parse HD key. Please provide a valid xpub");
+                }
+
+                // Accept an xpub from an active or unused(KEY) descriptor, but
+                // not from a (used) inactive one.
+                std::set<CExtPubKey> xpub_candidates;
+                for (const auto& candidate : wallet->GetHDPubKeys(HDKeyFilter::UnusedKey)) {
+                    xpub_candidates.insert(candidate.first);
+                }
+                for (const auto& candidate : wallet->GetHDPubKeys(HDKeyFilter::Active)) {
+                    xpub_candidates.insert(candidate.first);
+                }
+                if (!xpub_candidates.contains(xpub)) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "HD key is not used by an active or unused(KEY) descriptor");
+                }
+            }
+
+            // If hdkey was not specified, try to look it up. First consider
+            // unused(KEY) descriptors. Otherwise look for active descriptors.
+            if (hdkey.isNull()) {
+                HDPubKeyMap wallet_xpubs{wallet->GetHDPubKeys(HDKeyFilter::UnusedKey)};
+
+                if (wallet_xpubs.size() > 1) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to determine which HD key to use. Please specify with 'hdkey'");
+                } else if (wallet_xpubs.size() == 1) {
+                    xpub = wallet_xpubs.begin()->first;
+                } else {
+                    HDPubKeyMap active_xpubs = wallet->GetHDPubKeys(HDKeyFilter::Active);
+                    if (active_xpubs.empty()) {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No active or unused(KEY) descriptor found");
+                    }
+
+                    if (active_xpubs.size() > 1) {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to determine which HD key to use from active descriptors. Please specify with 'hdkey'");
+                    }
+
+                    xpub = active_xpubs.begin()->first;
+                }
+            }
+
+            std::optional<CExtKey> xprv{wallet->GetExtKey(xpub)};
+            if (!xprv) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Private key for %s is not known", EncodeExtPubKey(xpub)));
+            }
+
+            std::optional<std::pair<CExtKey, KeyOriginInfo>> child{DeriveExtKey(*xprv, path)};
+            if (!child) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Unable to derive HD key at the requested path");
+            }
+
+            UniValue res{UniValue::VOBJ};
+
+            const std::string fingerprint{HexStr(child->second.fingerprint)};
+
+            res.pushKV("origin", strprintf("[%s%s]", fingerprint, FormatHDKeypath(child->second.path)));
+            res.pushKV("xpub", EncodeExtPubKey(child->first.Neuter()));
+            if (priv) {
+                res.pushKV("xprv", EncodeExtKey(child->first));
+            }
+            return res;
+        },
+    };
+}
+
 // addresses
 RPCMethod getaddressinfo();
 RPCMethod getnewaddress();
@@ -907,13 +1140,16 @@ std::span<const CRPCCommand> GetWalletRPCCommands()
         {"rawtransactions", &fundrawtransaction},
         {"wallet", &abandontransaction},
         {"wallet", &abortrescan},
+        {"wallet", &addhdkey},
         {"wallet", &backupwallet},
         {"wallet", &bumpfee},
         {"wallet", &psbtbumpfee},
         {"wallet", &createwallet},
         {"wallet", &createwalletdescriptor},
+        {"wallet", &derivehdkey},
         {"wallet", &restorewallet},
         {"wallet", &encryptwallet},
+        {"wallet", &exportwatchonlywallet},
         {"wallet", &getaddressesbylabel},
         {"wallet", &getaddressinfo},
         {"wallet", &getbalance},
diff --git a/depend/bitcoin/src/wallet/scriptpubkeyman.cpp b/depend/bitcoin/src/wallet/scriptpubkeyman.cpp
index 911b247d..c3db3816 100644
--- a/depend/bitcoin/src/wallet/scriptpubkeyman.cpp
+++ b/depend/bitcoin/src/wallet/scriptpubkeyman.cpp
@@ -2,9 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <wallet/scriptpubkeyman.h>
+
+#include <coins.h>
 #include <hash.h>
 #include <key_io.h>
-#include <logging.h>
 #include <node/types.h>
 #include <outputtype.h>
 #include <script/descriptor.h>
@@ -13,11 +15,11 @@
 #include <script/solver.h>
 #include <util/bip32.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/time.h>
 #include <util/translation.h>
-#include <wallet/scriptpubkeyman.h>
 
 #include <optional>
 
@@ -419,10 +421,10 @@ bool LegacyDataSPKM::GetKeyOrigin(const CKeyID& keyID, KeyOriginInfo& info) cons
         meta = it->second;
     }
     if (meta.has_key_origin) {
-        std::copy(meta.key_origin.fingerprint, meta.key_origin.fingerprint + 4, info.fingerprint);
+        info.fingerprint = meta.key_origin.fingerprint;
         info.path = meta.key_origin.path;
     } else { // Single pubkeys get the master fingerprint of themselves
-        std::copy(keyID.begin(), keyID.begin() + 4, info.fingerprint);
+        info.fingerprint = keyID.fingerprint();
     }
     return true;
 }
@@ -596,16 +598,15 @@ std::optional<MigrationData> LegacyDataSPKM::MigrateToDescriptor()
 
         // Construct the combo descriptor
         std::string desc_str = "combo(" + origin_str + HexStr(key.GetPubKey()) + ")";
-        FlatSigningProvider keys;
+        FlatSigningProvider provider;
         std::string error;
-        std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, keys, error, false);
+        std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, provider, error, false);
         CHECK_NONFATAL(descs.size() == 1); // It shouldn't be possible to have an invalid or multipath descriptor
         WalletDescriptor w_desc(std::move(descs.at(0)), creation_time, 0, 0, 0);
 
         // Make the DescriptorScriptPubKeyMan and get the scriptPubKeys
-        auto desc_spk_man = std::make_unique<DescriptorScriptPubKeyMan>(m_storage, w_desc, /*keypool_size=*/0);
-        WITH_LOCK(desc_spk_man->cs_desc_man, desc_spk_man->AddDescriptorKeyWithDB(batch, key, key.GetPubKey()));
-        desc_spk_man->TopUpWithDB(batch);
+        provider.keys.emplace(key.GetPubKey().GetID(), key);
+        auto desc_spk_man = DescriptorScriptPubKeyMan::CreateFromMigration(m_storage, batch, w_desc, /*keypool_size=*/0, provider);
         auto desc_spks = desc_spk_man->GetScriptPubKeys();
 
         // Remove the scriptPubKeys from our current set
@@ -619,42 +620,50 @@ std::optional<MigrationData> LegacyDataSPKM::MigrateToDescriptor()
     }
 
     // Handle HD keys by using the CHDChains
-    std::vector<CHDChain> chains;
-    chains.push_back(m_hd_chain);
+    std::set<CHDChain> chains;
+    chains.insert(m_hd_chain);
     for (const auto& chain_pair : m_inactive_hd_chains) {
-        chains.push_back(chain_pair.second);
+        chains.insert(chain_pair.second);
     }
 
     bool can_support_hd_split_feature = m_hd_chain.nVersion >= CHDChain::VERSION_HD_CHAIN_SPLIT;
 
+    std::set<CExtPubKey> master_xpubs;
     for (const CHDChain& chain : chains) {
+        if (chain.seed_id.IsNull()) continue;
+
+        // Get the master xprv
+        CKey seed_key;
+        if (!GetKey(chain.seed_id, seed_key)) {
+            assert(false);
+        }
+        CExtKey master_key;
+        master_key.SetSeed(seed_key);
+
+        // Get the xpub and verify that we haven't already seen this xpub before
+        CExtPubKey master_xpub = master_key.Neuter();
+        const auto& [_, inserted] = master_xpubs.insert(master_xpub);
+        if (!inserted) continue;
+
         for (int i = 0; i < 2; ++i) {
             // Skip if doing internal chain and split chain is not supported
-            if (chain.seed_id.IsNull() || (i == 1 && !can_support_hd_split_feature)) {
+            if (i == 1 && !can_support_hd_split_feature) {
                 continue;
             }
-            // Get the master xprv
-            CKey seed_key;
-            if (!GetKey(chain.seed_id, seed_key)) {
-                assert(false);
-            }
-            CExtKey master_key;
-            master_key.SetSeed(seed_key);
 
             // Make the combo descriptor
             std::string xpub = EncodeExtPubKey(master_key.Neuter());
             std::string desc_str = "combo(" + xpub + "/0h/" + ToString(i) + "h/*h)";
-            FlatSigningProvider keys;
+            FlatSigningProvider provider;
             std::string error;
-            std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, keys, error, false);
+            std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, provider, error, false);
             CHECK_NONFATAL(descs.size() == 1); // It shouldn't be possible to have an invalid or multipath descriptor
             uint32_t chain_counter = std::max((i == 1 ? chain.nInternalChainCounter : chain.nExternalChainCounter), (uint32_t)0);
             WalletDescriptor w_desc(std::move(descs.at(0)), 0, 0, chain_counter, 0);
 
             // Make the DescriptorScriptPubKeyMan and get the scriptPubKeys
-            auto desc_spk_man = std::make_unique<DescriptorScriptPubKeyMan>(m_storage, w_desc, /*keypool_size=*/0);
-            WITH_LOCK(desc_spk_man->cs_desc_man, desc_spk_man->AddDescriptorKeyWithDB(batch, master_key.key, master_key.key.GetPubKey()));
-            desc_spk_man->TopUpWithDB(batch);
+            provider.keys.emplace(master_key.key.GetPubKey().GetID(), master_key.key);
+            auto desc_spk_man = DescriptorScriptPubKeyMan::CreateFromMigration(m_storage, batch, w_desc, /*keypool_size=*/0, provider);
             auto desc_spks = desc_spk_man->GetScriptPubKeys();
 
             // Remove the scriptPubKeys from our current set
@@ -727,16 +736,15 @@ std::optional<MigrationData> LegacyDataSPKM::MigrateToDescriptor()
             desc->Expand(0, provider, desc_spks, provider);
         } else {
             // Make the DescriptorScriptPubKeyMan and get the scriptPubKeys
-            WalletDescriptor w_desc(std::move(desc), creation_time, 0, 0, 0);
-            auto desc_spk_man = std::make_unique<DescriptorScriptPubKeyMan>(m_storage, w_desc, /*keypool_size=*/0);
             for (const auto& keyid : privkeyids) {
                 CKey key;
                 if (!GetKey(keyid, key)) {
                     continue;
                 }
-                WITH_LOCK(desc_spk_man->cs_desc_man, desc_spk_man->AddDescriptorKeyWithDB(batch, key, key.GetPubKey()));
+                keys.keys.emplace(key.GetPubKey().GetID(), key);
             }
-            desc_spk_man->TopUpWithDB(batch);
+            WalletDescriptor w_desc(std::move(desc), creation_time, 0, 0, 0);
+            auto desc_spk_man = DescriptorScriptPubKeyMan::CreateFromMigration(m_storage, batch, w_desc, /*keypool_size=*/0, keys);
             auto desc_spks_set = desc_spk_man->GetScriptPubKeys();
             desc_spks.insert(desc_spks.end(), desc_spks_set.begin(), desc_spks_set.end());
 
@@ -821,6 +829,48 @@ bool LegacyDataSPKM::DeleteRecordsWithDB(WalletBatch& batch)
     return batch.EraseRecords(DBKeys::LEGACY_TYPES);
 }
 
+std::unique_ptr<DescriptorScriptPubKeyMan> DescriptorScriptPubKeyMan::CreateFromImport(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const FlatSigningProvider& provider)
+{
+    auto spkm = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(storage, descriptor, keypool_size));
+    LOCK(spkm->cs_desc_man);
+    WalletBatch batch(storage.GetDatabase());
+    spkm->UpdateWithSigningProvider(batch, provider);
+    return spkm;
+}
+
+std::unique_ptr<DescriptorScriptPubKeyMan> DescriptorScriptPubKeyMan::CreateFromMigration(WalletStorage& storage, WalletBatch& batch, WalletDescriptor& descriptor, int64_t keypool_size, const FlatSigningProvider& provider)
+{
+    auto spkm = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(storage, descriptor, keypool_size));
+    LOCK(spkm->cs_desc_man);
+    spkm->UpdateWithSigningProvider(batch, provider);
+    return spkm;
+}
+
+DescriptorScriptPubKeyMan::DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys)
+    : ScriptPubKeyMan(storage),
+    m_map_keys(keys),
+    m_map_crypted_keys(ckeys),
+    m_keypool_size(keypool_size),
+    m_wallet_descriptor(descriptor)
+{
+    if (!keys.empty() && !ckeys.empty()) {
+        throw std::runtime_error("Wallet contains both unencrypted and encrypted keys");
+    }
+    Load();
+}
+
+std::unique_ptr<DescriptorScriptPubKeyMan> DescriptorScriptPubKeyMan::LoadFromStorage(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys)
+{
+    return std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(storage, descriptor, keypool_size, keys, ckeys));
+}
+
+std::unique_ptr<DescriptorScriptPubKeyMan> DescriptorScriptPubKeyMan::GenerateNewSingleSig(WalletStorage& storage, WalletBatch& batch, int64_t keypool_size, const CExtKey& master_key, OutputType addr_type, bool internal)
+{
+    auto spkm = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(storage, keypool_size));
+    spkm->SetupDescriptorGeneration(batch, master_key, addr_type, internal);
+    return spkm;
+}
+
 util::Result<CTxDestination> DescriptorScriptPubKeyMan::GetNewDestination(const OutputType type)
 {
     // Returns true if this descriptor supports getting new addresses. Conditions where we may be unable to fetch them (e.g. locked) are caught later
@@ -1132,15 +1182,11 @@ bool DescriptorScriptPubKeyMan::AddDescriptorKeyWithDB(WalletBatch& batch, const
     }
 }
 
-bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal)
+void DescriptorScriptPubKeyMan::SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal)
 {
     LOCK(cs_desc_man);
-    assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
-
-    // Ignore when there is already a descriptor
-    if (m_wallet_descriptor.descriptor) {
-        return false;
-    }
+    Assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
+    Assert(!m_wallet_descriptor.descriptor);
 
     m_wallet_descriptor = GenerateWalletDescriptor(master_key.Neuter(), addr_type, internal);
 
@@ -1152,11 +1198,15 @@ bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(WalletBatch& batch, co
         throw std::runtime_error(std::string(__func__) + ": writing descriptor failed");
     }
 
+    // Set m_decryption_thoroughly_checked for encrypted wallets
+    if (m_storage.HasEncryptionKeys()) {
+        m_decryption_thoroughly_checked = true;
+    }
+
     // TopUp
     TopUpWithDB(batch);
 
     m_storage.UnsetBlankWalletFlag(batch);
-    return true;
 }
 
 bool DescriptorScriptPubKeyMan::IsHDEnabled() const
@@ -1172,7 +1222,7 @@ bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const
     LOCK(cs_desc_man);
     return m_wallet_descriptor.descriptor->IsSingleType() &&
            m_wallet_descriptor.descriptor->IsRange() &&
-           (HavePrivateKeys() || m_wallet_descriptor.next_index < m_wallet_descriptor.range_end);
+           (HavePrivateKeys() || m_wallet_descriptor.next_index < m_wallet_descriptor.range_end || m_wallet_descriptor.descriptor->CanSelfExpand());
 }
 
 bool DescriptorScriptPubKeyMan::HavePrivateKeys() const
@@ -1311,8 +1361,7 @@ std::optional<PSBTError> DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTran
     if (n_signed) {
         *n_signed = 0;
     }
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
-        const CTxIn& txin = psbtx.tx->vin[i];
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
         PSBTInput& input = psbtx.inputs.at(i);
 
         if (PSBTInputSigned(input)) {
@@ -1324,10 +1373,10 @@ std::optional<PSBTError> DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTran
         if (!input.witness_utxo.IsNull()) {
             script = input.witness_utxo.scriptPubKey;
         } else if (input.non_witness_utxo) {
-            if (txin.prevout.n >= input.non_witness_utxo->vout.size()) {
+            if (input.prev_out >= input.non_witness_utxo->vout.size()) {
                 return PSBTError::MISSING_INPUTS;
             }
-            script = input.non_witness_utxo->vout[txin.prevout.n].scriptPubKey;
+            script = input.non_witness_utxo->vout[input.prev_out].scriptPubKey;
         } else {
             // There's no UTXO so we can just skip this now
             continue;
@@ -1391,8 +1440,8 @@ std::optional<PSBTError> DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTran
     }
 
     // Fill in the bip32 keypaths and redeemscripts for the outputs so that hardware wallets can identify change
-    for (unsigned int i = 0; i < psbtx.tx->vout.size(); ++i) {
-        std::unique_ptr<SigningProvider> keys = GetSolvingProvider(psbtx.tx->vout.at(i).scriptPubKey);
+    for (unsigned int i = 0; i < psbtx.outputs.size(); ++i) {
+        std::unique_ptr<SigningProvider> keys = GetSolvingProvider(psbtx.outputs.at(i).script);
         if (!keys) {
             continue;
         }
@@ -1426,11 +1475,10 @@ uint256 DescriptorScriptPubKeyMan::GetID() const
     return m_wallet_descriptor.id;
 }
 
-void DescriptorScriptPubKeyMan::SetCache(const DescriptorCache& cache)
+void DescriptorScriptPubKeyMan::Load()
 {
     LOCK(cs_desc_man);
     std::set<CScript> new_spks;
-    m_wallet_descriptor.cache = cache;
     for (int32_t i = m_wallet_descriptor.range_start; i < m_wallet_descriptor.range_end; ++i) {
         FlatSigningProvider out_keys;
         std::vector<CScript> scripts_temp;
@@ -1460,24 +1508,6 @@ void DescriptorScriptPubKeyMan::SetCache(const DescriptorCache& cache)
     m_storage.TopUpCallback(new_spks, this);
 }
 
-bool DescriptorScriptPubKeyMan::AddKey(const CKeyID& key_id, const CKey& key)
-{
-    LOCK(cs_desc_man);
-    m_map_keys[key_id] = key;
-    return true;
-}
-
-bool DescriptorScriptPubKeyMan::AddCryptedKey(const CKeyID& key_id, const CPubKey& pubkey, const std::vector<unsigned char>& crypted_key)
-{
-    LOCK(cs_desc_man);
-    if (!m_map_keys.empty()) {
-        return false;
-    }
-
-    m_map_crypted_keys[key_id] = make_pair(pubkey, crypted_key);
-    return true;
-}
-
 bool DescriptorScriptPubKeyMan::HasWalletDescriptor(const WalletDescriptor& desc) const
 {
     LOCK(cs_desc_man);
@@ -1566,7 +1596,7 @@ void DescriptorScriptPubKeyMan::UpgradeDescriptorCache()
     }
 }
 
-util::Result<void> DescriptorScriptPubKeyMan::UpdateWalletDescriptor(WalletDescriptor& descriptor)
+util::Result<void> DescriptorScriptPubKeyMan::UpdateWalletDescriptor(WalletDescriptor& descriptor, const FlatSigningProvider& provider)
 {
     LOCK(cs_desc_man);
     std::string error;
@@ -1579,10 +1609,29 @@ util::Result<void> DescriptorScriptPubKeyMan::UpdateWalletDescriptor(WalletDescr
     m_max_cached_index = -1;
     m_wallet_descriptor = descriptor;
 
+    WalletBatch batch(m_storage.GetDatabase());
+    UpdateWithSigningProvider(batch, provider);
     NotifyFirstKeyTimeChanged(this, m_wallet_descriptor.creation_time);
     return {};
 }
 
+void DescriptorScriptPubKeyMan::UpdateWithSigningProvider(WalletBatch& batch, const FlatSigningProvider& signing_provider)
+{
+    AssertLockHeld(cs_desc_man);
+    // Add the private keys to the descriptor
+    for (const auto& entry : signing_provider.keys) {
+        const CKey& key = entry.second;
+        if (!AddDescriptorKeyWithDB(batch, key, key.GetPubKey())) {
+            throw std::runtime_error(std::string(__func__) + ": writing descriptor private key failed");
+        }
+    }
+
+    // Top up key pool, to generate scriptPubKeys
+    if (!TopUpWithDB(batch)) {
+        throw std::runtime_error("Could not top up scriptPubKeys");
+    }
+}
+
 bool DescriptorScriptPubKeyMan::CanUpdateToWalletDescriptor(const WalletDescriptor& descriptor, std::string& error)
 {
     LOCK(cs_desc_man);
diff --git a/depend/bitcoin/src/wallet/scriptpubkeyman.h b/depend/bitcoin/src/wallet/scriptpubkeyman.h
index 1bc5249c..960346db 100644
--- a/depend/bitcoin/src/wallet/scriptpubkeyman.h
+++ b/depend/bitcoin/src/wallet/scriptpubkeyman.h
@@ -6,17 +6,18 @@
 #define BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
 
 #include <addresstype.h>
-#include <btcsignals.h>
 #include <common/messages.h>
 #include <common/signmessage.h>
 #include <common/types.h>
-#include <logging.h>
 #include <musig.h>
 #include <node/types.h>
 #include <psbt.h>
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <util/btcsignals.h>
+#include <util/hasher.h>
+#include <util/log.h>
 #include <util/result.h>
 #include <util/time.h>
 #include <wallet/crypter.h>
@@ -27,6 +28,7 @@
 #include <functional>
 #include <optional>
 #include <unordered_map>
+#include <unordered_set>
 
 enum class OutputType;
 
@@ -56,12 +58,10 @@ class WalletStorage
 };
 
 //! Constant representing an unknown spkm creation time
-static constexpr int64_t UNKNOWN_TIME = std::numeric_limits<int64_t>::max();
+inline constexpr int64_t UNKNOWN_TIME = std::numeric_limits<int64_t>::max();
 
 //! Default for -keypool
-static const unsigned int DEFAULT_KEYPOOL_SIZE = 1000;
-
-std::vector<CKeyID> GetAffectedKeys(const CScript& spk, const SigningProvider& provider);
+inline constexpr unsigned int DEFAULT_KEYPOOL_SIZE = 1000;
 
 struct WalletDestination
 {
@@ -158,21 +158,22 @@ class ScriptPubKeyMan
     btcsignals::signal<void (const ScriptPubKeyMan* spkm, int64_t new_birth_time)> NotifyFirstKeyTimeChanged;
 };
 
-/** OutputTypes supported by the LegacyScriptPubKeyMan */
-static const std::unordered_set<OutputType> LEGACY_OUTPUT_TYPES {
+/** Output types associated with LegacyDataSPKM. */
+inline const std::unordered_set<OutputType> LEGACY_OUTPUT_TYPES {
     OutputType::LEGACY,
     OutputType::P2SH_SEGWIT,
     OutputType::BECH32,
 };
 
-// Manages the data for a LegacyScriptPubKeyMan.
-// This is the minimum necessary to load a legacy wallet so that it can be migrated.
+using KeyMap = std::map<CKeyID, CKey>;
+using CryptedKeyMap = std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char>>>;
+
+// Manages the minimum data needed to load and migrate a legacy wallet.
 class LegacyDataSPKM : public ScriptPubKeyMan, public FillableSigningProvider
 {
 private:
     using WatchOnlySet = std::set<CScript>;
     using WatchKeyMap = std::map<CKeyID, CPubKey>;
-    using CryptedKeyMap = std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char>>>;
 
     CryptedKeyMap mapCryptedKeys GUARDED_BY(cs_KeyStore);
     WatchOnlySet setWatchOnly GUARDED_BY(cs_KeyStore);
@@ -245,14 +246,14 @@ class LegacyDataSPKM : public ScriptPubKeyMan, public FillableSigningProvider
      */
     std::unordered_set<CScript, SaltedSipHasher> GetNotMineScriptPubKeys() const;
 
-    /** Get the DescriptorScriptPubKeyMans (with private keys) that have the same scriptPubKeys as this LegacyScriptPubKeyMan.
-     * Does not modify this ScriptPubKeyMan. */
+    /** Get the DescriptorScriptPubKeyMans (with private keys) that have the same scriptPubKeys as this LegacyDataSPKM.
+     * Does not modify this LegacyDataSPKM. */
     std::optional<MigrationData> MigrateToDescriptor();
-    /** Delete all the records of this LegacyScriptPubKeyMan from disk*/
+    /** Delete the legacy wallet records from disk. */
     bool DeleteRecordsWithDB(WalletBatch& batch);
 };
 
-/** Wraps a LegacyScriptPubKeyMan so that it can be returned in a new unique_ptr. Does not provide privkeys */
+/** SigningProvider wrapper for LegacyDataSPKM that does not provide private keys. */
 class LegacySigningProvider : public SigningProvider
 {
 private:
@@ -270,12 +271,9 @@ class LegacySigningProvider : public SigningProvider
 
 class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 {
-    friend class LegacyDataSPKM;
 private:
     using ScriptPubKeyMap = std::map<CScript, int32_t>; // Map of scripts to descriptor range index
     using PubKeyMap = std::map<CPubKey, int32_t>; // Map of pubkeys involved in scripts to descriptor range index
-    using CryptedKeyMap = std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char>>>;
-    using KeyMap = std::map<CKeyID, CKey>;
 
     ScriptPubKeyMap m_map_script_pub_keys GUARDED_BY(cs_desc_man);
     PubKeyMap m_map_pubkeys GUARDED_BY(cs_desc_man);
@@ -299,10 +297,17 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
      * must be done in order to prevent nonce reuse.
      *
      * The session id is an arbitrary value set by the signer in order for the signing logic
-     * to find ongoing signing sessions. It is the SHA256 of aggregate xonly key, + participant pubkey + sighash.
+     * to find ongoing signing sessions, see MuSig2SessionID.
      */
     mutable std::map<uint256, MuSig2SecNonce> m_musig2_secnonces;
 
+    //! Create a new DescriptorScriptPubKeyMan from an existing descriptor (i.e. from an import)
+    DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size)
+        : ScriptPubKeyMan(storage),
+        m_keypool_size(keypool_size),
+        m_wallet_descriptor(descriptor)
+    {}
+
     bool AddDescriptorKeyWithDB(WalletBatch& batch, const CKey& key, const CPubKey &pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
 
     KeyMap GetKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
@@ -314,22 +319,33 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     // Fetch the SigningProvider for a given index and optionally include private keys. Called by the above functions.
     std::unique_ptr<FlatSigningProvider> GetSigningProvider(int32_t index, bool include_private = false) const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
 
+    void Load();
+
+    void AddDescriptorKey(const CKey& key, const CPubKey &pubkey);
+    void UpdateWithSigningProvider(WalletBatch& batch, const FlatSigningProvider& signing_provider) EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
+
+    //! Setup descriptors based on the given CExtKey
+    void SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal);
+
 protected:
+    //! Create a DescriptorScriptPubKeyMan from existing data (i.e. during loading)
+    DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys);
+
+    DescriptorScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size)
+        : ScriptPubKeyMan(storage),
+        m_keypool_size(keypool_size)
+    {}
+
     WalletDescriptor m_wallet_descriptor GUARDED_BY(cs_desc_man);
 
     //! Same as 'TopUp' but designed for use within a batch transaction context
     bool TopUpWithDB(WalletBatch& batch, unsigned int size = 0);
 
 public:
-    DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size)
-        :   ScriptPubKeyMan(storage),
-            m_keypool_size(keypool_size),
-            m_wallet_descriptor(descriptor)
-        {}
-    DescriptorScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size)
-        :   ScriptPubKeyMan(storage),
-            m_keypool_size(keypool_size)
-        {}
+    static std::unique_ptr<DescriptorScriptPubKeyMan> LoadFromStorage(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys);
+    static std::unique_ptr<DescriptorScriptPubKeyMan> CreateFromImport(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size, const FlatSigningProvider& provider);
+    static std::unique_ptr<DescriptorScriptPubKeyMan> CreateFromMigration(WalletStorage& storage, WalletBatch& batch, WalletDescriptor& descriptor, int64_t keypool_size, const FlatSigningProvider& provider);
+    static std::unique_ptr<DescriptorScriptPubKeyMan> GenerateNewSingleSig(WalletStorage& storage, WalletBatch& batch, int64_t keypool_size, const CExtKey& master_key, OutputType addr_type, bool internal);
 
     mutable RecursiveMutex cs_desc_man;
 
@@ -343,8 +359,8 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     void ReturnDestination(int64_t index, bool internal, const CTxDestination& addr) override;
 
     // Tops up the descriptor cache and m_map_script_pub_keys. The cache is stored in the wallet file
-    // and is used to expand the descriptor in GetNewDestination. DescriptorScriptPubKeyMan relies
-    // more on ephemeral data than LegacyScriptPubKeyMan. For wallets using unhardened derivation
+    // and is used to expand the descriptor in GetNewDestination. Descriptor wallets rely more on
+    // ephemeral data than legacy wallets. For wallets using unhardened derivation
     // (with or without private keys), the "keypool" is a single xpub.
     bool TopUp(unsigned int size = 0) override;
 
@@ -352,9 +368,6 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 
     bool IsHDEnabled() const override;
 
-    //! Setup descriptors based on the given CExtkey
-    bool SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal);
-
     bool HavePrivateKeys() const override;
     bool HasPrivKey(const CKeyID& keyid) const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
     //! Retrieve the particular key if it is available. Returns nullopt if the key is not in the wallet, or if the wallet is locked.
@@ -382,15 +395,9 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 
     uint256 GetID() const override;
 
-    void SetCache(const DescriptorCache& cache);
-
-    bool AddKey(const CKeyID& key_id, const CKey& key);
-    bool AddCryptedKey(const CKeyID& key_id, const CPubKey& pubkey, const std::vector<unsigned char>& crypted_key);
-
     bool HasWalletDescriptor(const WalletDescriptor& desc) const;
-    util::Result<void> UpdateWalletDescriptor(WalletDescriptor& descriptor);
+    util::Result<void> UpdateWalletDescriptor(WalletDescriptor& descriptor, const FlatSigningProvider& provider);
     bool CanUpdateToWalletDescriptor(const WalletDescriptor& descriptor, std::string& error);
-    void AddDescriptorKey(const CKey& key, const CPubKey &pubkey);
     void WriteDescriptor();
 
     WalletDescriptor GetWalletDescriptor() const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
diff --git a/depend/bitcoin/src/wallet/spend.cpp b/depend/bitcoin/src/wallet/spend.cpp
index 0a6d0056..0f445f6d 100644
--- a/depend/bitcoin/src/wallet/spend.cpp
+++ b/depend/bitcoin/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));
         }
     }
@@ -178,8 +178,8 @@ TxSize CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *walle
         const auto mi = wallet->mapWallet.find(input.prevout.hash);
         // Can not estimate size without knowing the input details
         if (mi != wallet->mapWallet.end()) {
-            assert(input.prevout.n < mi->second.tx->vout.size());
-            txouts.emplace_back(mi->second.tx->vout.at(input.prevout.n));
+            assert(input.prevout.n < mi->second.GetTx()->vout.size());
+            txouts.emplace_back(mi->second.GetTx()->vout.at(input.prevout.n));
         } else if (coin_control) {
             const auto& txout{coin_control->GetExternalOutput(input.prevout)};
             if (!txout) return TxSize{-1, -1};
@@ -210,10 +210,6 @@ std::vector<COutput> CoinsResult::All() const
     return all;
 }
 
-void CoinsResult::Clear() {
-    coins.clear();
-}
-
 void CoinsResult::Erase(const std::unordered_set<COutPoint, SaltedOutpointHasher>& coins_to_remove)
 {
     for (auto& [type, vec] : coins) {
@@ -285,10 +281,10 @@ util::Result<CoinsResult> FetchSelectedInputs(const CWallet& wallet, const CCoin
             }
             const CWalletTx& parent_tx = txo->GetWalletTx();
             if (wallet.GetTxDepthInMainChain(parent_tx) == 0) {
-                if (parent_tx.tx->version == TRUC_VERSION && coin_control.m_version != TRUC_VERSION) {
+                if (parent_tx.GetTx()->version == TRUC_VERSION && coin_control.m_version != TRUC_VERSION) {
                     return util::Error{strprintf(_("Can't spend unconfirmed version 3 pre-selected input with a version %d tx"), coin_control.m_version)};
-                } else if (coin_control.m_version == TRUC_VERSION && parent_tx.tx->version != TRUC_VERSION) {
-                    return util::Error{strprintf(_("Can't spend unconfirmed version %d pre-selected input with a version 3 tx"), parent_tx.tx->version)};
+                } else if (coin_control.m_version == TRUC_VERSION && parent_tx.GetTx()->version != TRUC_VERSION) {
+                    return util::Error{strprintf(_("Can't spend unconfirmed version %d pre-selected input with a version 3 tx"), parent_tx.GetTx()->version)};
                 }
             }
         } else {
@@ -382,7 +378,7 @@ CoinsResult AvailableCoins(const CWallet& wallet,
             // be a 1-block reorg away from the chain where transactions A and C
             // were accepted to another chain where B, B', and C were all
             // accepted.
-            if (nDepth == 0 && wtx.mapValue.contains("replaces_txid")) {
+            if (nDepth == 0 && wtx.m_replaces_txid) {
                 safeTx = false;
             }
 
@@ -394,22 +390,22 @@ CoinsResult AvailableCoins(const CWallet& wallet,
             // intending to replace A', but potentially resulting in a scenario
             // where A, A', and D could all be accepted (instead of just B and
             // D, or just A and A' like the user would want).
-            if (nDepth == 0 && wtx.mapValue.contains("replaced_by_txid")) {
+            if (nDepth == 0 && wtx.m_replaced_by_txid) {
                 safeTx = false;
             }
 
             if (nDepth == 0 && params.check_version_trucness) {
                 if (coinControl->m_version == TRUC_VERSION) {
-                    if (wtx.tx->version != TRUC_VERSION) continue;
+                    if (wtx.GetTx()->version != TRUC_VERSION) continue;
                     // this unconfirmed v3 transaction already has a child
                     if (wtx.truc_child_in_mempool.has_value()) continue;
 
                     // this unconfirmed v3 transaction has a parent: spending would create a third generation
                     size_t ancestors, unused_cluster_count;
-                    wallet.chain().getTransactionAncestry(wtx.tx->GetHash(), ancestors, unused_cluster_count);
+                    wallet.chain().getTransactionAncestry(wtx.GetTx()->GetHash(), ancestors, unused_cluster_count);
                     if (ancestors > 1) continue;
                 } else {
-                    if (wtx.tx->version == TRUC_VERSION) continue;
+                    if (wtx.GetTx()->version == TRUC_VERSION) continue;
                 }
             }
 
@@ -472,9 +468,9 @@ CoinsResult AvailableCoins(const CWallet& wallet,
 
         auto available_output_type = GetOutputType(type, is_from_p2sh);
         auto available_output = COutput(outpoint, output, nDepth, input_bytes, solvable, tx_safe, wtx.GetTxTime(), tx_from_me, feerate);
-        if (wtx.tx->version == TRUC_VERSION && nDepth == 0 && params.check_version_trucness) {
+        if (wtx.GetTx()->version == TRUC_VERSION && nDepth == 0 && params.check_version_trucness) {
             unconfirmed_truc_coins.emplace_back(available_output_type, available_output);
-            auto [it, _] = truc_txid_by_value.try_emplace(wtx.tx->GetHash(), 0);
+            auto [it, _] = truc_txid_by_value.try_emplace(wtx.GetTx()->GetHash(), 0);
             it->second += output.nValue;
         } else {
             result.Add(available_output_type, available_output);
@@ -530,16 +526,16 @@ const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const COutPoint&
     AssertLockHeld(wallet.cs_wallet);
     const CWalletTx* wtx{Assert(wallet.GetWalletTx(outpoint.hash))};
 
-    const CTransaction* ptx = wtx->tx.get();
+    const CTransaction* ptx = wtx->GetTx().get();
     int n = outpoint.n;
     while (OutputIsChange(wallet, ptx->vout[n]) && ptx->vin.size() > 0) {
         const COutPoint& prevout = ptx->vin[0].prevout;
         const CWalletTx* it = wallet.GetWalletTx(prevout.hash);
-        if (!it || it->tx->vout.size() <= prevout.n ||
-            !wallet.IsMine(it->tx->vout[prevout.n])) {
+        if (!it || it->GetTx()->vout.size() <= prevout.n ||
+            !wallet.IsMine(it->GetTx()->vout[prevout.n])) {
             break;
         }
-        ptx = it->tx.get();
+        ptx = it->GetTx().get();
         n = prevout.n;
     }
     return ptx->vout[n];
@@ -800,7 +796,8 @@ util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, co
             return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")};
         }
         CAmount bump_fee_overestimate = summed_bump_fees - combined_bump_fee.value();
-        if (bump_fee_overestimate) {
+        // Avoid negative discount if mempool changed between the two bump fee snapshots.
+        if (bump_fee_overestimate > 0) {
             result.SetBumpFeeDiscount(bump_fee_overestimate);
         }
         result.RecalculateWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
diff --git a/depend/bitcoin/src/wallet/spend.h b/depend/bitcoin/src/wallet/spend.h
index 925111dc..b013a3fa 100644
--- a/depend/bitcoin/src/wallet/spend.h
+++ b/depend/bitcoin/src/wallet/spend.h
@@ -40,7 +40,7 @@ TxSize CalculateMaximumSignedTxSize(const CTransaction& tx, const CWallet* walle
  * This struct is really just a wrapper around OutputType vectors with a convenient
  * method for concatenating and returning all COutputs as one vector.
  *
- * Size(), Clear(), Erase(), Shuffle(), and Add() methods are implemented to
+ * Size(), Erase(), Shuffle(), and Add() methods are implemented to
  * allow easy interaction with the struct.
  */
 struct CoinsResult {
@@ -54,7 +54,6 @@ struct CoinsResult {
     size_t Size() const;
     /** Return how many different output types this struct stores */
     size_t TypesCount() const { return coins.size(); }
-    void Clear();
     void Erase(const std::unordered_set<COutPoint, SaltedOutpointHasher>& coins_to_remove);
     void Shuffle(FastRandomContext& rng_fast);
     void Add(OutputType type, const COutput& out);
diff --git a/depend/bitcoin/src/wallet/sqlite.cpp b/depend/bitcoin/src/wallet/sqlite.cpp
index 3d6583bb..fa2abc93 100644
--- a/depend/bitcoin/src/wallet/sqlite.cpp
+++ b/depend/bitcoin/src/wallet/sqlite.cpp
@@ -8,10 +8,10 @@
 
 #include <chainparams.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <sync.h>
 #include <util/check.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
 #include <wallet/db.h>
@@ -116,7 +116,7 @@ SQLiteDatabase::SQLiteDatabase(const fs::path& dir_path, const fs::path& file_pa
 {}
 
 SQLiteDatabase::SQLiteDatabase(const fs::path& dir_path, const fs::path& file_path, const DatabaseOptions& options, int additional_flags)
-    : WalletDatabase(), m_dir_path(dir_path), m_file_path(fs::PathToString(file_path)), m_write_semaphore(1), m_use_unsafe_sync(options.use_unsafe_sync)
+    : WalletDatabase(), m_dir_path(dir_path), m_file_path(fs::PathToString(file_path)), m_additional_flags(additional_flags), m_write_semaphore(1), m_use_unsafe_sync(options.use_unsafe_sync)
 {
     {
         LOCK(g_sqlite_mutex);
@@ -139,7 +139,7 @@ SQLiteDatabase::SQLiteDatabase(const fs::path& dir_path, const fs::path& file_pa
     }
 
     try {
-        Open(additional_flags);
+        Open(m_additional_flags);
     } catch (const std::runtime_error&) {
         // If open fails, cleanup this object and rethrow the exception
         Cleanup();
@@ -247,7 +247,10 @@ bool SQLiteDatabase::Verify(bilingual_str& error)
 
 void SQLiteDatabase::Open()
 {
-    Open(/*additional_flags*/0);
+    if (m_additional_flags & SQLITE_OPEN_MEMORY) {
+        throw std::runtime_error("SQLiteDatabase: Cannot reopen an in-memory database");
+    }
+    Open(m_additional_flags);
 }
 
 void SQLiteDatabase::Open(int additional_flags)
@@ -257,7 +260,11 @@ void SQLiteDatabase::Open(int additional_flags)
     if (m_db == nullptr) {
         if (!(flags & SQLITE_OPEN_MEMORY)) {
             TryCreateDirectories(m_dir_path);
+            if (!IsDirWritable(m_dir_path)) {
+                throw std::runtime_error(strprintf("SQLiteDatabase: Failed to open database in directory '%s': directory is not writable", fs::PathToString(m_dir_path)));
+            }
         }
+
         int ret = sqlite3_open_v2(m_file_path.c_str(), &m_db, flags, nullptr);
         if (ret != SQLITE_OK) {
             throw std::runtime_error(strprintf("SQLiteDatabase: Failed to open database: %s\n", sqlite3_errstr(ret)));
@@ -267,7 +274,7 @@ void SQLiteDatabase::Open(int additional_flags)
             throw std::runtime_error(strprintf("SQLiteDatabase: Failed to enable extended result codes: %s\n", sqlite3_errstr(ret)));
         }
         // Trace SQL statements if tracing is enabled with -debug=walletdb -loglevel=walletdb:trace
-        if (LogAcceptCategory(BCLog::WALLETDB, BCLog::Level::Trace)) {
+        if (util::log::ShouldTraceLog(BCLog::WALLETDB)) {
            ret = sqlite3_trace_v2(m_db, SQLITE_TRACE_STMT, TraceSqlCallback, this);
            if (ret != SQLITE_OK) {
                LogWarning("Failed to enable SQL tracing for %s", Filename());
@@ -444,6 +451,9 @@ void SQLiteBatch::Close()
     }
 
     if (force_conn_refresh) {
+        if (m_database.m_additional_flags & SQLITE_OPEN_MEMORY) {
+            throw std::runtime_error("SQLiteDatabase: Cannot recover in-memory database connection");
+        }
         m_database.Close();
         try {
             m_database.Open();
@@ -712,6 +722,15 @@ std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const D
     }
 }
 
+InMemoryWalletDatabase::InMemoryWalletDatabase()
+    : SQLiteDatabase(fs::path{}, fs::path{":memory:"}, DatabaseOptions(), SQLITE_OPEN_MEMORY)
+{}
+
+std::unique_ptr<WalletDatabase> MakeInMemoryWalletDatabase()
+{
+    return std::make_unique<InMemoryWalletDatabase>();
+}
+
 std::string SQLiteDatabaseVersion()
 {
     return std::string(sqlite3_libversion());
diff --git a/depend/bitcoin/src/wallet/sqlite.h b/depend/bitcoin/src/wallet/sqlite.h
index fb0fa39c..f3268b4b 100644
--- a/depend/bitcoin/src/wallet/sqlite.h
+++ b/depend/bitcoin/src/wallet/sqlite.h
@@ -103,10 +103,14 @@ class SQLiteBatch : public DatabaseBatch
 class SQLiteDatabase : public WalletDatabase
 {
 private:
+    friend class SQLiteBatch;
+
     const fs::path m_dir_path;
 
     const std::string m_file_path;
 
+    const int m_additional_flags;
+
     /**
      * This mutex protects SQLite initialization and shutdown.
      * sqlite3_config() and sqlite3_shutdown() are not thread-safe (sqlite3_initialize() is).
@@ -171,8 +175,19 @@ class SQLiteDatabase : public WalletDatabase
     bool m_use_unsafe_sync;
 };
 
+/** An in-memory SQLiteDatabase. Used as a temporary build artifact where no
+ *  on-disk persistence is needed. */
+class InMemoryWalletDatabase : public SQLiteDatabase
+{
+public:
+    InMemoryWalletDatabase();
+    std::vector<fs::path> Files() override { return {}; }
+};
+
 std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const DatabaseOptions& options, DatabaseStatus& status, bilingual_str& error);
 
+std::unique_ptr<WalletDatabase> MakeInMemoryWalletDatabase();
+
 std::string SQLiteDatabaseVersion();
 } // namespace wallet
 
diff --git a/depend/bitcoin/src/wallet/test/coinselection_tests.cpp b/depend/bitcoin/src/wallet/test/coinselection_tests.cpp
index 6e60af1c..f470fd1f 100644
--- a/depend/bitcoin/src/wallet/test/coinselection_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/coinselection_tests.cpp
@@ -112,7 +112,7 @@ static std::string InputAmountsToString(const SelectionResult& selection)
     return "[" + util::Join(selection.GetInputSet(), " ", [](const auto& input){ return util::ToString(input->txout.nValue);}) + "]";
 }
 
-static void TestBnBSuccess(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const std::vector<CAmount>& expected_input_amounts, const CoinSelectionParams& cs_params = default_cs_params, const int custom_spending_vsize = P2WPKH_INPUT_VSIZE, const int max_selection_weight = MAX_STANDARD_TX_WEIGHT)
+static void TestBnBSuccess(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const std::vector<CAmount>& expected_input_amounts, size_t expected_attempts, const CoinSelectionParams& cs_params = default_cs_params, const int custom_spending_vsize = P2WPKH_INPUT_VSIZE, const int max_selection_weight = MAX_STANDARD_TX_WEIGHT)
 {
     SelectionResult expected_result(CAmount(0), SelectionAlgorithm::BNB);
     CAmount expected_amount = 0;
@@ -127,6 +127,7 @@ static void TestBnBSuccess(std::string test_title, std::vector<OutputGroup>& utx
     BOOST_CHECK_MESSAGE(HaveEquivalentValues(expected_result, *result), strprintf("Result mismatch in BnB-Success: %s. Expected %s, but got %s", test_title, InputAmountsToString(expected_result), InputAmountsToString(*result)));
     BOOST_CHECK_MESSAGE(result->GetSelectedValue() == expected_amount, strprintf("Selected amount mismatch in BnB-Success: %s. Expected %d, but got %d", test_title, expected_amount, result->GetSelectedValue()));
     BOOST_CHECK_MESSAGE(result->GetWeight() <= max_selection_weight, strprintf("Selected weight is higher than permitted in BnB-Success: %s. Expected %d, but got %d", test_title, max_selection_weight, result->GetWeight()));
+    BOOST_CHECK_MESSAGE(result->GetSelectionsEvaluated() == expected_attempts, strprintf("Unexpected number of attempts in BnB-Success: %s. Expected %i attempts, but got %i", test_title, expected_attempts, result->GetSelectionsEvaluated()));
 }
 
 static void TestBnBFail(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const CoinSelectionParams& cs_params = default_cs_params, int max_selection_weight = MAX_STANDARD_TX_WEIGHT, const bool expect_max_weight_exceeded = false)
@@ -149,19 +150,19 @@ BOOST_AUTO_TEST_CASE(bnb_test)
         AddCoins(utxo_pool, {1 * CENT, 3 * CENT, 5 * CENT}, cs_params);
 
         // Simple success cases
-        TestBnBSuccess("Select smallest UTXO", utxo_pool, /*selection_target=*/1 * CENT, /*expected_input_amounts=*/{1 * CENT}, cs_params);
-        TestBnBSuccess("Select middle UTXO", utxo_pool, /*selection_target=*/3 * CENT, /*expected_input_amounts=*/{3 * CENT}, cs_params);
-        TestBnBSuccess("Select biggest UTXO", utxo_pool, /*selection_target=*/5 * CENT, /*expected_input_amounts=*/{5 * CENT}, cs_params);
-        TestBnBSuccess("Select two UTXOs", utxo_pool, /*selection_target=*/4 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, cs_params);
-        TestBnBSuccess("Select all UTXOs", utxo_pool, /*selection_target=*/9 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT, 5 * CENT}, cs_params);
+        TestBnBSuccess("Select smallest UTXO", utxo_pool, /*selection_target=*/1 * CENT, /*expected_input_amounts=*/{1 * CENT}, /*expected_attempts=*/3, cs_params);
+        TestBnBSuccess("Select middle UTXO", utxo_pool, /*selection_target=*/3 * CENT, /*expected_input_amounts=*/{3 * CENT}, /*expected_attempts=*/3, cs_params);
+        TestBnBSuccess("Select biggest UTXO", utxo_pool, /*selection_target=*/5 * CENT, /*expected_input_amounts=*/{5 * CENT}, /*expected_attempts=*/2, cs_params);
+        TestBnBSuccess("Select two UTXOs", utxo_pool, /*selection_target=*/4 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, /*expected_attempts=*/4, cs_params);
+        TestBnBSuccess("Select all UTXOs", utxo_pool, /*selection_target=*/9 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT, 5 * CENT}, /*expected_attempts=*/5, cs_params);
 
         // BnB finds changeless solution while overshooting by up to cost_of_change
-        TestBnBSuccess("Select upper bound", utxo_pool, /*selection_target=*/4 * CENT - cs_params.m_cost_of_change, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, cs_params);
+        TestBnBSuccess("Select upper bound", utxo_pool, /*selection_target=*/4 * CENT - cs_params.m_cost_of_change, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, /*expected_attempts=*/4, cs_params);
 
         // BnB fails to find changeless solution when overshooting by cost_of_change + 1 sat
         TestBnBFail("Overshoot upper bound", utxo_pool, /*selection_target=*/4 * CENT - cs_params.m_cost_of_change - 1, cs_params);
 
-        TestBnBSuccess("Select max weight", utxo_pool, /*selection_target=*/4 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, cs_params, /*custom_spending_vsize=*/P2WPKH_INPUT_VSIZE, /*max_selection_weight=*/4 * 2 * P2WPKH_INPUT_VSIZE);
+        TestBnBSuccess("Select max weight", utxo_pool, /*selection_target=*/4 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, /*expected_attempts=*/4, cs_params, /*custom_spending_vsize=*/P2WPKH_INPUT_VSIZE, /*max_selection_weight=*/4 * 2 * P2WPKH_INPUT_VSIZE);
 
         TestBnBFail("Exceed max weight", utxo_pool, /*selection_target=*/4 * CENT, cs_params, /*max_selection_weight=*/4 * 2 * P2WPKH_INPUT_VSIZE - 1, /*expect_max_weight_exceeded=*/true);
 
@@ -174,7 +175,7 @@ BOOST_AUTO_TEST_CASE(bnb_test)
         std::vector<OutputGroup> clone_pool;
         AddCoins(clone_pool, {2 * CENT, 7 * CENT, 7 * CENT}, cs_params);
         AddDuplicateCoins(clone_pool, /*count=*/50'000, /*amount=*/5 * CENT, cs_params);
-        TestBnBSuccess("Skip equivalent input sets", clone_pool, /*selection_target=*/16 * CENT, /*expected_input_amounts=*/{2 * CENT, 7 * CENT, 7 * CENT}, cs_params);
+        TestBnBSuccess("Skip equivalent input sets", clone_pool, /*selection_target=*/16 * CENT, /*expected_input_amounts=*/{2 * CENT, 7 * CENT, 7 * CENT}, /*expected_attempts=*/16, cs_params);
 
         /* Test BnB attempt limit (`TOTAL_TRIES`)
          *
@@ -206,35 +207,59 @@ BOOST_AUTO_TEST_CASE(bnb_test)
             }
         }
         AddCoins(doppelganger_pool, doppelgangers, cs_params);
-        // Among up to 17 unique UTXOs of similar effective value we will find a solution composed of the eight smallest UTXOs
-        TestBnBSuccess("Combine smallest 8 of 17 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, /*expected_input_amounts=*/expected_inputs, cs_params);
+        // Among 17 unique UTXOs of similar effective value we will find a solution composed of the eight smallest UTXOs
+        TestBnBSuccess("Combine smallest 8 of 17 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, /*expected_input_amounts=*/expected_inputs, /*expected_attempts=*/51'765, cs_params);
 
-        // Starting with 18 unique UTXOs of similar effective value we will not find the solution due to exceeding the attempt limit
+        // Among up to 18 unique UTXOs of similar effective value we will find a solution composed of the eight smallest UTXOs
         AddCoins(doppelganger_pool, {1 * CENT + cs_params.m_cost_of_change + 17}, cs_params);
-        TestBnBFail("Exhaust looking for smallest 8 of 18 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, cs_params);
+        TestBnBSuccess("Combine smallest 8 of 18 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, /*expected_input_amounts=*/expected_inputs, /*expected_attempts=*/87'957, cs_params);
+
+        // Starting with 19 unique UTXOs of similar effective value we will not find the solution due to exceeding the attempt limit
+        AddCoins(doppelganger_pool, {1 * CENT + cs_params.m_cost_of_change + 18}, cs_params);
+        TestBnBFail("Exhaust looking for smallest 8 of 19 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, cs_params);
     }
 }
 
+BOOST_AUTO_TEST_CASE(bnb_exhaustion_with_solution_test)
+{
+    std::vector<OutputGroup> utxo_pool;
+    utxo_pool.reserve(19);
+
+    CAmount selection_target{800'000};
+    // A hard case with no exact-match solution: BnB must still report that the algorithm did not complete once the
+    // search is pushed into the attempt limit, even though it finds a solution within cost_of_change of the target.
+    for (size_t i = 0; i < 19; ++i) {
+        utxo_pool.push_back(MakeCoin(100'000 + i, /*is_eff_value=*/true, default_cs_params));
+    }
+
+    const auto result{SelectCoinsBnB(utxo_pool, selection_target, /*cost_of_change=*/default_cs_params.m_cost_of_change, MAX_STANDARD_TX_WEIGHT)};
+    BOOST_CHECK_MESSAGE(result, "Falsy result in BnB-Success: Exhaust with early solution");
+    BOOST_CHECK(result->GetSelectedEffectiveValue() > selection_target + 28);
+    BOOST_CHECK_EQUAL(result->GetInputSet().size(), 8U);
+    BOOST_CHECK_EQUAL(result->GetSelectionsEvaluated(), 100'000U);
+    BOOST_CHECK(!result->GetAlgoCompleted());
+}
+
 BOOST_AUTO_TEST_CASE(bnb_feerate_sensitivity_test)
 {
     // Create sets of UTXOs with the same effective amounts at different feerates (but different absolute amounts)
     std::vector<OutputGroup> low_feerate_pool; // 5 sat/vB (default, and lower than long_term_feerate of 10 sat/vB)
     AddCoins(low_feerate_pool, {2 * CENT, 3 * CENT, 5 * CENT, 10 * CENT});
-    TestBnBSuccess("Select many inputs at low feerates", low_feerate_pool, /*selection_target=*/10 * CENT, /*expected_input_amounts=*/{2 * CENT, 3 * CENT, 5 * CENT});
+    TestBnBSuccess("Select many inputs at low feerates", low_feerate_pool, /*selection_target=*/10 * CENT, /*expected_input_amounts=*/{2 * CENT, 3 * CENT, 5 * CENT}, /*expected_attempts=*/6);
 
     const CoinSelectionParams high_feerate_params = init_cs_params(/*eff_feerate=*/25'000);
     std::vector<OutputGroup> high_feerate_pool; // 25 sat/vB (greater than long_term_feerate of 10 sat/vB)
     AddCoins(high_feerate_pool, {2 * CENT, 3 * CENT, 5 * CENT, 10 * CENT}, high_feerate_params);
-    TestBnBSuccess("Select one input at high feerates", high_feerate_pool, /*selection_target=*/10 * CENT, /*expected_input_amounts=*/{10 * CENT}, high_feerate_params);
+    TestBnBSuccess("Select one input at high feerates", high_feerate_pool, /*selection_target=*/10 * CENT, /*expected_input_amounts=*/{10 * CENT}, /*expected_attempts=*/5, high_feerate_params);
 
     // Add heavy inputs {6, 7} to existing {2, 3, 5, 10}
     low_feerate_pool.push_back(MakeCoin(6 * CENT, true, default_cs_params, /*custom_spending_vsize=*/500));
     low_feerate_pool.push_back(MakeCoin(7 * CENT, true, default_cs_params, /*custom_spending_vsize=*/500));
-    TestBnBSuccess("Prefer two heavy inputs over two light inputs at low feerates", low_feerate_pool, /*selection_target=*/13 * CENT, /*expected_input_amounts=*/{6 * CENT, 7 * CENT}, default_cs_params, /*custom_spending_vsize=*/500);
+    TestBnBSuccess("Prefer two heavy inputs over two light inputs at low feerates", low_feerate_pool, /*selection_target=*/13 * CENT, /*expected_input_amounts=*/{6 * CENT, 7 * CENT}, /*expected_attempts=*/18, default_cs_params, /*custom_spending_vsize=*/500);
 
     high_feerate_pool.push_back(MakeCoin(6 * CENT, true, high_feerate_params, /*custom_spending_vsize=*/500));
     high_feerate_pool.push_back(MakeCoin(7 * CENT, true, high_feerate_params, /*custom_spending_vsize=*/500));
-    TestBnBSuccess("Prefer two light inputs over two heavy inputs at high feerates", high_feerate_pool, /*selection_target=*/13 * CENT, /*expected_input_amounts=*/{3 * CENT, 10 * CENT}, high_feerate_params);
+    TestBnBSuccess("Prefer two light inputs over two heavy inputs at high feerates", high_feerate_pool, /*selection_target=*/13 * CENT, /*expected_input_amounts=*/{3 * CENT, 10 * CENT}, /*expected_attempts=*/9, high_feerate_params);
 }
 
 static void TestSRDSuccess(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const CoinSelectionParams& cs_params = default_cs_params, const int max_selection_weight = MAX_STANDARD_TX_WEIGHT)
@@ -283,6 +308,13 @@ BOOST_AUTO_TEST_CASE(srd_test)
         AddDuplicateCoins(utxo_pool, /*count=*/3, /*amount=*/7 * CENT, cs_params);
         TestSRDSuccess("Select most valuable UTXOs for acceptable weight", utxo_pool, /*selection_target=*/20 * CENT, cs_params, /*max_selection_weight=*/4 * 4 * (P2WPKH_INPUT_VSIZE - 1 ));
         TestSRDFail("No acceptable weight possible", utxo_pool, /*selection_target=*/25 * CENT, cs_params, /*max_selection_weight=*/4 * 3 * P2WPKH_INPUT_VSIZE, /*expect_max_weight_exceeded=*/true);
+
+        // Create UTXO pool with UTXOs of same effective value but different weights
+        std::vector<OutputGroup> mixed_weight_pool;
+        AddDuplicateCoins(mixed_weight_pool, /*count=*/100, /*amount=*/5 * CENT, cs_params);
+        mixed_weight_pool.push_back(MakeCoin(5 * CENT, true, cs_params, /*custom_spending_vsize=*/P2WPKH_INPUT_VSIZE - 1));
+        TestSRDSuccess("Tie-break same effective value with lower weight", utxo_pool, /*selection_target=*/9 * CENT, cs_params,
+        /*max_selection_weight=*/4 * 3 * (P2WPKH_INPUT_VSIZE - 1));
     }
 }
 
diff --git a/depend/bitcoin/src/wallet/test/coinselector_tests.cpp b/depend/bitcoin/src/wallet/test/coinselector_tests.cpp
index ee6a639a..fdce22a2 100644
--- a/depend/bitcoin/src/wallet/test/coinselector_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/coinselector_tests.cpp
@@ -76,7 +76,7 @@ static void add_coin(CoinsResult& available_coins, CWallet& wallet, const CAmoun
     auto ret = wallet.mapWallet.emplace(std::piecewise_construct, std::forward_as_tuple(txid), std::forward_as_tuple(MakeTransactionRef(std::move(tx)), TxStateInactive{}));
     assert(ret.second);
     CWalletTx& wtx = (*ret.first).second;
-    const auto& txout = wtx.tx->vout.at(nInput);
+    const auto& txout = wtx.GetTx()->vout.at(nInput);
     available_coins.Add(OutputType::BECH32, {COutPoint(wtx.GetHash(), nInput), txout, nAge, custom_size == 0 ? CalculateMaximumSignedInputSize(txout, &wallet, /*coin_control=*/nullptr) : custom_size, /*solvable=*/true, /*safe=*/true, wtx.GetTxTime(), fIsFromMe, feerate});
 }
 
@@ -169,8 +169,8 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
 {
     FastRandomContext rand{};
     // Setup
-    std::vector<COutput> utxo_pool;
     SelectionResult expected_result(CAmount(0), SelectionAlgorithm::BNB);
+    size_t expected_attempts;
 
     ////////////////////
     // Behavior tests //
@@ -202,12 +202,14 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
         BOOST_CHECK(!SelectCoinsBnB(GroupCoins(available_coins.All()), 1 * CENT, coin_selection_params_bnb.m_cost_of_change));
 
         // Test fees subtracted from output:
-        available_coins.Clear();
+        available_coins = {};
         add_coin(available_coins, *wallet, 1 * CENT, coin_selection_params_bnb.m_effective_feerate);
         available_coins.All().at(0).input_bytes = 40;
         const auto result9 = SelectCoinsBnB(GroupCoins(available_coins.All()), 1 * CENT, coin_selection_params_bnb.m_cost_of_change);
         BOOST_CHECK(result9);
         BOOST_CHECK_EQUAL(result9->GetSelectedValue(), 1 * CENT);
+        expected_attempts = 1;
+        BOOST_CHECK_MESSAGE(result9->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, result9->GetSelectionsEvaluated()));
     }
 
     {
@@ -230,6 +232,8 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
         LOCK(wallet->cs_wallet);
         const auto result10 = SelectCoins(*wallet, available_coins, selected_input, 10 * CENT, coin_control, coin_selection_params_bnb);
         BOOST_CHECK(result10);
+        expected_attempts = 3;
+        BOOST_CHECK_MESSAGE(result10->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, result10->GetSelectionsEvaluated()));
     }
     {
         std::unique_ptr<CWallet> wallet = NewWallet(m_node);
@@ -259,6 +263,8 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
         available_coins.Erase({(++available_coins.coins[OutputType::BECH32].begin())->outpoint});
         const auto result13 = SelectCoins(*wallet, available_coins, selected_input, 10 * CENT, coin_control, coin_selection_params_bnb);
         BOOST_CHECK(EquivalentResult(expected_result, *result13));
+        expected_attempts = 2;
+        BOOST_CHECK_MESSAGE(result13->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, result13->GetSelectionsEvaluated()));
     }
 
     {
@@ -290,6 +296,8 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
         add_coin(5 * CENT, 2, expected_result);
         add_coin(3 * CENT, 2, expected_result);
         BOOST_CHECK(EquivalentResult(expected_result, *res));
+        expected_attempts = 22;
+        BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated()));
     }
 }
 
@@ -343,7 +351,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
     // test multiple times to allow for differences in the shuffle order
     for (int i = 0; i < RUN_TESTS; i++)
     {
-        available_coins.Clear();
+        available_coins = {};
 
         // with an empty wallet we can't even pay one cent
         BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 1 * CENT, CENT));
@@ -412,7 +420,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
         BOOST_CHECK_EQUAL(result8->GetInputSet().size(), 1U);
 
         // now clear out the wallet and start again to test choosing between subsets of smaller coins and the next biggest coin
-        available_coins.Clear();
+        available_coins = {};
 
         add_coin(available_coins, *wallet,  6*CENT);
         add_coin(available_coins, *wallet,  7*CENT);
@@ -470,7 +478,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
 
         // empty the wallet and start again, now with fractions of a cent, to test small change avoidance
 
-        available_coins.Clear();
+        available_coins = {};
         add_coin(available_coins, *wallet, CENT * 1 / 10);
         add_coin(available_coins, *wallet, CENT * 2 / 10);
         add_coin(available_coins, *wallet, CENT * 3 / 10);
@@ -502,7 +510,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
 
         // run the 'mtgox' test (see https://blockexplorer.com/tx/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf)
         // they tried to consolidate 10 50k coins into one 500k coin, and ended up with 50k in change
-        available_coins.Clear();
+        available_coins = {};
         for (int j = 0; j < 20; j++)
             add_coin(available_coins, *wallet, 50000 * COIN);
 
@@ -515,7 +523,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
         // we need to try finding an exact subset anyway
 
         // sometimes it will fail, and so we use the next biggest coin:
-        available_coins.Clear();
+        available_coins = {};
         add_coin(available_coins, *wallet, CENT * 5 / 10);
         add_coin(available_coins, *wallet, CENT * 6 / 10);
         add_coin(available_coins, *wallet, CENT * 7 / 10);
@@ -526,7 +534,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
         BOOST_CHECK_EQUAL(result20->GetInputSet().size(), 1U);
 
         // but sometimes it's possible, and we use an exact subset (0.4 + 0.6 = 1.0)
-        available_coins.Clear();
+        available_coins = {};
         add_coin(available_coins, *wallet, CENT * 4 / 10);
         add_coin(available_coins, *wallet, CENT * 6 / 10);
         add_coin(available_coins, *wallet, CENT * 8 / 10);
@@ -537,7 +545,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
         BOOST_CHECK_EQUAL(result21->GetInputSet().size(), 2U); // in two coins 0.4+0.6
 
         // test avoiding small change
-        available_coins.Clear();
+        available_coins = {};
         add_coin(available_coins, *wallet, CENT * 5 / 100);
         add_coin(available_coins, *wallet, CENT * 1);
         add_coin(available_coins, *wallet, CENT * 100);
@@ -557,7 +565,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
 
     // test with many inputs
     for (CAmount amt=1500; amt < COIN; amt*=10) {
-        available_coins.Clear();
+        available_coins = {};
         // Create 676 inputs (=  (old MAX_STANDARD_TX_SIZE == 100000)  / 148 bytes per input)
         for (uint16_t j = 0; j < 676; j++)
             add_coin(available_coins, *wallet, amt);
@@ -583,7 +591,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
 
     // test randomness
     {
-        available_coins.Clear();
+        available_coins = {};
         for (int i2 = 0; i2 < 100; i2++)
             add_coin(available_coins, *wallet, COIN);
 
diff --git a/depend/bitcoin/src/wallet/test/db_tests.cpp b/depend/bitcoin/src/wallet/test/db_tests.cpp
index 532bdce3..818b176c 100644
--- a/depend/bitcoin/src/wallet/test/db_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/db_tests.cpp
@@ -297,5 +297,14 @@ BOOST_AUTO_TEST_CASE(concurrent_txn_dont_interfere)
     BOOST_CHECK_EQUAL(read_value, value2);
 }
 
+BOOST_AUTO_TEST_CASE(in_memory_database_cannot_reopen)
+{
+    // Reopening an in-memory database would create a fresh empty connection,
+    // silently losing all data. Open() must throw instead.
+    InMemoryWalletDatabase database;
+    database.Close();
+    BOOST_CHECK_THROW(database.Open(), std::runtime_error);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace wallet
diff --git a/depend/bitcoin/src/wallet/test/fuzz/coincontrol.cpp b/depend/bitcoin/src/wallet/test/fuzz/coincontrol.cpp
index 6774a21d..c7ed5aa2 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/coincontrol.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/coincontrol.cpp
@@ -32,8 +32,7 @@ FUZZ_TARGET(coincontrol, .init = initialize_coincontrol)
     CCoinControl coin_control;
     COutPoint out_point;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -57,26 +56,88 @@ FUZZ_TARGET(coincontrol, .init = initialize_coincontrol)
             },
             [&] {
                 (void)coin_control.Select(out_point);
+                assert(coin_control.IsSelected(out_point));
             },
             [&] {
                 const CTxOut tx_out{ConsumeMoney(fuzzed_data_provider), ConsumeScript(fuzzed_data_provider)};
-                (void)coin_control.Select(out_point).SetTxOut(tx_out);
+                auto& input = coin_control.Select(out_point);
+                const auto set_tx_out{fuzzed_data_provider.ConsumeBool()};
+                if (set_tx_out) {
+                    input.SetTxOut(tx_out);
+                }
+                auto has_tx_out{input.HasTxOut()};
+                auto is_external_selected{coin_control.IsExternalSelected(out_point)};
+                if (set_tx_out) {
+                    assert(has_tx_out);
+                    assert(input.GetTxOut() == tx_out);
+                    assert(is_external_selected);
+                } else if (!has_tx_out) {
+                    assert(!is_external_selected);
+                }
             },
             [&] {
-                (void)coin_control.UnSelect(out_point);
+                coin_control.UnSelect(out_point);
+                assert(!coin_control.IsSelected(out_point));
             },
             [&] {
-                (void)coin_control.UnSelectAll();
+                coin_control.UnSelectAll();
+                assert(!coin_control.HasSelected());
             },
             [&] {
-                (void)coin_control.ListSelected();
+                const std::vector<COutPoint> selected = coin_control.ListSelected();
+                for (const auto& out : selected) {
+                    assert(coin_control.IsSelected(out));
+                }
             },
             [&] {
                 int64_t weight{fuzzed_data_provider.ConsumeIntegral<int64_t>()};
-                (void)coin_control.SetInputWeight(out_point, weight);
+                coin_control.SetInputWeight(out_point, weight);
+                assert(coin_control.GetInputWeight(out_point) == weight);
+            },
+            [&] {
+                const bool is_selected = coin_control.IsSelected(out_point);
+                assert(!coin_control.GetInputWeight(out_point) || is_selected);
+                assert(!coin_control.GetSequence(out_point) || is_selected);
+            },
+            [&] {
+                const auto scripts = coin_control.GetScripts(out_point);
+                assert(coin_control.IsSelected(out_point) || (!scripts.first && !scripts.second));
+            },
+            [&] {
+                assert(coin_control.HasSelectedOrder() || !coin_control.GetSelectionPos(out_point));
+            },
+            [&] {
+                assert(!coin_control.GetSelectionPos(out_point) || coin_control.IsSelected(out_point));
+            },
+            [&] {
+                auto& input = coin_control.Select(out_point);
+                uint32_t sequence{fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
+                input.SetSequence(sequence);
+                assert(input.GetSequence() == sequence);
+                assert(coin_control.GetSequence(out_point) == sequence);
+            },
+            [&] {
+                auto& input = coin_control.Select(out_point);
+                const CScript script{ConsumeScript(fuzzed_data_provider)};
+                input.SetScriptSig(script);
+                assert(input.HasScripts());
+                assert(input.GetScripts().first == script);
+                assert(coin_control.GetScripts(out_point).first == script);
+            },
+            [&] {
+                auto& input = coin_control.Select(out_point);
+                const CScriptWitness script_wit{ConsumeScriptWitness(fuzzed_data_provider)};
+                input.SetScriptWitness(script_wit);
+                assert(input.HasScripts());
+                assert(input.GetScripts().second->stack == script_wit.stack);
+                assert(coin_control.GetScripts(out_point).second->stack == script_wit.stack);
             },
             [&] {
-                (void)coin_control.GetInputWeight(out_point);
+                auto& input = coin_control.Select(out_point);
+                unsigned int pos{fuzzed_data_provider.ConsumeIntegral<unsigned int>()};
+                input.SetPosition(pos);
+                assert(input.GetPosition() == pos);
+                assert(coin_control.GetSelectionPos(out_point) == pos);
             });
     }
 }
diff --git a/depend/bitcoin/src/wallet/test/fuzz/coinselection.cpp b/depend/bitcoin/src/wallet/test/fuzz/coinselection.cpp
index 42a53a83..8949a6c2 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/coinselection.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/coinselection.cpp
@@ -50,8 +50,7 @@ static void GroupCoins(FuzzedDataProvider& fuzzed_data_provider, const std::vect
 static CAmount CreateCoins(FuzzedDataProvider& fuzzed_data_provider, std::vector<COutput>& utxo_pool, CoinSelectionParams& coin_params, int& next_locktime)
 {
     CAmount total_balance{0};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const int n_input{fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 10)};
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(41, 10000)};
         const CAmount amount{fuzzed_data_provider.ConsumeIntegralInRange<CAmount>(1, MAX_MONEY)};
@@ -102,8 +101,7 @@ FUZZ_TARGET(coin_grinder)
     CAmount total_balance{0};
     CAmount max_spendable{0};
     int next_locktime{0};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const int n_input{fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 10)};
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(41, 10000)};
         const CAmount amount{fuzzed_data_provider.ConsumeIntegralInRange<CAmount>(1, MAX_MONEY)};
@@ -152,8 +150,7 @@ FUZZ_TARGET(coin_grinder_is_optimal)
     int next_locktime{0};
     static constexpr unsigned max_output_groups{16};
     std::vector<OutputGroup> group_pos;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), max_output_groups)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), max_output_groups) {
         // With maximum m_effective_feerate and n_input_bytes = 1'000'000, input_fee <= MAX_MONEY.
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(1, 1'000'000)};
         // Only make UTXOs with positive effective value
@@ -250,8 +247,7 @@ FUZZ_TARGET(bnb_finds_min_waste)
     // Choose 1–16 of 16 provides ample fuzzing space.
     static constexpr unsigned max_output_groups{16};
     std::vector<OutputGroup> group_pos;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), max_output_groups)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), max_output_groups) {
         // With maximum m_effective_feerate 10'000 s/vB and n_input_bytes = 20'000 B, input_fee <= MAX_MONEY.
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(1, 20'000)};
         const CAmount input_fee = coin_params.m_effective_feerate.GetFee(n_input_bytes);
diff --git a/depend/bitcoin/src/wallet/test/fuzz/crypter.cpp b/depend/bitcoin/src/wallet/test/fuzz/crypter.cpp
index 81f82403..f0a6a36e 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/crypter.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/crypter.cpp
@@ -46,8 +46,7 @@ FUZZ_TARGET(crypter, .init = initialize_crypter)
     if (!random_ckey.IsValid()) return;
     CPubKey pubkey{random_ckey.GetPubKey()};
 
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -64,7 +63,7 @@ FUZZ_TARGET(crypter, .init = initialize_crypter)
                 (void)crypt.Decrypt(cipher_text_ed, plain_text_ed);
             },
             [&] {
-                const CKeyingMaterial master_key(random_key.begin(), random_key.end());;
+                const CKeyingMaterial master_key(random_key.begin(), random_key.end());
                 (void)EncryptSecret(master_key, plain_text_ed, pubkey.GetHash(), cipher_text_ed);
             },
             [&] {
diff --git a/depend/bitcoin/src/wallet/test/fuzz/fees.cpp b/depend/bitcoin/src/wallet/test/fuzz/fees.cpp
index 0d332c59..36c1f56b 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/fees.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/fees.cpp
@@ -63,7 +63,7 @@ FUZZ_TARGET(wallet_fees, .init = initialize_setup)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     auto& node{g_setup->m_node};
     Chainstate* chainstate = &node.chainman->ActiveChainstate();
 
diff --git a/depend/bitcoin/src/wallet/test/fuzz/scriptpubkeyman.cpp b/depend/bitcoin/src/wallet/test/fuzz/scriptpubkeyman.cpp
index 100db1a6..32ba797f 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/scriptpubkeyman.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/scriptpubkeyman.cpp
@@ -70,6 +70,13 @@ static std::optional<std::pair<WalletDescriptor, FlatSigningProvider>> CreateWal
     std::vector<std::unique_ptr<Descriptor>> parsed_descs = Parse(desc_str.value(), keys, error, false);
     if (parsed_descs.empty()) return std::nullopt;
 
+    // Verify expand succeeds before making WalletDescriptor
+    // Expansion results are not needed
+    FlatSigningProvider out_keys;
+    std::vector<CScript> scripts_temp;
+    DescriptorCache temp_cache;
+    if (!parsed_descs.at(0)->Expand(0, keys, scripts_temp, out_keys, &temp_cache)) return std::nullopt;
+
     WalletDescriptor w_desc{std::move(parsed_descs.at(0)), /*creation_time=*/0, /*range_start=*/0, /*range_end=*/1, /*next_index=*/1};
     return std::make_pair(w_desc, keys);
 }
@@ -86,7 +93,7 @@ FUZZ_TARGET(scriptpubkeyman, .init = initialize_spkm)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     const auto& node{g_setup->m_node};
     Chainstate& chainstate{node.chainman->ActiveChainstate()};
     std::unique_ptr<CWallet> wallet_ptr{std::make_unique<CWallet>(node.chain.get(), "", CreateMockableWalletDatabase())};
@@ -116,7 +123,7 @@ FUZZ_TARGET(scriptpubkeyman, .init = initialize_spkm)
     }
 
     bool good_data{true};
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 20) {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 20) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -178,13 +185,17 @@ FUZZ_TARGET(scriptpubkeyman, .init = initialize_spkm)
                 (void)spk_manager->SignTransaction(tx_to, coins, sighash, input_errors);
             },
             [&] {
-                std::optional<PartiallySignedTransaction> opt_psbt{ConsumeDeserializable<PartiallySignedTransaction>(fuzzed_data_provider)};
+                std::optional<PartiallySignedTransaction> opt_psbt{ConsumeDeserializableConstructor<PartiallySignedTransaction>(fuzzed_data_provider)};
                 if (!opt_psbt) {
                     good_data = false;
                     return;
                 }
                 auto psbt{*opt_psbt};
-                const PrecomputedTransactionData txdata{PrecomputePSBTData(psbt)};
+                std::optional<PrecomputedTransactionData> txdata_res = PrecomputePSBTData(psbt);
+                if (!txdata_res) {
+                    return;
+                }
+                const PrecomputedTransactionData& txdata = *txdata_res;
                 common::PSBTFillOptions options{
                     .sign = fuzzed_data_provider.ConsumeBool(),
                     .sighash_type = fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 151),
@@ -207,7 +218,7 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     const auto& node{g_setup->m_node};
     Chainstate& chainstate{node.chainman->ActiveChainstate()};
 
@@ -223,7 +234,7 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
     auto& legacy_data{*wallet.GetOrCreateLegacyDataSPKM()};
 
     std::vector<CKey> keys;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30) {
         const auto key{ConsumePrivateKey(fuzzed_data_provider)};
         if (!key.IsValid()) return;
         auto pub_key{key.GetPubKey()};
@@ -231,6 +242,7 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
         if (legacy_data.LoadKey(key, pub_key) && std::find(keys.begin(), keys.end(), key) == keys.end()) keys.push_back(key);
     }
 
+    size_t added_chains = 0;
     bool add_hd_chain{fuzzed_data_provider.ConsumeBool() && !keys.empty()};
     CHDChain hd_chain;
     auto version{fuzzed_data_provider.ConsumeBool() ? CHDChain::VERSION_HD_CHAIN_SPLIT : CHDChain::VERSION_HD_BASE};
@@ -240,14 +252,17 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
         hd_chain.nVersion = version;
         hd_chain.seed_id = hd_key.GetPubKey().GetID();
         legacy_data.LoadHDChain(hd_chain);
+        added_chains++;
     }
 
     bool add_inactive_hd_chain{fuzzed_data_provider.ConsumeBool() && !keys.empty()};
     if (add_inactive_hd_chain) {
-        hd_key = PickValue(fuzzed_data_provider, keys);
+        CKey inactive_hd_key = PickValue(fuzzed_data_provider, keys);
         hd_chain.nVersion = fuzzed_data_provider.ConsumeBool() ? CHDChain::VERSION_HD_CHAIN_SPLIT : CHDChain::VERSION_HD_BASE;
-        hd_chain.seed_id = hd_key.GetPubKey().GetID();
+        bool dup_chain = hd_key.IsValid() && std::equal(hd_key.begin(), hd_key.end(), inactive_hd_key.begin());
+        hd_chain.seed_id = inactive_hd_key.GetPubKey().GetID();
         legacy_data.AddInactiveHDChain(hd_chain);
+        if (!dup_chain) added_chains++;
     }
 
     bool watch_only = false;
@@ -261,7 +276,7 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
 
     size_t added_script{0};
     bool good_data{true};
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 30) {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 30) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -325,7 +340,6 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
 
     auto result{legacy_data.MigrateToDescriptor()};
     assert(result);
-    size_t added_chains{static_cast<size_t>(add_hd_chain) + static_cast<size_t>(add_inactive_hd_chain)};
     if ((add_hd_chain && version >= CHDChain::VERSION_HD_CHAIN_SPLIT) || (!add_hd_chain && add_inactive_hd_chain)) {
         added_chains *= 2;
     }
diff --git a/depend/bitcoin/src/wallet/test/fuzz/spend.cpp b/depend/bitcoin/src/wallet/test/fuzz/spend.cpp
index e9a6bea7..35a05c9e 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/spend.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/spend.cpp
@@ -34,7 +34,7 @@ FUZZ_TARGET(wallet_create_transaction, .init = initialize_setup)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    FakeNodeClock clock{ConsumeTime(fuzzed_data_provider)};
     const auto& node = g_setup->m_node;
     Chainstate& chainstate{node.chainman->ActiveChainstate()};
     ArgsManager& args = *node.args;
@@ -59,8 +59,7 @@ FUZZ_TARGET(wallet_create_transaction, .init = initialize_setup)
 
     int next_locktime{0};
     CAmount all_values{0};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CMutableTransaction tx;
         tx.nLockTime = next_locktime++;
         tx.vout.resize(1);
@@ -73,10 +72,11 @@ FUZZ_TARGET(wallet_create_transaction, .init = initialize_setup)
         auto txid{tx.GetHash()};
         auto ret{fuzzed_wallet.wallet->mapWallet.emplace(std::piecewise_construct, std::forward_as_tuple(txid), std::forward_as_tuple(MakeTransactionRef(std::move(tx)), TxStateConfirmed{chainstate.m_chain.Tip()->GetBlockHash(), chainstate.m_chain.Height(), /*index=*/0}))};
         assert(ret.second);
+        fuzzed_wallet.wallet->RefreshTXOsFromTx(ret.first->second);
     }
 
     std::vector<CRecipient> recipients;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CTxDestination destination;
         CallOneOf(
             fuzzed_data_provider,
diff --git a/depend/bitcoin/src/wallet/test/fuzz/wallet_bdb_parser.cpp b/depend/bitcoin/src/wallet/test/fuzz/wallet_bdb_parser.cpp
index f15548d4..37c9869b 100644
--- a/depend/bitcoin/src/wallet/test/fuzz/wallet_bdb_parser.cpp
+++ b/depend/bitcoin/src/wallet/test/fuzz/wallet_bdb_parser.cpp
@@ -74,14 +74,15 @@ FUZZ_TARGET(wallet_bdb_parser, .init = initialize_wallet_bdb_parser)
             error.original == "Internal record position not in page" ||
             error.original == "LSNs are not reset, this database is not completely flushed. Please reopen then close the database with a version that has BDB support" ||
             error.original == "Records page has odd number of records" ||
-            error.original == "Bad overflow record page type") {
-            // Do nothing
-        } else if (error.original == "Subdatabase last page is greater than database last page" ||
-                   error.original == "Page number is greater than database last page" ||
-                   error.original == "Last page number could not fit in file" ||
-                   error.original == "Subdatabase has an unexpected name" ||
-                   error.original == "Unsupported BDB data file version number" ||
-                   error.original == "BDB builtin encryption is not supported") {
+            error.original == "Bad overflow record page type" ||
+            error.original == "BTree page has an unexpected level" ||
+            error.original == "BTree Leaf page is not at level 1" ||
+            error.original == "Subdatabase last page is greater than database last page" ||
+            error.original == "Page number is greater than database last page" ||
+            error.original == "Last page number could not fit in file" ||
+            error.original == "Subdatabase has an unexpected name" ||
+            error.original == "Unsupported BDB data file version number" ||
+            error.original == "BDB builtin encryption is not supported") {
         } else {
             throw std::runtime_error(error.original);
         }
diff --git a/depend/bitcoin/src/wallet/test/group_outputs_tests.cpp b/depend/bitcoin/src/wallet/test/group_outputs_tests.cpp
index 4bbf145c..9b4d9bc8 100644
--- a/depend/bitcoin/src/wallet/test/group_outputs_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/group_outputs_tests.cpp
@@ -44,7 +44,7 @@ static void addCoin(CoinsResult& coins,
     auto ret = wallet.mapWallet.emplace(std::piecewise_construct, std::forward_as_tuple(txid), std::forward_as_tuple(MakeTransactionRef(std::move(tx)), TxStateInactive{}));
     assert(ret.second);
     CWalletTx& wtx = (*ret.first).second;
-    const auto& txout = wtx.tx->vout.at(0);
+    const auto& txout = wtx.GetTx()->vout.at(0);
     coins.Add(*Assert(OutputTypeFromDestination(dest)),
               {COutPoint(wtx.GetHash(), 0),
                    txout,
diff --git a/depend/bitcoin/src/wallet/test/psbt_wallet_tests.cpp b/depend/bitcoin/src/wallet/test/psbt_wallet_tests.cpp
index 7e2ee6ce..ec4ba0ea 100644
--- a/depend/bitcoin/src/wallet/test/psbt_wallet_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/psbt_wallet_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <key_io.h>
 #include <node/types.h>
-#include <util/bip32.h>
 #include <util/strencodings.h>
 #include <wallet/wallet.h>
 
@@ -56,11 +55,10 @@ BOOST_AUTO_TEST_CASE(psbt_updater_test)
     import_descriptor(m_wallet, "wpkh(xprv9s21ZrQH143K2LE7W4Xf3jATf9jECxSb7wj91ZnmY4qEJrS66Qru9RFqq8xbkgT32ya6HqYJweFdJUEDf5Q6JFV7jMiUws7kQfe6Tv4RbfN/0h/0h/*h)");
 
     // Call FillPSBT
-    PartiallySignedTransaction psbtx;
     DataStream ssData{
         "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f000000000000000000"_hex,
     };
-    ssData >> psbtx;
+    PartiallySignedTransaction psbtx(deserialize, ssData);
 
     // Fill transaction with our data
     bool complete = true;
@@ -73,86 +71,12 @@ BOOST_AUTO_TEST_CASE(psbt_updater_test)
     BOOST_CHECK_EQUAL(final_hex, "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000104475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae2206029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f10d90c6a4f000000800000008000000080220602dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d710d90c6a4f0000008000000080010000800001008a020000000158e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd7501000000171600145f275f436b09a8cc9a2eb2a2f528485c68a56323feffffff02d8231f1b0100000017a914aed962d6654f9a2b36608eb9d64d2b260db4f1118700c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e8876500000001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e88701042200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903010547522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae2206023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7310d90c6a4f000000800000008003000080220603089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc10d90c6a4f00000080000000800200008000220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000");
 
     // Mutate the transaction so that one of the inputs is invalid
-    psbtx.tx->vin[0].prevout.n = 2;
+    psbtx.inputs[0].prev_out = 2;
 
     // Try to sign the mutated input
     SignatureData sigdata;
     BOOST_CHECK(m_wallet.FillPSBT(psbtx, {.sign = true, .bip32_derivs = true}, complete));
 }
 
-BOOST_AUTO_TEST_CASE(parse_hd_keypath)
-{
-    std::vector<uint32_t> keypath;
-
-    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1", keypath));
-    BOOST_CHECK(!ParseHDKeypath("///////////////////////////", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1'/1", keypath));
-    BOOST_CHECK(!ParseHDKeypath("//////////////////////////'/", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/", keypath));
-    BOOST_CHECK(!ParseHDKeypath("1///////////////////////////", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1/1'/", keypath));
-    BOOST_CHECK(!ParseHDKeypath("1/'//////////////////////////", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("", keypath));
-    BOOST_CHECK(!ParseHDKeypath(" ", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("0", keypath));
-    BOOST_CHECK(!ParseHDKeypath("O", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("0000'/0000'/0000'", keypath));
-    BOOST_CHECK(!ParseHDKeypath("0000,/0000,/0000,", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("01234", keypath));
-    BOOST_CHECK(!ParseHDKeypath("0x1234", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("1", keypath));
-    BOOST_CHECK(!ParseHDKeypath(" 1", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("42", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m42", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("4294967295", keypath)); // 4294967295 == 0xFFFFFFFF (uint32_t max)
-    BOOST_CHECK(!ParseHDKeypath("4294967296", keypath)); // 4294967296 == 0xFFFFFFFF (uint32_t max) + 1
-
-    BOOST_CHECK(ParseHDKeypath("m", keypath));
-    BOOST_CHECK(!ParseHDKeypath("n", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/", keypath));
-    BOOST_CHECK(!ParseHDKeypath("n/", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0", keypath));
-    BOOST_CHECK(!ParseHDKeypath("n/0", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0'", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m/0''", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0'/0'", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m/'0/0'", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0/0", keypath));
-    BOOST_CHECK(!ParseHDKeypath("n/0/0", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0/0/00", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m/0/0/f00", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0/0/000000000000000000000000000000000000000000000000000000000000000000000000000000000000", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m/1/1/111111111111111111111111111111111111111111111111111111111111111111111111111111111111", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0/00/0", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m/0'/00/'0", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/1/", keypath));
-    BOOST_CHECK(!ParseHDKeypath("m/1//", keypath));
-
-    BOOST_CHECK(ParseHDKeypath("m/0/4294967295", keypath)); // 4294967295 == 0xFFFFFFFF (uint32_t max)
-    BOOST_CHECK(!ParseHDKeypath("m/0/4294967296", keypath)); // 4294967296 == 0xFFFFFFFF (uint32_t max) + 1
-
-    BOOST_CHECK(ParseHDKeypath("m/4294967295", keypath)); // 4294967295 == 0xFFFFFFFF (uint32_t max)
-    BOOST_CHECK(!ParseHDKeypath("m/4294967296", keypath)); // 4294967296 == 0xFFFFFFFF (uint32_t max) + 1
-}
-
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace wallet
diff --git a/depend/bitcoin/src/wallet/test/scriptpubkeyman_tests.cpp b/depend/bitcoin/src/wallet/test/scriptpubkeyman_tests.cpp
index 9c62436d..74389a54 100644
--- a/depend/bitcoin/src/wallet/test/scriptpubkeyman_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/scriptpubkeyman_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <key.h>
 #include <key_io.h>
+#include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <script/solver.h>
 #include <wallet/scriptpubkeyman.h>
@@ -37,5 +38,17 @@ BOOST_AUTO_TEST_CASE(DescriptorScriptPubKeyManTests)
     BOOST_CHECK(signprov_keypath_nums_h == nullptr);
 }
 
+BOOST_AUTO_TEST_CASE(desc_spkm_topup_fail)
+{
+    // Attempting to construct a DescriptorSPKM that cannot be topped up (hardened derivation without private keys)
+    // should throw even though it is valid and can be parsed
+    CExtKey extkey;
+    extkey.SetSeed(std::array<std::byte, 32>{});
+    CWallet keystore(m_node.chain.get(), "", CreateMockableWalletDatabase());
+    BOOST_CHECK_EXCEPTION(
+        CreateDescriptor(keystore, "wpkh(" + EncodeExtPubKey(extkey.Neuter()) + "/*h)", /*success=*/true),
+        std::runtime_error, HasReason("Could not top up scriptPubKeys"));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace wallet
diff --git a/depend/bitcoin/src/wallet/test/spend_tests.cpp b/depend/bitcoin/src/wallet/test/spend_tests.cpp
index 866ffa48..218792ff 100644
--- a/depend/bitcoin/src/wallet/test/spend_tests.cpp
+++ b/depend/bitcoin/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()));
diff --git a/depend/bitcoin/src/wallet/test/util.cpp b/depend/bitcoin/src/wallet/test/util.cpp
index b21c96f1..f51f1149 100644
--- a/depend/bitcoin/src/wallet/test/util.cpp
+++ b/depend/bitcoin/src/wallet/test/util.cpp
@@ -7,7 +7,6 @@
 #include <chain.h>
 #include <key.h>
 #include <key_io.h>
-#include <streams.h>
 #include <test/util/setup_common.h>
 #include <validationinterface.h>
 #include <wallet/context.h>
@@ -41,7 +40,7 @@ std::unique_ptr<CWallet> CreateSyncedWallet(interfaces::Chain& chain, CChain& cc
     }
     WalletRescanReserver reserver(*wallet);
     reserver.reserve();
-    CWallet::ScanResult result = wallet->ScanForWalletTransactions(cchain.Genesis()->GetBlockHash(), /*start_height=*/0, /*max_height=*/{}, reserver, /*fUpdate=*/false, /*save_progress=*/false);
+    CWallet::ScanResult result = wallet->ScanForWalletTransactions(cchain.Genesis()->GetBlockHash(), /*start_height=*/0, /*max_height=*/{}, reserver, /*save_progress=*/false);
     assert(result.status == CWallet::ScanResult::SUCCESS);
     assert(result.last_scanned_block == cchain.Tip()->GetBlockHash());
     assert(*result.last_scanned_height == cchain.Height());
@@ -53,7 +52,7 @@ std::shared_ptr<CWallet> TestCreateWallet(std::unique_ptr<WalletDatabase> databa
 {
     bilingual_str _error;
     std::vector<bilingual_str> _warnings;
-    auto wallet = CWallet::CreateNew(context, "", std::move(database), create_flags, _error, _warnings);
+    auto wallet = CWallet::CreateNew(context, "", std::move(database), create_flags, /*born_encrypted=*/false, _error, _warnings);
     NotifyWalletLoaded(context, wallet);
     if (context.chain) {
         wallet->postInitProcess();
@@ -68,7 +67,6 @@ std::shared_ptr<CWallet> TestCreateWallet(WalletContext& context)
     options.create_flags = WALLET_FLAG_DESCRIPTORS;
     DatabaseStatus status;
     bilingual_str error;
-    std::vector<bilingual_str> warnings;
     auto database = MakeWalletDatabase("", options, status, error);
     return TestCreateWallet(std::move(database), context, options.create_flags);
 }
@@ -92,7 +90,6 @@ std::shared_ptr<CWallet> TestLoadWallet(WalletContext& context)
     options.require_existing = true;
     DatabaseStatus status;
     bilingual_str error;
-    std::vector<bilingual_str> warnings;
     auto database = MakeWalletDatabase("", options, status, error);
     return TestLoadWallet(std::move(database), context);
 }
@@ -105,27 +102,6 @@ void TestUnloadWallet(std::shared_ptr<CWallet>&& wallet)
     WaitForDeleteWallet(std::move(wallet));
 }
 
-std::unique_ptr<WalletDatabase> DuplicateMockDatabase(WalletDatabase& database)
-{
-    std::unique_ptr<DatabaseBatch> batch_orig = database.MakeBatch();
-    std::unique_ptr<DatabaseCursor> cursor_orig = batch_orig->GetNewCursor();
-
-    std::unique_ptr<WalletDatabase> new_db = CreateMockableWalletDatabase();
-    std::unique_ptr<DatabaseBatch> new_db_batch = new_db->MakeBatch();
-    MockableSQLiteBatch* batch_new = dynamic_cast<MockableSQLiteBatch*>(new_db_batch.get());
-    Assert(batch_new);
-
-    while (true) {
-        DataStream key, value;
-        DatabaseCursor::Status status = cursor_orig->Next(key, value);
-        Assert(status != DatabaseCursor::Status::FAIL);
-        if (status != DatabaseCursor::Status::MORE) break;
-        batch_new->WriteKey(std::move(key), std::move(value));
-    }
-
-    return new_db;
-}
-
 std::string getnewaddress(CWallet& w)
 {
     constexpr auto output_type = OutputType::BECH32;
@@ -138,7 +114,7 @@ CTxDestination getNewDestination(CWallet& w, OutputType output_type)
 }
 
 MockableSQLiteDatabase::MockableSQLiteDatabase()
-    : SQLiteDatabase(fs::PathFromString("mock/"), fs::PathFromString("mock/wallet.dat"), DatabaseOptions(), SQLITE_OPEN_MEMORY)
+    : InMemoryWalletDatabase()
 {}
 
 std::unique_ptr<WalletDatabase> CreateMockableWalletDatabase()
diff --git a/depend/bitcoin/src/wallet/test/util.h b/depend/bitcoin/src/wallet/test/util.h
index fbc5188f..0795c65a 100644
--- a/depend/bitcoin/src/wallet/test/util.h
+++ b/depend/bitcoin/src/wallet/test/util.h
@@ -25,11 +25,11 @@ class CWallet;
 class WalletDatabase;
 struct WalletContext;
 
-static const DatabaseFormat DATABASE_FORMATS[] = {
+inline constexpr DatabaseFormat DATABASE_FORMATS[] = {
        DatabaseFormat::SQLITE,
 };
 
-const std::string ADDRESS_BCRT1_UNSPENDABLE = "bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3xueyj";
+inline const std::string ADDRESS_BCRT1_UNSPENDABLE = "bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3xueyj";
 
 std::unique_ptr<CWallet> CreateSyncedWallet(interfaces::Chain& chain, CChain& cchain, const CKey& key);
 
@@ -39,9 +39,6 @@ std::shared_ptr<CWallet> TestLoadWallet(WalletContext& context);
 std::shared_ptr<CWallet> TestLoadWallet(std::unique_ptr<WalletDatabase> database, WalletContext& context);
 void TestUnloadWallet(std::shared_ptr<CWallet>&& wallet);
 
-// Creates a copy of the provided database
-std::unique_ptr<WalletDatabase> DuplicateMockDatabase(WalletDatabase& database);
-
 /** Returns a new encoded destination from the wallet (hardcoded to BECH32) */
 std::string getnewaddress(CWallet& w);
 /** Returns a new destination, of an specific type, from the wallet */
@@ -59,7 +56,7 @@ class MockableSQLiteBatch : public SQLiteBatch
 
 /** A WalletDatabase whose contents and return values can be modified as needed for testing
  **/
-class MockableSQLiteDatabase : public SQLiteDatabase
+class MockableSQLiteDatabase : public InMemoryWalletDatabase
 {
 public:
     MockableSQLiteDatabase();
@@ -67,7 +64,6 @@ class MockableSQLiteDatabase : public SQLiteDatabase
     bool Backup(const std::string& strDest) const override { return true; }
 
     std::string Filename() override { return "mockable"; }
-    std::vector<fs::path> Files() override { return {}; }
     std::string Format() override { return "sqlite-mock"; }
     std::unique_ptr<DatabaseBatch> MakeBatch() override { return std::make_unique<MockableSQLiteBatch>(*this); }
 };
diff --git a/depend/bitcoin/src/wallet/test/wallet_tests.cpp b/depend/bitcoin/src/wallet/test/wallet_tests.cpp
index 5cd47f67..7865bf8c 100644
--- a/depend/bitcoin/src/wallet/test/wallet_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/wallet_tests.cpp
@@ -110,7 +110,7 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
         AddKey(wallet, coinbaseKey);
         WalletRescanReserver reserver(wallet);
         reserver.reserve();
-        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/{}, /*start_height=*/0, /*max_height=*/{}, reserver, /*fUpdate=*/false, /*save_progress=*/false);
+        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/{}, /*start_height=*/0, /*max_height=*/{}, reserver, /*save_progress=*/false);
         BOOST_CHECK_EQUAL(result.status, CWallet::ScanResult::FAILURE);
         BOOST_CHECK(result.last_failed_block.IsNull());
         BOOST_CHECK(result.last_scanned_block.IsNull());
@@ -137,10 +137,11 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
         {
             CBlockLocator locator;
             BOOST_CHECK(WalletBatch{wallet.GetDatabase()}.ReadBestBlock(locator));
-            BOOST_CHECK(!locator.IsNull() && locator.vHave.front() == newTip->GetBlockHash());
+            BOOST_REQUIRE(!locator.IsNull());
+            BOOST_CHECK(locator.vHave.front() == newTip->GetBlockHash());
         }
 
-        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/oldTip->GetBlockHash(), /*start_height=*/oldTip->nHeight, /*max_height=*/{}, reserver, /*fUpdate=*/false, /*save_progress=*/true);
+        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/oldTip->GetBlockHash(), /*start_height=*/oldTip->nHeight, /*max_height=*/{}, reserver, /*save_progress=*/true);
         BOOST_CHECK_EQUAL(result.status, CWallet::ScanResult::SUCCESS);
         BOOST_CHECK(result.last_failed_block.IsNull());
         BOOST_CHECK_EQUAL(result.last_scanned_block, newTip->GetBlockHash());
@@ -150,7 +151,8 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
         {
             CBlockLocator locator;
             BOOST_CHECK(WalletBatch{wallet.GetDatabase()}.ReadBestBlock(locator));
-            BOOST_CHECK(!locator.IsNull() && locator.vHave.front() == newTip->GetBlockHash());
+            BOOST_REQUIRE(!locator.IsNull());
+            BOOST_CHECK(locator.vHave.front() == newTip->GetBlockHash());
         }
     }
 
@@ -176,7 +178,7 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
         AddKey(wallet, coinbaseKey);
         WalletRescanReserver reserver(wallet);
         reserver.reserve();
-        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/oldTip->GetBlockHash(), /*start_height=*/oldTip->nHeight, /*max_height=*/{}, reserver, /*fUpdate=*/false, /*save_progress=*/false);
+        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/oldTip->GetBlockHash(), /*start_height=*/oldTip->nHeight, /*max_height=*/{}, reserver, /*save_progress=*/false);
         BOOST_CHECK_EQUAL(result.status, CWallet::ScanResult::FAILURE);
         BOOST_CHECK_EQUAL(result.last_failed_block, oldTip->GetBlockHash());
         BOOST_CHECK_EQUAL(result.last_scanned_block, newTip->GetBlockHash());
@@ -204,7 +206,7 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
         AddKey(wallet, coinbaseKey);
         WalletRescanReserver reserver(wallet);
         reserver.reserve();
-        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/oldTip->GetBlockHash(), /*start_height=*/oldTip->nHeight, /*max_height=*/{}, reserver, /*fUpdate=*/false, /*save_progress=*/false);
+        CWallet::ScanResult result = wallet.ScanForWalletTransactions(/*start_block=*/oldTip->GetBlockHash(), /*start_height=*/oldTip->nHeight, /*max_height=*/{}, reserver, /*save_progress=*/false);
         BOOST_CHECK_EQUAL(result.status, CWallet::ScanResult::FAILURE);
         BOOST_CHECK_EQUAL(result.last_failed_block, newTip->GetBlockHash());
         BOOST_CHECK(result.last_scanned_block.IsNull());
@@ -213,6 +215,36 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup)
     }
 }
 
+BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions_abort, TestChain100Setup)
+{
+    CWallet wallet(m_node.chain.get(), "", CreateMockableWalletDatabase());
+    uint256 genesis_hash;
+    {
+        LOCK(wallet.cs_wallet);
+        LOCK(Assert(m_node.chainman)->GetMutex());
+        wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
+        wallet.SetLastBlockProcessed(m_node.chainman->ActiveChain().Height(), m_node.chainman->ActiveChain().Tip()->GetBlockHash());
+        genesis_hash = m_node.chainman->ActiveChain().Genesis()->GetBlockHash();
+    }
+
+    // An abort requested while no rescan is held is stale and must
+    // not cancel a later scan.
+    wallet.AbortRescan();
+    WalletRescanReserver reserver(wallet);
+    BOOST_CHECK(reserver.reserve());
+    BOOST_CHECK(!wallet.IsAbortingRescan());
+
+    // An abort requested after the reservation but before the scan starts
+    // (e.g. while importdescriptors is still deriving keys) must cancel the
+    // scan.
+    wallet.AbortRescan();
+    CWallet::ScanResult result = wallet.ScanForWalletTransactions(genesis_hash, /*start_height=*/0, /*max_height=*/{}, reserver, /*save_progress=*/false);
+    BOOST_CHECK_EQUAL(result.status, CWallet::ScanResult::USER_ABORT);
+    BOOST_CHECK(result.last_scanned_block.IsNull());
+    BOOST_CHECK(!result.last_scanned_height);
+    BOOST_CHECK(result.last_failed_block.IsNull());
+}
+
 // This test verifies that wallet settings can be added and removed
 // concurrently, ensuring no race conditions occur during either process.
 BOOST_FIXTURE_TEST_CASE(write_wallet_settings_concurrently, TestingSetup)
@@ -246,12 +278,12 @@ BOOST_FIXTURE_TEST_CASE(write_wallet_settings_concurrently, TestingSetup)
                             /*num_expected_wallets=*/0);
 }
 
-static int64_t AddTx(ChainstateManager& chainman, CWallet& wallet, uint32_t lockTime, int64_t mockTime, int64_t blockTime)
+static int64_t AddTx(ChainstateManager& chainman, CWallet& wallet, uint32_t lockTime, std::chrono::seconds mock_time, int64_t blockTime)
 {
     CMutableTransaction tx;
     TxState state = TxStateInactive{};
     tx.nLockTime = lockTime;
-    SetMockTime(mockTime);
+    FakeNodeClock clock{mock_time};
     CBlockIndex* block = nullptr;
     if (blockTime > 0) {
         LOCK(cs_main);
@@ -277,24 +309,24 @@ static int64_t AddTx(ChainstateManager& chainman, CWallet& wallet, uint32_t lock
 BOOST_AUTO_TEST_CASE(ComputeTimeSmart)
 {
     // New transaction should use clock time if lower than block time.
-    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 1, 100, 120), 100);
+    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 1, 100s, 120), 100);
 
     // Test that updating existing transaction does not change smart time.
-    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 1, 200, 220), 100);
+    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 1, 200s, 220), 100);
 
     // New transaction should use clock time if there's no block time.
-    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 2, 300, 0), 300);
+    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 2, 300s, 0), 300);
 
     // New transaction should use block time if lower than clock time.
-    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 3, 420, 400), 400);
+    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 3, 420s, 400), 400);
 
     // New transaction should use latest entry time if higher than
     // min(block time, clock time).
-    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 4, 500, 390), 400);
+    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 4, 500s, 390), 400);
 
     // If there are future entries, new transaction should use time of the
     // newest entry that is no more than 300 seconds ahead of the clock time.
-    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 5, 50, 600), 300);
+    BOOST_CHECK_EQUAL(AddTx(*m_node.chainman, m_wallet, 5, 50s, 600), 300);
 }
 
 void TestLoadWallet(const std::string& name, DatabaseFormat format, std::function<void(std::shared_ptr<CWallet>)> f)
@@ -372,11 +404,11 @@ class ListCoinsTestingSetup : public TestChain100Setup
             BOOST_CHECK(res);
             tx = res->tx;
         }
-        wallet->CommitTransaction(tx, {}, {});
+        wallet->CommitTransaction(tx);
         CMutableTransaction blocktx;
         {
             LOCK(wallet->cs_wallet);
-            blocktx = CMutableTransaction(*wallet->mapWallet.at(tx->GetHash()).tx);
+            blocktx = CMutableTransaction(*wallet->mapWallet.at(tx->GetHash()).GetTx());
         }
         CreateAndProcessBlock({CMutableTransaction(blocktx)}, GetScriptForRawPubKey(coinbaseKey.GetPubKey()));
 
@@ -459,7 +491,7 @@ void TestCoinsResult(ListCoinsTest& context, OutputType out_type, CAmount amount
     filter.skip_locked = false;
     CoinsResult available_coins = AvailableCoins(*context.wallet, nullptr, std::nullopt, filter);
     // Lock outputs so they are not spent in follow-up transactions
-    for (uint32_t i = 0; i < wtx.tx->vout.size(); i++) context.wallet->LockCoin({wtx.GetHash(), i}, /*persist=*/false);
+    for (uint32_t i = 0; i < wtx.GetTx()->vout.size(); i++) context.wallet->LockCoin({wtx.GetHash(), i}, /*persist=*/false);
     for (const auto& [type, size] : expected_coins_sizes) BOOST_CHECK_EQUAL(size, available_coins.coins[type].size());
 }
 
@@ -698,7 +730,6 @@ BOOST_FIXTURE_TEST_CASE(RemoveTxs, TestChain100Setup)
     CKey key = GenerateRandomKey();
     AddKey(*wallet, key);
 
-    std::string error;
     m_coinbase_txns.push_back(CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())).vtx[0]);
     auto block_tx = TestSimpleSpend(*m_coinbase_txns[0], 0, coinbaseKey, GetScriptForRawPubKey(key.GetPubKey()));
     CreateAndProcessBlock({block_tx}, GetScriptForRawPubKey(coinbaseKey.GetPubKey()));
diff --git a/depend/bitcoin/src/wallet/test/wallet_transaction_tests.cpp b/depend/bitcoin/src/wallet/test/wallet_transaction_tests.cpp
index 38be52f4..19129dad 100644
--- a/depend/bitcoin/src/wallet/test/wallet_transaction_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/wallet_transaction_tests.cpp
@@ -4,6 +4,9 @@
 
 #include <wallet/transaction.h>
 
+#include <primitives/transaction.h>
+#include <serialize.h>
+#include <streams.h>
 #include <test/util/common.h>
 #include <wallet/test/wallet_test_fixture.h>
 
@@ -23,5 +26,34 @@ BOOST_AUTO_TEST_CASE(roundtrip)
     }
 }
 
+BOOST_AUTO_TEST_CASE(deserialize_rejects_mismatched_variant_txid)
+{
+    // Build tx_a and serialise it as a CWalletTx.
+    // Needs at least one input: a zero-input tx serialises vin_count as 0x00,
+    // which the witness-aware deserialiser misreads as the segwit marker byte.
+    CMutableTransaction mtx_a;
+    mtx_a.vin.emplace_back(COutPoint{Txid::FromUint256(uint256::ONE), 0});
+    mtx_a.vout.emplace_back(COIN, CScript() << OP_TRUE);
+    CTransactionRef tx_a = MakeTransactionRef(std::move(mtx_a));
+    CWalletTx wtx_a{tx_a, TxStateInactive{}};
+    DataStream ss;
+    ss << wtx_a;
+
+    // Build tx_b with a different txid to use as a bogus variant.
+    CMutableTransaction mtx_b;
+    mtx_b.vout.emplace_back(2 * COIN, CScript() << OP_TRUE);
+    CTransactionRef tx_b = MakeTransactionRef(std::move(mtx_b));
+    BOOST_REQUIRE(tx_b->GetHash() != tx_a->GetHash());
+
+    // A variant whose txid doesn't match the canonical txid must be rejected.
+    std::map<Wtxid, CTransactionRef> bad_variants{{tx_b->GetWitnessHash(), tx_b}};
+    try {
+        CWalletTx(deserialize, ss, bad_variants);
+        BOOST_FAIL("expected std::runtime_error was not thrown");
+    } catch (const std::runtime_error& e) {
+        BOOST_CHECK_EQUAL(std::string(e.what()), "variant txid does not match wallet txid");
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace wallet
diff --git a/depend/bitcoin/src/wallet/test/walletload_tests.cpp b/depend/bitcoin/src/wallet/test/walletload_tests.cpp
index 46b0ab16..66a34dee 100644
--- a/depend/bitcoin/src/wallet/test/walletload_tests.cpp
+++ b/depend/bitcoin/src/wallet/test/walletload_tests.cpp
@@ -37,9 +37,11 @@ class DummyDescriptor final : public Descriptor {
     std::optional<int64_t> MaxSatisfactionWeight(bool) const override { return {}; }
     std::optional<int64_t> MaxSatisfactionElems() const override { return {}; }
     void GetPubKeys(std::set<CPubKey>& pubkeys, std::set<CExtPubKey>& ext_pubs) const override {}
+    bool HasScripts() const override { return true; }
     std::vector<std::string> Warnings() const override { return {}; }
     uint32_t GetMaxKeyExpr() const override { return 0; }
     size_t GetKeyCount() const override { return 0; }
+    bool CanSelfExpand() const final { return false; }
 };
 
 BOOST_FIXTURE_TEST_CASE(wallet_load_descriptors, TestingSetup)
diff --git a/depend/bitcoin/src/wallet/transaction.cpp b/depend/bitcoin/src/wallet/transaction.cpp
index 3d82d55f..26cbf55f 100644
--- a/depend/bitcoin/src/wallet/transaction.cpp
+++ b/depend/bitcoin/src/wallet/transaction.cpp
@@ -4,6 +4,7 @@
 
 #include <wallet/transaction.h>
 
+#include <consensus/validation.h>
 #include <interfaces/chain.h>
 
 using interfaces::FoundBlock;
@@ -11,8 +12,8 @@ using interfaces::FoundBlock;
 namespace wallet {
 bool CWalletTx::IsEquivalentTo(const CWalletTx& _tx) const
 {
-        CMutableTransaction tx1 {*this->tx};
-        CMutableTransaction tx2 {*_tx.tx};
+        CMutableTransaction tx1 {*this->GetTx()};
+        CMutableTransaction tx2 {*_tx.GetTx()};
         for (auto& txin : tx1.vin) {
             txin.scriptSig = CScript();
             txin.scriptWitness.SetNull();
@@ -54,10 +55,57 @@ void CWalletTx::updateState(interfaces::Chain& chain)
     } else if (auto* conf = state<TxStateBlockConflicted>()) {
         lookup_block(conf->conflicting_block_hash, conf->conflicting_block_height, m_state);
     }
+
+    // If the above downgraded a previously-confirmed witness variant back to unconfirmed,
+    // the canonical choice is no longer pinned by confirmation. Re-apply the least-weight rule.
+    if (!isConfirmed()) RecomputeCanonical();
+}
+
+bool CWalletTx::Update(CTransactionRef new_tx, const TxState& new_state)
+{
+    Assert(new_tx);
+    if (!Assume(GetHash() == new_tx->GetHash())) {
+        return false;
+    }
+    bool ret = false;
+    const auto& [tx_pair, inserted] = m_txs.emplace(new_tx->GetWitnessHash(), std::move(new_tx));
+    if (inserted) {
+        ret = true;
+    }
+    const auto& [wtxid, tx] = *tx_pair;
+
+    if (new_state.index() != m_state.index()) {
+        m_state = new_state;
+        if (state<TxStateConfirmed>()) {
+            m_canonical_wtxid = wtxid;
+        }
+        ret = true;
+    } else {
+        assert(TxStateSerializedIndex(m_state) == TxStateSerializedIndex(new_state));
+        assert(TxStateSerializedBlockHash(m_state) == TxStateSerializedBlockHash(new_state));
+    }
+
+    // While unconfirmed, derive the canonical variant from all known variants
+    if (!isConfirmed()) {
+        const Wtxid prev_canonical = m_canonical_wtxid;
+        RecomputeCanonical();
+        if (m_canonical_wtxid != prev_canonical) {
+            ret = true;
+        }
+    }
+
+    return ret;
 }
 
-void CWalletTx::CopyFrom(const CWalletTx& _tx)
+void CWalletTx::RecomputeCanonical()
 {
-    *this = _tx;
+    // Recompute the canonical variant among the witness variants. They share
+    // the txid but differ in the wtxid. Prefer variant with witness data and
+    // the least weight.
+    Assert(!m_txs.empty());
+
+    m_canonical_wtxid = std::ranges::min_element(m_txs, std::less{}, [](const auto& entry) {
+                            return std::make_pair(!entry.second->HasWitness(), GetTransactionWeight(*entry.second));
+                        })->first;
 }
 } // namespace wallet
diff --git a/depend/bitcoin/src/wallet/transaction.h b/depend/bitcoin/src/wallet/transaction.h
index 29baf669..c00be287 100644
--- a/depend/bitcoin/src/wallet/transaction.h
+++ b/depend/bitcoin/src/wallet/transaction.h
@@ -164,9 +164,6 @@ struct CachableAmount
 };
 
 
-typedef std::map<std::string, std::string> mapValue_t;
-
-
 /** Legacy class used for deserializing vtxPrev for backwards compatibility.
  * vtxPrev was removed in commit 93a18a3650292afbb441a47d1fa1b94aeb0164e3,
  * but old wallet.dat files may still contain vtxPrev vectors of CMerkleTxs.
@@ -194,33 +191,20 @@ class CMerkleTx
 class CWalletTx
 {
 public:
-    /**
-     * Key/value map with information about the transaction.
-     *
-     * The following keys can be read and written through the map and are
-     * serialized in the wallet database:
-     *
-     *     "comment", "to"   - comment strings provided to sendtoaddress,
-     *                         and sendmany wallet RPCs
-     *     "replaces_txid"   - txid (as HexStr) of transaction replaced by
-     *                         bumpfee on transaction created by bumpfee
-     *     "replaced_by_txid" - txid (as HexStr) of transaction created by
-     *                         bumpfee on transaction replaced by bumpfee
-     *     "from", "message" - obsolete fields that could be set in UI prior to
-     *                         2011 (removed in commit 4d9b223)
-     *
-     * The following keys are serialized in the wallet database, but shouldn't
-     * be read or written through the map (they will be temporarily added and
-     * removed from the map during serialization):
-     *
-     *     "fromaccount"     - serialized strFromAccount value
-     *     "n"               - serialized nOrderPos value
-     *     "timesmart"       - serialized nTimeSmart value
-     *     "spent"           - serialized vfSpent value that existed prior to
-     *                         2014 (removed in commit 93a18a3)
-     */
-    mapValue_t mapValue;
-    std::vector<std::pair<std::string, std::string> > vOrderForm;
+    // "from" and "message" are obsolete fields that could be set in
+    // the UI prior to 2011 (removed in commit 4d9b223)
+    // These fields are kept to avoid losing metadata.
+    std::optional<std::string> m_from;
+    std::optional<std::string> m_message;
+    // Comment strings provided by the user
+    std::optional<std::string> m_comment;
+    std::optional<std::string> m_comment_to;
+    std::optional<Txid> m_replaces_txid;
+    std::optional<Txid> m_replaced_by_txid;
+    // BIP 21 URI Messages
+    std::vector<std::string> m_messages;
+    // BIP 70 Payment Request (deprecated, field kept to preserve metadata from old wallets)
+    std::vector<std::string> m_payment_requests;
     unsigned int nTimeReceived; //!< time received by this node
     /**
      * Stable timestamp that never changes, and reflects the order a transaction
@@ -250,23 +234,27 @@ class CWalletTx
     mutable bool fChangeCached;
     mutable CAmount nChangeCached;
 
-    CWalletTx(CTransactionRef tx, const TxState& state) : tx(std::move(tx)), m_state(state)
+    CWalletTx(CTransactionRef tx, const TxState& state) : m_state(state)
     {
-        Init();
+        Assert(tx);
+        m_canonical_wtxid = tx->GetWitnessHash();
+        m_txs.emplace(tx->GetWitnessHash(), std::move(tx));
+        SetDefaults();
     }
 
-    void Init()
+    template <typename Stream>
+    CWalletTx(deserialize_type, Stream& s, const std::map<Wtxid, CTransactionRef>& variants) : m_state(TxStateInactive{})
     {
-        mapValue.clear();
-        vOrderForm.clear();
-        nTimeReceived = 0;
-        nTimeSmart = 0;
-        fChangeCached = false;
-        nChangeCached = 0;
-        nOrderPos = -1;
+        Unserialize(s);
+        const Txid& canonical_txid = GetHash();
+        for (const auto& [wtxid, tx] : variants) {
+            if (tx->GetHash() != canonical_txid) throw std::runtime_error("variant txid does not match wallet txid");
+        }
+        // Merge witness variants
+        m_txs.insert(variants.begin(), variants.end());
+        Assert(m_txs.contains(GetWitnessHash()));
     }
 
-    CTransactionRef tx;
     TxState m_state;
 
     // Set of mempool transactions that conflict
@@ -284,14 +272,24 @@ class CWalletTx
     template<typename Stream>
     void Serialize(Stream& s) const
     {
-        mapValue_t mapValueCopy = mapValue;
-
-        mapValueCopy["fromaccount"] = "";
-        if (nOrderPos != -1) {
-            mapValueCopy["n"] = util::ToString(nOrderPos);
+        std::map<std::string, std::string> string_values;
+        if (m_from) string_values["from"] = *m_from;
+        if (m_message) string_values["message"] = *m_message;
+        if (m_comment) string_values["comment"] = *m_comment;
+        if (m_comment_to) string_values["to"] = *m_comment_to;
+        if (m_replaces_txid) string_values["replaces_txid"] = m_replaces_txid->ToString();
+        if (m_replaced_by_txid) string_values["replaced_by_txid"] = m_replaced_by_txid->ToString();
+        string_values["fromaccount"] = "";
+        if (nOrderPos != -1) string_values["n"] = util::ToString(nOrderPos);
+        if (nTimeSmart) string_values["timesmart"] = strprintf("%u", nTimeSmart);
+
+        std::vector<std::pair<std::string, std::string>> msgs_reqs;
+        msgs_reqs.reserve(m_messages.size() + m_payment_requests.size());
+        for (const std::string& msg : m_messages) {
+            msgs_reqs.emplace_back("Message", msg);
         }
-        if (nTimeSmart) {
-            mapValueCopy["timesmart"] = strprintf("%u", nTimeSmart);
+        for (const std::string& req : m_payment_requests) {
+            msgs_reqs.emplace_back("PaymentRequest", req);
         }
 
         std::vector<uint8_t> dummy_vector1; // Used to be vMerkleBranch
@@ -300,7 +298,7 @@ class CWalletTx
         uint32_t dummy_int = 0; // Used to be fTimeReceivedIsTxTime
         uint256 serializedHash = TxStateSerializedBlockHash(m_state);
         int serializedIndex = TxStateSerializedIndex(m_state);
-        s << TX_WITH_WITNESS(tx) << serializedHash << dummy_vector1 << serializedIndex << dummy_vector2 << mapValueCopy << vOrderForm << dummy_int << nTimeReceived << dummy_bool << dummy_bool;
+        s << TX_WITH_WITNESS(GetTx()) << serializedHash << dummy_vector1 << serializedIndex << dummy_vector2 << string_values << msgs_reqs << dummy_int << nTimeReceived << dummy_bool << dummy_bool;
     }
 
     template<typename Stream>
@@ -314,25 +312,47 @@ class CWalletTx
         uint32_t dummy_int; // Used to be fTimeReceivedIsTxTime
         uint256 serialized_block_hash;
         int serializedIndex;
-        s >> TX_WITH_WITNESS(tx) >> serialized_block_hash >> dummy_vector1 >> serializedIndex >> dummy_vector2 >> mapValue >> vOrderForm >> dummy_int >> nTimeReceived >> dummy_bool >> dummy_bool;
+        std::map<std::string, std::string> string_values;
+        std::vector<std::pair<std::string, std::string>> msgs_reqs;
+        CTransactionRef canonical_tx;
+        s >> TX_WITH_WITNESS(canonical_tx) >> serialized_block_hash >> dummy_vector1 >> serializedIndex >> dummy_vector2 >> string_values >> msgs_reqs >> dummy_int >> nTimeReceived >> dummy_bool >> dummy_bool;
+        m_canonical_wtxid = canonical_tx->GetWitnessHash();
+        m_txs.emplace(m_canonical_wtxid, std::move(canonical_tx));
 
         m_state = TxStateInterpretSerialized({serialized_block_hash, serializedIndex});
 
-        const auto it_op = mapValue.find("n");
-        nOrderPos = (it_op != mapValue.end()) ? LocaleIndependentAtoi<int64_t>(it_op->second) : -1;
-        const auto it_ts = mapValue.find("timesmart");
-        nTimeSmart = (it_ts != mapValue.end()) ? static_cast<unsigned int>(LocaleIndependentAtoi<int64_t>(it_ts->second)) : 0;
+        string_values.erase("fromaccount");
+        string_values.erase("spent");
+        for (const auto& [key, value] : string_values) {
+            if (key == "n") nOrderPos = LocaleIndependentAtoi<int64_t>(value);
+            else if (key == "timesmart") nTimeSmart = LocaleIndependentAtoi<int64_t>(value);
+            else if (key == "from") m_from = value;
+            else if (key == "message") m_message = value;
+            else if (key == "comment") m_comment = value;
+            else if (key == "to") m_comment_to = value;
+            else if (key == "replaces_txid") m_replaces_txid = Txid::FromHex(value);
+            else if (key == "replaced_by_txid") m_replaced_by_txid = Txid::FromHex(value);
+            else {
+                throw std::runtime_error("Unexpected value in CWalletTx strings value map");
+            }
+        }
 
-        mapValue.erase("fromaccount");
-        mapValue.erase("spent");
-        mapValue.erase("n");
-        mapValue.erase("timesmart");
+        for (const auto& [type, data] : msgs_reqs) {
+            if (type == "Message") m_messages.emplace_back(data);
+            else if (type == "PaymentRequest") m_payment_requests.emplace_back(data);
+            else {
+                throw std::runtime_error("Unknown type in CWalletTx messages and requests vector");
+            }
+        }
     }
 
-    void SetTx(CTransactionRef arg)
-    {
-        tx = std::move(arg);
-    }
+    CTransactionRef GetTx() const { return m_txs.at(m_canonical_wtxid); }
+
+    // Update the state of this wallet transaction along with a transaction that may have a different wtxid.
+    // If the given transaction has a different wtxid, the transaction is stored if it has not been seen before.
+    // The canonical wtxid is also updated. The tx that is confirmed becomes canonical. For unconfirmed txs,
+    // those with witnesses are preferred, followed by least weight.
+    bool Update(CTransactionRef tx, const TxState& new_state);
 
     //! make sure balances are recalculated
     void MarkDirty()
@@ -364,19 +384,44 @@ class CWalletTx
     bool isInactive() const { return state<TxStateInactive>(); }
     bool isUnconfirmed() const { return !isAbandoned() && !isBlockConflicted() && !isMempoolConflicted() && !isConfirmed(); }
     bool isConfirmed() const { return state<TxStateConfirmed>(); }
-    const Txid& GetHash() const LIFETIMEBOUND { return tx->GetHash(); }
-    const Wtxid& GetWitnessHash() const LIFETIMEBOUND { return tx->GetWitnessHash(); }
-    bool IsCoinBase() const { return tx->IsCoinBase(); }
+    const Txid& GetHash() const LIFETIMEBOUND { return GetTx()->GetHash(); }
+    const Wtxid& GetWitnessHash() const LIFETIMEBOUND { return GetTx()->GetWitnessHash(); }
+    bool IsCoinBase() const { return GetTx()->IsCoinBase(); }
+
+    const std::map<Wtxid, CTransactionRef>& GetTxs() const { return m_txs; }
 
-private:
     // Disable copying of CWalletTx objects to prevent bugs where instances get
     // copied in and out of the mapWallet map, and fields are updated in the
     // wrong copy.
-    CWalletTx(const CWalletTx&) = default;
-    CWalletTx& operator=(const CWalletTx&) = default;
-public:
-    // Instead have an explicit copy function
-    void CopyFrom(const CWalletTx&);
+    CWalletTx(const CWalletTx&) = delete;
+    CWalletTx& operator=(const CWalletTx&) = delete;
+
+    // Enable the default move constructor
+    CWalletTx(CWalletTx&&) = default;
+
+private:
+    void SetDefaults()
+    {
+        nTimeReceived = 0;
+        nTimeSmart = 0;
+        fChangeCached = false;
+        nChangeCached = 0;
+        nOrderPos = -1;
+    }
+
+    void Init()
+    {
+        m_txs.clear();
+        m_canonical_wtxid = Wtxid{};
+        SetDefaults();
+    }
+
+    Wtxid m_canonical_wtxid;
+    std::map<Wtxid, CTransactionRef> m_txs;
+
+    //! Set m_canonical_wtxid to the best variant under the unconfirmed rule
+    //! (witnessed preferred, then least weight). Ignores state.
+    void RecomputeCanonical();
 };
 
 struct WalletTxOrderComparator {
@@ -397,7 +442,7 @@ class WalletTXO
     : m_wtx(wtx),
     m_output(output)
     {
-        Assume(std::ranges::find(wtx.tx->vout, output) != wtx.tx->vout.end());
+        Assume(std::ranges::find(wtx.GetTx()->vout, output) != wtx.GetTx()->vout.end());
     }
 
     const CWalletTx& GetWalletTx() const { return m_wtx; }
diff --git a/depend/bitcoin/src/wallet/types.h b/depend/bitcoin/src/wallet/types.h
index 09ad4a0a..e4cbab3b 100644
--- a/depend/bitcoin/src/wallet/types.h
+++ b/depend/bitcoin/src/wallet/types.h
@@ -15,6 +15,7 @@
 #define BITCOIN_WALLET_TYPES_H
 
 #include <policy/fees/block_policy_estimator.h>
+#include <util/translation.h>
 
 namespace wallet {
 /**
@@ -42,6 +43,33 @@ struct CreatedTransactionResult
             : tx(_tx), fee(_fee), fee_calc(_fee_calc), change_pos(_change_pos) {}
 };
 
+//! Machine-readable wallet error codes.
+//!
+//! @note Add new codes only when callers need to handle the condition
+//! differently. For errors that should only be displayed to the user, use
+//! WalletErrorCode::GenericError and provide the user-facing details in WalletError::message.
+enum class WalletErrorCode {
+    //! Generic wallet error. Callers may present the accompanying message to
+    //! the user.
+    GenericError,
+
+    //! The wallet is locked and the operation requires access to private keys.
+    //! Callers may ask the user to unlock the wallet and retry the operation.
+    UnlockNeeded,
+};
+
+//! Wallet-layer error with both programmatic and user-facing information.
+//!
+//! Wallet methods should return a specific WalletErrorCode only when callers
+//! can handle that condition differently. Otherwise, use WalletErrorCode::GenericError
+//! and describe the failure in `message`.
+struct WalletError {
+    //! Machine-readable error code for callers that need programmatic handling.
+    WalletErrorCode code;
+    //! User-facing translated error message
+    bilingual_str message;
+};
+
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_TYPES_H
diff --git a/depend/bitcoin/src/wallet/wallet.cpp b/depend/bitcoin/src/wallet/wallet.cpp
index 823e1b48..ddb742d0 100644
--- a/depend/bitcoin/src/wallet/wallet.cpp
+++ b/depend/bitcoin/src/wallet/wallet.cpp
@@ -6,6 +6,7 @@
 #include <wallet/wallet.h>
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
+
 #include <addresstype.h>
 #include <blockfilter.h>
 #include <chain.h>
@@ -26,7 +27,6 @@
 #include <kernel/types.h>
 #include <key.h>
 #include <key_io.h>
-#include <logging.h>
 #include <node/types.h>
 #include <outputtype.h>
 #include <policy/feerate.h>
@@ -55,6 +55,7 @@
 #include <util/check.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 #include <util/result.h>
 #include <util/string.h>
@@ -109,7 +110,14 @@ bool AddWalletSetting(interfaces::Chain& chain, const std::string& wallet_name)
 bool RemoveWalletSetting(interfaces::Chain& chain, const std::string& wallet_name)
 {
     const auto update_function = [&wallet_name](common::SettingsValue& setting_value) {
-        if (!setting_value.isArray()) return interfaces::SettingsAction::SKIP_WRITE;
+        if (!setting_value.isArray()) {
+            if (wallet_name.empty() && setting_value.isNull()) {
+                // Empty setting suppresses backwards-compatible default wallet autoload.
+                setting_value.setArray();
+                return interfaces::SettingsAction::WRITE;
+            }
+            return interfaces::SettingsAction::SKIP_WRITE;
+        }
         common::SettingsValue new_value(common::SettingsValue::VARR);
         for (const auto& value : setting_value.getValues()) {
             if (!value.isStr() || value.get_str() != wallet_name) new_value.push_back(value);
@@ -385,18 +393,12 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
 
     uint64_t wallet_creation_flags = options.create_flags;
     const SecureString& passphrase = options.create_passphrase;
+    bool born_encrypted = !passphrase.empty();
 
     // Only descriptor wallets can be created
     Assert(wallet_creation_flags & WALLET_FLAG_DESCRIPTORS);
     options.require_format = DatabaseFormat::SQLITE;
 
-    // Indicate that the wallet is actually supposed to be blank and not just blank to make it encrypted
-    bool create_blank = (wallet_creation_flags & WALLET_FLAG_BLANK_WALLET);
-
-    // Born encrypted wallets need to be created blank first.
-    if (!passphrase.empty()) {
-        wallet_creation_flags |= WALLET_FLAG_BLANK_WALLET;
-    }
 
     // Private keys must be disabled for an external signer wallet
     if ((wallet_creation_flags & WALLET_FLAG_EXTERNAL_SIGNER) && !(wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
@@ -406,7 +408,7 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
     }
 
     // Do not allow a passphrase when private keys are disabled
-    if (!passphrase.empty() && (wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+    if (born_encrypted && (wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         error = Untranslated("Passphrase provided but private keys are disabled. A passphrase is only used to encrypt private keys, so cannot be used for wallets with private keys disabled.");
         status = DatabaseStatus::FAILED_CREATE;
         return nullptr;
@@ -422,7 +424,7 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
 
     // Make the wallet
     context.chain->initMessage(_("Creating wallet…"));
-    std::shared_ptr<CWallet> wallet = CWallet::CreateNew(context, name, std::move(database), wallet_creation_flags, error, warnings);
+    std::shared_ptr<CWallet> wallet = CWallet::CreateNew(context, name, std::move(database), wallet_creation_flags, born_encrypted, error, warnings);
     if (!wallet) {
         error = Untranslated("Wallet creation failed.") + Untranslated(" ") + error;
         status = DatabaseStatus::FAILED_CREATE;
@@ -430,29 +432,12 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
     }
 
     // Encrypt the wallet
-    if (!passphrase.empty() && !(wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+    if (born_encrypted) {
         if (!wallet->EncryptWallet(passphrase)) {
             error = Untranslated("Error: Wallet created but failed to encrypt.");
             status = DatabaseStatus::FAILED_ENCRYPT;
             return nullptr;
         }
-        if (!create_blank) {
-            // Unlock the wallet
-            if (!wallet->Unlock(passphrase)) {
-                error = Untranslated("Error: Wallet was encrypted but could not be unlocked");
-                status = DatabaseStatus::FAILED_ENCRYPT;
-                return nullptr;
-            }
-
-            // Set a seed for the wallet
-            {
-                LOCK(wallet->cs_wallet);
-                wallet->SetupDescriptorScriptPubKeyMans();
-            }
-
-            // Relock the wallet
-            wallet->Lock();
-        }
     }
 
     WITH_LOCK(wallet->cs_wallet, wallet->LogStats());
@@ -708,7 +693,7 @@ std::set<Txid> CWallet::GetConflicts(const Txid& txid) const
 
     std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range;
 
-    for (const CTxIn& txin : wtx.tx->vin)
+    for (const CTxIn& txin : wtx.GetTx()->vin)
     {
         if (mapTxSpends.count(txin.prevout) <= 1)
             continue;  // No conflict if zero or one spends
@@ -764,8 +749,14 @@ void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> ran
         if (copyFrom == copyTo) continue;
         assert(copyFrom && "Oldest wallet transaction in range assumed to have been found.");
         if (!copyFrom->IsEquivalentTo(*copyTo)) continue;
-        copyTo->mapValue = copyFrom->mapValue;
-        copyTo->vOrderForm = copyFrom->vOrderForm;
+        copyTo->m_from = copyFrom->m_from;
+        copyTo->m_message = copyFrom->m_message;
+        copyTo->m_comment = copyFrom->m_comment;
+        copyTo->m_comment_to = copyFrom->m_comment_to;
+        copyTo->m_replaces_txid = copyFrom->m_replaces_txid;
+        copyTo->m_replaced_by_txid = copyFrom->m_replaced_by_txid;
+        copyTo->m_messages = copyFrom->m_messages;
+        copyTo->m_payment_requests = copyFrom->m_payment_requests;
         // nTimeReceived not copied on purpose
         copyTo->nTimeSmart = copyFrom->nTimeSmart;
         // nOrderPos not copied on purpose
@@ -834,7 +825,7 @@ void CWallet::AddToSpends(const CWalletTx& wtx)
     if (wtx.IsCoinBase()) // Coinbases don't spend anything!
         return;
 
-    for (const CTxIn& txin : wtx.tx->vin)
+    for (const CTxIn& txin : wtx.GetTx()->vin)
         AddToSpends(txin.prevout, wtx.GetHash());
 }
 
@@ -896,12 +887,12 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
         encrypted_batch = nullptr;
 
         Lock();
-        Unlock(strWalletPassphrase);
-
-        // Make new descriptors with a new seed
-        if (!IsWalletFlagSet(WALLET_FLAG_BLANK_WALLET)) {
-            SetupDescriptorScriptPubKeyMans();
+        if (!Unlock(strWalletPassphrase)) {
+            return false;
         }
+
+        SetupWalletGeneration();
+
         Lock();
 
         // Need to completely rewrite the wallet file; if we don't, the database might keep
@@ -1003,9 +994,9 @@ bool CWallet::MarkReplaced(const Txid& originalHash, const Txid& newHash)
     CWalletTx& wtx = (*mi).second;
 
     // Ensure for now that we're not overwriting data
-    assert(!wtx.mapValue.contains("replaced_by_txid"));
+    Assert(!wtx.m_replaced_by_txid);
 
-    wtx.mapValue["replaced_by_txid"] = newHash.ToString();
+    wtx.m_replaced_by_txid = newHash;
 
     // Refresh mempool status without waiting for transactionRemovedFromMempool or transactionAddedToMempool
     RefreshMempoolStatus(wtx, chain());
@@ -1030,7 +1021,7 @@ void CWallet::SetSpentKeyState(WalletBatch& batch, const Txid& hash, unsigned in
     if (!srctx) return;
 
     CTxDestination dst;
-    if (ExtractDestination(srctx->tx->vout[n].scriptPubKey, dst)) {
+    if (ExtractDestination(srctx->GetTx()->vout[n].scriptPubKey, dst)) {
         if (IsMine(dst)) {
             if (used != IsAddressPreviouslySpent(dst)) {
                 if (used) {
@@ -1093,22 +1084,7 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
 
     if (!fInsertedNew)
     {
-        if (state.index() != wtx.m_state.index()) {
-            wtx.m_state = state;
-            fUpdated = true;
-        } else {
-            assert(TxStateSerializedIndex(wtx.m_state) == TxStateSerializedIndex(state));
-            assert(TxStateSerializedBlockHash(wtx.m_state) == TxStateSerializedBlockHash(state));
-        }
-        // If we have a witness-stripped version of this transaction, and we
-        // see a new version with a witness, then we must be upgrading a pre-segwit
-        // wallet.  Store the new version of the transaction with the witness,
-        // as the stripped-version must be invalid.
-        // TODO: Store all versions of the transaction, instead of just one.
-        if (tx->HasWitness() && !wtx.tx->HasWitness()) {
-            wtx.SetTx(tx);
-            fUpdated = true;
-        }
+        fUpdated |= wtx.Update(tx, state);
     }
 
     // Mark inactive coinbase transactions and their descendants as abandoned
@@ -1124,8 +1100,8 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
             // Break caches since we have changed the state
             desc_tx->MarkDirty();
             batch.WriteTx(*desc_tx);
-            MarkInputsDirty(desc_tx->tx);
-            for (unsigned int i = 0; i < desc_tx->tx->vout.size(); ++i) {
+            MarkInputsDirty(desc_tx->GetTx());
+            for (unsigned int i = 0; i < desc_tx->GetTx()->vout.size(); ++i) {
                 COutPoint outpoint(desc_tx->GetHash(), i);
                 std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range = mapTxSpends.equal_range(outpoint);
                 for (TxSpends::const_iterator it = range.first; it != range.second; ++it) {
@@ -1190,11 +1166,11 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
     return &wtx;
 }
 
-bool CWallet::LoadToWallet(const Txid& hash, const UpdateWalletTxFn& fill_wtx)
+bool CWallet::LoadToWallet(CWalletTx&& wtx_in)
 {
-    const auto& ins = mapWallet.emplace(std::piecewise_construct, std::forward_as_tuple(hash), std::forward_as_tuple(nullptr, TxStateInactive{}));
+    const auto& ins = mapWallet.emplace(wtx_in.GetHash(), std::move(wtx_in));
     CWalletTx& wtx = ins.first->second;
-    if (!fill_wtx(wtx, ins.second)) {
+    if (!ins.second) {
         return false;
     }
     // If wallet doesn't have a chain (e.g when using bitcoin-wallet tool),
@@ -1202,11 +1178,9 @@ bool CWallet::LoadToWallet(const Txid& hash, const UpdateWalletTxFn& fill_wtx)
     if (HaveChain()) {
       wtx.updateState(chain());
     }
-    if (/* insertion took place */ ins.second) {
-        wtx.m_it_wtxOrdered = wtxOrdered.insert(std::make_pair(wtx.nOrderPos, &wtx));
-    }
+    wtx.m_it_wtxOrdered = wtxOrdered.insert(std::make_pair(wtx.nOrderPos, &wtx));
     AddToSpends(wtx);
-    for (const CTxIn& txin : wtx.tx->vin) {
+    for (const CTxIn& txin : wtx.GetTx()->vin) {
         auto it = mapWallet.find(txin.prevout.hash);
         if (it != mapWallet.end()) {
             CWalletTx& prevtx = it->second;
@@ -1224,7 +1198,7 @@ bool CWallet::LoadToWallet(const Txid& hash, const UpdateWalletTxFn& fill_wtx)
     return true;
 }
 
-bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, const SyncTxState& state, bool fUpdate, bool rescanning_old_block)
+bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, const SyncTxState& state, bool rescanning_old_block)
 {
     const CTransaction& tx = *ptx;
     {
@@ -1244,7 +1218,6 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, const SyncTxS
         }
 
         bool fExisted = mapWallet.contains(tx.GetHash());
-        if (fExisted && !fUpdate) return false;
         if (fExisted || IsMine(tx) || IsFromMe(tx))
         {
             /* Check if any keys in the wallet keypool that were supposed to be unused
@@ -1301,8 +1274,8 @@ void CWallet::UpdateTrucSiblingConflicts(const CWalletTx& parent_wtx, const Txid
 {
     // Find all other txs in our wallet that spend utxos from this parent
     // so that we can mark them as mempool-conflicted by this new tx.
-    for (long unsigned int i = 0; i < parent_wtx.tx->vout.size(); i++) {
-        for (auto range = mapTxSpends.equal_range(COutPoint(parent_wtx.tx->GetHash(), i)); range.first != range.second; range.first++) {
+    for (long unsigned int i = 0; i < parent_wtx.GetTx()->vout.size(); i++) {
+        for (auto range = mapTxSpends.equal_range(COutPoint(parent_wtx.GetTx()->GetHash(), i)); range.first != range.second; range.first++) {
             const Txid& sibling_txid = range.first->second;
             // Skip the child_tx itself
             if (sibling_txid == child_txid) continue;
@@ -1416,7 +1389,7 @@ void CWallet::RecursiveUpdateTxState(WalletBatch* batch, const Txid& tx_hash, co
             wtx.MarkDirty();
             if (batch) batch->WriteTx(wtx);
             // Iterate over all its outputs, and update those tx states as well (if applicable)
-            for (unsigned int i = 0; i < wtx.tx->vout.size(); ++i) {
+            for (unsigned int i = 0; i < wtx.GetTx()->vout.size(); ++i) {
                 std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range = mapTxSpends.equal_range(COutPoint(now, i));
                 for (TxSpends::const_iterator iter = range.first; iter != range.second; ++iter) {
                     if (!done.contains(iter->second)) {
@@ -1431,14 +1404,14 @@ void CWallet::RecursiveUpdateTxState(WalletBatch* batch, const Txid& tx_hash, co
 
             // If a transaction changes its tx state, that usually changes the balance
             // available of the outputs it spends. So force those to be recomputed
-            MarkInputsDirty(wtx.tx);
+            MarkInputsDirty(wtx.GetTx());
         }
     }
 }
 
-bool CWallet::SyncTransaction(const CTransactionRef& ptx, const SyncTxState& state, bool update_tx, bool rescanning_old_block)
+bool CWallet::SyncTransaction(const CTransactionRef& ptx, const SyncTxState& state, bool rescanning_old_block)
 {
-    if (!AddToWalletIfInvolvingMe(ptx, state, update_tx, rescanning_old_block))
+    if (!AddToWalletIfInvolvingMe(ptx, state, rescanning_old_block))
         return false; // Not one of ours
 
     // If a transaction changes 'conflicted' state, that changes the balance
@@ -1627,7 +1600,7 @@ void CWallet::blockDisconnected(const interfaces::BlockInfo& block)
                     return TxUpdate::UNCHANGED;
                 };
 
-                RecursiveUpdateTxState(wtx.tx->GetHash(), try_updating_state);
+                RecursiveUpdateTxState(wtx.GetTx()->GetHash(), try_updating_state);
             }
         }
     }
@@ -1709,10 +1682,10 @@ bool CWallet::IsMine(const COutPoint& outpoint) const
     if (!wtx) {
         return false;
     }
-    if (outpoint.n >= wtx->tx->vout.size()) {
+    if (outpoint.n >= wtx->GetTx()->vout.size()) {
         return false;
     }
-    return IsMine(wtx->tx->vout[outpoint.n]);
+    return IsMine(wtx->GetTx()->vout[outpoint.n]);
 }
 
 bool CWallet::IsFromMe(const CTransaction& tx) const
@@ -1847,7 +1820,7 @@ void CWallet::MaybeUpdateBirthTime(int64_t time)
  * @return Earliest timestamp that could be successfully scanned from. Timestamp
  * returned will be higher than startTime if relevant blocks could not be read.
  */
-int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& reserver, bool update)
+int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& reserver)
 {
     // Find starting block. May be null if nCreateTime is greater than the
     // highest blockchain timestamp, in which case there is nothing that needs
@@ -1859,7 +1832,7 @@ int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& r
 
     if (start) {
         // TODO: this should take into account failure by ScanResult::USER_ABORT
-        ScanResult result = ScanForWalletTransactions(start_block, start_height, /*max_height=*/{}, reserver, /*fUpdate=*/update, /*save_progress=*/false);
+        ScanResult result = ScanForWalletTransactions(start_block, start_height, /*max_height=*/{}, reserver, /*save_progress=*/false);
         if (result.status == ScanResult::FAILURE) {
             int64_t time_max;
             CHECK_NONFATAL(chain().findBlock(result.last_failed_block, FoundBlock().maxTime(time_max)));
@@ -1871,8 +1844,7 @@ int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& r
 
 /**
  * Scan the block chain (starting in start_block) for transactions
- * from or to us. If fUpdate is true, found transactions that already
- * exist in the wallet will be updated. If max_height is not set, the
+ * from or to us. If max_height is not set, the
  * mempool will be scanned as well.
  *
  * @param[in] start_block Scan starting block. If block is not on the active
@@ -1891,7 +1863,7 @@ int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& r
  * the main chain after to the addition of any new keys you want to detect
  * transactions for.
  */
-CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, bool fUpdate, const bool save_progress)
+CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, const bool save_progress)
 {
     constexpr auto INTERVAL_TIME{60s};
     auto current_time{reserver.now()};
@@ -1908,7 +1880,6 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
     WalletLogPrintf("Rescan started from block %s... (%s)\n", start_block.ToString(),
                     fast_rescan_filter ? "fast variant using block filters" : "slow variant inspecting all blocks");
 
-    fAbortRescan = false;
     ShowProgress(strprintf("[%s] %s", DisplayName(), _("Rescanning…")), 0); // show rescan progress in GUI as dialog or on splashscreen, if rescan required on startup (e.g. due to corruption)
     uint256 tip_hash = WITH_LOCK(cs_wallet, return GetLastBlockHash());
     uint256 end_hash = tip_hash;
@@ -1976,7 +1947,7 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
                     break;
                 }
                 for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {
-                    SyncTransaction(block.vtx[posInBlock], TxStateConfirmed{block_hash, block_height, static_cast<int>(posInBlock)}, fUpdate, /*rescanning_old_block=*/true);
+                    SyncTransaction(block.vtx[posInBlock], TxStateConfirmed{block_hash, block_height, static_cast<int>(posInBlock)}, /*rescanning_old_block=*/true);
                 }
                 // scan succeeded, record block as most recent successfully scanned
                 result.last_scanned_block = block_hash;
@@ -2030,10 +2001,10 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
         WITH_LOCK(cs_wallet, chain().requestMempoolTransactions(*this));
     }
     ShowProgress(strprintf("[%s] %s", DisplayName(), _("Rescanning…")), 100); // hide progress dialog in GUI
-    if (block_height && fAbortRescan) {
+    if (fAbortRescan) {
         WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height, progress_current);
         result.status = ScanResult::USER_ABORT;
-    } else if (block_height && chain().shutdownRequested()) {
+    } else if (chain().shutdownRequested()) {
         WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", block_height, progress_current);
         result.status = ScanResult::USER_ABORT;
     } else {
@@ -2080,7 +2051,7 @@ bool CWallet::SubmitTxMemoryPoolAndRelay(CWalletTx& wtx,
     // If broadcast fails for any reason, trying to set wtx.m_state here would be incorrect.
     // If transaction was previously in the mempool, it should be updated when
     // TransactionRemovedFromMempool fires.
-    bool ret = chain().broadcastTransaction(wtx.tx, m_default_max_tx_fee, broadcast_method, err_string);
+    bool ret = chain().broadcastTransaction(wtx.GetTx(), m_default_max_tx_fee, broadcast_method, err_string);
     if (ret) wtx.m_state = TxStateInMempool{};
     return ret;
 }
@@ -2194,12 +2165,12 @@ bool CWallet::SignTransaction(CMutableTransaction& tx) const
     std::map<COutPoint, Coin> coins;
     for (auto& input : tx.vin) {
         const auto mi = mapWallet.find(input.prevout.hash);
-        if(mi == mapWallet.end() || input.prevout.n >= mi->second.tx->vout.size()) {
+        if(mi == mapWallet.end() || input.prevout.n >= mi->second.GetTx()->vout.size()) {
             return false;
         }
         const CWalletTx& wtx = mi->second;
         int prev_height = wtx.state<TxStateConfirmed>() ? wtx.state<TxStateConfirmed>()->confirmed_block_height : 0;
-        coins[input.prevout] = Coin(wtx.tx->vout[input.prevout.n], prev_height, wtx.IsCoinBase());
+        coins[input.prevout] = Coin(wtx.GetTx()->vout[input.prevout.n], prev_height, wtx.IsCoinBase());
     }
     std::map<int, bilingual_str> input_errors;
     return SignTransaction(tx, coins, SIGHASH_DEFAULT, input_errors);
@@ -2227,28 +2198,29 @@ std::optional<PSBTError> CWallet::FillPSBT(PartiallySignedTransaction& psbtx, co
     }
     LOCK(cs_wallet);
     // Get all of the previous transactions
-    for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
-        const CTxIn& txin = psbtx.tx->vin[i];
-        PSBTInput& input = psbtx.inputs.at(i);
-
+    for (PSBTInput& input : psbtx.inputs) {
         if (PSBTInputSigned(input)) {
             continue;
         }
 
         // If we have no utxo, grab it from the wallet.
         if (!input.non_witness_utxo) {
-            const Txid& txhash = txin.prevout.hash;
+            const Txid& txhash = input.prev_txid;
             const auto it = mapWallet.find(txhash);
             if (it != mapWallet.end()) {
                 const CWalletTx& wtx = it->second;
                 // We only need the non_witness_utxo, which is a superset of the witness_utxo.
                 //   The signing code will switch to the smaller witness_utxo if this is ok.
-                input.non_witness_utxo = wtx.tx;
+                input.non_witness_utxo = wtx.GetTx();
             }
         }
     }
 
-    const PrecomputedTransactionData txdata = PrecomputePSBTData(psbtx);
+    std::optional<PrecomputedTransactionData> txdata_res = PrecomputePSBTData(psbtx);
+    if (!txdata_res) {
+        return PSBTError::INVALID_TX;
+    }
+    const PrecomputedTransactionData& txdata = *txdata_res;
 
     // Fill in information from ScriptPubKeyMans
     for (ScriptPubKeyMan* spk_man : GetAllScriptPubKeyMans()) {
@@ -2348,7 +2320,14 @@ OutputType CWallet::TransactionChangeType(const std::optional<OutputType>& chang
     return m_default_address_type;
 }
 
-void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm)
+void CWallet::CommitTransaction(
+    CTransactionRef tx,
+    std::optional<Txid> replaces_txid,
+    std::optional<std::string> comment,
+    std::optional<std::string> comment_to,
+    const std::vector<std::string>& messages,
+    const std::vector<std::string>& payment_requests
+)
 {
     LOCK(cs_wallet);
     WalletLogPrintf("CommitTransaction:\n%s\n", util::RemoveSuffixView(tx->ToString(), "\n"));
@@ -2356,10 +2335,11 @@ void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::ve
     // Add tx to wallet, because if it has change it's also ours,
     // otherwise just for transaction history.
     CWalletTx* wtx = AddToWallet(tx, TxStateInactive{}, [&](CWalletTx& wtx, bool new_tx) {
-        CHECK_NONFATAL(wtx.mapValue.empty());
-        CHECK_NONFATAL(wtx.vOrderForm.empty());
-        wtx.mapValue = std::move(mapValue);
-        wtx.vOrderForm = std::move(orderForm);
+        if (replaces_txid) wtx.m_replaces_txid = replaces_txid;
+        if (comment) wtx.m_comment = comment;
+        if (comment_to) wtx.m_comment_to = comment_to;
+        if (!messages.empty()) wtx.m_messages = messages;
+        if (!payment_requests.empty()) wtx.m_payment_requests = payment_requests;
         return true;
     });
 
@@ -2480,7 +2460,7 @@ util::Result<void> CWallet::RemoveTxs(WalletBatch& batch, std::vector<Txid>& txs
         for (const auto& it : erased_txs) {
             const Txid hash{it->first};
             wtxOrdered.erase(it->second.m_it_wtxOrdered);
-            for (const auto& txin : it->second.tx->vin) {
+            for (const auto& txin : it->second.GetTx()->vin) {
                 auto range = mapTxSpends.equal_range(txin.prevout);
                 for (auto iter = range.first; iter != range.second; ++iter) {
                     if (iter->second == hash) {
@@ -2489,7 +2469,7 @@ util::Result<void> CWallet::RemoveTxs(WalletBatch& batch, std::vector<Txid>& txs
                     }
                 }
             }
-            for (unsigned int i = 0; i < it->second.tx->vout.size(); ++i) {
+            for (unsigned int i = 0; i < it->second.GetTx()->vout.size(); ++i) {
                 m_txos.erase(COutPoint(hash, i));
             }
             mapWallet.erase(it);
@@ -2654,9 +2634,9 @@ void CWallet::MarkDestinationsDirty(const std::set<CTxDestination>& destinations
     for (auto& entry : mapWallet) {
         CWalletTx& wtx = entry.second;
         if (wtx.m_is_cache_empty) continue;
-        for (unsigned int i = 0; i < wtx.tx->vout.size(); i++) {
+        for (unsigned int i = 0; i < wtx.GetTx()->vout.size(); i++) {
             CTxDestination dst;
-            if (ExtractDestination(wtx.tx->vout[i].scriptPubKey, dst) && destinations.contains(dst)) {
+            if (ExtractDestination(wtx.GetTx()->vout[i].scriptPubKey, dst) && destinations.contains(dst)) {
                 wtx.MarkDirty();
                 break;
             }
@@ -2940,19 +2920,36 @@ bool CWallet::EraseAddressReceiveRequest(WalletBatch& batch, const CTxDestinatio
     return true;
 }
 
-static util::Result<fs::path> GetWalletPath(const std::string& name)
+util::Result<fs::path> GetWalletPath(const std::string& name)
 {
+    const fs::path name_path = fs::PathFromString(name);
+
+    // 'name' must be a normalized path, i.e. no . or .. except at the root
+    if (name_path != name_path.lexically_normal()) {
+        return util::Error{Untranslated("Wallet name given as a path must be normalized")};
+    }
+
+    // 'name' cannot begin with ./ or ../
+    if (!name_path.empty() && (*name_path.begin() == fs::PathFromString(".") || *name_path.begin() == fs::PathFromString(".."))) {
+        return util::Error{Untranslated("Wallet name given as a relative path cannot begin with ./ or ../, for wallets not in the walletdir, please use an absolute path.")};
+    }
+
+    // Disallow path at root
+    if (name_path.has_root_path() && name_path.root_path() == name_path) {
+        return util::Error{Untranslated("Wallet name cannot be the root path")};
+    }
+
     // Do some checking on wallet path. It should be either a:
     //
     // 1. Path where a directory can be created.
     // 2. Path to an existing directory.
     // 3. Path to a symlink to a directory.
     // 4. For backwards compatibility, the name of a data file in -walletdir.
-    const fs::path wallet_path = fsbridge::AbsPathJoin(GetWalletDir(), fs::PathFromString(name));
+    const fs::path wallet_path = fsbridge::AbsPathJoin(GetWalletDir(), name_path);
     fs::file_type path_type = fs::symlink_status(wallet_path).type();
     if (!(path_type == fs::file_type::not_found || path_type == fs::file_type::directory ||
           (path_type == fs::file_type::symlink && fs::is_directory(wallet_path)) ||
-          (path_type == fs::file_type::regular && fs::PathFromString(name).filename() == fs::PathFromString(name)))) {
+          (path_type == fs::file_type::regular && name_path.filename() == name_path))) {
         return util::Error{Untranslated(strprintf(
               "Invalid -wallet path '%s'. -wallet path should point to a directory where wallet.dat and "
               "database/log.?????????? files can be stored, a location where such a directory could be created, "
@@ -3086,7 +3083,11 @@ bool CWallet::LoadWalletArgs(std::shared_ptr<CWallet> wallet, const WalletContex
 
     wallet->m_confirm_target = args.GetIntArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
     wallet->m_spend_zero_conf_change = args.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
-    wallet->m_signal_rbf = args.GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);
+    wallet->m_signal_rbf = DEFAULT_WALLET_RBF;
+    if (auto value{args.GetBoolArg("-walletrbf")}) {
+        warnings.push_back(_("-walletrbf is deprecated and will be fully removed in the next release."));
+        wallet->m_signal_rbf = *value;
+    }
 
     wallet->m_keypool_size = std::max(args.GetIntArg("-keypool", DEFAULT_KEYPOOL_SIZE), int64_t{1});
     wallet->m_notify_tx_changed_script = args.GetArg("-walletnotify", "");
@@ -3095,7 +3096,7 @@ bool CWallet::LoadWalletArgs(std::shared_ptr<CWallet> wallet, const WalletContex
     return true;
 }
 
-std::shared_ptr<CWallet> CWallet::CreateNew(WalletContext& context, const std::string& name, std::unique_ptr<WalletDatabase> database, uint64_t wallet_creation_flags, bilingual_str& error, std::vector<bilingual_str>& warnings)
+std::shared_ptr<CWallet> CWallet::CreateNew(WalletContext& context, const std::string& name, std::unique_ptr<WalletDatabase> database, uint64_t wallet_creation_flags, bool born_encrypted, bilingual_str& error, std::vector<bilingual_str>& warnings)
 {
     interfaces::Chain* chain = context.chain;
     const std::string& walletFile = database->Filename();
@@ -3124,8 +3125,9 @@ std::shared_ptr<CWallet> CWallet::CreateNew(WalletContext& context, const std::s
         // Only descriptor wallets can be created
         assert(walletInstance->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
 
-        if ((wallet_creation_flags & WALLET_FLAG_EXTERNAL_SIGNER) || !(wallet_creation_flags & (WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET))) {
-            walletInstance->SetupDescriptorScriptPubKeyMans();
+        // Born encrypted wallets will have their keys generated later
+        if (!born_encrypted) {
+            walletInstance->SetupWalletGeneration();
         }
 
         if (chain) {
@@ -3298,7 +3300,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf
                 error = _("Failed to acquire rescan reserver during wallet initialization");
                 return false;
             }
-            ScanResult scan_res = walletInstance->ScanForWalletTransactions(chain.getBlockHash(rescan_height), rescan_height, /*max_height=*/{}, reserver, /*fUpdate=*/true, /*save_progress=*/true);
+            ScanResult scan_res = walletInstance->ScanForWalletTransactions(chain.getBlockHash(rescan_height), rescan_height, /*max_height=*/{}, reserver, /*save_progress=*/true);
             if (ScanResult::SUCCESS != scan_res.status) {
                 error = _("Failed to rescan the wallet during initialization");
                 return false;
@@ -3534,11 +3536,11 @@ void CWallet::AddScriptPubKeyMan(const uint256& id, std::unique_ptr<ScriptPubKey
 
 LegacyDataSPKM* CWallet::GetOrCreateLegacyDataSPKM()
 {
-    SetupLegacyScriptPubKeyMan();
+    SetupLegacyDataSPKM();
     return GetLegacyDataSPKM();
 }
 
-void CWallet::SetupLegacyScriptPubKeyMan()
+void CWallet::SetupLegacyDataSPKM()
 {
     if (!m_internal_spk_managers.empty() || !m_external_spk_managers.empty() || !m_spk_managers.empty() || IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
         return;
@@ -3586,31 +3588,24 @@ void CWallet::ConnectScriptPubKeyManNotifiers()
     }
 }
 
-DescriptorScriptPubKeyMan& CWallet::LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc)
+void CWallet::LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc, const KeyMap& keys, const CryptedKeyMap& ckeys)
 {
-    DescriptorScriptPubKeyMan* spk_manager;
+    std::unique_ptr<DescriptorScriptPubKeyMan> spk_manager;
     if (IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
-        spk_manager = new ExternalSignerScriptPubKeyMan(*this, desc, m_keypool_size);
+        spk_manager = ExternalSignerScriptPubKeyMan::LoadFromStorage(*this, desc, m_keypool_size, keys, ckeys);
     } else {
-        spk_manager = new DescriptorScriptPubKeyMan(*this, desc, m_keypool_size);
+        spk_manager = DescriptorScriptPubKeyMan::LoadFromStorage(*this, desc, m_keypool_size, keys, ckeys);
     }
-    AddScriptPubKeyMan(id, std::unique_ptr<ScriptPubKeyMan>(spk_manager));
-    return *spk_manager;
+    AddScriptPubKeyMan(id, std::move(spk_manager));
 }
 
 DescriptorScriptPubKeyMan& CWallet::SetupDescriptorScriptPubKeyMan(WalletBatch& batch, const CExtKey& master_key, const OutputType& output_type, bool internal)
 {
     AssertLockHeld(cs_wallet);
-    auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, m_keypool_size));
-    if (HasEncryptionKeys()) {
-        if (IsLocked()) {
-            throw std::runtime_error(std::string(__func__) + ": Wallet is locked, cannot setup new descriptors");
-        }
-        if (!spk_manager->CheckDecryptionKey(vMasterKey) && !spk_manager->Encrypt(vMasterKey, &batch)) {
-            throw std::runtime_error(std::string(__func__) + ": Could not encrypt new descriptors");
-        }
+    if (IsLocked()) {
+        throw std::runtime_error(std::string(__func__) + ": Wallet is locked, cannot setup new descriptors");
     }
-    spk_manager->SetupDescriptorGeneration(batch, master_key, output_type, internal);
+    auto spk_manager = DescriptorScriptPubKeyMan::GenerateNewSingleSig(*this, batch, m_keypool_size, master_key, output_type, internal);
     DescriptorScriptPubKeyMan* out = spk_manager.get();
     uint256 id = spk_manager->GetID();
     AddScriptPubKeyMan(id, std::move(spk_manager));
@@ -3682,8 +3677,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
                     continue;
                 }
                 OutputType t =  *desc->GetOutputType();
-                auto spk_manager = std::unique_ptr<ExternalSignerScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, m_keypool_size));
-                spk_manager->SetupDescriptor(batch, std::move(desc));
+                auto spk_manager = ExternalSignerScriptPubKeyMan::CreateNew(*this, batch, m_keypool_size, std::move(desc));
                 uint256 id = spk_manager->GetID();
                 AddScriptPubKeyMan(id, std::move(spk_manager));
                 AddActiveScriptPubKeyManWithDb(batch, id, t, internal);
@@ -3695,6 +3689,18 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
     }
 }
 
+void CWallet::SetupWalletGeneration()
+{
+    AssertLockHeld(cs_wallet);
+    // Skip setup for non-external-signer wallets that are either blank
+    // or have private keys disabled (not having private keys implies blank).
+    if (!IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER) &&
+        (IsWalletFlagSet(WALLET_FLAG_BLANK_WALLET) || IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS))) {
+        return;
+    }
+    SetupDescriptorScriptPubKeyMans();
+}
+
 void CWallet::AddActiveScriptPubKeyMan(uint256 id, OutputType type, bool internal)
 {
     WalletBatch batch(GetDatabase());
@@ -3789,32 +3795,27 @@ util::Result<std::reference_wrapper<DescriptorScriptPubKeyMan>> CWallet::AddWall
     auto spk_man = GetDescriptorScriptPubKeyMan(desc);
     if (spk_man) {
         WalletLogPrintf("Update existing descriptor: %s\n", desc.descriptor->ToString());
-        if (auto spkm_res = spk_man->UpdateWalletDescriptor(desc); !spkm_res) {
+        if (auto spkm_res = spk_man->UpdateWalletDescriptor(desc, signing_provider); !spkm_res) {
             return util::Error{util::ErrorString(spkm_res)};
         }
     } else {
-        auto new_spk_man = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc, m_keypool_size));
+        auto new_spk_man = DescriptorScriptPubKeyMan::CreateFromImport(*this, desc, m_keypool_size, signing_provider);
         spk_man = new_spk_man.get();
 
         // Save the descriptor to memory
         uint256 id = new_spk_man->GetID();
         AddScriptPubKeyMan(id, std::move(new_spk_man));
-    }
-
-    // Add the private keys to the descriptor
-    for (const auto& entry : signing_provider.keys) {
-        const CKey& key = entry.second;
-        spk_man->AddDescriptorKey(key, key.GetPubKey());
-    }
 
-    // Top up key pool, the manager will generate new scriptPubKeys internally
-    if (!spk_man->TopUp()) {
-        return util::Error{_("Could not top up scriptPubKeys")};
+        // Write the existing cache to disk
+        WalletBatch batch(GetDatabase());
+        if (!batch.WriteDescriptorCacheItems(id, desc.cache)) {
+            return util::Error{_("Unable to write descriptor cache")};
+        }
     }
 
     // Apply the label if necessary
-    // Note: we disable labels for ranged descriptors
-    if (!desc.descriptor->IsRange()) {
+    // Note: we disable labels for descriptors that are ranged or that don't produce output scripts (i.e. unused())
+    if (!desc.descriptor->IsRange() && desc.descriptor->HasScripts()) {
         auto script_pub_keys = spk_man->GetScriptPubKeys();
         if (script_pub_keys.empty()) {
             return util::Error{_("Could not generate scriptPubKeys (cache is empty)")};
@@ -3966,12 +3967,12 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
         AddScriptPubKeyMan(id, std::move(desc_spkm));
     }
 
-    // Remove the LegacyScriptPubKeyMan from disk
+    // Remove the LegacyDataSPKM's records from disk
     if (!legacy_spkm->DeleteRecordsWithDB(local_wallet_batch)) {
         return util::Error{_("Error: cannot remove legacy wallet records")};
     }
 
-    // Remove the LegacyScriptPubKeyMan from memory
+    // Remove the LegacyDataSPKM from memory
     m_spk_managers.erase(legacy_spkm->GetID());
     m_external_spk_managers.clear();
     m_internal_spk_managers.clear();
@@ -3989,10 +3990,9 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
     }
 
     // Get best block locator so that we can copy it to the watchonly and solvables
+    // Note: The best block locator was introduced in #152 so ancient wallets do not have it
     CBlockLocator best_block_locator;
-    if (!local_wallet_batch.ReadBestBlock(best_block_locator)) {
-        return util::Error{_("Error: Unable to read wallet's best block locator record")};
-    }
+    (void)local_wallet_batch.ReadBestBlock(best_block_locator);
 
     // Update m_txos to match the descriptors remaining in this wallet
     m_txos.clear();
@@ -4009,7 +4009,7 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
         LOCK(data.watchonly_wallet->cs_wallet);
         data.watchonly_wallet->nOrderPosNext = nOrderPosNext;
         watchonly_batch->WriteOrderPosNext(data.watchonly_wallet->nOrderPosNext);
-        // Write the best block locator to avoid rescanning on reload
+        // Write the locator record. An empty locator is valid and triggers rescan on load.
         if (!watchonly_batch->WriteBestBlock(best_block_locator)) {
             return util::Error{_("Error: Unable to write watchonly wallet best block locator record")};
         }
@@ -4018,7 +4018,7 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
     if (data.solvable_wallet) {
         solvables_batch = std::make_unique<WalletBatch>(data.solvable_wallet->GetDatabase());
         if (!solvables_batch->TxnBegin()) return util::Error{strprintf(_("Error: database transaction cannot be executed for wallet %s"), data.solvable_wallet->GetName())};
-        // Write the best block locator to avoid rescanning on reload
+        // Write the locator record. An empty locator is valid and triggers rescan on load.
         if (!solvables_batch->WriteBestBlock(best_block_locator)) {
             return util::Error{_("Error: Unable to write solvable wallet best block locator record")};
         }
@@ -4026,19 +4026,16 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
     for (const auto& [_pos, wtx] : wtxOrdered) {
         // Check it is the watchonly wallet's
         // solvable_wallet doesn't need to be checked because transactions for those scripts weren't being watched for
-        bool is_mine = IsMine(*wtx->tx) || IsFromMe(*wtx->tx);
+        bool is_mine = IsMine(*wtx->GetTx()) || IsFromMe(*wtx->GetTx());
         if (data.watchonly_wallet) {
             LOCK(data.watchonly_wallet->cs_wallet);
-            if (data.watchonly_wallet->IsMine(*wtx->tx) || data.watchonly_wallet->IsFromMe(*wtx->tx)) {
+            if (data.watchonly_wallet->IsMine(*wtx->GetTx()) || data.watchonly_wallet->IsFromMe(*wtx->GetTx())) {
                 // Add to watchonly wallet
                 const Txid& hash = wtx->GetHash();
-                const CWalletTx& to_copy_wtx = *wtx;
-                if (!data.watchonly_wallet->LoadToWallet(hash, [&](CWalletTx& ins_wtx, bool new_tx) EXCLUSIVE_LOCKS_REQUIRED(data.watchonly_wallet->cs_wallet) {
-                    if (!new_tx) return false;
-                    ins_wtx.SetTx(to_copy_wtx.tx);
-                    ins_wtx.CopyFrom(to_copy_wtx);
-                    return true;
-                })) {
+                DataStream wtx_ser;
+                wtx_ser << *wtx;
+                CWalletTx copy_wtx(deserialize, wtx_ser, wtx->GetTxs());
+                if (!data.watchonly_wallet->LoadToWallet(std::move(copy_wtx))) {
                     return util::Error{strprintf(_("Error: Could not add watchonly tx %s to watchonly wallet"), wtx->GetHash().GetHex())};
                 }
                 watchonly_batch->WriteTx(data.watchonly_wallet->mapWallet.at(hash));
@@ -4159,7 +4156,7 @@ static std::string MigrationPrefixName(CWallet& wallet)
     return name.empty() ? "default_wallet" : name;
 }
 
-bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error, MigrationResult& res) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
+bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error, MigrationResult& res, const bool load_on_startup = true) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
 {
     AssertLockHeld(wallet.cs_wallet);
 
@@ -4197,7 +4194,7 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
                 return false;
             }
 
-            data->watchonly_wallet = CWallet::CreateNew(empty_context, wallet_name, std::move(database), options.create_flags, error, warnings);
+            data->watchonly_wallet = CWallet::CreateNew(empty_context, wallet_name, std::move(database), options.create_flags, /*born_encrypted=*/false, error, warnings);
             if (!data->watchonly_wallet) {
                 error = _("Error: Failed to create new watchonly wallet");
                 return false;
@@ -4211,8 +4208,9 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
                 FlatSigningProvider keys;
                 std::string parse_err;
                 std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, keys, parse_err, /*require_checksum=*/ true);
-                assert(descs.size() == 1); // It shouldn't be possible to have the LegacyScriptPubKeyMan make an invalid descriptor or a multipath descriptors
-                assert(!descs.at(0)->IsRange()); // It shouldn't be possible to have LegacyScriptPubKeyMan make a ranged watchonly descriptor
+                // LegacyDataSPKM should not produce invalid, multipath, or ranged watch-only descriptors.
+                assert(descs.size() == 1);
+                assert(!descs.at(0)->IsRange());
 
                 // Add to the wallet
                 WalletDescriptor w_desc(std::move(descs.at(0)), creation_time, 0, 0, 0);
@@ -4222,7 +4220,7 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
             }
 
             // Add the wallet to settings
-            UpdateWalletSetting(*context.chain, wallet_name, /*load_on_startup=*/true, warnings);
+            UpdateWalletSetting(*context.chain, wallet_name, load_on_startup, warnings);
         }
         if (data->solvable_descs.size() > 0) {
             wallet.WalletLogPrintf("Making a new watchonly wallet containing the unwatched solvable scripts\n");
@@ -4236,7 +4234,7 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
                 return false;
             }
 
-            data->solvable_wallet = CWallet::CreateNew(empty_context, wallet_name, std::move(database), options.create_flags, error, warnings);
+            data->solvable_wallet = CWallet::CreateNew(empty_context, wallet_name, std::move(database), options.create_flags, /*born_encrypted=*/false, error, warnings);
             if (!data->solvable_wallet) {
                 error = _("Error: Failed to create new watchonly wallet");
                 return false;
@@ -4250,8 +4248,9 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
                 FlatSigningProvider keys;
                 std::string parse_err;
                 std::vector<std::unique_ptr<Descriptor>> descs = Parse(desc_str, keys, parse_err, /*require_checksum=*/ true);
-                assert(descs.size() == 1); // It shouldn't be possible to have the LegacyScriptPubKeyMan make an invalid descriptor or a multipath descriptors
-                assert(!descs.at(0)->IsRange()); // It shouldn't be possible to have LegacyScriptPubKeyMan make a ranged watchonly descriptor
+                // LegacyDataSPKM should not produce invalid, multipath, or ranged watch-only descriptors.
+                assert(descs.size() == 1);
+                assert(!descs.at(0)->IsRange());
 
                 // Add to the wallet
                 WalletDescriptor w_desc(std::move(descs.at(0)), creation_time, 0, 0, 0);
@@ -4261,11 +4260,11 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
             }
 
             // Add the wallet to settings
-            UpdateWalletSetting(*context.chain, wallet_name, /*load_on_startup=*/true, warnings);
+            UpdateWalletSetting(*context.chain, wallet_name, load_on_startup, warnings);
         }
     }
 
-    // Add the descriptors to wallet, remove LegacyScriptPubKeyMan, and cleanup txs and address book data
+    // Add the descriptors to the wallet, remove the LegacyDataSPKM, and clean up transactions and address book data
     return RunWithinTxn(wallet.GetDatabase(), /*process_desc=*/"apply migration process", [&](WalletBatch& batch) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet){
         if (auto res_migration = wallet.ApplyMigrationData(batch, *data); !res_migration) {
             error = util::ErrorString(res_migration);
@@ -4276,7 +4275,7 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
     });
 }
 
-util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context)
+util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context, bool load_wallet)
 {
     std::vector<bilingual_str> warnings;
     bilingual_str error;
@@ -4318,10 +4317,10 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
         return util::Error{Untranslated("Wallet loading failed.") + Untranslated(" ") + error};
     }
 
-    return MigrateLegacyToDescriptor(std::move(local_wallet), passphrase, context);
+    return MigrateLegacyToDescriptor(std::move(local_wallet), passphrase, context, load_wallet);
 }
 
-util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet> local_wallet, const SecureString& passphrase, WalletContext& context)
+util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet> local_wallet, const SecureString& passphrase, WalletContext& context, bool load_wallet)
 {
     MigrationResult res;
     bilingual_str error;
@@ -4387,7 +4386,7 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet>
 
         // Do the migration of keys and scripts for non-empty wallets, and cleanup if it fails
         if (HasLegacyRecords(*local_wallet)) {
-            success = DoMigration(*local_wallet, context, error, res);
+            success = DoMigration(*local_wallet, context, error, res, load_wallet);
             // No scripts mean empty wallet after migration
             empty_local_wallet = local_wallet->GetAllScriptPubKeyMans().empty();
         } else {
@@ -4429,29 +4428,43 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet>
             for (const auto& path_to_remove : paths_to_remove) fs::remove(path_to_remove);
         }
 
-        LogInfo("Loading new wallets after migration...\n");
-        // Migration successful, load all the migrated wallets.
+        if (load_wallet) {
+            LogInfo("Loading new wallets after migration...\n");
+            /** We only override the load_on_startup setting in case the user explicitly said
+             * that he does not want to load the wallet, otherwise keep the old wallet configuration */
+        } else {
+            UpdateWalletSetting(*context.chain, wallet_name, /*load_on_startup=*/false, warnings);
+        }
+        // Migration successful, if load_wallet is set load all the migrated wallets.
+        bool main_wallet_set{false};
         for (std::shared_ptr<CWallet>* wallet_ptr : {&local_wallet, &res.watchonly_wallet, &res.solvables_wallet}) {
             if (success && *wallet_ptr) {
                 std::shared_ptr<CWallet>& wallet = *wallet_ptr;
-                // Track db path and load wallet
+                // Track db path
                 track_for_cleanup(*wallet);
                 assert(wallet.use_count() == 1);
                 std::string wallet_name = wallet->GetName();
                 wallet.reset();
-                wallet = LoadWallet(context, wallet_name, /*load_on_start=*/std::nullopt, options, status, error, warnings);
-                if (!wallet) {
-                    LogError("Failed to load wallet '%s' after migration. Rolling back migration to preserve consistency. "
-                             "Error cause: %s\n", wallet_name, error.original);
-                    success = false;
-                    break;
+                if (load_wallet) {
+                    wallet = LoadWallet(context, wallet_name, /*load_on_start=*/std::nullopt, options, status, error, warnings);
+                    if (!wallet) {
+                        LogError("Failed to load wallet '%s' after migration. Rolling back migration to preserve consistency. "
+                                 "Error cause: %s\n", wallet_name, error.original);
+                        success = false;
+                        break;
+                    }
                 }
-
-                // Set the first successfully loaded wallet as the main one.
+                // Set the first wallet as the main one.
                 // The loop order is intentional and must always start with the local wallet.
-                if (!res.wallet) {
-                    res.wallet_name = wallet->GetName();
-                    res.wallet = std::move(wallet);
+                if (!main_wallet_set) {
+                    res.wallet_name = wallet_name;
+                    if (load_wallet) res.wallet = std::move(wallet);
+                    main_wallet_set = true;
+                }
+                if (wallet_ptr == &res.watchonly_wallet) {
+                    res.watchonly_wallet_name = wallet_name;
+                } else if (wallet_ptr == &res.solvables_wallet) {
+                    res.solvables_wallet_name = wallet_name;
                 }
             }
         }
@@ -4524,25 +4537,27 @@ void CWallet::TopUpCallback(const std::set<CScript>& spks, ScriptPubKeyMan* spkm
     CacheNewScriptPubKeys(spks, spkm);
 }
 
-std::set<CExtPubKey> CWallet::GetActiveHDPubKeys() const
+CWallet::HDPubKeyMap CWallet::GetHDPubKeys(HDKeyFilter filter) const
 {
     AssertLockHeld(cs_wallet);
 
     Assert(IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
 
-    std::set<CExtPubKey> active_xpubs;
-    for (const auto& spkm : GetActiveScriptPubKeyMans()) {
-        const DescriptorScriptPubKeyMan* desc_spkm = dynamic_cast<DescriptorScriptPubKeyMan*>(spkm);
-        assert(desc_spkm);
+    HDPubKeyMap xpubs;
+    for (const auto& spkm : filter == HDKeyFilter::Active ? GetActiveScriptPubKeyMans() : GetAllScriptPubKeyMans()) {
+        auto* desc_spkm = Assert(dynamic_cast<DescriptorScriptPubKeyMan*>(spkm));
         LOCK(desc_spkm->cs_desc_man);
         WalletDescriptor w_desc = desc_spkm->GetWalletDescriptor();
+        if (filter == HDKeyFilter::UnusedKey && w_desc.descriptor->HasScripts()) continue;
 
         std::set<CPubKey> desc_pubkeys;
         std::set<CExtPubKey> desc_xpubs;
         w_desc.descriptor->GetPubKeys(desc_pubkeys, desc_xpubs);
-        active_xpubs.merge(std::move(desc_xpubs));
+        for (const CExtPubKey& xpub : desc_xpubs) {
+            xpubs[xpub].insert(desc_spkm);
+        }
     }
-    return active_xpubs;
+    return xpubs;
 }
 
 std::optional<CKey> CWallet::GetKey(const CKeyID& keyid) const
@@ -4560,6 +4575,14 @@ std::optional<CKey> CWallet::GetKey(const CKeyID& keyid) const
     return std::nullopt;
 }
 
+std::optional<CExtKey> CWallet::GetExtKey(const CExtPubKey& xpub) const
+{
+    if (std::optional<CKey> key = GetKey(xpub.pubkey.GetID())) {
+        return CExtKey{xpub, *key};
+    }
+    return std::nullopt;
+}
+
 void CWallet::WriteBestBlock() const
 {
     AssertLockHeld(cs_wallet);
@@ -4578,8 +4601,8 @@ void CWallet::WriteBestBlock() const
 void CWallet::RefreshTXOsFromTx(const CWalletTx& wtx)
 {
     AssertLockHeld(cs_wallet);
-    for (uint32_t i = 0; i < wtx.tx->vout.size(); ++i) {
-        const CTxOut& txout = wtx.tx->vout.at(i);
+    for (uint32_t i = 0; i < wtx.GetTx()->vout.size(); ++i) {
+        const CTxOut& txout = wtx.GetTx()->vout.at(i);
         if (!IsMine(txout)) continue;
         COutPoint outpoint(wtx.GetHash(), i);
         if (m_txos.contains(outpoint)) {
diff --git a/depend/bitcoin/src/wallet/wallet.h b/depend/bitcoin/src/wallet/wallet.h
index cbf3efc0..61ba2dea 100644
--- a/depend/bitcoin/src/wallet/wallet.h
+++ b/depend/bitcoin/src/wallet/wallet.h
@@ -7,12 +7,10 @@
 #define BITCOIN_WALLET_WALLET_H
 
 #include <addresstype.h>
-#include <btcsignals.h>
 #include <consensus/amount.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
 #include <kernel/cs_main.h>
-#include <logging.h>
 #include <node/types.h>
 #include <outputtype.h>
 #include <policy/feerate.h>
@@ -24,8 +22,11 @@
 #include <sync.h>
 #include <tinyformat.h>
 #include <uint256.h>
+#include <util/btcsignals.h>
+#include <util/expected.h>
 #include <util/fs.h>
 #include <util/hasher.h>
+#include <util/log.h>
 #include <util/result.h>
 #include <util/string.h>
 #include <util/time.h>
@@ -74,7 +75,7 @@ struct CBlockLocator;
 struct CExtKey;
 struct FlatSigningProvider;
 struct KeyOriginInfo;
-struct PartiallySignedTransaction;
+class PartiallySignedTransaction;
 struct SignatureData;
 
 using LoadWalletFn = std::function<void(std::unique_ptr<interfaces::Wallet> wallet)>;
@@ -102,13 +103,13 @@ void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>&
 std::unique_ptr<WalletDatabase> MakeWalletDatabase(const std::string& name, const DatabaseOptions& options, DatabaseStatus& status, bilingual_str& error);
 
 //! -fallbackfee default
-static const CAmount DEFAULT_FALLBACK_FEE = 0;
+inline constexpr CAmount DEFAULT_FALLBACK_FEE = 0;
 //! -discardfee default
-static const CAmount DEFAULT_DISCARD_FEE = 10000;
+inline constexpr CAmount DEFAULT_DISCARD_FEE{10'000};
 //! -mintxfee default
-static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
+inline constexpr CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
 //! -consolidatefeerate default
-static const CAmount DEFAULT_CONSOLIDATE_FEERATE{10000}; // 10 sat/vbyte
+inline constexpr CAmount DEFAULT_CONSOLIDATE_FEERATE{10'000}; // 10 sat/vbyte
 /**
  * maximum fee increase allowed to do partial spend avoidance, even for nodes with this feature disabled by default
  *
@@ -116,37 +117,37 @@ static const CAmount DEFAULT_CONSOLIDATE_FEERATE{10000}; // 10 sat/vbyte
  * A value of 0 (current default) means to attempt to do partial spend avoidance, and use its results if the fees remain *unchanged*
  * A value > 0 means to do partial spend avoidance if the fee difference against a regular coin selection instance is in the range [0..value].
  */
-static const CAmount DEFAULT_MAX_AVOIDPARTIALSPEND_FEE = 0;
+inline constexpr CAmount DEFAULT_MAX_AVOIDPARTIALSPEND_FEE = 0;
 //! discourage APS fee higher than this amount
-constexpr CAmount HIGH_APS_FEE{COIN / 10000};
+inline constexpr CAmount HIGH_APS_FEE{COIN / 10000};
 //! minimum recommended increment for replacement txs
-static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
+inline constexpr CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
 //! Default for -spendzeroconfchange
-static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
+inline constexpr bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 //! Default for -walletrejectlongchains
-static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS{true};
+inline constexpr bool DEFAULT_WALLET_REJECT_LONG_CHAINS{true};
 //! -txconfirmtarget default
-static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
+inline constexpr unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
 //! -walletrbf default
-static const bool DEFAULT_WALLET_RBF = true;
-static const bool DEFAULT_WALLETBROADCAST = true;
-static const bool DEFAULT_DISABLE_WALLET = false;
-static const bool DEFAULT_WALLETCROSSCHAIN = false;
+inline constexpr bool DEFAULT_WALLET_RBF = true;
+inline constexpr bool DEFAULT_WALLETBROADCAST = true;
+inline constexpr bool DEFAULT_DISABLE_WALLET = false;
+inline constexpr bool DEFAULT_WALLETCROSSCHAIN = false;
 //! -maxtxfee default
-constexpr CAmount DEFAULT_TRANSACTION_MAXFEE{COIN / 10};
+inline constexpr CAmount DEFAULT_TRANSACTION_MAXFEE{COIN / 10};
 //! Discourage users to set fees higher than this amount (in satoshis) per kB
-constexpr CAmount HIGH_TX_FEE_PER_KB{COIN / 100};
+inline constexpr CAmount HIGH_TX_FEE_PER_KB{COIN / 100};
 //! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
-constexpr CAmount HIGH_MAX_TX_FEE{100 * HIGH_TX_FEE_PER_KB};
+inline constexpr CAmount HIGH_MAX_TX_FEE{100 * HIGH_TX_FEE_PER_KB};
 //! Pre-calculated constants for input size estimation in *virtual size*
-static constexpr size_t DUMMY_NESTED_P2WPKH_INPUT_SIZE = 91;
+inline constexpr size_t DUMMY_NESTED_P2WPKH_INPUT_SIZE = 91;
 
 class CCoinControl;
 
 //! Default for -addresstype
-constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::BECH32};
+inline constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::BECH32};
 
-static constexpr uint64_t KNOWN_WALLET_FLAGS =
+inline constexpr uint64_t KNOWN_WALLET_FLAGS =
         WALLET_FLAG_AVOID_REUSE
     |   WALLET_FLAG_BLANK_WALLET
     |   WALLET_FLAG_KEY_ORIGIN_METADATA
@@ -155,10 +156,10 @@ static constexpr uint64_t KNOWN_WALLET_FLAGS =
     |   WALLET_FLAG_DESCRIPTORS
     |   WALLET_FLAG_EXTERNAL_SIGNER;
 
-static constexpr uint64_t MUTABLE_WALLET_FLAGS =
+inline constexpr uint64_t MUTABLE_WALLET_FLAGS =
         WALLET_FLAG_AVOID_REUSE;
 
-static const std::map<WalletFlags, std::string> WALLET_FLAG_TO_STRING{
+inline const std::map<WalletFlags, std::string> WALLET_FLAG_TO_STRING{
     {WALLET_FLAG_AVOID_REUSE, "avoid_reuse"},
     {WALLET_FLAG_BLANK_WALLET, "blank"},
     {WALLET_FLAG_KEY_ORIGIN_METADATA, "key_origin_metadata"},
@@ -168,7 +169,7 @@ static const std::map<WalletFlags, std::string> WALLET_FLAG_TO_STRING{
     {WALLET_FLAG_EXTERNAL_SIGNER, "external_signer"}
 };
 
-static const std::map<std::string, WalletFlags> STRING_TO_WALLET_FLAG{
+inline const std::map<std::string, WalletFlags> STRING_TO_WALLET_FLAG{
     {WALLET_FLAG_TO_STRING.at(WALLET_FLAG_AVOID_REUSE), WALLET_FLAG_AVOID_REUSE},
     {WALLET_FLAG_TO_STRING.at(WALLET_FLAG_BLANK_WALLET), WALLET_FLAG_BLANK_WALLET},
     {WALLET_FLAG_TO_STRING.at(WALLET_FLAG_KEY_ORIGIN_METADATA), WALLET_FLAG_KEY_ORIGIN_METADATA},
@@ -347,7 +348,6 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * block_hash.IsNull(), then wallet state is not updated in AddToWallet, but
      * notifications happen and cached balances are marked dirty.
      *
-     * If fUpdate is true, existing transactions will be updated.
      * TODO: One exception to this is that the abandoned state is cleared under the
      * assumption that any further notification of a transaction that was considered
      * abandoned is an indication that it is not safe to be considered abandoned.
@@ -357,7 +357,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * Should be called with rescanning_old_block set to true, if the transaction is
      * not discovered in real time, but during a rescan of old blocks.
      */
-    bool AddToWalletIfInvolvingMe(const CTransactionRef& tx, const SyncTxState& state, bool fUpdate, bool rescanning_old_block) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    bool AddToWalletIfInvolvingMe(const CTransactionRef& tx, const SyncTxState& state, bool rescanning_old_block) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     /** Mark a transaction (and its in-wallet descendants) as conflicting with a particular block. */
     void MarkConflicted(const uint256& hashBlock, int conflicting_height, const Txid& hashTx);
@@ -375,7 +375,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
 
     void SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator>) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
-    bool SyncTransaction(const CTransactionRef& tx, const SyncTxState& state, bool update_tx = true, bool rescanning_old_block = false) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    bool SyncTransaction(const CTransactionRef& tx, const SyncTxState& state, bool rescanning_old_block = false) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     /** WalletFlags set on this wallet. */
     std::atomic<uint64_t> m_wallet_flags{0};
@@ -630,12 +630,12 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * @return the recently added wtx pointer or nullptr if there was a db write error.
      */
     CWalletTx* AddToWallet(CTransactionRef tx, const TxState& state, const UpdateWalletTxFn& update_wtx=nullptr, bool rescanning_old_block = false);
-    bool LoadToWallet(const Txid& hash, const UpdateWalletTxFn& fill_wtx) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    bool LoadToWallet(CWalletTx&& wtx) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     void transactionAddedToMempool(const CTransactionRef& tx) override;
     void blockConnected(const kernel::ChainstateRole& role, const interfaces::BlockInfo& block) override;
     void blockDisconnected(const interfaces::BlockInfo& block) override;
     void updatedBlockTip() override;
-    int64_t RescanFromTime(int64_t startTime, const WalletRescanReserver& reserver, bool update);
+    int64_t RescanFromTime(int64_t startTime, const WalletRescanReserver& reserver);
 
     struct ScanResult {
         enum { SUCCESS, FAILURE, USER_ABORT } status = SUCCESS;
@@ -652,7 +652,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
         //! USER_ABORT.
         uint256 last_failed_block;
     };
-    ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, bool fUpdate, bool save_progress);
+    ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, bool save_progress);
     void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) override;
     /** Set the next time this wallet should resend transactions to 12-36 hours from now, ~1 day on average. */
     void SetNextResend() { m_next_resend = GetDefaultNextResend(); }
@@ -691,10 +691,19 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * broadcasting the transaction.
      *
      * @param[in] tx The transaction to be broadcast.
-     * @param[in] mapValue key-values to be set on the transaction.
-     * @param[in] orderForm BIP 70 / BIP 21 order form details to be set on the transaction.
+     * @param[in] replaces_txid The txid of the transaction that this transaction replaces
+     * @param[in] comment The user's comment for this transaction
+     * @param[in] comment_to The comment for this transaction indicating where coins are sent to
+     * @param[in] messages The BIP 21 URI messages to attach to this transaction
      */
-    void CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm);
+    void CommitTransaction(
+        CTransactionRef tx,
+        std::optional<Txid> replaces_txid = std::nullopt,
+        std::optional<std::string> comment = std::nullopt,
+        std::optional<std::string> comment_to = std::nullopt,
+        const std::vector<std::string>& messages = {},
+        const std::vector<std::string>& payment_requests = {}
+    );
 
     /** Pass this transaction to node for optional mempool insertion and relay to peers. */
     bool SubmitTxMemoryPoolAndRelay(CWalletTx& wtx, std::string& err_string, node::TxBroadcast broadcast_method) const
@@ -871,7 +880,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     static bool LoadWalletArgs(std::shared_ptr<CWallet> wallet, const WalletContext& context, bilingual_str& error, std::vector<bilingual_str>& warnings);
 
     /* Initializes, creates and returns a new CWallet; returns a null pointer in case of an error */
-    static std::shared_ptr<CWallet> CreateNew(WalletContext& context, const std::string& name, std::unique_ptr<WalletDatabase> database, uint64_t wallet_creation_flags, bilingual_str& error, std::vector<bilingual_str>& warnings);
+    static std::shared_ptr<CWallet> CreateNew(WalletContext& context, const std::string& name, std::unique_ptr<WalletDatabase> database, uint64_t wallet_creation_flags, bool born_encrypted, bilingual_str& error, std::vector<bilingual_str>& warnings);
 
     /* Initializes, loads, and returns a CWallet from an existing wallet; returns a null pointer in case of an error */
     static std::shared_ptr<CWallet> LoadExisting(WalletContext& context, const std::string& name, std::unique_ptr<WalletDatabase> database, bilingual_str& error, std::vector<bilingual_str>& warnings);
@@ -882,7 +891,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      */
     void postInitProcess();
 
-    bool BackupWallet(const std::string& strDest) const;
+    [[nodiscard]] bool BackupWallet(const std::string& strDest) const;
 
     /* Returns true if HD is enabled */
     bool IsHDEnabled() const;
@@ -970,12 +979,12 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     //! Get the wallet descriptors for a script.
     std::vector<WalletDescriptor> GetWalletDescriptors(const CScript& script) const;
 
-    //! Get the LegacyScriptPubKeyMan which is used for all types, internal, and external.
+    //! Get the LegacyDataSPKM used for all legacy output types and both internal and external chains.
     LegacyDataSPKM* GetLegacyDataSPKM() const;
     LegacyDataSPKM* GetOrCreateLegacyDataSPKM();
 
-    //! Make a Legacy(Data)SPKM and set it for all types, internal, and external.
-    void SetupLegacyScriptPubKeyMan();
+    //! Create a LegacyDataSPKM and set it for all legacy output types and both internal and external chains.
+    void SetupLegacyDataSPKM();
 
     bool WithEncryptionKey(std::function<bool (const CKeyingMaterial&)> cb) const override;
 
@@ -1004,7 +1013,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     void ConnectScriptPubKeyManNotifiers();
 
     //! Instantiate a descriptor ScriptPubKeyMan from the WalletDescriptor and load it
-    DescriptorScriptPubKeyMan& LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc);
+    void LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc, const KeyMap& keys, const CryptedKeyMap& ckeys);
 
     //! Adds the active ScriptPubKeyMan for the specified type and internal. Writes it to the wallet file
     //! @param[in] id The unique id for the ScriptPubKeyMan
@@ -1033,6 +1042,9 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     //! Create new seed and default DescriptorScriptPubKeyMans for this wallet
     void SetupOwnDescriptorScriptPubKeyMans(WalletBatch& batch) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
+    //! Setup new descriptors or seed for new address generation
+    void SetupWalletGeneration() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+
     //! Return the DescriptorScriptPubKeyMan for a WalletDescriptor if it is already in the wallet
     DescriptorScriptPubKeyMan* GetDescriptorScriptPubKeyMan(const WalletDescriptor& desc) const;
 
@@ -1054,8 +1066,8 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     //! Get all of the descriptors from a legacy wallet
     std::optional<MigrationData> GetDescriptorsForLegacy(bilingual_str& error) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
-    //! Adds the ScriptPubKeyMans given in MigrationData to this wallet, removes LegacyScriptPubKeyMan,
-    //! and where needed, moves tx and address book entries to watchonly_wallet or solvable_wallet
+    //! Adds the ScriptPubKeyMans from MigrationData to this wallet, removes the LegacyDataSPKM,
+    //! and moves transaction and address book entries to watchonly_wallet or solvable_wallet as needed.
     util::Result<void> ApplyMigrationData(WalletBatch& local_wallet_batch, MigrationData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     //! Whether the (external) signer performs R-value signature grinding
@@ -1066,13 +1078,24 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
 
     void TopUpCallback(const std::set<CScript>& spks, ScriptPubKeyMan* spkm) override;
 
-    //! Retrieve the xpubs in use by the active descriptors
-    std::set<CExtPubKey> GetActiveHDPubKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    //! Which descriptors GetHDPubKeys() should consider.
+    enum class HDKeyFilter {
+        Active,    //!< Only active descriptors
+        All,       //!< All descriptors
+        UnusedKey, //!< Only unused(KEY) descriptors
+    };
+    using HDPubKeyMap = std::map<CExtPubKey, std::set<DescriptorScriptPubKeyMan*>>;
+    //! Retrieve descriptor xpubs matching the requested filter.
+    HDPubKeyMap GetHDPubKeys(HDKeyFilter filter) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     //! Find the private key for the given key id from the wallet's descriptors, if available
     //! Returns nullopt when no descriptor has the key or if the wallet is locked.
     std::optional<CKey> GetKey(const CKeyID& keyid) const;
 
+    //! Reconstruct the extended private key for an HD xpub. Returns nullopt when
+    //! no descriptor has the private key, or the wallet is locked.
+    std::optional<CExtKey> GetExtKey(const CExtPubKey& xpub) const;
+
     //! Disconnect chain notifications and wait for all notifications to be processed
     void DisconnectChainNotifications();
 };
@@ -1101,6 +1124,10 @@ class WalletRescanReserver
         if (m_wallet.fScanningWallet.exchange(true)) {
             return false;
         }
+        // Discard any abort request left over from previous reservation, so
+        // that an abort requested while the reservation is held always applies
+        // to abort this rescan, even if it arrives before the scan loop starts.
+        m_wallet.fAbortRescan = false;
         m_wallet.m_scanning_with_passphrase.exchange(with_passphrase);
         m_wallet.m_scanning_start = SteadyClock::now();
         m_wallet.m_scanning_progress = 0;
@@ -1134,6 +1161,8 @@ bool RemoveWalletSetting(interfaces::Chain& chain, const std::string& wallet_nam
 
 struct MigrationResult {
     std::string wallet_name;
+    std::optional<std::string> watchonly_wallet_name;
+    std::optional<std::string> solvables_wallet_name;
     std::shared_ptr<CWallet> wallet;
     std::shared_ptr<CWallet> watchonly_wallet;
     std::shared_ptr<CWallet> solvables_wallet;
@@ -1141,9 +1170,12 @@ struct MigrationResult {
 };
 
 //! Do all steps to migrate a legacy wallet to a descriptor wallet
-[[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context);
+[[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context, bool load_wallet = true);
 //! Requirement: The wallet provided to this function must be isolated, with no attachment to the node's context.
-[[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet> local_wallet, const SecureString& passphrase, WalletContext& context);
+[[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet> local_wallet, const SecureString& passphrase, WalletContext& context, bool load_wallet = true);
+
+//! Determine the path that the wallet is stored in
+util::Result<fs::path> GetWalletPath(const std::string& name);
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_WALLET_H
diff --git a/depend/bitcoin/src/wallet/walletdb.cpp b/depend/bitcoin/src/wallet/walletdb.cpp
index c8b7ae53..0fdb09fa 100644
--- a/depend/bitcoin/src/wallet/walletdb.cpp
+++ b/depend/bitcoin/src/wallet/walletdb.cpp
@@ -52,6 +52,7 @@ const std::string POOL{"pool"};
 const std::string PURPOSE{"purpose"};
 const std::string SETTINGS{"settings"};
 const std::string TX{"tx"};
+const std::string WTX_VARIANT{"wtxvariant"};
 const std::string VERSION{"version"};
 const std::string WALLETDESCRIPTOR{"walletdescriptor"};
 const std::string WALLETDESCRIPTORCACHE{"walletdescriptorcache"};
@@ -97,12 +98,24 @@ bool WalletBatch::ErasePurpose(const std::string& strAddress)
 
 bool WalletBatch::WriteTx(const CWalletTx& wtx)
 {
-    return WriteIC(std::make_pair(DBKeys::TX, wtx.GetHash()), wtx);
+    const Txid txid = wtx.GetHash();
+    // Persist all witness variants. Including the canonical one
+    for (const auto& [wtxid, tx] : wtx.GetTxs()) {
+        if (!WriteWtxVariant(txid, tx)) return false;
+    }
+    return WriteIC(std::make_pair(DBKeys::TX, txid), wtx);
 }
 
 bool WalletBatch::EraseTx(Txid hash)
 {
-    return EraseIC(std::make_pair(DBKeys::TX, hash.ToUint256()));
+    if (!EraseIC(std::make_pair(DBKeys::TX, hash.ToUint256()))) return false;
+    // Drop all witness variant records too, so none are left dangling
+    return m_batch->ErasePrefix(DataStream() << DBKeys::WTX_VARIANT << hash);
+}
+
+bool WalletBatch::WriteWtxVariant(const Txid& txid, const CTransactionRef& tx)
+{
+    return WriteIC(std::make_pair(DBKeys::WTX_VARIANT, std::make_pair(txid, tx->GetWitnessHash())), TX_WITH_WITNESS(tx));
 }
 
 bool WalletBatch::WriteKeyMetadata(const CKeyMetadata& meta, const CPubKey& pubkey, const bool overwrite)
@@ -166,14 +179,6 @@ bool WalletBatch::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMet
     return WriteIC(std::make_pair(DBKeys::WATCHS, dest), uint8_t{'1'});
 }
 
-bool WalletBatch::EraseWatchOnly(const CScript &dest)
-{
-    if (!EraseIC(std::make_pair(DBKeys::WATCHMETA, dest))) {
-        return false;
-    }
-    return EraseIC(std::make_pair(DBKeys::WATCHS, dest));
-}
-
 bool WalletBatch::WriteBestBlock(const CBlockLocator& locator)
 {
     WriteIC(DBKeys::BESTBLOCK, CBlockLocator()); // Write empty block locator so versions that require a merkle branch automatically rescan
@@ -667,7 +672,7 @@ static DBErrors LoadLegacyWalletRecords(CWallet* pwallet, DatabaseBatch& batch,
                 }
             }
         } else {
-            pwallet->WalletLogPrintf("Inactive HD Chains found but no Legacy ScriptPubKeyMan\n");
+            pwallet->WalletLogPrintf("Inactive HD chains found but no LegacyDataSPKM\n");
             result = DBErrors::CORRUPT;
         }
     }
@@ -771,10 +776,8 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
             strErr = strprintf("%s\nDetails: %s", strErr, e.what());
             return DBErrors::UNKNOWN_DESCRIPTOR;
         }
-        DescriptorScriptPubKeyMan& spkm = pwallet->LoadDescriptorScriptPubKeyMan(id, desc);
 
-        // Prior to doing anything with this spkm, verify ID compatibility
-        if (id != spkm.GetID()) {
+        if (id != desc.id) {
             strErr = "The descriptor ID calculated by the wallet differs from the one in DB";
             return DBErrors::CORRUPT;
         }
@@ -833,15 +836,14 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
         });
         result = std::max(result, lh_cache_res.m_result);
 
-        // Set the cache for this descriptor
-        auto spk_man = (DescriptorScriptPubKeyMan*)pwallet->GetScriptPubKeyMan(id);
-        assert(spk_man);
-        spk_man->SetCache(cache);
+        // Set the cache to the WalletDescriptor
+        desc.cache = cache;
 
         // Get unencrypted keys
+        KeyMap keys;
         prefix = PrefixStream(DBKeys::WALLETDESCRIPTORKEY, id);
         LoadResult key_res = LoadRecords(pwallet, batch, DBKeys::WALLETDESCRIPTORKEY, prefix,
-            [&id, &spk_man] (CWallet* pwallet, DataStream& key, DataStream& value, std::string& strErr) {
+            [&id, &keys] (CWallet* pwallet, DataStream& key, DataStream& value, std::string& strErr) {
             uint256 desc_id;
             CPubKey pubkey;
             key >> desc_id;
@@ -873,16 +875,17 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
                 strErr = "Error reading wallet database: descriptor unencrypted key CPrivKey corrupt";
                 return DBErrors::CORRUPT;
             }
-            spk_man->AddKey(pubkey.GetID(), privkey);
+            keys[pubkey.GetID()] = privkey;
             return DBErrors::LOAD_OK;
         });
         result = std::max(result, key_res.m_result);
         num_keys = key_res.m_records;
 
         // Get encrypted keys
+        CryptedKeyMap ckeys;
         prefix = PrefixStream(DBKeys::WALLETDESCRIPTORCKEY, id);
         LoadResult ckey_res = LoadRecords(pwallet, batch, DBKeys::WALLETDESCRIPTORCKEY, prefix,
-            [&id, &spk_man] (CWallet* pwallet, DataStream& key, DataStream& value, std::string& err) {
+            [&id, &ckeys] (CWallet* pwallet, DataStream& key, DataStream& value, std::string& err) {
             uint256 desc_id;
             CPubKey pubkey;
             key >> desc_id;
@@ -896,12 +899,19 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
             std::vector<unsigned char> privkey;
             value >> privkey;
 
-            spk_man->AddCryptedKey(pubkey.GetID(), pubkey, privkey);
+            ckeys[pubkey.GetID()] = std::make_pair(pubkey, privkey);
             return DBErrors::LOAD_OK;
         });
         result = std::max(result, ckey_res.m_result);
         num_ckeys = ckey_res.m_records;
 
+        try {
+            pwallet->LoadDescriptorScriptPubKeyMan(id, desc, keys, ckeys);
+        } catch (std::runtime_error& e) {
+            strErr = e.what();
+            return DBErrors::CORRUPT;
+        }
+
         return result;
     });
 
@@ -975,6 +985,37 @@ static DBErrors LoadAddressBookRecords(CWallet* pwallet, DatabaseBatch& batch) E
     return result;
 }
 
+static std::map<Wtxid, CTransactionRef> ReadWtxVariants(DatabaseBatch& batch, const Txid& txid)
+{
+    std::map<Wtxid, CTransactionRef> variants;
+
+    DataStream prefix;
+    prefix << DBKeys::WTX_VARIANT << txid;
+    std::unique_ptr<DatabaseCursor> cursor = batch.GetNewPrefixCursor(prefix);
+    if (!cursor) {
+        throw std::runtime_error(strprintf("Error getting database cursor for '%s' records", DBKeys::WTX_VARIANT));
+    }
+
+    DataStream key;
+    DataStream value;
+    while (true) {
+        DatabaseCursor::Status status = cursor->Next(key, value);
+        if (status == DatabaseCursor::Status::DONE) break;
+        if (status == DatabaseCursor::Status::FAIL) {
+            throw std::runtime_error(strprintf("Error reading '%s' record", DBKeys::WTX_VARIANT));
+        }
+        CTransactionRef tx;
+        value >> TX_WITH_WITNESS(tx);
+        if (tx->GetHash() != txid) {
+            throw std::runtime_error(strprintf("Corrupted witness variant, tx hash differs"));
+        }
+        if (!variants.emplace(tx->GetWitnessHash(), std::move(tx)).second) {
+            throw std::runtime_error(strprintf("Duplicate witness variant"));
+        }
+    }
+    return variants;
+}
+
 static DBErrors LoadTxRecords(CWallet* pwallet, DatabaseBatch& batch, bool& any_unordered) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)
 {
     AssertLockHeld(pwallet->cs_wallet);
@@ -983,31 +1024,27 @@ static DBErrors LoadTxRecords(CWallet* pwallet, DatabaseBatch& batch, bool& any_
     // Load tx record
     any_unordered = false;
     LoadResult tx_res = LoadRecords(pwallet, batch, DBKeys::TX,
-        [&any_unordered] (CWallet* pwallet, DataStream& key, DataStream& value, std::string& err) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet) {
+        [&any_unordered, &batch] (CWallet* pwallet, DataStream& key, DataStream& value, std::string& err) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet) {
         DBErrors result = DBErrors::LOAD_OK;
         Txid hash;
         key >> hash;
-        // LoadToWallet call below creates a new CWalletTx that fill_wtx
-        // callback fills with transaction metadata.
-        auto fill_wtx = [&](CWalletTx& wtx, bool new_tx) {
-            if(!new_tx) {
-                // There's some corruption here since the tx we just tried to load was already in the wallet.
-                err = "Error: Corrupt transaction found. This can be fixed by removing transactions from wallet and rescanning.";
-                result = DBErrors::CORRUPT;
-                return false;
+        try {
+            CWalletTx wtx{deserialize, value, ReadWtxVariants(batch, hash)};
+            if (wtx.GetHash() != hash) {
+                result = std::max(result, DBErrors::NEED_RESCAN);
             }
-            value >> wtx;
-            if (wtx.GetHash() != hash)
-                return false;
 
-            if (wtx.nOrderPos == -1)
+            if (wtx.nOrderPos == -1) {
                 any_unordered = true;
+            }
 
-            return true;
-        };
-        if (!pwallet->LoadToWallet(hash, fill_wtx)) {
-            // Use std::max as fill_wtx may have already set result to CORRUPT
-            result = std::max(result, DBErrors::NEED_RESCAN);
+            if (!pwallet->LoadToWallet(std::move(wtx))) {
+                err = "Error: Corrupt transaction found. This can be fixed by removing transactions from wallet and rescanning.";
+                return DBErrors::CORRUPT;
+            }
+        } catch (const std::exception& e) {
+            err = strprintf("Error: Corrupt tx record found: %s" ,e.what());
+            return DBErrors::CORRUPT;
         }
         return result;
     });
diff --git a/depend/bitcoin/src/wallet/walletdb.h b/depend/bitcoin/src/wallet/walletdb.h
index 455fc745..275d9ce7 100644
--- a/depend/bitcoin/src/wallet/walletdb.h
+++ b/depend/bitcoin/src/wallet/walletdb.h
@@ -7,6 +7,7 @@
 #define BITCOIN_WALLET_WALLETDB_H
 
 #include <key.h>
+#include <primitives/transaction.h>
 #include <primitives/transaction_identifier.h>
 #include <script/sign.h>
 #include <wallet/db.h>
@@ -14,6 +15,7 @@
 
 #include <cstdint>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 class CScript;
@@ -78,6 +80,7 @@ extern const std::string POOL;
 extern const std::string PURPOSE;
 extern const std::string SETTINGS;
 extern const std::string TX;
+extern const std::string WTX_VARIANT;
 extern const std::string VERSION;
 extern const std::string WALLETDESCRIPTOR;
 extern const std::string WALLETDESCRIPTORCKEY;
@@ -85,7 +88,7 @@ extern const std::string WALLETDESCRIPTORKEY;
 extern const std::string WATCHMETA;
 extern const std::string WATCHS;
 
-// Keys in this set pertain only to the legacy wallet (LegacyScriptPubKeyMan) and are removed during migration from legacy to descriptors.
+// Keys in this set pertain only to legacy wallets and are removed during migration to descriptors.
 extern const std::unordered_set<std::string> LEGACY_TYPES;
 } // namespace DBKeys
 
@@ -99,9 +102,9 @@ class CHDChain
     int64_t m_next_external_index{0}; // Next index in the keypool to be used. Memory only.
     int64_t m_next_internal_index{0}; // Next index in the keypool to be used. Memory only.
 
-    static const int VERSION_HD_BASE        = 1;
-    static const int VERSION_HD_CHAIN_SPLIT = 2;
-    static const int CURRENT_VERSION        = VERSION_HD_CHAIN_SPLIT;
+    static constexpr int VERSION_HD_BASE{1};
+    static constexpr int VERSION_HD_CHAIN_SPLIT{2};
+    static constexpr int CURRENT_VERSION{VERSION_HD_CHAIN_SPLIT};
     int nVersion;
 
     CHDChain() { SetNull(); }
@@ -126,15 +129,19 @@ class CHDChain
     {
         return seed_id == chain.seed_id;
     }
+    bool operator<(const CHDChain& chain) const
+    {
+        return seed_id < chain.seed_id;
+    }
 };
 
 class CKeyMetadata
 {
 public:
-    static const int VERSION_BASIC=1;
-    static const int VERSION_WITH_HDDATA=10;
-    static const int VERSION_WITH_KEY_ORIGIN = 12;
-    static const int CURRENT_VERSION=VERSION_WITH_KEY_ORIGIN;
+    static constexpr int VERSION_BASIC{1};
+    static constexpr int VERSION_WITH_HDDATA{10};
+    static constexpr int VERSION_WITH_KEY_ORIGIN{12};
+    static constexpr int CURRENT_VERSION{VERSION_WITH_KEY_ORIGIN};
     int nVersion;
     int64_t nCreateTime; // 0 means unknown
     std::string hdKeypath; //optional HD/bip32 keypath. Still used to determine whether a key is a seed. Also kept for backwards compatibility
@@ -225,6 +232,7 @@ class WalletBatch
 
     bool WriteTx(const CWalletTx& wtx);
     bool EraseTx(Txid hash);
+    bool WriteWtxVariant(const Txid& txid, const CTransactionRef& tx);
 
     bool WriteKeyMetadata(const CKeyMetadata& meta, const CPubKey& pubkey, bool overwrite);
     bool WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata &keyMeta);
@@ -233,7 +241,6 @@ class WalletBatch
     bool EraseMasterKey(unsigned int id);
 
     bool WriteWatchOnly(const CScript &script, const CKeyMetadata &keymeta);
-    bool EraseWatchOnly(const CScript &script);
 
     bool WriteBestBlock(const CBlockLocator& locator);
     bool ReadBestBlock(CBlockLocator& locator);
diff --git a/depend/bitcoin/src/wallet/wallettool.cpp b/depend/bitcoin/src/wallet/wallettool.cpp
index 7c24c0e1..336bc45c 100644
--- a/depend/bitcoin/src/wallet/wallettool.cpp
+++ b/depend/bitcoin/src/wallet/wallettool.cpp
@@ -93,16 +93,24 @@ static void WalletShowInfo(CWallet* wallet_instance)
 
 bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command)
 {
-    if (args.IsArgSet("-dumpfile") && command != "dump" && command != "createfromdump") {
-        tfm::format(std::cerr, "The -dumpfile option can only be used with the \"dump\" and \"createfromdump\" commands.\n");
-        return false;
+    {
+        std::vector<std::string> details;
+        if (!args.CheckCommandOptions(command, &details)) {
+            tfm::format(std::cerr, "Error: Invalid arguments provided:\n%s\n", util::MakeUnorderedList(details));
+            return false;
+        }
     }
     if ((command == "create" || command == "createfromdump") && !args.IsArgSet("-wallet")) {
         tfm::format(std::cerr, "Wallet name must be provided when creating a new wallet.\n");
         return false;
     }
     const std::string name = args.GetArg("-wallet", "");
-    const fs::path path = fsbridge::AbsPathJoin(GetWalletDir(), fs::PathFromString(name));
+    util::Result<fs::path> path_res = GetWalletPath(name);
+    if (!path_res) {
+        tfm::format(std::cerr, "%s\n", util::ErrorString(path_res).original);
+        return false;
+    }
+    const fs::path& path = *path_res;
 
     if (command == "create") {
         if (name.empty()) {
diff --git a/depend/bitcoin/src/wallet/walletutil.cpp b/depend/bitcoin/src/wallet/walletutil.cpp
index 93d4b1ac..85249f63 100644
--- a/depend/bitcoin/src/wallet/walletutil.cpp
+++ b/depend/bitcoin/src/wallet/walletutil.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <common/args.h>
 #include <key_io.h>
-#include <logging.h>
+#include <util/log.h>
 
 namespace wallet {
 fs::path GetWalletDir()
diff --git a/depend/bitcoin/src/zmq/zmqabstractnotifier.cpp b/depend/bitcoin/src/zmq/zmqabstractnotifier.cpp
index 081a2a2c..77bb8a7a 100644
--- a/depend/bitcoin/src/zmq/zmqabstractnotifier.cpp
+++ b/depend/bitcoin/src/zmq/zmqabstractnotifier.cpp
@@ -6,8 +6,6 @@
 
 #include <cassert>
 
-const int CZMQAbstractNotifier::DEFAULT_ZMQ_SNDHWM;
-
 CZMQAbstractNotifier::~CZMQAbstractNotifier()
 {
     assert(!psocket);
diff --git a/depend/bitcoin/src/zmq/zmqabstractnotifier.h b/depend/bitcoin/src/zmq/zmqabstractnotifier.h
index 77d478a1..686a46a1 100644
--- a/depend/bitcoin/src/zmq/zmqabstractnotifier.h
+++ b/depend/bitcoin/src/zmq/zmqabstractnotifier.h
@@ -19,7 +19,7 @@ using CZMQNotifierFactory = std::function<std::unique_ptr<CZMQAbstractNotifier>(
 class CZMQAbstractNotifier
 {
 public:
-    static const int DEFAULT_ZMQ_SNDHWM {1000};
+    static constexpr int DEFAULT_ZMQ_SNDHWM {1000};
 
     virtual ~CZMQAbstractNotifier();
 
diff --git a/depend/bitcoin/src/zmq/zmqnotificationinterface.cpp b/depend/bitcoin/src/zmq/zmqnotificationinterface.cpp
index 9efb3eb7..8bfeba0d 100644
--- a/depend/bitcoin/src/zmq/zmqnotificationinterface.cpp
+++ b/depend/bitcoin/src/zmq/zmqnotificationinterface.cpp
@@ -7,11 +7,11 @@
 #include <common/args.h>
 #include <kernel/mempool_entry.h>
 #include <kernel/types.h>
-#include <logging.h>
 #include <netbase.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <zmq/zmqabstractnotifier.h>
 #include <zmq/zmqpublishnotifier.h>
 #include <zmq/zmqutil.h>
diff --git a/depend/bitcoin/src/zmq/zmqpublishnotifier.cpp b/depend/bitcoin/src/zmq/zmqpublishnotifier.cpp
index 61b65a13..07763a07 100644
--- a/depend/bitcoin/src/zmq/zmqpublishnotifier.cpp
+++ b/depend/bitcoin/src/zmq/zmqpublishnotifier.cpp
@@ -6,7 +6,6 @@
 
 #include <chain.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <primitives/transaction.h>
@@ -14,6 +13,7 @@
 #include <streams.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <zmq/zmqutil.h>
 
 #include <zmq.h>
diff --git a/depend/bitcoin/src/zmq/zmqutil.cpp b/depend/bitcoin/src/zmq/zmqutil.cpp
index 7f28f5e5..5e334c03 100644
--- a/depend/bitcoin/src/zmq/zmqutil.cpp
+++ b/depend/bitcoin/src/zmq/zmqutil.cpp
@@ -4,8 +4,7 @@
 
 #include <zmq/zmqutil.h>
 
-#include <logging.h>
-#include <util/check.h>
+#include <util/log.h>
 
 #include <zmq.h>
 
diff --git a/depend/bitcoin/src/zmq/zmqutil.h b/depend/bitcoin/src/zmq/zmqutil.h
index 86f594c1..a213b104 100644
--- a/depend/bitcoin/src/zmq/zmqutil.h
+++ b/depend/bitcoin/src/zmq/zmqutil.h
@@ -10,6 +10,6 @@
 void zmqError(const std::string& str);
 
 /** Prefix for unix domain socket addresses (which are local filesystem paths) */
-const std::string ADDR_PREFIX_IPC = "ipc://"; // used by libzmq, example "ipc:///root/path/to/file"
+inline const std::string ADDR_PREFIX_IPC = "ipc://"; // used by libzmq, example "ipc:///root/path/to/file"
 
 #endif // BITCOIN_ZMQ_ZMQUTIL_H
diff --git a/depend/bitcoin/test/CMakeLists.txt b/depend/bitcoin/test/CMakeLists.txt
index eac3ec59..241ab7f9 100644
--- a/depend/bitcoin/test/CMakeLists.txt
+++ b/depend/bitcoin/test/CMakeLists.txt
@@ -9,9 +9,9 @@ function(create_test_config)
 
   macro(set_configure_variable var conf_var)
     if(${var})
-      set(${conf_var}_TRUE "")
+      set(${conf_var}_VALUE true)
     else()
-      set(${conf_var}_TRUE "#")
+      set(${conf_var}_VALUE false)
     endif()
   endmacro()
 
@@ -29,6 +29,7 @@ function(create_test_config)
   set_configure_variable(ENABLE_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
   set_configure_variable(WITH_USDT ENABLE_USDT_TRACEPOINTS)
   set_configure_variable(ENABLE_IPC ENABLE_IPC)
+  set_configure_variable(BUILD_GUI BUILD_GUI)
 
   configure_file(config.ini.in config.ini USE_SOURCE_PERMISSIONS @ONLY)
 endfunction()
@@ -94,6 +95,8 @@ function(create_test_directory_links)
     endif()
     file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/${f} ${CMAKE_CURRENT_BINARY_DIR}/${f} COPY_ON_ERROR ${symlink})
   endforeach()
+
+  configure_file(${PROJECT_SOURCE_DIR}/src/test/data/siphash.json ${PROJECT_BINARY_DIR}/src/test/data/siphash.json COPYONLY)
 endfunction()
 
 create_test_directory_links()
diff --git a/depend/bitcoin/test/README.md b/depend/bitcoin/test/README.md
index 162815d6..0b34f52c 100644
--- a/depend/bitcoin/test/README.md
+++ b/depend/bitcoin/test/README.md
@@ -318,26 +318,6 @@ Often while debugging RPC calls in functional tests, the test might time out bef
 process can return a response. Use `--timeout-factor 0` to disable all RPC timeouts for that particular
 functional test. Ex: `build/test/functional/wallet_hd.py --timeout-factor 0`.
 
-##### Profiling
-
-An easy way to profile node performance during functional tests is provided
-for Linux platforms using `perf`.
-
-Perf will sample the running node and will generate profile data in the node's
-datadir. The profile data can then be presented using `perf report` or a graphical
-tool like [hotspot](https://github.com/KDAB/hotspot).
-
-To generate a profile during test suite runs, use the `--perf` flag.
-
-To see render the output to text, run
-
-```sh
-perf report -i /path/to/datadir/send-big-msgs.perf.data.xxxx --stdio | c++filt | less
-```
-
-For ways to generate more granular profiles, see the README in
-[test/functional](/test/functional).
-
 ### Lint tests
 
 See the README in [test/lint](/test/lint).
diff --git a/depend/bitcoin/test/config.ini.in b/depend/bitcoin/test/config.ini.in
index 20fa36b9..26733b8b 100644
--- a/depend/bitcoin/test/config.ini.in
+++ b/depend/bitcoin/test/config.ini.in
@@ -14,18 +14,19 @@ EXEEXT=@EXEEXT@
 RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py
 
 [components]
-# Which components are enabled. These are commented out by cmake if they were disabled during configuration.
-@ENABLE_WALLET_TRUE@ENABLE_WALLET=true
-@BUILD_BENCH_TRUE@BUILD_BENCH=true
-@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=true
-@BUILD_BITCOIN_TX_TRUE@BUILD_BITCOIN_TX=true
-@BUILD_BITCOIN_UTIL_TRUE@ENABLE_BITCOIN_UTIL=true
-@BUILD_BITCOIN_CHAINSTATE_TRUE@ENABLE_BITCOIN_CHAINSTATE=true
-@BUILD_BITCOIN_WALLET_TRUE@ENABLE_WALLET_TOOL=true
-@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=true
-@ENABLE_FUZZ_BINARY_TRUE@ENABLE_FUZZ_BINARY=true
-@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true
-@ENABLE_EMBEDDED_ASMAP_TRUE@ENABLE_EMBEDDED_ASMAP=true
-@ENABLE_EXTERNAL_SIGNER_TRUE@ENABLE_EXTERNAL_SIGNER=true
-@ENABLE_USDT_TRACEPOINTS_TRUE@ENABLE_USDT_TRACEPOINTS=true
-@ENABLE_IPC_TRUE@ENABLE_IPC=true
+# Which components are enabled.
+ENABLE_WALLET=@ENABLE_WALLET_VALUE@
+BUILD_BENCH=@BUILD_BENCH_VALUE@
+ENABLE_CLI=@BUILD_BITCOIN_CLI_VALUE@
+BUILD_BITCOIN_TX=@BUILD_BITCOIN_TX_VALUE@
+ENABLE_BITCOIN_UTIL=@BUILD_BITCOIN_UTIL_VALUE@
+ENABLE_BITCOIN_CHAINSTATE=@BUILD_BITCOIN_CHAINSTATE_VALUE@
+ENABLE_WALLET_TOOL=@BUILD_BITCOIN_WALLET_VALUE@
+ENABLE_BITCOIND=@BUILD_BITCOIND_VALUE@
+ENABLE_FUZZ_BINARY=@ENABLE_FUZZ_BINARY_VALUE@
+ENABLE_ZMQ=@ENABLE_ZMQ_VALUE@
+ENABLE_EMBEDDED_ASMAP=@ENABLE_EMBEDDED_ASMAP_VALUE@
+ENABLE_EXTERNAL_SIGNER=@ENABLE_EXTERNAL_SIGNER_VALUE@
+ENABLE_USDT_TRACEPOINTS=@ENABLE_USDT_TRACEPOINTS_VALUE@
+ENABLE_IPC=@ENABLE_IPC_VALUE@
+BUILD_GUI=@BUILD_GUI_VALUE@
diff --git a/depend/bitcoin/test/functional/README.md b/depend/bitcoin/test/functional/README.md
index cf0f2fd0..2de03450 100644
--- a/depend/bitcoin/test/functional/README.md
+++ b/depend/bitcoin/test/functional/README.md
@@ -164,36 +164,3 @@ Test-only secp256k1 elliptic curve implementation
 
 #### [blocktools.py](test_framework/blocktools.py)
 Helper functions for creating blocks and transactions.
-
-### Benchmarking with perf
-
-An easy way to profile node performance during functional tests is provided
-for Linux platforms using `perf`.
-
-Perf will sample the running node and will generate profile data in the node's
-datadir. The profile data can then be presented using `perf report` or a graphical
-tool like [hotspot](https://github.com/KDAB/hotspot).
-
-There are two ways of invoking perf: one is to use the `--perf` flag when
-running tests, which will profile each node during the entire test run: perf
-begins to profile when the node starts and ends when it shuts down. The other
-way is the use the `profile_with_perf` context manager, e.g.
-
-```python
-with node.profile_with_perf("send-big-msgs"):
-    # Perform activity on the node you're interested in profiling, e.g.:
-    for _ in range(10000):
-        node.p2ps[0].send_without_ping(some_large_message)
-```
-
-To see useful textual output, run
-
-```sh
-perf report -i /path/to/datadir/send-big-msgs.perf.data.xxxx --stdio | c++filt | less
-```
-
-#### See also:
-
-- [Installing perf](https://askubuntu.com/q/50145)
-- [Perf examples](https://www.brendangregg.com/perf.html)
-- [Hotspot](https://github.com/KDAB/hotspot): a GUI for perf output analysis
diff --git a/depend/bitcoin/test/functional/data/rpc_psbt.json b/depend/bitcoin/test/functional/data/rpc_psbt.json
index abc09d52..06c6f9e8 100644
--- a/depend/bitcoin/test/functional/data/rpc_psbt.json
+++ b/depend/bitcoin/test/functional/data/rpc_psbt.json
@@ -40,7 +40,29 @@
         "cHNidP8BAF4CAAAAAZvUh2UjC/mnLmYgAflyVW5U8Mb5f+tWvLVgDYF/aZUmAQAAAAD/////AUjmBSoBAAAAIlEgAw2k/OT32yjCyylRYx4ANxOFZZf+ljiCy1AOaBEsymMAAAAAAAEBKwDyBSoBAAAAIlEgwiR++/2SrEf29AuNQtFpF1oZ+p+hDkol1/NetN2FtpJjFcFQkpt0waBJVLeLS2A16XpeB4paDyjsltVHv+6azoA6wG99YgWelJehpKJnVp2YdtpgEBr/OONSm5uTnOf5GulwEV8uSQr3zEXE94UR82BXzlxaXFYyWin7RN/CA/NW4fgAIyAssTrGgkjegGqmo2Wc88A+toIdCcgRSk6Gj+vehlu20qzAAAA=",
         "cHNidP8BAF4CAAAAAZvUh2UjC/mnLmYgAflyVW5U8Mb5f+tWvLVgDYF/aZUmAQAAAAD/////AUjmBSoBAAAAIlEgAw2k/OT32yjCyylRYx4ANxOFZZf+ljiCy1AOaBEsymMAAAAAAAEBKwDyBSoBAAAAIlEgwiR++/2SrEf29AuNQtFpF1oZ+p+hDkol1/NetN2FtpJhFcFQkpt0waBJVLeLS2A16XpeB4paDyjsltVHv+6azoA6wG99YgWelJehpKJnVp2YdtpgEBr/OONSm5uTnOf5GulwEV8uSQr3zEXE94UR82BXzlxaXFYyWin7RN/CA/NW4SMgLLE6xoJI3oBqpqNlnPPAPraCHQnIEUpOho/r3oZbttKswAAA",
         "cHNidP8BAHUCAAAAAQCBcTce3/KF6Tet7qSze3gADAVmy7OtZGQXE8pCFxv2AAAAAAD+////AtPf9QUAAAAAGXapFNDFmQPFusKGh2DpD9UhpGZap2UgiKwA4fUFAAAAABepFDVF5uM7gyxHBQ8k0+65PJwDlIvHh7MuEwAAAQD9pQEBAAAAAAECiaPHHqtNIOA3G7ukzGmPopXJRjr6Ljl/hTPMti+VZ+UBAAAAFxYAFL4Y0VKpsBIDna89p95PUzSe7LmF/////4b4qkOnHf8USIk6UwpyN+9rRgi7st0tAXHmOuxqSJC0AQAAABcWABT+Pp7xp0XpdNkCxDVZQ6vLNL1TU/////8CAMLrCwAAAAAZdqkUhc/xCX/Z4Ai7NK9wnGIZeziXikiIrHL++E4sAAAAF6kUM5cluiHv1irHU6m80GfWx6ajnQWHAkcwRAIgJxK+IuAnDzlPVoMR3HyppolwuAJf3TskAinwf4pfOiQCIAGLONfc0xTnNMkna9b7QPZzMlvEuqFEyADS8vAtsnZcASED0uFWdJQbrUqZY3LLh+GFbTZSYG2YVi/jnF6efkE/IQUCSDBFAiEA0SuFLYXc2WHS9fSrZgZU327tzHlMDDPOXMMJ/7X85Y0CIGczio4OFyXBl/saiK9Z9R5E5CVbIBZ8hoQDHAXR8lkqASECI7cr7vCWXRC+B3jv7NYfysb3mk6haTkzgHNEZPhPKrMAAAAAAAAA",
-        "cHNidP8BAHUCAAAAASaBcTce3/KF6Tet7qSze3gADAVmy7OtZGQXE8pCFxv2AAAAAgD+////AtPf9QUAAAAAGXapFNDFmQPFusKGh2DpD9UhpGZap2UgiKwA4fUFAAAAABepFDVF5uM7gyxHBQ8k0+65PJwDlIvHh7MuEwAAAQD9pQEBAAAAAAECiaPHHqtNIOA3G7ukzGmPopXJRjr6Ljl/hTPMti+VZ+UBAAAAFxYAFL4Y0VKpsBIDna89p95PUzSe7LmF/////4b4qkOnHf8USIk6UwpyN+9rRgi7st0tAXHmOuxqSJC0AQAAABcWABT+Pp7xp0XpdNkCxDVZQ6vLNL1TU/////8CAMLrCwAAAAAZdqkUhc/xCX/Z4Ai7NK9wnGIZeziXikiIrHL++E4sAAAAF6kUM5cluiHv1irHU6m80GfWx6ajnQWHAkcwRAIgJxK+IuAnDzlPVoMR3HyppolwuAJf3TskAinwf4pfOiQCIAGLONfc0xTnNMkna9b7QPZzMlvEuqFEyADS8vAtsnZcASED0uFWdJQbrUqZY3LLh+GFbTZSYG2YVi/jnF6efkE/IQUCSDBFAiEA0SuFLYXc2WHS9fSrZgZU327tzHlMDDPOXMMJ/7X85Y0CIGczio4OFyXBl/saiK9Z9R5E5CVbIBZ8hoQDHAXR8lkqASECI7cr7vCWXRC+B3jv7NYfysb3mk6haTkzgHNEZPhPKrMAAAAAAAAA"
+        "cHNidP8BAHUCAAAAASaBcTce3/KF6Tet7qSze3gADAVmy7OtZGQXE8pCFxv2AAAAAgD+////AtPf9QUAAAAAGXapFNDFmQPFusKGh2DpD9UhpGZap2UgiKwA4fUFAAAAABepFDVF5uM7gyxHBQ8k0+65PJwDlIvHh7MuEwAAAQD9pQEBAAAAAAECiaPHHqtNIOA3G7ukzGmPopXJRjr6Ljl/hTPMti+VZ+UBAAAAFxYAFL4Y0VKpsBIDna89p95PUzSe7LmF/////4b4qkOnHf8USIk6UwpyN+9rRgi7st0tAXHmOuxqSJC0AQAAABcWABT+Pp7xp0XpdNkCxDVZQ6vLNL1TU/////8CAMLrCwAAAAAZdqkUhc/xCX/Z4Ai7NK9wnGIZeziXikiIrHL++E4sAAAAF6kUM5cluiHv1irHU6m80GfWx6ajnQWHAkcwRAIgJxK+IuAnDzlPVoMR3HyppolwuAJf3TskAinwf4pfOiQCIAGLONfc0xTnNMkna9b7QPZzMlvEuqFEyADS8vAtsnZcASED0uFWdJQbrUqZY3LLh+GFbTZSYG2YVi/jnF6efkE/IQUCSDBFAiEA0SuFLYXc2WHS9fSrZgZU327tzHlMDDPOXMMJ/7X85Y0CIGczio4OFyXBl/saiK9Z9R5E5CVbIBZ8hoQDHAXR8lkqASECI7cr7vCWXRC+B3jv7NYfysb3mk6haTkzgHNEZPhPKrMAAAAAAAAA",
+        "cHNidP8BAF4CAAAAAZvUh2UjC/mnLmYgAflyVW5U8Mb5f+tWvLVgDYF/aZUmAQAAAAD/////AUjmBSoBAAAAIlEgAw2k/OT32yjCyylRYx4ANxOFZZf+ljiCy1AOaBEsymMAAAAAAAEBKwDyBSoBAAAAIlEgwiR++/2SrEf29AuNQtFpF1oZ+p+hDkol1/NetN2FtpJhFcFQkpt0waBJVLeLS2A16XpeB4paDyjsltVHv+6azoA6wG99YgWelJehpKJnVp2YdtpgEBr/OONSm5uTnOf5GulwEV8uSQr3zEXE94UR82BXzlxaXFYyWin7RN/CA/NW4SMgLLE6xoJI3oBqpqNlnPPAPraCHQnIEUpOho/r3oZbttKswAAA",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAH7BAIAAAAAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BCGsCRzBEAiAFJ1pIVzTgrh87lxI3WG8OctyFgz0njA5HTNIxEsD6XgIgawSMg868PEHQuTzH2nYYXO29Aw0AWwgBi+K5i7rL33sBIQN2DcygXzmX3GWykwYPfynxUUyMUnBI4SgCsEHU/DQKJwAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAECBAIAAAAAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BCGsCRzBEAiAFJ1pIVzTgrh87lxI3WG8OctyFgz0njA5HTNIxEsD6XgIgawSMg868PEHQuTzH2nYYXO29Aw0AWwgBi+K5i7rL33sBIQN2DcygXzmX3GWykwYPfynxUUyMUnBI4SgCsEHU/DQKJwAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAEDBAIAAAAAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BCGsCRzBEAiAFJ1pIVzTgrh87lxI3WG8OctyFgz0njA5HTNIxEsD6XgIgawSMg868PEHQuTzH2nYYXO29Aw0AWwgBi+K5i7rL33sBIQN2DcygXzmX3GWykwYPfynxUUyMUnBI4SgCsEHU/DQKJwAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==<",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAEEAQIAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BCGsCRzBEAiAFJ1pIVzTgrh87lxI3WG8OctyFgz0njA5HTNIxEsD6XgIgawSMg868PEHQuTzH2nYYXO29Aw0AWwgBi+K5i7rL33sBIQN2DcygXzmX3GWykwYPfynxUUyMUnBI4SgCsEHU/DQKJwAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAEFAQIAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BCGsCRzBEAiAFJ1pIVzTgrh87lxI3WG8OctyFgz0njA5HTNIxEsD6XgIgawSMg868PEHQuTzH2nYYXO29Aw0AWwgBi+K5i7rL33sBIQN2DcygXzmX3GWykwYPfynxUUyMUnBI4SgCsEHU/DQKJwAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAEGAQAAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BCGsCRzBEAiAFJ1pIVzTgrh87lxI3WG8OctyFgz0njA5HTNIxEsD6XgIgawSMg868PEHQuTzH2nYYXO29Aw0AWwgBi+K5i7rL33sBIQN2DcygXzmX3GWykwYPfynxUUyMUnBI4SgCsEHU/DQKJwAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gAIgIC1gH4SEamdV93a+AOPZ3o+xCsyTX7g8RfsBYtTK1at5IY9p2HPlQAAIABAACAAAAAgAAAAAAqAAAAACICA27+LCVWIZhlU7qdZcPdxkFlyhQ24FqjWkxusCRRz3ltGPadhz5UAACAAQAAgAAAAIABAAAAYgAAAAA=",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonARAE/////wAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonAREEjI3EYgAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonARIEECcAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAAAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonACICAtYB+EhGpnVfd2vgDj2d6PsQrMk1+4PEX7AWLUytWreSGPadhz5UAACAAQAAgAAAAIAAAAAAKgAAAAEDCAAIry8AAAAAACICA27+LCVWIZhlU7qdZcPdxkFlyhQ24FqjWkxusCRRz3ltGPadhz5UAACAAQAAgAAAAIABAAAAYgAAAAA=",
+        "cHNidP8BAHECAAAAAQsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAAAAAAD+////AgAIry8AAAAAFgAUxDD2TEdW2jENvRoIVXLvKZkmJyyLvesLAAAAABYAFKB9rIq2ypQtN57Xlfg1unHJzGiFAAAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEIawJHMEQCIAUnWkhXNOCuHzuXEjdYbw5y3IWDPSeMDkdM0jESwPpeAiBrBIyDzrw8QdC5PMfadhhc7b0DDQBbCAGL4rmLusvfewEhA3YNzKBfOZfcZbKTBg9/KfFRTIxScEjhKAKwQdT8NAonACICAtYB+EhGpnVfd2vgDj2d6PsQrMk1+4PEX7AWLUytWreSGPadhz5UAACAAQAAgAAAAIAAAAAAKgAAAAEEFgAUoH2sirbKlC03nteV+DW6ccnMaIUAIgIDbv4sJVYhmGVTup1lw93GQWXKFDbgWqNaTG6wJFHPeW0Y9p2HPlQAAIABAACAAAAAgAEAAABiAAAAAA==",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEFAQIB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAARAE/v///wAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAARAE/v///wAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEPBAAAAAABEAT+////ACICAtYB+EhGpnVfd2vgDj2d6PsQrMk1+4PEX7AWLUytWreSGPadhz5UAACAAQAAgAAAAIAAAAAAKgAAAAEDCAAIry8AAAAAAQQWABTEMPZMR1baMQ29GghVcu8pmSYnLAAiAgLjb7/1PdU0Bwz4/TlmFGgPNXqbhdtzQL8c+nRdKtezQBj2nYc+VAAAgAEAAIAAAACAAQAAAGQAAAABAwiLvesLAAAAAAEEFgAUTdGTrJZKVqwbnhzKhFT+L0dPhRMA",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IARAE/v///wAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAEQBP7///8AIgIC1gH4SEamdV93a+AOPZ3o+xCsyTX7g8RfsBYtTK1at5IY9p2HPlQAAIABAACAAAAAgAAAAAAqAAAAAQQWABTEMPZMR1baMQ29GghVcu8pmSYnLAAiAgLjb7/1PdU0Bwz4/TlmFGgPNXqbhdtzQL8c+nRdKtezQBj2nYc+VAAAgAEAAIAAAACAAQAAAGQAAAABAwiLvesLAAAAAAEEFgAUTdGTrJZKVqwbnhzKhFT+L0dPhRMA",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAEQBP7///8AIgIC1gH4SEamdV93a+AOPZ3o+xCsyTX7g8RfsBYtTK1at5IY9p2HPlQAAIABAACAAAAAgAAAAAAqAAAAAQMIAAivLwAAAAAAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAAREE/2TNHQAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAARIEAGXNHQAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA=="
     ],
     "invalid_with_msg": [
         [
@@ -53,7 +75,7 @@
         ],
         [
             "cHNidP8BAFICAAAAAVaG3/QAFl9OBApYVfZYCTRyybz4EIsnKl0x8YH3tP+xAQAAAAD9////ARjd9QUAAAAAFgAUyRI+BujX8JZsXRzQ+TMALU63V80AAAAAAAEBKwDh9QUAAAAAIlEgC1jjN6pNOFKowpOHxCQI2M++OmE6Xjl+Cp8BpftxB9QhFgtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUBQAmgN1uIRY0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAUAWAsIhyEWT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwFAMMkmoIhFvkwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5BQB91lWSIRoLWOM3qk04UqjCk4fEJAjYz746YTpeOX4KnwGl+3EH1GMCNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQACT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwC+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvkAAA==",
-            "Input musig2 participants pubkeys aggregate key is not 34 bytes"
+            "Size of key was not 34 for the type Input MuSig2 Participants Pubkeys"
         ],
         [
             "cHNidP8BADMAAZJuAQAAAAAAAAAAAABMHQD/AAAAAAAAAAAA//////9BAB4AjIwAAAD5////AAAA/NwAAQErYQIAAAAAAAAiUSBw/G0rYgJicCsrtgAA2P//+HN0AAIA+f//7gAF++8AACIaCAEAAP8AcHNidP8BABMAAiEeAAEXDD4AAAEBAACCpP73IUL8j3+PjNNzYnT/AAAAAAAAlpb/AAAAAAAAAAYEAisAAAA=",
@@ -77,7 +99,7 @@
         ],
         [
             "cHNidP8BAH0CAAAAASWJ53Z5WLoVT5AYzM8N7ephR7tgzRoZS241kKmWVpDWAAAAAAD9////AoCWmAAAAAAAIlEgKWfS0CCpeV2nK1G+Tz/KJbsOV+kcWz56gav6cjKjSUIPwJJ8AAAAABYAFDScXTMCeMMAKmT1l9KwGqPcG9kDAAAAAAABAH0CAAAAAZqLSlB5a5YAmQ9/4R36ALxw79KWBIr8hnGa8PsfqRk3AAAAAAD9////AolcK30AAAAAFgAUz9mLoQJ+pO1L0q4bNIthVqAVA3UA4fUFAAAAACJRINCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+k4QAAAAEBH4lcK30AAAAAFgAUz9mLoQJ+pO1L0q4bNIthVqAVA3UiBgKmZlDwi/+k8InrIu3NvnYWZF/2zRgKNkhNS8gQVFlbexi//0SjVAAAgAEAAIAAAACAAQAAAIoCAAAAAQUgC1jjN6pNOFKowpOHxCQI2M++OmE6Xjl+Cp8BpftxB9QhBwtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUBQAmgN1uIQc0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAUAWAsIhyEHT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwFAMMkmoIhB/kwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5BQB91lWSIQgLWOM3qk04UqjCk4fEJAjYz746YTpeOX4KnwGl+3EH1GMCNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQACT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwC+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvkAIgIDvkrlPTfMB19Asw1tpHKdQK3uuYNTOvFhYZK8dtWyYSoYv/9Eo1QAAIABAACAAAAAgAEAAACNAgAAAA==",
-            "Output musig2 participants pubkeys aggregate key is not 34 bytes"
+            "Size of key was not 34 for the type Output MuSig2 Participants Pubkeys"
         ],
         [
             "cHNidP8BAH0CAAAAASWJ53Z5WLoVT5AYzM8N7ephR7tgzRoZS241kKmWVpDWAAAAAAD9////AoCWmAAAAAAAIlEgKWfS0CCpeV2nK1G+Tz/KJbsOV+kcWz56gav6cjKjSUIPwJJ8AAAAABYAFDScXTMCeMMAKmT1l9KwGqPcG9kDAAAAAAABAH0CAAAAAZqLSlB5a5YAmQ9/4R36ALxw79KWBIr8hnGa8PsfqRk3AAAAAAD9////AolcK30AAAAAFgAUz9mLoQJ+pO1L0q4bNIthVqAVA3UA4fUFAAAAACJRINCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+k4QAAAAEBH4lcK30AAAAAFgAUz9mLoQJ+pO1L0q4bNIthVqAVA3UiBgKmZlDwi/+k8InrIu3NvnYWZF/2zRgKNkhNS8gQVFlbexi//0SjVAAAgAEAAIAAAACAAQAAAIoCAAAAAQUgC1jjN6pNOFKowpOHxCQI2M++OmE6Xjl+Cp8BpftxB9QhBwtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUBQAmgN1uIQc0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAUAWAsIhyEHT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwFAMMkmoIhB/kwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5BQB91lWSIggDC1jjN6pNOFKowpOHxCQI2M++OmE6Xjl+Cp8BpftxB9RiNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQACT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwC+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvkAIgIDvkrlPTfMB19Asw1tpHKdQK3uuYNTOvFhYZK8dtWyYSoYv/9Eo1QAAIABAACAAAAAgAEAAACNAgAAAA==",
@@ -122,6 +144,18 @@
         [
             "cHNidP8BAFICAAAAASWJ53Z5WLoVT5AYzM8N7ephR7tgzRoZS241kKmWVpDWAQAAAAD9////ARjd9QUAAAAAFgAUyRI+BujX8JZsXRzQ+TMALU63V80AAAAAAAEBKwDh9QUAAAAAIlEg0LImxlmfJzh034/mhKtsMCgIG+6KLL7TGhNvWGX2z6QBE0CeOYl6wv/idSXcRg+FhP3dEf6al84uUMFIm4waTpL8wH5I22OhpMy50pdTfQwDiDg3i78njeeqGhKJldFiXMXNIRY0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAUAWAsIhyEWT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwFAMMkmoIhFo3ZarhYslnFGCGMAUpG605qyJnlHGde93T7toqHmc4vDQAmgN1uAQAAAAIAAAAhFvkwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5BQB91lWSARcgjdlquFiyWcUYIYwBSkbrTmrImeUcZ173dPu2ioeZzi8iGgMLWOM3qk04UqjCk4fEJAjYz746YTpeOX4KnwGl+3EH1GMCNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQACT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwC+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvlDGwI0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAALQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpEICTu/J/dEr50dGSFxni4JolJzJI26fzoIkE5VSOvBCYr8DjCdugyqtS/uekEhRYvV0yLJhnfW9GduP+i6wBZSTvxtDGwJPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLALQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpEIDoySj9CIb+rK2+geGpwSPM0XONE8UWOFRuhh7Waq0mMsCo2OCWbpMzEb+edjXmk2ecE7A93AbXmZNTYczg4r0kZZDGwL5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+QLQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpEICwS6074dgMhwHKlHY+2XDTui0UqFIGFV/Yd8GEoWlgJEDoI5BsmKULG5ZMv0ftdmSNol5ifbpEtwhR20ncYdBFJNDHAJPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLALQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpCDnhVL7TOmy0A4e0OLLmOCHGZEnR36PGhxoGgC5xM5wmEMcAvkwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5AtCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+kIMvMlXhqHGdNSNisUuMi3Xxuq6w7/Evnm3UN4o34Li9zQxwCNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQBq5voHDYXyLgYYDZRwd2Cemo5Lf+nNM2aIGiiZxmFnVU8gZX2yhr4U6A7ODdhLTRfE3EFMPla8jO8IJ7BhtN0sj0MAAA==",
             "musig2 aggregate pubkey is invalid"
+        ],
+        [
+            "cHNidP8BAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQIEAgAAAAEDBAAAAAABBAEBAQUBAgEGAQcB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAARAE/v///wERBIyNxGIBEgQQJwAAACICAtYB+EhGpnVfd2vgDj2d6PsQrMk1+4PEX7AWLUytWreSGPadhz5UAACAAQAAgAAAAIAAAAAAKgAAAAEDCAAIry8AAAAAAQQWABTEMPZMR1baMQ29GghVcu8pmSYnLAAiAgLjb7/1PdU0Bwz4/TlmFGgPNXqbhdtzQL8c+nRdKtezQBj2nYc+VAAAgAEAAIAAAACAAQAAAGQAAAABAwiLvesLAAAAAAEEFgAUTdGTrJZKVqwbnhzKhFT+L0dPhRMA",
+            "PSBT_GLOBAL_UNSIGNED_TX is not allowed in PSBTv2"
+        ],
+        [
+            "cHNidP8BBAEBAQUBAgH7BAIAAAAAAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAAAEDCAAIry8AAAAAAQQWABTEMPZMR1baMQ29GghVcu8pmSYnLAABAwiLvesLAAAAAAEEFgAUTdGTrJZKVqwbnhzKhFT+L0dPhRMA",
+            "PSBT_GLOBAL_TX_VERSION is required in PSBTv2"
+        ],
+        [
+            "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAQYBBwH7BAIAAAAAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BDiALCtkhQZwchxlzXXLcc5+eqeBjjR/kwe7w+ZRAhIFfyAEPBAAAAAABEAT+////AREEjI3EYgESBAAAAAAAIgIC1gH4SEamdV93a+AOPZ3o+xCsyTX7g8RfsBYtTK1at5IY9p2HPlQAAIABAACAAAAAgAAAAAAqAAAAAQMIAAivLwAAAAABBBYAFMQw9kxHVtoxDb0aCFVy7ymZJicsACICAuNvv/U91TQHDPj9OWYUaA81epuF23NAvxz6dF0q17NAGPadhz5UAACAAQAAgAAAAIABAAAAZAAAAAEDCIu96wsAAAAAAQQWABRN0ZOslkpWrBueHMqEVP4vR0+FEwA=",
+            "Required height based locktime is invalid (0)"
         ]
     ],
     "valid" : [
@@ -158,7 +192,21 @@
         "cHNidP8BAFICAAAAASWJ53Z5WLoVT5AYzM8N7ephR7tgzRoZS241kKmWVpDWAQAAAAD9////ARjd9QUAAAAAFgAUyRI+BujX8JZsXRzQ+TMALU63V80AAAAAAAEBKwDh9QUAAAAAIlEg0LImxlmfJzh034/mhKtsMCgIG+6KLL7TGhNvWGX2z6QhFjRrmVkzVxB8nTRZ6d66jT6vROZjbIXH+FPrkLpS6M0ABQBYCwiHIRZPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLAUAwySagiEWjdlquFiyWcUYIYwBSkbrTmrImeUcZ173dPu2ioeZzi8NACaA3W4BAAAAAgAAACEW+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvkFAH3WVZIBFyCN2Wq4WLJZxRghjAFKRutOasiZ5RxnXvd0+7aKh5nOLyIaAwtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUYwI0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAJPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLAL5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+UMbAjRrmVkzVxB8nTRZ6d66jT6vROZjbIXH+FPrkLpS6M0AAtCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+kQgJO78n90SvnR0ZIXGeLgmiUnMkjbp/OgiQTlVI68EJivwOMJ26DKq1L+56QSFFi9XTIsmGd9b0Z24/6LrAFlJO/G0MbAk+v1l+BaRhvwr/bIjPHfmMNEL4oCiTHFlwJonYRd1wsAtCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+kQgOjJKP0Ihv6srb6B4anBI8zRc40TxRY4VG6GHtZqrSYywKjY4JZukzMRv552NeaTZ5wTsD3cBteZk1NhzODivSRlkMbAvkwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5AtCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+kQgLBLrTvh2AyHAcqUdj7ZcNO6LRSoUgYVX9h3wYShaWAkQOgjkGyYpQsblky/R+12ZI2iXmJ9ukS3CFHbSdxh0EUkwAA",
         "cHNidP8BAFICAAAAASWJ53Z5WLoVT5AYzM8N7ephR7tgzRoZS241kKmWVpDWAQAAAAD9////ARjd9QUAAAAAFgAUyRI+BujX8JZsXRzQ+TMALU63V80AAAAAAAEBKwDh9QUAAAAAIlEg0LImxlmfJzh034/mhKtsMCgIG+6KLL7TGhNvWGX2z6QBE0CeOYl6wv/idSXcRg+FhP3dEf6al84uUMFIm4waTpL8wH5I22OhpMy50pdTfQwDiDg3i78njeeqGhKJldFiXMXNIRY0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAUAWAsIhyEWT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwFAMMkmoIhFo3ZarhYslnFGCGMAUpG605qyJnlHGde93T7toqHmc4vDQAmgN1uAQAAAAIAAAAhFvkwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5BQB91lWSARcgjdlquFiyWcUYIYwBSkbrTmrImeUcZ173dPu2ioeZzi8iGgMLWOM3qk04UqjCk4fEJAjYz746YTpeOX4KnwGl+3EH1GMCNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQACT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwC+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvlDGwI0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAALQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpEICTu/J/dEr50dGSFxni4JolJzJI26fzoIkE5VSOvBCYr8DjCdugyqtS/uekEhRYvV0yLJhnfW9GduP+i6wBZSTvxtDGwJPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLALQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpEIDoySj9CIb+rK2+geGpwSPM0XONE8UWOFRuhh7Waq0mMsCo2OCWbpMzEb+edjXmk2ecE7A93AbXmZNTYczg4r0kZZDGwL5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+QLQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpEICwS6074dgMhwHKlHY+2XDTui0UqFIGFV/Yd8GEoWlgJEDoI5BsmKULG5ZMv0ftdmSNol5ifbpEtwhR20ncYdBFJNDHAI0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAALQsibGWZ8nOHTfj+aEq2wwKAgb7oosvtMaE29YZfbPpCBlfbKGvhToDs4N2EtNF8TcQUw+VryM7wgnsGG03SyPQ0McAk+v1l+BaRhvwr/bIjPHfmMNEL4oCiTHFlwJonYRd1wsAtCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+kIOeFUvtM6bLQDh7Q4suY4IcZkSdHfo8aHGgaALnEznCYQxwC+TCKAZJYwxBJNE+F+J1SKbUxyEWDb5mwhgHxE7zgNvkC0LImxlmfJzh034/mhKtsMCgIG+6KLL7TGhNvWGX2z6Qgy8yVeGocZ01I2KxS4yLdfG6rrDv8S+ebdQ3ijfguL3MAAA==",
         "cHNidP8BAH0CAAAAASWJ53Z5WLoVT5AYzM8N7ephR7tgzRoZS241kKmWVpDWAAAAAAD9////AoCWmAAAAAAAIlEgKWfS0CCpeV2nK1G+Tz/KJbsOV+kcWz56gav6cjKjSUIPwJJ8AAAAABYAFDScXTMCeMMAKmT1l9KwGqPcG9kDAAAAAAABAH0CAAAAAZqLSlB5a5YAmQ9/4R36ALxw79KWBIr8hnGa8PsfqRk3AAAAAAD9////AolcK30AAAAAFgAUz9mLoQJ+pO1L0q4bNIthVqAVA3UA4fUFAAAAACJRINCyJsZZnyc4dN+P5oSrbDAoCBvuiiy+0xoTb1hl9s+k4QAAAAEBH4lcK30AAAAAFgAUz9mLoQJ+pO1L0q4bNIthVqAVA3UiBgKmZlDwi/+k8InrIu3NvnYWZF/2zRgKNkhNS8gQVFlbexi//0SjVAAAgAEAAIAAAACAAQAAAIoCAAAAAQUgC1jjN6pNOFKowpOHxCQI2M++OmE6Xjl+Cp8BpftxB9QhBwtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUBQAmgN1uIQc0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAUAWAsIhyEHT6/WX4FpGG/Cv9siM8d+Yw0QvigKJMcWXAmidhF3XCwFAMMkmoIhB/kwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5BQB91lWSIggDC1jjN6pNOFKowpOHxCQI2M++OmE6Xjl+Cp8BpftxB9RjAjRrmVkzVxB8nTRZ6d66jT6vROZjbIXH+FPrkLpS6M0AAk+v1l+BaRhvwr/bIjPHfmMNEL4oCiTHFlwJonYRd1wsAvkwigGSWMMQSTRPhfidUim1MchFg2+ZsIYB8RO84Db5ACICA75K5T03zAdfQLMNbaRynUCt7rmDUzrxYWGSvHbVsmEqGL//RKNUAACAAQAAgAAAAIABAAAAjQIAAAA=",
-        "cHNidP8BAH0CAAAAAfg1peyOQAj5bxdAfhPww0kSw50nYggA+uArr4a4p452AAAAAAD9////AoCWmAAAAAAAIlEg0LImxlmfJzh034/mhKtsMCgIG+6KLL7TGhNvWGX2z6SeQF0FAAAAABYAFJ+UrC20ZCC5XcDbHMj0vsC7kjTYAAAAAAABAFICAAAAAVaG3/QAFl9OBApYVfZYCTRyybz4EIsnKl0x8YH3tP+xAQAAAAD9////ARjd9QUAAAAAFgAUyRI+BujX8JZsXRzQ+TMALU63V80AAAAAAQEfGN31BQAAAAAWABTJEj4G6NfwlmxdHND5MwAtTrdXzSIGAyk8jY3Ee3EtfBOl0FNrfy4xkyZ+YPfmblY5OdvlB0ecGL//RKNUAACAAQAAgAAAAIAAAAAAlwEAAAABBSCN2Wq4WLJZxRghjAFKRutOasiZ5RxnXvd0+7aKh5nOLyEHNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQAFAFgLCIchB0+v1l+BaRhvwr/bIjPHfmMNEL4oCiTHFlwJonYRd1wsBQDDJJqCIQeN2Wq4WLJZxRghjAFKRutOasiZ5RxnXvd0+7aKh5nOLw0AJoDdbgEAAAACAAAAIQf5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+QUAfdZVkiIIAwtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUYwI0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAJPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLAL5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+QAiAgLOad6WdiKxyC6woPgM6wVzoPdosC/bBHsTwXHnkXT8zhi//0SjVAAAgAEAAIAAAACAAQAAAI4CAAAA"
+        "cHNidP8BAH0CAAAAAfg1peyOQAj5bxdAfhPww0kSw50nYggA+uArr4a4p452AAAAAAD9////AoCWmAAAAAAAIlEg0LImxlmfJzh034/mhKtsMCgIG+6KLL7TGhNvWGX2z6SeQF0FAAAAABYAFJ+UrC20ZCC5XcDbHMj0vsC7kjTYAAAAAAABAFICAAAAAVaG3/QAFl9OBApYVfZYCTRyybz4EIsnKl0x8YH3tP+xAQAAAAD9////ARjd9QUAAAAAFgAUyRI+BujX8JZsXRzQ+TMALU63V80AAAAAAQEfGN31BQAAAAAWABTJEj4G6NfwlmxdHND5MwAtTrdXzSIGAyk8jY3Ee3EtfBOl0FNrfy4xkyZ+YPfmblY5OdvlB0ecGL//RKNUAACAAQAAgAAAAIAAAAAAlwEAAAABBSCN2Wq4WLJZxRghjAFKRutOasiZ5RxnXvd0+7aKh5nOLyEHNGuZWTNXEHydNFnp3rqNPq9E5mNshcf4U+uQulLozQAFAFgLCIchB0+v1l+BaRhvwr/bIjPHfmMNEL4oCiTHFlwJonYRd1wsBQDDJJqCIQeN2Wq4WLJZxRghjAFKRutOasiZ5RxnXvd0+7aKh5nOLw0AJoDdbgEAAAACAAAAIQf5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+QUAfdZVkiIIAwtY4zeqTThSqMKTh8QkCNjPvjphOl45fgqfAaX7cQfUYwI0a5lZM1cQfJ00Weneuo0+r0TmY2yFx/hT65C6UujNAAJPr9ZfgWkYb8K/2yIzx35jDRC+KAokxxZcCaJ2EXdcLAL5MIoBkljDEEk0T4X4nVIptTHIRYNvmbCGAfETvOA2+QAiAgLOad6WdiKxyC6woPgM6wVzoPdosC/bBHsTwXHnkXT8zhi//0SjVAAAgAEAAIAAAACAAQAAAI4CAAAA",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIB+wQCAAAAAAEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAACICAtYB+EhGpnVfd2vgDj2d6PsQrMk1+4PEX7AWLUytWreSGPadhz5UAACAAQAAgAAAAIAAAAAAKgAAAAEDCAAIry8AAAAAAQQWABTEMPZMR1baMQ29GghVcu8pmSYnLAAiAgLjb7/1PdU0Bwz4/TlmFGgPNXqbhdtzQL8c+nRdKtezQBj2nYc+VAAAgAEAAIAAAACAAQAAAGQAAAABAwiLvesLAAAAAAEEFgAUTdGTrJZKVqwbnhzKhFT+L0dPhRMA",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIB+wQCAAAAAAEAUgIAAAABwaolbiFLlqGCL5PeQr/ztfP/jQUZMG41FddRWl6AWxIAAAAAAP////8BGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgAAAAABAR8Yxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAQ4gCwrZIUGcHIcZc11y3HOfnqngY40f5MHu8PmUQISBX8gBDwQAAAAAARAE/v///wAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAEQBP7///8BEQSMjcRiARIEECcAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEBAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgECAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEEAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEIAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEDAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEFAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEGAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgEHAfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQQBAQEFAQIBBgH/AfsEAgAAAAABAFICAAAAAcGqJW4hS5ahgi+T3kK/87Xz/40FGTBuNRXXUVpegFsSAAAAAAD/////ARjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4AAAAAAQEfGMaaOwAAAAAWABSwo68UQghBJpPKfRZoUrUtsK7wbgEOIAsK2SFBnByHGXNdctxzn56p4GONH+TB7vD5lECEgV/IAQ8EAAAAAAAiAgLWAfhIRqZ1X3dr4A49nej7EKzJNfuDxF+wFi1MrVq3khj2nYc+VAAAgAEAAIAAAACAAAAAACoAAAABAwgACK8vAAAAAAEEFgAUxDD2TEdW2jENvRoIVXLvKZkmJywAIgIC42+/9T3VNAcM+P05ZhRoDzV6m4Xbc0C/HPp0XSrXs0AY9p2HPlQAAIABAACAAAAAgAEAAABkAAAAAQMIi73rCwAAAAABBBYAFE3Rk6yWSlasG54cyoRU/i9HT4UTAA==",
+        "cHNidP8BAgQCAAAAAQMEAAAAAAEEAQEBBQECAQYBBwH7BAIAAAAAAQBSAgAAAAHBqiVuIUuWoYIvk95Cv/O18/+NBRkwbjUV11FaXoBbEgAAAAAA/////wEYxpo7AAAAABYAFLCjrxRCCEEmk8p9FmhStS2wrvBuAAAAAAEBHxjGmjsAAAAAFgAUsKOvFEIIQSaTyn0WaFK1LbCu8G4BDiALCtkhQZwchxlzXXLcc5+eqeBjjR/kwe7w+ZRAhIFfyAEPBAAAAAABEAT+////AREEjI3EYgESBBAnAAAAIgIC1gH4SEamdV93a+AOPZ3o+xCsyTX7g8RfsBYtTK1at5IY9p2HPlQAAIABAACAAAAAgAAAAAAqAAAAAQMIAAivLwAAAAABBBYAFMQw9kxHVtoxDb0aCFVy7ymZJicsACICAuNvv/U91TQHDPj9OWYUaA81epuF23NAvxz6dF0q17NAGPadhz5UAACAAQAAgAAAAIABAAAAZAAAAAEDCIu96wsAAAAAAQQWABRN0ZOslkpWrBueHMqEVP4vR0+FEwA="
     ],
     "creator" : [
         {
@@ -180,6 +228,7 @@
                     "bcrt1qqzh2ngh97ru8dfvgma25d6r595wcwqy0cee4cc": 1
                 }
             ],
+            "version": 0,
             "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAAAAAA="
         }
     ],
@@ -239,13 +288,6 @@
                 "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210cwRAIgYxqYn+c4qSrQGYYCMxLBkhT+KAKznly8GsNniAbGksMCIDnbbDh70mdxbf2z1NjaULjoXSEzJrp8faqkwM5B65IjAQEDBAEAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAAEBIADC6wsAAAAAF6kUt/X69A49QKWkWbHbNTXyty+pIeiHIgICOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNHMEQCIGX0W6WZi1mif/4ae+0BavHx+Q1Us6qPdFCqX1aiUQO9AiB/ckcDrR7blmgLKEtW1P/LiPf7dZ6rvgiqMPKbhROD0gEBAwQBAAAAAQQiACCMI1MXN0O1ld+0oHtyuo5C43l9p06H/n2ddJfjsgKJAwEFR1IhAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcIQI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8Oc1KuIgYCOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnMQ2QxqTwAAAIAAAACAAwAAgCIGAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcENkMak8AAACAAAAAgAIAAIAAIgIDqaTDf1mW06ol26xrVwrwZQOUSSlCRgs1R1Ptnuylh3EQ2QxqTwAAAIAAAACABAAAgAAiAgJ/Y5l1fS7/VaE2rQLGhLGDi2VW5fG2s0KCqUtrUAUQlhDZDGpPAAAAgAAAAIAFAACAAA=="
             ],
             "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgf0cwRAIgdAGK1BgAl7hzMjwAFXILNoTMgSOJEEjn282bVa1nnJkCIHPTabdA4+tT3O+jOCPIBwUUylWn3ZVE8VfBZ5EyYRGMASICAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXRzBEAiBjGpif5zipKtAZhgIzEsGSFP4oArOeXLwaw2eIBsaSwwIgOdtsOHvSZ3Ft/bPU2NpQuOhdITMmunx9qqTAzkHrkiMBAQMEAQAAAAEER1IhApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/IQLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU211KuIgYClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8Q2QxqTwAAAIAAAACAAAAAgCIGAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXENkMak8AAACAAAAAgAEAAIAAAQEgAMLrCwAAAAAXqRS39fr0Dj1ApaRZsds1NfK3L6kh6IciAgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3EcwRAIgYut6VWEHp8c/RaxKtaHd329wdfsSdZaafzg+//eEvLICIAwF27dHDb8vCFV901bHMlwe0wkT6ZbNOECUXbEiKNpfASICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA="
-        },
-        {
-            "combine" : [
-                "cHNidP8BAD8CAAAAAf//////////////////////////////////////////AAAAAAD/////AQAAAAAAAAAAA2oBAAAAAAAKDwECAwQFBgcICQ8BAgMEBQYHCAkKCwwNDg8ACg8BAgMEBQYHCAkPAQIDBAUGBwgJCgsMDQ4PAAoPAQIDBAUGBwgJDwECAwQFBgcICQoLDA0ODwA=",
-                "cHNidP8BAD8CAAAAAf//////////////////////////////////////////AAAAAAD/////AQAAAAAAAAAAA2oBAAAAAAAKDwECAwQFBgcIEA8BAgMEBQYHCAkKCwwNDg8ACg8BAgMEBQYHCBAPAQIDBAUGBwgJCgsMDQ4PAAoPAQIDBAUGBwgQDwECAwQFBgcICQoLDA0ODwA="
-            ],
-            "result" : "cHNidP8BAD8CAAAAAf//////////////////////////////////////////AAAAAAD/////AQAAAAAAAAAAA2oBAAAAAAAKDwECAwQFBgcICQ8BAgMEBQYHCAkKCwwNDg8KDwECAwQFBgcIEA8BAgMEBQYHCAkKCwwNDg8ACg8BAgMEBQYHCAkPAQIDBAUGBwgJCgsMDQ4PCg8BAgMEBQYHCBAPAQIDBAUGBwgJCgsMDQ4PAAoPAQIDBAUGBwgJDwECAwQFBgcICQoLDA0ODwoPAQIDBAUGBwgQDwECAwQFBgcICQoLDA0ODwA="
         }
     ],
     "finalizer" : [
diff --git a/depend/bitcoin/test/functional/data/util/bitcoin-util-test.json b/depend/bitcoin/test/functional/data/util/bitcoin-util-test.json
index 896decc4..2aaffff4 100644
--- a/depend/bitcoin/test/functional/data/util/bitcoin-util-test.json
+++ b/depend/bitcoin/test/functional/data/util/bitcoin-util-test.json
@@ -29,6 +29,55 @@
     "error_txt": "Could not decode block header",
     "description": ""
   },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["getchainparams"],
+    "return_code": 0,
+    "output_cmp": "getchainparams-mainnet.json",
+    "description": "getchainparams returns mainnet info"
+  },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["-regtest", "getchainparams"],
+    "return_code": 0,
+    "output_cmp": "getchainparams-regtest.json",
+    "description": "getchainparams returns regtest info"
+  },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["-testnet", "getchainparams"],
+    "return_code": 0,
+    "output_cmp": "getchainparams-testnet.json",
+    "description": "getchainparams returns testnet info"
+  },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["-testnet4", "getchainparams"],
+    "return_code": 0,
+    "output_cmp": "getchainparams-testnet4.json",
+    "description": "getchainparams returns testnet4 info"
+  },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["-signet", "getchainparams"],
+    "return_code": 0,
+    "output_cmp": "getchainparams-signet.json",
+    "description": "getchainparams returns signet info"
+  },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["-signet", "-signetchallenge=512102f7561d208dd9ae99bf497273e16f389bdbd6c4742ddb8e6b216e64fa2928ad8f51ae", "getchainparams"],
+    "return_code": 0,
+    "output_cmp": "getchainparams-signet-custom.json",
+    "description": "getchainparams returns custom signet info"
+  },
+  {
+    "exec": "./bitcoin-util",
+    "args": ["getchainparams", "extra_arg"],
+    "return_code": 1,
+    "error_txt": "getchainparams does not take arguments",
+    "description": "getchainparams rejects extra arguments"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-create", "nversion=1"],
     "output_cmp": "blanktxv1.hex",
diff --git a/depend/bitcoin/test/functional/data/util/getchainparams-mainnet.json b/depend/bitcoin/test/functional/data/util/getchainparams-mainnet.json
new file mode 100644
index 00000000..c0e0402c
--- /dev/null
+++ b/depend/bitcoin/test/functional/data/util/getchainparams-mainnet.json
@@ -0,0 +1,28 @@
+{
+  "chain": "main",
+  "test_chain": false,
+  "genesis": "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+  "subsidy_halving_interval": 210000,
+  "pow": {
+    "limit": "00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+    "target_spacing": 600,
+    "difficulty_retarget_interval": 2016,
+    "mindiff_blocks": "no"
+  },
+  "net": {
+    "default_port": 8333,
+    "magic": "f9beb4d9",
+    "dns_seeds": [
+      "dnsseed.bluematt.me.",
+      "seed.bitcoin.jonasschnelli.ch.",
+      "seed.btc.petertodd.net.",
+      "seed.bitcoin.sprovoost.nl.",
+      "dnsseed.emzy.de.",
+      "seed.bitcoin.wiz.biz.",
+      "seed.mainnet.achownodes.xyz."
+    ]
+  },
+  "addresses": {
+    "bech32_hrp": "bc"
+  }
+}
diff --git a/depend/bitcoin/test/functional/data/util/getchainparams-regtest.json b/depend/bitcoin/test/functional/data/util/getchainparams-regtest.json
new file mode 100644
index 00000000..7a3191b7
--- /dev/null
+++ b/depend/bitcoin/test/functional/data/util/getchainparams-regtest.json
@@ -0,0 +1,19 @@
+{
+  "chain": "regtest",
+  "test_chain": true,
+  "genesis": "06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
+  "subsidy_halving_interval": 150,
+  "pow": {
+    "limit": "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+  },
+  "net": {
+    "default_port": 18444,
+    "magic": "fabfb5da",
+    "dns_seeds": [
+      "dummySeed.invalid."
+    ]
+  },
+  "addresses": {
+    "bech32_hrp": "bcrt"
+  }
+}
diff --git a/depend/bitcoin/test/functional/data/util/getchainparams-signet-custom.json b/depend/bitcoin/test/functional/data/util/getchainparams-signet-custom.json
new file mode 100644
index 00000000..4f5d5287
--- /dev/null
+++ b/depend/bitcoin/test/functional/data/util/getchainparams-signet-custom.json
@@ -0,0 +1,24 @@
+{
+  "chain": "signet",
+  "test_chain": true,
+  "genesis": "f61eee3b63a380a477a063af32b2bbc97c9ff9f01f2c4225e973988108000000",
+  "subsidy_halving_interval": 210000,
+  "signet": {
+    "challenge": "512102f7561d208dd9ae99bf497273e16f389bdbd6c4742ddb8e6b216e64fa2928ad8f51ae"
+  },
+  "pow": {
+    "limit": "00000377ae000000000000000000000000000000000000000000000000000000",
+    "target_spacing": 600,
+    "difficulty_retarget_interval": 2016,
+    "mindiff_blocks": "no"
+  },
+  "net": {
+    "default_port": 38333,
+    "magic": "a5df2dcb",
+    "dns_seeds": [
+    ]
+  },
+  "addresses": {
+    "bech32_hrp": "tb"
+  }
+}
diff --git a/depend/bitcoin/test/functional/data/util/getchainparams-signet.json b/depend/bitcoin/test/functional/data/util/getchainparams-signet.json
new file mode 100644
index 00000000..91905976
--- /dev/null
+++ b/depend/bitcoin/test/functional/data/util/getchainparams-signet.json
@@ -0,0 +1,26 @@
+{
+  "chain": "signet",
+  "test_chain": true,
+  "genesis": "f61eee3b63a380a477a063af32b2bbc97c9ff9f01f2c4225e973988108000000",
+  "subsidy_halving_interval": 210000,
+  "signet": {
+    "challenge": "512103ad5e0edad18cb1f0fc0d28a3d4f1f3e445640337489abb10404f2d1e086be430210359ef5021964fe22d6f8e05b2463c9540ce96883fe3b278760f048f5189f2e6c452ae"
+  },
+  "pow": {
+    "limit": "00000377ae000000000000000000000000000000000000000000000000000000",
+    "target_spacing": 600,
+    "difficulty_retarget_interval": 2016,
+    "mindiff_blocks": "no"
+  },
+  "net": {
+    "default_port": 38333,
+    "magic": "0a03cf40",
+    "dns_seeds": [
+      "seed.signet.bitcoin.sprovoost.nl.",
+      "seed.signet.achownodes.xyz."
+    ]
+  },
+  "addresses": {
+    "bech32_hrp": "tb"
+  }
+}
diff --git a/depend/bitcoin/test/functional/data/util/getchainparams-testnet.json b/depend/bitcoin/test/functional/data/util/getchainparams-testnet.json
new file mode 100644
index 00000000..2c543bdf
--- /dev/null
+++ b/depend/bitcoin/test/functional/data/util/getchainparams-testnet.json
@@ -0,0 +1,25 @@
+{
+  "chain": "test",
+  "test_chain": true,
+  "genesis": "43497fd7f826957108f4a30fd9cec3aeba79972084e90ead01ea330900000000",
+  "subsidy_halving_interval": 210000,
+  "pow": {
+    "limit": "00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+    "target_spacing": 600,
+    "difficulty_retarget_interval": 2016,
+    "mindiff_blocks": "yes"
+  },
+  "net": {
+    "default_port": 18333,
+    "magic": "0b110907",
+    "dns_seeds": [
+      "testnet-seed.bitcoin.jonasschnelli.ch.",
+      "seed.tbtc.petertodd.net.",
+      "testnet-seed.bluematt.me.",
+      "seed.testnet.achownodes.xyz."
+    ]
+  },
+  "addresses": {
+    "bech32_hrp": "tb"
+  }
+}
diff --git a/depend/bitcoin/test/functional/data/util/getchainparams-testnet4.json b/depend/bitcoin/test/functional/data/util/getchainparams-testnet4.json
new file mode 100644
index 00000000..a59dd106
--- /dev/null
+++ b/depend/bitcoin/test/functional/data/util/getchainparams-testnet4.json
@@ -0,0 +1,23 @@
+{
+  "chain": "testnet4",
+  "test_chain": true,
+  "genesis": "43f08bdab050e35b567c864b91f47f50ae725ae2de53bcfbbaf284da00000000",
+  "subsidy_halving_interval": 210000,
+  "pow": {
+    "limit": "00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+    "target_spacing": 600,
+    "difficulty_retarget_interval": 2016,
+    "mindiff_blocks": "bip94"
+  },
+  "net": {
+    "default_port": 48333,
+    "magic": "1c163f28",
+    "dns_seeds": [
+      "seed.testnet4.bitcoin.sprovoost.nl.",
+      "seed.testnet4.wiz.biz."
+    ]
+  },
+  "addresses": {
+    "bech32_hrp": "tb"
+  }
+}
diff --git a/depend/bitcoin/test/functional/feature_addrman.py b/depend/bitcoin/test/functional/feature_addrman.py
index a80261ec..1930a277 100755
--- a/depend/bitcoin/test/functional/feature_addrman.py
+++ b/depend/bitcoin/test/functional/feature_addrman.py
@@ -52,12 +52,13 @@ def set_test_params(self):
 
     def run_test(self):
         peers_dat = os.path.join(self.nodes[0].chain_path, "peers.dat")
-        init_error = lambda reason: (
-            f"Error: Invalid or corrupt peers.dat \\({reason}\\). If you believe this "
-            f"is a bug, please report it to {self.config['environment']['CLIENT_BUGREPORT']}. "
-            f'As a workaround, you can move the file \\("{re.escape(peers_dat)}"\\) out of the way \\(rename, '
-            "move, or delete\\) to have a new one created on the next start."
-        )
+        def init_error(reason):
+            return (
+                f"Error: Invalid or corrupt peers.dat \\({reason}\\). If you believe this "
+                f"is a bug, please report it to {self.config['environment']['CLIENT_BUGREPORT']}. "
+                f'As a workaround, you can move the file \\("{re.escape(peers_dat)}"\\) out of the way \\(rename, '
+                "move, or delete\\) to have a new one created on the next start."
+            )
 
         self.log.info("Check that mocked addrman is valid")
         self.stop_node(0)
diff --git a/depend/bitcoin/test/functional/feature_assumeutxo.py b/depend/bitcoin/test/functional/feature_assumeutxo.py
index ae130ee2..8727a992 100755
--- a/depend/bitcoin/test/functional/feature_assumeutxo.py
+++ b/depend/bitcoin/test/functional/feature_assumeutxo.py
@@ -139,12 +139,12 @@ def expected_error(msg):
         self.log.info("  - snapshot file with alternated but parsable UTXO data results in different hash")
         cases = [
             # (content, offset, wrong_hash, custom_message)
-            [b"\xff" * 32, 0, "77874d48d932a5cb7a7f770696f5224ff05746fdcf732a58270b45da0f665934", None],  # wrong outpoint hash
-            [(2).to_bytes(1, "little"), 32, None, "Bad snapshot format or truncated snapshot after deserializing 1 coins."],  # wrong txid coins count
+            [b"\xff" * 32, 0, "43bb0fcc50f3789d50ce41891810bbc571d549a32e2bbaabfc036f73ae2a23f9", None],  # wrong outpoint hash
+            [(2).to_bytes(1, "little"), 32, None, "Bad snapshot data after deserializing 2 coins."],  # wrong txid coins count
             [b"\xfd\xff\xff", 32, None, "Mismatch in coins count in snapshot metadata and actual snapshot data"],  # txid coins count exceeds coins left
-            [b"\x01", 33, "9f562925721e4f97e6fde5b590dbfede51e2204a68639525062ad064545dd0ea", None],  # wrong outpoint index
-            [b"\x82", 34, "161393f07f8ad71760b3910a914f677f2cb166e5bcf5354e50d46b78c0422d15", None],  # wrong coin code VARINT
-            [b"\x80", 34, "e6fae191ef851554467b68acff01ca09ad0a2e48c9b3dfea46cf7d35a7fd0ad0", None],  # another wrong coin code
+            [b"\x01", 33, "0b0e96fd9a556157a68d9e6fe6e2c7562169c730347565ce0725032f824bea34", None],  # wrong outpoint index
+            [b"\x83", 34, "52084c732f760fbcfb804d854815a9145111e93d7c7f3f7bfcb0ade1ea4f6b99", None],  # wrong coin code VARINT
+            [b"\x80", 34, "c1a1308fcf04cbb14fc777467eb5e98e77a921b66eac4ad47877d0b6ed7b15b1", None],  # another wrong coin code
             [b"\x84\x58", 34, None, "Bad snapshot data after deserializing 0 coins"],  # wrong coin case with height 364 and coinbase 0
             [
                 # compressed txout value + scriptpubkey
@@ -163,12 +163,12 @@ def expected_error(msg):
                 f.write(content)
                 f.write(valid_snapshot_contents[(5 + 2 + 4 + 32 + 8 + offset + len(content)):])
 
-            msg = custom_message if custom_message is not None else f"Bad snapshot content hash: expected d2b051ff5e8eef46520350776f4100dd710a63447a8e01d917e92e79751a63e2, got {wrong_hash}."
+            msg = custom_message if custom_message is not None else f"Bad snapshot content hash: expected 106b2c56233e378a824cf0d5ff2be42ed32c72f1605c9be288d00942908a40ac, got {wrong_hash}."
             expected_error(msg)
 
     def test_headers_not_synced(self, valid_snapshot_path):
         for node in self.nodes[1:]:
-            msg = "Unable to load UTXO snapshot: The base block header (7cc695046fec709f8c9394b6f928f81e81fd3ac20977bb68760fa1faa7916ea2) must appear in the headers chain. Make sure all headers are syncing, and call loadtxoutset again."
+            msg = "Unable to load UTXO snapshot: The base block header (0c552ced4721c249a389eb9b08cb8da261cd46f0e7b5f9d064d48f3113406853) must appear in the headers chain. Make sure all headers are syncing, and call loadtxoutset again."
             assert_raises_rpc_error(-32603, msg, node.loadtxoutset, valid_snapshot_path)
 
     def test_invalid_chainstate_scenarios(self):
@@ -228,7 +228,7 @@ def test_snapshot_block_invalidated(self, dump_output_path):
             block_hash = node.getblockhash(height)
             node.invalidateblock(block_hash)
             assert_equal(node.getblockcount(), height - 1)
-            msg = "Unable to load UTXO snapshot: The base block header (7cc695046fec709f8c9394b6f928f81e81fd3ac20977bb68760fa1faa7916ea2) is part of an invalid chain."
+            msg = "Unable to load UTXO snapshot: The base block header (0c552ced4721c249a389eb9b08cb8da261cd46f0e7b5f9d064d48f3113406853) is part of an invalid chain."
             assert_raises_rpc_error(-32603, msg, node.loadtxoutset, dump_output_path)
             node.reconsiderblock(block_hash)
 
@@ -469,7 +469,7 @@ def run_test(self):
         def check_dump_output(output):
             assert_equal(
                 output['txoutset_hash'],
-                "d2b051ff5e8eef46520350776f4100dd710a63447a8e01d917e92e79751a63e2")
+                "106b2c56233e378a824cf0d5ff2be42ed32c72f1605c9be288d00942908a40ac")
             assert_equal(output["nchaintx"], blocks[SNAPSHOT_BASE_HEIGHT].chain_tx)
 
         check_dump_output(dump_output)
@@ -499,7 +499,7 @@ def check_dump_output(output):
         dump_output4 = n0.dumptxoutset(path='utxos4.dat', rollback=prev_snap_height)
         assert_equal(
             dump_output4['txoutset_hash'],
-            "45ac2777b6ca96588210e2a4f14b602b41ec37b8b9370673048cc0af434a1ec8")
+            "147d1789e3e29a62e3e15b80078b50603afb5e1e70ea07001c94666afbde38df")
         assert_not_equal(sha256sum_file(dump_output['path']), sha256sum_file(dump_output4['path']))
 
         # Use a hash instead of a height
diff --git a/depend/bitcoin/test/functional/feature_bind_extra.py b/depend/bitcoin/test/functional/feature_bind_extra.py
index ad4c4b13..2b81e921 100755
--- a/depend/bitcoin/test/functional/feature_bind_extra.py
+++ b/depend/bitcoin/test/functional/feature_bind_extra.py
@@ -32,8 +32,8 @@ def set_test_params(self):
         self.num_nodes = 3
 
     def skip_test_if_missing_module(self):
-        # Due to OS-specific network stats queries, we only run on Linux.
-        self.skip_if_platform_not_linux()
+        self.skip_if_platform_not_posix()
+        self.skip_if_no_lsof_on_nonlinux()
 
     def setup_network(self):
         loopback_ipv4 = addr_to_hex("127.0.0.1")
diff --git a/depend/bitcoin/test/functional/feature_bind_port_discover.py b/depend/bitcoin/test/functional/feature_bind_port_discover.py
index 613b111b..407b1364 100755
--- a/depend/bitcoin/test/functional/feature_bind_port_discover.py
+++ b/depend/bitcoin/test/functional/feature_bind_port_discover.py
@@ -7,6 +7,9 @@
 """
 
 from test_framework.test_framework import BitcoinTestFramework, SkipTest
+from test_framework.test_node import (
+    FailedToStartError,
+)
 from test_framework.util import (
     assert_equal,
     assert_not_equal,
@@ -20,18 +23,14 @@
 # Linux:
 # First find your interfaces: ip addr show
 # Then use your actual interface names (replace INTERFACE_NAME with yours):
-# ip addr add 1.1.1.1/32 dev INTERFACE_NAME && ip addr add 2.2.2.2/32 dev INTERFACE_NAME  # to set up
-# ip addr del 1.1.1.1/32 dev INTERFACE_NAME && ip addr del 2.2.2.2/32 dev INTERFACE_NAME  # to remove it
-#
-# macOS:
-# ifconfig en0 alias 1.1.1.1 && ifconfig en0 alias 2.2.2.2  # to set up
-# ifconfig en0 1.1.1.1 -alias && ifconfig en0 2.2.2.2 -alias  # to remove it, after the test
+# ip addr add 1.1.1.5/32 dev INTERFACE_NAME && ip addr add 1111:1111::5/128 dev INTERFACE_NAME  # to set up
+# ip addr del 1.1.1.5/32 dev INTERFACE_NAME && ip addr del 1111:1111::5/128 dev INTERFACE_NAME  # to remove it
 #
-# FreeBSD:
-# ifconfig em0 1.1.1.1/32 alias && ifconfig wlan0 2.2.2.2/32 alias  # to set up
-# ifconfig em0 1.1.1.1 -alias && ifconfig wlan0 2.2.2.2 -alias  # to remove it, after the test
-ADDR1 = '1.1.1.1'
-ADDR2 = '2.2.2.2'
+# FreeBSD and MacOS:
+# ifconfig INTERFACE_NAME 1.1.1.5/32 alias && ifconfig INTERFACE_NAME inet6 1111:1111::5/128 alias  # to set up
+# ifconfig INTERFACE_NAME 1.1.1.5 -alias && ifconfig INTERFACE_NAME inet6 1111:1111::5 -alias       # to remove it, after the test
+ADDR1 = '1.1.1.5' # This and the address below are set in the CI environment, don't change it just here (keep them in sync).
+ADDR2 = '1111:1111::5'
 
 class BindPortDiscoverTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -69,19 +68,17 @@ def setup_nodes(self):
         # False. We do not want any -bind= thus set has_explicit_bind to True.
         for node in self.nodes:
             node.has_explicit_bind = True
-        self.start_nodes()
-
-    def add_options(self, parser):
-        parser.add_argument(
-            "--ihave1111and2222", action='store_true', dest="ihave1111and2222",
-            help=f"Run the test, assuming {ADDR1} and {ADDR2} are configured on the machine",
-            default=False)
 
-    def skip_test_if_missing_module(self):
-        if not self.options.ihave1111and2222:
-            raise SkipTest(
-                f"To run this test make sure that {ADDR1} and {ADDR2} (routable addresses) are "
-                "assigned to the interfaces on this machine and rerun with --ihave1111and2222")
+        try:
+            self.start_nodes()
+        except FailedToStartError as e:
+            self.cleanup_partially_started_nodes()
+            if 'Unable to bind to ' in str(e):
+                raise SkipTest(
+                    f'To run this test make sure that {ADDR1} and {ADDR2} '
+                    '(routable addresses) are assigned to non-loopback '
+                    'interfaces on this machine')
+            raise
 
     def run_test(self):
         self.log.info(
diff --git a/depend/bitcoin/test/functional/feature_bind_port_externalip.py b/depend/bitcoin/test/functional/feature_bind_port_externalip.py
index 0e7764db..074797ac 100755
--- a/depend/bitcoin/test/functional/feature_bind_port_externalip.py
+++ b/depend/bitcoin/test/functional/feature_bind_port_externalip.py
@@ -7,17 +7,24 @@
 """
 
 from test_framework.test_framework import BitcoinTestFramework, SkipTest
+from test_framework.test_node import (
+    FailedToStartError,
+)
 from test_framework.util import assert_equal, p2p_port
 
-# We need to bind to a routable address for this test to exercise the relevant code.
-# To set a routable address on the machine use:
+# We need to bind to a routable address for this test to exercise the relevant
+# code. Those addresses must be on an interface that is UP and is not a loopback
+# interface (IFF_LOOPBACK).
+# To set these routable addresses on the machine, use:
 # Linux:
-# ifconfig lo:0 1.1.1.1/32 up  # to set up
-# ifconfig lo:0 down  # to remove it, after the test
-# FreeBSD:
-# ifconfig lo0 1.1.1.1/32 alias  # to set up
-# ifconfig lo0 1.1.1.1 -alias  # to remove it, after the test
-ADDR = '1.1.1.1'
+# First find your interfaces: ip addr show
+# Then use your actual interface names (replace INTERFACE_NAME with yours):
+# ip addr add 1.1.1.5/32 dev INTERFACE_NAME  # to set up
+# ip addr del 1.1.1.5/32 dev INTERFACE_NAME  # to remove it
+# FreeBSD and MacOS:
+# ifconfig INTERFACE_NAME 1.1.1.5/32 alias  # to set up
+# ifconfig INTERFACE_NAME 1.1.1.5 -alias  # to remove it, after the test
+ADDR = '1.1.1.5' # This is set in the CI environment, don't change it just here (keep them in sync).
 
 # array of tuples [arguments, expected port in localaddresses]
 EXPECTED = [
@@ -45,17 +52,25 @@ def set_test_params(self):
         self.num_nodes = len(EXPECTED)
         self.extra_args = list(map(lambda e: e[0], EXPECTED))
 
-    def add_options(self, parser):
-        parser.add_argument(
-            "--ihave1111", action='store_true', dest="ihave1111",
-            help=f"Run the test, assuming {ADDR} is configured on the machine",
-            default=False)
+    def setup_network(self):
+        self.setup_nodes()
 
-    def skip_test_if_missing_module(self):
-        if not self.options.ihave1111:
-            raise SkipTest(
-                f"To run this test make sure that {ADDR} (a routable address) is assigned "
-                "to one of the interfaces on this machine and rerun with --ihave1111")
+    def setup_nodes(self):
+        self.add_nodes(self.num_nodes, self.extra_args)
+        # TestNode.start() will add -bind= to extra_args if has_explicit_bind is
+        # False. We do not want any -bind= thus set has_explicit_bind to True.
+        for node in self.nodes:
+            node.has_explicit_bind = True
+        try:
+            self.start_nodes()
+        except FailedToStartError as e:
+            self.cleanup_partially_started_nodes()
+            if 'Unable to bind to ' in str(e):
+                raise SkipTest(
+                    f'To run this test make sure that {ADDR} '
+                    '(routable address) is assigned to non-loopback '
+                    'interface on this machine')
+            raise
 
     def run_test(self):
         self.log.info("Test the proper port is used for -externalip=")
diff --git a/depend/bitcoin/test/functional/feature_block.py b/depend/bitcoin/test/functional/feature_block.py
index 5600eeec..6e3f342c 100755
--- a/depend/bitcoin/test/functional/feature_block.py
+++ b/depend/bitcoin/test/functional/feature_block.py
@@ -92,6 +92,9 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.extra_args = [[
             '-testactivationheight=bip34@2',
+            # Override the functional-test default of 1 thread to exercise the multi-threaded
+            # prevout prefetching path in this block-heavy test.
+            '-prevoutfetchthreads=8',
         ]]
 
     def add_options(self, parser):
diff --git a/depend/bitcoin/test/functional/feature_coinstatsindex_compatibility.py b/depend/bitcoin/test/functional/feature_coinstatsindex_compatibility.py
index 855dc74d..21496a9c 100755
--- a/depend/bitcoin/test/functional/feature_coinstatsindex_compatibility.py
+++ b/depend/bitcoin/test/functional/feature_coinstatsindex_compatibility.py
@@ -16,7 +16,6 @@
 class CoinStatsIndexTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
-        self.supports_cli = False
         self.extra_args = [["-coinstatsindex"],["-coinstatsindex"]]
 
     def skip_test_if_missing_module(self):
diff --git a/depend/bitcoin/test/functional/feature_config_args.py b/depend/bitcoin/test/functional/feature_config_args.py
index feca0f16..62590266 100755
--- a/depend/bitcoin/test/functional/feature_config_args.py
+++ b/depend/bitcoin/test/functional/feature_config_args.py
@@ -265,6 +265,21 @@ def test_args_log(self):
             ])
         self.stop_node(0)
 
+    def test_empty_addnode(self):
+        self.log.info("Test empty addnode configuration values are ignored")
+        node = self.nodes[0]
+        util.append_config(node.datadir_path, ["addnode="])
+
+        with node.assert_debug_log(expected_msgs=["Ignoring empty -addnode value"]):
+            # Values consisting of whitespace only are trimmed away by the
+            # config file parser, so they can only be passed on the command
+            # line. Non-empty values are unaffected.
+            self.start_node(0, extra_args=["-addnode= ", "-addnode=some.node"])
+        util.assert_equal([added["addednode"] for added in node.getaddednodeinfo()], ["some.node"])
+        self.stop_node(0)
+
+        node.replace_in_config([("addnode=\n", "")])
+
     def test_networkactive(self):
         self.log.info('Test -networkactive option')
         with self.nodes[0].assert_debug_log(expected_msgs=['SetNetworkActive: true\n']):
@@ -325,13 +340,15 @@ def test_seed_peers(self):
 
         # No peers.dat exists and -dnsseed=0
         # We expect the node will fallback immediately to fixed seeds
+        # An empty -addnode value is ignored, so it must not delay the fallback
+        # either.
         assert not peer_dat.exists()
         with self.nodes[0].assert_debug_log(expected_msgs=[
                 "Loaded 0 addresses from peers.dat",
                 "DNS seeding disabled",
                 "Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet) and neither -addnode nor -seednode are provided\n",
         ], timeout=2):
-            self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1'])
+            self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1', '-addnode='])
         self.stop_node(0)
         self.nodes[0].assert_start_raises_init_error(['-dnsseed=1', '-onlynet=i2p', '-i2psam=127.0.0.1:7656'], "Error: Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6")
 
@@ -516,6 +533,7 @@ def test_testnet3_deprecation_msg(self):
     def run_test(self):
         self.test_log_buffer()
         self.test_args_log()
+        self.test_empty_addnode()
         self.test_seed_peers()
         self.test_networkactive()
         self.test_connect_with_seednode()
diff --git a/depend/bitcoin/test/functional/feature_dbcrash.py b/depend/bitcoin/test/functional/feature_dbcrash.py
index cc94be78..24e663af 100755
--- a/depend/bitcoin/test/functional/feature_dbcrash.py
+++ b/depend/bitcoin/test/functional/feature_dbcrash.py
@@ -25,8 +25,6 @@
          - restart until recovery succeeds
          - check that utxo matches node3 using gettxoutsetinfo"""
 
-import errno
-import http.client
 import random
 import time
 
@@ -49,7 +47,6 @@ class ChainstateWriteCrashTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 4
         self.rpc_timeout = 480
-        self.supports_cli = False
 
         # Set -maxmempool=0 to turn off mempool memory sharing with dbcache
         self.base_args = [
@@ -73,7 +70,7 @@ def setup_network(self):
         self.start_nodes()
         # Leave them unconnected, we'll use submitblock directly in this test
 
-    def restart_node(self, node_index, expected_tip):
+    def restart_node(self, node_index, *, expected_tip):
         """Start up a given node id, wait for the tip to reach the given block hash, and calculate the utxo hash.
 
         Exceptions during startup or subsequent RPC calls should indicate a node crash (due to -dbcrashratio), in which case we try again. Give up
@@ -90,7 +87,7 @@ def restart_node(self, node_index, expected_tip):
             except Exception:
                 # An exception here should mean the node is about to crash.
                 # If bitcoind exits, then try again.  wait_for_node_exit()
-                # should raise an exception if bitcoind doesn't exit.
+                # enforces that bitcoind crashed.
                 self.wait_for_node_exit(node_index, timeout=10)
             self.crashed_on_restart += 1
 
@@ -105,22 +102,15 @@ def submit_block_catch_error(self, node_index, block):
         """Try submitting a block to the given node.
 
         Catch any exceptions that indicate the node has crashed.
+        The caller will check that a crash happened.
         Returns true if the block was submitted successfully; false otherwise."""
 
         try:
             self.nodes[node_index].submitblock(block)
             return True
-        except (http.client.CannotSendRequest, http.client.RemoteDisconnected) as e:
+        except Exception as e:
             self.log.debug(f"node {node_index} submitblock raised exception: {e}")
             return False
-        except OSError as e:
-            self.log.debug(f"node {node_index} submitblock raised OSError exception: errno={e.errno}")
-            if e.errno in [errno.EPIPE, errno.ECONNREFUSED, errno.ECONNRESET]:
-                # The node has likely crashed
-                return False
-            else:
-                # Unexpected exception, raise
-                raise
 
     def sync_node3blocks(self, block_hashes):
         """Use submitblock to sync node3's chain with the other nodes
@@ -146,9 +136,10 @@ def sync_node3blocks(self, block_hashes):
                 if not self.submit_block_catch_error(i, block):
                     # TODO: more carefully check that the crash is due to -dbcrashratio
                     # (change the exit code perhaps, and check that here?)
+                    # wait_for_node_exit() enforces that bitcoind crashed.
                     self.wait_for_node_exit(i, timeout=30)
                     self.log.debug(f"Restarting node {i} after block hash {block_hash}")
-                    nodei_utxo_hash = self.restart_node(i, block_hash)
+                    nodei_utxo_hash = self.restart_node(i, expected_tip=block_hash)
                     assert nodei_utxo_hash is not None
                     self.restart_counts[i] += 1
                 else:
@@ -177,9 +168,10 @@ def verify_utxo_hash(self):
         for i in range(3):
             try:
                 nodei_utxo_hash = self.nodes[i].gettxoutsetinfo()['hash_serialized_3']
-            except OSError:
+            except Exception:
                 # probably a crash on db flushing
-                nodei_utxo_hash = self.restart_node(i, self.nodes[3].getbestblockhash())
+                self.wait_for_node_exit(i, timeout=10)
+                nodei_utxo_hash = self.restart_node(i, expected_tip=self.nodes[3].getbestblockhash())
             assert_equal(nodei_utxo_hash, node3_utxo_hash)
 
     def generate_small_transactions(self, node, count, utxo_list):
@@ -193,12 +185,12 @@ def generate_small_transactions(self, node, count, utxo_list):
                 # Sanity check -- if we chose inputs that are too small, skip
                 continue
 
-            self.wallet.send_self_transfer_multi(
-                from_node=node,
+            tx = self.wallet.create_self_transfer_multi(
                 utxos_to_spend=utxos_to_spend,
                 num_outputs=3,
                 fee_per_output=FEE // 3,
             )
+            node.sendrawtransaction(hexstring=tx["hex"], maxfeerate=0)
             num_transactions += 1
 
     def run_test(self):
diff --git a/depend/bitcoin/test/functional/feature_fee_estimation.py b/depend/bitcoin/test/functional/feature_fee_estimation.py
index 24a9baaa..73ebbddc 100755
--- a/depend/bitcoin/test/functional/feature_fee_estimation.py
+++ b/depend/bitcoin/test/functional/feature_fee_estimation.py
@@ -414,9 +414,16 @@ def clear_estimates(self):
 
     def broadcast_many(self, broadcaster, feerate, count, miner=None):
         """Broadcast and maybe mine some number of transactions with a specified fee rate."""
+        tx_batch = []
         for _ in range(count):
-            tx = self.wallet.send_self_transfer(from_node=broadcaster, fee_rate=feerate, confirmed_only=True, utxo_to_spend=self.confutxo.pop(0))
+            tx = self.wallet.create_self_transfer(fee_rate=feerate, utxo_to_spend=self.confutxo.pop(0))
             self.memutxo.append(tx["new_utxo"])
+            tx_batch.append(tx)
+        # To speed up the test, submit the transactions in batches to the nodes directly
+        # avoiding having to wait for p2p to propagate them between the nodes.
+        batch_send_tx = [broadcaster.sendrawtransaction.get_request(hexstring=tx["hex"]) for tx in tx_batch]
+        for node in self.nodes:
+            node.batch(batch_send_tx)
         self.sync_mempools(wait=0.1, nodes=[self.nodes[0], self.nodes[1], self.nodes[2]])
         if miner:
             mined = miner.getblock(self.generate(miner, 1)[0], True)["tx"]
diff --git a/depend/bitcoin/test/functional/feature_framework_unit_tests.py b/depend/bitcoin/test/functional/feature_framework_unit_tests.py
index 2a796f5b..7da6fb53 100755
--- a/depend/bitcoin/test/functional/feature_framework_unit_tests.py
+++ b/depend/bitcoin/test/functional/feature_framework_unit_tests.py
@@ -21,12 +21,14 @@
     "compressor",
     "crypto.chacha20",
     "crypto.ellswift",
+    "extendedkey",
     "key",
     "messages",
     "crypto.muhash",
     "crypto.poly1305",
     "crypto.ripemd160",
     "crypto.secp256k1",
+    "crypto.siphash",
     "script",
     "script_util",
     "segwit_addr",
diff --git a/depend/bitcoin/test/functional/feature_index_prune.py b/depend/bitcoin/test/functional/feature_index_prune.py
index 49520be0..89c8acd4 100755
--- a/depend/bitcoin/test/functional/feature_index_prune.py
+++ b/depend/bitcoin/test/functional/feature_index_prune.py
@@ -5,24 +5,24 @@
 """Test indices in conjunction with prune."""
 import concurrent.futures
 import os
-from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.test_node import TestNode
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
     assert_raises_rpc_error,
+    JSONRPCException,
 )
 
 from typing import List, Any
 
 def send_batch_request(node: TestNode, method: str, params: List[Any]) -> List[Any]:
     """Send batch request and parse all results"""
-    data = [{"method": method, "params": p} for p in params]
+    data = [getattr(node, method).get_request(*p) for p in params]
     response = node.batch(data)
     result = []
     for item in response:
-        assert item["error"] is None, item["error"]
+        assert "error" not in item, item["error"]
         result.append(item["result"])
 
     return result
@@ -100,7 +100,7 @@ def run_test(self):
                 pruneheight_new = node.pruneblockchain(400)
                 # the prune heights used here and below are magic numbers that are determined by the
                 # thresholds at which block files wrap, so they depend on disk serialization and default block file size.
-                assert_equal(pruneheight_new, 248)
+                assert_equal(pruneheight_new, 249)
 
         self.log.info("check if we can access the tips blockfilter and coinstats when we have pruned some blocks")
         tip = self.nodes[0].getbestblockhash()
@@ -117,8 +117,8 @@ def run_test(self):
             assert node.gettxoutsetinfo(hash_type="muhash", hash_or_height=height_hash)['muhash']
 
         # mine and sync index up to a height that will later be the pruneheight
-        self.generate(self.nodes[0], 51)
-        self.sync_index(height=751)
+        self.generate(self.nodes[0], 54)
+        self.sync_index(height=754)
 
         self.restart_without_indices()
 
@@ -130,12 +130,12 @@ def run_test(self):
             msg = "Querying specific block heights requires coinstatsindex"
             assert_raises_rpc_error(-8, msg, node.gettxoutsetinfo, "muhash", height_hash)
 
-        self.generate(self.nodes[0], 749)
+        self.generate(self.nodes[0], 746)
 
         self.log.info("prune exactly up to the indices best blocks while the indices are disabled")
         for i in range(3):
             pruneheight_2 = self.nodes[i].pruneblockchain(1000)
-            assert_equal(pruneheight_2, 750)
+            assert_equal(pruneheight_2, 753)
             # Restart the nodes again with the indices activated
             self.restart_node(i, extra_args=self.extra_args[i])
 
@@ -195,7 +195,7 @@ def run_test(self):
         for node in self.nodes[:2]:
             with node.assert_debug_log(['limited pruning to height 2489']):
                 pruneheight_new = node.pruneblockchain(2500)
-                assert_equal(pruneheight_new, 2005)
+                assert_equal(pruneheight_new, 2013)
 
         self.log.info("ensure that prune locks don't prevent indices from failing in a reorg scenario")
         with self.nodes[0].assert_debug_log(['basic block filter index prune lock moved back to 2480']):
diff --git a/depend/bitcoin/test/functional/feature_init.py b/depend/bitcoin/test/functional/feature_init.py
index 259e07b1..18faba33 100755
--- a/depend/bitcoin/test/functional/feature_init.py
+++ b/depend/bitcoin/test/functional/feature_init.py
@@ -63,6 +63,7 @@ def sigterm_node():
                 node.process.terminate()
             assert_equal(0, node.process.wait())
 
+        reindex_log_line = b'Reindexing block file blk00000.dat'
         lines_to_terminate_after = [
             b'Validating signatures for all blocks',
             b'scheduler thread start',
@@ -77,26 +78,30 @@ def sigterm_node():
             b'net thread start',
             b'addcon thread start',
             b'initload thread start',
-            b'txindex thread start',
-            b'block filter index thread start',
-            b'coinstatsindex thread start',
-            b'txospenderindex thread start',
+            b'txidx thread start',
+            b'blkfltbscidx thread start',
+            b'coinstatsidx thread start',
+            b'txospenderidx thread start',
             b'msghand thread start',
             b'net thread start',
             b'addcon thread start',
         ]
         if self.is_wallet_compiled():
             lines_to_terminate_after.append(b'Verifying wallet')
+        lines_to_terminate_after.append(reindex_log_line)
 
         for terminate_line in lines_to_terminate_after:
             self.log.info(f"Starting node and will terminate after line {terminate_line}")
             with node.busy_wait_for_debug_log([terminate_line]):
+                extra_args = [*ALL_INDEX_ARGS]
+                if terminate_line == reindex_log_line:
+                    extra_args += ['-reindex']
                 if platform.system() == 'Windows':
                     # CREATE_NEW_PROCESS_GROUP is required in order to be able
                     # to terminate the child without terminating the test.
-                    node.start(extra_args=ALL_INDEX_ARGS, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
+                    node.start(extra_args=extra_args, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
                 else:
-                    node.start(extra_args=ALL_INDEX_ARGS)
+                    node.start(extra_args=extra_args)
             self.log.debug("Terminating node after terminate line was found")
             sigterm_node()
 
@@ -323,12 +328,48 @@ def init_empty_test(self):
         for option in options:
             self.restart_node(1, option)
 
+    def restart_node_with_fd_limit(self, limit):
+        """Restart node 1 with a given soft RLIMIT_NOFILE. Skips if the limit cannot be set."""
+        import resource
+        soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+        try:
+            resource.setrlimit(resource.RLIMIT_NOFILE, (limit, hard))
+        except (ValueError, OSError):
+            self.log.info(f"Skipping rlimit test: cannot set soft limit (hard={hard})")
+            return
+        try:
+            self.restart_node(1)
+            self.log.debug(f"Node started successfully with RLIM_INFINITY limit (soft={limit})")
+        finally:
+            resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard))
+            self.log.debug(f"Restored previous RLIMIT_NOFILE limits (soft={soft}, hard={hard})")
+
+    def init_rlimit_test(self):
+        """Test that bitcoind starts correctly when the soft RLIMIT_NOFILE limit is RLIM_INFINITY."""
+        if self.RLIM_INFINITY is None:
+            self.log.info("Skipping: resource module not available")
+            return
+
+        self.log.info("Testing node startup with RLIM_INFINITY fd limit")
+        self.restart_node_with_fd_limit(self.RLIM_INFINITY)
+
+    def init_rlimit_large_test(self):
+        """Test that bitcoind starts correctly when the soft RLIMIT_NOFILE limit is above INT_MAX."""
+        if self.RLIM_INFINITY is None:
+            self.log.info("Skipping: resource module not available")
+            return
+
+        self.log.info("Testing node startup with fd limit above INT_MAX")
+        self.restart_node_with_fd_limit(1 << 31)
+
     def run_test(self):
         self.init_pid_test()
         self.init_stress_test_interrupt()
         self.init_stress_test_removals()
         self.break_wait_test()
         self.init_empty_test()
+        self.init_rlimit_test()
+        self.init_rlimit_large_test()
 
 
 if __name__ == '__main__':
diff --git a/depend/bitcoin/test/functional/feature_loadblock.py b/depend/bitcoin/test/functional/feature_loadblock.py
index fc942cad..417ecff5 100755
--- a/depend/bitcoin/test/functional/feature_loadblock.py
+++ b/depend/bitcoin/test/functional/feature_loadblock.py
@@ -25,7 +25,6 @@ class LoadblockTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 2
-        self.supports_cli = False
 
     def run_test(self):
         self.nodes[1].setnetworkactive(state=False)
diff --git a/depend/bitcoin/test/functional/feature_logging.py b/depend/bitcoin/test/functional/feature_logging.py
index 07420733..fd3b8097 100755
--- a/depend/bitcoin/test/functional/feature_logging.py
+++ b/depend/bitcoin/test/functional/feature_logging.py
@@ -37,8 +37,8 @@ def run_test(self):
         invdir = self.relative_log_path("foo")
         invalidname = os.path.join("foo", "foo.log")
         self.stop_node(0)
-        exp_stderr = r"Error: Could not open debug log file \S+$"
-        self.nodes[0].assert_start_raises_init_error([f"-debuglogfile={invalidname}"], exp_stderr, match=ErrorMatch.FULL_REGEX)
+        exp_stderr = "Error: Could not open debug log file "
+        self.nodes[0].assert_start_raises_init_error([f"-debuglogfile={invalidname}"], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
         assert not os.path.isfile(os.path.join(invdir, "foo.log"))
 
         # check that invalid log (relative) works after path exists
@@ -51,7 +51,7 @@ def run_test(self):
         self.stop_node(0)
         invdir = os.path.join(self.options.tmpdir, "foo")
         invalidname = os.path.join(invdir, "foo.log")
-        self.nodes[0].assert_start_raises_init_error([f"-debuglogfile={invalidname}"], exp_stderr, match=ErrorMatch.FULL_REGEX)
+        self.nodes[0].assert_start_raises_init_error([f"-debuglogfile={invalidname}"], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
         assert not os.path.isfile(os.path.join(invdir, "foo.log"))
 
         # check that invalid log (absolute) works after path exists
diff --git a/depend/bitcoin/test/functional/feature_notifications.py b/depend/bitcoin/test/functional/feature_notifications.py
index 71500cc6..e983d5a2 100755
--- a/depend/bitcoin/test/functional/feature_notifications.py
+++ b/depend/bitcoin/test/functional/feature_notifications.py
@@ -11,6 +11,7 @@
     create_block,
 )
 from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
@@ -31,6 +32,10 @@
 def notify_outputname(walletname, txid):
     return txid if platform.system() == 'Windows' else f'{walletname}_{txid}'
 
+def shell_escape_posix(arg):
+    # Identical to ShellEscape() in the C++ code
+    return "'" + arg.replace("'", "'\"'\"'") + "'"
+
 
 class NotificationsTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -51,13 +56,18 @@ def setup_network(self):
         os.mkdir(self.walletnotify_dir)
         os.mkdir(self.shutdownnotify_dir)
 
+        if platform.system() == 'Windows':
+            walletnotify_path = f"\"{os.path.join(self.walletnotify_dir, notify_outputname('%w', '%s'))}\""
+        else:
+            walletnotify_path = f"{shell_escape_posix(os.path.join(self.walletnotify_dir, ''))}{notify_outputname('%w', '%s')}"
+
         # -alertnotify and -blocknotify on node0, walletnotify on node1
         self.extra_args = [[
-            f"-alertnotify=echo %s >> {self.alertnotify_file}",
-            f"-blocknotify=echo > {os.path.join(self.blocknotify_dir, '%s')}",
-            f"-shutdownnotify=echo > {self.shutdownnotify_file}",
+            f"-alertnotify=echo %s >> \"{self.alertnotify_file}\"",
+            f"-blocknotify=echo > \"{os.path.join(self.blocknotify_dir, '%s')}\"",
+            f"-shutdownnotify=echo > \"{self.shutdownnotify_file}\"",
         ], [
-            f"-walletnotify=echo %h_%b > {os.path.join(self.walletnotify_dir, notify_outputname('%w', '%s'))}",
+            f"-walletnotify=echo %h_%b > {walletnotify_path}",
         ]]
         self.wallet_names = [self.default_wallet_name, self.wallet]
         super().setup_network()
@@ -65,7 +75,7 @@ def setup_network(self):
     def run_test(self):
         if self.is_wallet_compiled():
             # Setup the descriptors to be imported to the wallet
-            xpriv = "tprv8ZgxMBicQKsPfHCsTwkiM1KT56RXbGGTqvc2hgqzycpwbHqqpcajQeMRZoBD35kW4RtyCemu6j34Ku5DEspmgjKdt2qe4SvRch5Kk8B8A2v"
+            xpriv = ExtendedPrivateKey.generate().to_string()
             desc_imports = [{
                 "desc": descsum_create(f"wpkh({xpriv}/0/*)"),
                 "timestamp": 0,
diff --git a/depend/bitcoin/test/functional/feature_proxy.py b/depend/bitcoin/test/functional/feature_proxy.py
index fa4e966e..37a6e2f4 100755
--- a/depend/bitcoin/test/functional/feature_proxy.py
+++ b/depend/bitcoin/test/functional/feature_proxy.py
@@ -135,6 +135,9 @@ def setup_nodes(self):
         if self.have_unix_sockets:
             args[5] = ['-listen', f'-proxy=unix:{socket_path}']
             args[6] = ['-listen', f'-onion=unix:{socket_path}']
+        # This test launches many nodes; disable prevout prefetching so we don't spin up a
+        # thread pool for each one.
+        args = [a + ['-prevoutfetchthreads=0'] for a in args]
         self.add_nodes(self.num_nodes, extra_args=args)
         self.start_nodes()
 
diff --git a/depend/bitcoin/test/functional/feature_prune_stale_fork.py b/depend/bitcoin/test/functional/feature_prune_stale_fork.py
new file mode 100755
index 00000000..5badca0a
--- /dev/null
+++ b/depend/bitcoin/test/functional/feature_prune_stale_fork.py
@@ -0,0 +1,39 @@
+#!/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.
+"""Test node restart with a pruned stale-fork block whose parent has no transactions."""
+
+from test_framework.blocktools import create_empty_fork
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal, assert_raises_rpc_error
+
+
+class FeaturePruneStaleForkTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.extra_args = [["-prune=1", "-fastprune"]]
+
+    def run_test(self):
+        node = self.nodes[0]
+
+        self.log.info("Create a 2-block stale fork: parent has no transactions, child has transactions")
+        [side_parent, side_child] = create_empty_fork(node, 2)
+
+        node.submitheader(side_parent.serialize().hex())
+        node.submitblock(side_child.serialize().hex())
+        assert_equal(node.getblockheader(side_parent.hash_hex)["nTx"], 0)
+        assert_equal(node.getblockheader(side_child.hash_hex)["nTx"], 1)
+
+        self.log.info("Advance and prune so the stale-fork child's block data is removed from disk")
+        self.generate(node, 500)
+        node.pruneblockchain(node.getblockcount() - 100)
+        assert_raises_rpc_error(-1, "Block not available (pruned data)", node.getblock, side_child.hash_hex)
+
+        self.log.info("Restart and mine; node must reload cleanly after the stale-fork child was pruned")
+        self.restart_node(0)
+        self.generate(node, 1)
+
+
+if __name__ == '__main__':
+    FeaturePruneStaleForkTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/feature_pruning.py b/depend/bitcoin/test/functional/feature_pruning.py
index c935ea95..0a8f8e44 100755
--- a/depend/bitcoin/test/functional/feature_pruning.py
+++ b/depend/bitcoin/test/functional/feature_pruning.py
@@ -6,7 +6,6 @@
 
 WARNING:
 This test uses 4GB of disk space.
-This test takes 30 mins or more (up to 2 hours)
 """
 import os
 
@@ -236,8 +235,8 @@ def reorg_back(self):
         self.nodes[2].getblock(self.nodes[2].getblockhash(self.forkheight))
 
         first_reorg_height = self.nodes[2].getblockcount()
-        curchainhash = self.nodes[2].getblockhash(self.mainchainheight)
-        self.nodes[2].invalidateblock(curchainhash)
+        block_hash_1295 = self.nodes[2].getblockhash(1295)
+        self.nodes[2].invalidateblock(block_hash_1295)
         goalbestheight = self.mainchainheight
         goalbesthash = self.mainchainhash2
 
@@ -252,7 +251,7 @@ def reorg_back(self):
         if self.nodes[2].getblockcount() < self.mainchainheight:
             blocks_to_mine = first_reorg_height + 1 - self.mainchainheight
             self.log.info(f"Rewind node 0 to prev main chain to mine longer chain to trigger redownload. Blocks needed: {blocks_to_mine}")
-            self.nodes[0].invalidateblock(curchainhash)
+            self.nodes[0].invalidateblock(block_hash_1295)
             assert_equal(self.nodes[0].getblockcount(), self.mainchainheight)
             assert_equal(self.nodes[0].getbestblockhash(), self.mainchainhash2)
             goalbesthash = self.generate(self.nodes[0], blocks_to_mine, sync_fun=self.no_op)[-1]
@@ -351,17 +350,15 @@ def test_wallet_rescan(self):
         self.log.info("Stop and start pruning node to trigger wallet rescan")
         self.restart_node(2, extra_args=["-prune=550"])
 
-        wallet_info = self.nodes[2].getwalletinfo()
-        self.wait_until(lambda: wallet_info["scanning"] == False)
-        self.wait_until(lambda: wallet_info["lastprocessedblock"]["height"] == self.nodes[2].getblockcount())
+        self.wait_until(lambda: self.nodes[2].getwalletinfo()["scanning"] is False)
+        self.wait_until(lambda: self.nodes[2].getwalletinfo()["lastprocessedblock"]["height"] == self.nodes[2].getblockcount())
 
         # check that wallet loads successfully when restarting a pruned node after IBD.
         # this was reported to fail in #7494.
         self.restart_node(5, extra_args=["-prune=550", "-blockfilterindex=1"]) # restart to trigger rescan
 
-        wallet_info = self.nodes[5].getwalletinfo()
-        self.wait_until(lambda: wallet_info["scanning"] == False)
-        self.wait_until(lambda: wallet_info["lastprocessedblock"]["height"] == self.nodes[0].getblockcount())
+        self.wait_until(lambda: self.nodes[5].getwalletinfo()["scanning"] is False)
+        self.wait_until(lambda: self.nodes[5].getwalletinfo()["lastprocessedblock"]["height"] == self.nodes[0].getblockcount())
 
     def run_test(self):
         self.log.info("Warning! This test requires 4GB of disk space")
diff --git a/depend/bitcoin/test/functional/feature_reindex.py b/depend/bitcoin/test/functional/feature_reindex.py
index 1e6c1490..cf45663b 100755
--- a/depend/bitcoin/test/functional/feature_reindex.py
+++ b/depend/bitcoin/test/functional/feature_reindex.py
@@ -20,6 +20,7 @@
 
 class ReindexTest(BitcoinTestFramework):
     def set_test_params(self):
+        self.rpc_timeout *= 2  # To avoid timeout when generating the reindex chain
         self.setup_clean_chain = True
         self.num_nodes = 1
 
diff --git a/depend/bitcoin/test/functional/feature_reindex_readonly.py b/depend/bitcoin/test/functional/feature_reindex_readonly.py
index 889d0c2a..336fab69 100755
--- a/depend/bitcoin/test/functional/feature_reindex_readonly.py
+++ b/depend/bitcoin/test/functional/feature_reindex_readonly.py
@@ -35,13 +35,14 @@ def reindex_readonly(self):
         filename = self.nodes[0].chain_path / "blocks" / "blk00000.dat"
         filename.chmod(stat.S_IREAD)
 
-        undo_immutable = lambda: None
+        undo_immutable_cmd = None
+        should_reindex = True
         # Linux
         try:
             subprocess.run(['chattr'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             try:
                 subprocess.run(['chattr', '+i', filename], capture_output=True, check=True)
-                undo_immutable = lambda: subprocess.check_call(['chattr', '-i', filename])
+                undo_immutable_cmd = ['chattr', '-i', filename]
                 self.log.info("Made file immutable with chattr")
             except subprocess.CalledProcessError as e:
                 self.log.warning(str(e))
@@ -53,14 +54,14 @@ def reindex_readonly(self):
                     self.log.warning("Return early on Linux under root, because chattr failed.")
                     self.log.warning("This should only happen due to missing capabilities in a container.")
                     self.log.warning("Make sure to --cap-add LINUX_IMMUTABLE if you want to run this test.")
-                    undo_immutable = False
+                    should_reindex = False
         except Exception:
             # macOS, and *BSD
             try:
                 subprocess.run(['chflags'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                 try:
                     subprocess.run(['chflags', 'uchg', filename], capture_output=True, check=True)
-                    undo_immutable = lambda: subprocess.check_call(['chflags', 'nouchg', filename])
+                    undo_immutable_cmd = ['chflags', 'nouchg', filename]
                     self.log.info("Made file immutable with chflags")
                 except subprocess.CalledProcessError as e:
                     self.log.warning(str(e))
@@ -70,16 +71,17 @@ def reindex_readonly(self):
                         self.log.warning(f"stderr: {e.stderr}")
                     if os.getuid() == 0:
                         self.log.warning("Return early on BSD under root, because chflags failed.")
-                        undo_immutable = False
+                        should_reindex = False
             except Exception:
                 pass
 
-        if undo_immutable:
+        if should_reindex:
             self.log.debug("Attempt to restart and reindex the node with the unwritable block file")
             with self.nodes[0].assert_debug_log(["Reindexing finished"], timeout=60):
                 self.start_node(0, extra_args=['-reindex', '-fastprune'])
             assert_equal(block_count, self.nodes[0].getblockcount())
-            undo_immutable()
+            if undo_immutable_cmd is not None:
+                subprocess.check_call(undo_immutable_cmd)
 
         filename.chmod(0o777)
 
diff --git a/depend/bitcoin/test/functional/feature_segwit.py b/depend/bitcoin/test/functional/feature_segwit.py
index 35c9459c..05c44352 100755
--- a/depend/bitcoin/test/functional/feature_segwit.py
+++ b/depend/bitcoin/test/functional/feature_segwit.py
@@ -11,6 +11,7 @@
     script_to_p2wsh,
 )
 from test_framework.blocktools import (
+    NORMAL_GBT_REQUEST_PARAMS,
     send_to_witness,
     witness_script,
 )
@@ -109,7 +110,7 @@ def run_test(self):
 
         self.log.info("Verify sigops are counted in GBT with pre-BIP141 rules before the fork")
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
-        tmpl = self.nodes[0].getblocktemplate({'rules': ['segwit']})
+        tmpl = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         assert_equal(tmpl['sizelimit'], 1000000)
         assert 'weightlimit' not in tmpl
         assert_equal(tmpl['sigoplimit'], 20000)
@@ -221,7 +222,7 @@ def run_test(self):
         self.log.info("Verify sigops are counted in GBT with BIP141 rules after the fork")
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
         raw_tx = self.nodes[0].getrawtransaction(txid, True)
-        tmpl = self.nodes[0].getblocktemplate({'rules': ['segwit']})
+        tmpl = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         assert_greater_than_or_equal(tmpl['sizelimit'], 3999577)  # actual maximum size is lower due to minimum mandatory non-witness data
         assert_equal(tmpl['weightlimit'], 4000000)
         assert_equal(tmpl['sigoplimit'], 80000)
@@ -275,7 +276,7 @@ def run_test(self):
         assert txid3 in self.nodes[0].getrawmempool()
 
         # Check that getblocktemplate includes all transactions.
-        template = self.nodes[0].getblocktemplate({"rules": ["segwit"]})
+        template = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         template_txids = [t['txid'] for t in template['transactions']]
         assert txid1 in template_txids
         assert txid2 in template_txids
diff --git a/depend/bitcoin/test/functional/feature_settings.py b/depend/bitcoin/test/functional/feature_settings.py
index 9a4138b9..0585e056 100755
--- a/depend/bitcoin/test/functional/feature_settings.py
+++ b/depend/bitcoin/test/functional/feature_settings.py
@@ -73,7 +73,7 @@ def run_test(self):
         # 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:
diff --git a/depend/bitcoin/test/functional/feature_shutdown.py b/depend/bitcoin/test/functional/feature_shutdown.py
index 3b4c35cb..50ae234e 100755
--- a/depend/bitcoin/test/functional/feature_shutdown.py
+++ b/depend/bitcoin/test/functional/feature_shutdown.py
@@ -5,7 +5,7 @@
 """Test bitcoind shutdown."""
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, get_rpc_proxy
+from test_framework.util import assert_equal
 from threading import Thread
 
 def test_long_call(node):
@@ -17,10 +17,9 @@ class ShutdownTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
-        self.supports_cli = False
 
     def run_test(self):
-        node = get_rpc_proxy(self.nodes[0].url, 1, timeout=600, coveragedir=self.nodes[0].coverage_dir)
+        node = self.nodes[0].create_new_rpc_connection()
         # Force connection establishment by executing a dummy command.
         node.getblockcount()
         Thread(target=test_long_call, args=(node,)).start()
diff --git a/depend/bitcoin/test/functional/feature_taproot.py b/depend/bitcoin/test/functional/feature_taproot.py
index eb3bb86e..a0c11fd6 100755
--- a/depend/bitcoin/test/functional/feature_taproot.py
+++ b/depend/bitcoin/test/functional/feature_taproot.py
@@ -99,6 +99,7 @@
     assert_raises_rpc_error,
     assert_equal,
 )
+from test_framework.wallet import NodeSigner
 from test_framework.wallet_util import generate_keypair
 from test_framework.key import (
     generate_privkey,
@@ -763,7 +764,9 @@ def spenders_taproot_active():
                 add_spender(spenders, "sighash/scriptpath_hashtype_mis_%x" % hashtype, tap=tap, leaf="s0", key=secs[1], annex=annex, standard=no_annex, hashtype_actual=random.choice(VALID_SIGHASHES_TAPROOT_NO_SINGLE), **SINGLE_SIG, failure={"hashtype_actual": hashtype}, **ERR_SCHNORR_SIG_HASHTYPE, need_vin_vout_mismatch=True)
 
         # Test OP_CODESEPARATOR impact on sighashing.
-        hashtype = lambda _: random.choice(VALID_SIGHASHES_TAPROOT)
+        def hashtype(_):
+            return random.choice(VALID_SIGHASHES_TAPROOT)
+
         common = {"annex": annex, "hashtype": hashtype, "standard": no_annex}
         scripts = [
             ("pk_codesep", CScript(random_checksig_style(pubs[1]) + bytes([OP_CODESEPARATOR]))),  # codesep after checksig
@@ -791,7 +794,9 @@ def spenders_taproot_active():
     add_spender(spenders, "sighash/keypath", tap=tap, key=secs[0], **common, failure={"sighash": override(default_sighash, leaf="pk_codesep")}, **ERR_SCHNORR_SIG)
 
     # Test that invalid hashtypes don't work, both in key path and script path spends
-    hashtype = lambda _: random.choice(VALID_SIGHASHES_TAPROOT)
+    def hashtype(_):
+        return random.choice(VALID_SIGHASHES_TAPROOT)
+
     for invalid_hashtype in [x for x in range(0x100) if x not in VALID_SIGHASHES_TAPROOT]:
         add_spender(spenders, "sighash/keypath_unk_hashtype_%x" % invalid_hashtype, tap=tap, key=secs[0], hashtype=hashtype, failure={"hashtype": invalid_hashtype}, **ERR_SCHNORR_SIG_HASHTYPE)
         add_spender(spenders, "sighash/scriptpath_unk_hashtype_%x" % invalid_hashtype, tap=tap, leaf="pk_codesep", key=secs[1], **SINGLE_SIG, hashtype=hashtype, failure={"hashtype": invalid_hashtype}, **ERR_SCHNORR_SIG_HASHTYPE)
@@ -1169,7 +1174,9 @@ def predict_sigops_ratio(n, dummy_size):
         add_spender(spenders, "unkver/1001inputs", standard=False, tap=tap, leaf="bare_unkver", inputs=[b'']*1001, failure={"leaf": "bare_c0"}, **ERR_STACK_SIZE)
 
     # OP_SUCCESSx tests.
-    hashtype = lambda _: random.choice(VALID_SIGHASHES_TAPROOT)
+    def hashtype(_):
+        return random.choice(VALID_SIGHASHES_TAPROOT)
+
     for opval in range(76, 0x100):
         opcode = CScriptOp(opval)
         if not is_op_success(opcode):
@@ -1214,7 +1221,9 @@ def predict_sigops_ratio(n, dummy_size):
 
     # == Test case for https://github.com/bitcoin/bitcoin/issues/24765 ==
 
-    zero_fn = lambda h: bytes([0 for _ in range(32)])
+    def zero_fn(h):
+        return bytes([0] * 32)
+
     tap = taproot_construct(pubs[0], [("leaf", CScript([pubs[1], OP_CHECKSIG, pubs[1], OP_CHECKSIGADD, OP_2, OP_EQUAL])), zero_fn])
     add_spender(spenders, "case24765", tap=tap, leaf="leaf", inputs=[getter("sign"), getter("sign")], key=secs[1], no_fail=True)
 
@@ -1409,9 +1418,6 @@ def add_options(self, parser):
         parser.add_argument("--dumptests", dest="dump_tests", default=False, action="store_true",
                             help="Dump generated test cases to directory set by TEST_DUMP_DIR environment variable")
 
-    def skip_test_if_missing_module(self):
-        self.skip_if_no_wallet()
-
     def set_test_params(self):
         self.num_nodes = 1
         self.setup_clean_chain = True
@@ -1468,18 +1474,16 @@ def test_spenders(self, node, spenders, input_counts):
         host_spks = []
         host_pubkeys = []
         for i in range(16):
-            addr = node.getnewaddress(address_type=random.choice(["legacy", "p2sh-segwit", "bech32"]))
-            info = node.getaddressinfo(addr)
-            spk = bytes.fromhex(info['scriptPubKey'])
+            pubkey, spk, _ = self.nodesigner.getnewaddress(address_type=random.choice(["legacy", "p2sh-segwit", "bech32"]))
             host_spks.append(spk)
-            host_pubkeys.append(bytes.fromhex(info['pubkey']))
+            host_pubkeys.append(pubkey)
 
         self.init_blockinfo(node)
 
         # Create transactions spending up to 50 of the wallet's inputs, with one output for each spender, and
         # one change output at the end. The transaction is constructed on the Python side to enable
-        # having multiple outputs to the same address and outputs with no assigned address. The wallet
-        # is then asked to sign it through signrawtransactionwithwallet, and then added to a block on the
+        # having multiple outputs to the same address and outputs with no assigned address. The node
+        # is then asked to sign it through signrawtransactionwithkey, and then added to a block on the
         # Python side (to bypass standardness rules).
         self.log.info("- Creating test UTXOs...")
         random.shuffle(spenders)
@@ -1492,7 +1496,7 @@ def test_spenders(self, node, spenders, input_counts):
 
             fund_tx = CTransaction()
             # Add the 50 highest-value inputs
-            unspents = node.listunspent()
+            unspents = self.nodesigner.listunspent()
             random.shuffle(unspents)
             unspents.sort(key=lambda x: int(x["amount"] * 100000000), reverse=True)
             if len(unspents) > 50:
@@ -1515,8 +1519,8 @@ def test_spenders(self, node, spenders, input_counts):
                 fund_tx.vout.append(CTxOut(amount, spenders[done + i].script))
             # Add change
             fund_tx.vout.append(CTxOut(balance - 10000, random.choice(host_spks)))
-            # Ask the wallet to sign
-            fund_tx = tx_from_hex(node.signrawtransactionwithwallet(fund_tx.serialize().hex())["hex"])
+            # Ask the node to sign
+            fund_tx = tx_from_hex(self.nodesigner.signrawtransaction(fund_tx.serialize().hex(), unspents)["hex"])
             # Construct UTXOData entries
             for i in range(count_this_tx):
                 utxodata = UTXOData(outpoint=COutPoint(fund_tx.txid_int, i), output=fund_tx.vout[i], spender=spenders[done])
@@ -1668,7 +1672,7 @@ def gen_test_vectors(self):
         block.solve()
         self.nodes[0].submitblock(block.serialize().hex())
         assert_equal(self.nodes[0].getblockcount(), 1)
-        self.generate(self.nodes[0], COINBASE_MATURITY)
+        self.generatetoaddress(self.nodes[0], COINBASE_MATURITY, self.nodesigner.getnewaddress()[2])
 
         SEED = 317
         VALID_LEAF_VERS = list(range(0xc0, 0x100, 2)) + [0x66, 0x7e, 0x80, 0x84, 0x96, 0x98, 0xba, 0xbc, 0xbe]
@@ -1879,6 +1883,7 @@ def pr(node):
             print(json.dumps(tests, indent=4, sort_keys=False))
 
     def run_test(self):
+        self.nodesigner = NodeSigner(self.nodes[0])
         self.gen_test_vectors()
 
         self.log.info("Post-activation tests...")
diff --git a/depend/bitcoin/test/functional/feature_txindex_compatibility.py b/depend/bitcoin/test/functional/feature_txindex_compatibility.py
new file mode 100755
index 00000000..6ba4c069
--- /dev/null
+++ b/depend/bitcoin/test/functional/feature_txindex_compatibility.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+# Copyright (c) 2026 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test txindex forward compatibility.
+
+"""
+
+import shutil
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
+from test_framework.wallet import MiniWallet
+
+class TxIndexTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 2
+        self.extra_args = [["-txindex"],["-txindex"]]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_previous_releases()
+
+    def setup_nodes(self):
+        self.add_nodes(
+            self.num_nodes,
+            extra_args=self.extra_args,
+            versions=[
+                None,
+                280200,
+            ],
+        )
+        self.start_nodes()
+
+    def run_test(self):
+        self._test_txindex_compatibility()
+
+    def _test_txindex_compatibility(self):
+        node = self.nodes[0]
+        legacy_node = self.nodes[1]
+        self.wallet = MiniWallet(self.nodes[0])
+        tx1 = self.wallet.send_self_transfer(from_node=self.nodes[0])
+        self.generate(self.nodes[0], 1)
+        txId1 = tx1['txid']
+
+        for n in self.nodes:
+            self.wait_until(lambda: n.getindexinfo()['txindex']['synced'])
+
+        self.log.info("Ensure that queries to the txindex are consistent between the different index versions")
+        assert_equal(node.getrawtransaction(txId1), tx1['hex'])
+        assert_equal(legacy_node.getrawtransaction(txId1), tx1['hex'])
+
+        self.log.info("Exercise the new index running on a datadir with the old version")
+        self.stop_nodes()
+        self.cleanup_folder(node.chain_path)
+        shutil.copytree(legacy_node.chain_path, node.chain_path)
+        msg = "txindex contains entries in the legacy format"
+        with node.assert_debug_log(expected_msgs=[msg]):
+            self.start_node(0)
+        self.wait_until(lambda: node.getindexinfo()['txindex']['synced'])
+        assert_equal(node.getrawtransaction(txId1), tx1['hex'])
+
+        self.log.info("Test that looking up a newly added transaction in a mixed-format db is possible")
+        tx2 = self.wallet.send_self_transfer(from_node=self.nodes[0])
+        self.generate(self.nodes[0], 1, sync_fun=self.no_op)
+        txId2 = tx2['txid']
+        self.wait_until(lambda: node.getindexinfo()['txindex']['synced'])
+        assert_equal(node.getrawtransaction(txId1), tx1['hex'])
+        assert_equal(node.getrawtransaction(txId2), tx2['hex'])
+
+
+if __name__ == '__main__':
+    TxIndexTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/feature_utxo_set_hash.py b/depend/bitcoin/test/functional/feature_utxo_set_hash.py
index 733b1fea..fb64439e 100755
--- a/depend/bitcoin/test/functional/feature_utxo_set_hash.py
+++ b/depend/bitcoin/test/functional/feature_utxo_set_hash.py
@@ -67,8 +67,8 @@ def test_muhash_implementation(self):
         assert_equal(finalized[::-1].hex(), node_muhash)
 
         self.log.info("Test deterministic UTXO set hash results")
-        assert_equal(node.gettxoutsetinfo()['hash_serialized_3'], "e0b4c80f2880985fdf1adc331ed0735ac207588f986c91c7c05e8cf5fe6780f0")
-        assert_equal(node.gettxoutsetinfo("muhash")['muhash'], "8739b878f23030ef39a5547edc7b57f88d50fdaaf47314ff0524608deb13067e")
+        assert_equal(node.gettxoutsetinfo()['hash_serialized_3'], "396058cfd7f3b4c05dcdfaf360be9986d859d2c8315082d3aadda6d2d16add25")
+        assert_equal(node.gettxoutsetinfo("muhash")['muhash'], "97f341d4226cb4451dd9da2856759fb97659cfc238a0b8d5452e64af6032bd3d")
 
     def run_test(self):
         self.test_muhash_implementation()
diff --git a/depend/bitcoin/test/functional/feature_versionbits_warning.py b/depend/bitcoin/test/functional/feature_versionbits_warning.py
index e1e9ff43..f630f781 100755
--- a/depend/bitcoin/test/functional/feature_versionbits_warning.py
+++ b/depend/bitcoin/test/functional/feature_versionbits_warning.py
@@ -18,8 +18,13 @@
 VB_PERIOD = 144           # versionbits period length for regtest
 VB_THRESHOLD = 108        # versionbits activation threshold for regtest
 VB_TOP_BITS = 0x20000000
-VB_UNKNOWN_BIT = 27       # Choose a bit unassigned to any deployment
+
+# Choose a bit unassigned to any deployment, or start the
+# node with the deployment matching this bit disabled.
+VB_UNKNOWN_BIT = 3
 VB_UNKNOWN_VERSION = VB_TOP_BITS | (1 << VB_UNKNOWN_BIT)
+VB_IGNORED_BIT = 5
+VB_IGNORED_VERSION = VB_TOP_BITS | (1 << VB_IGNORED_BIT)
 
 WARN_UNKNOWN_RULES_ACTIVE = f"Unknown new rules activated (versionbit {VB_UNKNOWN_BIT})"
 VB_PATTERN = re.compile("Unknown new rules activated.*versionbit")
@@ -76,11 +81,24 @@ def run_test(self):
         assert not VB_PATTERN.match(",".join(node.getmininginfo()["warnings"]))
         assert not VB_PATTERN.match(",".join(node.getnetworkinfo()["warnings"]))
 
+        self.log.info("Check that there is no warning if previous VB_BLOCKS have VB_PERIOD blocks with ignored versionbits version.")
         # Build one period of blocks with VB_THRESHOLD blocks signaling some unknown bit
-        self.send_blocks_with_version(peer, VB_THRESHOLD, VB_UNKNOWN_VERSION)
+        self.send_blocks_with_version(peer, VB_THRESHOLD, VB_IGNORED_VERSION)
         self.generatetoaddress(node, VB_PERIOD - VB_THRESHOLD, node_deterministic_address)
 
+        # Move the ignored deployment state to ACTIVE and make sure we're out of IBD.
+        self.generatetoaddress(node, VB_PERIOD, node_deterministic_address)
+        self.wait_until(lambda: not node.getblockchaininfo()['initialblockdownload'])
+
+        # Check that we're not getting any versionbit-related warnings in get*info()
+        assert not VB_PATTERN.match(", ".join(node.getmininginfo()["warnings"]))
+        assert not VB_PATTERN.match(", ".join(node.getnetworkinfo()["warnings"]))
+
         self.log.info("Check that there is a warning if previous VB_BLOCKS have >=VB_THRESHOLD blocks with unknown versionbits version.")
+        # Build one period of blocks with VB_THRESHOLD blocks signaling some unknown bit
+        self.send_blocks_with_version(peer, VB_THRESHOLD, VB_UNKNOWN_VERSION)
+        self.generatetoaddress(node, VB_PERIOD - VB_THRESHOLD, node_deterministic_address)
+
         # Mine a period worth of expected blocks so the generic block-version warning
         # is cleared. This will move the versionbit state to ACTIVE.
         self.generatetoaddress(node, VB_PERIOD, node_deterministic_address)
diff --git a/depend/bitcoin/test/functional/interface_bitcoin_cli.py b/depend/bitcoin/test/functional/interface_bitcoin_cli.py
index e908ba8a..07687c5d 100755
--- a/depend/bitcoin/test/functional/interface_bitcoin_cli.py
+++ b/depend/bitcoin/test/functional/interface_bitcoin_cli.py
@@ -177,9 +177,9 @@ def run_test(self):
         conf_rpcport = "rpcport=" + str(node_rpc_port)
         self.nodes[0].replace_in_config([(conf_rpcport, "#" + conf_rpcport)])
         # prefer rpcport over rpcconnect
-        assert_raises_process_error(1, "Could not connect to the server 127.0.0.1:1", self.nodes[0].cli(f"-rpcconnect=127.0.0.1:{node_rpc_port}", "-rpcport=1").echo)
+        assert_raises_process_error(1, "Error while attempting to communicate with server 127.0.0.1:1 (Could not connect to the server)", self.nodes[0].cli(f"-rpcconnect=127.0.0.1:{node_rpc_port}", "-rpcport=1").echo)
         if have_ipv6:
-            assert_raises_process_error(1, "Could not connect to the server ::1:1", self.nodes[0].cli(f"-rpcconnect=[::1]:{node_rpc_port}", "-rpcport=1").echo)
+            assert_raises_process_error(1, "Error while attempting to communicate with server ::1:1 (Could not connect to the server)", self.nodes[0].cli(f"-rpcconnect=[::1]:{node_rpc_port}", "-rpcport=1").echo)
 
         assert_equal(BLOCKS, self.nodes[0].cli("-rpcconnect=127.0.0.1:18999", f'-rpcport={node_rpc_port}').getblockcount())
         if have_ipv6:
@@ -458,7 +458,8 @@ def run_test(self):
             # This tests behavior when ENABLE_IPC is off. When it is on,
             # behavior is checked by the interface_ipc_cli.py test.
             self.log.info("Test bitcoin-cli -ipcconnect triggers error if not built with IPC support")
-            args = [self.binary_paths.bitcoincli, "-ipcconnect=unix", "-getinfo"]
+            # node.cli.options includes -rpcconnect which can't be combined with -ipcconnect, so pass just -datadir directly to keep bitcoin-cli on the test's bitcoin.conf
+            args = self.nodes[0].binaries.valgrind_cmd + [self.nodes[0].binaries.paths.bitcoincli, f"-datadir={self.nodes[0].datadir_path}", "-ipcconnect=unix", "-getinfo"]
             result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
             assert_equal(result.stdout, "error: bitcoin-cli was not built with IPC support\n")
             assert_equal(result.stderr, None)
diff --git a/depend/bitcoin/test/functional/interface_gui.py b/depend/bitcoin/test/functional/interface_gui.py
new file mode 100755
index 00000000..7383bb65
--- /dev/null
+++ b/depend/bitcoin/test/functional/interface_gui.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test that bitcoin-gui starts up and can be stopped via RPC."""
+
+import platform
+
+from test_framework.test_framework import (
+    BitcoinTestFramework,
+    SkipTest,
+)
+
+
+class GuiTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.extra_args = [["-server"]]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_gui()
+        # On Windows, bitcoin.exe exits immediately when launching bitcoin-gui.exe,
+        # causing the test framework's process monitor to see a premature node exit.
+        # This issue is likely fixable.
+        if platform.system() == "Windows":
+            raise SkipTest("bitcoin-gui test not supported on Windows")
+
+    def setup_nodes(self):
+        self.extra_init = [{"use_gui": True}]
+        super().setup_nodes()
+
+    def run_test(self):
+        self.log.info("Test that bitcoin-gui starts up and can be stopped via RPC")
+        self.stop_node(0)
+
+
+if __name__ == "__main__":
+    GuiTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/interface_http.py b/depend/bitcoin/test/functional/interface_http.py
index cfa111b7..3e5d1832 100755
--- a/depend/bitcoin/test/functional/interface_http.py
+++ b/depend/bitcoin/test/functional/interface_http.py
@@ -5,19 +5,20 @@
 """Test the HTTP server basics."""
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.netutil import NETWORK_ERRORS
 from test_framework.util import assert_equal, str_to_b64str
 
 import http.client
+import socket
+import threading
 import time
 import urllib.parse
 
-# Configuration option for some test nodes
+# Configuration option for some tests
 RPCSERVERTIMEOUT = 2
-# Set in httpserver.cpp and passed to libevent evhttp_set_max_headers_size()
+# Set in httpserver.h
 MAX_HEADERS_SIZE = 8192
-# Set in serialize.h and passed to libevent evhttp_set_max_body_size()
-MAX_SIZE = 0x02000000
-
+MAX_BODY_SIZE = 32 * 1024 * 1024
 
 class BitcoinHTTPConnection:
     def __init__(self, node):
@@ -37,8 +38,7 @@ def sock_closed(self):
             self.conn.request('GET', '/')
             self.conn.getresponse().read()
             return False
-        #       macos/linux           windows
-        except (ConnectionResetError, ConnectionAbortedError):
+        except NETWORK_ERRORS:
             return True
 
     def close_sock(self):
@@ -63,12 +63,15 @@ def post(self, path, data, connection_header=None, **kwargs):
     def get(self, path, connection_header=None):
         return self._request('GET', path, '', connection_header)
 
+    def send_raw(self, data):
+        self.conn.sock.sendall(data)
+
     def post_raw(self, path, data):
         data_bytes = data.encode("utf-8")
         req = f"POST {path} HTTP/1.1\r\n"
         req += f'Authorization: Basic {str_to_b64str(self.authpair)}\r\n'
         req += f'Content-Length: {len(data_bytes)}\r\n\r\n'
-        self.conn.sock.sendall(req.encode("ascii") + data_bytes)
+        self.send_raw(req.encode("ascii") + data_bytes)
 
     def recv_raw(self):
         '''
@@ -95,7 +98,6 @@ def expect_timeout(self, seconds):
 class HTTPBasicsTest (BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
-        self.supports_cli = False
 
     def setup_network(self):
         self.setup_nodes()
@@ -114,10 +116,21 @@ def run_test(self):
         self.check_keepalive_connection()
         self.check_close_connection()
         self.check_excessive_request_size()
-        self.check_pipelining()
+        self.check_pipelining(with_invalid_second_request=False)
+        self.check_pipelining(with_invalid_second_request=True)
         self.check_chunked_transfer()
         self.check_idle_timeout()
         self.check_server_busy_idle_timeout()
+        self.check_auth_required()
+        self.check_wrong_credentials()
+        self.check_malformed_auth_headers()
+        self.check_disallowed_http_methods()
+        self.check_path_traversal()
+        self.check_request_smuggling_cl_te()
+        self.check_duplicate_content_length()
+        self.check_null_byte_in_uri()
+        self.check_invalid_http_version()
+        self.check_whitespace_in_headers()
 
 
     def check_default_connection(self):
@@ -186,11 +199,6 @@ def check_excessive_request_size(self):
         headers_below_limit = (MAX_HEADERS_SIZE - 1000) // header_line_length
         headers_above_limit = MAX_HEADERS_SIZE // header_line_length
 
-        # This is a libevent mystery:
-        # libevent does not reject the request until it is more than
-        # 1,000 bytes above the configured limit.
-        headers_above_limit += 1000 // header_line_length
-
         # Many small header lines is ok
         conn = BitcoinHTTPConnection(self.node)
         for i in range(headers_below_limit):
@@ -208,8 +216,8 @@ def check_excessive_request_size(self):
         # Compute how much data we can add to a request message body
         # to make / break the limit.
         base_request_body_size = len('{"jsonrpc": "2.0", "id": "0", "method": "submitblock", "params": [""]}}')
-        bytes_below_limit = MAX_SIZE - base_request_body_size
-        bytes_above_limit = MAX_SIZE - base_request_body_size + 2
+        bytes_below_limit = MAX_BODY_SIZE - base_request_body_size
+        bytes_above_limit = MAX_BODY_SIZE - base_request_body_size + 2
 
         # Large request body size is ok
         conn = BitcoinHTTPConnection(self.node)
@@ -217,32 +225,45 @@ def check_excessive_request_size(self):
         assert_equal(response4.status, http.client.OK)
 
         conn = BitcoinHTTPConnection(self.node)
+
+        # Split off the send into a background thread. When the server detects
+        # the excessive size it will stop reading from the socket, but the client
+        # will continue trying to write until the backpressure eventually
+        # drops the TCP window size to 0. While the send operation is blocking until
+        # it times out, we can still receive the server's response in the foreground.
+
+        def send_excessive_body(self, conn):
+            try:
+                # Excessive body size is invalid
+                conn.post_raw('/', f'{{"jsonrpc": "2.0", "id": "0", "method": "submitblock", "params": ["{"0" * bytes_above_limit}"]}}')
+                # On some platforms (e.g. Windows) the whole request may be
+                # accepted into the OS send buffer before the server disconnects.
+                # It's ok to allow that, the server-side behavior is asserted in
+                # the foreground thread via the 413 response.
+                self.log.info("Client finished sending request before connection was terminated")
+            except NETWORK_ERRORS:
+                self.log.info("Client did not finish sending request before connection was terminated")
+
+        send_thread = threading.Thread(target=send_excessive_body, args=(self, conn))
+        send_thread.start()
+
+        response5 = conn.recv_raw().decode()
+        assert "413 Content too large" in response5
+
         try:
-            # Excessive body size is invalid
-            conn.post_raw('/', f'{{"jsonrpc": "2.0", "id": "0", "method": "submitblock", "params": ["{"0" * bytes_above_limit}"]}}')
-            self.log.info("Client finished sending request before connection was terminated")
-        except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):
-            self.log.info("Client did not finish sending request before connection was terminated")
-
-        # The server will send a 413 response and disconnect but due to a race
-        # condition, the python client may or may not read the response before
-        # detecting the broken socket (which it may still be trying to write to).
-        try:
-            response5 = conn.conn.getresponse()
-            assert_equal(response5.status, http.client.REQUEST_ENTITY_TOO_LARGE)
-            self.log.info(f"Client got expected response status {response5.status}")
-            assert conn.sock_closed()
-        #       macos/linux                   windows
-        except (http.client.ResponseNotReady, ConnectionAbortedError):
-            self.log.info("Client did not read response before disconnecting")
+            conn.conn.sock.shutdown(socket.SHUT_RDWR)
+            self.log.info("Send thread force-closed by test framework")
+        except OSError:
+            self.log.info("Send thread was already closed by RST from server")
+        send_thread.join()
 
 
-    def check_pipelining(self):
+    def check_pipelining(self, with_invalid_second_request):
         """
         Requests are responded to in the order in which they were received
         See https://www.rfc-editor.org/rfc/rfc7230#section-6.3.2
         """
-        self.log.info("Check pipelining")
+        self.log.info("Check pipelining" + (" with invalid second request" if with_invalid_second_request else ""))
         tip_height = self.node.getblockcount()
         conn = BitcoinHTTPConnection(self.node)
         conn.set_timeout(5)
@@ -250,7 +271,10 @@ def check_pipelining(self):
         # Send two requests in a row.
         # The first request will block the second indefinitely
         conn.post_raw('/', f'{{"method": "waitforblockheight", "params": [{tip_height + 1}]}}')
-        conn.post_raw('/', '{"method": "getblockcount"}')
+        if with_invalid_second_request:
+            conn.post_raw(f'/{"x" * MAX_HEADERS_SIZE * 2}', '{"method": "getblockcount"}')
+        else:
+            conn.post_raw('/', '{"method": "getblockcount"}')
 
         try:
             # The server should not respond to the second request until the first
@@ -264,16 +288,30 @@ def check_pipelining(self):
         # Use a separate http connection to generate a block
         self.generate(self.node, 1, sync_fun=self.no_op)
 
-        # Wait for two responses to be received
+        # Wait for responses to be received
+        if with_invalid_second_request:
+            OK = 1
+            BAD = 1
+        else:
+            OK = 2
+            BAD = 0
         res = b""
-        while res.count(b"result") != 2:
+        while True:
             res += conn.recv_raw()
+            if res.count(b"HTTP/1.1 200") == OK and res.count(b"HTTP/1.1 400") == BAD:
+                break
 
         # waitforblockheight was responded to first, and then getblockcount
         # which includes the block added after the request was made
         chunks = res.split(b'"result":')
         assert chunks[1].startswith(b'{"hash":')
-        assert chunks[2].startswith(bytes(f'{tip_height + 1}', 'utf8'))
+        if with_invalid_second_request:
+            # The response to the in-flight first request is sent before the
+            # error generated by parsing the second one, even though the second
+            # request could have been rejected much earlier.
+            assert res.index(b"HTTP/1.1 200") < res.index(b"HTTP/1.1 400")
+        else:
+            assert chunks[2].startswith(bytes(f'{tip_height + 1}', 'utf8'))
 
 
     def check_chunked_transfer(self):
@@ -310,28 +348,41 @@ def check_chunked_transfer(self):
             b'3' * 10000000,
             b'"]}'
         ]
+
+        # Split off the send into a background thread. When the server detects
+        # the excessive size it will stop reading from the socket, but the client
+        # will continue trying to write until the backpressure eventually
+        # drops the TCP window size to 0. While the send operation is blocking until
+        # it times out, we can still receive the server's response in the foreground.
+
+        def send_excessive_chunked(self, conn):
+            try:
+                conn.conn.request(
+                    method='POST',
+                    url='/',
+                    body=iter(body_chunked),
+                    headers=headers_chunked,
+                    encode_chunked=True)
+                # On some platforms (e.g. Windows) the whole request may be
+                # accepted into the OS send buffer before the server disconnects.
+                # It's ok to allow that, the server-side behavior is asserted in
+                # the foreground thread via the 413 response.
+                self.log.info("Client finished sending request before connection was terminated")
+            except NETWORK_ERRORS:
+                self.log.info("Client did not finish sending request before connection was terminated")
+
+        send_thread = threading.Thread(target=send_excessive_chunked, args=(self, conn))
+        send_thread.start()
+
+        response2 = conn.recv_raw().decode()
+        assert "413 Content too large" in response2
+
         try:
-            conn.conn.request(
-                method='POST',
-                url='/',
-                body=iter(body_chunked),
-                headers=headers_chunked,
-                encode_chunked=True)
-            self.log.info("Client finished sending request before connection was terminated")
-        except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):
-            self.log.info("Client did not finish sending request before connection was terminated")
-
-        # The server will send a 413 response and disconnect but due to a race
-        # condition, the python client may or may not read the response before
-        # detecting the broken socket (which it may still be trying to write to).
-        try:
-            response2 = conn.conn.getresponse()
-            assert_equal(response2.status, http.client.REQUEST_ENTITY_TOO_LARGE)
-            self.log.info(f"Client got expected response status {response2.status}")
-            assert conn.sock_closed()
-        #       macos/linux                   windows
-        except (http.client.ResponseNotReady, ConnectionAbortedError):
-            self.log.info("Client did not read response before disconnecting")
+            conn.conn.sock.shutdown(socket.SHUT_RDWR)
+            self.log.info("Send thread force-closed by test framework")
+        except OSError:
+            self.log.info("Send thread was already closed by RST from server")
+        send_thread.join()
 
 
     def check_idle_timeout(self):
@@ -346,14 +397,14 @@ def check_idle_timeout(self):
         # A complete request would have an additional "\r\n" at the end.
         bad_http_request = "GET /test1 HTTP/1.1\r\nHost: somehost\r\n"
         conn = BitcoinHTTPConnection(self.node)
-        conn.conn.sock.sendall(bad_http_request.encode("ascii"))
+        conn.send_raw(bad_http_request.encode("ascii"))
 
         conn.expect_timeout(RPCSERVERTIMEOUT)
 
         # Sanity check -- complete requests don't timeout waiting for completion
         good_http_request = "GET /test2 HTTP/1.1\r\nHost: somehost\r\n\r\n"
         conn.reset_conn()
-        conn.conn.sock.sendall(good_http_request.encode("ascii"))
+        conn.send_raw(good_http_request.encode("ascii"))
         response = conn.recv_raw()
         assert response.startswith(b"HTTP/1.1 404 Not Found")
 
@@ -384,5 +435,179 @@ def check_server_busy_idle_timeout(self):
         conn.expect_timeout(RPCSERVERTIMEOUT)
 
 
+    def check_auth_required(self):
+        self.log.info("Check that requests without credentials return 401 Unauthorized with WWW-Authenticate")
+        conn = BitcoinHTTPConnection(self.node)
+        conn.headers = {}
+        response = conn.post('/', '{"method": "getbestblockhash"}')
+        assert_equal(response.status, http.client.UNAUTHORIZED)
+        assert response.getheader('WWW-Authenticate') is not None
+
+
+    def check_wrong_credentials(self):
+        self.log.info("Check that incorrect credentials return 401 Unauthorized")
+        conn = BitcoinHTTPConnection(self.node)
+        wrong_pair = f"{conn.url.username}:wrong_password"
+        conn.headers = {"Authorization": f"Basic {str_to_b64str(wrong_pair)}"}
+        response = conn.post('/', '{"method": "getbestblockhash"}')
+        assert_equal(response.status, http.client.UNAUTHORIZED)
+        assert response.getheader('WWW-Authenticate') is not None
+
+
+    def check_malformed_auth_headers(self):
+        self.log.info("Check that malformed Authorization headers return 401 Unauthorized")
+        cases = [
+            "Bearer sometoken123",
+            'Digest username="user", realm="test"',
+            "Basic !!!notbase64!!!",
+            f"Basic {str_to_b64str('nocolon')}",
+            "Basic ",
+        ]
+        for auth_value in cases:
+            conn = BitcoinHTTPConnection(self.node)
+            conn.headers = {"Authorization": f"{auth_value}"}
+            response = conn.post('/', '{"method": "getbestblockhash"}')
+            assert_equal(response.status, http.client.UNAUTHORIZED)
+            assert response.getheader('WWW-Authenticate') is not None
+
+
+    def check_disallowed_http_methods(self):
+        self.log.info("Check that unsafe or unsupported HTTP methods are rejected")
+        for method, err in [
+            ['TRACE',   http.client.METHOD_NOT_ALLOWED],
+            ['CONNECT', http.client.METHOD_NOT_ALLOWED],
+            ['DELETE',  http.client.METHOD_NOT_ALLOWED],
+            ['PATCH',   http.client.METHOD_NOT_ALLOWED],
+            ['OPTIONS', http.client.METHOD_NOT_ALLOWED],
+            ['GET',     http.client.METHOD_NOT_ALLOWED] # RPC endpoint '/' only handles POST
+        ]:
+            conn = BitcoinHTTPConnection(self.node)
+            response = conn._request(method, '/', data=None, connection_header=None)
+            assert_equal(response.status, err)
+
+
+    def check_path_traversal(self):
+        self.log.info("Check that path traversal attempts are safely rejected")
+        traversal_paths = [
+            '/../etc/passwd',
+            '/../../etc/shadow',
+            '/%2e%2e/%2e%2e/etc/passwd',     # URL-encoded dots
+            '/..%2Fetc%2Fpasswd',            # URL-encoded slash
+            '/.%2e/.%2e/etc/passwd',         # mixed encoding
+            '/valid/../../../etc/passwd',
+        ]
+        for path in traversal_paths:
+            conn = BitcoinHTTPConnection(self.node)
+            response = conn.get(path)
+            assert_equal(response.status, http.client.NOT_FOUND)
+
+
+    def check_request_smuggling_cl_te(self):
+        self.log.info("Check request smuggling is not possible")
+        # https://www.rfc-editor.org/rfc/rfc7230#section-3.3.3
+        # Transfer-Encoding takes precedence over Content-Length.
+        # Sending both creates a smuggling vector: a front-end proxy that
+        # uses Content-Length while the back-end uses Transfer-Encoding lets an
+        # attacker prepend arbitrary bytes to the next victim's request.
+
+        # The real JSON-RPC body sent as a single chunk.
+        body = b'{"method":"getblockcount"}'
+        # Content-Length is set to the length of just the chunk-size line
+        # ("1a\r\n" = 4 bytes), not the full chunked body — the ambiguity that
+        # smuggling exploits. A server using Transfer-Encoding reads the complete
+        # chunk and responds with the block count; a server confused by the
+        # mismatch may stall, close the connection, or return an error.
+        chunk_size_line = f"{len(body):x}\r\n".encode("ascii")
+        # Signals end of body
+        empty_chunk = b'\r\n0\r\n\r\n'
+        chunk_body = chunk_size_line + body + empty_chunk
+
+        conn = BitcoinHTTPConnection(self.node)
+        raw = (
+            f"POST / HTTP/1.1\r\n"
+            f"Host: {conn.url.hostname}\r\n"
+            f"Authorization: Basic {str_to_b64str(conn.authpair)}\r\n"
+            f"Content-Length: {len(chunk_size_line)}\r\n"
+            f"Transfer-Encoding: chunked\r\n"
+            f"\r\n"
+        ).encode("ascii") + chunk_body
+        conn.send_raw(raw)
+        response = conn.recv_raw().decode()
+        assert "HTTP/1.1 200 OK" in response
+        count = self.node.getblockcount()
+        assert f'"result":{count}' in response
+
+
+    def check_duplicate_content_length(self):
+        self.log.info("Check that duplicate Content-Length headers are handled")
+        # https://www.rfc-editor.org/rfc/rfc7230#section-3.3.3
+        # Multiple Content-Length headers with differing values "MUST"
+        # result in an error.
+        conn = BitcoinHTTPConnection(self.node)
+        body = '{"method":"getblockcount"}'
+        raw = (
+            f"POST / HTTP/1.1\r\n"
+            f"Host: {conn.url.hostname}\r\n"
+            f"Authorization: Basic {str_to_b64str(conn.authpair)}\r\n"
+            f"Content-Length: {len(body)}\r\n"
+            f"Content-Length: 999\r\n"
+            f"\r\n"
+            f"{body}"
+        ).encode("ascii")
+        conn.send_raw(raw)
+        response = conn.recv_raw().decode()
+        assert response.startswith("HTTP/1.1 400")
+
+
+    def check_null_byte_in_uri(self):
+        self.log.info("Check that null bytes in the URI are safely rejected")
+        # Null-byte injection can truncate the path string in C environments,
+        # bypassing suffix/extension checks and causing unexpected file access.
+        conn = BitcoinHTTPConnection(self.node)
+        raw = (
+            "GET /safe\x00/../etc/passwd HTTP/1.1\r\n"
+            f"Host: {conn.url.hostname}\r\n"
+            f"Authorization: Basic {str_to_b64str(conn.authpair)}\r\n"
+            "\r\n"
+        ).encode("ascii")
+        conn.send_raw(raw)
+        response = conn.recv_raw().decode()
+        assert response.startswith("HTTP/1.1 400")
+
+
+    def check_invalid_http_version(self):
+        self.log.info("Check that requests with invalid HTTP versions are safely rejected")
+        cases = [
+            b"GET / \r\n\r\n",                                    # HTTP/0.9 — no version
+            b"GET / HTTP/9.9\r\nHost: localhost\r\n\r\n",         # far-future version
+            b"GET / HTTP/INVALID\r\nHost: localhost\r\n\r\n",     # non-numeric version
+            b"GET / NOTHTTP/1.1\r\nHost: localhost\r\n\r\n",      # wrong protocol name
+        ]
+        for raw in cases:
+            conn = BitcoinHTTPConnection(self.node)
+            conn.send_raw(raw)
+            response = conn.recv_raw().decode()
+            assert response.startswith("HTTP/1.1 400")
+
+
+    def check_whitespace_in_headers(self):
+        self.log.info("Check that requests with whitespace in headers are rejected")
+        # Extra whitespace before colon in header.
+        conn = BitcoinHTTPConnection(self.node)
+        conn.headers = {"Authorization ": f"Basic {str_to_b64str(conn.authpair)}"}
+        response = conn.post('/', '{"method": "getbestblockhash"}')
+        assert_equal(response.status, http.client.BAD_REQUEST)
+
+        # Extra whitespace at start of new line.
+        # "line folding" as defined in
+        # https://www.rfc-editor.org/rfc/rfc2616#section-2.2
+        # is considered unsafe and is explicitly deprecated in
+        # https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4
+        conn = BitcoinHTTPConnection(self.node)
+        conn.headers = {"Authorization": f"Basic \n {str_to_b64str(conn.authpair)}"}
+        response = conn.post('/', '{"method": "getbestblockhash"}')
+        assert_equal(response.status, http.client.BAD_REQUEST)
+
+
 if __name__ == '__main__':
     HTTPBasicsTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/interface_ipc_cli.py b/depend/bitcoin/test/functional/interface_ipc_cli.py
index 9ad704d3..93711937 100755
--- a/depend/bitcoin/test/functional/interface_ipc_cli.py
+++ b/depend/bitcoin/test/functional/interface_ipc_cli.py
@@ -41,8 +41,8 @@ def run_test(self):
             self.log.info("Skipping a few checks because temporary directory path is too long")
 
         http_auth_error = "error: Authorization failed: Incorrect rpcuser or rpcpassword were specified."
-        http_connect_error = f"error: timeout on transient error: Could not connect to the server 127.0.0.1:{rpc_port(node.index)}\n\nMake sure the bitcoind server is running and that you are connecting to the correct RPC port.\nUse \"bitcoin-cli -help\" for more info.\n"
-        ipc_connect_error = "error: timeout on transient error: Connection refused\n\nProbably bitcoin-node is not running or not listening on a unix socket. Can be started with:\n\n    bitcoin-node -chain=regtest -ipcbind=unix\n"
+        http_connect_error = f"error: Error while attempting to communicate with server 127.0.0.1:{rpc_port(node.index)} (Could not connect to the server)\n\nMake sure the bitcoind server is running and that you are connecting to the correct RPC port.\nUse \"bitcoin-cli -help\" for more info.\n"
+        ipc_connect_error = "error: Connection refused\n\nProbably bitcoin-node is not running or not listening on a unix socket. Can be started with:\n\n    bitcoin-node -chain=regtest -ipcbind=unix\n"
         ipc_http_conflict = "error: -rpcconnect and -ipcconnect options cannot both be enabled\n"
 
         for started in (True, False):
diff --git a/depend/bitcoin/test/functional/interface_ipc_mining.py b/depend/bitcoin/test/functional/interface_ipc_mining.py
index 31ccec63..c36d73ab 100755
--- a/depend/bitcoin/test/functional/interface_ipc_mining.py
+++ b/depend/bitcoin/test/functional/interface_ipc_mining.py
@@ -6,42 +6,47 @@
 import asyncio
 import time
 from contextlib import AsyncExitStack
+from copy import deepcopy
+from decimal import Decimal
 from io import BytesIO
-from test_framework.blocktools import NULL_OUTPOINT
+from test_framework.blocktools import (
+    NULL_OUTPOINT,
+    script_BIP34_coinbase_height,
+    WITNESS_COMMITMENT_HEADER,
+)
 from test_framework.messages import (
-    MAX_BLOCK_WEIGHT,
     CBlockHeader,
+    COIN,
     CTransaction,
     CTxIn,
-    CTxOut,
     CTxInWitness,
-    ser_uint256,
-    COIN,
+    CTxOut,
+    DEFAULT_BLOCK_RESERVED_WEIGHT,
+    MAX_BLOCK_SIGOPS_COST,
+    MAX_BLOCK_WEIGHT,
     from_hex,
     msg_headers,
-)
-from test_framework.script import (
-    CScript,
-    CScriptNum,
+    ser_uint256,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_greater_than_or_equal,
-    assert_not_equal
+    assert_not_equal,
 )
 from test_framework.wallet import MiniWallet
 from test_framework.p2p import P2PInterface
 from test_framework.ipc_util import (
+    assert_capnp_failed,
+    assert_create_new_block_fails,
     destroying,
-    mining_create_block_template,
     load_capnp_modules,
+    make_mining_ctx,
+    mining_create_block_template,
     mining_get_block,
     mining_get_coinbase_tx,
     mining_wait_next_template,
     wait_and_do,
-    make_mining_ctx,
-    assert_capnp_failed
 )
 
 # Test may be skipped and not have capnp installed
@@ -58,16 +63,16 @@ def skip_test_if_missing_module(self):
         self.skip_if_no_py_capnp()
 
     def set_test_params(self):
-        self.num_nodes = 2
+        self.num_nodes = 3
 
     def setup_nodes(self):
-        self.extra_init = [{"ipcbind": True}, {}]
+        self.extra_init = [{"ipcbind": True}, {}, {"ipcbind": True}]
         super().setup_nodes()
         # Use this function to also load the capnp modules (we cannot use set_test_params for this,
         # as it is being called before knowing whether capnp is available).
         self.capnp_modules = load_capnp_modules(self.config)
 
-    async def build_coinbase_test(self, template, ctx, miniwallet):
+    async def build_coinbase_test(self, template, ctx, miniwallet, extra_nonce=b""):
         self.log.debug("Build coinbase transaction using getCoinbaseTx()")
         assert template is not None
         coinbase_res = await mining_get_coinbase_tx(template, ctx)
@@ -79,11 +84,11 @@ async def build_coinbase_test(self, template, ctx, miniwallet):
 
         # Verify there's no dummy extraNonce in the coinbase scriptSig
         current_block_height = self.nodes[0].getchaintips()[0]["height"]
-        expected_scriptsig = CScript([CScriptNum(current_block_height + 1)])
-        assert_equal(coinbase_res.scriptSigPrefix.hex(), expected_scriptsig.hex())
+        bip34_prefix = script_BIP34_coinbase_height(current_block_height + 1, padding=False)
+        assert_equal(coinbase_res.scriptSigPrefix, bip34_prefix)
 
         # Typically a mining pool appends its name and an extraNonce
-        coinbase_tx.vin[0].scriptSig = coinbase_res.scriptSigPrefix
+        coinbase_tx.vin[0].scriptSig = coinbase_res.scriptSigPrefix + extra_nonce
 
         # We currently always provide a coinbase witness, even for empty
         # blocks, but this may change, so always check:
@@ -106,11 +111,31 @@ async def build_coinbase_test(self, template, ctx, miniwallet):
         coinbase_tx.nLockTime = coinbase_res.lockTime
         return coinbase_tx
 
+    async def build_candidate_block(self, template, ctx, extra_nonce=b""):
+        """Build a complete block from a remote BlockTemplate.
+
+        The returned block replaces the dummy coinbase from CreateNewBlock()
+        with one constructed from getCoinbaseTx().
+        """
+        block = await mining_get_block(template, ctx)
+        coinbase = await self.build_coinbase_test(
+            template, ctx, self.miniwallet, extra_nonce=extra_nonce)
+        # Reduce payout for balance comparison simplicity.
+        coinbase.vout[0].nValue = COIN
+        block.vtx[0] = coinbase
+        block.hashMerkleRoot = block.calc_merkle_root()
+        return block
+
+    async def assert_submit_block(self, mining, ctx, block, *, result, reason="", debug=""):
+        submit = await mining.submitBlock(ctx, block.serialize())
+        assert_equal(submit.result, result)
+        assert_equal(submit.reason, reason)
+        assert_equal(submit.debug, debug)
+
     def run_mining_interface_test(self):
         """Test Mining interface methods."""
         self.log.info("Running Mining interface test")
         block_hash_size = 32
-        timeout = 1000.0 * self.options.timeout_factor # 1000 milliseconds
 
         async def async_routine():
             ctx, mining = await make_mining_ctx(self)
@@ -120,19 +145,19 @@ async def async_routine():
 
             self.log.debug("Mine a block")
             newblockref = (await wait_and_do(
-                mining.waitTipChanged(ctx, blockref.result.hash, timeout),
+                mining.waitTipChanged(ctx, blockref.result.hash, self.default_ipc_timeout),
                 lambda: self.generate(self.nodes[0], 1))).result
             assert_equal(len(newblockref.hash), block_hash_size)
             assert_equal(newblockref.height, current_block_height + 1)
             self.log.debug("Wait for timeout")
-            oldblockref = (await mining.waitTipChanged(ctx, newblockref.hash, timeout)).result
+            oldblockref = (await mining.waitTipChanged(ctx, newblockref.hash, self.default_ipc_timeout)).result
             assert_equal(len(newblockref.hash), block_hash_size)
             assert_equal(oldblockref.hash, newblockref.hash)
             assert_equal(oldblockref.height, newblockref.height)
 
             self.log.debug("interrupt() should abort waitTipChanged()")
             async def wait_for_tip():
-                long_timeout = max(timeout, 60000.0)  # at least 1 minute
+                long_timeout = max(self.default_ipc_timeout, 60000.0)  # at least 1 minute
                 result = (await mining.waitTipChanged(ctx, newblockref.hash, long_timeout)).result
                 # Unlike a timeout, interrupt() returns an empty BlockRef.
                 assert_equal(len(result.hash), 0)
@@ -167,12 +192,15 @@ async def async_routine():
         # Reconnect nodes so next tests are happy
         node.wait_for_rpc_connection()
         self.connect_nodes(1, 0)
+        # Restarting node 0 drops its P2P connection to the rest of the test
+        # chain. Restore the synced 0-1-2 topology before later tests split
+        # node 2 off for submitBlock checks.
+        self.sync_all()
 
     def run_block_template_test(self):
         """Test BlockTemplate interface methods."""
         self.log.info("Running BlockTemplate interface test")
         block_header_size = 80
-        timeout = 1000.0 * self.options.timeout_factor
 
         async def async_routine():
             ctx, mining = await make_mining_ctx(self)
@@ -241,7 +269,7 @@ async def create_block():
 
                 self.log.debug("Wait for a new template")
                 waitoptions = self.capnp_modules['mining'].BlockWaitOptions()
-                waitoptions.timeout = timeout
+                waitoptions.timeout = self.default_ipc_timeout
                 waitoptions.feeThreshold = 1
                 template2 = await wait_and_do(
                     mining_wait_next_template(template, stack, ctx, waitoptions),
@@ -285,7 +313,7 @@ async def create_block():
                 self.log.debug("interruptWait should abort the current wait")
                 async def wait_for_block():
                     new_waitoptions = self.capnp_modules['mining'].BlockWaitOptions()
-                    new_waitoptions.timeout = max(timeout, 60000.0) # at least 1 minute
+                    new_waitoptions.timeout = max(self.default_ipc_timeout, 60000.0)  # at least 1 minute
                     new_waitoptions.feeThreshold = 1
                     template7 = await mining_wait_next_template(template6, stack, ctx, new_waitoptions)
                     assert template7 is None
@@ -295,11 +323,13 @@ async def wait_for_block():
 
     def run_ipc_option_override_test(self):
         self.log.info("Running IPC option override test")
-        # Set an absurd reserved weight. `-blockreservedweight` is RPC-only, so
-        # with this setting RPC templates would be empty. IPC clients set
+        # Confirm that BlockCreateOptions.blockReservedWeight takes precedence
+        # over -blockreservedweight. Set an absurdly high -blockreservedweight
+        # value that would result in empty blocks to verify this. IPC clients set
         # blockReservedWeight per template request and are unaffected; later in
         # the test the IPC template includes a mempool transaction.
         self.restart_node(0, extra_args=[f"-blockreservedweight={MAX_BLOCK_WEIGHT}"])
+        self.miniwallet.rescan_utxos()
 
         async def async_routine():
             ctx, mining = await make_mining_ctx(self)
@@ -321,11 +351,139 @@ async def async_routine():
 
             self.log.debug("Enforce minimum reserved weight for IPC clients too")
             opts.blockReservedWeight = 0
-            try:
-                await mining.createNewBlock(ctx, opts)
-                raise AssertionError("createNewBlock unexpectedly succeeded")
-            except capnp.lib.capnp.KjException as e:
-                assert_capnp_failed(e, "remote exception: std::exception: block_reserved_weight (0) must be at least 2000 weight units")
+            await assert_create_new_block_fails(ctx, mining, opts,
+                "block_reserved_weight (0) is lower than minimum safety value of (2000)")
+
+        async def async_routine_check_max_reserved_weight():
+            self.log.debug("Enforce maximum reserved weight for IPC clients too")
+            ctx, mining = await make_mining_ctx(self)
+            opts = self.capnp_modules['mining'].BlockCreateOptions()
+            opts.blockReservedWeight = MAX_BLOCK_WEIGHT + 1
+            await assert_create_new_block_fails(ctx, mining, opts,
+                f"block_reserved_weight ({MAX_BLOCK_WEIGHT + 1}) exceeds consensus maximum block weight ({MAX_BLOCK_WEIGHT})")
+
+        async def async_routine_check_sigops_limit():
+            self.log.debug("Enforce sigops limit for IPC clients too")
+            ctx, mining = await make_mining_ctx(self)
+            opts = self.capnp_modules['mining'].BlockCreateOptions()
+            opts.coinbaseOutputMaxAdditionalSigops = MAX_BLOCK_SIGOPS_COST + 1
+            await assert_create_new_block_fails(ctx, mining, opts,
+                f"coinbase_output_max_additional_sigops ({MAX_BLOCK_SIGOPS_COST + 1}) exceeds consensus maximum block sigops cost ({MAX_BLOCK_SIGOPS_COST})")
+
+        asyncio.run(capnp.run(async_routine()))
+        asyncio.run(capnp.run(async_routine_check_max_reserved_weight()))
+        asyncio.run(capnp.run(async_routine_check_sigops_limit()))
+        self.restart_node(0)
+        self.connect_nodes(0, 1)
+        self.miniwallet.rescan_utxos()
+
+    def run_waitnext_mining_policy_test(self):
+        """Verify that waitNext() preserves the mining policy from -blockmintxfee
+        instead of falling back to defaults."""
+        self.log.info("Running waitNext mining policy test")
+        block_min_tx_fee = Decimal("0.00002000")
+        below_block_min_tx_fee = Decimal("0.00001000")
+        above_block_min_tx_fee = Decimal("0.00003000")
+
+        self.restart_node(0, extra_args=[
+            f"-blockmintxfee={block_min_tx_fee:.8f}",
+            "-minrelaytxfee=0",
+            "-persistmempool=0",
+        ])
+
+        async def async_routine():
+            ctx, mining = await make_mining_ctx(self)
+
+            self.log.debug("Create a below -blockmintxfee transaction")
+            low_fee_tx = self.miniwallet.send_self_transfer(
+                fee_rate=below_block_min_tx_fee,
+                from_node=self.nodes[0],
+                confirmed_only=True,
+            )
+            assert low_fee_tx["txid"] in self.nodes[0].getrawmempool()
+
+            async with AsyncExitStack() as stack:
+                self.log.debug("createNewBlock should respect -blockmintxfee")
+                template = await mining_create_block_template(mining, stack, ctx, self.default_block_create_options)
+                assert template is not None
+                block = await mining_get_block(template, ctx)
+                assert low_fee_tx["txid"] not in {tx.txid_hex for tx in block.vtx[1:]}
+
+                self.log.debug("waitNext should preserve the same mining policy")
+                high_fee_tx = self.miniwallet.send_self_transfer(
+                    fee_rate=above_block_min_tx_fee,
+                    from_node=self.nodes[0],
+                    confirmed_only=True,
+                )
+                mempool_txids = self.nodes[0].getrawmempool()
+                assert high_fee_tx["txid"] in mempool_txids
+                assert low_fee_tx["txid"] in mempool_txids
+                template_next = await mining_wait_next_template(template, stack, ctx, self.default_block_wait_options)
+                assert template_next is not None
+
+                block_next = await mining_get_block(template_next, ctx)
+                block_next_txids = {tx.txid_hex for tx in block_next.vtx[1:]}
+                assert high_fee_tx["txid"] in block_next_txids
+                assert low_fee_tx["txid"] not in block_next_txids
+
+        asyncio.run(capnp.run(async_routine()))
+
+    def run_block_max_weight_test(self):
+        """Verify IPC createNewBlock() and waitNext() preserve the -blockmaxweight policy."""
+        self.log.info("Running block_max_weight test")
+
+        # Cap that leaves room for only a handful of mempool transactions
+        # above DEFAULT_BLOCK_RESERVED_WEIGHT (8000). Well below MAX_BLOCK_WEIGHT
+        # (4_000_000), so any truncation observed here is attributable to the
+        # cap, not to consensus limits or wallet chain limits.
+        small_cap = DEFAULT_BLOCK_RESERVED_WEIGHT + 4000
+        NUM_TXS = 20
+
+        self.restart_node(0, extra_args=[
+            f"-blockmaxweight={small_cap}",
+            "-minrelaytxfee=0",
+            "-persistmempool=0",
+        ])
+        # Refresh miniwallet's UTXO view from the chain after restart.
+        self.miniwallet.rescan_utxos()
+
+        # Fill the mempool enough that the configured block weight cap forces
+        # template truncation.
+        for _ in range(NUM_TXS):
+            self.miniwallet.send_self_transfer(from_node=self.nodes[0], confirmed_only=True)
+        assert_equal(self.nodes[0].getmempoolinfo()["size"], NUM_TXS)
+
+        async def async_routine():
+            ctx, mining = await make_mining_ctx(self)
+            async with AsyncExitStack() as stack:
+                template = await mining_create_block_template(mining, stack, ctx, self.default_block_create_options)
+                assert template is not None
+                block = await mining_get_block(template, ctx)
+                assert_greater_than_or_equal(small_cap, block.get_weight())
+                # Exclude the coinbase; the cap must have forced truncation.
+                initial_included = len(block.vtx) - 1
+                assert initial_included < NUM_TXS, (
+                    f"Expected -blockmaxweight={small_cap} to truncate; "
+                    f"included {initial_included}/{NUM_TXS} mempool txs"
+                )
+
+                self.log.debug("waitNext should preserve -blockmaxweight")
+                high_fee_tx = self.miniwallet.send_self_transfer(
+                    from_node=self.nodes[0],
+                    confirmed_only=True,
+                    fee_rate=10,
+                )
+                template_next = await mining_wait_next_template(template, stack, ctx, self.default_block_wait_options)
+                assert template_next is not None
+
+                block_next = await mining_get_block(template_next, ctx)
+                assert_greater_than_or_equal(small_cap, block_next.get_weight())
+                assert high_fee_tx["txid"] in {tx.txid_hex for tx in block_next.vtx[1:]}
+                next_included = len(block_next.vtx) - 1
+                assert next_included < NUM_TXS + 1, (
+                    f"Expected -blockmaxweight={small_cap} to remain capped after waitNext; "
+                    f"included {next_included}/{NUM_TXS + 1} mempool txs"
+                )
 
         asyncio.run(capnp.run(async_routine()))
 
@@ -335,23 +493,38 @@ def run_coinbase_and_submission_test(self):
 
         async def async_routine():
             ctx, mining = await make_mining_ctx(self)
+            # Node 0 drives the checkBlock() and submitSolution() checks. Node
+            # 2 has a separate IPC interface and starts synced through node 1,
+            # so it can be isolated below to test submitBlock() without
+            # changing node 0's template and chain state first.
+            ctx2, mining2 = await make_mining_ctx(self, node_index=2)
 
             current_block_height = self.nodes[0].getchaintips()[0]["height"]
             check_opts = self.capnp_modules['mining'].BlockCheckOptions()
 
+            # Send a real transaction so the template includes it.
+            self.miniwallet.send_self_transfer(fee_rate=10, from_node=self.nodes[0])
+
             async with destroying((await mining.createNewBlock(ctx, self.default_block_create_options)).result, ctx) as template:
-                block = await mining_get_block(template, ctx)
+                block = await self.build_candidate_block(template, ctx)
+                coinbase = block.vtx[0]
+                self.log.debug("Template should include a mempool transaction")
+                assert len(block.vtx) >= 2, "Block should include at least the coinbase and the mempool tx"
                 balance = self.miniwallet.get_balance()
-                coinbase = await self.build_coinbase_test(template, ctx, self.miniwallet)
-                # Reduce payout for balance comparison simplicity
-                coinbase.vout[0].nValue = COIN
-                block.vtx[0] = coinbase
-                block.hashMerkleRoot = block.calc_merkle_root()
                 original_version = block.nVersion
 
+                self.log.debug("Disconnect node 2 before block submission tests")
+                # The default topology is 2 -> 1 -> 0. Splitting the 1-2 edge
+                # lets node 2 accept/reject complete blocks independently.
+                self.disconnect_nodes(1, 2)
+
+                self.log.debug("submitSolution should reject an empty coinbase")
+                submitted = (await template.submitSolution(ctx, 0, 0, 0, b"")).result
+                assert_equal(submitted, False)
+
                 self.log.debug("Submit solution that can't be deserialized")
                 try:
-                    await template.submitSolution(ctx, 0, 0, 0, b"")
+                    await template.submitSolution(ctx, 0, 0, 0, b"\x00")
                     raise AssertionError("submitSolution unexpectedly succeeded")
                 except capnp.lib.capnp.KjException as e:
                     assert_capnp_failed(e, "remote exception: std::exception: SpanReader::read(): end of data:")
@@ -362,8 +535,21 @@ async def async_routine():
                 check = await mining.checkBlock(ctx, block.serialize(), check_opts)
                 assert_equal(check.result, False)
                 assert_equal(check.reason, "bad-version(0x00000000)")
-                submitted = (await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize())).result
-                assert_equal(submitted, False)
+                assert_equal(check.debug, "rejected nVersion=0x00000000 block")
+                self.log.debug("submitSolution should reject a bad-version block")
+                result = await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize())
+                assert_equal(result.result, False)
+                assert_equal(result.reason, "bad-version(0x00000000)")
+                assert_equal(result.debug, "rejected nVersion=0x00000000 block")
+                self.log.debug("submitBlock should reject a bad-version block")
+                await self.assert_submit_block(
+                    mining2,
+                    ctx2,
+                    block,
+                    result=False,
+                    reason="bad-version(0x00000000)",
+                    debug="rejected nVersion=0x00000000 block",
+                )
                 self.log.debug("Submit a valid block")
                 block.nVersion = original_version
                 block.solve()
@@ -377,8 +563,20 @@ async def async_routine():
 
                 self.log.debug("Submitted coinbase must include witness")
                 assert_not_equal(coinbase.serialize_without_witness().hex(), coinbase.serialize().hex())
-                submitted = (await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize_without_witness())).result
-                assert_equal(submitted, False)
+                missing_witness_block = deepcopy(block)
+                missing_witness_block.vtx[0].wit.vtxinwit = []
+                has_witness_commitment = any(
+                    len(o.scriptPubKey) >= 38 and o.scriptPubKey[2:6] == WITNESS_COMMITMENT_HEADER
+                    for o in missing_witness_block.vtx[0].vout
+                )
+                assert has_witness_commitment, "Coinbase should have a witness commitment output"
+                missing_witness_block.hashMerkleRoot = missing_witness_block.calc_merkle_root()
+                missing_witness_block.solve()
+                self.log.debug("submitSolution should reject a coinbase missing witness")
+                result = await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize_without_witness())
+                assert_equal(result.result, False)
+                assert_equal(result.reason, "bad-witness-nonce-size")
+                assert_equal(result.debug, "CheckWitnessMalleation : invalid witness reserved value size")
 
                 self.log.debug("Even a rejected submitSolution() mutates the template's block")
                 # Can be used by clients to download and inspect the (rejected)
@@ -386,14 +584,36 @@ async def async_routine():
                 remote_block_after = await mining_get_block(template, ctx)
                 assert_not_equal(remote_block_before.serialize().hex(), remote_block_after.serialize().hex())
 
+                self.log.debug("submitBlock should reject a block missing coinbase witness")
+                await self.assert_submit_block(
+                    mining2,
+                    ctx2,
+                    missing_witness_block,
+                    result=False,
+                    reason="bad-witness-nonce-size",
+                    debug="CheckWitnessMalleation : invalid witness reserved value size",
+                )
+
                 self.log.debug("Submit again, with the witness")
-                submitted = (await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize())).result
-                assert_equal(submitted, True)
+                result = await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize())
+                assert_equal(result.result, True)
+                assert_equal(result.reason, "")
+                assert_equal(result.debug, "")
+
+                self.log.debug("Submit a valid complete block through the disconnected node")
+                await self.assert_submit_block(mining2, ctx2, block, result=True)
+                assert_equal(self.nodes[2].getchaintips()[0]["height"], current_block_height + 1)
+                self.log.debug("submitBlock should reject the duplicate complete block")
+                await self.assert_submit_block(mining2, ctx2, block, result=False, reason="duplicate")
 
             self.log.debug("Block should propagate")
             # Check that the IPC node actually updates its own chain
             assert_equal(self.nodes[0].getchaintips()[0]["height"], current_block_height + 1)
             # Stalls if a regression causes submitSolution() to accept an invalid block:
+            self.sync_blocks(self.nodes[:2])
+            # Rejoin node 2 and verify the submitBlock result converges with
+            # the submitSolution result from node 0.
+            self.connect_nodes(1, 2)
             self.sync_all()
             # Check that the other node accepts the block
             assert_equal(self.nodes[0].getchaintips()[0], self.nodes[1].getchaintips()[0])
@@ -404,17 +624,206 @@ async def async_routine():
             check = await mining.checkBlock(ctx, block.serialize(), check_opts)
             assert_equal(check.result, False)
             assert_equal(check.reason, "inconclusive-not-best-prevblk")
+            self.log.debug("submitBlock on the same node should fail with duplicate after submitSolution succeeds")
+            await self.assert_submit_block(mining, ctx, block, result=False, reason="duplicate")
+
+            self.log.debug("submitSolution should return duplicate after submitBlock succeeds")
+            async with destroying((await mining2.createNewBlock(ctx2, self.default_block_create_options)).result, ctx2) as template2:
+                duplicate_block = await self.build_candidate_block(template2, ctx2)
+                duplicate_coinbase = duplicate_block.vtx[0]
+                duplicate_block.solve()
+                self.log.debug("Submit a valid complete block before duplicate submitSolution")
+                await self.assert_submit_block(mining2, ctx2, duplicate_block, result=True)
+                self.nodes[2].waitforblockheight(current_block_height + 2)
+                self.log.debug("submitSolution should reject the duplicate block")
+                result = await template2.submitSolution(ctx2, duplicate_block.nVersion, duplicate_block.nTime, duplicate_block.nNonce, duplicate_coinbase.serialize())
+                assert_equal(result.result, False)
+                assert_equal(result.reason, "duplicate")
+                assert_equal(result.debug, "")
+            self.sync_all()
+
+            self.log.debug(
+                "submitSolution and submitBlock should report inconclusive for valid stale blocks")
+            async with AsyncExitStack() as stack:
+                active_template = await mining_create_block_template(
+                    mining2, stack, ctx2, self.default_block_create_options)
+                solution_template = await mining_create_block_template(
+                    mining2, stack, ctx2, self.default_block_create_options)
+                submit_block_template = await mining_create_block_template(
+                    mining2, stack, ctx2, self.default_block_create_options)
+                assert active_template is not None
+                assert solution_template is not None
+                assert submit_block_template is not None
+
+                active_block = await self.build_candidate_block(
+                    active_template, ctx2, extra_nonce=b"\x01")
+                solution_block = await self.build_candidate_block(
+                    solution_template, ctx2, extra_nonce=b"\x02")
+                submit_block = await self.build_candidate_block(
+                    submit_block_template, ctx2, extra_nonce=b"\x03")
+                active_block.solve()
+                solution_block.solve()
+                submit_block.solve()
+
+                # All three templates share a parent. The first block becomes
+                # active, so the remaining valid blocks are accepted as stale.
+                await self.assert_submit_block(
+                    mining2, ctx2, active_block, result=True)
+
+                solution_coinbase = solution_block.vtx[0]
+                result = await solution_template.submitSolution(
+                    ctx2,
+                    solution_block.nVersion,
+                    solution_block.nTime,
+                    solution_block.nNonce,
+                    solution_coinbase.serialize(),
+                )
+                assert_equal(result.result, False)
+                assert_equal(result.reason, "inconclusive")
+                assert_equal(result.debug, "")
+
+                await self.assert_submit_block(
+                    mining2, ctx2, submit_block, result=False, reason="inconclusive")
+            self.sync_all()
+
+            self.log.debug("Submit the same invalid block twice")
+            async with destroying((await mining2.createNewBlock(ctx2, self.default_block_create_options)).result, ctx2) as template2:
+                invalid_block = await self.build_candidate_block(template2, ctx2)
+                invalid_block.vtx[0].nLockTime = 2**32 - 1
+                invalid_block.hashMerkleRoot = invalid_block.calc_merkle_root()
+                invalid_block.solve()
+                self.log.debug("submitBlock should reject the non-final block")
+                await self.assert_submit_block(
+                    mining2,
+                    ctx2,
+                    invalid_block,
+                    result=False,
+                    reason="bad-txns-nonfinal",
+                    debug="non-final transaction",
+                )
+                self.log.debug("submitBlock should report duplicate-invalid for the same block")
+                await self.assert_submit_block(
+                    mining2,
+                    ctx2,
+                    invalid_block,
+                    result=False,
+                    reason="duplicate-invalid",
+                    debug=f"block {invalid_block.hash_hex} was previously marked invalid",
+                )
+
+            self.log.debug("Submit a malformed complete block")
+            try:
+                await mining2.submitBlock(ctx2, block.serialize()[:-15])
+                raise AssertionError("submitBlock unexpectedly succeeded")
+            except capnp.lib.capnp.KjException as e:
+                assert_capnp_failed(e, "remote exception: std::exception: SpanReader::read(): end of data:")
+
+            self.log.debug("Submit empty block data")
+            try:
+                await mining2.submitBlock(ctx2, b"")
+                raise AssertionError("submitBlock unexpectedly succeeded")
+            except capnp.lib.capnp.KjException as e:
+                assert_capnp_failed(e, "remote exception: std::exception: SpanReader::read(): end of data:")
+            assert_equal(self.nodes[2].is_node_stopped(), False)
+
+        asyncio.run(capnp.run(async_routine()))
+
+    def run_transaction_lookup_test(self):
+        """Test getTransactionsByTxID() and getTransactionsByWitnessID()."""
+        self.log.info("Running transaction lookup test")
+
+        async def async_routine():
+            ctx, mining = await make_mining_ctx(self)
+            tx1 = self.miniwallet.send_self_transfer(fee_rate=10, from_node=self.nodes[0])
+            tx2 = self.miniwallet.send_self_transfer(fee_rate=10, from_node=self.nodes[0], utxo_to_spend=tx1["new_utxo"])
+
+            self.log.debug("getTransactionsByTxID() returns mempool txs and nulls")
+            raw_txs_txid = await mining.getTransactionsByTxID(ctx, [tx1["tx"].txid, tx2["tx"].txid, bytes(32)])
+            assert_equal(len(raw_txs_txid.result), 3)
+            assert_equal(raw_txs_txid.result[0].hex(), tx1["hex"])
+            assert_equal(raw_txs_txid.result[1].hex(), tx2["hex"])
+            assert_equal(raw_txs_txid.result[2], b'')
+
+            self.log.debug("getTransactionsByWitnessID() returns mempool txs and nulls")
+            raw_txs_wtxid = await mining.getTransactionsByWitnessID(ctx, [tx1["tx"].wtxid, tx2["tx"].wtxid, bytes(32)])
+            assert_equal(len(raw_txs_wtxid.result), 3)
+            assert_equal(raw_txs_wtxid.result[0].hex(), tx1["hex"])
+            assert_equal(raw_txs_wtxid.result[1].hex(), tx2["hex"])
+            assert_equal(raw_txs_wtxid.result[2], b'')
+
+            self.log.debug("Mined transactions are not returned")
+            self.generate(self.nodes[0], 1)
+            self.sync_all()
+            raw_txs = await mining.getTransactionsByTxID(ctx, [tx1["tx"].txid])
+            assert_equal(raw_txs.result[0], b'')
+            raw_txs = await mining.getTransactionsByWitnessID(ctx, [tx1["tx"].wtxid])
+            assert_equal(raw_txs.result[0], b'')
+
+        asyncio.run(capnp.run(async_routine()))
+
+    def run_low_height_test(self):
+        """Test that IPC createNewBlock() works at low block heights on a
+        clean chain, in particular with regard to bad-cb-length.
+
+        createNewBlock pads the scriptSig with a dummy extranonce to pass
+        its internal CheckBlock(). This dummy is omitted from the
+        getCoinbaseTx() script_sig_prefix field. The client provides its
+        own extraNonce via submitSolution()."""
+        self.log.info("Running low block height test")
+
+        node = self.nodes[0]
+        self.stop_node(0)
+        # Clear chain data to start from genesis
+        self.cleanup_folder(node.chain_path)
+        node.start()
+        node.wait_for_rpc_connection()
+        assert_equal(node.getblockcount(), 0)
+
+        async def async_routine():
+            ctx, mining = await make_mining_ctx(self)
+            opts = self.capnp_modules['mining'].BlockCreateOptions()
+
+            # Mine blocks 1-17 to exercise the boundary at height 16, where the
+            # internal scriptSig padding is no longer needed.
+            for height in range(1, 18):
+                async with AsyncExitStack() as stack:
+                    # Disable cooldown to avoid hanging in the IBD loop on a fresh chain
+                    template = await mining_create_block_template(mining, stack, ctx, opts, cooldown=False)
+                    assert template is not None
+                    block = await mining_get_block(template, ctx)
+                    # Heights <= 16 need extra nonce padding.
+                    extra_nonce = b'\xaa\xbb\xcc\xdd' if height <= 16 else b""
+                    coinbase = await self.build_coinbase_test(template, ctx, self.miniwallet, extra_nonce=extra_nonce)
+                    block.vtx[0] = coinbase
+                    block.hashMerkleRoot = block.calc_merkle_root()
+                    block.solve()
+                    result = await template.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize())
+                    assert_equal(result.result, True)
+                    assert_equal(result.reason, "")
+                    assert_equal(result.debug, "")
+                    assert_equal(node.getblockcount(), height)
 
         asyncio.run(capnp.run(async_routine()))
 
     def run_test(self):
         self.miniwallet = MiniWallet(self.nodes[0])
+        # Amount of time in milliseconds the test is allowed to wait or be idle before it should fail.
+        self.default_ipc_timeout = 1000.0 * self.options.timeout_factor
         self.default_block_create_options = self.capnp_modules['mining'].BlockCreateOptions()
+        self.default_block_wait_options = self.capnp_modules['mining'].BlockWaitOptions()
+        self.default_block_wait_options.timeout = self.default_ipc_timeout
+        self.default_block_wait_options.feeThreshold = 1
         self.run_mining_interface_test()
         self.run_early_startup_test()
         self.run_block_template_test()
         self.run_coinbase_and_submission_test()
+        self.run_waitnext_mining_policy_test()
+        self.run_block_max_weight_test()
         self.run_ipc_option_override_test()
+        self.run_transaction_lookup_test()
+
+        # Needs to run last because it resets the chain.
+        self.run_low_height_test()
 
 
 if __name__ == '__main__':
diff --git a/depend/bitcoin/test/functional/interface_rest.py b/depend/bitcoin/test/functional/interface_rest.py
index 2009752c..5c6d86df 100755
--- a/depend/bitcoin/test/functional/interface_rest.py
+++ b/depend/bitcoin/test/functional/interface_rest.py
@@ -23,6 +23,8 @@
     assert_equal,
     assert_greater_than,
     assert_greater_than_or_equal,
+    assert_not_equal,
+    sync_txindex,
 )
 from test_framework.wallet import (
     MiniWallet,
@@ -52,23 +54,22 @@ def filter_output_indices_by_value(vouts, value):
 class RESTTest (BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
-        self.extra_args = [["-rest", "-blockfilterindex=1"], []]
+        self.extra_args = [["-rest", "-blockfilterindex=1", "-txindex"], []]
         # whitelist peers to speed up tx relay / mempool sync
         self.noban_tx_relay = True
-        self.supports_cli = False
 
     def test_rest_request(
             self,
             uri: str,
             http_method: str = 'GET',
-            req_type: ReqType = ReqType.JSON,
+            req_type: typing.Optional[ReqType] = ReqType.JSON,
             body: str = '',
             status: int = 200,
             ret_type: RetType = RetType.JSON,
             query_params: typing.Union[dict[str, typing.Any], str, None] = None,
             ) -> typing.Union[http.client.HTTPResponse, bytes, str, None]:
         rest_uri = '/rest' + uri
-        if req_type in ReqType:
+        if isinstance(req_type, ReqType):
             rest_uri += f'.{req_type.name.lower()}'
         if query_params:
             if isinstance(query_params, str):
@@ -288,10 +289,12 @@ def run_test(self):
         assert_equal(len(json_obj), 1)  # ensure that there is one header in the json response
         assert_equal(json_obj[0]['hash'], bb_hash)  # request/response hash should be the same
 
-        # Check invalid uri (% symbol at the end of the request)
-        for invalid_uri in [f"/headers/{bb_hash}%", f"/blockfilterheaders/basic/{bb_hash}%", "/mempool/contents.json?%"]:
+        # Check tolerance for invalid URI (% symbol at the end of the request)
+        for invalid_uri in [f"/headers/{bb_hash}%", f"/blockfilterheaders/basic/{bb_hash}%"]:
             resp = self.test_rest_request(invalid_uri, ret_type=RetType.OBJ, status=400)
-            assert_equal(resp.read().decode('utf-8').rstrip(), "URI parsing failed, it likely contained RFC 3986 invalid characters")
+            assert_equal(resp.read().decode('utf-8').rstrip(), f"Invalid hash: {bb_hash}%")
+        resp = self.test_rest_request("/mempool/contents.json?%", ret_type=RetType.OBJ, status=200)
+        assert_equal(resp.read().decode('utf-8').rstrip(), "{}")
 
         # Compare with normal RPC block response
         rpc_block_json = self.nodes[0].getblock(bb_hash)
@@ -303,7 +306,7 @@ def run_test(self):
         expected_filter = {
             'basic block filter index': {'synced': True, 'best_block_height': 208},
         }
-        self.wait_until(lambda: self.nodes[0].getindexinfo() == expected_filter)
+        self.wait_until(lambda: self.nodes[0].getindexinfo("basic block filter index") == expected_filter)
         json_obj = self.test_rest_request(f"/headers/{bb_hash}", query_params={"count": 5})
         assert_equal(len(json_obj), 5)  # now we should have 5 header objects
         json_obj = self.test_rest_request(f"/blockfilterheaders/basic/{bb_hash}", query_params={"count": 5})
@@ -481,8 +484,7 @@ def get_block_part(status: int = 200, **kwargs):
             get_block_part(status=400, query_params={"offset": "x"})
             get_block_part(status=400, query_params={"size": "y"})
             get_block_part(status=400, query_params={"offset": "x", "size": "y"})
-            assert get_block_part(status=400, query_params="%XY").decode("utf-8").startswith("URI parsing failed")
-
+            get_block_part(status=400, query_params="%XY")
             get_block_part(status=400, query_params={"offset": 0, "size": 0})
             get_block_part(status=400, query_params={"offset": len(block_bin), "size": 0})
             get_block_part(status=400, query_params={"offset": len(block_bin), "size": 1})
@@ -523,5 +525,121 @@ def get_block_part(status: int = 200, **kwargs):
         resp = self.test_rest_request(f"/deploymentinfo/{INVALID_PARAM}", ret_type=RetType.OBJ, status=400)
         assert_equal(resp.read().decode('utf-8').rstrip(), f"Invalid hash: {INVALID_PARAM}")
 
+        self.log.info("Test Cache-Control headers on REST responses")
+
+        blockhash = self.nodes[0].getbestblockhash()
+        height = self.nodes[0].getblockcount()
+        immutable = "public, immutable, max-age=86400"
+        no_store = "no-store"
+
+        def assert_cache_control(
+            uri: str,
+            expected: str,
+            *,
+            req_type: typing.Optional[ReqType] = ReqType.JSON,
+            status: int = 200,
+            query_params: typing.Union[dict[str, typing.Any], str, None] = None,
+        ) -> bytes:
+            """Assert `uri` has expected Cache-Control and return the response body."""
+            response = self.test_rest_request(
+                uri,
+                req_type=req_type,
+                status=status,
+                ret_type=RetType.OBJ,
+                query_params=query_params,
+            )
+            assert isinstance(response, http.client.HTTPResponse)
+            assert_equal(response.getheader("Cache-Control"), expected)
+            return response.read()
+
+        # Immutable endpoints
+        immutable_block = assert_cache_control(f"/block/{blockhash}", immutable, req_type=ReqType.BIN)
+        immutable_spenttxouts = assert_cache_control(f"/spenttxouts/{blockhash}", immutable)
+        assert_cache_control(f"/spenttxouts/{blockhash}", immutable, req_type=ReqType.BIN)
+        assert_cache_control(f"/spenttxouts/{blockhash}", immutable, req_type=ReqType.HEX)
+        immutable_blockfilter = assert_cache_control(
+            f"/blockfilter/basic/{blockhash}", immutable, req_type=ReqType.JSON
+        )
+        assert_cache_control(f"/blockfilter/basic/{blockhash}", immutable, req_type=ReqType.BIN)
+        assert_cache_control(f"/blockfilter/basic/{blockhash}", immutable, req_type=ReqType.HEX)
+
+        # Mutable endpoints are not stored until validator support is available.
+        mutable_block = assert_cache_control(f"/block/{blockhash}", no_store)
+        assert_cache_control(f"/block/notxdetails/{blockhash}", no_store)
+        mutable_headers = assert_cache_control(
+            f"/headers/{blockhash}", no_store, req_type=ReqType.JSON, query_params={"count": 2}
+        )
+        assert_cache_control(f"/headers/{blockhash}", no_store, req_type=ReqType.BIN, query_params={"count": 1})
+        assert_cache_control(f"/headers/{blockhash}", no_store, req_type=ReqType.HEX, query_params={"count": 1})
+        assert_cache_control(f"/blockfilterheaders/basic/{blockhash}", no_store, req_type=ReqType.JSON, query_params={"count": 1})
+        assert_cache_control(f"/blockfilterheaders/basic/{blockhash}", no_store, req_type=ReqType.BIN, query_params={"count": 1})
+        assert_cache_control(f"/blockfilterheaders/basic/{blockhash}", no_store, req_type=ReqType.HEX, query_params={"count": 1})
+        assert_cache_control(f"/blockhashbyheight/{height}", no_store)
+        assert_cache_control(f"/blockhashbyheight/{height}", no_store, req_type=ReqType.BIN)
+        assert_cache_control(f"/blockhashbyheight/{height}", no_store, req_type=ReqType.HEX)
+
+        # Dynamic endpoints
+        mutable_chaininfo = assert_cache_control("/chaininfo", no_store)
+        assert_cache_control("/mempool/info", no_store)
+        mutable_deploymentinfo = assert_cache_control("/deploymentinfo", no_store)
+        immutable_deploymentinfo = assert_cache_control(f"/deploymentinfo/{blockhash}", immutable)
+
+        cache_tx = self.wallet.send_self_transfer(from_node=self.nodes[0])
+        mempool_txid = cache_tx["txid"]
+        cache_utxo = cache_tx["new_utxo"]
+        cache_utxo_path = f"/getutxos/{mempool_txid}-{cache_utxo['vout']}"
+
+        mempool_tx_response = assert_cache_control(f"/tx/{mempool_txid}", no_store, req_type=ReqType.JSON)
+        mempool_tx = json.loads(mempool_tx_response, parse_float=Decimal)
+        assert "blockhash" not in mempool_tx
+        assert_cache_control(f"/tx/{mempool_txid}", no_store, req_type=ReqType.BIN)
+        assert_cache_control(f"/tx/{mempool_txid}", no_store, req_type=ReqType.HEX)
+
+        self.generate(self.nodes[0], 1)
+        sync_txindex(self, self.nodes[0])
+
+        self.log.info("Test Cache-Control response behavior across a newly mined block")
+        assert_equal(immutable_block, assert_cache_control(f"/block/{blockhash}", immutable, req_type=ReqType.BIN))
+        assert_equal(immutable_spenttxouts, assert_cache_control(f"/spenttxouts/{blockhash}", immutable))
+        assert_equal(
+            immutable_blockfilter,
+            assert_cache_control(f"/blockfilter/basic/{blockhash}", immutable, req_type=ReqType.JSON),
+        )
+        assert_equal(immutable_deploymentinfo, assert_cache_control(f"/deploymentinfo/{blockhash}", immutable))
+
+        # no-store responses need not change after every block. Only compare responses
+        # that are guaranteed to incorporate this active chain extension.
+        assert_not_equal(mutable_block, assert_cache_control(f"/block/{blockhash}", no_store))
+        assert_not_equal(
+            mutable_headers,
+            assert_cache_control(f"/headers/{blockhash}", no_store, req_type=ReqType.JSON, query_params={"count": 2}),
+        )
+        assert_not_equal(mutable_chaininfo, assert_cache_control("/chaininfo", no_store))
+        assert_not_equal(mutable_deploymentinfo, assert_cache_control("/deploymentinfo", no_store))
+
+        confirmed_tx_response = assert_cache_control(f"/tx/{mempool_txid}", no_store, req_type=ReqType.JSON)
+        assert_not_equal(mempool_tx_response, confirmed_tx_response)
+        confirmed_tx = json.loads(confirmed_tx_response, parse_float=Decimal)
+        assert_equal(confirmed_tx["txid"], mempool_txid)
+        assert "blockhash" in confirmed_tx
+        assert_cache_control(f"/tx/{mempool_txid}", no_store, req_type=ReqType.BIN)
+        assert_cache_control(f"/tx/{mempool_txid}", no_store, req_type=ReqType.HEX)
+        assert_cache_control(cache_utxo_path, no_store, req_type=ReqType.JSON)
+        assert_cache_control(cache_utxo_path, no_store, req_type=ReqType.BIN)
+        assert_cache_control(cache_utxo_path, no_store, req_type=ReqType.HEX)
+
+        self.log.info("Test Cache-Control headers on REST error responses")
+        assert_cache_control(f"/block/{blockhash}.invalid", no_store, status=400, req_type=None)
+        assert_cache_control(f"/tx/{INVALID_PARAM}", no_store, status=400)
+        assert_cache_control(f"/deploymentinfo/{INVALID_PARAM}", no_store, status=400)
+        assert_cache_control("/blockhashbyheight/999999999", no_store, status=404)
+        assert_cache_control(f"/block/{UNKNOWN_PARAM}", no_store, status=404)
+        assert_cache_control(f"/tx/{'f' * 64}", no_store, status=404)
+        assert_cache_control("", no_store, status=404, query_params={"x": 1}, req_type=None)
+        assert_cache_control("/tx", no_store, status=404, req_type=None)
+        assert_cache_control("/does-not-exist", no_store, status=404, req_type=None)
+        assert_cache_control("/mempool/not-a-valid-path", no_store, status=400)
+        assert_cache_control(f"/deploymentinfo/{non_existing_blockhash}", no_store, status=400)
+
 if __name__ == '__main__':
     RESTTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/interface_rpc.py b/depend/bitcoin/test/functional/interface_rpc.py
index 46dbd2f8..d9636c12 100755
--- a/depend/bitcoin/test/functional/interface_rpc.py
+++ b/depend/bitcoin/test/functional/interface_rpc.py
@@ -8,10 +8,9 @@
 import os
 from dataclasses import dataclass
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, assert_greater_than_or_equal
+from test_framework.util import JSONRPCException, assert_equal, assert_greater_than_or_equal
 from threading import Thread
 from typing import Optional
-import subprocess
 
 
 RPC_INVALID_PARAMETER      = -8
@@ -83,8 +82,8 @@ def test_work_queue_getblock(node, got_exceeded_error):
     while not got_exceeded_error:
         try:
             node.cli("waitfornewblock", "500").send_cli()
-        except subprocess.CalledProcessError as e:
-            assert_equal(e.output, 'error: Server response: Work queue depth exceeded\n')
+        except JSONRPCException as e:
+            assert_equal(e.error["message"], "non-JSON HTTP response with '503 Service Unavailable' from server: Work queue depth exceeded")
             got_exceeded_error.append(True)
 
 
diff --git a/depend/bitcoin/test/functional/interface_usdt_net.py b/depend/bitcoin/test/functional/interface_usdt_net.py
index de481133..6ec3d126 100755
--- a/depend/bitcoin/test/functional/interface_usdt_net.py
+++ b/depend/bitcoin/test/functional/interface_usdt_net.py
@@ -35,8 +35,8 @@
 # from net_address.h
 NETWORK_TYPE_UNROUTABLE = 0
 # Use in -maxconnections. Results in a maximum of 21 inbound connections
-MAX_CONNECTIONS = 32
-MAX_INBOUND_CONNECTIONS = MAX_CONNECTIONS - 10 - 1  # 10 outbound and 1 feeler
+MAX_CONNECTIONS = 53
+MAX_INBOUND_CONNECTIONS = 21 # 10 outbound and 1 feeler, (MAX_CONNECTIONS - 10 - 1) / 2 slots for tx-relaying inbounds
 
 net_tracepoints_program = """
 #include <uapi/linux/ptrace.h>
diff --git a/depend/bitcoin/test/functional/mempool_accept.py b/depend/bitcoin/test/functional/mempool_accept.py
index 5893b1cc..b3e3749e 100755
--- a/depend/bitcoin/test/functional/mempool_accept.py
+++ b/depend/bitcoin/test/functional/mempool_accept.py
@@ -136,7 +136,7 @@ def run_test(self):
         raw_tx_0 = tx.serialize().hex()
         txid_0 = tx.txid_hex
         self.check_mempool_result(
-            result_expected=[{'txid': txid_0, 'allowed': True, 'vsize': tx.get_vsize(), 'fees': {'base': fee}}],
+            result_expected=[{'txid': txid_0, 'allowed': True, 'vsize_adjusted': tx.get_vsize(),  'vsize': tx.get_vsize(), 'vsize_bip141': tx.get_vsize(),'fees': {'base': fee}}],
             rawtxs=[raw_tx_0],
         )
 
@@ -151,7 +151,7 @@ def run_test(self):
         tx = tx_from_hex(raw_tx_final)
         fee_expected = Decimal('50.0') - output_amount
         self.check_mempool_result(
-            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize': tx.get_vsize(), 'fees': {'base': fee_expected}}],
+            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize_adjusted': tx.get_vsize(), 'vsize': tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), 'fees': {'base': fee_expected}}],
             rawtxs=[tx.serialize().hex()],
             maxfeerate=0,
         )
@@ -172,7 +172,7 @@ def run_test(self):
         raw_tx_0 = tx.serialize().hex()
         txid_0 = tx.txid_hex
         self.check_mempool_result(
-            result_expected=[{'txid': txid_0, 'allowed': True, 'vsize': tx.get_vsize(), 'fees': {'base': (2 * fee)}}],
+            result_expected=[{'txid': txid_0, 'allowed': True, 'vsize_adjusted': tx.get_vsize(), 'vsize': tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), 'fees': {'base': (2 * fee)}}],
             rawtxs=[raw_tx_0],
         )
         node.sendrawtransaction(hexstring=tx.serialize().hex(), maxfeerate=0)
@@ -218,7 +218,7 @@ def run_test(self):
         raw_tx_reference = tx.serialize().hex()
         # Reference tx should be valid on itself
         self.check_mempool_result(
-            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize': tx.get_vsize(), 'fees': { 'base': Decimal('0.1') - Decimal('0.05')}}],
+            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize_adjusted': tx.get_vsize(), 'vsize': tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), 'fees': { 'base': Decimal('0.1') - Decimal('0.05')}}],
             rawtxs=[tx.serialize().hex()],
             maxfeerate=0,
         )
@@ -354,7 +354,7 @@ def run_test(self):
         tx.vout.append(CTxOut(0, CScript([OP_RETURN, b'\xff' * 50000])))
 
         self.check_mempool_result(
-            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize': tx.get_vsize(), 'fees': {'base': Decimal('0.05')}}],
+            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize_adjusted': tx.get_vsize(), 'vsize': tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), 'fees': {'base': Decimal('0.05')}}],
             rawtxs=[tx.serialize().hex()],
             maxfeerate=0
         )
@@ -366,7 +366,7 @@ def run_test(self):
         tx.vout[0].scriptPubKey = CScript([OP_RETURN, b'\xff'])
         tx.vout = [tx.vout[0]] * op_return_count
         self.check_mempool_result(
-            result_expected=[{"txid": tx.txid_hex, "allowed": True, "vsize": tx.get_vsize(), "fees": {"base": Decimal("0.05000026")}}],
+            result_expected=[{"txid": tx.txid_hex, "allowed": True, "vsize_adjusted": tx.get_vsize(), "vsize": tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), "fees": {"base": Decimal("0.05000026")}}],
             rawtxs=[tx.serialize().hex()],
         )
 
@@ -377,7 +377,7 @@ def run_test(self):
         tx.vout[0].scriptPubKey = CScript([OP_RETURN, b"\xff" * (data_len)])
         assert_equal(tx.get_vsize(), int(MAX_STANDARD_TX_WEIGHT / 4))
         self.check_mempool_result(
-            result_expected=[{"txid": tx.txid_hex, "allowed": True, "vsize": tx.get_vsize(), "fees": {"base": Decimal("0.1") - Decimal("0.05")}}],
+            result_expected=[{"txid": tx.txid_hex, "allowed": True, "vsize_adjusted": tx.get_vsize(), "vsize": tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), "fees": {"base": Decimal("0.1") - Decimal("0.05")}}],
             rawtxs=[tx.serialize().hex()],
         )
         tx.vout[0].scriptPubKey = CScript([OP_RETURN, b"\xff" * (data_len + 1)])
@@ -430,7 +430,7 @@ def run_test(self):
         tx.vout[0] = CTxOut(COIN - 1000, DUMMY_MIN_OP_RETURN_SCRIPT)
         assert_equal(len(tx.serialize_without_witness()), MIN_STANDARD_TX_NONWITNESS_SIZE)
         self.check_mempool_result(
-            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize': tx.get_vsize(), 'fees': { 'base': Decimal('0.00001000')}}],
+            result_expected=[{'txid': tx.txid_hex, 'allowed': True, 'vsize_adjusted': tx.get_vsize(), 'vsize': tx.get_vsize(), 'vsize_bip141': tx.get_vsize(), 'fees': { 'base': Decimal('0.00001000')}}],
             rawtxs=[tx.serialize().hex()],
             maxfeerate=0,
         )
@@ -468,7 +468,7 @@ def run_test(self):
         assert_equal(anchor_spend.txid_hex, anchor_spend.wtxid_hex)
 
         self.check_mempool_result(
-            result_expected=[{'txid': anchor_spend.txid_hex, 'allowed': True, 'vsize': anchor_spend.get_vsize(), 'fees': { 'base': Decimal('0.00000700')}}],
+            result_expected=[{'txid': anchor_spend.txid_hex, 'allowed': True, 'vsize_adjusted': anchor_spend.get_vsize(), 'vsize': anchor_spend.get_vsize(), 'vsize_bip141': anchor_spend.get_vsize(), 'fees': { 'base': Decimal('0.00000700')}}],
             rawtxs=[anchor_spend.serialize().hex()],
             maxfeerate=0,
         )
@@ -503,7 +503,7 @@ def run_test(self):
         sign_input_legacy(tx_spend, 0, tx.vout[0].scriptPubKey, privkey, sighash_type=SIGHASH_ALL)
         tx_spend.vin[0].scriptSig = bytes(CScript([OP_0])) + tx_spend.vin[0].scriptSig
         self.check_mempool_result(
-            result_expected=[{'txid': tx_spend.txid_hex, 'allowed': True, 'vsize': tx_spend.get_vsize(), 'fees': { 'base': Decimal('0.00000700')}}],
+            result_expected=[{'txid': tx_spend.txid_hex, 'allowed': True, 'vsize_adjusted': tx_spend.get_vsize(), 'vsize': tx_spend.get_vsize(), 'vsize_bip141': tx_spend.get_vsize(), 'fees': { 'base': Decimal('0.00000700')}}],
             rawtxs=[tx_spend.serialize().hex()],
             maxfeerate=0,
         )
diff --git a/depend/bitcoin/test/functional/mempool_cluster.py b/depend/bitcoin/test/functional/mempool_cluster.py
index 0dfa6b09..a05377ab 100755
--- a/depend/bitcoin/test/functional/mempool_cluster.py
+++ b/depend/bitcoin/test/functional/mempool_cluster.py
@@ -30,13 +30,12 @@ def weight_to_vsize(weight):
 
 def cleanup(func):
     def wrapper(self, *args, **kwargs):
-        try:
-            func(self, *args, **kwargs)
-        finally:
-            # Mine blocks to clear the mempool and replenish the wallet's confirmed UTXOs.
-            while (len(self.nodes[0].getrawmempool()) > 0):
-                self.generate(self.nodes[0], 1)
-            self.wallet.rescan_utxos(include_mempool=True)
+        func(self, *args, **kwargs)
+
+        # Mine blocks to clear the mempool and replenish the wallet's confirmed UTXOs.
+        while (len(self.nodes[0].getrawmempool()) > 0):
+            self.generate(self.nodes[0], 1)
+        self.wallet.rescan_utxos(include_mempool=True)
     return wrapper
 
 class MempoolClusterTest(BitcoinTestFramework):
diff --git a/depend/bitcoin/test/functional/mempool_limit.py b/depend/bitcoin/test/functional/mempool_limit.py
index 4770e155..2e554bb8 100755
--- a/depend/bitcoin/test/functional/mempool_limit.py
+++ b/depend/bitcoin/test/functional/mempool_limit.py
@@ -5,6 +5,7 @@
 """Test mempool limiting together/eviction with the wallet."""
 
 from decimal import Decimal
+import time
 
 from test_framework.mempool_util import (
     fill_mempool,
@@ -205,7 +206,9 @@ def run_test(self):
         self.log.info('Check that mempoolminfee is minrelaytxfee')
         assert_equal(node.getmempoolinfo()['minrelaytxfee'], node.getmempoolinfo()["mempoolminfee"])
 
+        node.setmocktime(int(time.time())-3600)
         fill_mempool(self, node)
+        node.setmocktime(0) # bump time forward so the rate limit buckets refresh and don't block broadcast
 
         # Deliberately try to create a tx with a fee less than the minimum mempool fee to assert that it does not get added to the mempool
         self.log.info('Create a mempool tx that will not pass mempoolminfee')
diff --git a/depend/bitcoin/test/functional/mempool_sigoplimit.py b/depend/bitcoin/test/functional/mempool_sigoplimit.py
index 823d7054..16e83aab 100755
--- a/depend/bitcoin/test/functional/mempool_sigoplimit.py
+++ b/depend/bitcoin/test/functional/mempool_sigoplimit.py
@@ -41,6 +41,7 @@
     assert_equal,
     assert_greater_than,
     assert_greater_than_or_equal,
+    assert_not_equal,
     assert_raises_rpc_error,
 )
 from test_framework.wallet import MiniWallet
@@ -98,14 +99,20 @@ def test_sigops_limit(self, bytes_per_sigop, num_sigops):
 
         res = self.nodes[0].testmempoolaccept([tx.serialize().hex()])[0]
         assert_equal(res['allowed'], True)
+        assert_equal(sigop_equivalent_vsize, tx.get_vsize())
         assert_equal(res['vsize'], sigop_equivalent_vsize)
+        assert_equal(res['vsize_adjusted'], sigop_equivalent_vsize)
+        assert_equal(res['vsize_bip141'], tx.get_vsize())
 
         # increase the tx's vsize to be right above the sigop-limit equivalent size
         # => tx's vsize in mempool should also grow accordingly
         tx.vout[0].scriptPubKey = CScript([OP_RETURN, b'X'*(256+vsize_to_pad+1)])
         res = self.nodes[0].testmempoolaccept([tx.serialize().hex()])[0]
         assert_equal(res['allowed'], True)
+        assert_equal(sigop_equivalent_vsize + 1, tx.get_vsize())
         assert_equal(res['vsize'], sigop_equivalent_vsize+1)
+        assert_equal(res['vsize_adjusted'], sigop_equivalent_vsize + 1)
+        assert_equal(res['vsize_bip141'], tx.get_vsize())
 
         # decrease the tx's vsize to be right below the sigop-limit equivalent size
         # => tx's vsize in mempool should stick at the sigop-limit equivalent
@@ -114,7 +121,10 @@ def test_sigops_limit(self, bytes_per_sigop, num_sigops):
         tx.vout[0].scriptPubKey = CScript([OP_RETURN, b'X'*(256+vsize_to_pad-1)])
         res = self.nodes[0].testmempoolaccept([tx.serialize().hex()])[0]
         assert_equal(res['allowed'], True)
+        assert_not_equal(sigop_equivalent_vsize, tx.get_vsize())
         assert_equal(res['vsize'], sigop_equivalent_vsize)
+        assert_equal(res['vsize_adjusted'], sigop_equivalent_vsize)
+        assert_equal(res['vsize_bip141'], tx.get_vsize())
 
         # check that the ancestor and descendant size calculations in the mempool
         # also use the same max(sigop_equivalent_vsize, serialized_vsize) logic
@@ -141,6 +151,16 @@ def test_sigops_limit(self, bytes_per_sigop, num_sigops):
         assert_equal(entry_parent['descendantcount'], 2)
         assert_equal(entry_parent['descendantsize'], parent_tx.get_vsize() + sigop_equivalent_vsize)
 
+        tx_hex = tx.serialize().hex()
+        txid = tx.txid_hex
+        self.log.info(f"Pushing padded tx {txid} into mempool for getrawtransaction sigopsize field check")
+        self.nodes[0].sendrawtransaction(hexstring=tx_hex, maxburnamount='1.0')
+        # Fetch with verbosity=1 and assert sigopsize is present and correct
+        raw = self.nodes[0].getrawtransaction(txid, 1)
+        sigop_equivalent_vsize = ceil(num_sigops * bytes_per_sigop / WITNESS_SCALE_FACTOR)
+        assert_equal(raw['vsize_adjusted'], sigop_equivalent_vsize)
+        assert_greater_than(raw['vsize_adjusted'], raw['vsize'])
+
     def test_sigops_package(self):
         self.log.info("Test a overly-large sigops-vbyte hits package limits")
         # Make a 2-transaction package which fails vbyte checks even though
@@ -166,7 +186,7 @@ def create_bare_multisig_tx(utxo_to_spend=None):
         parent_individual_testres = self.nodes[0].testmempoolaccept([tx_parent.serialize().hex()])[0]
         assert parent_individual_testres["allowed"]
         max_multisig_vsize = MAX_PUBKEYS_PER_MULTISIG * 5000
-        assert_equal(parent_individual_testres["vsize"], max_multisig_vsize)
+        assert_equal(parent_individual_testres["vsize_adjusted"], max_multisig_vsize)
 
         # But together, it's exceeding limits in the *package* context. If sigops adjusted vsize wasn't being checked
         # here, it would get further in validation and give too-large-cluster error instead.
diff --git a/depend/bitcoin/test/functional/mempool_spend_coinbase.py b/depend/bitcoin/test/functional/mempool_spend_coinbase.py
index b09041c7..3dac5e9d 100755
--- a/depend/bitcoin/test/functional/mempool_spend_coinbase.py
+++ b/depend/bitcoin/test/functional/mempool_spend_coinbase.py
@@ -32,7 +32,8 @@ def run_test(self):
         # Coinbase at height chain_height-100+1 ok in mempool, should
         # get mined. Coinbase at height chain_height-100+2 is
         # too immature to spend.
-        coinbase_txid = lambda h: self.nodes[0].getblock(self.nodes[0].getblockhash(h))['tx'][0]
+        def coinbase_txid(h):
+            return self.nodes[0].getblock(self.nodes[0].getblockhash(h))['tx'][0]
         utxo_mature = wallet.get_utxo(txid=coinbase_txid(chain_height - 100 + 1))
         utxo_immature = wallet.get_utxo(txid=coinbase_txid(chain_height - 100 + 2))
 
diff --git a/depend/bitcoin/test/functional/mempool_truc.py b/depend/bitcoin/test/functional/mempool_truc.py
index e3abe039..96de2ca9 100755
--- a/depend/bitcoin/test/functional/mempool_truc.py
+++ b/depend/bitcoin/test/functional/mempool_truc.py
@@ -29,15 +29,14 @@
 def cleanup(extra_args=None):
     def decorator(func):
         def wrapper(self):
-            try:
-                if extra_args is not None:
-                    self.restart_node(0, extra_args=extra_args)
-                func(self)
-            finally:
-                # Clear mempool again after test
-                self.generate(self.nodes[0], 1)
-                if extra_args is not None:
-                    self.restart_node(0)
+            if extra_args is not None:
+                self.restart_node(0, extra_args=extra_args)
+            func(self)
+
+            # Clear mempool again after test
+            self.generate(self.nodes[0], 1)
+            if extra_args is not None:
+                self.restart_node(0)
         return wrapper
     return decorator
 
diff --git a/depend/bitcoin/test/functional/mining_basic.py b/depend/bitcoin/test/functional/mining_basic.py
index 53ddb0ed..7060a3cb 100755
--- a/depend/bitcoin/test/functional/mining_basic.py
+++ b/depend/bitcoin/test/functional/mining_basic.py
@@ -235,7 +235,7 @@ def test_timewarp(self):
         assert_equal(node.getblocktemplate(template_request={
             'data': block.serialize().hex(),
             'mode': 'proposal',
-            'rules': ['segwit'],
+            **NORMAL_GBT_REQUEST_PARAMS,
         }), None)
 
         bad_block = copy.deepcopy(block)
@@ -357,21 +357,28 @@ def test_block_max_weight(self):
         self.stop_node(0)
         self.nodes[0].assert_start_raises_init_error(
             extra_args=[f"-blockreservedweight={MAX_BLOCK_WEIGHT + 1}"],
-            expected_msg=f"Error: Specified -blockreservedweight ({MAX_BLOCK_WEIGHT + 1}) exceeds consensus maximum block weight ({MAX_BLOCK_WEIGHT})",
+            expected_msg=f"Error: -blockreservedweight ({MAX_BLOCK_WEIGHT + 1}) exceeds consensus maximum block weight ({MAX_BLOCK_WEIGHT})",
         )
 
         self.log.info(f"Test that node will fail to start when user provide -blockreservedweight below {MINIMUM_BLOCK_RESERVED_WEIGHT}")
         self.stop_node(0)
         self.nodes[0].assert_start_raises_init_error(
             extra_args=[f"-blockreservedweight={MINIMUM_BLOCK_RESERVED_WEIGHT - 1}"],
-            expected_msg=f"Error: Specified -blockreservedweight ({MINIMUM_BLOCK_RESERVED_WEIGHT - 1}) is lower than minimum safety value of ({MINIMUM_BLOCK_RESERVED_WEIGHT})",
+            expected_msg=f"Error: -blockreservedweight ({MINIMUM_BLOCK_RESERVED_WEIGHT - 1}) is lower than minimum safety value of ({MINIMUM_BLOCK_RESERVED_WEIGHT})",
         )
 
         self.log.info("Test that node will fail to start when user provide invalid -blockmaxweight")
         self.stop_node(0)
         self.nodes[0].assert_start_raises_init_error(
             extra_args=[f"-blockmaxweight={MAX_BLOCK_WEIGHT + 1}"],
-            expected_msg=f"Error: Specified -blockmaxweight ({MAX_BLOCK_WEIGHT + 1}) exceeds consensus maximum block weight ({MAX_BLOCK_WEIGHT})",
+            expected_msg=f"Error: -blockmaxweight ({MAX_BLOCK_WEIGHT + 1}) exceeds consensus maximum block weight ({MAX_BLOCK_WEIGHT})",
+        )
+
+        self.log.info("Test that node will fail to start when -blockmaxweight is lower than -blockreservedweight")
+        self.stop_node(0)
+        self.nodes[0].assert_start_raises_init_error(
+            extra_args=[f"-blockmaxweight={DEFAULT_BLOCK_RESERVED_WEIGHT - 1}"],
+            expected_msg=f"Error: -blockreservedweight ({DEFAULT_BLOCK_RESERVED_WEIGHT}) exceeds -blockmaxweight ({DEFAULT_BLOCK_RESERVED_WEIGHT - 1})",
         )
 
     def test_height_in_locktime(self):
diff --git a/depend/bitcoin/test/functional/mining_getblocktemplate_longpoll.py b/depend/bitcoin/test/functional/mining_getblocktemplate_longpoll.py
index e36396b3..37518428 100755
--- a/depend/bitcoin/test/functional/mining_getblocktemplate_longpoll.py
+++ b/depend/bitcoin/test/functional/mining_getblocktemplate_longpoll.py
@@ -7,8 +7,9 @@
 import random
 import threading
 
+from test_framework.blocktools import NORMAL_GBT_REQUEST_PARAMS
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, get_rpc_proxy
+from test_framework.util import assert_equal
 from test_framework.wallet import MiniWallet
 
 
@@ -16,27 +17,25 @@ class LongpollThread(threading.Thread):
     def __init__(self, node):
         threading.Thread.__init__(self)
         # query current longpollid
-        template = node.getblocktemplate({'rules': ['segwit']})
+        template = node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         self.longpollid = template['longpollid']
-        # create a new connection to the node, we can't use the same
-        # connection from two threads
-        self.node = get_rpc_proxy(node.url, 1, timeout=600, coveragedir=node.coverage_dir)
+        # create a new connection to the node for this thread
+        self.node = node.create_new_rpc_connection(client_timeout=600)
 
     def run(self):
-        self.node.getblocktemplate({'longpollid': self.longpollid, 'rules': ['segwit']})
+        self.node.getblocktemplate({'longpollid': self.longpollid, **NORMAL_GBT_REQUEST_PARAMS})
 
 class GetBlockTemplateLPTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
-        self.supports_cli = False
 
     def run_test(self):
         self.log.info("Warning: this test will take about 70 seconds in the best case. Be patient.")
         self.log.info("Test that longpollid doesn't change between successive getblocktemplate() invocations if nothing else happens")
         self.generate(self.nodes[0], 10)
-        template = self.nodes[0].getblocktemplate({'rules': ['segwit']})
+        template = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         longpollid = template['longpollid']
-        template2 = self.nodes[0].getblocktemplate({'rules': ['segwit']})
+        template2 = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         assert_equal(template2['longpollid'], longpollid)
 
         self.log.info("Test that longpoll waits if we do nothing")
diff --git a/depend/bitcoin/test/functional/mining_prioritisetransaction.py b/depend/bitcoin/test/functional/mining_prioritisetransaction.py
index 31ed6372..968c96ad 100755
--- a/depend/bitcoin/test/functional/mining_prioritisetransaction.py
+++ b/depend/bitcoin/test/functional/mining_prioritisetransaction.py
@@ -7,6 +7,7 @@
 from decimal import Decimal
 import time
 
+from test_framework.blocktools import NORMAL_GBT_REQUEST_PARAMS
 from test_framework.messages import (
     COIN,
     MAX_BLOCK_WEIGHT,
@@ -352,14 +353,14 @@ def run_test(self):
         # getblocktemplate to (eventually) return a new block.
         mock_time = int(time.time())
         self.nodes[0].setmocktime(mock_time)
-        template = self.nodes[0].getblocktemplate({'rules': ['segwit']})
+        template = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
         self.nodes[0].prioritisetransaction(txid=tx_id, fee_delta=-int(self.relayfee*COIN))
 
         # Calling prioritisetransaction with the inverse amount should delete its prioritisation entry
         assert tx_id not in self.nodes[0].getprioritisedtransactions()
 
         self.nodes[0].setmocktime(mock_time+10)
-        new_template = self.nodes[0].getblocktemplate({'rules': ['segwit']})
+        new_template = self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
 
         assert_not_equal(template, new_template)
 
diff --git a/depend/bitcoin/test/functional/mining_template_verification.py b/depend/bitcoin/test/functional/mining_template_verification.py
index a30fd960..ad2a42b8 100755
--- a/depend/bitcoin/test/functional/mining_template_verification.py
+++ b/depend/bitcoin/test/functional/mining_template_verification.py
@@ -14,6 +14,7 @@
 from test_framework.blocktools import (
     create_block,
     add_witness_commitment,
+    NORMAL_GBT_REQUEST_PARAMS,
 )
 
 from test_framework.test_framework import BitcoinTestFramework
@@ -38,7 +39,7 @@ def assert_template(node, block, expect, *, rehash=True, submit=True, solve=True
     rsp = node.getblocktemplate(template_request={
         'data': block.serialize().hex(),
         'mode': 'proposal',
-        'rules': ['segwit'],
+        **NORMAL_GBT_REQUEST_PARAMS,
     })
     assert_equal(rsp, expect)
     # Only attempt to submit invalid templates
@@ -81,7 +82,7 @@ def truncated_final_transaction_test(self, node, block):
             template_request={
                 "data": block.serialize()[:-1].hex(),
                 "mode": "proposal",
-                "rules": ["segwit"],
+                **NORMAL_GBT_REQUEST_PARAMS,
             }
         )
 
@@ -114,7 +115,7 @@ def bad_tx_count_test(self, node, block):
         assert_raises_rpc_error(-22, "Block decode failed", node.getblocktemplate, {
             'data': bad_block_sn.hex(),
             'mode': 'proposal',
-            'rules': ['segwit'],
+            **NORMAL_GBT_REQUEST_PARAMS,
         })
 
     def nbits_test(self, node, block):
@@ -252,10 +253,11 @@ def spend_twice_test(self, node, block_0_height, tx):
     def parallel_test(self, node, block_3):
         # Ensure that getblocktemplate can be called concurrently by many threads.
         self.log.info("Check blocks in parallel")
-        check_50_blocks = lambda n: [
-            assert_template(n, block_3, "bad-txns-inputs-missingorspent", submit=False)
-            for _ in range(50)
-        ]
+        def check_50_blocks(n):
+            return [
+                assert_template(n, block_3, "bad-txns-inputs-missingorspent", submit=False)
+                for _ in range(50)
+            ]
         rpcs = [node.cli for _ in range(6)]
         with ThreadPoolExecutor(max_workers=len(rpcs)) as threads:
             list(threads.map(check_50_blocks, rpcs))
diff --git a/depend/bitcoin/test/functional/p2p_addr_relay.py b/depend/bitcoin/test/functional/p2p_addr_relay.py
index 65b21c0d..1464e23c 100755
--- a/depend/bitcoin/test/functional/p2p_addr_relay.py
+++ b/depend/bitcoin/test/functional/p2p_addr_relay.py
@@ -280,12 +280,17 @@ def getaddr_tests(self):
         tip_header = from_hex(CBlockHeader(), self.nodes[0].getblockheader(self.nodes[0].getbestblockhash(), False))
         full_outbound_peer.send_and_ping(msg_headers([tip_header]))
 
-        self.log.info('Check that we do not send a getaddr message to a block-relay-only or inbound peer')
+        self.log.info('Check that we do not send a getaddr message to a block-relay-only, feeler or inbound peer')
         block_relay_peer = self.nodes[0].add_outbound_p2p_connection(AddrReceiver(), p2p_idx=1, connection_type="block-relay-only")
         block_relay_peer.sync_with_ping()
         assert_equal(block_relay_peer.getaddr_received(), False)
         block_relay_peer.send_and_ping(msg_headers([tip_header]))
 
+        feeler_peer = self.nodes[0].add_outbound_p2p_connection(AddrReceiver(), p2p_idx=2, connection_type="feeler")
+        # bitcoind closes feeler connections as soon as it receives a version message
+        assert_equal(feeler_peer.is_connected, False)
+        assert_equal(feeler_peer.getaddr_received(), False)
+
         inbound_peer = self.nodes[0].add_p2p_connection(AddrReceiver(send_getaddr=False))
         inbound_peer.sync_with_ping()
         assert_equal(inbound_peer.getaddr_received(), False)
diff --git a/depend/bitcoin/test/functional/p2p_addr_selfannouncement.py b/depend/bitcoin/test/functional/p2p_addr_selfannouncement.py
index 631ecb4c..01221332 100755
--- a/depend/bitcoin/test/functional/p2p_addr_selfannouncement.py
+++ b/depend/bitcoin/test/functional/p2p_addr_selfannouncement.py
@@ -23,6 +23,7 @@
 from test_framework.util import assert_equal, assert_greater_than
 
 IP_TO_ANNOUNCE = "42.42.42.42"
+ONION_ADDR = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion"
 ONE_DAY = 60 * 60 * 24
 
 
@@ -77,6 +78,7 @@ def run_test(self):
         self.self_announcement_test(outbound=False, addrv2=True)
         self.self_announcement_test(outbound=True, addrv2=False)
         self.self_announcement_test(outbound=True, addrv2=True)
+        self.test_externalip_bypasses_onlynet()
 
     @staticmethod
     def inbound_connection_open_assertions(addr_receiver):
@@ -150,5 +152,17 @@ def self_announcement_test(self, *, outbound, addrv2):
 
         self.nodes[0].disconnect_p2ps()
 
+    def test_externalip_bypasses_onlynet(self):
+        self.log.info("Test that -externalip onion is advertised despite -onlynet=ipv4")
+        self.restart_node(0, extra_args=["-onlynet=ipv4", f"-externalip={ONION_ADDR}"])
+
+        netinfo = self.nodes[0].getnetworkinfo()
+
+        onion_net = next(n for n in netinfo["networks"] if n["name"] == "onion")
+        assert not onion_net["reachable"], "onion should not be reachable under -onlynet=ipv4"
+
+        addrs = [a["address"] for a in netinfo["localaddresses"]]
+        assert ONION_ADDR in addrs, f"onion address missing from localaddresses: {addrs}"
+
 if __name__ == '__main__':
     AddrSelfAnnouncementTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_bip434_feature.py b/depend/bitcoin/test/functional/p2p_bip434_feature.py
new file mode 100755
index 00000000..ccb8144a
--- /dev/null
+++ b/depend/bitcoin/test/functional/p2p_bip434_feature.py
@@ -0,0 +1,242 @@
+#!/usr/bin/env python3
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+"""Test BIP434 feature negotiation."""
+
+from test_framework.messages import (
+    msg_version,
+    ser_compact_size,
+)
+from test_framework.p2p import (
+    P2PInterface,
+    P2P_SERVICES,
+    P2P_SUBVERSION,
+    P2P_VERSION_RELAY,
+)
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
+
+# Pre-BIP434 protocol version
+PRE_FEATURE_VERSION = 70016
+# Protocol version which enables BIP434 FEATURE negotiation
+FEATURE_VERSION = 70017
+# BIP434 wire-format limits
+MIN_FEATUREID_LENGTH = 4
+MAX_FEATUREID_LENGTH = 80
+MAX_FEATUREDATA_LENGTH = 512
+
+
+class RawFeature:
+    """A FEATURE message with a hand-crafted payload."""
+    msgtype = b"feature"
+
+    def __init__(self, payload):
+        self.payload = payload
+
+    def serialize(self):
+        return self.payload
+
+    def __repr__(self):
+        return f"RawFeature(payload_len={len(self.payload)})"
+
+
+def feature_wire(feature_id, feature_data, *, trailing=b""):
+    """Build a FEATURE payload plus optional trailing bytes."""
+    if isinstance(feature_id, str):
+        feature_id = feature_id.encode()
+    return (ser_compact_size(len(feature_id)) + feature_id
+            + ser_compact_size(len(feature_data)) + feature_data
+            + trailing)
+
+
+def _version_msg(nversion):
+    v = msg_version()
+    v.nVersion = nversion
+    v.strSubVer = P2P_SUBVERSION
+    v.nServices = P2P_SERVICES
+    v.relay = P2P_VERSION_RELAY
+    return v
+
+
+class FeaturePeer(P2PInterface):
+    """P2PInterface that counts FEATURE messages received."""
+
+    def __init__(self):
+        super().__init__()
+        self.got_feature_count = 0
+        self.last_feature = None
+
+    def on_feature(self, message):
+        self.got_feature_count += 1
+        self.last_feature = message
+
+
+class FeaturePeerNoVerack(FeaturePeer):
+    """Peer that records but does not auto-reply to the node's VERSION, so the
+    node stays in the post-VERSION / pre-VERACK window where FEATURE messages
+    are valid to send."""
+
+    def on_version(self, message):
+        self.nServices = message.nServices
+        self.relay = message.relay
+
+
+class P2PBIP434FeatureTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        # peertimeout=999 prevents the node from kicking the peer for being idle
+        self.extra_args = [["-debug=net", "-peertimeout=999"]]
+
+    def run_test(self):
+        self.test_advertised_version()
+        self.test_no_feature_to_pre_70017_peer()
+        self.test_features_announced_to_modern_peer()
+        self.test_feature_after_verack_disconnects()
+        self.test_feature_before_version_ignored()
+        self.test_feature_id_length_boundaries()
+        self.test_feature_data_length_boundaries()
+        self.test_trailing_bytes_disconnect()
+        self.test_truncated_feature_id_disconnect()
+        self.test_truncated_feature_data_disconnect()
+        self.test_non_ascii_feature_id_accepted()
+        self.test_many_features_in_handshake()
+        self.test_recv_feature_from_pre_70017_peer()
+
+    def _silent_peer(self, *, nversion=FEATURE_VERSION):
+        peer = self.nodes[0].add_p2p_connection(
+            FeaturePeerNoVerack(),
+            send_version=False, wait_for_verack=False,
+        )
+        peer.send_without_ping(_version_msg(nversion))
+        peer.wait_for_verack()
+        return peer
+
+    def _expect_accept(self, payload, *, log_substring="unknown feature advertised",
+                      nversion=FEATURE_VERSION):
+        peer = self._silent_peer(nversion=nversion)
+        with self.nodes[0].assert_debug_log([log_substring], timeout=2):
+            peer.send_without_ping(RawFeature(payload))
+        assert peer.is_connected, "peer disconnected after a well-formed FEATURE"
+        self.nodes[0].disconnect_p2ps()
+
+    def _expect_disconnect(self, payload, *, log_substring="invalid feature payload",
+                          nversion=FEATURE_VERSION):
+        peer = self._silent_peer(nversion=nversion)
+        with self.nodes[0].assert_debug_log([log_substring], timeout=2):
+            peer.send_without_ping(RawFeature(payload))
+            peer.wait_for_disconnect()
+
+    def test_advertised_version(self):
+        self.log.info("Test that node advertises FEATURE to peer with protocol version 70017")
+        peer = self.nodes[0].add_p2p_connection(FeaturePeer())
+        assert_equal(peer.last_message["version"].nVersion, FEATURE_VERSION)
+        self.nodes[0].disconnect_p2ps()
+
+    def test_no_feature_to_pre_70017_peer(self):
+        self.log.info("Test that node doesn't send FEATURE to a peer with protocol version <70017")
+        peer = self.nodes[0].add_p2p_connection(
+            FeaturePeer(), send_version=False, wait_for_verack=False,
+        )
+        peer.send_without_ping(_version_msg(PRE_FEATURE_VERSION))
+        peer.wait_for_verack()
+        # The node's full handshake has now been delivered to us; if any
+        # FEATURE would have been sent it would be in last_message by now.
+        assert_equal(peer.got_feature_count, 0)
+        self.nodes[0].disconnect_p2ps()
+
+    def test_features_announced_to_modern_peer(self):
+        self.log.info("Test that node announces correct number of features to a 70017 peer")
+        peer = self.nodes[0].add_p2p_connection(FeaturePeer())
+        assert_equal(peer.got_feature_count, 0)
+        self.nodes[0].disconnect_p2ps()
+
+    def test_feature_after_verack_disconnects(self):
+        self.log.info("Test that FEATURE after VERACK triggers disconnect")
+        peer = self.nodes[0].add_p2p_connection(FeaturePeer())
+        peer.sync_with_ping()  # ensure node has set fSuccessfullyConnected
+        with self.nodes[0].assert_debug_log(["feature received after verack"], timeout=2):
+            peer.send_without_ping(RawFeature(feature_wire(b"abcd", b"")))
+            peer.wait_for_disconnect()
+
+    def test_feature_before_version_ignored(self):
+        self.log.info("Test that FEATURE before any VERSION is silently ignored")
+        peer = self.nodes[0].add_p2p_connection(
+            FeaturePeer(), send_version=False, wait_for_verack=False,
+        )
+        with self.nodes[0].assert_debug_log(
+            ["non-version message before version handshake"], timeout=2,
+        ):
+            peer.send_without_ping(RawFeature(feature_wire(b"abcd", b"")))
+        assert peer.is_connected
+        self.nodes[0].disconnect_p2ps()
+
+    def test_feature_id_length_boundaries(self):
+        self.log.info("Test feature_id length boundaries")
+        for length, accept in [(0, False),
+                               (3, False),
+                               (MIN_FEATUREID_LENGTH, True),
+                               (MAX_FEATUREID_LENGTH, True),
+                               (MAX_FEATUREID_LENGTH + 1, False)]:
+            payload = feature_wire(b"a" * length, b"")
+            if accept:
+                self._expect_accept(payload)
+            else:
+                self._expect_disconnect(payload)
+
+    def test_feature_data_length_boundaries(self):
+        self.log.info("Test feature_data length boundaries")
+        for length, accept in [(0, True),
+                               (MAX_FEATUREDATA_LENGTH, True),
+                               (MAX_FEATUREDATA_LENGTH + 1, False)]:
+            payload = feature_wire(b"abcd", b"\x00" * length)
+            if accept:
+                self._expect_accept(payload)
+            else:
+                self._expect_disconnect(payload)
+
+    def test_trailing_bytes_disconnect(self):
+        self.log.info("Test that trailing bytes after data triggers disconnect")
+        self._expect_disconnect(
+            feature_wire(b"abcd", b"", trailing=b"\x00"),
+        )
+
+    def test_truncated_feature_id_disconnect(self):
+        self.log.info("Test that truncated feature_id triggers disconnect")
+        payload = ser_compact_size(10) + b"abcde"
+        self._expect_disconnect(payload)
+
+    def test_truncated_feature_data_disconnect(self):
+        self.log.info("Test that truncated feature_data triggers disconnect")
+        payload = (ser_compact_size(MIN_FEATUREID_LENGTH) + b"abcd"
+                   + ser_compact_size(10) + b"xx")
+        self._expect_disconnect(payload)
+
+    def test_non_ascii_feature_id_accepted(self):
+        self.log.info("Test that feature_id with non-ASCII bytes is still accepted")
+        # BIP says SHOULD, not MUST, on this
+        self._expect_accept(feature_wire(b"\x00\xff\x01\x7f", b""))
+
+    def test_many_features_in_handshake(self):
+        self.log.info("Test multiple FEATURE advertisements")
+        peer = self._silent_peer()
+        with self.nodes[0].assert_debug_log(["unknown feature advertised"], timeout=2):
+            for i in range(16):
+                peer.send_without_ping(
+                    RawFeature(feature_wire(f"feat{i:04d}".encode(), b""))
+                )
+        assert peer.is_connected
+        self.nodes[0].disconnect_p2ps()
+
+    def test_recv_feature_from_pre_70017_peer(self):
+        self.log.info("Test that FEATURE from <70017 peer triggers disconnect")
+        self._expect_disconnect(
+            feature_wire(b"abcd", b""),
+            log_substring="feature received with incompatible version",
+            nversion=PRE_FEATURE_VERSION,
+        )
+
+
+if __name__ == "__main__":
+    P2PBIP434FeatureTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_blocksonly.py b/depend/bitcoin/test/functional/p2p_blocksonly.py
index 6a251e69..4ffbb80f 100755
--- a/depend/bitcoin/test/functional/p2p_blocksonly.py
+++ b/depend/bitcoin/test/functional/p2p_blocksonly.py
@@ -6,7 +6,7 @@
 
 import time
 
-from test_framework.messages import msg_tx, msg_inv, CInv, MSG_WTX
+from test_framework.messages import msg_getdata, msg_tx, msg_inv, CInv, MSG_WTX
 from test_framework.p2p import P2PInterface, P2PTxInvStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
@@ -93,6 +93,16 @@ def blocks_relay_conn_tests(self):
         assert_equal(self.nodes[0].getpeerinfo()[0]['relaytxes'], False)
         self.check_p2p_inv_violation(conn)
 
+        self.log.info(
+            "Check that getdata(tx) from a block-relay-only connection is ignored"
+        )
+        conn = self.nodes[0].add_outbound_p2p_connection(
+            P2PInterface(), p2p_idx=0, connection_type="block-relay-only"
+        )
+        conn.send_and_ping(msg_getdata([CInv(t=MSG_WTX, h=0x12345)]))
+        assert_equal(self.nodes[0].getpeerinfo()[0]["relaytxes"], False)
+        assert "notfound" not in conn.last_message
+
         self.log.info("Check that txs from RPC are not sent to blockrelay connection")
         conn = self.nodes[0].add_outbound_p2p_connection(P2PTxInvStore(), p2p_idx=1, connection_type="block-relay-only")
 
diff --git a/depend/bitcoin/test/functional/p2p_compactblocks.py b/depend/bitcoin/test/functional/p2p_compactblocks.py
index ebc83964..7466b833 100755
--- a/depend/bitcoin/test/functional/p2p_compactblocks.py
+++ b/depend/bitcoin/test/functional/p2p_compactblocks.py
@@ -57,6 +57,7 @@
     OP_RETURN,
 )
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_node import TestNode
 from test_framework.util import (
     assert_not_equal,
     assert_equal,
@@ -150,23 +151,35 @@ def set_test_params(self):
         ]]
         self.utxos = []
 
+    def getblocktxn_expected(self, peer, blockhash, indices=None):
+        with p2p_lock:
+            assert "getblocktxn" in peer.last_message
+            gbt = peer.last_message["getblocktxn"].block_txn_request
+
+        assert_equal(gbt.blockhash, blockhash)
+        if indices is not None:
+            assert_equal(gbt.to_absolute(), indices)
+        if isinstance(peer, TestNode):
+            assert_not_equal(peer.getbestblockhash(), blockhash)
+
     def build_block_on_tip(self, node):
         block = create_block(tmpl=node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS))
         block.solve()
         return block
 
-    # Create 10 more anyone-can-spend utxo's for testing.
+    # Create 12 more anyone-can-spend utxo's for testing.
     def make_utxos(self):
+        COUNT = 12
         block = self.build_block_on_tip(self.nodes[0])
         self.segwit_node.send_and_ping(msg_no_witness_block(block))
         assert_equal(self.nodes[0].getbestblockhash(), block.hash_hex)
         self.generate(self.wallet, COINBASE_MATURITY)
 
         total_value = block.vtx[0].vout[0].nValue
-        out_value = total_value // 10
+        out_value = total_value // COUNT
         tx = CTransaction()
         tx.vin.append(CTxIn(COutPoint(block.vtx[0].txid_int, 0), b''))
-        for _ in range(10):
+        for _ in range(COUNT):
             tx.vout.append(CTxOut(out_value, CScript([OP_TRUE])))
 
         block2 = self.build_block_on_tip(self.nodes[0])
@@ -175,8 +188,23 @@ def make_utxos(self):
         block2.solve()
         self.segwit_node.send_and_ping(msg_no_witness_block(block2))
         assert_equal(self.nodes[0].getbestblockhash(), block2.hash_hex)
-        self.utxos.extend([[tx.txid_int, i, out_value] for i in range(10)])
+        self.utxos.extend([[tx.txid_int, i, out_value] for i in range(COUNT)])
+
+    def announce_cmpct_block(self, node, peer, txn_count=5, solicit=False):
+        utxo = self.utxos.pop(0)
+        block = self.build_block_with_transactions(node, utxo, txn_count)
 
+        cmpct_block = HeaderAndShortIDs()
+        cmpct_block.initialize_from_block(block)
+        msg = msg_cmpctblock(cmpct_block.to_p2p())
+        if solicit:
+            peer.send_without_ping(msg_headers([block]))
+            peer.wait_for_getdata([block.hash_int], timeout=30)
+
+        peer.clear_getblocktxn()
+        peer.send_and_ping(msg)
+        self.getblocktxn_expected(peer, block.hash_int)
+        return block, cmpct_block
 
     # Test "sendcmpct" (between peers preferring the same version):
     # - No compact block announcements unless sendcmpct is sent.
@@ -263,18 +291,48 @@ def check_announcement_of_new_block(node, peer, predicate):
         test_node.send_and_ping(msg_sendcmpct(announce=False, version=2))
         check_announcement_of_new_block(node, test_node, lambda p: "cmpctblock" not in p.last_message and "headers" in p.last_message)
 
+    # BIP152 mandates that the announce field of a sendcmpct message is a
+    # boolean and MUST have a value of either 1 or 0. Sending any other value
+    # should be treated as misbehavior and lead to a disconnect.
+    def test_invalid_sendcmpct_announce(self):
+        node = self.nodes[0]
+        bad_peer = node.add_p2p_connection(TestP2PConn())
+        msg = msg_sendcmpct(announce=2, version=2)
+        with node.assert_debug_log(['invalid sendcmpct announce field']):
+            bad_peer.send_await_disconnect(msg)
+
     # This test actually causes bitcoind to (reasonably!) disconnect us, so do this last.
+    # Note, these are not consensus-invalid blocks, but improperly constructed cmpctblock messages.
     def test_invalid_cmpctblock_message(self):
+        # Make a high-bandwidth peer
+        hb_peer = self.nodes[0].add_p2p_connection(TestP2PConn())
+        self.request_cb_announcements(hb_peer)
+        self.make_peer_hb_to_candidate(self.nodes[0], hb_peer)
+        self.assert_highbandwidth_states(self.nodes[0], idx=-1, hb_to=True, hb_from=True)
+
+        # Make a low-bandwidth peer
+        lb_peer = self.nodes[0].add_p2p_connection(TestP2PConn())
+        self.request_cb_announcements(lb_peer)
+        self.assert_highbandwidth_states(self.nodes[0], idx=-1, hb_to=False, hb_from=True)
+
+        # Construct an invalid cmpctblock message
         self.generate(self.nodes[0], COINBASE_MATURITY + 1)
         block = self.build_block_on_tip(self.nodes[0])
-
         cmpct_block = P2PHeaderAndShortIDs()
         cmpct_block.header = CBlockHeader(block)
         cmpct_block.prefilled_txn_length = 1
-        # This index will be too high
-        prefilled_txn = PrefilledTransaction(1, block.vtx[0])
+        too_high_prefill_idx = 1
+        prefilled_txn = PrefilledTransaction(too_high_prefill_idx, block.vtx[0])
         cmpct_block.prefilled_txn = [prefilled_txn]
-        self.segwit_node.send_await_disconnect(msg_cmpctblock(cmpct_block))
+
+        # Test an unsolicited invalid cmpctblock from an HB peer.
+        hb_peer.send_await_disconnect(msg_cmpctblock(cmpct_block))
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock)
+
+        # Test a solicited invalid cmpctblock from a non-HB peer.
+        lb_peer.send_header_for_blocks([block])
+        lb_peer.wait_for_getdata([block.hash_int], timeout=30)
+        lb_peer.send_await_disconnect(msg_cmpctblock(cmpct_block))
         assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock)
 
     # Compare the generated shortids to what we expect based on BIP 152, given
@@ -394,13 +452,11 @@ def test_compactblock_requests(self, test_node):
             [k0, k1] = comp_block.get_siphash_keys()
             coinbase_hash = block.vtx[0].wtxid_int
             comp_block.shortids = [calculate_shortid(k0, k1, coinbase_hash)]
+            test_node.clear_getblocktxn()
             test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
             assert_equal(int(node.getbestblockhash(), 16), block.hashPrevBlock)
-            # Expect a getblocktxn message.
-            with p2p_lock:
-                assert "getblocktxn" in test_node.last_message
-                absolute_indexes = test_node.last_message["getblocktxn"].block_txn_request.to_absolute()
-            assert_equal(absolute_indexes, [0])  # should be a coinbase request
+            # Expect a getblocktxn message that requests the coinbase.
+            self.getblocktxn_expected(test_node, block.hash_int, indices=[0])
 
             # Send the coinbase, and verify that the tip advances.
             msg = msg_blocktxn()
@@ -432,11 +488,9 @@ def test_getblocktxn_requests(self, test_node):
 
         def test_getblocktxn_response(compact_block, peer, expected_result):
             msg = msg_cmpctblock(compact_block.to_p2p())
+            peer.clear_getblocktxn()
             peer.send_and_ping(msg)
-            with p2p_lock:
-                assert "getblocktxn" in peer.last_message
-                absolute_indexes = peer.last_message["getblocktxn"].block_txn_request.to_absolute()
-            assert_equal(absolute_indexes, expected_result)
+            self.getblocktxn_expected(peer, compact_block.header.hash_int, expected_result)
 
         def test_tip_after_message(node, peer, msg, tip):
             peer.send_and_ping(msg)
@@ -497,8 +551,7 @@ def test_tip_after_message(node, peer, msg, tip):
             assert tx.txid_hex in mempool
 
         # Clear out last request.
-        with p2p_lock:
-            test_node.last_message.pop("getblocktxn", None)
+        test_node.clear_getblocktxn()
 
         # Send compact block
         comp_block.initialize_from_block(block, prefill_list=[0], use_witness=True)
@@ -527,12 +580,10 @@ def test_incorrect_blocktxn_response(self, test_node):
         # Send compact block
         comp_block = HeaderAndShortIDs()
         comp_block.initialize_from_block(block, prefill_list=[0], use_witness=True)
+        test_node.clear_getblocktxn()
         test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
-        absolute_indexes = []
-        with p2p_lock:
-            assert "getblocktxn" in test_node.last_message
-            absolute_indexes = test_node.last_message["getblocktxn"].block_txn_request.to_absolute()
-        assert_equal(absolute_indexes, [6, 7, 8, 9, 10])
+        expected_indices = [6, 7, 8, 9, 10]
+        self.getblocktxn_expected(test_node, block.hash_int, expected_indices)
 
         # Now give an incorrect response.
         # Note that it's possible for bitcoind to be smart enough to know we're
@@ -560,19 +611,20 @@ def test_incorrect_blocktxn_response(self, test_node):
     # Multiple blocktxn responses will cause a node to get disconnected.
     def test_multiple_blocktxn_response(self, test_node):
         node = self.nodes[0]
-        utxo = self.utxos[0]
+        utxo = self.utxos.pop(0)
 
         block = self.build_block_with_transactions(node, utxo, 2)
 
+        # The attacker sends the block header so that we request it.
+        test_node.send_without_ping(msg_headers([block]))
+        test_node.wait_for_getdata([block.hash_int], timeout=30)
+
         # Send compact block
         comp_block = HeaderAndShortIDs()
         comp_block.initialize_from_block(block, prefill_list=[0], use_witness=True)
+        test_node.clear_getblocktxn()
         test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
-        absolute_indexes = []
-        with p2p_lock:
-            assert "getblocktxn" in test_node.last_message
-            absolute_indexes = test_node.last_message["getblocktxn"].block_txn_request.to_absolute()
-        assert_equal(absolute_indexes, [1, 2])
+        self.getblocktxn_expected(test_node, block.hash_int, indices=[1,2])
 
         # Send a blocktxn that does not succeed in reconstruction, triggering
         # getdata fallback.
@@ -740,8 +792,7 @@ def test_end_to_end_block_relay(self, listeners):
     # but invalid transactions.
     def test_invalid_tx_in_compactblock(self, test_node):
         node = self.nodes[0]
-        assert len(self.utxos)
-        utxo = self.utxos[0]
+        utxo = self.utxos.pop(0)
 
         block = self.build_block_with_transactions(node, utxo, 5)
         block.hashMerkleRoot = block.calc_merkle_root()
@@ -792,6 +843,23 @@ def test_invalid_tx_in_compactblock(self, test_node):
         msg = msg_cmpctblock(comp_block.to_p2p())
         test_node.send_await_disconnect(msg)
 
+    def test_empty_getblocktxn_disconnects(self):
+        self.log.info("Testing empty getblocktxn disconnects the peer...")
+        node = self.nodes[0]
+        block_hash = int(node.getbestblockhash(), 16)
+        peer = node.add_p2p_connection(P2PInterface())
+        msg = msg_getblocktxn()
+        msg.block_txn_request = BlockTransactionsRequest(blockhash=block_hash, indexes=[])
+        with node.assert_debug_log(['getblocktxn received with no transaction indexes']):
+            peer.send_without_ping(msg)
+            peer.wait_for_disconnect()
+
+    # peer generates a block and sends it to node, which makes the peer a
+    # candidate for high-bandwidth 'to' (up to 3 peers according to BIP 152)
+    def make_peer_hb_to_candidate(self, node, peer):
+        block = self.build_block_on_tip(node)
+        peer.send_and_ping(msg_block(block))
+
     # Helper for enabling cb announcements
     # Send the sendcmpct request and sync headers
     def request_cb_announcements(self, peer):
@@ -802,21 +870,9 @@ def request_cb_announcements(self, peer):
 
     def test_compactblock_reconstruction_stalling_peer(self, stalling_peer, delivery_peer):
         node = self.nodes[0]
-        assert len(self.utxos)
 
-        def announce_cmpct_block(node, peer):
-            utxo = self.utxos.pop(0)
-            block = self.build_block_with_transactions(node, utxo, 5)
-
-            cmpct_block = HeaderAndShortIDs()
-            cmpct_block.initialize_from_block(block)
-            msg = msg_cmpctblock(cmpct_block.to_p2p())
-            peer.send_and_ping(msg)
-            with p2p_lock:
-                assert "getblocktxn" in peer.last_message
-            return block, cmpct_block
-
-        block, cmpct_block = announce_cmpct_block(node, stalling_peer)
+        self.make_peer_hb_to_candidate(node, delivery_peer)
+        block, cmpct_block = self.announce_cmpct_block(node, stalling_peer)
 
         for tx in block.vtx[1:]:
             delivery_peer.send_without_ping(msg_tx(tx))
@@ -832,7 +888,7 @@ def announce_cmpct_block(node, peer):
 
         # Now test that delivering an invalid compact block won't break relay
 
-        block, cmpct_block = announce_cmpct_block(node, stalling_peer)
+        block, cmpct_block = self.announce_cmpct_block(node, stalling_peer)
         for tx in block.vtx[1:]:
             delivery_peer.send_without_ping(msg_tx(tx))
         delivery_peer.sync_with_ping()
@@ -850,56 +906,48 @@ def announce_cmpct_block(node, peer):
         stalling_peer.send_and_ping(msg)
         assert_equal(node.getbestblockhash(), block.hash_hex)
 
+    # assert the RPC getpeerinfo boolean fields `bip152_hb_{to, from}`
+    # match the given parameters for the peer at idx of a given node
+    @staticmethod
+    def assert_highbandwidth_states(node, idx, hb_to, hb_from):
+        peerinfo = node.getpeerinfo()[idx]
+        assert_equal(peerinfo['bip152_hb_to'], hb_to)
+        assert_equal(peerinfo['bip152_hb_from'], hb_from)
+
     def test_highbandwidth_mode_states_via_getpeerinfo(self):
         # create new p2p connection for a fresh state w/o any prior sendcmpct messages sent
         hb_test_node = self.nodes[0].add_p2p_connection(TestP2PConn())
 
-        # assert the RPC getpeerinfo boolean fields `bip152_hb_{to, from}`
-        # match the given parameters for the last peer of a given node
-        def assert_highbandwidth_states(node, hb_to, hb_from):
-            peerinfo = node.getpeerinfo()[-1]
-            assert_equal(peerinfo['bip152_hb_to'], hb_to)
-            assert_equal(peerinfo['bip152_hb_from'], hb_from)
+        # Newly created hb_test_node is the last connection.
+        hb_test_node_idx = -1
 
         # initially, neither node has selected the other peer as high-bandwidth yet
-        assert_highbandwidth_states(self.nodes[0], hb_to=False, hb_from=False)
+        self.assert_highbandwidth_states(self.nodes[0], hb_test_node_idx, hb_to=False, hb_from=False)
 
         # peer requests high-bandwidth mode by sending sendcmpct(1)
         hb_test_node.send_and_ping(msg_sendcmpct(announce=True, version=2))
-        assert_highbandwidth_states(self.nodes[0], hb_to=False, hb_from=True)
+        self.assert_highbandwidth_states(self.nodes[0], hb_test_node_idx, hb_to=False, hb_from=True)
 
         # peer generates a block and sends it to node, which should
         # select the peer as high-bandwidth (up to 3 peers according to BIP 152)
         block = self.build_block_on_tip(self.nodes[0])
         hb_test_node.send_and_ping(msg_block(block))
-        assert_highbandwidth_states(self.nodes[0], hb_to=True, hb_from=True)
+        self.assert_highbandwidth_states(self.nodes[0], hb_test_node_idx, hb_to=True, hb_from=True)
 
         # peer requests low-bandwidth mode by sending sendcmpct(0)
         hb_test_node.send_and_ping(msg_sendcmpct(announce=False, version=2))
-        assert_highbandwidth_states(self.nodes[0], hb_to=True, hb_from=False)
+        self.assert_highbandwidth_states(self.nodes[0], hb_test_node_idx, hb_to=True, hb_from=False)
 
     def test_compactblock_reconstruction_parallel_reconstruction(self, stalling_peer, delivery_peer, inbound_peer, outbound_peer):
         """ All p2p connections are inbound except outbound_peer. We test that ultimate parallel slot
             can only be taken by an outbound node unless prior attempts were done by an outbound
         """
         node = self.nodes[0]
-        assert len(self.utxos)
-
-        def announce_cmpct_block(node, peer, txn_count):
-            utxo = self.utxos.pop(0)
-            block = self.build_block_with_transactions(node, utxo, txn_count)
-
-            cmpct_block = HeaderAndShortIDs()
-            cmpct_block.initialize_from_block(block)
-            msg = msg_cmpctblock(cmpct_block.to_p2p())
-            peer.send_and_ping(msg)
-            with p2p_lock:
-                assert "getblocktxn" in peer.last_message
-            return block, cmpct_block
 
         for name, peer in [("delivery", delivery_peer), ("inbound", inbound_peer), ("outbound", outbound_peer)]:
             self.log.info(f"Setting {name} as high bandwidth peer")
-            block, cmpct_block = announce_cmpct_block(node, peer, 1)
+            self.make_peer_hb_to_candidate(node, peer)
+            block, cmpct_block = self.announce_cmpct_block(node, peer, 1)
             msg = msg_blocktxn()
             msg.block_transactions.blockhash = block.hash_int
             msg.block_transactions.transactions = block.vtx[1:]
@@ -909,17 +957,18 @@ def announce_cmpct_block(node, peer, txn_count):
 
         # Test the simple parallel download case...
         for num_missing in [1, 5, 20]:
+            delivery_peer.clear_getblocktxn()
+            inbound_peer.clear_getblocktxn()
+            outbound_peer.clear_getblocktxn()
 
             # Remaining low-bandwidth peer is stalling_peer, who announces first
             assert_equal([peer['bip152_hb_to'] for peer in node.getpeerinfo()], [False, True, True, True])
 
-            block, cmpct_block = announce_cmpct_block(node, stalling_peer, num_missing)
+            block, cmpct_block = self.announce_cmpct_block(node, stalling_peer, num_missing, solicit=True)
 
             delivery_peer.send_and_ping(msg_cmpctblock(cmpct_block.to_p2p()))
-            with p2p_lock:
-                # The second peer to announce should still get a getblocktxn
-                assert "getblocktxn" in delivery_peer.last_message
-            assert_not_equal(node.getbestblockhash(), block.hash_hex)
+            # The second peer to announce should still get a getblocktxn
+            self.getblocktxn_expected(delivery_peer, block.hash_int)
 
             inbound_peer.send_and_ping(msg_cmpctblock(cmpct_block.to_p2p()))
             with p2p_lock:
@@ -928,10 +977,8 @@ def announce_cmpct_block(node, peer, txn_count):
             assert_not_equal(node.getbestblockhash(), block.hash_hex)
 
             outbound_peer.send_and_ping(msg_cmpctblock(cmpct_block.to_p2p()))
-            with p2p_lock:
-                # The third peer to announce should get a getblocktxn if outbound
-                assert "getblocktxn" in outbound_peer.last_message
-            assert_not_equal(node.getbestblockhash(), block.hash_hex)
+            # The third peer to announce should get a getblocktxn if outbound
+            self.getblocktxn_expected(outbound_peer, block.hash_int)
 
             # Second peer completes the compact block first
             msg = msg_blocktxn()
@@ -944,10 +991,64 @@ def announce_cmpct_block(node, peer, txn_count):
             stalling_peer.send_and_ping(msg)
             self.utxos.append([block.vtx[-1].txid_int, 0, block.vtx[-1].vout[0].nValue])
 
-            delivery_peer.clear_getblocktxn()
-            inbound_peer.clear_getblocktxn()
-            outbound_peer.clear_getblocktxn()
+    def test_compact_blocks_ignored(self):
+        node = self.nodes[0]
+
+        def build_compact_block():
+            # generate a compact block to send that will force a GETBLOCKTXN
+            utxo = self.utxos.pop(0)
+            block = self.build_block_with_transactions(node, utxo, 10)
+            cmpct_block = HeaderAndShortIDs()
+            cmpct_block.initialize_from_block(block)
+            msg = msg_cmpctblock(cmpct_block.to_p2p())
+            return block, msg
+
+        # Sends a compact block, uses presence of GETBLOCKTXN as a heuristic
+        # for whether or not the node processed the CMPCTBLOCK.
+        # Note: since we never fulfill the GETBLOCKTXN, this will never change
+        # the HB status of a connection.
+        def ignores_compact_block(conn, solicited=False):
+            block, msg = build_compact_block()
+            conn.clear_getblocktxn()
+            if solicited:
+                conn.send_without_ping(msg_headers([block]))
+                conn.wait_for_getdata([block.hash_int], timeout=30)
+            conn.send_and_ping(msg)
+            with p2p_lock:
+                return "getblocktxn" not in conn.last_message
+
+        # create new p2p connection for a fresh state w/o any prior sendcmpct messages sent
+        unsolicited_peer = self.nodes[0].add_p2p_connection(TestP2PConn())
+        self.assert_highbandwidth_states(node, idx=-1, hb_to=False, hb_from=False)
 
+        self.log.info("Test that a node ignores unsolicited CMPCTBLOCK messages from peers that have not sent SENDCMPCT.")
+        assert ignores_compact_block(unsolicited_peer, solicited=False)
+
+        self.log.info("Test that a node ignores solicited CMPCTBLOCK messages from peers that have not sent SENDCMPCT.")
+        assert ignores_compact_block(unsolicited_peer, solicited=True)
+
+        # Unsolicited peer announces CMPCTBLOCK support with SENDCMPCT message,
+        # but still non-HB.
+        unsolicited_peer.send_and_ping(msg_sendcmpct())
+        self.assert_highbandwidth_states(node, idx=-1, hb_to=False, hb_from=False)
+
+        self.log.info("Test that a node ignores unsolicited CMPCTBLOCK messages from non-HB peers.")
+        assert ignores_compact_block(unsolicited_peer, solicited=False)
+        self.assert_highbandwidth_states(node, idx=-1, hb_to=False, hb_from=False)
+
+        self.log.info("Test that a node does not ignore solicited CMPCTBLOCK messages from non-HB peers.")
+        assert not ignores_compact_block(unsolicited_peer, solicited=True)
+        self.assert_highbandwidth_states(node, idx=-1, hb_to=False, hb_from=False)
+
+        # The node will ask for transactions from an unsolicited compact block
+        # it receives from a high bandwidth peer, we need to use one set up earlier,
+        # since all the slots are full.
+        self.log.info("Test that a node does not ignore unsolicited CMPCTBLOCK messages from HB peers.")
+
+        hb_peer_idx = -2
+        self.assert_highbandwidth_states(node, idx=hb_peer_idx, hb_to=True, hb_from=False)
+        hb_peer = self.nodes[0].p2ps[hb_peer_idx]
+        assert not ignores_compact_block(hb_peer, solicited=False)
 
     def run_test(self):
         self.wallet = MiniWallet(self.nodes[0])
@@ -1007,15 +1108,21 @@ def run_test(self):
 
         self.log.info("Testing handling of invalid compact blocks...")
         self.test_invalid_tx_in_compactblock(self.segwit_node)
+        self.test_empty_getblocktxn_disconnects()
 
         # The previous test will lead to a disconnection. Reconnect before continuing.
         self.segwit_node = self.nodes[0].add_p2p_connection(TestP2PConn())
+        self.segwit_node.send_and_ping(msg_sendcmpct())
 
         self.log.info("Testing handling of multiple blocktxn responses...")
         self.test_multiple_blocktxn_response(self.segwit_node)
 
         # The previous test will lead to a disconnection. Reconnect before continuing.
         self.segwit_node = self.nodes[0].add_p2p_connection(TestP2PConn())
+        self.segwit_node.send_and_ping(msg_sendcmpct())
+
+        self.log.info("Testing invalid announce field in sendcmpct message...")
+        self.test_invalid_sendcmpct_announce()
 
         self.log.info("Testing invalid index in cmpctblock message...")
         self.test_invalid_cmpctblock_message()
@@ -1023,6 +1130,9 @@ def run_test(self):
         self.log.info("Testing high-bandwidth mode states via getpeerinfo...")
         self.test_highbandwidth_mode_states_via_getpeerinfo()
 
+        self.log.info("Testing CMPCTBLOCK messages are ignored when expected...")
+        self.test_compact_blocks_ignored()
+
 
 if __name__ == '__main__':
     CompactBlocksTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_compactblocks_blocksonly.py b/depend/bitcoin/test/functional/p2p_compactblocks_blocksonly.py
index befc283f..3fed634a 100755
--- a/depend/bitcoin/test/functional/p2p_compactblocks_blocksonly.py
+++ b/depend/bitcoin/test/functional/p2p_compactblocks_blocksonly.py
@@ -12,7 +12,9 @@
     CBlockHeader,
     CInv,
     from_hex,
+    HeaderAndShortIDs,
     msg_block,
+    msg_cmpctblock,
     msg_getdata,
     msg_headers,
     msg_sendcmpct,
@@ -38,6 +40,30 @@ def build_block_on_tip(self):
         block = from_hex(CBlock(), block_hex)
         return block
 
+    def ignores_cmpctblock(self, node_id, conn, solicited=False):
+        # Briefly connect to mining node, sync, and disconnect, just to make
+        # sure the node is on the same tip as the miner so that compact block
+        # reconstruction works.
+        self.connect_nodes(2, node_id)
+        self.sync_blocks([self.nodes[2], self.nodes[node_id]], timeout=10)
+        self.disconnect_nodes(2, node_id)
+
+        block = self.build_block_on_tip()
+        if solicited:
+            conn.send_without_ping(msg_headers([block]))
+            conn.wait_for_getdata([block.hash_int], timeout=10)
+        cmpct_block = HeaderAndShortIDs()
+        cmpct_block.initialize_from_block(block, use_witness=True)
+        msg = msg_cmpctblock(cmpct_block.to_p2p())
+        conn.send_and_ping(msg)
+
+        cmpct_block_received = self.nodes[node_id].getbestblockhash() == cmpct_block.header.hash_hex
+        if not cmpct_block_received:
+            # Compact block was ignored, send the full block to keep in sync.
+            conn.send_and_ping(msg_block(block))
+
+        return not cmpct_block_received
+
     def run_test(self):
         # Nodes will only request hb compact blocks mode when they're out of IBD
         for node in self.nodes:
@@ -98,11 +124,19 @@ def run_test(self):
         p2p_conn_high_bw.send_and_ping(msg_headers(headers=[CBlockHeader(block1)]))
         assert_equal(p2p_conn_high_bw.last_message['getdata'].inv, [CInv(MSG_CMPCT_BLOCK, block1.hash_int)])
 
+        # Send the block to avoid stalling the peer later in the test.
+        comp_block = HeaderAndShortIDs()
+        comp_block.initialize_from_block(block1, use_witness=True)
+        block1_cb_msg = msg_cmpctblock(comp_block.to_p2p())
+        p2p_conn_high_bw.send_and_ping(block1_cb_msg)
+
         self.log.info("Test that getdata(CMPCT) is still sent on BIP152 low bandwidth connections"
                       " when no -blocksonly nodes are involved")
 
         p2p_conn_low_bw.send_and_ping(msg_headers(headers=[CBlockHeader(block1)]))
         assert_equal(p2p_conn_low_bw.last_message['getdata'].inv, [CInv(MSG_CMPCT_BLOCK, block1.hash_int)])
+        # Send the block to avoid stalling the peer later in the test.
+        p2p_conn_low_bw.send_and_ping(block1_cb_msg)
 
         self.log.info("Test that -blocksonly nodes still serve compact blocks")
 
@@ -122,5 +156,18 @@ def test_for_cmpctblock(block):
         self.nodes[0].submitblock(block2.serialize().hex())
         p2p_conn_blocksonly.wait_until(lambda: test_for_cmpctblock(block2))
 
+        # This is redundant with other tests, and is here as a test-of-the-test
+        self.log.info("Test that normal nodes don't ignore CMPCTBLOCK messages from HB peers")
+        assert not self.ignores_cmpctblock(1, p2p_conn_high_bw, solicited=False)
+
+        self.log.info("Test that -blocksonly nodes ignore CMPCTBLOCK messages")
+        assert self.ignores_cmpctblock(0, p2p_conn_blocksonly, solicited=False)
+
+        self.log.info("Test that low bandwidth nodes listen to CMPCTBLOCK messages when the block is requested")
+        assert not self.ignores_cmpctblock(3, p2p_conn_low_bw, solicited=True)
+
+        self.log.info("Test that -blocksonly nodes ignore CMPCTBLOCK messages even when the block is requested")
+        assert self.ignores_cmpctblock(0, p2p_conn_blocksonly, solicited=True)
+
 if __name__ == '__main__':
     P2PCompactBlocksBlocksOnly(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_connection_limits.py b/depend/bitcoin/test/functional/p2p_connection_limits.py
new file mode 100755
index 00000000..eee34e8d
--- /dev/null
+++ b/depend/bitcoin/test/functional/p2p_connection_limits.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+# Copyright (c) 2023-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.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.messages import (
+    msg_version,
+    msg_filterload
+)
+from test_framework.p2p import (
+    P2PInterface,
+    P2P_SERVICES,
+    P2P_SUBVERSION,
+    P2P_VERSION,
+)
+
+
+class P2PConnectionLimits(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        # scenario : we have 2 inbound slots and allow a maximum of 1 tx-relaying inbound peer
+        self.extra_args = [['-maxconnections=13']]  # 11 slots are reserved for outbounds, leaving 2 inbound slots
+
+    def run_test(self):
+        self.test_inbound_limits()
+
+    def create_blocks_only_version(self):
+        no_txrelay_version_msg = msg_version()
+        no_txrelay_version_msg.nVersion = P2P_VERSION
+        no_txrelay_version_msg.strSubVer = P2P_SUBVERSION
+        no_txrelay_version_msg.nServices = P2P_SERVICES
+        no_txrelay_version_msg.relay = 0
+        return no_txrelay_version_msg
+
+    def create_no_services_blocks_only_version(self):
+        """VERSION with relay=0 and nServices=0 to avoid block-relay eviction protection."""
+        version_msg = msg_version()
+        version_msg.nVersion = P2P_VERSION
+        version_msg.strSubVer = P2P_SUBVERSION
+        version_msg.nServices = 0
+        version_msg.relay = 0
+        return version_msg
+
+    def test_inbound_limits(self):
+        node = self.nodes[0]
+
+        self.log.info('Test with 2 inbound slots, one of which allows tx-relay')
+        node.add_p2p_connection(P2PInterface())
+
+        self.log.info('Connect a full-relay inbound peer - test that eviction is triggered')
+        # Since there is no unprotected peer to evict here, the new peer is dropped instead.
+        with node.assert_debug_log(['failed to find a tx-relaying eviction candidate - connection dropped'], timeout=2):
+            self.nodes[0].add_p2p_connection(P2PInterface(), expect_success=False, wait_for_verack=False)
+        self.wait_until(lambda: len(node.getpeerinfo()) == 1)
+        node.disconnect_p2ps()
+
+        self.log.info('Connect a block-relay inbound peer - test that second full relay peer is accepted')
+        peer1 = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False)
+        peer1.send_without_ping(self.create_blocks_only_version())
+        peer1.wait_for_verack()
+
+        node.add_p2p_connection(P2PInterface())
+        self.wait_until(lambda: len(node.getpeerinfo()) == 2)
+
+        self.log.info('Connecting another full-relay peer triggers non-specific eviction')
+        with node.assert_debug_log(['failed to find an eviction candidate - connection dropped (full)'], timeout=2):
+            self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False, expect_success=False)
+        self.wait_until(lambda: len(node.getpeerinfo()) == 2)
+
+        self.log.info('Run with bloom filter support and check that a switch to tx relay during runtime can trigger eviction')
+        self.restart_node(0, ['-maxconnections=13', '-peerbloomfilters'])
+        peer1 = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False)
+        peer1.send_without_ping(self.create_blocks_only_version())
+        peer1.wait_for_verack()
+
+        node.add_p2p_connection(P2PInterface())
+        self.wait_until(lambda: len(node.getpeerinfo()) == 2)
+        with node.assert_debug_log(['connection dropped after filterload message'], timeout=2):
+            peer1.send_without_ping(msg_filterload(data=b'\xbb'*(100)))
+        self.wait_until(lambda: len(node.getpeerinfo()) == 1)
+
+        self.log.info('Test different values of inboundrelaypercent')
+        self.restart_node(0, ['-maxconnections=13', '-inboundrelaypercent=0'])
+        with node.assert_debug_log(['failed to find a tx-relaying eviction candidate - connection dropped'], timeout=2):
+            self.nodes[0].add_p2p_connection(P2PInterface(), expect_success=False, wait_for_verack=False)
+
+        self.restart_node(0, ['-maxconnections=13', '-inboundrelaypercent=100'])
+        node.add_p2p_connection(P2PInterface())
+        node.add_p2p_connection(P2PInterface())
+        self.wait_until(lambda: len(node.getpeerinfo()) == 2)
+
+        self.log.info('Test that EvictTxPeerIfFull only evicts tx-relaying peers')
+        NUM_BLOCK_RELAY_PEERS = 21
+        self.restart_node(0, ['-maxconnections=33', '-inboundrelaypercent=0'])
+        for _ in range(NUM_BLOCK_RELAY_PEERS):
+            p = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False)
+            p.send_without_ping(self.create_no_services_blocks_only_version())
+            p.wait_for_verack()
+        self.wait_until(lambda: len(node.getpeerinfo()) == NUM_BLOCK_RELAY_PEERS)
+
+        with node.assert_debug_log(['failed to find a tx-relaying eviction candidate - connection dropped'], timeout=5):
+            self.nodes[0].add_p2p_connection(P2PInterface(), expect_success=False, wait_for_verack=False)
+        self.wait_until(lambda: len(node.getpeerinfo()) == NUM_BLOCK_RELAY_PEERS)
+
+if __name__ == '__main__':
+    P2PConnectionLimits(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_eviction.py b/depend/bitcoin/test/functional/p2p_eviction.py
index c96f2a2c..f297b8f3 100755
--- a/depend/bitcoin/test/functional/p2p_eviction.py
+++ b/depend/bitcoin/test/functional/p2p_eviction.py
@@ -45,10 +45,12 @@ def on_ping(self, message):
 class P2PEvict(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
-        # The choice of maxconnections=32 results in a maximum of 21 inbound connections
-        # (32 - 10 outbound - 1 feeler). 20 inbound peers are protected from eviction:
+        # The choice of maxconnections=53 results in a maximum of 21 tx-relaying inbound connections
+        # (53 - 10 outbound - 1 feeler) * 0.5 = 21. The other inbound slots are reserved for block-relay-only
+        # peers that don't play a role in this test.
+        # 20 inbound peers are protected from eviction:
         # 4 by netgroup, 4 that sent us blocks, 4 that sent us transactions and 8 via lowest ping time
-        self.extra_args = [['-maxconnections=32']]
+        self.extra_args = [['-maxconnections=53']]
 
     def run_test(self):
         protected_peers = set()  # peers that we expect to be protected from eviction
diff --git a/depend/bitcoin/test/functional/p2p_getdata.py b/depend/bitcoin/test/functional/p2p_getdata.py
index 7a816ae6..5ff35060 100755
--- a/depend/bitcoin/test/functional/p2p_getdata.py
+++ b/depend/bitcoin/test/functional/p2p_getdata.py
@@ -26,7 +26,7 @@ class GetdataTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
 
-    def run_test(self):
+    def test_invalid_getdata(self):
         p2p_block_store = self.nodes[0].add_p2p_connection(P2PStoreBlock())
 
         self.log.info("test that an invalid GETDATA doesn't prevent processing of future messages")
@@ -44,5 +44,9 @@ def run_test(self):
         p2p_block_store.wait_until(lambda: p2p_block_store.blocks[best_block] == 1)
 
 
+    def run_test(self):
+        self.test_invalid_getdata()
+
+
 if __name__ == '__main__':
     GetdataTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_leak.py b/depend/bitcoin/test/functional/p2p_leak.py
index ec7b9dc2..71046edb 100755
--- a/depend/bitcoin/test/functional/p2p_leak.py
+++ b/depend/bitcoin/test/functional/p2p_leak.py
@@ -5,7 +5,7 @@
 """Test message sending before handshake completion.
 
 Before receiving a VERACK, a node should not send anything but VERSION/VERACK
-and feature negotiation messages (WTXIDRELAY, SENDADDRV2).
+and feature negotiation messages (WTXIDRELAY, SENDADDRV2, FEATURE).
 
 This test connects to a node and sends it a few messages, trying to entice it
 into sending us something it shouldn't."""
@@ -39,6 +39,7 @@ def __init__(self):
         self.ever_connected = False
         self.got_wtxidrelay = False
         self.got_sendaddrv2 = False
+        self.got_feature = False
 
     def bad_message(self, message):
         self.unexpected_msg = True
@@ -70,6 +71,7 @@ def on_getblocktxn(self, message): self.bad_message(message)
     def on_blocktxn(self, message): self.bad_message(message)
     def on_wtxidrelay(self, message): self.got_wtxidrelay = True
     def on_sendaddrv2(self, message): self.got_sendaddrv2 = True
+    def on_feature(self, message): self.got_feature = True
 
 
 # Peer that sends a version but not a verack.
@@ -119,7 +121,7 @@ def run_test(self):
         no_verack_idle_peer = self.nodes[0].add_p2p_connection(NoVerackIdlePeer(), wait_for_verack=False)
 
         # Pre-wtxidRelay peer that sends a version but not a verack and does not support feature negotiation
-        # messages which start at nVersion == 70016
+        # messages which start at nVersion >= 70016
         pre_wtxidrelay_peer = self.nodes[0].add_p2p_connection(NoVerackIdlePeer(), send_version=False, wait_for_verack=False)
         pre_wtxidrelay_peer.send_without_ping(self.create_old_version(70015))
 
@@ -145,14 +147,17 @@ def run_test(self):
         assert not no_version_idle_peer.unexpected_msg
         assert not no_version_idle_peer.got_wtxidrelay
         assert not no_version_idle_peer.got_sendaddrv2
+        assert not no_version_idle_peer.got_feature
 
         assert not no_verack_idle_peer.unexpected_msg
         assert no_verack_idle_peer.got_wtxidrelay
         assert no_verack_idle_peer.got_sendaddrv2
+        #assert no_verack_idle_peer.got_feature ## uncomment once a feature message is supported
 
         assert not pre_wtxidrelay_peer.unexpected_msg
         assert not pre_wtxidrelay_peer.got_wtxidrelay
         assert not pre_wtxidrelay_peer.got_sendaddrv2
+        assert not pre_wtxidrelay_peer.got_feature
 
         # Expect peers to be disconnected due to timeout
         assert not no_version_idle_peer.is_connected
diff --git a/depend/bitcoin/test/functional/p2p_mutated_blocks.py b/depend/bitcoin/test/functional/p2p_mutated_blocks.py
index 609c4449..51c06569 100755
--- a/depend/bitcoin/test/functional/p2p_mutated_blocks.py
+++ b/depend/bitcoin/test/functional/p2p_mutated_blocks.py
@@ -14,7 +14,9 @@
     msg_cmpctblock,
     msg_block,
     msg_blocktxn,
+    msg_headers,
     HeaderAndShortIDs,
+    msg_sendcmpct,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.blocktools import (
@@ -42,6 +44,7 @@ def run_test(self):
         self.generate(self.wallet, COINBASE_MATURITY)
 
         honest_relayer = self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=0, connection_type="outbound-full-relay")
+        honest_relayer.send_and_ping(msg_sendcmpct())
         attacker = self.nodes[0].add_p2p_connection(P2PInterface())
 
         # Create new block with two transactions (coinbase + 1 self-transfer).
@@ -57,6 +60,10 @@ def run_test(self):
         mutated_block = copy.deepcopy(block)
         mutated_block.vtx[1].version = 4
 
+        # Send block header through the honest relayer
+        honest_relayer.send_without_ping(msg_headers([block]))
+        honest_relayer.wait_for_getdata([block.hash_int], timeout=30)
+
         # Announce the new block via a compact block through the honest relayer
         cmpctblock = HeaderAndShortIDs()
         cmpctblock.initialize_from_block(block, use_witness=True)
diff --git a/depend/bitcoin/test/functional/p2p_nobloomfilter_messages.py b/depend/bitcoin/test/functional/p2p_nobloomfilter_messages.py
index 2d5d7add..77618742 100755
--- a/depend/bitcoin/test/functional/p2p_nobloomfilter_messages.py
+++ b/depend/bitcoin/test/functional/p2p_nobloomfilter_messages.py
@@ -11,7 +11,7 @@
 4. They send a p2p filterclear message
 """
 
-from test_framework.messages import msg_mempool, msg_filteradd, msg_filterload, msg_filterclear
+from test_framework.messages import msg_mempool, msg_filteradd, msg_filterload, msg_filterclear, CInv, MSG_FILTERED_BLOCK, msg_getdata
 from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
@@ -43,6 +43,10 @@ def run_test(self):
         self.log.info("Test that peer is disconnected if it sends a filterclear message")
         self.test_message_causes_disconnect(msg_filterclear())
 
+        self.log.info("Test that peer is disconnected if it requests a filtered block")
+        with self.nodes[0].assert_debug_log(['filtered block request received when NODE_BLOOM service disabled']):
+            self.test_message_causes_disconnect(msg_getdata([CInv(MSG_FILTERED_BLOCK, int(self.nodes[0].getbestblockhash(), 16))]))
+
 
 if __name__ == '__main__':
     P2PNoBloomFilterMessages(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_opportunistic_1p1c.py b/depend/bitcoin/test/functional/p2p_opportunistic_1p1c.py
index ef4440b9..156ffd9a 100755
--- a/depend/bitcoin/test/functional/p2p_opportunistic_1p1c.py
+++ b/depend/bitcoin/test/functional/p2p_opportunistic_1p1c.py
@@ -58,18 +58,17 @@
 
 def cleanup(func):
     def wrapper(self, *args, **kwargs):
-        try:
-            func(self, *args, **kwargs)
-        finally:
-            self.nodes[0].disconnect_p2ps()
-            # Do not clear the node's mempool, as each test requires mempool min feerate > min
-            # relay feerate. However, do check that this is the case.
-            assert self.nodes[0].getmempoolinfo()["mempoolminfee"] > self.nodes[0].getnetworkinfo()["relayfee"]
-            # Ensure we do not try to spend the same UTXOs in subsequent tests, as they will look like RBF attempts.
-            self.wallet.rescan_utxos(include_mempool=True)
-
-            # Resets if mocktime was used
-            self.nodes[0].setmocktime(0)
+        func(self, *args, **kwargs)
+
+        self.nodes[0].disconnect_p2ps()
+        # Do not clear the node's mempool, as each test requires mempool min feerate > min
+        # relay feerate. However, do check that this is the case.
+        assert_greater_than(self.nodes[0].getmempoolinfo()["mempoolminfee"], self.nodes[0].getnetworkinfo()["relayfee"])
+        # Ensure we do not try to spend the same UTXOs in subsequent tests, as they will look like RBF attempts.
+        self.wallet.rescan_utxos(include_mempool=True)
+
+        # Resets if mocktime was used
+        self.nodes[0].setmocktime(0)
     return wrapper
 
 class PackageRelayTest(BitcoinTestFramework):
@@ -77,7 +76,7 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
         self.extra_args = [[
-            "-maxmempool=5",
+            "-maxmempool=5","-inboundrelaypercent=100"
         ]]
 
     def create_tx_below_mempoolminfee(self, wallet, utxo_to_spend=None):
diff --git a/depend/bitcoin/test/functional/p2p_orphan_handling.py b/depend/bitcoin/test/functional/p2p_orphan_handling.py
index 4cd59f8f..a25c93cd 100755
--- a/depend/bitcoin/test/functional/p2p_orphan_handling.py
+++ b/depend/bitcoin/test/functional/p2p_orphan_handling.py
@@ -50,20 +50,19 @@
 
 def cleanup(func):
     def wrapper(self):
-        try:
-            func(self)
-        finally:
-            # Clear mempool
-            self.generate(self.nodes[0], 1)
-            self.nodes[0].disconnect_p2ps()
-            # Check that mempool and orphanage have been cleared
-            self.wait_until(lambda: len(self.nodes[0].getorphantxs()) == 0)
-            assert_equal(0, len(self.nodes[0].getrawmempool()))
-
-            self.restart_node(0, extra_args=["-persistmempool=0"])
-            # Allow use of bumpmocktime again
-            self.nodes[0].setmocktime(int(time.time()))
-            self.wallet.rescan_utxos(include_mempool=True)
+        func(self)
+
+        # Clear mempool
+        self.generate(self.nodes[0], 1)
+        self.nodes[0].disconnect_p2ps()
+        # Check that mempool and orphanage have been cleared
+        self.wait_until(lambda: len(self.nodes[0].getorphantxs()) == 0)
+        assert_equal(0, len(self.nodes[0].getrawmempool()))
+
+        self.restart_node(0, extra_args=["-persistmempool=0"])
+        # Allow use of bumpmocktime again
+        self.nodes[0].setmocktime(int(time.time()))
+        self.wallet.rescan_utxos(include_mempool=True)
     return wrapper
 
 class PeerTxRelayer(P2PTxInvStore):
@@ -384,6 +383,31 @@ def test_orphan_of_orphan(self):
         assert tx_in_orphanage(node, orphan["tx"])
         peer.wait_for_parent_requests([int(missing_parent["txid"], 16)])
 
+    @cleanup
+    def test_orphan_parent_confirmed(self):
+        node = self.nodes[0]
+        peer = node.add_p2p_connection(PeerTxRelayer())
+
+        parent = self.wallet.create_self_transfer(fee_rate=0)
+        child = self.wallet.create_self_transfer(utxo_to_spend=parent["new_utxo"])
+
+        self.log.info("Test orphan reconsideration when its missing parent is confirmed")
+        self.relay_transaction(peer, child["tx"])
+        assert tx_in_orphanage(node, child["tx"])
+
+        # Withhold the requested parent so it can only become available through the block.
+        node.bumpmocktime(TXREQUEST_TIME_SKIP)
+        peer.wait_for_parent_requests([parent["tx"].txid_int])
+        assert_equal(node.getrawmempool(), [])
+
+        self.generateblock(
+            node,
+            output=self.wallet.get_address(),
+            transactions=[parent["hex"]],
+        )
+        self.wait_until(lambda: child["txid"] in node.getrawmempool())
+        assert not tx_in_orphanage(node, child["tx"])
+
     @cleanup
     def test_orphan_inherit_rejection(self):
         node = self.nodes[0]
@@ -827,6 +851,7 @@ def run_test(self):
         self.test_orphan_multiple_parents()
         self.test_orphans_overlapping_parents()
         self.test_orphan_of_orphan()
+        self.test_orphan_parent_confirmed()
         self.test_orphan_inherit_rejection()
         self.test_same_txid_orphan()
         self.test_same_txid_orphan_of_orphan()
diff --git a/depend/bitcoin/test/functional/p2p_private_broadcast.py b/depend/bitcoin/test/functional/p2p_private_broadcast.py
index 1b4c393c..48535a59 100755
--- a/depend/bitcoin/test/functional/p2p_private_broadcast.py
+++ b/depend/bitcoin/test/functional/p2p_private_broadcast.py
@@ -6,7 +6,6 @@
 Test how locally submitted transactions are sent to the network when private broadcast is used.
 """
 
-import re
 import time
 import threading
 
@@ -14,7 +13,7 @@
     P2PDataStore,
     P2PInterface,
     P2P_SERVICES,
-    P2P_VERSION,
+    start_p2p_listener,
 )
 from test_framework.messages import (
     CAddress,
@@ -29,8 +28,7 @@
 )
 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,124 +38,21 @@
     assert_greater_than_or_equal,
     assert_not_equal,
     assert_raises_rpc_error,
-    p2p_port,
     tor_port,
 )
 from test_framework.wallet import (
     MiniWallet,
 )
 
+P2P_PRIVATE_VERSION = 70016
 NUM_PRIVATE_BROADCAST_PER_TX = 3
+MAX_PRIVATE_BROADCAST_ATTEMPTS = 1000
 
-# 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 NoRelayP2PInterface(P2PInterface):
+    def peer_connect_send_version(self, services):
+        super().peer_connect_send_version(services)
+        self.on_connection_send_msg.relay = 0
 
 
 class P2PPrivateBroadcast(BitcoinTestFramework):
@@ -166,49 +61,39 @@ def set_test_params(self):
         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()
 
-        def find_connection_type_in_debug_log(to_addr, to_port):
-            """
-            Scan the debug log of tx_originator for a connection attempt to to_addr:to_port.
-            Return the connection type (outbound-full-relay, private-broadcast, etc) or
-            None if there is no connection attempt to to_addr:to_port.
-            """
-            with open(self.tx_originator_debug_log_path, mode="r", encoding="utf-8") as debug_log:
-                for line in debug_log.readlines():
-                    match = re.match(f".*trying v. connection \\((.+)\\) to \\[?{to_addr}]?:{to_port},.*", line)
-                    if match:
-                        return match.group(1)
-            return None
-
-        def destinations_factory(requested_to_addr, requested_to_port):
+        self.trigger_no_relay_peer = False
+        self.no_relay_peer = None
+
+        def destinations_factory(requested_to_addr, requested_to_port, proxy_client):
             """
             Instruct the SOCKS5 proxy to redirect connections:
             * The first automatic outbound connection -> P2PDataStore
             * The first private broadcast connection -> nodes[1]
             * Anything else -> P2PInterface
+
+            proxy_client is the client's socket address as seen by the proxy (host:port),
+            equal to the node's addrbind for this connection.
             """
             conn_type = None
-            def found_connection_in_debug_log():
+            # SOCKS handlers run in separate threads, so each needs its own RPC connection.
+            rpc = self.nodes[0].create_new_rpc_connection()
+
+            def connection_type_found():
                 nonlocal conn_type
-                conn_type = find_connection_type_in_debug_log(requested_to_addr, requested_to_port)
-                return conn_type is not None
+                # The proxy has already replied SUCCESS to the SOCKS5 request, so the node
+                # has finished ConnectNode and registered the peer (or is about to).
+                # The proxy client address equals the node's addrbind for this connection.
+                for peer in rpc.getpeerinfo():
+                    if peer.get("addrbind") == proxy_client:
+                        conn_type = peer["connection_type"]
+                        return True
+                return False
 
-            self.wait_until(found_connection_in_debug_log)
+            self.wait_until(connection_type_found)
 
             with self.destinations_lock:
                 i = len(self.destinations)
@@ -229,28 +114,18 @@ def found_connection_in_debug_log():
                     if conn_type == "outbound-full-relay" and not any(dest["conn_type"] == "outbound-full-relay" for dest in self.destinations):
                         listener = P2PDataStore()
                         target_name = "Python P2PDataStore"
+                    elif conn_type == "private-broadcast" and self.trigger_no_relay_peer:
+                        listener = NoRelayP2PInterface()
+                        target_name = "Python NoRelayP2PInterface"
+                        self.trigger_no_relay_peer = False
+                        self.no_relay_peer = listener
                     else:
                         listener = P2PInterface()
                         target_name = "Python 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)
 
-                    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 "
@@ -268,7 +143,7 @@ def on_listen_done(addr, port):
                     "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 +154,7 @@ def on_listen_done(addr, port):
                 "-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.
@@ -333,7 +208,7 @@ def get_destinations_len():
             })
             dummy_address = CAddress()
             dummy_address.nServices = 0
-            assert_equal(peer.last_message["version"].nVersion, P2P_VERSION)
+            assert_equal(peer.last_message["version"].nVersion, P2P_PRIVATE_VERSION)
             assert_equal(peer.last_message["version"].nServices, 0)
             assert_equal(peer.last_message["version"].nTime, 0)
             assert_equal(peer.last_message["version"].addrTo, dummy_address)
@@ -351,23 +226,25 @@ def get_destinations_len():
         assert_equal(len(pending), 1)
         assert_equal(pending[0]["hex"].lower(), tx["hex"].lower())
         peers = pending[0]["peers"]
-        assert len(peers) >= NUM_PRIVATE_BROADCAST_PER_TX
+        assert_greater_than_or_equal(len(peers), NUM_PRIVATE_BROADCAST_PER_TX)
+        assert_equal(pending[0]["attempts_remaining"], MAX_PRIVATE_BROADCAST_ATTEMPTS - len(peers))
         assert all("address" in p and "sent" in p for p in peers)
         assert_greater_than_or_equal(sum(1 for p in peers if "received" in p), broadcasts_to_expect)
 
     def run_test(self):
         tx_originator = self.nodes[0]
-        self.tx_originator_debug_log_path = tx_originator.debug_log_path
         tx_receiver = self.nodes[1]
         far_observer = tx_receiver.add_p2p_connection(P2PInterface())
 
-        wallet = MiniWallet(tx_originator)
+        self.log.info("Test getprivatebroadcastinfo and abortprivatebroadcast fails if the node is running without -privatebroadcast set")
+        assert_raises_rpc_error(-32601, "Private broadcast is not enabled. Ensure you're running Bitcoin Core with -privatebroadcast=1.",
+            tx_receiver.getprivatebroadcastinfo)
+        assert_raises_rpc_error(-32601, "Private broadcast is not enabled. Ensure you're running Bitcoin Core with -privatebroadcast=1.",
+            tx_receiver.abortprivatebroadcast, "00" * 32)
+
+        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")
@@ -515,6 +392,19 @@ def set_tx_returner_and_other():
             "0" * 64,
         )
 
+        self.log.info("Checking that a private broadcast destination signaling relay=false gets disconnected")
+        tx_no_relay = wallet.create_self_transfer()
+        disconnect_msg = "Disconnecting: does not support transaction relay (connected in vain)"
+        with tx_originator.assert_debug_log(expected_msgs=[disconnect_msg]):
+            with self.destinations_lock:
+                self.no_relay_peer = None
+                self.trigger_no_relay_peer = True
+            tx_originator.sendrawtransaction(hexstring=tx_no_relay["hex"], maxfeerate=0.1)
+            self.wait_until(lambda: self.no_relay_peer is not None)
+            self.no_relay_peer.wait_until(lambda: self.no_relay_peer.message_count["version"] == 1, check_connected=False)
+            self.no_relay_peer.wait_for_disconnect()
+        assert_equal(self.no_relay_peer.message_count, {"version": 1})
+
         # Stop the SOCKS5 proxy server to avoid it being upset by the bitcoin
         # node disconnecting in the middle of the SOCKS5 handshake when we
         # restart below.
diff --git a/depend/bitcoin/test/functional/p2p_private_broadcast_cap.py b/depend/bitcoin/test/functional/p2p_private_broadcast_cap.py
new file mode 100755
index 00000000..81f00a89
--- /dev/null
+++ b/depend/bitcoin/test/functional/p2p_private_broadcast_cap.py
@@ -0,0 +1,103 @@
+#!/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.
+"""Test the private-broadcast queue size cap: submissions beyond the cap are
+rejected (the queue is not modified), rather than evicting existing entries.
+"""
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal, assert_raises_rpc_error
+from test_framework.wallet import MiniWallet
+
+
+# Must match PrivateBroadcast::MAX_TRANSACTIONS
+MAX_TRANSACTIONS = 10_000
+OVER_CAP = 5
+
+
+class PrivateBroadcastCapTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        # -privatebroadcast is incompatible with the framework's default
+        # -connect=0; allow autoconnect (no actual peers will succeed though).
+        self.disable_autoconnect = False
+        self.extra_args = [[
+            "-privatebroadcast",
+            # Fake I2P reachability so the privatebroadcast startup precondition passes.
+            "-i2psam=127.0.0.1:1",
+            "-proxy=127.0.0.1:1",
+        ]]
+
+    def setup_network(self):
+        # Skip the framework's default connect_nodes loop. We have a single
+        # node and don't need any peer connections.
+        self.setup_nodes()
+
+    def run_test(self):
+        node = self.nodes[0]
+        wallet = MiniWallet(node)
+        # Mature one coinbase to spend.
+        self.generate(wallet, 101)
+
+        # Build a parent that fans out to MAX_TRANSACTIONS + OVER_CAP outputs.
+        # Inject it directly via generateblock since -privatebroadcast bypasses
+        # the mempool
+        utxo = wallet.get_utxo()
+        parent = wallet.create_self_transfer_multi(
+            utxos_to_spend=[utxo],
+            num_outputs=MAX_TRANSACTIONS + OVER_CAP,
+            fee_per_output=500,
+        )
+        self.generateblock(node, wallet.get_address(), [parent["hex"]])
+
+        children = [wallet.create_self_transfer(utxo_to_spend=u)
+                    for u in parent["new_utxos"]]
+        assert_equal(len(children), MAX_TRANSACTIONS + OVER_CAP)
+
+        # Fill the queue exactly to the cap; every distinct submission succeeds.
+        self.log.info(f"Filling private broadcast queue to cap ({MAX_TRANSACTIONS} txns)")
+        for child in children[:MAX_TRANSACTIONS]:
+            node.sendrawtransaction(child["hex"])
+
+        pbinfo = node.getprivatebroadcastinfo()
+        assert_equal(len(pbinfo["transactions"]), MAX_TRANSACTIONS)
+        present_wtxids = {t["wtxid"] for t in pbinfo["transactions"]}
+        for i, child in enumerate(children[:MAX_TRANSACTIONS]):
+            assert child["wtxid"] in present_wtxids, \
+                f"tx index {i} (wtxid={child['wtxid']}) should be in the queue"
+
+        # Further distinct submissions are rejected with an RPC error, and the
+        # queue is left unchanged (nothing evicted to make room).
+        self.log.info(f"Submitting {OVER_CAP} more; each should be rejected (queue full)")
+        for child in children[MAX_TRANSACTIONS:]:
+            assert_raises_rpc_error(-37, "Private broadcast queue is full",
+                                    node.sendrawtransaction, child["hex"])
+
+        assert_equal(pbinfo["transactions"], node.getprivatebroadcastinfo()["transactions"])
+
+        self.log.info("Checking abortprivatebroadcast frees a slot for a new submission")
+        abort_res = node.abortprivatebroadcast(children[1]["txid"])
+        assert_equal([t["wtxid"] for t in abort_res["removed_transactions"]],
+                     [children[1]["wtxid"]])
+        wtxids = {t["wtxid"] for t in node.getprivatebroadcastinfo()["transactions"]}
+        assert_equal(len(wtxids), MAX_TRANSACTIONS - 1)
+        assert children[1]["wtxid"] not in wtxids, "aborted tx should be gone from the queue"
+
+        new_child = children[MAX_TRANSACTIONS]  # first previously-rejected tx
+        node.sendrawtransaction(new_child["hex"])
+        wtxids = {t["wtxid"] for t in node.getprivatebroadcastinfo()["transactions"]}
+        assert_equal(len(wtxids), MAX_TRANSACTIONS)
+        assert new_child["wtxid"] in wtxids, "freed slot should now hold the new tx"
+        assert children[1]["wtxid"] not in wtxids, "aborted tx should not reappear"
+
+        # Re-submitting an already-queued transaction is a no-op, not an error,
+        # even when the queue is full.
+        self.log.info("Re-submitting an already-queued tx should not error")
+        node.sendrawtransaction(children[0]["hex"])
+        wtxids = {t["wtxid"] for t in node.getprivatebroadcastinfo()["transactions"]}
+        assert_equal(len(wtxids), MAX_TRANSACTIONS)
+        assert children[0]["wtxid"] in wtxids, "re-submitted tx should remain queued"
+
+if __name__ == "__main__":
+    PrivateBroadcastCapTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/p2p_private_broadcast_retry_v1.py b/depend/bitcoin/test/functional/p2p_private_broadcast_retry_v1.py
new file mode 100755
index 00000000..7b97119b
--- /dev/null
+++ b/depend/bitcoin/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, _proxy_client):
+            """
+            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, _proxy_client):
+            """
+            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/depend/bitcoin/test/functional/p2p_segwit.py b/depend/bitcoin/test/functional/p2p_segwit.py
index 92ebe21a..6224e9c5 100755
--- a/depend/bitcoin/test/functional/p2p_segwit.py
+++ b/depend/bitcoin/test/functional/p2p_segwit.py
@@ -615,7 +615,9 @@ def test_standardness_v0(self):
                     'txid': tx3.txid_hex,
                     'wtxid': tx3.wtxid_hex,
                     'allowed': True,
+                    'vsize_adjusted': tx3.get_vsize(),
                     'vsize': tx3.get_vsize(),
+                    'vsize_bip141': tx3.get_vsize(),
                     'fees': {
                         'base': Decimal('0.00001000'),
                     },
@@ -633,7 +635,9 @@ def test_standardness_v0(self):
                     'txid': tx3.txid_hex,
                     'wtxid': tx3.wtxid_hex,
                     'allowed': True,
+                    'vsize_adjusted': tx3.get_vsize(),
                     'vsize': tx3.get_vsize(),
+                    'vsize_bip141': tx3.get_vsize(),
                     'fees': {
                         'base': Decimal('0.00011000'),
                     },
diff --git a/depend/bitcoin/test/functional/p2p_sendheaders.py b/depend/bitcoin/test/functional/p2p_sendheaders.py
index cc28fc05..acef0329 100755
--- a/depend/bitcoin/test/functional/p2p_sendheaders.py
+++ b/depend/bitcoin/test/functional/p2p_sendheaders.py
@@ -139,7 +139,9 @@ def send_getblocks(self, locator):
         self.send_without_ping(getblocks_message)
 
     def wait_for_block_announcement(self, block_hash, timeout=60):
-        test_function = lambda: self.last_blockhash_announced == block_hash
+        def test_function():
+            return self.last_blockhash_announced == block_hash
+
         self.wait_until(test_function, timeout=timeout)
 
     def on_inv(self, message):
@@ -165,7 +167,9 @@ def clear_block_announcements(self):
     def check_last_headers_announcement(self, headers):
         """Test whether the last headers announcements received are right.
            Headers may be announced across more than one message."""
-        test_function = lambda: (len(self.recent_headers_announced) >= len(headers))
+        def test_function():
+            return len(self.recent_headers_announced) >= len(headers)
+
         self.wait_until(test_function)
         with p2p_lock:
             assert_equal(self.recent_headers_announced, headers)
@@ -177,7 +181,9 @@ def check_last_inv_announcement(self, inv):
         """Test whether the last announcement received had the right inv.
         inv should be a list of block hashes."""
 
-        test_function = lambda: self.block_announced
+        def test_function():
+            return self.block_announced
+
         self.wait_until(test_function)
 
         with p2p_lock:
diff --git a/depend/bitcoin/test/functional/p2p_tx_download.py b/depend/bitcoin/test/functional/p2p_tx_download.py
index a46b6a6b..aa43cc18 100755
--- a/depend/bitcoin/test/functional/p2p_tx_download.py
+++ b/depend/bitcoin/test/functional/p2p_tx_download.py
@@ -16,6 +16,7 @@
     CInv,
     MSG_TX,
     MSG_TYPE_MASK,
+    MSG_WITNESS_TX,
     MSG_WTX,
     msg_inv,
     msg_notfound,
@@ -116,17 +117,23 @@ def test_inv_block(self):
         self.nodes[0].sendrawtransaction(tx['hex'])
 
         # Since node 1 is connected outbound to an honest peer (node 0), it
-        # should get the tx within a timeout. (Assuming that node 0
-        # announced the tx within the timeout)
+        # should get the tx within a timeout.
+        # However, node 0 sees the same connection as inbound, so it may not
+        # announce the tx within the timeout.
         # The timeout is the sum of
         # * the worst case until the tx is first requested from an inbound
         #   peer, plus
         # * the first time it is re-requested from the outbound peer, plus
         # * 2 seconds to avoid races
+        assert_equal(self.nodes[0].getpeerinfo()[0]["inbound"], True)
+        assert_equal(self.nodes[0].getpeerinfo()[0]["inv_to_send"], 1)
         assert_equal(self.nodes[1].getpeerinfo()[0]['inbound'], False)
         timeout = 2 + NONPREF_PEER_TX_DELAY + GETDATA_TX_INTERVAL
         self.log.info("Tx should be received at node 1 after {} seconds".format(timeout))
         self.nodes[0].bumpmocktime(timeout)
+        # Use an unrelated peer to ensure node 0 calls `SendMessages` at least once
+        self.nodes[0].p2ps[0].sync_with_ping()
+        assert_equal(self.nodes[0].getpeerinfo()[0]['inv_to_send'], 0)  # May fail rarely, retry the test
         self.sync_mempools()
 
         self.nodes[0].setmocktime(0)
@@ -263,7 +270,7 @@ def test_preferred_tiebreaker_inv(self):
         self.nodes[0].bumpmocktime(NONPREF_PEER_TX_DELAY)
         with p2p_lock:
             for peer in non_pref_peers:
-                    assert_equal(peer.tx_getdata_count, 0)
+                assert_equal(peer.tx_getdata_count, 0)
 
         # Now add another outbound (preferred) which is immediately ready for consideration
         # upon advertisement
@@ -318,6 +325,72 @@ def test_large_inv_batch(self):
         peer.wait_until(lambda: peer.tx_getdata_count == MAX_PEER_TX_ANNOUNCEMENTS)
         peer.sync_with_ping()
 
+    def test_duplicate_tx_inv(self):
+        self.log.info('Check that duplicate transaction identifiers in one inv message are processed once')
+        node = self.nodes[0]
+        node.logging(include=['net'])
+
+        def send_invs_and_read_log(peer, invs):
+            log_start = node.debug_log_size(encoding='utf-8')
+            peer.send_and_ping(msg_inv(invs))
+            with open(node.debug_log_path, encoding='utf-8', errors='replace') as debug_log:
+                debug_log.seek(log_start)
+                return debug_log.read()
+
+        for wtxidrelay, inv_type, inv_name, mismatched_type, mismatched_name, hash_a, hash_b in [
+            (False, MSG_TX, 'tx', MSG_WTX, 'wtx', 0xaabbcc, 0xddeeff),
+            (True, MSG_WTX, 'wtx', MSG_TX, 'tx', 0x112233, 0x445566),
+        ]:
+            peer = node.add_p2p_connection(TestP2PConn(wtxidrelay=wtxidrelay))
+            inv_a_log = f"got inv: {inv_name} {hash_a:064x}"
+            inv_b_log = f"got inv: {inv_name} {hash_b:064x}"
+            mismatched_inv_log = f"got inv: {mismatched_name} {hash_a:064x}"
+
+            log = send_invs_and_read_log(peer, [
+                CInv(t=mismatched_type, h=hash_a),
+                CInv(t=inv_type, h=hash_a),
+                CInv(t=inv_type, h=hash_b),
+                CInv(t=inv_type, h=hash_a),
+                CInv(t=inv_type, h=hash_b),
+            ])
+            assert_equal(log.count(inv_a_log), 1)
+            assert_equal(log.count(inv_b_log), 1)
+            assert_equal(log.count(mismatched_inv_log), 0)
+
+            # The duplicate filter is scoped to a single INV message.
+            log = send_invs_and_read_log(peer, [
+                CInv(t=inv_type, h=hash_a),
+                CInv(t=inv_type, h=hash_a),
+            ])
+            assert_equal(log.count(inv_a_log), 1)
+            assert_equal(log.count(inv_b_log), 0)
+
+        self.log.info('Check that MSG_TX and MSG_WITNESS_TX are deduplicated as txids')
+        peer = node.add_p2p_connection(TestP2PConn(wtxidrelay=False))
+        for first_type, first_name, second_type, second_name, hash_a in [
+            (MSG_TX, 'tx', MSG_WITNESS_TX, 'witness-tx', 0x667788),
+            (MSG_WITNESS_TX, 'witness-tx', MSG_TX, 'tx', 0x778899),
+        ]:
+            log = send_invs_and_read_log(peer, [
+                CInv(t=first_type, h=hash_a),
+                CInv(t=second_type, h=hash_a),
+            ])
+            assert_equal(log.count(f"got inv: {first_name} {hash_a:064x}"), 1)
+            assert_equal(log.count(f"got inv: {second_name} {hash_a:064x}"), 0)
+
+        self.log.info('Check that txids and wtxids are deduplicated separately')
+        peer = node.add_p2p_connection(TestP2PConn(wtxidrelay=True))
+        for first_type, second_type, hash_a in [
+            (MSG_WITNESS_TX, MSG_WTX, 0x8899aa),
+            (MSG_WTX, MSG_WITNESS_TX, 0x99aabb),
+        ]:
+            log = send_invs_and_read_log(peer, [
+                CInv(t=first_type, h=hash_a),
+                CInv(t=second_type, h=hash_a),
+            ])
+            assert_equal(log.count(f"got inv: witness-tx {hash_a:064x}"), 1)
+            assert_equal(log.count(f"got inv: wtx {hash_a:064x}"), 1)
+
     def test_spurious_notfound(self):
         self.log.info('Check that spurious notfound is ignored')
         self.nodes[0].p2ps[0].send_without_ping(msg_notfound(vec=[CInv(MSG_TX, 1)]))
@@ -389,6 +462,7 @@ def run_test(self):
         self.test_txid_inv_delay()
         self.test_txid_inv_delay(True)
         self.test_large_inv_batch()
+        self.test_duplicate_tx_inv()
         self.test_spurious_notfound()
 
         # Run each test against new bitcoind instances, as setting mocktimes has long-term effects on when
diff --git a/depend/bitcoin/test/functional/p2p_tx_relay_rate_limit.py b/depend/bitcoin/test/functional/p2p_tx_relay_rate_limit.py
new file mode 100755
index 00000000..9c612444
--- /dev/null
+++ b/depend/bitcoin/test/functional/p2p_tx_relay_rate_limit.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test transaction relay rate limiting via token buckets.
+
+With -txsendrate=R, the inbound count bucket has capacity R*30. A broadcast
+transaction is relayed immediately while the bucket has tokens; once it is
+exhausted the excess transactions queue in a global backlog and drain as the
+bucket refills (R tokens/second as mocktime advances).
+"""
+
+from decimal import Decimal
+import time
+
+from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.p2p import P2PTxInvStore
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
+from test_framework.wallet import MiniWallet
+
+SEND_RATE = 2                 # -txsendrate value
+BUCKET_CAP = SEND_RATE * 30   # count bucket capacity (60)
+NUM_TXS = 80                  # total transactions to submit
+
+
+class TxRelayRateLimitTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.extra_args = [[f'-txsendrate={SEND_RATE}']]
+
+    def inbound_backlog(self, node):
+        return node.getnetworkinfo()['inv_buckets']['inbound']['backlog']
+
+    def run_test(self):
+        node = self.nodes[0]
+        wallet = MiniWallet(node)
+
+        node.setmocktime(int(time.time()))
+
+        # Mine enough blocks for mature coinbase UTXOs.
+        self.generate(wallet, COINBASE_MATURITY + NUM_TXS + 50)
+
+        # Connect an inbound peer (negotiates wtxid relay by default)
+        peer = node.add_p2p_connection(P2PTxInvStore())
+
+        # Advance time so the peer's trickle timer initializes
+        node.bumpmocktime(10)
+        peer.sync_with_ping()
+        assert_equal(len(peer.get_invs()), 0)
+
+        # Verify the configured send rate
+        assert_equal(node.getnetworkinfo()['tx_send_rate'], SEND_RATE)
+
+        self.test_rate_limit_and_rbf(node, wallet, peer)
+
+    def test_rate_limit_and_rbf(self, node, wallet, peer):
+        self.log.info(f"Submitting {NUM_TXS} transactions at frozen time (bucket capacity {BUCKET_CAP})")
+
+        # Prepare an RBF pair: original and replacement spending the same UTXO.
+        # Both are created upfront so we can submit the replacement later.
+        rbf_utxo = wallet.get_utxo()
+        tx_rbf_orig = wallet.create_self_transfer(utxo_to_spend=rbf_utxo)
+        tx_rbf_repl = wallet.create_self_transfer(utxo_to_spend=rbf_utxo, fee_rate=Decimal("0.009"))
+
+        # Submit NUM_TXS transactions at frozen time. Each broadcast is relayed
+        # immediately while the count bucket has tokens, so the first BUCKET_CAP
+        # are handed straight to the peer and the rest queue in the backlog. The
+        # RBF original is placed in the backlogged tail.
+        RBF_INDEX = NUM_TXS - 5
+        for i in range(NUM_TXS):
+            if i == RBF_INDEX:
+                node.sendrawtransaction(tx_rbf_orig['hex'])
+            else:
+                wallet.send_self_transfer(from_node=node)
+
+        # The excess beyond the bucket capacity is backlogged. Nothing is
+        # announced yet -- the per-peer trickle timer hasn't fired (frozen time).
+        self.log.info(f"Backlog after burst: {self.inbound_backlog(node)}")
+        assert_equal(self.inbound_backlog(node), NUM_TXS - BUCKET_CAP)
+        assert_equal(len(peer.get_invs()), 0)
+
+        # RBF the backlogged original while time is still frozen, so the
+        # replacement also queues in the backlog (the bucket is exhausted). The
+        # original's wtxid stays in the backlog vector for now but is dropped
+        # when the backlog is processed, since it is no longer in the mempool.
+        self.log.info("RBF'ing a backlogged transaction")
+        node.sendrawtransaction(tx_rbf_repl['hex'])
+        assert_equal(self.inbound_backlog(node), NUM_TXS - BUCKET_CAP + 1)
+
+        # Advance time so the bucket refills and the backlog drains. Loop until
+        # the backlog is empty and every surviving tx has trickled out.
+        self.log.info("Advancing time to drain the backlog")
+        for _ in range(30):
+            if self.inbound_backlog(node) == 0 and len(peer.get_invs()) == NUM_TXS:
+                break
+            node.bumpmocktime(4)
+            peer.sync_with_ping()
+
+        announced = set(peer.get_invs())
+        self.log.info(f"Total announced: {len(announced)}")
+
+        # Every surviving transaction is announced: the burst minus the dropped
+        # RBF original, plus the replacement.
+        assert_equal(self.inbound_backlog(node), 0)
+        assert_equal(len(announced), NUM_TXS)
+        assert int(tx_rbf_orig['wtxid'], 16) not in announced
+        assert int(tx_rbf_repl['wtxid'], 16) in announced
+
+        self.log.info("Rate limiting and RBF backlog cleanup test passed")
+
+
+if __name__ == '__main__':
+    TxRelayRateLimitTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_bind.py b/depend/bitcoin/test/functional/rpc_bind.py
index 3c6e3e4b..81e916bb 100755
--- a/depend/bitcoin/test/functional/rpc_bind.py
+++ b/depend/bitcoin/test/functional/rpc_bind.py
@@ -4,21 +4,20 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test running bitcoind with the -rpcbind and -rpcallowip options."""
 
-from test_framework.netutil import all_interfaces, addr_to_hex, get_bind_addrs, test_ipv6_local
+from test_framework.netutil import NETWORK_ERRORS, all_interfaces, addr_to_hex, get_bind_addrs, test_ipv6_local
 from test_framework.test_framework import BitcoinTestFramework, SkipTest
 from test_framework.test_node import ErrorMatch
-from test_framework.util import assert_equal, assert_raises_rpc_error, get_rpc_proxy, rpc_port, rpc_url
+from test_framework.util import assert_equal, rpc_port
 
 class RPCBindTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.bind_to_localhost_only = False
         self.num_nodes = 1
-        self.supports_cli = False
 
     def skip_test_if_missing_module(self):
-        # due to OS-specific network stats queries, this test works only on Linux
-        self.skip_if_platform_not_linux()
+        self.skip_if_platform_not_posix()
+        self.skip_if_no_lsof_on_nonlinux()
 
     def setup_network(self):
         self.add_nodes(self.num_nodes, None)
@@ -64,6 +63,7 @@ def run_allowip_test(self, allow_ips, rpchost, rpcport):
         Start a node with rpcallow IP, and request getnetworkinfo
         at a non-localhost IP.
         '''
+        success = True
         self.log.info("Allow IP test for %s:%d" % (rpchost, rpcport))
         node_args = \
             ['-disablewallet', '-nolisten'] + \
@@ -71,10 +71,15 @@ def run_allowip_test(self, allow_ips, rpchost, rpcport):
             ['-rpcbind='+addr for addr in ['127.0.0.1', "%s:%d" % (rpchost, rpcport)]] # Bind to localhost as well so start_nodes doesn't hang
         self.nodes[0].rpchost = None
         self.start_nodes([node_args])
+        self.nodes[0].rpchost = f"{rpchost}:{rpcport}"
         # connect to node through non-loopback interface
-        node = get_rpc_proxy(rpc_url(self.nodes[0].datadir_path, 0, self.chain, "%s:%d" % (rpchost, rpcport)), 0, coveragedir=self.options.coveragedir)
-        node.getnetworkinfo()
+        node = self.nodes[0].create_new_rpc_connection()
+        try:
+            node.getnetworkinfo()
+        except NETWORK_ERRORS:
+            success = False
         self.stop_nodes()
+        return success
 
     def run_invalid_allowip_test(self):
         '''
@@ -105,9 +110,12 @@ def run_test(self):
             raise SkipTest("This test requires ipv6 support.")
 
         self.log.info("Check for non-loopback interface")
+        interfaces = all_interfaces()
+        if not interfaces:
+            raise AssertionError("all_interfaces() returned no IPv4 interfaces")
         self.non_loopback_ip = None
-        for name,ip in all_interfaces():
-            if ip != '127.0.0.1':
+        for name,ip in interfaces:
+            if not ip.startswith('127.'):
                 self.non_loopback_ip = ip
                 break
         if self.non_loopback_ip is None and self.options.run_nonloopback:
@@ -160,9 +168,13 @@ def _run_nonloopback_tests(self):
         self.run_bind_test([self.non_loopback_ip], self.non_loopback_ip, [self.non_loopback_ip],
             [(self.non_loopback_ip, self.defaultport)])
 
-        # Check that with invalid rpcallowip, we are denied
-        self.run_allowip_test([self.non_loopback_ip], self.non_loopback_ip, self.defaultport)
-        assert_raises_rpc_error(-342, "non-JSON HTTP response with '403 Forbidden' from server", self.run_allowip_test, ['1.1.1.1'], self.non_loopback_ip, self.defaultport)
+        # Check that connections from allowed IPs are allowed
+        assert self.run_allowip_test([self.non_loopback_ip], self.non_loopback_ip, self.defaultport)
+        # Otherwise we are denied
+        if self.options.usecli:
+            self.log.info("Skip negative IP test with CLI, because the CLI can not throw the tested exception type")
+            return
+        assert not self.run_allowip_test(['1.1.1.1'], self.non_loopback_ip, self.defaultport)
 
 if __name__ == '__main__':
     RPCBindTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_blockchain.py b/depend/bitcoin/test/functional/rpc_blockchain.py
index bf7c7d11..d731907f 100755
--- a/depend/bitcoin/test/functional/rpc_blockchain.py
+++ b/depend/bitcoin/test/functional/rpc_blockchain.py
@@ -290,6 +290,8 @@ def _test_y2106(self):
         self.log.info("Check that block timestamps work until year 2106")
         self.generate(self.nodes[0], 8)[-1]
         time_2106 = 2**32 - 1
+        assert_raises_rpc_error(-8, f"Mocktime must be in the range [0, {time_2106}], not -1.", self.nodes[0].setmocktime, -1)
+        assert_raises_rpc_error(-8, f"Mocktime must be in the range [0, {time_2106}], not {time_2106 + 1}.", self.nodes[0].setmocktime, time_2106 + 1)
         self.nodes[0].setmocktime(time_2106)
         last = self.generate(self.nodes[0], 6)[-1]
         assert_equal(self.nodes[0].getblockheader(last)["mediantime"], time_2106)
diff --git a/depend/bitcoin/test/functional/rpc_createmultisig.py b/depend/bitcoin/test/functional/rpc_createmultisig.py
index 199e9c44..faaa7f61 100755
--- a/depend/bitcoin/test/functional/rpc_createmultisig.py
+++ b/depend/bitcoin/test/functional/rpc_createmultisig.py
@@ -50,6 +50,7 @@ def run_test(self):
             for output_type in ["bech32", "p2sh-segwit", "legacy"]:
                 self.do_multisig(keys, sigs, output_type)
 
+        self.test_combinerawtransaction_preconditions()
         self.test_multisig_script_limit()
         self.test_mixing_uncompressed_and_compressed_keys(node0)
         self.test_sortedmulti_descriptors_bip67()
@@ -82,7 +83,12 @@ def test_multisig_script_limit(self):
         assert_raises_rpc_error(-8, "Number of keys involved in the multisignature address creation > 20", node1.createmultisig, 16, self.pub, 'p2sh-segwit')
         assert_raises_rpc_error(-8, "Number of keys involved in the multisignature address creation > 20", node1.createmultisig, 16, self.pub, 'bech32')
 
-    def do_multisig(self, nkeys, nsigs, output_type):
+    def test_combinerawtransaction_preconditions(self):
+        self.log.info('Test combinerawtransaction preconditions')
+        # Note that preconditions don't depend on the output type, choosing bech32
+        self.do_multisig(nkeys=3, nsigs=2, output_type="bech32", assert_mergeability=True)
+
+    def do_multisig(self, nkeys, nsigs, output_type, assert_mergeability=False):
         node0, _node1, node2 = self.nodes
         pub_keys = self.pub[0: nkeys]
         priv_keys = self.priv[0: nkeys]
@@ -146,10 +152,32 @@ def do_multisig(self, nkeys, nsigs, output_type):
         assert_equal(rawtx2["complete"], False)
         rawtx3 = node2.signrawtransactionwithkey(rawtx, [priv_keys[-1]], prevtxs)
         assert_equal(rawtx3["complete"], False)
-        assert_raises_rpc_error(-22, "TX decode failed", node2.combinerawtransaction, [rawtx2['hex'], rawtx3['hex'] + "00"])
-        assert_raises_rpc_error(-22, "Missing transactions", node2.combinerawtransaction, [])
-        combined_rawtx = node2.combinerawtransaction([rawtx2["hex"], rawtx3["hex"]])
 
+        if assert_mergeability:
+            # Test boundary conditions
+            assert_raises_rpc_error(-22, "TX decode failed", node2.combinerawtransaction, [rawtx2['hex'], rawtx3['hex'] + "00"])
+            assert_raises_rpc_error(-22, "Missing transactions. At least two transactions required.", node2.combinerawtransaction, [])
+            assert_raises_rpc_error(-22, "Missing transactions. At least two transactions required.", node2.combinerawtransaction, [rawtx2['hex']])
+
+            out_addr2 = getnewdestination('bech32')[2]
+            unmergeable_transaction_args = [
+                ([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr: outval * 2}]], {}), # similar transaction but with different amount to send
+                ([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr: outval}]], {"version": 1}), # similar transaction but with different version
+                ([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr: outval}]], {"locktime": 1}), # similar transaction but with different locktime
+                ([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr2: outval}]], {}), # similar transaction but with different output address (scriptPubKey)
+                ([[{"txid": tx["txid"], "vout": tx["sent_vout"], "sequence": 1}], [{out_addr: outval}]], {}), # similar transaction but with different sequence number
+                ([[{"txid": tx["txid"], "vout": tx["sent_vout"] + 1}], [{out_addr: outval}]], {}) # similar transaction but with different input vout index
+            ]
+
+            for rpc_args, rpc_kwargs in unmergeable_transaction_args:
+                unrelated_tx = node2.createrawtransaction(*rpc_args, **rpc_kwargs)
+                assert_raises_rpc_error(-8, "Transaction number 2 not compatible with first transaction", node0.combinerawtransaction, [rawtx2['hex'], unrelated_tx])
+
+            # Accept duplicate transactions in combinerawtransaction
+            dupe_merged_tx = node2.combinerawtransaction([rawtx2['hex'], rawtx2['hex']])
+            assert_equal(rawtx2['hex'], dupe_merged_tx)
+
+        combined_rawtx = node2.combinerawtransaction([rawtx2["hex"], rawtx3["hex"]])
         tx = node0.sendrawtransaction(combined_rawtx, 0)
         blk = self.generate(node0, 1)[0]
         assert tx in node0.getblock(blk)["tx"]
@@ -161,7 +189,7 @@ def do_multisig(self, nkeys, nsigs, output_type):
 
     def test_mixing_uncompressed_and_compressed_keys(self, node):
         self.log.info('Mixed compressed and uncompressed multisigs are not allowed')
-        pk0, pk1, pk2 = [getnewdestination('bech32')[0].hex() for _ in range(3)]
+        pk0, pk1, pk2 = [getnewdestination('bech32')[0][1].hex() for _ in range(3)]
 
         # decompress pk2
         pk_obj = ECPubKey()
diff --git a/depend/bitcoin/test/functional/rpc_deprecated.py b/depend/bitcoin/test/functional/rpc_deprecated.py
index 2f86954f..dd7f6002 100755
--- a/depend/bitcoin/test/functional/rpc_deprecated.py
+++ b/depend/bitcoin/test/functional/rpc_deprecated.py
@@ -4,6 +4,8 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test deprecation of RPC calls."""
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_raises_rpc_error
+
 
 class DeprecatedRpcTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -26,7 +28,17 @@ def run_test(self):
 
         # Please don't delete nor modify this comment
         self.log.info("Tests for deprecated RPC methods (if any)")
-        self.log.info("Currently no tests for deprecated RPC methods")
+        if self.is_wallet_compiled():
+            self.log.info("Tests for deprecated wallet-related RPC methods (if any)")
+            self.nodes[0].createwallet("ancient_wallet")
+            wallet = self.nodes[0].get_wallet_rpc("ancient_wallet")
+
+            self.log.info("Test removeprunedfunds deprecation")
+            assert_raises_rpc_error(
+                -32, "Start bitcoind with the `-deprecatedrpc=removeprunedfunds`",
+                wallet.removeprunedfunds,
+                "fakeargument"
+            )
 
 
 if __name__ == '__main__':
diff --git a/depend/bitcoin/test/functional/rpc_deriveaddresses.py b/depend/bitcoin/test/functional/rpc_deriveaddresses.py
index f704223f..6fc79418 100755
--- a/depend/bitcoin/test/functional/rpc_deriveaddresses.py
+++ b/depend/bitcoin/test/functional/rpc_deriveaddresses.py
@@ -35,6 +35,7 @@ def run_test(self):
         assert_raises_rpc_error(-8, "Range should not be specified for an un-ranged descriptor", self.nodes[0].deriveaddresses, descsum_create("wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/0)"), [0, 2])
 
         assert_raises_rpc_error(-8, "Range must be specified for a ranged descriptor", self.nodes[0].deriveaddresses, descsum_create("wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*)"))
+        assert_raises_rpc_error(-8, "Range must be specified for a ranged descriptor", self.nodes[0].deriveaddresses, descsum_create("wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*)"), None)
 
         assert_raises_rpc_error(-8, "End of range is too high", self.nodes[0].deriveaddresses, descsum_create("wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*)"), 10000000000)
 
diff --git a/depend/bitcoin/test/functional/rpc_dumptxoutset.py b/depend/bitcoin/test/functional/rpc_dumptxoutset.py
index 80c4bf6f..47568c24 100755
--- a/depend/bitcoin/test/functional/rpc_dumptxoutset.py
+++ b/depend/bitcoin/test/functional/rpc_dumptxoutset.py
@@ -68,15 +68,15 @@ def run_test(self):
         # Blockhash should be deterministic based on mocked time.
         assert_equal(
             out['base_hash'],
-            '6885775faa46290bedfa071f22d0598c93f1d7e01f24607c4dedd69b9baa4a8f')
+            '220aee93f0f5409631f35488898258f0930952bd620063cb4d7d87f7c28a8f50')
 
         # UTXO snapshot hash should be deterministic based on mocked time.
         assert_equal(
             sha256sum_file(str(expected_path)).hex(),
-            'd9506d541437f5e2892d6b6ea173f55233de11601650c157a27d8f2b9d08cb6f')
+            'e8c59b1bc1f19061c67eb7a392f4ea17eea83af58646ea2909e270546699c36c')
 
         assert_equal(
-            out['txoutset_hash'], 'd4453995f4f20db7bb3a604afd10d7128e8ee11159cde56d5b2fd7f55be7c74c')
+            out['txoutset_hash'], '771d773b5c27b6f35f598ce764652a2cf28fbc268341eb1827844e416c629c7d')
         assert_equal(out['nchaintx'], 101)
 
         # Specifying a path to an existing or invalid file will fail.
diff --git a/depend/bitcoin/test/functional/rpc_echo_payload.py b/depend/bitcoin/test/functional/rpc_echo_payload.py
new file mode 100755
index 00000000..e1099565
--- /dev/null
+++ b/depend/bitcoin/test/functional/rpc_echo_payload.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit/.
+"""Ensure RPCs with a (possibly large) payload will either be rejected or handled, but will never time out."""
+
+from concurrent.futures import ThreadPoolExecutor
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal, JSONRPCException
+import random
+
+
+class RpcEchoPayloadTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.setup_clean_chain = True
+        self.extra_args = [["-rpcworkqueue=2", "-rpcthreads=2"]]
+        # enough to possibly fill the running threads as well as the queue:
+        self.num_threads = 6
+
+    def run_test(self):
+        node = self.nodes[0]
+        # Use json-serializable, but non-hex data
+        data = "z" + random.randbytes(1_999_000).hex()
+
+        def check_results(rpc):
+            self.log.info("Starting thread ...")
+            for i in range(200):
+                payload = data[: random.randrange(0, len(data))]
+                try:
+                    if random.getrandbits(1):
+                        assert_equal(payload, rpc.echo(payload)[0])
+                    else:
+                        rpc.sendrawtransaction(payload)
+                except JSONRPCException as e:
+                    msg = e.error["message"]
+                    if msg not in [
+                        "TX decode failed. Make sure the tx has at least one input.",
+                        "non-JSON HTTP response with '503 Service Unavailable' from server: Work queue depth exceeded",
+                    ]:
+                        raise AssertionError(f"Unexpected msg: {msg}")
+
+        rpcs = [node.create_new_rpc_connection() for _ in range(self.num_threads)]
+        self.log.info("Starting threadpool ...")
+        with ThreadPoolExecutor(max_workers=len(rpcs)) as threads:
+            list(threads.map(check_results, rpcs))
+
+
+if __name__ == "__main__":
+    RpcEchoPayloadTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_generate.py b/depend/bitcoin/test/functional/rpc_generate.py
index a68d9c32..97ebf936 100755
--- a/depend/bitcoin/test/functional/rpc_generate.py
+++ b/depend/bitcoin/test/functional/rpc_generate.py
@@ -87,7 +87,9 @@ def test_generateblock(self):
 
         # Ensure that generateblock can be called concurrently by many threads.
         self.log.info('Generate blocks in parallel')
-        generate_50_blocks = lambda n: [n.generateblock(output=address, transactions=[]) for _ in range(50)]
+        def generate_50_blocks(n):
+            return [n.generateblock(output=address, transactions=[]) for _ in range(50)]
+
         rpcs = [node.cli for _ in range(6)]
         with ThreadPoolExecutor(max_workers=len(rpcs)) as threads:
             list(threads.map(generate_50_blocks, rpcs))
diff --git a/depend/bitcoin/test/functional/rpc_getblockfrompeer.py b/depend/bitcoin/test/functional/rpc_getblockfrompeer.py
index 841cde02..f646abed 100755
--- a/depend/bitcoin/test/functional/rpc_getblockfrompeer.py
+++ b/depend/bitcoin/test/functional/rpc_getblockfrompeer.py
@@ -4,7 +4,6 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test the getblockfrompeer RPC."""
 
-from test_framework.authproxy import JSONRPCException
 from test_framework.messages import (
     CBlock,
     from_hex,
@@ -19,6 +18,7 @@
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
+    JSONRPCException,
 )
 
 
@@ -128,7 +128,7 @@ def run_test(self):
         self.generate(self.nodes[0], 400, sync_fun=self.no_op)
         self.sync_blocks([self.nodes[0], pruned_node])
         pruneheight = pruned_node.pruneblockchain(300)
-        assert_equal(pruneheight, 248)
+        assert_equal(pruneheight, 249)
         # Ensure the block is actually pruned
         pruned_block = self.nodes[0].getblockhash(2)
         assert_raises_rpc_error(-1, "Block not available (pruned data)", pruned_node.getblock, pruned_block)
@@ -144,14 +144,14 @@ def run_test(self):
         self.log.info("Fetched block persists after next pruning event")
         self.generate(self.nodes[0], 250, sync_fun=self.no_op)
         self.sync_blocks([self.nodes[0], pruned_node])
-        pruneheight += 251
+        pruneheight += 252
         assert_equal(pruned_node.pruneblockchain(700), pruneheight)
         assert_equal(pruned_node.getblock(pruned_block)["hash"], "196ee3a1a6db2353965081c48ef8e6b031cb2115d084bec6fec937e91a2c6277")
 
         self.log.info("Fetched block can be pruned again when prune height exceeds the height of the tip at the time when the block was fetched")
         self.generate(self.nodes[0], 250, sync_fun=self.no_op)
         self.sync_blocks([self.nodes[0], pruned_node])
-        pruneheight += 250
+        pruneheight += 251
         assert_equal(pruned_node.pruneblockchain(1000), pruneheight)
         assert_raises_rpc_error(-1, "Block not available (pruned data)", pruned_node.getblock, pruned_block)
 
diff --git a/depend/bitcoin/test/functional/rpc_gettxspendingprevout.py b/depend/bitcoin/test/functional/rpc_gettxspendingprevout.py
index 972056e6..6a7e1db9 100755
--- a/depend/bitcoin/test/functional/rpc_gettxspendingprevout.py
+++ b/depend/bitcoin/test/functional/rpc_gettxspendingprevout.py
@@ -212,6 +212,14 @@ def create_tx(**kwargs):
         result = node0.gettxspendingprevout([prevout(tx1['txid'], vout=0)], return_spending_tx=True)
         assert_equal(result, [unspent_out(tx1['txid'], vout=0)])
 
+        self.log.info("Check mixed mempool and index result order")
+        tx4 = create_tx(utxos_to_spend=[txH["new_utxos"][0]], num_outputs=1)
+        result = node0.gettxspendingprevout([prevout(txid_reorg_cancel_utxo, vout=0), prevout(txidH, vout=0)])
+        assert_equal(result, [
+            spent_out(txid_reorg_cancel_utxo, vout=0, spending_tx_id=tx3["txid"]) | {"blockhash": blockhash},
+            spent_out(txidH, vout=0, spending_tx_id=tx4["txid"]),
+        ])
+
 
 if __name__ == '__main__':
     GetTxSpendingPrevoutTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_misc.py b/depend/bitcoin/test/functional/rpc_misc.py
index 86f22f00..55a78683 100755
--- a/depend/bitcoin/test/functional/rpc_misc.py
+++ b/depend/bitcoin/test/functional/rpc_misc.py
@@ -11,10 +11,9 @@
     assert_equal,
     assert_greater_than,
     assert_greater_than_or_equal,
+    JSONRPCException,
 )
 
-from test_framework.authproxy import JSONRPCException
-
 import http
 import subprocess
 
@@ -121,6 +120,19 @@ def run_test(self):
         # Specifying an unknown index name returns an empty result
         assert_equal(node.getindexinfo("foo"), {})
 
+        # Test a deprecated category
+        all_result = node.logging(include=['all'])
+        assert_equal(True, all(enabled is True for category, enabled in all_result.items()))
+        assert_equal(True, 'libevent' not in all_result)
+        assert_equal(all_result, node.logging())
+        libevent_warning = "The logging category `libevent` is deprecated"
+        with self.nodes[0].assert_debug_log([libevent_warning]):
+            assert_equal(all_result, node.logging(include=['libevent']))
+        assert_equal(all_result, node.logging())
+        with self.nodes[0].assert_debug_log([libevent_warning]):
+            assert_equal(all_result, node.logging(exclude=['libevent']))
+        assert_equal(all_result, node.logging())
+
 
 if __name__ == '__main__':
     RpcMiscTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_named_arguments.py b/depend/bitcoin/test/functional/rpc_named_arguments.py
index ce1bbda4..9f8248c8 100755
--- a/depend/bitcoin/test/functional/rpc_named_arguments.py
+++ b/depend/bitcoin/test/functional/rpc_named_arguments.py
@@ -10,10 +10,10 @@
     assert_raises_rpc_error,
 )
 
+
 class NamedArgumentTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
-        self.supports_cli = False
 
     def run_test(self):
         node = self.nodes[0]
@@ -25,14 +25,14 @@ def run_test(self):
         h = node.getblockhash(height=0)
         node.getblock(blockhash=h)
 
-        assert_equal(node.echo(), [])
-        assert_equal(node.echo(arg0=0,arg9=9), [0] + [None]*8 + [9])
-        assert_equal(node.echo(arg1=1), [None, 1])
-        assert_equal(node.echo(arg9=None), [None]*10)
-        assert_equal(node.echo(arg0=0,arg3=3,arg9=9), [0] + [None]*2 + [3] + [None]*5 + [9])
-        assert_equal(node.echo(0, 1, arg3=3, arg5=5), [0, 1, None, 3, None, 5])
-        assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echo, 0, 1, arg1=1)
-        assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echo, 0, None, 2, arg1=1)
+        assert_equal(node.echojson(), [])
+        assert_equal(node.echojson(arg0=0, arg9=9), [0] + [None] * 8 + [9])
+        assert_equal(node.echojson(arg1=1), [None, 1])
+        assert_equal(node.echojson(arg9=None), [] if self.options.usecli else [None] * 10)
+        assert_equal(node.echojson(arg0=0, arg3=3, arg9=9), [0] + [None] * 2 + [3] + [None] * 5 + [9])
+        assert_equal(node.echojson(0, 1, arg3=3, arg5=5), [0, 1, None, 3, None, 5])
+        assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echojson, 0, 1, arg1=1)
+        assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echojson, 0, None, 2, arg1=1)
 
 if __name__ == '__main__':
     NamedArgumentTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_net.py b/depend/bitcoin/test/functional/rpc_net.py
index 405d21fc..8d1bc244 100755
--- a/depend/bitcoin/test/functional/rpc_net.py
+++ b/depend/bitcoin/test/functional/rpc_net.py
@@ -202,7 +202,9 @@ def test_getnettotals(self):
         self.wait_until(lambda: (self.nodes[0].getnettotals()['totalbytesrecv'] >= net_totals_before['totalbytesrecv'] + ping_size * 2), timeout=1)
 
         for peer_before in peer_info_before:
-            peer_after = lambda: next(p for p in self.nodes[0].getpeerinfo() if p['id'] == peer_before['id'])
+            def peer_after():
+                return next(p for p in self.nodes[0].getpeerinfo() if p['id'] == peer_before['id'])
+
             self.wait_until(lambda: peer_after()['bytesrecv_per_msg'].get('pong', 0) >= peer_before['bytesrecv_per_msg'].get('pong', 0) + ping_size, timeout=1)
             self.wait_until(lambda: peer_after()['bytessent_per_msg'].get('ping', 0) >= peer_before['bytessent_per_msg'].get('ping', 0) + ping_size, timeout=1)
 
@@ -270,6 +272,11 @@ def test_addnode_getaddednodeinfo(self):
         assert_equal(added_nodes[0]['addednode'], "11.22.33.44")
         self.log.info("Check that an invalid command returns an error")
         assert_raises_rpc_error(-1, 'addnode "node" "command"', self.nodes[0].addnode, node=ip_port, command='abc')
+        self.log.info("Check that an empty node address returns an error")
+        for command in ['add', 'remove', 'onetry']:
+            assert_raises_rpc_error(-8, "Node address cannot be empty", self.nodes[0].addnode, node="", command=command)
+            assert_raises_rpc_error(-8, "Node address cannot be empty", self.nodes[0].addnode, node=" ", command=command)
+        assert_equal(len(self.nodes[0].getaddednodeinfo()), 1)
         self.log.info("Check that trying to remove the node again returns an error")
         assert_raises_rpc_error(-24, "Node could not be removed", self.nodes[0].addnode, node=ip_port, command='remove')
         self.log.info("Check that a non-existent node returns an error")
diff --git a/depend/bitcoin/test/functional/rpc_openrpc.py b/depend/bitcoin/test/functional/rpc_openrpc.py
new file mode 100755
index 00000000..32be191f
--- /dev/null
+++ b/depend/bitcoin/test/functional/rpc_openrpc.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# Copyright (c) 2026 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Check that getopenrpcinfo RPC is callable and serializable as valid json."""
+
+import json
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
+
+
+def find_method(openrpc, name):
+    return next(method for method in openrpc["methods"] if method["name"] == name)
+
+
+def find_param(method, name):
+    return next(param for param in method["params"] if param["name"] == name)
+
+
+class OpenRPCDocTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+
+    def run_test(self):
+        self.log.info("Calling getopenrpcinfo")
+        openrpc = self.nodes[0].getopenrpcinfo()
+        json.dumps(openrpc)
+        assert_equal(openrpc["openrpc"], "1.4.1")
+        assert_equal(type(openrpc["openrpc"]).__name__, "str")
+        assert_equal(type(openrpc["info"]).__name__, "dict")
+        assert_equal(type(openrpc["methods"]).__name__, "list")
+
+        self.log.info("Calling rpc.discover")
+        if self.options.usecli:
+            discovered = self.nodes[0].cli("rpc.discover").send_cli()
+        else:
+            discovered = self.nodes[0].rpc.discover()
+        assert_equal(discovered, openrpc)
+        rpc_discover = find_method(discovered, "rpc.discover")
+        assert_equal(rpc_discover["params"], [])
+
+        stop = find_method(openrpc, "stop")
+        assert "wait" not in [param["name"] for param in stop["params"]]
+
+        self.log.info("Calling getopenrpcinfo with hidden commands")
+        openrpc_with_hidden = self.nodes[0].getopenrpcinfo(True)
+        stop_with_hidden = find_method(openrpc_with_hidden, "stop")
+        wait = find_param(stop_with_hidden, "wait")
+        assert_equal(wait["schema"]["type"], "number")
+
+        self.log.info("Checking type_str override schemas")
+        getblockstats = find_method(openrpc, "getblockstats")
+        hash_or_height = find_param(getblockstats, "hash_or_height")
+        assert_equal(hash_or_height["schema"], {"oneOf": [{"type": "integer"}, {"type": "string"}]})
+
+        self.log.info("Checking fixed-length array schemas")
+        deriveaddresses = find_method(openrpc, "deriveaddresses")
+        range_array = find_param(deriveaddresses, "range")["schema"]["oneOf"][1]
+        assert_equal(range_array, {
+            "type": "array",
+            "items": [{"type": "number"}, {"type": "number"}],
+            "additionalItems": False,
+            "minItems": 2,
+            "maxItems": 2,
+        })
+
+        feerate_percentiles = getblockstats["result"]["schema"]["properties"]["feerate_percentiles"]
+        assert_equal(feerate_percentiles["type"], "array")
+        assert_equal(feerate_percentiles["items"], [{"type": "number"}] * 5)
+        assert_equal(feerate_percentiles["additionalItems"], False)
+        assert_equal(feerate_percentiles["minItems"], 5)
+        assert_equal(feerate_percentiles["maxItems"], 5)
+
+        self.log.info("Checking relaxed schemas for unchecked RPC types")
+        createrawtransaction = find_method(openrpc, "createrawtransaction")
+        outputs = find_param(createrawtransaction, "outputs")
+        address_description = "A key-value pair. The key (string) is the bitcoin address, the value (float or string) is the amount in BTC"
+        address_obj = {"type": "object", "additionalProperties": {"oneOf": [{"type": "number"},{"type": "string"}]}, "description": address_description}
+        data_description = "A key-value pair. The key must be \"data\", the value is hex-encoded data that becomes a part of an OP_RETURN output"
+        data_obj = {"type": "object", "properties": { "data": {"type": "string", "pattern": "^[0-9a-fA-F]+$", "description": data_description}}, "additionalProperties": False, "required": ["data"]}
+        assert_equal(outputs["schema"], {"oneOf": [{"type": "array", "items": {"anyOf": [address_obj, data_obj]}}, {"type": "object"}]})
+
+        getdescriptoractivity = find_method(openrpc, "getdescriptoractivity")
+        activity = getdescriptoractivity["result"]["schema"]["properties"]["activity"]
+        assert_equal(activity["type"], "array")
+
+        if "getwalletinfo" in [method["name"] for method in openrpc["methods"]]:
+            getwalletinfo = find_method(openrpc, "getwalletinfo")
+            scanning = getwalletinfo["result"]["schema"]["properties"]["scanning"]
+            assert_equal(scanning["oneOf"][0]["type"], "object")
+            assert_equal(scanning["oneOf"][1], {"const": False})
+
+        self.log.info("Checking argument fallback annotations")
+        getblock = find_method(openrpc, "getblock")
+        verbosity = find_param(getblock, "verbosity")
+        assert_equal(verbosity["schema"]["default"], 1)
+        stats = find_param(getblockstats, "stats")
+        assert_equal(stats["schema"]["x-bitcoin-default-hint"], "all values")
+
+        self.log.info("Checking numeric amount result annotations")
+        analyzepsbt = find_method(openrpc, "analyzepsbt")
+        result_schema = analyzepsbt["result"]["schema"]
+        estimated_feerate = result_schema["properties"]["estimated_feerate"]
+        assert_equal(estimated_feerate["type"], "number")
+        assert_equal(estimated_feerate["x-bitcoin-unit"], "amount")
+
+
+if __name__ == "__main__":
+    OpenRPCDocTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_packages.py b/depend/bitcoin/test/functional/rpc_packages.py
index 12e08621..647d16df 100755
--- a/depend/bitcoin/test/functional/rpc_packages.py
+++ b/depend/bitcoin/test/functional/rpc_packages.py
@@ -302,6 +302,7 @@ def test_rbf(self):
         assert_equal(testres_replaceable["wtxid"], replaceable_tx["wtxid"])
         assert testres_replaceable["allowed"]
         assert_equal(testres_replaceable["vsize"], replaceable_tx["tx"].get_vsize())
+        assert_equal(testres_replaceable["vsize_bip141"], replaceable_tx["tx"].get_vsize())
         assert_equal(testres_replaceable["fees"]["base"], fee)
         assert_fee_amount(fee, replaceable_tx["tx"].get_vsize(), testres_replaceable["fees"]["effective-feerate"])
         assert_equal(testres_replaceable["fees"]["effective-includes"], [replaceable_tx["wtxid"]])
@@ -339,9 +340,11 @@ def assert_equal_package_results(self, node, testmempoolaccept_result, submitpac
             # No "allowed" if the tx was already in the mempool
             if "allowed" in testres_tx and testres_tx["allowed"]:
                 assert_equal(submitres_tx["vsize"], testres_tx["vsize"])
+                assert_equal(submitres_tx["vsize_bip141"], testres_tx["vsize"])
                 assert_equal(submitres_tx["fees"]["base"], testres_tx["fees"]["base"])
             entry_info = node.getmempoolentry(submitres_tx["txid"])
             assert_equal(submitres_tx["vsize"], entry_info["vsize"])
+            assert_equal(submitres_tx["vsize_bip141"], entry_info["vsize"])
             assert_equal(submitres_tx["fees"]["base"], entry_info["fees"]["base"])
 
     def test_submit_child_with_parents(self, num_parents, partial_submit):
@@ -371,7 +374,9 @@ def test_submit_child_with_parents(self, num_parents, partial_submit):
             assert wtxid in submitpackage_result["tx-results"]
             tx_result = submitpackage_result["tx-results"][wtxid]
             assert_equal(tx_result["txid"], tx.txid_hex)
+            assert_equal(tx_result["vsize_adjusted"], tx.get_vsize())
             assert_equal(tx_result["vsize"], tx.get_vsize())
+            assert_equal(tx_result["vsize_bip141"], tx.get_vsize())
             assert_equal(tx_result["fees"]["base"], DEFAULT_FEE)
             if wtxid not in presubmitted_wtxids:
                 assert_fee_amount(DEFAULT_FEE, tx.get_vsize(), tx_result["fees"]["effective-feerate"])
diff --git a/depend/bitcoin/test/functional/rpc_psbt.py b/depend/bitcoin/test/functional/rpc_psbt.py
index 6b1bc414..b107dd05 100755
--- a/depend/bitcoin/test/functional/rpc_psbt.py
+++ b/depend/bitcoin/test/functional/rpc_psbt.py
@@ -20,11 +20,14 @@
     CTxOut,
     MAX_BIP125_RBF_SEQUENCE,
     WITNESS_SCALE_FACTOR,
+    ser_compact_size,
 )
 from test_framework.psbt import (
     PSBT,
     PSBTMap,
+    PSBT_GLOBAL_PROPRIETARY,
     PSBT_GLOBAL_UNSIGNED_TX,
+    PSBT_GLOBAL_VERSION,
     PSBT_IN_RIPEMD160,
     PSBT_IN_SHA256,
     PSBT_IN_SIGHASH_TYPE,
@@ -34,9 +37,13 @@
     PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS,
     PSBT_IN_MUSIG2_PUB_NONCE,
     PSBT_IN_NON_WITNESS_UTXO,
+    PSBT_IN_PROPRIETARY,
     PSBT_IN_WITNESS_UTXO,
+    PSBT_IN_FINAL_SCRIPTWITNESS,
     PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS,
+    PSBT_OUT_PROPRIETARY,
     PSBT_OUT_TAP_TREE,
+    PSBT_OUT_SCRIPT,
 )
 from test_framework.script import CScript, OP_TRUE, SIGHASH_ALL, SIGHASH_ANYONECANPAY
 from test_framework.script_util import MIN_STANDARD_TX_NONWITNESS_SIZE
@@ -50,6 +57,7 @@
     assert_raises_rpc_error,
     find_vout_for_address,
     wallet_importprivkey,
+    bitflipper
 )
 from test_framework.wallet_util import (
     calculate_input_weight,
@@ -65,8 +73,8 @@ 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=0", "-changetype=legacy"],
+            [],
+            ["-changetype=legacy"],
             []
         ]
         # whitelist peers to speed up tx relay / mempool sync
@@ -76,6 +84,26 @@ def set_test_params(self):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
+    @staticmethod
+    def create_psbt(inputs=None, outputs=None):
+        if inputs is None:
+            inputs = {}
+        if outputs is None:
+            outputs = {}
+        tx = CTransaction()
+        tx.vin = [CTxIn(outpoint=COutPoint(hash=0, n=0))]
+        tx.vout = [CTxOut(nValue=1, scriptPubKey=CScript([OP_TRUE]))]
+
+        # https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki#specification
+        psbt = PSBT()
+        # global map
+        psbt.g = PSBTMap({PSBT_GLOBAL_UNSIGNED_TX: tx.serialize()})
+        # input map
+        psbt.i = [PSBTMap(inputs)]
+        # output map
+        psbt.o = [PSBTMap(outputs)]
+        return psbt
+
     def test_psbt_incomplete_after_invalid_modification(self):
         self.log.info("Check that PSBT is correctly marked as incomplete after invalid modification")
         node = self.nodes[2]
@@ -90,9 +118,7 @@ def test_psbt_incomplete_after_invalid_modification(self):
 
         # Modify the raw transaction by changing the output address, so the signature is no longer valid
         signed_psbt_obj = PSBT.from_base64(signed_psbt)
-        substitute_addr = wallet.getnewaddress()
-        raw = wallet.createrawtransaction([{"txid": utxos[0]["txid"], "vout": utxos[0]["vout"]}], [{substitute_addr: 0.9999}])
-        signed_psbt_obj.g.map[PSBT_GLOBAL_UNSIGNED_TX] = bytes.fromhex(raw)
+        signed_psbt_obj.o[0].map[PSBT_OUT_SCRIPT] = CScript([OP_TRUE])
 
         # Check that the walletprocesspsbt call succeeds but also recognizes that the transaction is not complete
         signed_psbt_incomplete = wallet.walletprocesspsbt(psbt=signed_psbt_obj.to_base64(), finalize=False)
@@ -165,11 +191,11 @@ def test_input_confs_control(self):
         psbtx1 = wallet.walletcreatefundedpsbt([], {target_address: 0.1}, 0, {'fee_rate': 1, 'maxconf': 0})['psbt']
 
         # Make sure we only had the one input
-        tx1_inputs = self.nodes[0].decodepsbt(psbtx1)['tx']['vin']
+        tx1_inputs = self.nodes[0].decodepsbt(psbtx1)['inputs']
         assert_equal(len(tx1_inputs), 1)
 
         utxo1 = tx1_inputs[0]
-        assert_equal(unconfirmed_txid, utxo1['txid'])
+        assert_equal(unconfirmed_txid, utxo1['previous_txid'])
 
         signed_tx1 = wallet.walletprocesspsbt(psbtx1)
         txid1 = self.nodes[0].sendrawtransaction(signed_tx1['hex'])
@@ -178,23 +204,23 @@ def test_input_confs_control(self):
         assert txid1 in mempool
 
         self.log.info("Fail to craft a new PSBT that sends more funds with add_inputs = False")
-        assert_raises_rpc_error(-4, "The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually", wallet.walletcreatefundedpsbt, [{'txid': utxo1['txid'], 'vout': utxo1['vout']}], {target_address: 1}, 0, {'add_inputs': False})
+        assert_raises_rpc_error(-4, "The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually", wallet.walletcreatefundedpsbt, [{'txid': utxo1['previous_txid'], 'vout': utxo1['previous_vout']}], {target_address: 1}, 0, {'add_inputs': False})
 
         self.log.info("Fail to craft a new PSBT with minconf above highest one")
-        assert_raises_rpc_error(-4, "Insufficient funds", wallet.walletcreatefundedpsbt, [{'txid': utxo1['txid'], 'vout': utxo1['vout']}], {target_address: 1}, 0, {'add_inputs': True, 'minconf': 3, 'fee_rate': 10})
+        assert_raises_rpc_error(-4, "Insufficient funds", wallet.walletcreatefundedpsbt, [{'txid': utxo1['previous_txid'], 'vout': utxo1['previous_vout']}], {target_address: 1}, 0, {'add_inputs': True, 'minconf': 3, 'fee_rate': 10})
 
         self.log.info("Fail to broadcast a new PSBT with maxconf 0 due to BIP125 rules to verify it actually chose unconfirmed outputs")
-        psbt_invalid = wallet.walletcreatefundedpsbt([{'txid': utxo1['txid'], 'vout': utxo1['vout']}], {target_address: 1}, 0, {'add_inputs': True, 'maxconf': 0, 'fee_rate': 10})['psbt']
+        psbt_invalid = wallet.walletcreatefundedpsbt([{'txid': utxo1['previous_txid'], 'vout': utxo1['previous_vout']}], {target_address: 1}, 0, {'add_inputs': True, 'maxconf': 0, 'fee_rate': 10})['psbt']
         signed_invalid = wallet.walletprocesspsbt(psbt_invalid)
         assert_raises_rpc_error(-26, "bad-txns-spends-conflicting-tx", self.nodes[0].sendrawtransaction, signed_invalid['hex'])
 
         self.log.info("Craft a replacement adding inputs with highest confs possible")
-        psbtx2 = wallet.walletcreatefundedpsbt([{'txid': utxo1['txid'], 'vout': utxo1['vout']}], {target_address: 1}, 0, {'add_inputs': True, 'minconf': 2, 'fee_rate': 10})['psbt']
-        tx2_inputs = self.nodes[0].decodepsbt(psbtx2)['tx']['vin']
+        psbtx2 = wallet.walletcreatefundedpsbt([{'txid': utxo1['previous_txid'], 'vout': utxo1['previous_vout']}], {target_address: 1}, 0, {'add_inputs': True, 'minconf': 2, 'fee_rate': 10})['psbt']
+        tx2_inputs = self.nodes[0].decodepsbt(psbtx2)['inputs']
         assert_greater_than_or_equal(len(tx2_inputs), 2)
         for vin in tx2_inputs:
-            if vin['txid'] != unconfirmed_txid:
-                assert_greater_than_or_equal(self.nodes[0].gettxout(vin['txid'], vin['vout'])['confirmations'], 2)
+            if vin['previous_txid'] != unconfirmed_txid:
+                assert_greater_than_or_equal(self.nodes[0].gettxout(vin['previous_txid'], vin['previous_vout'])['confirmations'], 2)
 
         signed_tx2 = wallet.walletprocesspsbt(psbtx2)
         txid2 = self.nodes[0].sendrawtransaction(signed_tx2['hex'])
@@ -274,6 +300,65 @@ def test_decodepsbt_musig2_input_output_types(self):
         assert "participant_pubkeys" in out_participant_pks
         assert_equal(out_participant_pks["participant_pubkeys"], [out_pubkey1.hex(), out_pubkey2.hex()])
 
+    def test_combinepsbt_preserves_proprietary_fields(self):
+        self.log.info("Test that combining PSBTs preserves proprietary fields")
+
+        def proprietary_key(type_byte, identifier, subtype, key_data=b""):
+            return bytes([type_byte]) + ser_compact_size(len(identifier)) + identifier + ser_compact_size(subtype) + key_data
+
+        def proprietary_entry(key, value, identifier, subtype):
+            return {"identifier": identifier.hex(), "subtype": subtype, "key": key.hex(), "value": value.hex()}
+
+        tx = CTransaction()
+        tx.vin = [CTxIn(outpoint=COutPoint(hash=int('aa' * 32, 16), n=0), scriptSig=b"")]
+        tx.vout = [CTxOut(nValue=0, scriptPubKey=b"")]
+
+        global_key_a = proprietary_key(type_byte=PSBT_GLOBAL_PROPRIETARY, identifier=b"gc", subtype=1, key_data=b"\x01")
+        global_key_b = proprietary_key(type_byte=PSBT_GLOBAL_PROPRIETARY, identifier=b"gc", subtype=2, key_data=b"\x02")
+        input_key_a = proprietary_key(type_byte=PSBT_IN_PROPRIETARY, identifier=b"in", subtype=3, key_data=b"\x03")
+        input_key_b = proprietary_key(type_byte=PSBT_IN_PROPRIETARY, identifier=b"in", subtype=4, key_data=b"\x04")
+        output_key_a = proprietary_key(type_byte=PSBT_OUT_PROPRIETARY, identifier=b"out", subtype=5, key_data=b"\x05")
+        output_key_b = proprietary_key(type_byte=PSBT_OUT_PROPRIETARY, identifier=b"out", subtype=6, key_data=b"\x06")
+
+        psbt1 = PSBT(
+            g=PSBTMap({
+                PSBT_GLOBAL_UNSIGNED_TX: tx.serialize(),
+                global_key_a: b"\xaa",
+            }),
+            i=[PSBTMap({
+                input_key_a: b"\xbb",
+            })],
+            o=[PSBTMap({
+                output_key_a: b"\xcc",
+            })],
+        ).to_base64()
+        psbt2 = PSBT(
+            g=PSBTMap({
+                PSBT_GLOBAL_UNSIGNED_TX: tx.serialize(),
+                global_key_b: b"\xdd",
+            }),
+            i=[PSBTMap({
+                input_key_b: b"\xee",
+            })],
+            o=[PSBTMap({
+                output_key_b: b"\xff",
+            })],
+        ).to_base64()
+
+        decoded = self.nodes[0].decodepsbt(self.nodes[0].combinepsbt([psbt1, psbt2]))
+        assert_equal(decoded["proprietary"], [
+            proprietary_entry(key=global_key_a, value=b"\xaa", identifier=b"gc", subtype=1),
+            proprietary_entry(key=global_key_b, value=b"\xdd", identifier=b"gc", subtype=2),
+        ])
+        assert_equal(decoded["inputs"][0]["proprietary"], [
+            proprietary_entry(key=input_key_a, value=b"\xbb", identifier=b"in", subtype=3),
+            proprietary_entry(key=input_key_b, value=b"\xee", identifier=b"in", subtype=4),
+        ])
+        assert_equal(decoded["outputs"][0]["proprietary"], [
+            proprietary_entry(key=output_key_a, value=b"\xcc", identifier=b"out", subtype=5),
+            proprietary_entry(key=output_key_b, value=b"\xff", identifier=b"out", subtype=6),
+        ])
+
     def test_sighash_mismatch(self):
         self.log.info("Test sighash type mismatches")
         self.nodes[0].createwallet("sighash_mismatch")
@@ -367,7 +452,7 @@ def assert_change_type(self, psbtx, expected_type):
         # The decodepsbt RPC is stateless and independent of any settings, we can always just call it on the first node
         decoded_psbt = self.nodes[0].decodepsbt(psbtx["psbt"])
         changepos = psbtx["changepos"]
-        assert_equal(decoded_psbt["tx"]["vout"][changepos]["scriptPubKey"]["type"], expected_type)
+        assert_equal(decoded_psbt["outputs"][changepos]["script"]["type"], expected_type)
 
     def test_psbt_named_parameter_handling(self):
         """Test that PSBT Base64 parameters with '=' padding are handled correctly in -named mode"""
@@ -406,6 +491,90 @@ def test_psbt_named_parameter_handling(self):
 
         self.log.info("PSBT parameter handling test completed successfully")
 
+    def test_psbt_roundtrip(self):
+        self.log.info("Test that PSBTs roundtrip when RPC does nothing")
+        utxo = self.nodes[0].listunspent()[0]
+        for ver in [0, 2]:
+            psbt = self.nodes[0].walletcreatefundedpsbt(inputs=[utxo], outputs=[{self.nodes[0].getnewaddress(): utxo["amount"] / 2}], psbt_version=ver)["psbt"]
+
+            rt_psbts = [
+                self.nodes[0].combinepsbt([psbt, psbt]),
+                self.nodes[0].finalizepsbt(psbt)["psbt"],
+                self.nodes[0].utxoupdatepsbt(psbt),
+                self.nodes[0].descriptorprocesspsbt(psbt, [])["psbt"],
+                self.nodes[0].walletprocesspsbt(psbt, sign=False)["psbt"],
+            ]
+            for p in rt_psbts:
+                assert_equal(psbt, p)
+
+    def test_psbt_version(self):
+        tobump = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        utxo = self.nodes[0].listunspent()[0]
+        outputs = [{self.nodes[0].getnewaddress(): utxo["amount"] / 2}]
+        rawtx = self.nodes[0].createrawtransaction(inputs=[utxo], outputs=outputs)
+        for ver in [0, 2]:
+            psbt = self.nodes[0].createpsbt(inputs=[utxo], outputs=outputs, psbt_version=ver)
+            dec = self.nodes[0].decodepsbt(psbt)
+            assert_equal(ver, dec["psbt_version"])
+
+            psbt = self.nodes[0].walletcreatefundedpsbt(inputs=[utxo], outputs=outputs, psbt_version=ver)
+            dec = self.nodes[0].decodepsbt(psbt["psbt"])
+            assert_equal(ver, dec["psbt_version"])
+
+            psbt = self.nodes[0].converttopsbt(hexstring=rawtx, psbt_version=ver)
+            dec = self.nodes[0].decodepsbt(psbt)
+            assert_equal(ver, dec["psbt_version"])
+
+            psbt = self.nodes[0].psbtbumpfee(txid=tobump, psbt_version=ver)
+            dec = self.nodes[0].decodepsbt(psbt["psbt"])
+            assert_equal(ver, dec["psbt_version"])
+
+        assert_raises_rpc_error(-8, "The PSBT version can only be 2 or 0", self.nodes[0].createpsbt, inputs=[utxo], outputs=outputs, psbt_version=1)
+        assert_raises_rpc_error(-8, "The PSBT version can only be 2 or 0", self.nodes[0].walletcreatefundedpsbt, inputs=[utxo], outputs=outputs, psbt_version=1)
+        assert_raises_rpc_error(-8, "The PSBT version can only be 2 or 0", self.nodes[0].converttopsbt, hexstring=rawtx, psbt_version=1)
+        assert_raises_rpc_error(-8, "The PSBT version can only be 2 or 0", self.nodes[0].psbtbumpfee, txid=tobump, psbt_version=1)
+
+    def test_psbt_with_invalid_signature(self):
+        self.log.info("Test descriptorprocesspsbt with invalid signature in signed PSBT")
+
+        def_wallet = self.nodes[0].get_wallet_rpc(self.default_wallet_name)
+        outputs = [{def_wallet.getnewaddress(address_type="bech32m"): 1}]
+        def_wallet.send(outputs)
+        self.generate(self.nodes[0], 1)
+
+        utxos = [utxo for utxo in def_wallet.listunspent() if utxo["desc"].startswith("tr")]
+        unsigned_psbt = def_wallet.walletcreatefundedpsbt(utxos, [{def_wallet.getnewaddress(): 0.5}])["psbt"]
+        descs = [desc for desc in def_wallet.listdescriptors(True)["descriptors"] if desc["desc"].startswith("tr")]
+
+        # Unload the wallet to avoid using wallet RPC internals in descriptorprocesspsbt.
+        def_wallet.unloadwallet()
+
+        result = self.nodes[0].descriptorprocesspsbt(psbt=unsigned_psbt, descriptors=descs, finalize=True)
+        assert_equal(result["complete"], True)
+        assert_equal("hex" in result, True)
+
+        valid_sig_psbt = result["psbt"]
+        flawed_psbt = PSBT.from_base64(valid_sig_psbt)
+        valid_witness = flawed_psbt.i[0].map.get(PSBT_IN_FINAL_SCRIPTWITNESS)
+        # The witness format is [num_items: CompactSize] [item1_len: CompactSize] [item1_data] ...
+        # For taproot key-path spend [0x01] [0x40 or 0x41] [64 or 65 byte signature].
+        # Skip the first 2 prefix bytes and flip a bit in the signature bytes only.
+        assert_equal(valid_witness[0], 1)
+        prefix = valid_witness[:2]
+        sig_len = valid_witness[1]
+        signature = valid_witness[2:2 + sig_len]
+        invalid_sig = bitflipper(signature)
+        invalid_witness = prefix + invalid_sig + valid_witness[2 + sig_len:]
+        flawed_psbt.i[0].map[PSBT_IN_FINAL_SCRIPTWITNESS] = invalid_witness
+        invalid_sig_psbt = flawed_psbt.to_base64()
+
+        result = self.nodes[0].descriptorprocesspsbt(psbt=invalid_sig_psbt, descriptors=descs, finalize=True)
+        assert_equal(result["complete"], False)
+        assert_equal("hex" in result, False)
+
+        # Load the default wallet back for later test cases.
+        self.nodes[0].loadwallet(self.default_wallet_name)
+
     def run_test(self):
         # Create and fund a raw tx for sending 10 BTC
         psbtx1 = self.nodes[0].walletcreatefundedpsbt([], {self.nodes[2].getnewaddress():10})['psbt']
@@ -446,7 +615,9 @@ def run_test(self):
 
         max_tx_weight_sufficient = 1000 # 1k vbytes is enough
         psbt = self.nodes[0].walletcreatefundedpsbt(outputs=dest_arg,locktime=0, options={"max_tx_weight": max_tx_weight_sufficient})["psbt"]
-        weight = self.nodes[0].decodepsbt(psbt)["tx"]["weight"]
+        psbt = self.nodes[0].walletprocesspsbt(psbt)["psbt"]
+        final_tx = self.nodes[0].finalizepsbt(psbt)["hex"]
+        weight = self.nodes[0].decoderawtransaction(final_tx)["weight"]
         # ensure the transaction's weight is below the specified max_tx_weight.
         assert_greater_than_or_equal(max_tx_weight_sufficient, weight)
 
@@ -457,7 +628,7 @@ def run_test(self):
                                 self.nodes[0].walletcreatefundedpsbt, [{"txid": utxo1['txid'], "vout": utxo1['vout']}], {self.nodes[2].getnewaddress():90})
 
         psbtx1 = self.nodes[0].walletcreatefundedpsbt([{"txid": utxo1['txid'], "vout": utxo1['vout']}], {self.nodes[2].getnewaddress():90}, 0, {"add_inputs": True})['psbt']
-        assert_equal(len(self.nodes[0].decodepsbt(psbtx1)['tx']['vin']), 2)
+        assert_equal(len(self.nodes[0].decodepsbt(psbtx1)['inputs']), 2)
 
         # Inputs argument can be null
         self.nodes[0].walletcreatefundedpsbt(None, {self.nodes[2].getnewaddress():10})
@@ -697,15 +868,20 @@ def run_test(self):
         # Create a psbt spending outputs from nodes 1 and 2
         psbt_orig = self.nodes[0].createpsbt([utxo1, utxo2], {self.nodes[0].getnewaddress():25.999})
 
+        # Check that the default psbt version is 2
+        assert_equal(self.nodes[0].decodepsbt(psbt_orig)["psbt_version"], 2)
+
         # Update psbts, should only have data for one input and not the other
         psbt1 = self.nodes[1].walletprocesspsbt(psbt_orig, False, "ALL")['psbt']
         psbt1_decoded = self.nodes[0].decodepsbt(psbt1)
-        assert psbt1_decoded['inputs'][0] and not psbt1_decoded['inputs'][1]
+        assert len(psbt1_decoded['inputs'][0].keys()) > 3
+        assert len(psbt1_decoded['inputs'][1].keys()) == 3
         # Check that BIP32 path was added
         assert "bip32_derivs" in psbt1_decoded['inputs'][0]
         psbt2 = self.nodes[2].walletprocesspsbt(psbt_orig, False, "ALL", False)['psbt']
         psbt2_decoded = self.nodes[0].decodepsbt(psbt2)
-        assert not psbt2_decoded['inputs'][0] and psbt2_decoded['inputs'][1]
+        assert len(psbt2_decoded['inputs'][0].keys()) == 3
+        assert len(psbt2_decoded['inputs'][1].keys()) > 3
         # Check that BIP32 paths were not added
         assert "bip32_derivs" not in psbt2_decoded['inputs'][1]
 
@@ -727,34 +903,26 @@ def run_test(self):
         unspent = self.nodes[0].listunspent()[0]
         psbtx_info = self.nodes[0].walletcreatefundedpsbt([{"txid":unspent["txid"], "vout":unspent["vout"]}], [{self.nodes[2].getnewaddress():unspent["amount"]+1}], block_height+2, {"replaceable": False, "add_inputs": True}, False)
         decoded_psbt = self.nodes[0].decodepsbt(psbtx_info["psbt"])
-        for tx_in, psbt_in in zip(decoded_psbt["tx"]["vin"], decoded_psbt["inputs"]):
-            assert_greater_than(tx_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
+        for psbt_in in decoded_psbt["inputs"]:
+            assert_greater_than(psbt_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
             assert "bip32_derivs" not in psbt_in
-        assert_equal(decoded_psbt["tx"]["locktime"], block_height+2)
+        assert_equal(decoded_psbt["fallback_locktime"], block_height+2)
 
         # Same construction with only locktime set and RBF explicitly enabled
         psbtx_info = self.nodes[0].walletcreatefundedpsbt([{"txid":unspent["txid"], "vout":unspent["vout"]}], [{self.nodes[2].getnewaddress():unspent["amount"]+1}], block_height, {"replaceable": True, "add_inputs": True}, True)
         decoded_psbt = self.nodes[0].decodepsbt(psbtx_info["psbt"])
-        for tx_in, psbt_in in zip(decoded_psbt["tx"]["vin"], decoded_psbt["inputs"]):
-            assert_equal(tx_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
+        for psbt_in in decoded_psbt["inputs"]:
+            assert_equal(psbt_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
             assert "bip32_derivs" in psbt_in
-        assert_equal(decoded_psbt["tx"]["locktime"], block_height)
+        assert_equal(decoded_psbt["fallback_locktime"], block_height)
 
         # Same construction without optional arguments
         psbtx_info = self.nodes[0].walletcreatefundedpsbt([], [{self.nodes[2].getnewaddress():unspent["amount"]+1}])
         decoded_psbt = self.nodes[0].decodepsbt(psbtx_info["psbt"])
-        for tx_in, psbt_in in zip(decoded_psbt["tx"]["vin"], decoded_psbt["inputs"]):
-            assert_equal(tx_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
-            assert "bip32_derivs" in psbt_in
-        assert_equal(decoded_psbt["tx"]["locktime"], 0)
-
-        # Same construction without optional arguments, for a node with -walletrbf=0
-        unspent1 = self.nodes[1].listunspent()[0]
-        psbtx_info = self.nodes[1].walletcreatefundedpsbt([{"txid":unspent1["txid"], "vout":unspent1["vout"]}], [{self.nodes[2].getnewaddress():unspent1["amount"]+1}], block_height, {"add_inputs": True})
-        decoded_psbt = self.nodes[1].decodepsbt(psbtx_info["psbt"])
-        for tx_in, psbt_in in zip(decoded_psbt["tx"]["vin"], decoded_psbt["inputs"]):
-            assert_greater_than(tx_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
+        for psbt_in in decoded_psbt["inputs"]:
+            assert_equal(psbt_in["sequence"], MAX_BIP125_RBF_SEQUENCE)
             assert "bip32_derivs" in psbt_in
+        assert_equal(decoded_psbt["fallback_locktime"], 0)
 
         # Make sure change address wallet does not have P2SH innerscript access to results in success
         # when attempting BnB coin selection
@@ -791,13 +959,33 @@ def run_test(self):
         assert_raises_rpc_error(-4, "Insufficient funds", wunsafe.walletcreatefundedpsbt, [], [{self.nodes[0].getnewaddress(): 1}])
         wunsafe.walletcreatefundedpsbt([], [{self.nodes[0].getnewaddress(): 1}], 0, {"include_unsafe": True})
 
-        # BIP 174 Test Vectors
+        self.log.info("Test that unknown values are just passed through")
+        unknown_type = b'\xf0'
+        unknown_key = unknown_type + bytes(range(1, 10))
+        unknown_value = bytes(range(1, 16))
 
-        # Check that unknown values are just passed through
-        unknown_psbt = "cHNidP8BAD8CAAAAAf//////////////////////////////////////////AAAAAAD/////AQAAAAAAAAAAA2oBAAAAAAAACg8BAgMEBQYHCAkPAQIDBAUGBwgJCgsMDQ4PAAA="
+        unknown_psbt = self.create_psbt(inputs={unknown_key: unknown_value}).to_base64()
         unknown_out = self.nodes[0].walletprocesspsbt(unknown_psbt)['psbt']
         assert_equal(unknown_psbt, unknown_out)
 
+        unknown_key2 = unknown_type + bytes(range(1, 9)) + bytes(11)
+        unknown_psbt2 = self.create_psbt(inputs={unknown_key2: unknown_value}).to_base64()
+        merged_unknown = self.nodes[0].combinepsbt([unknown_psbt, unknown_psbt2])
+        merged_unknown_psbt = PSBT.from_base64(merged_unknown)
+        assert_equal(merged_unknown_psbt.i[0].map[unknown_key], unknown_value)
+        assert_equal(merged_unknown_psbt.i[0].map[unknown_key2], unknown_value)
+
+        # The explicit PSBT_GLOBAL_VERSION=0 encoding is equivalent to omitting the
+        # version field, and both accepted v0 encodings can be merged.
+        explicit_v0_psbt = self.create_psbt(inputs={unknown_key2: unknown_value})
+        explicit_v0_psbt.g.map[PSBT_GLOBAL_VERSION] = (0).to_bytes(4, "little")
+        merged_v0_versions = self.nodes[0].combinepsbt([unknown_psbt, explicit_v0_psbt.to_base64()])
+        merged_v0_versions_psbt = PSBT.from_base64(merged_v0_versions)
+        assert_equal(merged_v0_versions_psbt.i[0].map[unknown_key], unknown_value)
+        assert_equal(merged_v0_versions_psbt.i[0].map[unknown_key2], unknown_value)
+
+        # BIP 174 Test Vectors
+
         # Open the data file
         with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data/rpc_psbt.json')) as f:
             d = json.load(f)
@@ -823,7 +1011,7 @@ def run_test(self):
 
         # Creator Tests
         for creator in creators:
-            created_tx = self.nodes[0].createpsbt(inputs=creator['inputs'], outputs=creator['outputs'], replaceable=False)
+            created_tx = self.nodes[0].createpsbt(inputs=creator['inputs'], outputs=creator['outputs'], replaceable=False, psbt_version=creator['version'])
             assert_equal(created_tx, creator['result'])
 
         # Signer tests
@@ -877,46 +1065,55 @@ def run_test(self):
         utxo1, utxo2, utxo3 = self.create_outpoints(self.nodes[1], outputs=[{addr1: 11}, {addr2: 11}, {addr3: 11}])
         self.sync_all()
 
+        psbt_v2_required_keys = ["previous_txid", "previous_vout", "sequence"]
+
         def test_psbt_input_keys(psbt_input, keys):
             """Check that the psbt input has only the expected keys."""
+            keys.extend(["previous_txid", "previous_vout", "sequence"])
             assert_equal(set(keys), set(psbt_input.keys()))
 
         # Create a PSBT. None of the inputs are filled initially
         psbt = self.nodes[1].createpsbt([utxo1, utxo2, utxo3], {self.nodes[0].getnewaddress():32.999})
         decoded = self.nodes[1].decodepsbt(psbt)
-        test_psbt_input_keys(decoded['inputs'][0], [])
-        test_psbt_input_keys(decoded['inputs'][1], [])
-        test_psbt_input_keys(decoded['inputs'][2], [])
+        test_psbt_input_keys(decoded['inputs'][0], psbt_v2_required_keys)
+        test_psbt_input_keys(decoded['inputs'][1], psbt_v2_required_keys)
+        test_psbt_input_keys(decoded['inputs'][2], psbt_v2_required_keys)
 
         # Update a PSBT with UTXOs from the node
         # Bech32 inputs should be filled with witness UTXO. Other inputs should not be filled because they are non-witness
         updated = self.nodes[1].utxoupdatepsbt(psbt)
         decoded = self.nodes[1].decodepsbt(updated)
-        test_psbt_input_keys(decoded['inputs'][0], ['witness_utxo', 'non_witness_utxo'])
-        test_psbt_input_keys(decoded['inputs'][1], ['non_witness_utxo'])
-        test_psbt_input_keys(decoded['inputs'][2], ['non_witness_utxo'])
+        test_psbt_input_keys(decoded['inputs'][0], psbt_v2_required_keys + ['witness_utxo', 'non_witness_utxo'])
+        test_psbt_input_keys(decoded['inputs'][1], psbt_v2_required_keys + ['non_witness_utxo'])
+        test_psbt_input_keys(decoded['inputs'][2], psbt_v2_required_keys + ['non_witness_utxo'])
 
         # Try again, now while providing descriptors, making P2SH-segwit work, and causing bip32_derivs and redeem_script to be filled in
         descs = [self.nodes[1].getaddressinfo(addr)['desc'] for addr in [addr1,addr2,addr3]]
         updated = self.nodes[1].utxoupdatepsbt(psbt=psbt, descriptors=descs)
         decoded = self.nodes[1].decodepsbt(updated)
-        test_psbt_input_keys(decoded['inputs'][0], ['witness_utxo', 'non_witness_utxo', 'bip32_derivs'])
-        test_psbt_input_keys(decoded['inputs'][1], ['non_witness_utxo', 'bip32_derivs'])
-        test_psbt_input_keys(decoded['inputs'][2], ['non_witness_utxo','witness_utxo', 'bip32_derivs', 'redeem_script'])
+        test_psbt_input_keys(decoded['inputs'][0], psbt_v2_required_keys + ['witness_utxo', 'non_witness_utxo', 'bip32_derivs'])
+        test_psbt_input_keys(decoded['inputs'][1], psbt_v2_required_keys + ['non_witness_utxo', 'bip32_derivs'])
+        test_psbt_input_keys(decoded['inputs'][2], psbt_v2_required_keys + ['non_witness_utxo', 'witness_utxo', 'bip32_derivs', 'redeem_script'])
+
+        # Cannot join PSBTv2s
+        psbt1 = self.nodes[1].createpsbt(inputs=[utxo1], outputs={self.nodes[0].getnewaddress():Decimal('10.999')}, psbt_version=0)
+        psbt2 = self.nodes[1].createpsbt(inputs=[utxo1], outputs={self.nodes[0].getnewaddress():Decimal('10.999')}, psbt_version=2)
+        assert_raises_rpc_error(-8, "joinpsbts only operates on version 0 PSBTs", self.nodes[1].joinpsbts, [psbt1, psbt2])
 
         # Two PSBTs with a common input should not be joinable
-        psbt1 = self.nodes[1].createpsbt([utxo1], {self.nodes[0].getnewaddress():Decimal('10.999')})
-        assert_raises_rpc_error(-8, "exists in multiple PSBTs", self.nodes[1].joinpsbts, [psbt1, updated])
+        psbt2 = self.nodes[1].createpsbt([utxo1], {self.nodes[0].getnewaddress():Decimal('10.999')}, psbt_version=0)
+        assert_raises_rpc_error(-8, "exists in multiple PSBTs", self.nodes[1].joinpsbts, [psbt1, psbt2])
 
         # Join two distinct PSBTs
+        psbt1 = self.nodes[1].createpsbt(inputs=[utxo1, utxo2, utxo3], outputs={self.nodes[0].getnewaddress():32.999}, psbt_version=0)
         addr4 = self.nodes[1].getnewaddress("", "p2sh-segwit")
         utxo4 = self.create_outpoints(self.nodes[0], outputs=[{addr4: 5}])[0]
         self.generate(self.nodes[0], 6)
-        psbt2 = self.nodes[1].createpsbt([utxo4], {self.nodes[0].getnewaddress():Decimal('4.999')})
+        psbt2 = self.nodes[1].createpsbt([utxo4], {self.nodes[0].getnewaddress():Decimal('4.999')}, psbt_version=0)
         psbt2 = self.nodes[1].walletprocesspsbt(psbt2)['psbt']
         psbt2_decoded = self.nodes[0].decodepsbt(psbt2)
         assert "final_scriptwitness" in psbt2_decoded['inputs'][0] and "final_scriptSig" in psbt2_decoded['inputs'][0]
-        joined = self.nodes[0].joinpsbts([psbt, psbt2])
+        joined = self.nodes[0].joinpsbts([psbt1, psbt2])
         joined_decoded = self.nodes[0].decodepsbt(joined)
         assert_equal(len(joined_decoded['inputs']), 4)
         assert_equal(len(joined_decoded['outputs']), 2)
@@ -927,7 +1124,7 @@ def test_psbt_input_keys(psbt_input, keys):
         # 10 attempts should be enough to get a shuffled join
         shuffled = False
         for _ in range(10):
-            shuffled_joined = self.nodes[0].joinpsbts([psbt, psbt2])
+            shuffled_joined = self.nodes[0].joinpsbts([psbt1, psbt2])
             shuffled |= joined != shuffled_joined
             if shuffled:
                 break
@@ -1025,11 +1222,9 @@ def test_psbt_input_keys(psbt_input, keys):
         final = signed['hex']
 
         dec = self.nodes[0].decodepsbt(signed["psbt"])
-        for i, txin in enumerate(dec["tx"]["vin"]):
-            if txin["txid"] == ext_utxo["txid"] and txin["vout"] == ext_utxo["vout"]:
-                input_idx = i
+        for psbt_in in dec["inputs"]:
+            if psbt_in["previous_txid"] == ext_utxo["txid"] and psbt_in["previous_vout"] == ext_utxo["vout"]:
                 break
-        psbt_in = dec["inputs"][input_idx]
         scriptsig_hex = psbt_in["final_scriptSig"]["hex"] if "final_scriptSig" in psbt_in else ""
         witness_stack_hex = psbt_in["final_scriptwitness"] if "final_scriptwitness" in psbt_in else None
         input_weight = calculate_input_weight(scriptsig_hex, witness_stack_hex)
@@ -1149,7 +1344,7 @@ def test_psbt_input_keys(psbt_input, keys):
         assert_equal(comb_psbt, psbt)
 
         self.log.info("Test walletprocesspsbt raises if an invalid sighashtype is passed")
-        assert_raises_rpc_error(-8, "'all' is not a valid sighash parameter.", self.nodes[0].walletprocesspsbt, psbt, sighashtype="all")
+        assert_raises_rpc_error(-8, "'all' is not a valid sighash parameter.", self.nodes[0].walletprocesspsbt, psbt=psbt, sighashtype="all")
 
         self.log.info("Test decoding PSBT with per-input preimage types")
         # note that the decodepsbt RPC doesn't check whether preimages and hashes match
@@ -1184,6 +1379,8 @@ def test_psbt_input_keys(psbt_input, keys):
 
         self.test_decodepsbt_musig2_input_output_types()
 
+        self.test_combinepsbt_preserves_proprietary_fields()
+
         self.log.info("Test that combining PSBTs with different transactions fails")
         tx = CTransaction()
         tx.vin = [CTxIn(outpoint=COutPoint(hash=int('aa' * 32, 16), n=0), scriptSig=b"")]
@@ -1227,6 +1424,14 @@ def test_psbt_input_keys(psbt_input, keys):
         utxo = self.create_outpoints(self.nodes[0], outputs=[{address: 1}])[0]
         self.sync_all()
 
+        self.log.info("Test descriptorprocesspsbt updates PSBT outputs")
+        for has_input in [False, True]:
+            output_psbt = self.nodes[2].createpsbt([utxo] if has_input else [], {address: 1})
+            processed = self.nodes[2].descriptorprocesspsbt(psbt=output_psbt, descriptors=[descriptor], finalize=False)
+            decoded = self.nodes[2].decodepsbt(processed["psbt"])
+            assert_equal(len(decoded["inputs"]), int(has_input))
+            assert_equal(len(decoded["outputs"][0]["bip32_derivs"]), 1)
+
         psbt = self.nodes[2].createpsbt([utxo], {self.nodes[0].getnewaddress(): 0.99999})
         decoded = self.nodes[2].decodepsbt(psbt)
         test_psbt_input_keys(decoded['inputs'][0], [])
@@ -1257,12 +1462,15 @@ def test_psbt_input_keys(psbt_input, keys):
         self.nodes[2].sendrawtransaction(processed_psbt['hex'])
 
         self.log.info("Test descriptorprocesspsbt raises if an invalid sighashtype is passed")
-        assert_raises_rpc_error(-8, "'all' is not a valid sighash parameter.", self.nodes[2].descriptorprocesspsbt, psbt, [descriptor], sighashtype="all")
+        assert_raises_rpc_error(-8, "'all' is not a valid sighash parameter.", self.nodes[2].descriptorprocesspsbt, psbt=psbt, descriptors=[descriptor], sighashtype="all")
 
         if not self.options.usecli:
             self.test_sighash_mismatch()
         self.test_sighash_adding()
         self.test_psbt_named_parameter_handling()
+        self.test_psbt_roundtrip()
+        self.test_psbt_version()
+        self.test_psbt_with_invalid_signature()
 
 if __name__ == '__main__':
     PSBTTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_scanblocks.py b/depend/bitcoin/test/functional/rpc_scanblocks.py
index 0b13741e..c10051d0 100755
--- a/depend/bitcoin/test/functional/rpc_scanblocks.py
+++ b/depend/bitcoin/test/functional/rpc_scanblocks.py
@@ -134,6 +134,9 @@ def run_test(self):
         # test invalid command
         assert_raises_rpc_error(-8, "Invalid action 'foobar'", node.scanblocks, "foobar")
 
+        # test that null scanobjects is rejected for start
+        assert_raises_rpc_error(-1, "scanobjects argument is required for the start action", node.scanblocks, "start", None)
+
 
 if __name__ == '__main__':
     ScanblocksTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/rpc_scantxoutset.py b/depend/bitcoin/test/functional/rpc_scantxoutset.py
index d59bd31a..4d04fe4d 100755
--- a/depend/bitcoin/test/functional/rpc_scantxoutset.py
+++ b/depend/bitcoin/test/functional/rpc_scantxoutset.py
@@ -36,9 +36,9 @@ def run_test(self):
         assert_equal(sum(u["coinbase"] for u in self.nodes[0].scantxoutset("start", [self.wallet.get_descriptor()])["unspents"]), 49)
 
         self.log.info("Create UTXOs...")
-        pubk1, spk_P2SH_SEGWIT, addr_P2SH_SEGWIT = getnewdestination("p2sh-segwit")
-        pubk2, spk_LEGACY, addr_LEGACY = getnewdestination("legacy")
-        pubk3, spk_BECH32, addr_BECH32 = getnewdestination("bech32")
+        (_, pubk1), spk_P2SH_SEGWIT, addr_P2SH_SEGWIT = getnewdestination("p2sh-segwit")
+        (_, pubk2), spk_LEGACY, addr_LEGACY = getnewdestination("legacy")
+        (_, pubk3), spk_BECH32, addr_BECH32 = getnewdestination("bech32")
         self.sendtodestination(spk_P2SH_SEGWIT, 0.001)
         self.sendtodestination(spk_LEGACY, 0.002)
         self.sendtodestination(spk_BECH32, 0.004)
@@ -80,6 +80,8 @@ def run_test(self):
         assert_raises_rpc_error(-8, "End of range is too high", self.nodes[0].scantxoutset, "start", [{"desc": "desc", "range": [(2 << 31 + 1) - 1000000, (2 << 31 + 1)]}])
         assert_raises_rpc_error(-8, "Range specified as [begin,end] must not have begin after end", self.nodes[0].scantxoutset, "start", [{"desc": "desc", "range": [2, 1]}])
         assert_raises_rpc_error(-8, "Range is too large", self.nodes[0].scantxoutset, "start", [{"desc": "desc", "range": [0, 1000001]}])
+        range_end = 2**31 - 1
+        assert_equal(self.nodes[0].scantxoutset("start", [{"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/0'/*)", "range": [range_end, range_end]}])['success'], True)
 
         self.log.info("Test extended key derivation.")
         # Run various scans, and verify that the sum of the amounts of the matches corresponds to the expected subset.
@@ -134,6 +136,7 @@ def run_test(self):
 
         # Check that second arg is needed for start
         assert_raises_rpc_error(-1, "scanobjects argument is required for the start action", self.nodes[0].scantxoutset, "start")
+        assert_raises_rpc_error(-1, "scanobjects argument is required for the start action", self.nodes[0].scantxoutset, "start", None)
 
         # Check that invalid command give error
         assert_raises_rpc_error(-8, "Invalid action 'invalid_command'", self.nodes[0].scantxoutset, "invalid_command")
diff --git a/depend/bitcoin/test/functional/rpc_signer.py b/depend/bitcoin/test/functional/rpc_signer.py
index 3b1fe88d..6d51182c 100755
--- a/depend/bitcoin/test/functional/rpc_signer.py
+++ b/depend/bitcoin/test/functional/rpc_signer.py
@@ -72,6 +72,25 @@ def run_test(self):
         )
         self.clear_mock_result(self.nodes[1])
 
+        # Duplicate fingerprints
+        self.set_mock_result(self.nodes[1],
+            '0 ['
+            '{"fingerprint": "00000001", "type": "trezor", "model": "trezor_t"}, '
+            '{"fingerprint": "00000001", "type": "trezor", "model": "trezor_t"}, '
+            '{"fingerprint": "00000002", "type": "trezor", "model": "trezor_one"}'
+            ']')
+        assert_equal(self.nodes[1].enumeratesigners(), {"signers": [
+            {"fingerprint": "00000001", "name": "trezor_t"},
+            {"fingerprint": "00000002", "name": "trezor_one"},
+        ]})
+        self.clear_mock_result(self.nodes[1])
+
+        # Invalid fingerprints are rejected
+        for fingerprint in ["", "0000001", "000000001", "0000000g", "zzzzzzzz"]:
+            self.set_mock_result(self.nodes[1], '0 [{"type": "trezor", "model": "trezor_t", "fingerprint": "%s"}]' % fingerprint)
+            assert_raises_rpc_error(-1, 'invalid fingerprint', self.nodes[1].enumeratesigners)
+            self.clear_mock_result(self.nodes[1])
+
         assert_equal({'fingerprint': '00000001', 'name': 'trezor_t'} in self.nodes[1].enumeratesigners()['signers'], True)
 
 if __name__ == '__main__':
diff --git a/depend/bitcoin/test/functional/rpc_uptime.py b/depend/bitcoin/test/functional/rpc_uptime.py
index 48256e2f..96c2fcb3 100755
--- a/depend/bitcoin/test/functional/rpc_uptime.py
+++ b/depend/bitcoin/test/functional/rpc_uptime.py
@@ -10,7 +10,6 @@
 import time
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_raises_rpc_error
 
 
 class UptimeTest(BitcoinTestFramework):
@@ -19,12 +18,8 @@ def set_test_params(self):
         self.setup_clean_chain = True
 
     def run_test(self):
-        self._test_negative_time()
         self._test_uptime()
 
-    def _test_negative_time(self):
-        assert_raises_rpc_error(-8, "Mocktime must be in the range [0, 9223372036], not -1.", self.nodes[0].setmocktime, -1)
-
     def _test_uptime(self):
         time.sleep(1) # Do some work before checking uptime
         uptime_before = self.nodes[0].uptime()
diff --git a/depend/bitcoin/test/functional/rpc_users.py b/depend/bitcoin/test/functional/rpc_users.py
index 9650480a..3eec97f1 100755
--- a/depend/bitcoin/test/functional/rpc_users.py
+++ b/depend/bitcoin/test/functional/rpc_users.py
@@ -36,7 +36,6 @@ def call_with_auth(node, user, password, method="getbestblockhash"):
 class HTTPBasicsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
-        self.supports_cli = False
 
     def conf_setup(self):
         #Append rpcauth to bitcoin.conf before initialization
@@ -61,6 +60,7 @@ def conf_setup(self):
         rpcauth3 = lines[1]
         self.password = lines[3]
 
+        self.stop_nodes()
         with open(self.nodes[0].datadir_path / "bitcoin.conf", "a") as f:
             f.write(rpcauth + "\n")
             f.write(rpcauth2 + "\n")
@@ -68,8 +68,7 @@ def conf_setup(self):
         with open(self.nodes[1].datadir_path / "bitcoin.conf", "a") as f:
             f.write("rpcuser={}\n".format(self.rpcuser))
             f.write("rpcpassword={}\n".format(self.rpcpassword))
-        self.restart_node(0)
-        self.restart_node(1)
+        self.start_nodes()
 
     def test_auth(self, node, user, password):
         self.log.info('Correct...')
@@ -109,6 +108,7 @@ def test_perm(perm: Optional[str]):
             assert_equal(expected_perms, actual_perms)
 
         # Remove any leftover rpc{user|password} config options from previous tests
+        self.stop_node(1)
         self.nodes[1].replace_in_config([("rpcuser", "#rpcuser"), ("rpcpassword", "#rpcpassword")])
 
         self.log.info('Check default cookie permission')
diff --git a/depend/bitcoin/test/functional/rpc_whitelist.py b/depend/bitcoin/test/functional/rpc_whitelist.py
index da63b76d..e14a591b 100755
--- a/depend/bitcoin/test/functional/rpc_whitelist.py
+++ b/depend/bitcoin/test/functional/rpc_whitelist.py
@@ -33,7 +33,6 @@ class RPCWhitelistTest(BitcoinTestFramework):
 
     def set_test_params(self):
         self.num_nodes = 1
-        self.supports_cli = False
 
     def run_test(self):
         # 0 => Username
diff --git a/depend/bitcoin/test/functional/test-shell.md b/depend/bitcoin/test/functional/test-shell.md
index 526c67f6..0c2b7d3d 100644
--- a/depend/bitcoin/test/functional/test-shell.md
+++ b/depend/bitcoin/test/functional/test-shell.md
@@ -180,7 +180,6 @@ can be called after the TestShell is shut down.
 | `loglevel` | `INFO` | Logs events at this level and higher. Can be set to `DEBUG`, `INFO`, `WARNING`, `ERROR` or `CRITICAL`. |
 | `nocleanup` | `False` | Cleans up temporary test directory if set to `True` during `shutdown`. |
 | `num_nodes` | `1` | Sets the number of initialized bitcoind processes. |
-| `perf` | False | Profiles running nodes with `perf` for the duration of the test if set to `True`. |
 | `rpc_timeout` | `60` | Sets the RPC server timeout for the underlying bitcoind processes. |
 | `setup_clean_chain` | `False` | A 200-block-long chain is initialized from cache by default. Instead, `setup_clean_chain` initializes an empty blockchain if set to `True`. |
 | `randomseed` | Random Integer | `TestShell().options.randomseed` is a member of `TestShell` which can be accessed during a test to seed a random generator. User can override default with a constant value for reproducible test runs. |
diff --git a/depend/bitcoin/test/functional/test_framework/address.py b/depend/bitcoin/test/functional/test_framework/address.py
index d4aa26e5..7fb6ddf9 100644
--- a/depend/bitcoin/test/functional/test_framework/address.py
+++ b/depend/bitcoin/test/functional/test_framework/address.py
@@ -56,10 +56,12 @@ def create_deterministic_address_bcrt1_p2tr_op_true(explicit_internal_key=None):
 
 
 def byte_to_base58(b, version):
-    result = ''
-    b = bytes([version]) + b  # prepend version
+    if isinstance(version, int):
+        version = bytes([version])
+    b = version + b # prepend version
     b += hash256(b)[:4]       # append checksum
     value = int.from_bytes(b, 'big')
+    result = ''
     while value > 0:
         result = b58chars[value % 58] + result
         value //= 58
diff --git a/depend/bitcoin/test/functional/test_framework/authproxy.py b/depend/bitcoin/test/functional/test_framework/authproxy.py
index 078672c3..100372a4 100644
--- a/depend/bitcoin/test/functional/test_framework/authproxy.py
+++ b/depend/bitcoin/test/functional/test_framework/authproxy.py
@@ -44,18 +44,13 @@
 import time
 import urllib.parse
 
+from .util import JSONRPCException, assert_equal
+
 HTTP_TIMEOUT = 30
 USER_AGENT = "AuthServiceProxy/0.1"
 
 log = logging.getLogger("BitcoinRPC")
 
-class JSONRPCException(Exception):
-    def __init__(self, rpc_error, http_status=None):
-        super().__init__(f"{rpc_error} [http_status={http_status}]")
-        self.error = rpc_error
-        self.http_status = http_status
-
-
 def serialization_fallback(o):
     if isinstance(o, decimal.Decimal):
         return str(o)
@@ -144,7 +139,6 @@ def __call__(self, *args, **argsn):
             else:
                 return response['result']
         else:
-            from .util import assert_equal
             assert_equal(response['jsonrpc'], '2.0')
             if status != HTTPStatus.OK:
                 raise JSONRPCException({
@@ -175,7 +169,7 @@ def _get_response(self):
                 'message': '%r RPC took longer than %f seconds. Consider '
                            'using larger timeout for calls that take '
                            'longer to return.' % (self._service_name,
-                                                  self.__conn.timeout)})
+                                                  self.__conn.timeout)}) from None
         if http_response is None:
             raise JSONRPCException({
                 'code': -342, 'message': 'missing HTTP response from server'})
diff --git a/depend/bitcoin/test/functional/test_framework/blocktools.py b/depend/bitcoin/test/functional/test_framework/blocktools.py
index 0a393d89..529f07cd 100644
--- a/depend/bitcoin/test/functional/test_framework/blocktools.py
+++ b/depend/bitcoin/test/functional/test_framework/blocktools.py
@@ -161,11 +161,13 @@ def add_witness_commitment(block, nonce=0):
     block.hashMerkleRoot = block.calc_merkle_root()
 
 
-def script_BIP34_coinbase_height(height):
+def script_BIP34_coinbase_height(height, *, padding=True):
     if height <= 16:
         res = CScriptOp.encode_op_n(height)
-        # Append dummy extraNonce to increase scriptSig size to 2 (see bad-cb-length consensus rule)
-        return CScript([res, OP_0])
+        if padding:
+            # Append dummy extraNonce to increase scriptSig size to 2 (see bad-cb-length consensus rule)
+            return CScript([res, OP_0])
+        return CScript([res])
     return CScript([CScriptNum(height)])
 
 
diff --git a/depend/bitcoin/test/functional/test_framework/crypto/siphash.py b/depend/bitcoin/test/functional/test_framework/crypto/siphash.py
index f89a7ce9..a7390f34 100644
--- a/depend/bitcoin/test/functional/test_framework/crypto/siphash.py
+++ b/depend/bitcoin/test/functional/test_framework/crypto/siphash.py
@@ -8,6 +8,11 @@
 integers is provided in addition to the one accepting generic data.
 """
 
+import json
+from pathlib import Path
+import unittest
+
+
 def rotl64(n, b):
     return n >> (64 - b) | (n & ((1 << (64 - b)) - 1)) << b
 
@@ -63,3 +68,12 @@ def siphash(k0, k1, data):
 def siphash256(k0, k1, num):
     assert type(num) is int
     return siphash(k0, k1, num.to_bytes(32, 'little'))
+
+
+class TestFrameworkSipHash(unittest.TestCase):
+    def test_vectors(self):
+        with (Path(__file__).parents[4] / "src/test/data/siphash.json").open() as vectors_file:
+            for test in json.load(vectors_file):
+                k0, k1 = (int(key, 16) for key in test["key"])
+                data = b"".join(bytes.fromhex(block) for block in test["input"])
+                self.assertEqual(siphash(k0, k1, data), int(test["expected"]["siphash24"], 16))
diff --git a/depend/bitcoin/test/functional/test_framework/extendedkey.py b/depend/bitcoin/test/functional/test_framework/extendedkey.py
new file mode 100644
index 00000000..92abc3c9
--- /dev/null
+++ b/depend/bitcoin/test/functional/test_framework/extendedkey.py
@@ -0,0 +1,195 @@
+#!/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.
+"""Base classes for creating dynamic xprvs and xpubs. Only basic
+functionality of BIP32 is provided here. These classes work over
+the ECKey and ECPubKey classes in the key.py."""
+
+import hashlib
+import hmac
+import unittest
+
+from test_framework.address import byte_to_base58
+from test_framework.crypto import secp256k1
+from test_framework.key import (
+    ECKey,
+    ECPubKey,
+    generate_privkey,
+    ORDER,
+)
+from test_framework.script import hash160
+
+BIP32_HARDENED = 0x80000000
+
+def get_version(private=False, mainnet=False):
+    if mainnet:
+        if private:
+            return bytes.fromhex("0488ADE4")
+        return bytes.fromhex("0488B21E")
+
+    if private:
+        return bytes.fromhex("04358394")
+    return bytes.fromhex("043587CF")
+
+def hardened(index):
+    assert 0 <= index < BIP32_HARDENED
+    return index | BIP32_HARDENED
+
+def derive_path(key, path, path_idx_parser):
+    if path in ("", "m"):
+        return key
+    parts = path.split("/")
+    if parts[0] == "m":
+        parts = parts[1:]
+    for part in parts:
+        index = path_idx_parser(part)
+        key = key._derive(index)
+
+    return key
+
+class ExtendedPrivateKey:
+    def __init__(self, key, chaincode, depth=0, parent_fingerprint_bytes=b"\x00\x00\x00\x00", child_num=0):
+        self.key = key
+        self.chaincode = chaincode
+        self.depth = depth
+        self.parent_fingerprint_bytes = parent_fingerprint_bytes
+        self.child_num = child_num
+
+    @classmethod
+    def from_seed(cls, seed):
+        I = hmac.new(b"Bitcoin seed", seed, hashlib.sha512).digest()
+
+        secret = I[:32]
+        chaincode = I[32:]
+
+        secret_int = int.from_bytes(secret, "big")
+        if secret_int == 0 or secret_int >= ORDER:
+            raise ValueError("Invalid master key")
+
+        key = ECKey()
+        key.set(secret, compressed=True)
+
+        return cls(key, chaincode)
+
+    @classmethod
+    def generate(cls):
+        return cls.from_seed(generate_privkey())
+
+    def _fingerprint(self):
+        return hash160(self.key.get_pubkey().get_bytes())[:4]
+
+    def _derive(self, index):
+        if index >= BIP32_HARDENED:
+            data = (b"\x00" + self.key.get_bytes() + index.to_bytes(4, "big"))
+        else:
+            data = (self.key.get_pubkey().get_bytes() + index.to_bytes(4, "big"))
+
+        I = hmac.new(self.chaincode, data, hashlib.sha512).digest()
+        IL = I[:32]
+        IR = I[32:]
+
+        IL_int = int.from_bytes(IL, "big")
+        child_secret = (IL_int + int.from_bytes(self.key.get_bytes(), "big")) % ORDER
+        # Per BIP32, if IL >= n or the child key is 0, the key is invalid. This is
+        # astronomically unlikely (~1 in 2^127), so reject rather than retrying the next index.
+        if IL_int >= ORDER or child_secret == 0:
+            raise ValueError("Invalid BIP32 child key")
+
+        child = ECKey()
+        child.set(child_secret.to_bytes(32, 'big'), compressed=True)
+
+        return ExtendedPrivateKey(child, IR, self.depth + 1, self._fingerprint(), index)
+
+    def _serialize(self):
+        return (bytes([self.depth]) + self.parent_fingerprint_bytes + self.child_num.to_bytes(4, "big") + self.chaincode + b"\x00" + self.key.get_bytes())
+
+    def pubkey(self):
+        return ExtendedPublicKey(self.key.get_pubkey(), self.chaincode, self.depth, self.parent_fingerprint_bytes, self.child_num)
+
+    def derive_path(self, path):
+        def path_idx_parser(part):
+            if part.endswith(("h", "'")):
+                return hardened(int(part[:-1]))
+            return int(part)
+
+        return derive_path(self, path, path_idx_parser)
+
+    def to_string(self, mainnet=False):
+        return byte_to_base58(self._serialize(), get_version(private=True, mainnet=mainnet))
+
+class ExtendedPublicKey:
+    def __init__(self, pubkey, chaincode, depth, parent_fingerprint_bytes, child_num):
+        self.pubkey = pubkey
+        self.chaincode = chaincode
+        self.depth = depth
+        self.parent_fingerprint_bytes = parent_fingerprint_bytes
+        self.child_num = child_num
+
+    def _fingerprint(self):
+        return hash160(self.pubkey.get_bytes())[:4]
+
+    def _derive(self, index):
+        if index >= BIP32_HARDENED:
+            raise ValueError("Cannot derive hardened child from xpub")
+
+        data = (self.pubkey.get_bytes() + index.to_bytes(4, "big"))
+        I = hmac.new(self.chaincode, data, hashlib.sha512).digest()
+        IL = I[:32]
+        IR = I[32:]
+
+        IL_int = int.from_bytes(IL, "big")
+        child_point = IL_int * secp256k1.G + self.pubkey.p
+        # Per BIP32, if IL >= n or the resulting point is infinity, the key is invalid.
+        if IL_int >= ORDER or child_point.infinity:
+            raise ValueError("Invalid BIP32 child key")
+
+        child_pubkey = ECPubKey()
+        child_pubkey.set(child_point.to_bytes_compressed())
+
+        return ExtendedPublicKey(child_pubkey, IR, self.depth + 1, self._fingerprint(), index)
+
+    def _serialize(self):
+        return (bytes([self.depth]) + self.parent_fingerprint_bytes + self.child_num.to_bytes(4, "big") + self.chaincode + self.pubkey.get_bytes())
+
+    def derive_path(self, path):
+        return derive_path(self, path, lambda x: int(x))
+
+    def to_string(self, mainnet=False):
+        return byte_to_base58(self._serialize(), get_version(private=False, mainnet=mainnet))
+
+class TestFrameworkExtendedKey(unittest.TestCase):
+    def test_bip32_vectors(self):
+        vectors = [
+            [
+                "000102030405060708090a0b0c0d0e0f",
+                [
+                    ["m", "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi", "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8"],
+                    ["m/0h", "xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7", "xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw"],
+                    ["m/0h/1", "xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs", "xpub6ASuArnXKPbfEwhqN6e3mwBcDTgzisQN1wXN9BJcM47sSikHjJf3UFHKkNAWbWMiGj7Wf5uMash7SyYq527Hqck2AxYysAA7xmALppuCkwQ"],
+                    ["m/0h/1/2h", "xprv9z4pot5VBttmtdRTWfWQmoH1taj2axGVzFqSb8C9xaxKymcFzXBDptWmT7FwuEzG3ryjH4ktypQSAewRiNMjANTtpgP4mLTj34bhnZX7UiM", "xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5"],
+                    ["m/0h/1/2h/2", "xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334", "xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV"],
+                    ["m/0h/1/2h/2/1000000000", "xprvA41z7zogVVwxVSgdKUHDy1SKmdb533PjDz7J6N6mV6uS3ze1ai8FHa8kmHScGpWmj4WggLyQjgPie1rFSruoUihUZREPSL39UNdE3BBDu76", "xpub6H1LXWLaKsWFhvm6RVpEL9P4KfRZSW7abD2ttkWP3SSQvnyA8FSVqNTEcYFgJS2UaFcxupHiYkro49S8yGasTvXEYBVPamhGW6cFJodrTHy"],
+                ]
+            ],
+            [
+                "fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542",
+                [
+                    ["m", "xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U", "xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB"],
+                    ["m/0", "xprv9vHkqa6EV4sPZHYqZznhT2NPtPCjKuDKGY38FBWLvgaDx45zo9WQRUT3dKYnjwih2yJD9mkrocEZXo1ex8G81dwSM1fwqWpWkeS3v86pgKt", "xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH"],
+                    ["m/0/2147483647h", "xprv9wSp6B7kry3Vj9m1zSnLvN3xH8RdsPP1Mh7fAaR7aRLcQMKTR2vidYEeEg2mUCTAwCd6vnxVrcjfy2kRgVsFawNzmjuHc2YmYRmagcEPdU9", "xpub6ASAVgeehLbnwdqV6UKMHVzgqAG8Gr6riv3Fxxpj8ksbH9ebxaEyBLZ85ySDhKiLDBrQSARLq1uNRts8RuJiHjaDMBU4Zn9h8LZNnBC5y4a"],
+                    ["m/0/2147483647h/1", "xprv9zFnWC6h2cLgpmSA46vutJzBcfJ8yaJGg8cX1e5StJh45BBciYTRXSd25UEPVuesF9yog62tGAQtHjXajPPdbRCHuWS6T8XA2ECKADdw4Ef", "xpub6DF8uhdarytz3FWdA8TvFSvvAh8dP3283MY7p2V4SeE2wyWmG5mg5EwVvmdMVCQcoNJxGoWaU9DCWh89LojfZ537wTfunKau47EL2dhHKon"],
+                    ["m/0/2147483647h/1/2147483646h", "xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc", "xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL"],
+                    ["m/0/2147483647h/1/2147483646h/2", "xprvA2nrNbFZABcdryreWet9Ea4LvTJcGsqrMzxHx98MMrotbir7yrKCEXw7nadnHM8Dq38EGfSh6dqA9QWTyefMLEcBYJUuekgW4BYPJcr9E7j", "xpub6FnCn6nSzZAw5Tw7cgR9bi15UV96gLZhjDstkXXxvCLsUXBGXPdSnLFbdpq8p9HmGsApME5hQTZ3emM2rnY5agb9rXpVGyy3bdW6EEgAtqt"]
+                ]
+            ]
+        ]
+
+        for vector in vectors:
+            seed = bytes.fromhex(vector[0])
+            xprv = ExtendedPrivateKey.from_seed(seed)
+            for seed_vector in vector[1]:
+                path = seed_vector[0]
+                derivedxprv = xprv.derive_path(path)
+                self.assertEqual(derivedxprv.to_string(mainnet=True), seed_vector[1])
+                self.assertEqual(derivedxprv.pubkey().to_string(mainnet=True), seed_vector[2])
diff --git a/depend/bitcoin/test/functional/test_framework/ipc_util.py b/depend/bitcoin/test/functional/test_framework/ipc_util.py
index 0e10b90e..a4ebd091 100644
--- a/depend/bitcoin/test/functional/test_framework/ipc_util.py
+++ b/depend/bitcoin/test/functional/test_framework/ipc_util.py
@@ -94,8 +94,8 @@ def load_capnp_modules(config):
     }
 
 
-async def make_capnp_init_ctx(self):
-    node = self.nodes[0]
+async def make_capnp_init_ctx(self, node_index=0):
+    node = self.nodes[node_index]
     # Establish a connection, and create Init proxy object.
     connection = await capnp.AsyncIoStream.create_unix_connection(node.ipc_socket_path)
     client = capnp.TwoPartyClient(connection)
@@ -109,9 +109,9 @@ async def make_capnp_init_ctx(self):
     return ctx, init
 
 
-async def mining_create_block_template(mining, stack, ctx, opts):
+async def mining_create_block_template(mining, stack, ctx, *args, **kwargs):
     """Call mining.createNewBlock() and return template, then call template.destroy() when stack exits."""
-    response = await mining.createNewBlock(ctx, opts)
+    response = await mining.createNewBlock(ctx, *args, **kwargs)
     if not response._has("result"):
         return None
     return await stack.enter_async_context(destroying(response.result, ctx))
@@ -152,9 +152,9 @@ async def mining_get_coinbase_tx(block_template, ctx) -> CoinbaseTxData:
         lockTime=int(template_capnp.lockTime),
     )
 
-async def make_mining_ctx(self):
+async def make_mining_ctx(self, node_index=0):
     """Create IPC context and Mining proxy object."""
-    ctx, init = await make_capnp_init_ctx(self)
+    ctx, init = await make_capnp_init_ctx(self, node_index)
     self.log.debug("Create Mining proxy object")
     mining = init.makeMining(ctx).result
     return ctx, mining
@@ -162,3 +162,12 @@ async def make_mining_ctx(self):
 def assert_capnp_failed(e, description_prefix):
     assert e.description.startswith(description_prefix), f"Expected description starting with '{description_prefix}', got '{e.description}'"
     assert_equal(e.type, "FAILED")
+
+
+async def assert_create_new_block_fails(ctx, mining, opts, expected_msg):
+    """Assert that mining.createNewBlock fails with the expected remote exception."""
+    try:
+        await mining.createNewBlock(ctx, opts)
+        raise AssertionError("createNewBlock unexpectedly succeeded")
+    except capnp.lib.capnp.KjException as e:
+        assert_capnp_failed(e, f"remote exception: std::exception: {expected_msg}")
diff --git a/depend/bitcoin/test/functional/test_framework/messages.py b/depend/bitcoin/test/functional/test_framework/messages.py
index 012049c2..c636a29f 100755
--- a/depend/bitcoin/test/functional/test_framework/messages.py
+++ b/depend/bitcoin/test/functional/test_framework/messages.py
@@ -36,6 +36,7 @@
 
 MAX_LOCATOR_SZ = 101
 MAX_BLOCK_WEIGHT = 4000000
+MAX_BLOCK_SIGOPS_COST = 80000
 DEFAULT_BLOCK_RESERVED_WEIGHT = 8000
 MINIMUM_BLOCK_RESERVED_WEIGHT = 2000
 MAX_BLOOM_FILTER_SIZE = 36000
@@ -686,25 +687,35 @@ def serialize_with_witness(self):
     def serialize(self):
         return self.serialize_with_witness()
 
+    @property
+    def wtxid(self):
+        """Return wtxid (transaction hash with witness) as little-endian bytes."""
+        return hash256(self.serialize_with_witness())
+
     @property
     def wtxid_hex(self):
         """Return wtxid (transaction hash with witness) as hex string."""
-        return hash256(self.serialize())[::-1].hex()
+        return self.wtxid[::-1].hex()
 
     @property
     def wtxid_int(self):
         """Return wtxid (transaction hash with witness) as integer."""
-        return uint256_from_str(hash256(self.serialize_with_witness()))
+        return uint256_from_str(self.wtxid)
+
+    @property
+    def txid(self):
+        """Return txid (transaction hash without witness) as little-endian bytes."""
+        return hash256(self.serialize_without_witness())
 
     @property
     def txid_hex(self):
         """Return txid (transaction hash without witness) as hex string."""
-        return hash256(self.serialize_without_witness())[::-1].hex()
+        return self.txid[::-1].hex()
 
     @property
     def txid_int(self):
         """Return txid (transaction hash without witness) as integer."""
-        return uint256_from_str(hash256(self.serialize_without_witness()))
+        return uint256_from_str(self.txid)
 
     def is_valid(self):
         for tout in self.vout:
@@ -1671,7 +1682,7 @@ class msg_sendcmpct:
     __slots__ = ("announce", "version")
     msgtype = b"sendcmpct"
 
-    def __init__(self, announce=False, version=1):
+    def __init__(self, announce=False, version=2):
         self.announce = announce
         self.version = version
 
@@ -1927,6 +1938,28 @@ def __repr__(self):
         return "msg_sendtxrcncl(version=%lu, salt=%lu)" %\
             (self.version, self.salt)
 
+class msg_feature:
+    """FEATURE message for negotiating optional features."""
+    __slots__ = ("feature_id", "feature_data")
+    msgtype = b"feature"
+
+    def __init__(self, feature_id="", feature_data=b""):
+        self.feature_id = feature_id
+        self.feature_data = feature_data
+
+    def deserialize(self, f):
+        self.feature_id = deser_string(f).decode()
+        self.feature_data = deser_string(f)
+
+    def serialize(self):
+        r = ser_string(self.feature_id.encode())
+        r += ser_string(self.feature_data)
+        return r
+
+    def __repr__(self):
+        return f"msg_feature(feature_id={self.feature_id}, data={self.feature_data.hex()})"
+
+
 class TestFrameworkScript(unittest.TestCase):
     def test_addrv2_encode_decode(self):
         def check_addrv2(ip, net):
diff --git a/depend/bitcoin/test/functional/test_framework/netutil.py b/depend/bitcoin/test/functional/test_framework/netutil.py
index 5504029a..fdf76f8b 100644
--- a/depend/bitcoin/test/functional/test_framework/netutil.py
+++ b/depend/bitcoin/test/functional/test_framework/netutil.py
@@ -2,11 +2,12 @@
 # Copyright (c) 2014-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.
-"""Linux network utilities.
+"""Linux, macOS, BSD and illumos network utilities.
 
 Roughly based on https://web.archive.org/web/20190424172231/http://voorloopnul.com/blog/a-python-netstat-in-less-than-100-lines-of-code/ by Ricardo Pascal
 """
 
+import http.client
 import sys
 import socket
 import struct
@@ -34,6 +35,15 @@
 ADDRMAN_TRIED_BUCKET_COUNT = 1 << 8
 ADDRMAN_BUCKET_SIZE = 1 << 6
 
+# When a test expects a server disconnection, any of these errors are
+# acceptable. The specific event is determined by race condition and platform OS.
+NETWORK_ERRORS = (
+    BrokenPipeError,                 # write to a closed socket/pipe
+    ConnectionResetError,            # connection forcibly closed by peer
+    ConnectionAbortedError,          # connection aborted locally or by network stack
+    http.client.ResponseNotReady,    # server response not ready or connection out of sync
+)
+
 def get_socket_inodes(pid):
     '''
     Get list of socket inodes for process pid.
@@ -88,40 +98,72 @@ def get_bind_addrs(pid):
     '''
     Get bind addresses as (host,port) tuples for process pid.
     '''
-    inodes = get_socket_inodes(pid)
-    bind_addrs = []
-    for conn in netstat('tcp') + netstat('tcp6'):
-        if conn[3] == STATE_LISTEN and conn[4] in inodes:
-            bind_addrs.append(conn[1])
-    return bind_addrs
-
-# from: https://code.activestate.com/recipes/439093/
+    if sys.platform == 'linux':
+        inodes = get_socket_inodes(pid)
+        bind_addrs = []
+        for conn in netstat('tcp') + netstat('tcp6'):
+            if conn[3] == STATE_LISTEN and conn[4] in inodes:
+                bind_addrs.append(conn[1])
+        return bind_addrs
+    # OpenBSD is not included, as it does not ship the lsof utility.
+    elif sys.platform.startswith(("darwin", "freebsd", "netbsd", "sunos5")):
+        import re
+        import subprocess
+        output = subprocess.check_output(["lsof",
+            *(["-Di"] if sys.platform.startswith(("freebsd", "netbsd", "sunos5")) else []), # Ignore device cache to avoid stderr warnings.
+            *(["-w"] if sys.platform.startswith("netbsd") else []), # Ignore point release mismatch warnings.
+            "-nP",          # Keep hosts and ports numeric.
+            "-a",           # Require all filters to match.
+            "-p", str(pid), # Limit results to the target pid.
+            "-iTCP",        # Only inspect TCP sockets.
+            "-sTCP:LISTEN", # Only keep listening sockets.
+            "-Ftn",         # Emit machine-readable type and name fields.
+        ], text=True)
+        return [
+            (addr_to_hex(("::" if sock_type == "IPv6" else "0.0.0.0") if host == "*" else host.strip("[]")), int(port))
+            for sock_type, host, port in re.findall(r"t(IPv[46])\nn(\*|\[.+?]|[^:]+):(\d+)", output)
+        ]
+    else:
+        raise NotImplementedError(f"get_bind_addrs is not supported on {sys.platform}")
+
 def all_interfaces():
     '''
-    Return all interfaces that are up
+    Return all IPv4 interfaces that are up.
     '''
-    import fcntl  # Linux only, so only import when required
-
-    is_64bits = sys.maxsize > 2**32
-    struct_size = 40 if is_64bits else 32
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    max_possible = 8 # initial value
-    while True:
-        bytes = max_possible * struct_size
-        names = array.array('B', b'\0' * bytes)
-        outbytes = struct.unpack('iL', fcntl.ioctl(
-            s.fileno(),
-            0x8912,  # SIOCGIFCONF
-            struct.pack('iL', bytes, names.buffer_info()[0])
-        ))[0]
-        if outbytes == bytes:
-            max_possible *= 2
-        else:
-            break
-    namestr = names.tobytes()
-    return [(namestr[i:i+16].split(b'\0', 1)[0],
-             socket.inet_ntoa(namestr[i+20:i+24]))
-            for i in range(0, outbytes, struct_size)]
+    if sys.platform == 'linux':
+        import fcntl  # Linux only, so only import when required
+
+        is_64bits = sys.maxsize > 2**32
+        struct_size = 40 if is_64bits else 32
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        max_possible = 8 # initial value
+        while True:
+            bytes = max_possible * struct_size
+            names = array.array('B', b'\0' * bytes)
+            outbytes = struct.unpack('iL', fcntl.ioctl(
+                s.fileno(),
+                0x8912,  # SIOCGIFCONF
+                struct.pack('iL', bytes, names.buffer_info()[0])
+            ))[0]
+            if outbytes == bytes:
+                max_possible *= 2
+            else:
+                break
+        namestr = names.tobytes()
+        return [(namestr[i:i+16].split(b'\0', 1)[0],
+                 socket.inet_ntoa(namestr[i+20:i+24]))
+                for i in range(0, outbytes, struct_size)]
+    elif sys.platform.startswith(("darwin", "freebsd", "netbsd", "openbsd", "sunos5")):
+        import re
+        import subprocess
+        output = subprocess.check_output(["ifconfig", "-au"], text=True)
+        return [
+            (m["iface"].encode(), ip)
+            for m in re.finditer(r"(?m)^(?P<iface>\S+):(?P<block>[^\n]*(?:\n[ \t]+[^\n]*)*)", output)
+            for ip in re.findall(r"inet ([^\s/]+)", m["block"])
+        ]
+    else:
+        raise NotImplementedError(f"all_interfaces is not supported on {sys.platform}")
 
 def addr_to_hex(addr):
     '''
@@ -182,6 +224,37 @@ def format_addr_port(addr, port):
     else:
         return f"{addr}:{port}"
 
+def format_sock(sock, *, local):
+    '''
+    Format either local or remote side of a socket to a human readable string, e.g.
+    1.2.3.4:8333 or
+    [11:22::33]:8333 or
+    /path/to/socket or
+    @abstract-socket
+    '''
+    try:
+        if local:
+            name = sock.getsockname()
+        else:
+            name = sock.getpeername()
+    except Exception:
+        return "n/a"
+
+    if sock.family == socket.AF_INET:
+        return f"{name[0]}:{name[1]}"
+
+    if sock.family == socket.AF_INET6:
+        return f"[{name[0]}]:{name[1]}"
+
+    if sock.family == socket.AF_UNIX:
+        if isinstance(name, bytes):
+            name = name.decode(errors="backslashreplace")
+        if name.startswith("\0"):
+            return f"@{name[1:]}"
+        return name
+
+    return str(name)
+
 
 def set_ephemeral_port_range(sock):
     '''On FreeBSD, set socket to use the high ephemeral port range (49152-65535).
diff --git a/depend/bitcoin/test/functional/test_framework/p2p.py b/depend/bitcoin/test/functional/test_framework/p2p.py
index fae4eb94..65260b7d 100755
--- a/depend/bitcoin/test/functional/test_framework/p2p.py
+++ b/depend/bitcoin/test/functional/test_framework/p2p.py
@@ -43,6 +43,7 @@
     msg_cfheaders,
     msg_cfilter,
     msg_cmpctblock,
+    msg_feature,
     msg_feefilter,
     msg_filteradd,
     msg_filterclear,
@@ -99,7 +100,8 @@
 MIN_P2P_VERSION_SUPPORTED = 60001
 # The P2P version that this test framework implements and sends in its `version` message
 # Version 70016 supports wtxid relay
-P2P_VERSION = 70016
+# Version 70017 supports feature
+P2P_VERSION = 70017
 # The services that this test framework offers in its `version` message
 P2P_SERVICES = NODE_NETWORK | NODE_WITNESS
 # The P2P user agent string that this test framework sends in its `version` message
@@ -124,6 +126,7 @@
     b"cfheaders": msg_cfheaders,
     b"cfilter": msg_cfilter,
     b"cmpctblock": msg_cmpctblock,
+    b"feature": msg_feature,
     b"feefilter": msg_feefilter,
     b"filteradd": msg_filteradd,
     b"filterclear": msg_filterclear,
@@ -543,6 +546,7 @@ def on_cfcheckpt(self, message): pass
     def on_cfheaders(self, message): pass
     def on_cfilter(self, message): pass
     def on_cmpctblock(self, message): pass
+    def on_feature(self, message): pass
     def on_feefilter(self, message): pass
     def on_filteradd(self, message): pass
     def on_filterclear(self, message): pass
@@ -606,11 +610,15 @@ def test_function():
         wait_until_helper_internal(test_function, timeout=timeout, lock=p2p_lock, timeout_factor=self.timeout_factor, check_interval=check_interval)
 
     def wait_for_connect(self, *, timeout=60):
-        test_function = lambda: self.is_connected
+        def test_function():
+            return self.is_connected
+
         self.wait_until(test_function, timeout=timeout, check_connected=False)
 
     def wait_for_disconnect(self, *, timeout=60):
-        test_function = lambda: not self.is_connected
+        def test_function():
+            return not self.is_connected
+
         self.wait_until(test_function, timeout=timeout, check_connected=False)
 
     def wait_for_reconnect(self, *, timeout=60):
@@ -973,3 +981,27 @@ def wait_for_broadcast(self, txns, *, timeout=60):
         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
diff --git a/depend/bitcoin/test/functional/test_framework/psbt.py b/depend/bitcoin/test/functional/test_framework/psbt.py
index 0a57be31..a025790f 100644
--- a/depend/bitcoin/test/functional/test_framework/psbt.py
+++ b/depend/bitcoin/test/functional/test_framework/psbt.py
@@ -4,11 +4,15 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import base64
+import struct
+
+from io import BytesIO
 
 from .util import assert_equal
 from .messages import (
     CTransaction,
     deser_string,
+    deser_compact_size,
     from_binary,
     ser_compact_size,
 )
@@ -108,37 +112,82 @@ def __init__(self, *, g=None, i=None, o=None):
         self.g = g if g is not None else PSBTMap()
         self.i = i if i is not None else []
         self.o = o if o is not None else []
-        self.tx = None
+        self.version = None
 
     def deserialize(self, f):
         assert_equal(f.read(5), b"psbt\xff")
         self.g = from_binary(PSBTMap, f)
-        assert PSBT_GLOBAL_UNSIGNED_TX in self.g.map
-        self.tx = from_binary(CTransaction, self.g.map[PSBT_GLOBAL_UNSIGNED_TX])
-        self.i = [from_binary(PSBTMap, f) for _ in self.tx.vin]
-        self.o = [from_binary(PSBTMap, f) for _ in self.tx.vout]
+
+        self.version = 0
+        if PSBT_GLOBAL_VERSION in self.g.map:
+            self.version = struct.unpack("<I", self.g.map[PSBT_GLOBAL_VERSION])[0]
+            assert self.version in [0, 2]
+        if self.version == 2:
+            assert PSBT_GLOBAL_INPUT_COUNT in self.g.map
+            assert PSBT_GLOBAL_OUTPUT_COUNT in self.g.map
+            in_count = deser_compact_size(BytesIO(self.g.map[PSBT_GLOBAL_INPUT_COUNT]))
+            out_count = deser_compact_size(BytesIO(self.g.map[PSBT_GLOBAL_OUTPUT_COUNT]))
+        else:
+            assert PSBT_GLOBAL_UNSIGNED_TX in self.g.map
+            tx = from_binary(CTransaction, self.g.map[PSBT_GLOBAL_UNSIGNED_TX])
+            in_count = len(tx.vin)
+            out_count = len(tx.vout)
+
+        self.i = [from_binary(PSBTMap, f) for _ in range(in_count)]
+        self.o = [from_binary(PSBTMap, f) for _ in range(out_count)]
         return self
 
     def serialize(self):
         assert isinstance(self.g, PSBTMap)
         assert isinstance(self.i, list) and all(isinstance(x, PSBTMap) for x in self.i)
         assert isinstance(self.o, list) and all(isinstance(x, PSBTMap) for x in self.o)
-        assert PSBT_GLOBAL_UNSIGNED_TX in self.g.map
-        tx = from_binary(CTransaction, self.g.map[PSBT_GLOBAL_UNSIGNED_TX])
-        assert_equal(len(tx.vin), len(self.i))
-        assert_equal(len(tx.vout), len(self.o))
+        if self.version is not None and self.version == 2:
+            self.g.map[PSBT_GLOBAL_INPUT_COUNT] = ser_compact_size(len(self.i))
+            self.g.map[PSBT_GLOBAL_OUTPUT_COUNT] = ser_compact_size(len(self.o))
+        if self.version is None or (self.version is not None and self.version == 0):
+            assert PSBT_GLOBAL_UNSIGNED_TX in self.g.map
+            tx = from_binary(CTransaction, self.g.map[PSBT_GLOBAL_UNSIGNED_TX])
+            assert_equal(len(tx.vin), len(self.i))
+            assert_equal(len(tx.vout), len(self.o))
 
         psbt = [x.serialize() for x in [self.g] + self.i + self.o]
         return b"psbt\xff" + b"".join(psbt)
 
     def make_blank(self):
         """
-        Remove all fields except for PSBT_GLOBAL_UNSIGNED_TX
+        Remove all fields except for required fields depending on version
         """
-        for m in self.i + self.o:
-            m.map.clear()
-
-        self.g = PSBTMap(map={PSBT_GLOBAL_UNSIGNED_TX: self.g.map[PSBT_GLOBAL_UNSIGNED_TX]})
+        if self.version == 0:
+            for m in self.i + self.o:
+                m.map.clear()
+
+            self.g = PSBTMap(map={PSBT_GLOBAL_UNSIGNED_TX: self.g.map[PSBT_GLOBAL_UNSIGNED_TX]})
+        elif self.version == 2:
+            self.g = PSBTMap(map={
+                PSBT_GLOBAL_TX_VERSION: self.g.map[PSBT_GLOBAL_TX_VERSION],
+                PSBT_GLOBAL_INPUT_COUNT: self.g.map[PSBT_GLOBAL_INPUT_COUNT],
+                PSBT_GLOBAL_OUTPUT_COUNT: self.g.map[PSBT_GLOBAL_OUTPUT_COUNT],
+                PSBT_GLOBAL_VERSION: self.g.map[PSBT_GLOBAL_VERSION],
+                PSBT_GLOBAL_FALLBACK_LOCKTIME: self.g.map[PSBT_GLOBAL_FALLBACK_LOCKTIME],
+            })
+
+            new_i = []
+            for m in self.i:
+                new_i.append(PSBTMap(map={
+                    PSBT_IN_PREVIOUS_TXID: m.map[PSBT_IN_PREVIOUS_TXID],
+                    PSBT_IN_OUTPUT_INDEX: m.map[PSBT_IN_OUTPUT_INDEX],
+                }))
+            self.i = new_i
+
+            new_o = []
+            for m in self.o:
+                new_o.append(PSBTMap(map={
+                    PSBT_OUT_SCRIPT: m.map[PSBT_OUT_SCRIPT],
+                    PSBT_OUT_AMOUNT: m.map[PSBT_OUT_AMOUNT],
+                }))
+            self.o = new_o
+        else:
+            assert False
 
     def to_base64(self):
         return base64.b64encode(self.serialize()).decode("utf8")
diff --git a/depend/bitcoin/test/functional/test_framework/socks5.py b/depend/bitcoin/test/functional/test_framework/socks5.py
index 28aa2e8e..44d8e6fc 100644
--- a/depend/bitcoin/test/functional/test_framework/socks5.py
+++ b/depend/bitcoin/test/functional/test_framework/socks5.py
@@ -12,6 +12,7 @@
 
 from .netutil import (
     format_addr_port,
+    format_sock,
     set_ephemeral_port_range,
 )
 
@@ -55,6 +56,12 @@ def forward_sockets(a, b, wakeup_socket, serv):
     Monitors wakeup_socket for a shutdown signal and checks serv.is_running()
     to exit gracefully when the server is stopping.
     """
+    # Prefix messages with e.g.:
+    # forward_sockets(a{remote=127.0.0.1:36935, local=127.0.0.1:9050} <-> b{local=127.0.0.1:33424, remote=127.0.0.1:8333})
+    log_prefix = ("forward_sockets("
+                  f"a{{remote={format_sock(a, local=False)}, local={format_sock(a, local=True)}}} <-> "
+                  f"b{{local={format_sock(b, local=True)}, remote={format_sock(b, local=False)}}}): ")
+
     # Mark as non-blocking so that we do not end up in a deadlock-like situation
     # where we block and wait on data from `a` while there is data ready to be
     # received on `b` and forwarded to `a`. And at the same time the application
@@ -63,24 +70,26 @@ def forward_sockets(a, b, wakeup_socket, serv):
     a.setblocking(False)
     b.setblocking(False)
     sockets = [a, b, wakeup_socket]
-    done = False
-    while not done:
+    while True:
         # Blocking select with timeout
         rlist, _, xlist = select.select(sockets, [], sockets, 2)
         if not serv.is_running():
-            logger.debug("forward_sockets: Exit due to shutdown")
+            logger.debug(f"{log_prefix}Exit due to shutdown")
             return
         if len(xlist) > 0:
-            raise IOError('Exceptional condition on socket')
+            raise IOError(f"{log_prefix}Exceptional condition on socket")
         for s in rlist:
-            data = s.recv(4096)
-            if data is None or len(data) == 0:
-                done = True
-                break
-            if s == a:
-                sendall(b, data)
-            elif s == b:
-                sendall(a, data)
+            try:
+                data = s.recv(4096)
+                if data is None or len(data) == 0:
+                    return
+                if s == a:
+                    sendall(b, data)
+                elif s == b:
+                    sendall(a, data)
+            except (BrokenPipeError, ConnectionResetError) as e:
+                logger.debug(f"{log_prefix}cannot send or receive data on socket {'a' if s == a else 'b'}: {str(e)}")
+                return
 
 # Implementation classes
 class Socks5Configuration():
@@ -95,6 +104,7 @@ def __init__(self):
         # and it decides where the connection is redirected to. It is passed:
         # - the address the client requested to connect to
         # - the port the client requested to connect to
+        # - the client's socket address as seen by the proxy, formatted as host:port
         # It is supposed to return an object like:
         # {
         #     "actual_to_addr": "127.0.0.1"
@@ -129,7 +139,13 @@ def __init__(self, serv, conn):
 
     def handle(self):
         """Handle socks5 request according to RFC1928."""
+        log_exception_prefix = "Socks5Connection.handle(): "
         try:
+            proxy_client = format_sock(self.conn, local=False)
+            log_exception_prefix = ("Socks5Connection.handle("
+                                    f"client={proxy_client}, "
+                                    f"proxy={format_sock(self.conn, local=True)}): ")
+
             # Verify socks version
             ver = recvall(self.conn, 1)[0]
             if ver != 0x05:
@@ -179,7 +195,9 @@ def handle(self):
             port_hi,port_lo = recvall(self.conn, 2)
             port = (port_hi << 8) | port_lo
 
-            # Send dummy response
+            # Reply SUCCESS before calling destinations_factory, so the client can finish
+            # establishing the connection and register the peer; factories that consult
+            # getpeerinfo depend on that order.
             self.conn.sendall(bytearray([0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
 
             cmdin = Socks5Command(cmd, atyp, addr, port, username, password)
@@ -191,7 +209,7 @@ def handle(self):
 
             if self.serv.is_running():
                 if self.serv.conf.destinations_factory is not None:
-                    dest = self.serv.conf.destinations_factory(requested_to_addr, port)
+                    dest = self.serv.conf.destinations_factory(requested_to_addr, port, proxy_client)
                     if dest is not None:
                         logger.debug(f"Serving connection to {requested_to}, will redirect it to "
                                     f"{dest['actual_to_addr']}:{dest['actual_to_port']} instead")
@@ -203,9 +221,12 @@ def handle(self):
                 else:
                     logger.debug(f"Can't serve the connection to {requested_to}: no destinations factory")
 
-            # Fall through to disconnect
+            # Disconnect happens in the "finally" block below.
+
+        except (BrokenPipeError, ConnectionResetError) as e:
+            logger.debug(f"{log_exception_prefix}abnormal connection close: {str(e)}")
         except Exception as e:
-            logger.exception(f"socks5 request handling failed (running {self.serv.is_running()})")
+            logger.exception(f"{log_exception_prefix}exception: {str(e)} (running {self.serv.is_running()})")
             if self.serv.is_running():
                 self.serv.queue.put(e)
         finally:
@@ -327,3 +348,15 @@ def stop(self):
                     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
diff --git a/depend/bitcoin/test/functional/test_framework/test_framework.py b/depend/bitcoin/test/functional/test_framework/test_framework.py
index 067388c6..0617d334 100755
--- a/depend/bitcoin/test/functional/test_framework/test_framework.py
+++ b/depend/bitcoin/test/functional/test_framework/test_framework.py
@@ -8,6 +8,7 @@
 from enum import Enum
 import argparse
 from datetime import datetime, timezone
+from importlib.util import find_spec
 import logging
 import os
 from pathlib import Path
@@ -22,8 +23,8 @@
 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 (
@@ -40,6 +41,7 @@
     p2p_port,
     wait_until_helper_internal,
     wallet_importprivkey,
+    JSONRPCException,
 )
 
 
@@ -190,8 +192,6 @@ def parse_args(self, test_file):
                             help="Attach a python debugger if test fails")
         parser.add_argument("--usecli", dest="usecli", default=False, action="store_true",
                             help="use bitcoin-cli instead of RPC for all commands")
-        parser.add_argument("--perf", dest="perf", default=False, action="store_true",
-                            help="profile running nodes with perf for the duration of the test")
         parser.add_argument("--valgrind", dest="valgrind", default=False, action="store_true",
                             help="Run binaries under the valgrind memory error detector: Expect at least a ~10x slowdown. Does not apply to previous release binaries.")
         parser.add_argument("--randomseed", type=int,
@@ -291,15 +291,11 @@ def shutdown(self):
 
         should_clean_up = (
             not self.options.nocleanup and
-            self.success != TestStatus.FAILED and
-            not self.options.perf
+            self.success != TestStatus.FAILED
         )
         if should_clean_up:
             self.log.info("Cleaning up {} on exit".format(self.options.tmpdir))
             cleanup_tree_on_exit = True
-        elif self.options.perf:
-            self.log.warning("Not cleaning up dir {} due to perf data".format(self.options.tmpdir))
-            cleanup_tree_on_exit = False
         else:
             self.log.warning("Not cleaning up dir {}".format(self.options.tmpdir))
             cleanup_tree_on_exit = False
@@ -481,7 +477,6 @@ def bin_dir_from_version(version):
                 extra_conf=extra_confs[i],
                 extra_args=args,
                 use_cli=self.options.usecli,
-                start_perf=self.options.perf,
                 v2transport=self.options.v2transport,
                 uses_wallet=self.uses_wallet,
             )
@@ -535,6 +530,27 @@ def stop_nodes(self, wait=0):
             # Wait for nodes to stop
             node.wait_until_stopped()
 
+    def cleanup_partially_started_nodes(self):
+        """Tear down nodes left running after a failed start_nodes().
+
+        After start_nodes() raises (e.g. FailedToStartError), some nodes may be
+        RPC-connected, some may have a live process without RPC, and some may
+        already have exited. Stop the connected ones cleanly and force-kill the
+        rest so the framework's teardown can proceed.
+        """
+        for node in self.nodes:
+            if not node.running:
+                continue
+            if node.rpc_connected:
+                node.stop_node(wait=node.rpc_timeout)
+            else:
+                node.process.kill()
+                node.process.wait(timeout=node.rpc_timeout)
+                node.process = None
+                node.stdout.close()
+                node.stderr.close()
+                node.running = False
+
     def restart_node(self, i, extra_args=None, clear_addrman=False, *, expected_stderr=''):
         """Stop and start a test node"""
         self.stop_node(i, expected_stderr=expected_stderr)
@@ -730,6 +746,125 @@ def sync_all(self, nodes=None):
     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):
@@ -892,6 +1027,11 @@ def skip_if_platform_not_linux(self):
         if platform.system() != "Linux":
             raise SkipTest("not on a Linux system")
 
+    def skip_if_no_lsof_on_nonlinux(self):
+        """Skip the running test if the lsof utility is not available on non-Linux platforms."""
+        if sys.platform != "linux" and shutil.which("lsof") is None:
+            raise SkipTest("lsof not available")
+
     def skip_if_platform_not_posix(self):
         """Skip the running test if we are not on a POSIX platform"""
         if os.name != 'posix':
@@ -943,11 +1083,27 @@ def skip_if_no_ipc(self):
         if not self.is_ipc_compiled():
             raise SkipTest("ipc has not been compiled.")
 
+    def skip_if_no_gui(self):
+        """Skip the running test if the GUI has not been compiled."""
+        if not self.is_gui_compiled():
+            raise SkipTest("GUI has not been compiled.")
+
     def skip_if_no_previous_releases(self):
         """Skip the running test if previous releases are not available."""
         if not self.has_previous_releases():
             raise SkipTest("previous releases not available or disabled")
 
+    def has_resource_module(self):
+        """Checks whether the resource module is available."""
+        return find_spec('resource') is not None
+
+    @property
+    def RLIM_INFINITY(self):
+        if not self.has_resource_module():
+            return None
+        import resource
+        return resource.RLIM_INFINITY
+
     def has_previous_releases(self):
         """Checks whether previous releases are present and enabled."""
         if not os.path.isdir(self.options.previous_releases_path):
@@ -968,51 +1124,55 @@ def skip_if_running_under_valgrind(self):
 
     def is_bench_compiled(self):
         """Checks whether bench_bitcoin was compiled."""
-        return self.config["components"].getboolean("BUILD_BENCH")
+        return self.config.getboolean("components", "BUILD_BENCH")
 
     def is_cli_compiled(self):
         """Checks whether bitcoin-cli was compiled."""
-        return self.config["components"].getboolean("ENABLE_CLI")
+        return self.config.getboolean("components", "ENABLE_CLI")
 
     def is_external_signer_compiled(self):
         """Checks whether external signer support was compiled."""
-        return self.config["components"].getboolean("ENABLE_EXTERNAL_SIGNER")
+        return self.config.getboolean("components", "ENABLE_EXTERNAL_SIGNER")
 
     def is_wallet_compiled(self):
         """Checks whether the wallet module was compiled."""
-        return self.config["components"].getboolean("ENABLE_WALLET")
+        return self.config.getboolean("components", "ENABLE_WALLET")
 
     def is_wallet_tool_compiled(self):
         """Checks whether bitcoin-wallet was compiled."""
-        return self.config["components"].getboolean("ENABLE_WALLET_TOOL")
+        return self.config.getboolean("components", "ENABLE_WALLET_TOOL")
 
     def is_bitcoin_tx_compiled(self):
         """Checks whether bitcoin-tx was compiled."""
-        return self.config["components"].getboolean("BUILD_BITCOIN_TX")
+        return self.config.getboolean("components", "BUILD_BITCOIN_TX")
 
     def is_bitcoin_util_compiled(self):
         """Checks whether bitcoin-util was compiled."""
-        return self.config["components"].getboolean("ENABLE_BITCOIN_UTIL")
+        return self.config.getboolean("components", "ENABLE_BITCOIN_UTIL")
 
     def is_bitcoin_chainstate_compiled(self):
         """Checks whether bitcoin-chainstate was compiled."""
-        return self.config["components"].getboolean("ENABLE_BITCOIN_CHAINSTATE")
+        return self.config.getboolean("components", "ENABLE_BITCOIN_CHAINSTATE")
 
     def is_zmq_compiled(self):
         """Checks whether the zmq module was compiled."""
-        return self.config["components"].getboolean("ENABLE_ZMQ")
+        return self.config.getboolean("components", "ENABLE_ZMQ")
 
     def is_embedded_asmap_compiled(self):
         """Checks whether ASMap data was embedded during compilation."""
-        return self.config["components"].getboolean("ENABLE_EMBEDDED_ASMAP")
+        return self.config.getboolean("components", "ENABLE_EMBEDDED_ASMAP")
 
     def is_usdt_compiled(self):
         """Checks whether the USDT tracepoints were compiled."""
-        return self.config["components"].getboolean("ENABLE_USDT_TRACEPOINTS")
+        return self.config.getboolean("components", "ENABLE_USDT_TRACEPOINTS")
 
     def is_ipc_compiled(self):
         """Checks whether ipc was compiled."""
-        return self.config["components"].getboolean("ENABLE_IPC")
+        return self.config.getboolean("components", "ENABLE_IPC")
+
+    def is_gui_compiled(self):
+        """Checks whether the GUI was compiled."""
+        return self.config.getboolean("components", "BUILD_GUI")
 
     def has_blockfile(self, node, filenum: str):
         return (node.blocks_path/ f"blk{filenum}.dat").is_file()
diff --git a/depend/bitcoin/test/functional/test_framework/test_node.py b/depend/bitcoin/test/functional/test_framework/test_node.py
index 1ba2e09b..62c55268 100755
--- a/depend/bitcoin/test/functional/test_framework/test_node.py
+++ b/depend/bitcoin/test/functional/test_framework/test_node.py
@@ -18,15 +18,16 @@
 import time
 import urllib.parse
 import collections
-import shlex
 import sys
 from collections.abc import Iterable
 from pathlib import Path
 
 from .authproxy import (
+    AuthServiceProxy,
     JSONRPCException,
     serialization_fallback,
 )
+from . import coverage
 from .messages import NODE_P2P_V2
 from .p2p import P2P_SERVICES, P2P_SUBVERSION
 from .util import (
@@ -36,8 +37,7 @@
     append_config,
     delete_cookie_file,
     get_auth_cookie,
-    get_rpc_proxy,
-    rpc_url,
+    rpc_port,
     wait_until_helper_internal,
     p2p_port,
     tor_port,
@@ -76,6 +76,9 @@ class ErrorMatch(Enum):
     PARTIAL_REGEX = 3
 
 
+RPCConnectionType = Enum("RPCConnectionType", ["AUTO", "AUTHPROXY", "CLI"])
+
+
 class TestNode():
     """A class for representing a bitcoind node under test.
 
@@ -105,18 +108,12 @@ def __init__(
         extra_conf=None,
         extra_args=None,
         use_cli=False,
-        start_perf=False,
         version=None,
         v2transport=False,
         uses_wallet=False,
         ipcbind=False,
+        use_gui=False,
     ):
-        """
-        Kwargs:
-            start_perf (bool): If True, begin profiling the node with `perf` as soon as
-                the node starts.
-        """
-
         self.index = i
         self.datadir_path = datadir_path
         self.bitcoinconf = self.datadir_path / "bitcoin.conf"
@@ -129,6 +126,7 @@ def __init__(
         self.binaries = binaries
         self.coverage_dir = coverage_dir
         self.cwd = cwd
+        self.use_gui = use_gui
         self.has_explicit_bind = False
         if extra_conf is not None:
             append_config(self.datadir_path, extra_conf)
@@ -142,11 +140,10 @@ def __init__(
         # Configuration for logging is set as command-line args rather than in the bitcoin.conf file.
         # This means that starting a bitcoind using the temp dir to debug a failed test won't
         # spam debug.log.
-        self.args = self.binaries.node_argv(need_ipc=ipcbind) + [
+        self.args = self.binaries.node_argv(need_ipc=ipcbind, use_gui=use_gui) + [
             f"-datadir={self.datadir_path}",
             "-logtimemicros",
             "-debug",
-            "-debugexclude=libevent",
             "-debugexclude=leveldb",
             "-debugexclude=rand",
             "-uacomment=testnode%d" % i,  # required for subversion uniqueness across peers
@@ -185,23 +182,16 @@ def __init__(
                 self.args.append("-v2transport=0")
         # if v2transport is requested via global flag but not supported for node version, ignore it
 
-        self.cli = TestNodeCLI(
-            binaries,
-            self.datadir_path,
-            self.rpc_timeout // 2,  # timeout identical to the one used in self._rpc
-        )
+        self.cli = None
         self.use_cli = use_cli
-        self.start_perf = start_perf
 
         self.running = False
         self.process = None
         self.rpc_connected = False
         self._rpc = None # Should usually not be accessed directly in tests to allow for --usecli mode
-        self.reuse_http_connections = True # Must be set before calling get_rpc_proxy() i.e. before restarting node
+        self.reuse_http_connections = True # Must be set before create_new_rpc_connection(), i.e. before restarting node
         self.url = None
         self.log = logging.getLogger('TestFramework.node%d' % i)
-        # Cache perf subprocesses here by their data output filename.
-        self.perf_subprocesses = {}
 
         self.p2ps = []
 
@@ -290,6 +280,36 @@ def start(self, extra_args=None, *, cwd=None, stdout=None, stderr=None, env=None
 
         # add environment variable LIBC_FATAL_STDERR_=1 so that libc errors are written to stderr and not the terminal
         subp_env = dict(os.environ, LIBC_FATAL_STDERR_="1")
+        if self.use_gui:
+            subp_env.setdefault("QT_QPA_PLATFORM", "minimal")
+            if platform.system() == "Darwin":
+                # QMacStyle assumes a Cocoa platform window, which the minimal platform
+                # does not provide. In particular, painting a QGroupBox can make Qt call
+                # addSubview: on an invalid native object (QTBUG-49686).
+                subp_env.setdefault("QT_STYLE_OVERRIDE", "fusion")
+            if platform.system() == "OpenBSD":
+                # The system Qt packages are built with GLib support, so Qt uses
+                # QEventDispatcherGlib, which pushes/pops the GLib thread-default
+                # main context in each thread. On OpenBSD the pop can run during
+                # thread exit after GLib's per-thread context stack has already
+                # been torn down, so shutdown emits messages like
+                #   (process:NNN): GLib-CRITICAL **: g_main_context_pop_thread_default:
+                #   assertion 'stack != NULL' failed
+                # on stderr, which the test framework treats as a failure.
+                # Fall back to Qt's poll-based event dispatcher instead.
+                subp_env.setdefault("QT_NO_GLIB", "1")
+            subp_env.setdefault("LC_ALL", "nl_NL.UTF-8") # Set language to try to trigger translation bugs
+            if sys.platform.startswith("linux") and "XDG_RUNTIME_DIR" not in subp_env:
+                # Qt prints warnings to stderr when XDG_RUNTIME_DIR is unset or has wrong
+                # permissions (e.g. in CI environments without a desktop session), which
+                # would cause tests to fail due to unexpected stderr output. The two
+                # warnings are:
+                #   "QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-root'"
+                #   "QStandardPaths: wrong permissions on runtime directory /path, 0755 instead of 0700"
+                # Use a dedicated subdirectory with the required 0700 permissions.
+                xdg_runtime_dir = self.datadir_path / "xdg_runtime"
+                xdg_runtime_dir.mkdir(mode=0o700, exist_ok=True)
+                subp_env["XDG_RUNTIME_DIR"] = str(xdg_runtime_dir)
         if env is not None:
             subp_env.update(env)
 
@@ -298,8 +318,35 @@ def start(self, extra_args=None, *, cwd=None, stdout=None, stderr=None, env=None
         self.running = True
         self.log.debug("bitcoind started, waiting for RPC to come up")
 
-        if self.start_perf:
-            self._start_perf()
+    def create_new_rpc_connection(self, *, mode="AUTO", client_timeout=None):
+        """Create an additional RPC connection, likely to be used in a new thread."""
+        mode = RPCConnectionType[mode]
+        if mode == RPCConnectionType.AUTO:
+            mode = RPCConnectionType.CLI if self.use_cli else RPCConnectionType.AUTHPROXY
+        client_timeout = client_timeout or (self.rpc_timeout // 2)  # Shorter timeout to allow for one retry in case of ETIMEDOUT
+        host = "127.0.0.1"
+        port = rpc_port(self.index)
+        if self.rpchost:
+            parts = self.rpchost.split(":")
+            if len(parts) == 2:
+                host, port = parts
+            else:
+                host = self.rpchost
+        if mode == RPCConnectionType.AUTHPROXY:
+            rpc_u, rpc_p = get_auth_cookie(self.datadir_path, self.chain)
+            url = f"http://{rpc_u}:{rpc_p}@{host}:{port}"
+            proxy = AuthServiceProxy(url, timeout=int(client_timeout))
+            coverage_logfile = coverage.get_filename(self.coverage_dir, self.index) if self.coverage_dir else None
+            rpc = coverage.AuthServiceProxyWrapper(proxy, url, coverage_logfile)
+            rpc.auth_service_proxy_instance.reuse_http_connections = self.reuse_http_connections
+            return rpc
+        else:  # mode==CLI
+            return TestNodeCLI(self.binaries)(
+                f"-datadir={self.datadir_path}",
+                f"-rpcclienttimeout={client_timeout}",
+                f"-rpcconnect={host}",
+                f"-rpcport={port}",
+            )
 
     def wait_for_rpc_connection(self, *, wait_for_import=True):
         """Sets up an RPC connection to the bitcoind process. Returns False if unable to connect."""
@@ -322,13 +369,7 @@ def suppress_error(category: str, e: Exception):
                 raise FailedToStartError(self._node_msg(
                     f'bitcoind exited with status {self.process.returncode} during initialization. {str_error}'))
             try:
-                rpc = get_rpc_proxy(
-                    rpc_url(self.datadir_path, self.index, self.chain, self.rpchost),
-                    self.index,
-                    timeout=self.rpc_timeout // 2,  # Shorter timeout to allow for one retry in case of ETIMEDOUT
-                    coveragedir=self.coverage_dir,
-                )
-                rpc.auth_service_proxy_instance.reuse_http_connections = self.reuse_http_connections
+                rpc = self.create_new_rpc_connection(mode="AUTHPROXY")
                 rpc.getblockcount()
                 # If the call to getblockcount() succeeds then the RPC connection is up
                 if self.version_is_at_least(190000) and wait_for_import:
@@ -355,10 +396,11 @@ def suppress_error(category: str, e: Exception):
                 self.log.debug("RPC successfully started")
                 # Set rpc_connected even if we are in use_cli mode so that we know we can call self.stop() if needed.
                 self.rpc_connected = True
+                self.url = rpc.rpc_url
+                self.cli = self.create_new_rpc_connection(mode="CLI")
                 if self.use_cli:
                     return
                 self._rpc = rpc
-                self.url = self._rpc.rpc_url
                 return
             except JSONRPCException as e:
                 # Suppress these as they are expected during initialization.
@@ -378,9 +420,13 @@ def suppress_error(category: str, e: Exception):
                     # doesn't specify errno.
                     elif isinstance(e, ConnectionResetError):
                         error_num = errno.ECONNRESET
+                    # Windows can raise this while bitcoind shuts down during startup.
+                    elif isinstance(e, ConnectionAbortedError):
+                        error_num = errno.ECONNABORTED
 
                 # Suppress similarly to the above JSONRPCException errors.
                 if error_num not in [
+                    errno.ECONNABORTED, # Treat identical to ECONNRESET
                     errno.ECONNRESET,   # This might happen when the RPC server is in warmup,
                                         # but shut down before the call to getblockcount succeeds.
                     errno.ETIMEDOUT,    # Treat identical to ECONNRESET
@@ -461,10 +507,6 @@ def stop_node(self, expected_stderr='', *, wait=0, wait_until_stopped=True):
         else:
             self.stop()
 
-        # If there are any running perf processes, stop them.
-        for profile_name in tuple(self.perf_subprocesses.keys()):
-            self._stop_perf(profile_name)
-
         del self.p2ps[:]
 
         assert (not expected_stderr) or wait_until_stopped  # Must wait to check stderr
@@ -650,84 +692,6 @@ def get_highest_peer_id():
         yield
         self.wait_until(lambda: get_highest_peer_id() > initial_peer_id, timeout=timeout)
 
-    @contextlib.contextmanager
-    def profile_with_perf(self, profile_name: str):
-        """
-        Context manager that allows easy profiling of node activity using `perf`.
-
-        See `test/functional/README.md` for details on perf usage.
-
-        Args:
-            profile_name: This string will be appended to the
-                profile data filename generated by perf.
-        """
-        subp = self._start_perf(profile_name)
-
-        yield
-
-        if subp:
-            self._stop_perf(profile_name)
-
-    def _start_perf(self, profile_name=None):
-        """Start a perf process to profile this node.
-
-        Returns the subprocess running perf."""
-        subp = None
-
-        def test_success(cmd):
-            return subprocess.call(
-                # shell=True required for pipe use below
-                cmd, shell=True,
-                stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL) == 0
-
-        if platform.system() != 'Linux':
-            self.log.warning("Can't profile with perf; only available on Linux platforms")
-            return None
-
-        if not test_success('which perf'):
-            self.log.warning("Can't profile with perf; must install perf-tools")
-            return None
-
-        if not test_success('readelf -S {} | grep .debug_str'.format(shlex.quote(self.binary))):
-            self.log.warning(
-                "perf output won't be very useful without debug symbols compiled into bitcoind")
-
-        output_path = tempfile.NamedTemporaryFile(
-            dir=self.datadir_path,
-            prefix="{}.perf.data.".format(profile_name or 'test'),
-            delete=False,
-        ).name
-
-        cmd = [
-            'perf', 'record',
-            '-g',                     # Record the callgraph.
-            '--call-graph', 'dwarf',  # Compatibility for gcc's --fomit-frame-pointer.
-            '-F', '101',              # Sampling frequency in Hz.
-            '-p', str(self.process.pid),
-            '-o', output_path,
-        ]
-        subp = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        self.perf_subprocesses[profile_name] = subp
-
-        return subp
-
-    def _stop_perf(self, profile_name):
-        """Stop (and pop) a perf subprocess."""
-        subp = self.perf_subprocesses.pop(profile_name)
-        output_path = subp.args[subp.args.index('-o') + 1]
-
-        subp.terminate()
-        subp.wait(timeout=10)
-
-        stderr = subp.stderr.read().decode()
-        if 'Consider tweaking /proc/sys/kernel/perf_event_paranoid' in stderr:
-            self.log.warning(
-                "perf couldn't collect data! Try "
-                "'sudo sysctl -w kernel.perf_event_paranoid=-1'")
-        else:
-            report_cmd = "perf report -i {}".format(output_path)
-            self.log.info("See perf output by running '{}'".format(report_cmd))
-
     def assert_start_raises_init_error(self, extra_args=None, expected_msg=None, match=ErrorMatch.FULL_TEXT, *args, **kwargs):
         """Attempt to start the node and expect it to raise an error.
 
@@ -954,18 +918,16 @@ def arg_to_cli(arg):
 
 class TestNodeCLI():
     """Interface to bitcoin-cli for an individual node"""
-    def __init__(self, binaries, datadir, rpc_timeout):
+    def __init__(self, binaries):
         self.options = []
         self.binaries = binaries
-        self.datadir = datadir
-        self.rpc_timeout = rpc_timeout
         self.input = None
         self.log = logging.getLogger('TestFramework.bitcoincli')
 
     def __call__(self, *options, input=None):
         # TestNodeCLI is callable with bitcoin-cli command-line options
-        cli = TestNodeCLI(self.binaries, self.datadir, self.rpc_timeout)
-        cli.options = [str(o) for o in options]
+        cli = TestNodeCLI(self.binaries)
+        cli.options = self.options + [str(o) for o in options]
         cli.input = input
         return cli
 
@@ -985,10 +947,7 @@ def send_cli(self, clicommand=None, *args, **kwargs):
         """Run bitcoin-cli command. Deserializes returned string as python object."""
         pos_args = [arg_to_cli(arg) for arg in args]
         named_args = [key + "=" + arg_to_cli(value) for (key, value) in kwargs.items() if value is not None]
-        p_args = self.binaries.rpc_argv() + [
-            f"-datadir={self.datadir}",
-            f"-rpcclienttimeout={int(self.rpc_timeout)}",
-        ] + self.options
+        p_args = self.binaries.rpc_argv() + self.options
         if named_args:
             p_args += ["-named"]
         base_arg_pos = len(p_args)
@@ -1019,6 +978,13 @@ def send_cli(self, clicommand=None, *args, **kwargs):
             if match:
                 code, message = match.groups()
                 raise JSONRPCException(dict(code=int(code), message=message))
+            match = re.match(r'error: Server response: (.*)\n?$', cli_stderr)
+            if match:
+                message = match.group(1)
+                raise JSONRPCException(dict(
+                    code=-342,
+                    message=f"non-JSON HTTP response with '503 Service Unavailable' from server: {message}",
+                ), http_status=503)
             # Ignore cli_stdout, raise with cli_stderr
             raise subprocess.CalledProcessError(returncode, p_args, output=cli_stderr)
         try:
diff --git a/depend/bitcoin/test/functional/test_framework/util.py b/depend/bitcoin/test/functional/test_framework/util.py
index 8e1e3c71..1f9d5901 100644
--- a/depend/bitcoin/test/functional/test_framework/util.py
+++ b/depend/bitcoin/test/functional/test_framework/util.py
@@ -5,6 +5,7 @@
 """Helpful routines for regression testing."""
 
 from base64 import b64encode
+from copy import copy
 from decimal import Decimal
 from subprocess import CalledProcessError
 import hashlib
@@ -20,8 +21,6 @@
 import time
 import types
 
-from . import coverage
-from .authproxy import AuthServiceProxy, JSONRPCException
 from .descriptors import descsum_create
 from collections.abc import Callable
 from typing import Optional, Union
@@ -30,6 +29,18 @@
 
 logger = logging.getLogger("TestFramework.utils")
 
+class JSONRPCException(Exception):
+    def __init__(self, rpc_error, http_status=None):
+        self.error = rpc_error
+        self.http_status = http_status
+
+        # throw KeyError if any required fields are missing
+        copied_error = copy(rpc_error)
+        message = copied_error.pop("message")
+        code = copied_error.pop("code")
+        extra = f'{copied_error}' if copied_error else ''
+        super().__init__(f"{message} ({code}) {extra} [http_status={http_status}]")
+
 # Assert functions
 ##################
 
@@ -294,11 +305,11 @@ def chainstate_argv(self):
         "Return argv array that should be used to invoke bitcoin-chainstate"
         return self._argv("chainstate", self.paths.bitcoinchainstate)
 
-    def _argv(self, command, bin_path, need_ipc=False):
+    def _argv(self, command, bin_path, *, need_ipc=False, use_gui=False):
         """Return argv array that should be used to invoke the command.
 
-        It either uses the bitcoin wrapper executable (if BITCOIN_CMD is set or
-        need_ipc is True), or the direct binary path (bitcoind, etc). When
+        It either uses the bitcoin wrapper executable (if BITCOIN_CMD, need_ipc,
+        or use_gui are set), or the direct binary path (bitcoind, etc). When
         bin_dir is set (by tests calling binaries from previous releases) it
         always uses the direct path.
 
@@ -308,11 +319,12 @@ def _argv(self, command, bin_path, need_ipc=False):
         """
         if self.bin_dir is not None:
             return [os.path.join(self.bin_dir, os.path.basename(bin_path))]
-        elif self.paths.bitcoin_cmd is not None or need_ipc:
-            # If the current test needs IPC functionality, use the bitcoin
-            # wrapper binary and append -m so it calls multiprocess binaries.
+        elif self.paths.bitcoin_cmd is not None or need_ipc or use_gui:
+            # If the current test needs IPC or GUI functionality, use the
+            # bitcoin wrapper binary and add appropriate options.
             bitcoin_cmd = self.paths.bitcoin_cmd or [self.paths.bitcoin_bin]
-            return self.valgrind_cmd + bitcoin_cmd + (["-m"] if need_ipc else []) + [command]
+            subcommand = "gui" if use_gui and command == "node" else command
+            return self.valgrind_cmd + bitcoin_cmd + (["-m"] if need_ipc else []) + [subcommand]
         else:
             return self.valgrind_cmd + [bin_path]
 
@@ -478,32 +490,6 @@ class PortSeed:
     # Must be initialized with a unique integer for each process
     n = None
 
-
-def get_rpc_proxy(url: str, node_number: int, *, timeout: Optional[int]=None, coveragedir: Optional[str]=None) -> coverage.AuthServiceProxyWrapper:
-    """
-    Args:
-        url: URL of the RPC server to call
-        node_number: the node number (or id) that this calls to
-
-    Kwargs:
-        timeout: HTTP timeout in seconds
-        coveragedir: Directory
-
-    Returns:
-        AuthServiceProxy. convenience object for making RPC calls.
-
-    """
-    proxy_kwargs = {}
-    if timeout is not None:
-        proxy_kwargs['timeout'] = int(timeout)
-
-    proxy = AuthServiceProxy(url, **proxy_kwargs)
-
-    coverage_logfile = coverage.get_filename(coveragedir, node_number) if coveragedir else None
-
-    return coverage.AuthServiceProxyWrapper(proxy, url, coverage_logfile)
-
-
 def p2p_port(n):
     assert n <= MAX_NODES
     return PORT_MIN + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
@@ -517,19 +503,6 @@ def tor_port(n):
     return p2p_port(n) + PORT_RANGE * 2
 
 
-def rpc_url(datadir, i, chain, rpchost):
-    rpc_u, rpc_p = get_auth_cookie(datadir, chain)
-    host = '127.0.0.1'
-    port = rpc_port(i)
-    if rpchost:
-        parts = rpchost.split(':')
-        if len(parts) == 2:
-            host, port = parts
-        else:
-            host = rpchost
-    return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, host, int(port))
-
-
 # Node functions
 ################
 
@@ -576,7 +549,7 @@ def write_config(config_path, *, n, chain, extra_config="", disable_autoconnect=
         # in tests.
         f.write("peertimeout=999999999\n")
         f.write("printtoconsole=0\n")
-        f.write("natpmp=0\n")
+        f.write("natpmp=0\n") # Avoid non-loopback network traffic during tests.
         f.write("shrinkdebugfile=0\n")
         # To improve SQLite wallet performance so that the tests don't timeout, use -unsafesqlitesync
         f.write("unsafesqlitesync=1\n")
@@ -594,6 +567,8 @@ def write_config(config_path, *, n, chain, extra_config="", disable_autoconnect=
         #  nMaxConnections = available_fds - min_required_fds = 256 - 161 = 94;
         f.write("maxconnections=94\n")
         f.write("par=" + str(min(2, os.cpu_count())) + "\n")
+        # Use a single prevoutfetch worker thread to keep per-node resource usage low.
+        f.write("prevoutfetchthreads=1\n")
         f.write(extra_config)
 
 
@@ -729,7 +704,8 @@ def dumb_sync_blocks(*, src, dst, height=None):
     height = height or src.getblockcount()
     for i in range(dst.getblockcount() + 1, height + 1):
         block_hash = src.getblockhash(i)
-        block = src.getblock(blockhash=block_hash, verbosity=0)
+        # Use boolean verbosity for v0.14.x compatibility.
+        block = src.getblock(blockhash=block_hash, verbose=False)
         dst.submitblock(block)
     assert_equal(dst.getblockcount(), height)
 
@@ -749,3 +725,17 @@ def wallet_importprivkey(wallet_rpc, privkey, timestamp, *, label=""):
     }]
     import_res = wallet_rpc.importdescriptors(req)
     assert_equal(import_res[0]["success"], True)
+
+def is_dir_writable(dir_path: pathlib.Path) -> bool:
+    """Return True if we can create a file in the directory, False otherwise"""
+    try:
+        tmp = dir_path / f".tmp_{random.randrange(1 << 32)}"
+        tmp.touch()
+        tmp.unlink()
+        return True
+    except OSError:
+        return False
+
+def bitflipper(input):
+    assert isinstance(input, bytes)
+    return (int.from_bytes(input, "little") ^ (1 << random.randrange(len(input) * 8))).to_bytes(len(input), "little")
diff --git a/depend/bitcoin/test/functional/test_framework/v2_p2p.py b/depend/bitcoin/test/functional/test_framework/v2_p2p.py
index 087b885a..4057fd9a 100644
--- a/depend/bitcoin/test/functional/test_framework/v2_p2p.py
+++ b/depend/bitcoin/test/functional/test_framework/v2_p2p.py
@@ -50,6 +50,7 @@
     26: b"getcfcheckpt",
     27: b"cfcheckpt",
     28: b"addrv2",
+    37: b"feature",
 }
 
 # Dictionary which contains short message type ID for the P2P message
diff --git a/depend/bitcoin/test/functional/test_framework/wallet.py b/depend/bitcoin/test/functional/test_framework/wallet.py
index fc8b639b..dbf24ec6 100644
--- a/depend/bitcoin/test/functional/test_framework/wallet.py
+++ b/depend/bitcoin/test/functional/test_framework/wallet.py
@@ -54,7 +54,10 @@
     assert_greater_than_or_equal,
     get_fee,
 )
-from test_framework.wallet_util import generate_keypair
+from test_framework.wallet_util import (
+    bytes_to_wif,
+    generate_keypair,
+)
 
 DEFAULT_FEE = Decimal("0.0001")
 
@@ -419,9 +422,44 @@ def send_self_transfer_chain(self, *, from_node, **kwargs):
         return chain
 
 
+class NodeSigner:
+    """Simple wallet replacement that delegates signing of existing raw transactions to a node by
+       using the `signrawtransactionwithkey` RPC. This can be used for spending from widespread
+       output types (P2PKH, P2WPKH, P2SH-P2WPKH, P2TR) without having the wallet compiled in."""
+    def __init__(self, node):
+        self._node = node
+        self._key_entries = []
+
+    def getnewaddress(self, address_type='legacy'):
+        (seckey, pubkey), spk, address = getnewdestination(address_type)
+        redeem_script = key_to_p2wpkh_script(pubkey) if address_type == 'p2sh-segwit' else None
+        self._key_entries.append({"seckey_wif": bytes_to_wif(seckey.get_bytes()), "output_script": spk, "redeem_script": redeem_script})
+        return pubkey, spk, address
+
+    def listunspent(self):
+        needles = [descsum_create(f'raw({key_entry["output_script"].hex()})') for key_entry in self._key_entries]
+        scan_res = self._node.scantxoutset(action="start", scanobjects=needles)
+        spend_height = scan_res['height'] + 1  # coins would be spent in the next block
+        unspents = []
+        for u in scan_res['unspents']:
+            if u["coinbase"] and (spend_height - u["height"]) < COINBASE_MATURITY:  # skip immature coins
+                continue
+            unspent = { "txid": u["txid"], "vout": u["vout"], "scriptPubKey": u["scriptPubKey"], "amount": u["amount"] }
+            key_entry = [ke for ke in self._key_entries if ke["output_script"] == bytes.fromhex(u["scriptPubKey"])][0]
+            if key_entry["redeem_script"] is not None:
+                unspent["redeemScript"] = key_entry["redeem_script"].hex()
+            unspents.append(unspent)
+        return unspents
+
+    def signrawtransaction(self, tx_hex, inputs):
+        output_scripts_to_sign = {i["scriptPubKey"] for i in inputs}
+        seckeys_wif = [ke["seckey_wif"] for ke in self._key_entries if ke["output_script"].hex() in output_scripts_to_sign]
+        return self._node.signrawtransactionwithkey(tx_hex, seckeys_wif, inputs)
+
+
 def getnewdestination(address_type='bech32m'):
     """Generate a random destination of the specified type and return the
-       corresponding public key, scriptPubKey and address. Supported types are
+       corresponding key pair, scriptPubKey and address. Supported types are
        'legacy', 'p2sh-segwit', 'bech32' and 'bech32m'. Can be used when a random
        destination is needed, but no compiled wallet is available (e.g. as
        replacement to the getnewaddress/getaddressinfo RPCs)."""
@@ -442,4 +480,4 @@ def getnewdestination(address_type='bech32m'):
         address = output_key_to_p2tr(pubkey)
     else:
         assert False
-    return pubkey, scriptpubkey, address
+    return (key, pubkey), scriptpubkey, address
diff --git a/depend/bitcoin/test/functional/test_framework/wallet_util.py b/depend/bitcoin/test/functional/test_framework/wallet_util.py
index 12251530..30d5a3a6 100755
--- a/depend/bitcoin/test/functional/test_framework/wallet_util.py
+++ b/depend/bitcoin/test/functional/test_framework/wallet_util.py
@@ -24,6 +24,7 @@
     script_to_p2sh_script,
 )
 
+
 Key = namedtuple('Key', ['privkey',
                          'pubkey',
                          'p2pkh_script',
diff --git a/depend/bitcoin/test/functional/test_runner.py b/depend/bitcoin/test/functional/test_runner.py
index 698742bc..68fbf420 100755
--- a/depend/bitcoin/test/functional/test_runner.py
+++ b/depend/bitcoin/test/functional/test_runner.py
@@ -125,6 +125,7 @@
     'feature_segwit.py --v2transport',
     'feature_segwit.py --v1transport',
     'p2p_tx_download.py',
+    'feature_txindex_compatibility.py',
     'wallet_avoidreuse.py',
     'feature_abortnode.py',
     'wallet_address_types.py',
@@ -151,7 +152,9 @@
     'wallet_listtransactions.py',
     'wallet_miniscript.py',
     # vv Tests less than 30s vv
+    'wallet_deprecated_rbf.py',
     'p2p_invalid_messages.py',
+    'rpc_echo_payload.py',
     'rpc_createmultisig.py',
     'p2p_timeouts.py --v1transport',
     'p2p_timeouts.py --v2transport',
@@ -172,8 +175,10 @@
     'wallet_blank.py',
     'wallet_keypool_topup.py',
     'wallet_fast_rescan.py',
+    'wallet_derivehdkey.py',
     'wallet_gethdkeys.py',
     'wallet_createwalletdescriptor.py',
+    'wallet_exported_watchonly.py',
     'interface_zmq.py',
     'rpc_invalid_address_message.py',
     'rpc_validateaddress.py',
@@ -273,6 +278,7 @@
     'wallet_importprunedfunds.py',
     'p2p_leak_tx.py --v1transport',
     'p2p_leak_tx.py --v2transport',
+    'p2p_tx_relay_rate_limit.py',
     'p2p_eviction.py',
     'p2p_outbound_eviction.py',
     'p2p_ibd_stalling.py --v1transport',
@@ -300,6 +306,8 @@
     'wallet_listsinceblock.py',
     'wallet_listdescriptors.py',
     'p2p_leak.py',
+    'p2p_bip434_feature.py',
+    'p2p_bip434_feature.py --v2transport',
     'wallet_encryption.py',
     'feature_dersig.py',
     'feature_reindex_init.py',
@@ -312,6 +320,7 @@
     'feature_minchainwork.py',
     'rpc_estimatefee.py',
     'p2p_private_broadcast.py',
+    'p2p_private_broadcast_cap.py',
     'rpc_getblockstats.py',
     'feature_port.py',
     'feature_bind_port_externalip.py',
@@ -351,6 +360,7 @@
     'rpc_scanblocks.py',
     'tool_bitcoin.py',
     'p2p_sendtxrcncl.py',
+    'p2p_connection_limits.py',
     'rpc_scantxoutset.py',
     'feature_torcontrol.py',
     'feature_unsupported_utxo_db.py',
@@ -358,6 +368,7 @@
     'feature_logging.py',
     'interface_ipc.py',
     'interface_ipc_mining.py',
+    'interface_gui.py',
     'feature_anchors.py',
     'mempool_datacarrier.py',
     'feature_coinstatsindex.py',
@@ -368,7 +379,9 @@
     'p2p_permissions.py',
     'feature_blocksdir.py',
     'wallet_startup.py',
+    'p2p_private_broadcast_retry_v1.py',
     'feature_remove_pruned_files_on_startup.py',
+    'feature_prune_stale_fork.py',
     'p2p_i2p_ports.py',
     'p2p_i2p_sessions.py',
     'feature_presegwit_node_upgrade.py',
@@ -388,6 +401,8 @@
     'wallet_migration.py',
     'p2p_ibd_txrelay.py',
     'p2p_seednode.py',
+    'rpc_openrpc.py',
+    'wallet_ancient_migration.py',
     # Don't append tests at the end to avoid merge conflicts
     # Put them in a random line within the section that fits their approximate run-time
 ]
@@ -464,7 +479,7 @@ def main():
         assert results_filepath.parent.exists(), "Results file parent directory does not exist"
         logging.debug("Test results will be written to " + str(results_filepath))
 
-    enable_bitcoind = config["components"].getboolean("ENABLE_BITCOIND")
+    enable_bitcoind = config.getboolean("components", "ENABLE_BITCOIND")
 
     if not enable_bitcoind:
         print("No functional tests to run.")
@@ -533,7 +548,7 @@ def remove_tests(exclude_list):
                 # Exclude all variants of a test
                 remove_tests([test for test in test_list if test.split('.py')[0] == exclude_test.split('.py')[0]])
 
-    if config["components"].getboolean("BUILD_BENCH") and TOOL_BENCH_SANITY_CHECK in test_list:
+    if config.getboolean("components", "BUILD_BENCH") and TOOL_BENCH_SANITY_CHECK in test_list:
         # Remove it, and expand it for each bench in the list
         test_list.remove(TOOL_BENCH_SANITY_CHECK)
         bench_cmd = Binaries(get_binary_paths(config), bin_dir=None).bench_argv() + ["-list"]
diff --git a/depend/bitcoin/test/functional/tool_bitcoin_chainstate.py b/depend/bitcoin/test/functional/tool_bitcoin_chainstate.py
index c57da1fc..6b712889 100755
--- a/depend/bitcoin/test/functional/tool_bitcoin_chainstate.py
+++ b/depend/bitcoin/test/functional/tool_bitcoin_chainstate.py
@@ -20,7 +20,7 @@
 START_HEIGHT = 199
 # Hardcoded in regtest chainparams
 SNAPSHOT_BASE_BLOCK_HEIGHT = 299
-SNAPSHOT_BASE_BLOCK_HASH = "7cc695046fec709f8c9394b6f928f81e81fd3ac20977bb68760fa1faa7916ea2"
+SNAPSHOT_BASE_BLOCK_HASH = "0c552ced4721c249a389eb9b08cb8da261cd46f0e7b5f9d064d48f3113406853"
 
 
 class BitcoinChainstateTest(BitcoinTestFramework):
diff --git a/depend/bitcoin/test/functional/tool_signet_miner.py b/depend/bitcoin/test/functional/tool_signet_miner.py
index 2be47332..cb22dd92 100755
--- a/depend/bitcoin/test/functional/tool_signet_miner.py
+++ b/depend/bitcoin/test/functional/tool_signet_miner.py
@@ -69,7 +69,7 @@ def mine_block(self, node):
         n_blocks = node.getblockcount()
         base_dir = self.config["environment"]["SRCDIR"]
         signet_miner_path = os.path.join(base_dir, "contrib", "signet", "miner")
-        rpc_argv = node.binaries.rpc_argv() + [f"-datadir={node.cli.datadir}"]
+        rpc_argv = node.binaries.rpc_argv() + [f"-datadir={node.datadir_path}"]
         util_argv = node.binaries.util_argv() + ["grind"]
         subprocess.run([
                 sys.executable,
@@ -89,7 +89,7 @@ def mine_block_manual(self, node, *, sign):
         n_blocks = node.getblockcount()
         base_dir = self.config["environment"]["SRCDIR"]
         signet_miner_path = os.path.join(base_dir, "contrib", "signet", "miner")
-        rpc_argv = node.binaries.rpc_argv() + [f"-datadir={node.cli.datadir}"]
+        rpc_argv = node.binaries.rpc_argv() + [f"-datadir={node.datadir_path}"]
         util_argv = node.binaries.util_argv() + ["grind"]
         base_cmd = [
             sys.executable,
diff --git a/depend/bitcoin/test/functional/tool_wallet.py b/depend/bitcoin/test/functional/tool_wallet.py
index 737aaf54..845d7a9a 100755
--- a/depend/bitcoin/test/functional/tool_wallet.py
+++ b/depend/bitcoin/test/functional/tool_wallet.py
@@ -421,6 +421,7 @@ def test_no_create_legacy(self):
         assert not (self.nodes[0].wallets_path / "legacy").exists()
         self.assert_raises_tool_error("Invalid parameter -descriptors", "-wallet=legacy", "-descriptors=false", "create")
         assert not (self.nodes[0].wallets_path / "legacy").exists()
+        self.assert_raises_tool_error("The -dumpfile option cannot be used with the 'create' command.", "-wallet=legacy", "-dumpfile=wallet.dump", "create")
 
     def test_no_create_unnamed(self):
         self.log.info("Test that unnamed (default) wallets cannot be created")
diff --git a/depend/bitcoin/test/functional/wallet_ancient_migration.py b/depend/bitcoin/test/functional/wallet_ancient_migration.py
new file mode 100755
index 00000000..b884c876
--- /dev/null
+++ b/depend/bitcoin/test/functional/wallet_ancient_migration.py
@@ -0,0 +1,229 @@
+#!/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.
+"""Test wallet migration from ancient versions (v0.14.3) to descriptor wallets.
+
+Previous releases are required by this test, see test/README.md.
+"""
+from decimal import Decimal
+from pathlib import Path
+import shutil
+
+from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_greater_than,
+    assert_is_hash_string,
+    assert_raises_rpc_error,
+    dumb_sync_blocks,
+)
+
+# Wallet version constants from ancient Bitcoin Core (pre-0.15)
+FEATURE_COMPRPUBKEY = 60000  # Non-HD wallet version
+FEATURE_HD = 130000          # Single-chain HD wallet version (pre-v0.15)
+WALLET_PASSPHRASE = "test_passphrase"
+
+
+def get_vout_addresses(decoded_tx):
+    for vout in decoded_tx["vout"]:
+        script_pub_key = vout["scriptPubKey"]
+        if "address" in script_pub_key:
+            yield script_pub_key["address"]
+        else:
+            yield from script_pub_key.get("addresses", [])
+
+
+def normalize_listtransactions(txs):
+    """Return cross-version stable fields from listtransactions output."""
+    return sorted(
+        (tx["txid"], tx["amount"], tx["category"], tx["confirmations"])
+        for tx in txs
+    )
+
+
+class WalletAncientMigrationTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = True
+        self.num_nodes = 8
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+        self.skip_if_no_previous_releases()
+
+    def setup_network(self):
+        # Use dedicated old/new node pairs for each migration scenario to avoid
+        # resetting node datadirs between sub-tests.
+        self.add_nodes(self.num_nodes, versions=[140300, None] * 4)
+
+    def run_migration_test(
+        self,
+        wallet_type,
+        old_node_idx,
+        new_node_idx,
+        extra_args_old,
+        expected_version,
+        expect_hd,
+        passphrase=None,
+    ):
+        """Test migration of a v0.14.3 wallet to descriptor wallet."""
+        old_node = self.nodes[old_node_idx]
+        new_node = self.nodes[new_node_idx]
+
+        self.log.info(f"Testing {wallet_type} wallet migration")
+        self.start_node(old_node_idx, extra_args=extra_args_old)
+
+        # Create addresses and verify wallet version
+        old_addresses = [old_node.getnewaddress() for _ in range(4)]
+        unfunded_address = old_node.getnewaddress()
+        old_wallet_info = old_node.getwalletinfo()
+        assert_equal(old_wallet_info['walletversion'], expected_version)
+        # v0.14.3 predates HD split keypool (v0.15+).
+        assert_equal('keypoolsize_hd_internal' in old_wallet_info, False)
+        assert_equal('hdmasterkeyid' in old_wallet_info, expect_hd)
+
+        # Generate blocks and create transaction history
+        self.generatetoaddress(old_node, COINBASE_MATURITY + 1, old_addresses[0], sync_fun=self.no_op)
+        send_txs = []
+        for i, amount in enumerate([0.1, 0.2, 0.3], start=1):
+            send_txs.append((old_node.sendtoaddress(old_addresses[i], amount), old_addresses[i]))
+        self.generatetoaddress(old_node, 1, old_addresses[0], sync_fun=self.no_op)
+
+        old_balance = old_node.getbalance()
+        old_txs = old_node.listtransactions("*", 1000)
+        old_wallet_state = old_node.getwalletinfo()
+        assert_equal(old_balance, Decimal("99.99986440"))
+        assert_equal(len(old_txs), 108)
+
+        # Collect all addresses including change; listtransactions omits change
+        # addresses for self-sends, so decode the sent transactions explicitly.
+        change_addresses = set()
+        for txid, destination in send_txs:
+            decoded_tx = old_node.decoderawtransaction(old_node.gettransaction(txid)["hex"])
+            for address in get_vout_addresses(decoded_tx):
+                if address != destination:
+                    change_addresses.add(address)
+
+        all_addresses = {tx['address'] for tx in old_txs if 'address' in tx} | change_addresses
+        assert_equal(unfunded_address in all_addresses, False)
+        assert_greater_than(len(change_addresses), 0)
+        assert_greater_than(len(all_addresses), 0)
+
+        # Sync blocks to modern node via RPC (avoids filesystem copy and reindex)
+        self.start_node(new_node_idx)
+        dumb_sync_blocks(src=old_node, dst=new_node)
+
+        if passphrase is None:
+            self.stop_node(old_node_idx)
+        else:
+            # v0.14.3 shuts down after encrypting the wallet.
+            old_node.encryptwallet(passphrase)
+            old_node.wait_until_stopped()
+
+        # Copy and migrate wallet
+        self.log.info("Migrating wallet to descriptor format")
+        old_wallet_path = old_node.chain_path / "wallet.dat"
+        migrated_wallet_dir = new_node.wallets_path / "migrated_wallet"
+        migrated_wallet_dir.mkdir(parents=True)
+        shutil.copy2(old_wallet_path, migrated_wallet_dir / "wallet.dat")
+
+        with new_node.assert_debug_log(expected_msgs=[], unexpected_msgs=["Rescanning"]):
+            migration_result = new_node.migratewallet("migrated_wallet", passphrase=passphrase)
+        assert_equal(migration_result['wallet_name'], 'migrated_wallet')
+        assert_equal('watchonly_name' in migration_result, False)
+        assert_equal('solvables_name' in migration_result, False)
+        assert Path(migration_result['backup_path']).is_file()
+        new_wallet = new_node.get_wallet_rpc(migration_result['wallet_name'])
+
+        # Verify migration results
+        self.log.info("Verifying migration")
+        new_wallet_info = new_wallet.getwalletinfo()
+        assert_equal(new_wallet_info['format'], 'sqlite')
+        assert_equal(new_wallet_info['descriptors'], True)
+
+        # v0.14.3 HD wallets use a single external chain. Encrypting an HD
+        # wallet rotates its seed, leaving the original chain inactive.
+        single_chain_hd_descriptors = [
+            descriptor for descriptor in new_wallet.listdescriptors()['descriptors']
+            if '/0h/0h/*h)' in descriptor['desc']
+        ]
+        expected_single_chain_hd_descriptors = 0
+        if expect_hd:
+            expected_single_chain_hd_descriptors = 1
+            if passphrase is not None:
+                expected_single_chain_hd_descriptors += 1
+        assert_equal(len(single_chain_hd_descriptors), expected_single_chain_hd_descriptors)
+
+        assert_equal(new_wallet_info['txcount'], 105)
+        if passphrase is not None:
+            assert_equal(new_wallet_info['unlocked_until'], 0)
+        assert_equal(new_wallet.getbalance(), old_balance)
+        new_balances = new_wallet.getbalances()['mine']
+        assert_equal(new_balances['trusted'], old_wallet_state['balance'])
+        assert_equal(new_balances['untrusted_pending'], old_wallet_state['unconfirmed_balance'])
+        assert_equal(new_balances['immature'], old_wallet_state['immature_balance'])
+        assert_equal(new_wallet_info['txcount'], old_wallet_state['txcount'])
+        new_txs = new_wallet.listtransactions("*", 1000)
+        assert_equal(normalize_listtransactions(new_txs), normalize_listtransactions(old_txs))
+
+        # Verify all addresses are still owned
+        for addr in all_addresses:
+            assert_equal(new_wallet.getaddressinfo(addr)['ismine'], True)
+        assert_equal(new_wallet.getaddressinfo(unfunded_address)['ismine'], True)
+
+        # Test post-migration functionality
+        new_addr = new_wallet.getnewaddress()
+        if passphrase is not None:
+            assert_raises_rpc_error(-13, "Please enter the wallet passphrase", new_wallet.sendtoaddress, new_addr, 0.1)
+            new_wallet.walletpassphrase(passphrase, 60)
+        txid = new_wallet.sendtoaddress(new_addr, 0.1)
+        assert_is_hash_string(txid)
+
+        self.stop_node(new_node_idx)
+        self.log.info(f"{wallet_type} wallet migration successful")
+
+    def run_test(self):
+        self.log.info("Testing wallet migration from v0.14.3")
+
+        self.run_migration_test(
+            wallet_type="non-HD",
+            old_node_idx=0,
+            new_node_idx=1,
+            extra_args_old=["-usehd=0", "-keypool=10"],
+            expected_version=FEATURE_COMPRPUBKEY,
+            expect_hd=False,
+        )
+
+        self.run_migration_test(
+            wallet_type="encrypted non-HD",
+            old_node_idx=2,
+            new_node_idx=3,
+            extra_args_old=["-usehd=0", "-keypool=10"],
+            expected_version=FEATURE_COMPRPUBKEY,
+            expect_hd=False,
+            passphrase=WALLET_PASSPHRASE,
+        )
+
+        self.run_migration_test(
+            wallet_type="HD (VERSION_HD_BASE)",
+            old_node_idx=4,
+            new_node_idx=5,
+            extra_args_old=["-keypool=10"],
+            expected_version=FEATURE_HD,
+            expect_hd=True,
+        )
+
+        self.run_migration_test(
+            wallet_type="encrypted HD (VERSION_HD_BASE)",
+            old_node_idx=6,
+            new_node_idx=7,
+            extra_args_old=["-keypool=10"],
+            expected_version=FEATURE_HD,
+            expect_hd=True,
+            passphrase=WALLET_PASSPHRASE,
+        )
+
+
+if __name__ == '__main__':
+    WalletAncientMigrationTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_assumeutxo.py b/depend/bitcoin/test/functional/wallet_assumeutxo.py
index a8c97be7..9c647fa2 100755
--- a/depend/bitcoin/test/functional/wallet_assumeutxo.py
+++ b/depend/bitcoin/test/functional/wallet_assumeutxo.py
@@ -172,7 +172,7 @@ def run_test(self):
 
         assert_equal(
             dump_output['txoutset_hash'],
-            "d2b051ff5e8eef46520350776f4100dd710a63447a8e01d917e92e79751a63e2")
+            "106b2c56233e378a824cf0d5ff2be42ed32c72f1605c9be288d00942908a40ac")
         assert_equal(dump_output["nchaintx"], 334)
         assert_equal(n0.getblockchaininfo()["blocks"], SNAPSHOT_BASE_HEIGHT)
 
@@ -215,12 +215,18 @@ def loading_error(height):
         wallet_name = "w1"
         n1.createwallet(wallet_name, disable_private_keys=True)
         key = get_generate_key()
-        time = n1.getblockchaininfo()['time']
+        block_info = n1.getblockchaininfo()
+        time = block_info["time"]
+        def expected_rescan_error(timestamp):
+            return f"Rescan failed for descriptor with timestamp {timestamp}. There was an error reading a block from time {time}, which is after or within 7200 seconds of key creation, and could contain transactions pertaining to the desc. As a result, transactions and coins using this desc may not appear in the wallet. This error is likely caused by an in-progress assumeutxo background sync. Check logs or getchainstates RPC for assumeutxo background sync progress and try again later."
         timestamp = 0
-        expected_error_message = f"Rescan failed for descriptor with timestamp {timestamp}. There was an error reading a block from time {time}, which is after or within 7200 seconds of key creation, and could contain transactions pertaining to the desc. As a result, transactions and coins using this desc may not appear in the wallet. This error is likely caused by an in-progress assumeutxo background sync. Check logs or getchainstates RPC for assumeutxo background sync progress and try again later."
         result = self.import_descriptor(n1, wallet_name, key, timestamp)
         assert_equal(result[0]['error']['code'], -1)
-        assert_equal(result[0]['error']['message'], expected_error_message)
+        assert_equal(result[0]['error']['message'], expected_rescan_error(timestamp))
+        now_timestamp = block_info["mediantime"]
+        result = self.import_descriptor(n1, wallet_name, get_generate_key(), "now")
+        assert_equal(result[0]['error']['code'], -1)
+        assert_equal(result[0]['error']['message'], expected_rescan_error(now_timestamp))
 
         self.log.info("Test that rescanning blocks from before the snapshot fails when blocks are not available from the background sync yet")
         w1 = n1.get_wallet_rpc(wallet_name)
diff --git a/depend/bitcoin/test/functional/wallet_backwards_compatibility.py b/depend/bitcoin/test/functional/wallet_backwards_compatibility.py
index f00f2958..a5224546 100755
--- a/depend/bitcoin/test/functional/wallet_backwards_compatibility.py
+++ b/depend/bitcoin/test/functional/wallet_backwards_compatibility.py
@@ -19,6 +19,7 @@
 import shutil
 
 from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.descriptors import descsum_create
 from test_framework.messages import ser_string
@@ -26,6 +27,7 @@
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
+    assert_not_equal,
     assert_raises_rpc_error,
 )
 
@@ -38,13 +40,13 @@ def set_test_params(self):
         # Add new version after each release:
         self.extra_args = [
             ["-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # Pre-release: use to mine blocks. noban for immediate tx relay
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # Pre-release: use to receive coins, swap wallets, etc
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v25.0
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v24.0.1
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v23.0
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1", f"-keypool={LAST_KEYPOOL_INDEX + 1}"], # v22.0
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v0.21.0
-            ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v0.20.1
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # Pre-release: use to receive coins, swap wallets, etc
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v25.0
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v24.0.1
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v23.0
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1", f"-keypool={LAST_KEYPOOL_INDEX + 1}"], # v22.0
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v0.21.0
+            ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v0.20.1
         ]
         self.wallet_names = [self.default_wallet_name]
 
@@ -191,6 +193,76 @@ def test_ignore_legacy_during_startup(self, legacy_nodes, node_master):
         # Reset settings for any subsequent test
         os.remove(settings_path)
 
+    def test_downgrade_preserves_witness_variants(self, node_master, node_miner, node_old):
+        # Ensure the wallet keeps every witness variant of a tx during a downgrade. An old
+        # release updating the tx record must not drop them.
+        self.log.info("Test that witness variants survive a downgrade that rewrites the tx record")
+
+        # Earlier tests may have restarted node_master or dropped its peers
+        self.connect_nodes(node_miner.index, node_master.index)
+        self.connect_nodes(node_master.index, node_old.index)
+        self.sync_blocks([node_miner, node_master, node_old])
+
+        wallet_name = "altwit_downgrade"
+        node_master.createwallet(wallet_name)
+        wallet = node_master.get_wallet_rpc(wallet_name)
+
+        xprvs = [ExtendedPrivateKey.generate() for _ in range(0, 2)]
+        xpubs = [xprv.pubkey() for xprv in xprvs]
+
+        # Taproot descriptor with a public-only internal key: the wallet can only
+        # spend via the script path, so the key path is signed separately below.
+        script_path_desc = descsum_create(f"tr({xpubs[0].to_string()}/*,pk({xprvs[1].to_string()}/*))")
+        assert_equal(wallet.importdescriptors([{"desc": script_path_desc, "active": True, "timestamp": "now"}])[0]["success"], True)
+
+        # Fund tr output owned by the wallet
+        node_miner.sendtoaddress(wallet.getnewaddress(address_type="bech32m"), 1)
+        self.sync_mempools([node_miner, node_master])
+        self.generate(node_miner, 1, sync_fun=self.no_op)
+        self.sync_blocks([node_miner, node_master, node_old])
+        wallet.syncwithvalidationinterfacequeue()
+
+        # Two witness variants of the same spend: same txid, different wtxid
+        psbt = wallet.walletcreatefundedpsbt(outputs=[{node_miner.getnewaddress(): 0.5}])["psbt"]
+        script_path_tx = wallet.finalizepsbt(wallet.walletprocesspsbt(psbt=psbt, finalize=False)["psbt"])["hex"]
+        script_path_wtxid = node_master.decoderawtransaction(script_path_tx)["hash"]
+
+        key_path_desc = descsum_create(f"tr({xprvs[0].to_string()}/*,pk({xpubs[1].to_string()}/*))")
+        key_path_psbt = node_master.descriptorprocesspsbt(psbt=psbt, descriptors=[{"desc": key_path_desc}], finalize=False)["psbt"]
+        key_path_tx = wallet.finalizepsbt(key_path_psbt)["hex"]
+        key_path_wtxid = node_master.decoderawtransaction(key_path_tx)["hash"]
+        assert_not_equal(script_path_wtxid, key_path_wtxid)
+
+        # Store variant A through the mempool; store variant B by mining it. The
+        # confirmed (key path) variant becomes canonical, the script path an alternate.
+        txid = node_master.sendrawtransaction(script_path_tx)
+        wallet.syncwithvalidationinterfacequeue()
+        block_hash = self.generateblock(node_master, node_miner.getnewaddress(), [key_path_tx], sync_fun=self.no_op)["hash"]
+        self.sync_blocks([node_miner, node_master, node_old])
+        wallet.syncwithvalidationinterfacequeue()
+        assert_equal(wallet.gettransaction(txid)["alternate_wtxids"], [script_path_wtxid])
+        wallet.unloadwallet()
+
+        # Downgrade: load on the old release, then force it to rewrite the tx
+        # record by disconnecting the block that confirmed the canonical tx.
+        old_dir = node_old.wallets_path / wallet_name
+        shutil.copytree(node_master.wallets_path / wallet_name, old_dir)
+        node_old.loadwallet(wallet_name)
+        old_wallet = node_old.get_wallet_rpc(wallet_name)
+        assert_equal(old_wallet.gettransaction(txid)["hex"], key_path_tx)
+        old_wallet.invalidateblock(block_hash)
+        old_wallet.syncwithvalidationinterfacequeue()
+        old_wallet.unloadwallet()
+
+        # Re-open on master: the alternate must still be there
+        self.cleanup_folder(node_master.wallets_path / wallet_name)
+        shutil.copytree(old_dir, node_master.wallets_path / wallet_name)
+        node_master.loadwallet(wallet_name)
+        wallet = node_master.get_wallet_rpc(wallet_name)
+        assert_equal(wallet.gettransaction(txid)["alternate_wtxids"], [script_path_wtxid])
+        wallet.unloadwallet()
+
+
     def run_test(self):
         node_miner = self.nodes[0]
         node_master = self.nodes[1]
@@ -349,7 +421,6 @@ def get_flags(conn):
 
             # Restore the wallet to master
             load_res = node_master.restorewallet(wallet_name, backup_path)
-
             # There should be no warnings
             assert "warnings" not in load_res
 
@@ -435,6 +506,8 @@ def check_upgraded_records(conn, old_flags):
 
         self.test_v22_inactivehdchain_path()
         self.test_ignore_legacy_during_startup(legacy_nodes, node_master)
+        node_v25 = self.nodes[2] # note: could be any node prior to v32
+        self.test_downgrade_preserves_witness_variants(node_master, node_miner, node_v25)
 
 if __name__ == '__main__':
     BackwardsCompatibilityTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_basic.py b/depend/bitcoin/test/functional/wallet_basic.py
index e7a333ba..ea95daa2 100755
--- a/depend/bitcoin/test/functional/wallet_basic.py
+++ b/depend/bitcoin/test/functional/wallet_basic.py
@@ -562,8 +562,9 @@ def run_test(self):
                                  "amount":   baz["amount"],
                                  "category": baz["category"],
                                  "vout":     baz["vout"]}
-        expected_fields = frozenset({'amount', 'bip125-replaceable', 'confirmations', 'details', 'fee',
-                                     'hex', 'lastprocessedblock', 'time', 'timereceived', 'trusted', 'txid', 'wtxid', 'walletconflicts', 'mempoolconflicts'})
+        expected_fields = frozenset({'amount', 'confirmations', 'details', 'fee',
+                                     'hex', 'lastprocessedblock', 'time', 'timereceived', 'trusted', 'txid', 'wtxid', 'walletconflicts', 'mempoolconflicts',
+                                     'alternate_wtxids'})
         verbose_field = "decoded"
         expected_verbose_fields = expected_fields | {verbose_field}
 
diff --git a/depend/bitcoin/test/functional/wallet_bumpfee.py b/depend/bitcoin/test/functional/wallet_bumpfee.py
index 80735e01..ee0c0451 100755
--- a/depend/bitcoin/test/functional/wallet_bumpfee.py
+++ b/depend/bitcoin/test/functional/wallet_bumpfee.py
@@ -18,6 +18,8 @@
 from test_framework.blocktools import (
     COINBASE_MATURITY,
 )
+from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.messages import (
     MAX_BIP125_RBF_SEQUENCE,
     MAX_SEQUENCE_NONFINAL,
@@ -56,7 +58,6 @@ def set_test_params(self):
         # whitelist peers to speed up tx relay / mempool sync
         self.noban_tx_relay = True
         self.extra_args = [[
-            "-walletrbf={}".format(i),
             "-mintxfee=0.00002",
             "-addresstype=bech32",
         ] for i in range(self.num_nodes)]
@@ -547,9 +548,9 @@ def test_maxtxfee_fails(self, rbf_node, dest_address):
 
 def test_watchonly_psbt(self, peer_node, rbf_node, dest_address):
     self.log.info('Test that PSBT is returned for bumpfee in watchonly wallets')
-    priv_rec_desc = "wpkh([00000001/84'/1'/0']tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0/*)#rweraev0"
+    priv_rec_desc = descsum_create(f"wpkh([00000001/84'/1'/0']{ExtendedPrivateKey.generate().to_string()}/0/*)")
     pub_rec_desc = rbf_node.getdescriptorinfo(priv_rec_desc)["descriptor"]
-    priv_change_desc = "wpkh([00000001/84'/1'/0']tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/*)#j6uzqvuh"
+    priv_change_desc = descsum_create(f"wpkh([00000001/84'/1'/0']{ExtendedPrivateKey.generate().to_string()}/1/*)")
     pub_change_desc = rbf_node.getdescriptorinfo(priv_change_desc)["descriptor"]
     # Create a wallet with private keys that can sign PSBTs
     rbf_node.createwallet(wallet_name="signer", disable_private_keys=False, blank=True)
@@ -608,14 +609,14 @@ def test_watchonly_psbt(self, peer_node, rbf_node, dest_address):
             {"fee_rate": 1, "add_inputs": False}, True)['psbt']
     psbt_signed = signer.walletprocesspsbt(psbt=psbt, sign=True, sighashtype="ALL", bip32derivs=True)
     original_txid = watcher.sendrawtransaction(psbt_signed["hex"])
-    assert_equal(len(watcher.decodepsbt(psbt)["tx"]["vin"]), 1)
+    assert_equal(len(watcher.decodepsbt(psbt)["inputs"]), 1)
 
     # bumpfee can't be used on watchonly wallets
     assert_raises_rpc_error(-4, "bumpfee is not available with wallets that have private keys disabled. Use psbtbumpfee instead.", watcher.bumpfee, original_txid)
 
     # Bump fee, obnoxiously high to add additional watchonly input
     bumped_psbt = watcher.psbtbumpfee(original_txid, fee_rate=HIGH)
-    assert_greater_than(len(watcher.decodepsbt(bumped_psbt['psbt'])["tx"]["vin"]), 1)
+    assert_greater_than(len(watcher.decodepsbt(bumped_psbt['psbt'])["inputs"]), 1)
     assert "txid" not in bumped_psbt
     assert_equal(bumped_psbt["origfee"], -watcher.gettransaction(original_txid)["fee"])
     assert not watcher.finalizepsbt(bumped_psbt["psbt"])["complete"]
diff --git a/depend/bitcoin/test/functional/wallet_createwallet.py b/depend/bitcoin/test/functional/wallet_createwallet.py
index 8edbbcf4..60f670de 100755
--- a/depend/bitcoin/test/functional/wallet_createwallet.py
+++ b/depend/bitcoin/test/functional/wallet_createwallet.py
@@ -4,12 +4,16 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test createwallet arguments.
 """
+import os
+import stat
 
 from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
+    is_dir_writable,
     wallet_importprivkey,
 )
 from test_framework.wallet_util import generate_keypair, WalletUnlock
@@ -25,9 +29,27 @@ def set_test_params(self):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
+    def test_bad_dir_permissions(self, node):
+        self.log.info("Test wallet creation failure due to non-writable directory")
+        wallet_name = "bad_permissions"
+        dir_path = node.wallets_path / wallet_name
+        dir_path.mkdir(parents=True)
+        original_dir_perms = dir_path.stat().st_mode
+        os.chmod(dir_path, original_dir_perms & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH))
+        if is_dir_writable(dir_path):
+            self.log.warning("Skipping non-writable directory test: unable to enforce read-only permissions")
+        else:
+            # Run actual test
+            assert_raises_rpc_error(-4, f"SQLiteDatabase: Failed to open database in directory '{str(dir_path)}': directory is not writable", node.createwallet, wallet_name=wallet_name)
+        # Reset directory permissions for cleanup
+        dir_path.chmod(original_dir_perms)
+
+
     def run_test(self):
         node = self.nodes[0]
 
+        self.test_bad_dir_permissions(node)
+
         self.log.info("Run createwallet with invalid parameters.")
         # Run createwallet with invalid parameters. This must not prevent a new wallet with the same name from being created with the correct parameters.
         assert_raises_rpc_error(-4, "Passphrase provided but private keys are disabled. A passphrase is only used to encrypt private keys, so cannot be used for wallets with private keys disabled.",
@@ -76,12 +98,12 @@ def run_test(self):
         assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w3.getnewaddress)
         # Set the seed
         w3.importdescriptors([{
-            'desc': descsum_create('wpkh(tprv8ZgxMBicQKsPcwuZGKp8TeWppSuLMiLe2d9PupB14QpPeQsqoj3LneJLhGHH13xESfvASyd4EFLJvLrG8b7DrLxEuV7hpF9uUc6XruKA1Wq/0h/*)'),
+            'desc': descsum_create(f'wpkh({ExtendedPrivateKey.generate().to_string()}/0h/*)'),
             'timestamp': 'now',
             'active': True
         },
         {
-            'desc': descsum_create('wpkh(tprv8ZgxMBicQKsPcwuZGKp8TeWppSuLMiLe2d9PupB14QpPeQsqoj3LneJLhGHH13xESfvASyd4EFLJvLrG8b7DrLxEuV7hpF9uUc6XruKA1Wq/1h/*)'),
+            'desc': descsum_create(f'wpkh({ExtendedPrivateKey.generate().to_string()}/1h/*)'),
             'timestamp': 'now',
             'active': True,
             'internal': True
@@ -103,12 +125,12 @@ def run_test(self):
         with WalletUnlock(w4, "pass"):
             # Now set a seed and it should work. Wallet should also be encrypted
             w4.importdescriptors([{
-                'desc': descsum_create('wpkh(tprv8ZgxMBicQKsPcwuZGKp8TeWppSuLMiLe2d9PupB14QpPeQsqoj3LneJLhGHH13xESfvASyd4EFLJvLrG8b7DrLxEuV7hpF9uUc6XruKA1Wq/0h/*)'),
+                'desc': descsum_create(f'wpkh({ExtendedPrivateKey.generate().to_string()}/0h/*)'),
                 'timestamp': 'now',
                 'active': True
             },
             {
-                'desc': descsum_create('wpkh(tprv8ZgxMBicQKsPcwuZGKp8TeWppSuLMiLe2d9PupB14QpPeQsqoj3LneJLhGHH13xESfvASyd4EFLJvLrG8b7DrLxEuV7hpF9uUc6XruKA1Wq/1h/*)'),
+                'desc': descsum_create(f'wpkh({ExtendedPrivateKey.generate().to_string()}/1h/*)'),
                 'timestamp': 'now',
                 'active': True,
                 'internal': True
diff --git a/depend/bitcoin/test/functional/wallet_deprecated_rbf.py b/depend/bitcoin/test/functional/wallet_deprecated_rbf.py
new file mode 100755
index 00000000..e1085143
--- /dev/null
+++ b/depend/bitcoin/test/functional/wallet_deprecated_rbf.py
@@ -0,0 +1,37 @@
+#!/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.
+"""Test deprecation of RPC calls."""
+from test_framework.util import assert_equal
+from test_framework.test_framework import BitcoinTestFramework
+
+'''
+This test exercises the deprecatedrpc=bip125 flag and deprecated -walletrbf options
+and should be removed when the options are removed post deprecation.
+'''
+class WalletDeprecatedRBFTest(BitcoinTestFramework):
+    def set_test_params(self):
+      self.num_nodes = 1
+      self.setup_clean_chain = True
+      self.extra_args = [[]]
+
+    def skip_test_if_missing_module(self):
+      self.skip_if_no_wallet()
+
+    def run_test(self):
+      self.log.info("Test -deprecatedrpc=bip125 and -walletrbf startup option")
+
+      self.restart_node(0, extra_args=["-walletrbf=0", "-deprecatedrpc=bip125"])
+      node = self.nodes[0]
+      node.createwallet("deprecated_optinrbf")
+      wallet = node.get_wallet_rpc("deprecated_optinrbf")
+      self.generatetoaddress(node, nblocks=101, address=wallet.getnewaddress(), sync_fun=self.no_op)
+      tx = wallet.gettransaction(wallet.sendall(recipients=[wallet.getnewaddress()])["txid"])
+      assert_equal("bip125-replaceable" in tx, True)
+      assert_equal(tx["bip125-replaceable"], "no")
+      self.stop_node(0, expected_stderr="Warning: -walletrbf is deprecated and will be fully removed in the next release.")
+
+
+if __name__ == '__main__':
+    WalletDeprecatedRBFTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_derivehdkey.py b/depend/bitcoin/test/functional/wallet_derivehdkey.py
new file mode 100755
index 00000000..8905c55e
--- /dev/null
+++ b/depend/bitcoin/test/functional/wallet_derivehdkey.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+# Copyright (c) 2025-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.
+"""Test wallet derivehdkey RPC."""
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_raises_rpc_error,
+)
+from test_framework.wallet_util import WalletUnlock
+
+
+class WalletDeriveHDKeyTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = True
+        self.num_nodes = 2
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
+    def run_test(self):
+        self.test_basic_derivehdkey()
+        self.test_multiple_unused_keys()
+        self.test_active_descriptor()
+        self.test_inactive_descriptor()
+        self.test_noprivs_blank()
+        self.test_compare()
+
+    def test_basic_derivehdkey(self):
+        self.log.info("Test derivehdkey basics")
+        self.nodes[0].createwallet("basic", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc("basic")
+        assert_raises_rpc_error(
+            -8,
+            "Derivation path requires at least one hardened step",
+            wallet.derivehdkey,
+            "m",
+        )
+        assert_raises_rpc_error(
+            -8,
+            "Derivation path requires at least one hardened step",
+            wallet.derivehdkey,
+            "m/87/0/0",
+        )
+        # A BIP32 keypath element must be in 0..2^31-1. The
+        # value 2^31 (2147483648 == 0x80000000) is out of range.
+        for path in ["m/2147483648", "m/2147483648h", "m/2147483648'"]:
+            assert_raises_rpc_error(
+                -8,
+                "Invalid BIP32 keypath",
+                wallet.derivehdkey,
+                path,
+            )
+        assert_raises_rpc_error(
+            -5,
+            "No active or unused(KEY) descriptor found",
+            wallet.derivehdkey,
+            "m/87h",
+        )
+        wallet.addhdkey()
+        xpub_info = wallet.derivehdkey("m/87h")
+        assert "xprv" not in xpub_info
+        xpub = xpub_info["xpub"]
+        root_fingerprint = wallet.derivehdkey("m/87h/0h")["origin"][1:9]
+        assert_equal(xpub_info["origin"], f"[{root_fingerprint}/87h]")
+        too_deep_path = "m/" + "/".join(["0h"] * 256)
+        assert_raises_rpc_error(
+            -8,
+            "Unable to derive HD key at the requested path",
+            wallet.derivehdkey,
+            too_deep_path,
+        )
+
+        xpub_info = wallet.derivehdkey("m/87h/0h/0h/0")
+        xpub_priv_info = wallet.derivehdkey("m/87h/0h/0h/0", private=True)
+        xprv = xpub_priv_info["xprv"]
+        assert_equal(xpub_priv_info["xpub"], xpub_info["xpub"])
+
+        self.log.info("HD pubkey can be retrieved from encrypted wallets")
+        prev_xprv = xprv
+        wallet.encryptwallet("pass")
+        assert_raises_rpc_error(
+            -13,
+            "Error: Please enter the wallet passphrase with walletpassphrase first",
+            wallet.derivehdkey,
+            "m/87h",
+        )
+        with WalletUnlock(wallet, "pass"):
+            xpub_info = wallet.derivehdkey("m/87h")
+            # Only automatically generated descriptors are rotated on
+            # encryption, unused(KEY) is not.
+            assert_equal(xpub_info["xpub"], xpub)
+            assert "xprv" not in xpub_info
+
+        self.log.info("HD privkey can be retrieved from encrypted wallets")
+        assert_raises_rpc_error(
+            -13,
+            "Error: Please enter the wallet passphrase with walletpassphrase first",
+            wallet.derivehdkey,
+            "m/87h/0h/0h/0",
+            private=True,
+        )
+        with WalletUnlock(wallet, "pass"):
+            xpub_info = wallet.derivehdkey("m/87h/0h/0h/0", private=True)
+            # Unused(KEY) is preferred over active descriptors and is not
+            # rotated on encryption.
+            assert_equal(xpub_info["xprv"], prev_xprv)
+
+    def test_multiple_unused_keys(self):
+        self.log.info("Test multiple unused(KEY) descriptors")
+        self.nodes[0].createwallet("multiple_unused_keys", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc("multiple_unused_keys")
+        master_xpub_1 = wallet.addhdkey()['xpub']
+        master_xpub_2 = wallet.addhdkey()['xpub']
+        assert_raises_rpc_error(
+            -5,
+            "Unable to determine which HD key to use. Please specify with 'hdkey'",
+            wallet.derivehdkey,
+            "m/87h",
+        )
+        xpub_info_1 = wallet.derivehdkey("m/87h", hdkey=master_xpub_1)
+        xpub_info_2 = wallet.derivehdkey("m/87h", hdkey=master_xpub_2)
+        assert xpub_info_1["xpub"] != xpub_info_2["xpub"]
+
+        assert_raises_rpc_error(
+            -5,
+            "Unable to parse HD key. Please provide a valid xpub",
+            wallet.derivehdkey,
+            "m/87h",
+            hdkey="bad",
+        )
+
+    def test_active_descriptor(self):
+        self.log.info("Test derivation in wallet with regular descriptors")
+        self.nodes[0].createwallet("active_descriptor")
+        wallet = self.nodes[0].get_wallet_rpc("active_descriptor")
+        xpub_info = wallet.derivehdkey("m/44h/1h/0h")
+        active_xpub = wallet.gethdkeys(active_only=True)[0]["xpub"]
+        assert_equal(wallet.derivehdkey("m/44h/1h/0h", hdkey=active_xpub), xpub_info)
+
+        # Get the activate wpkh() receive descriptor
+        desc = list(filter(lambda d:
+                           d["active"] and not d["internal"] and d["desc"][0:3] == "pkh",
+                           wallet.listdescriptors()["descriptors"])
+                    )[0]["desc"]
+        self.log.debug(desc)
+
+        assert(xpub_info["origin"] in desc)
+        assert(xpub_info["xpub"] in desc)
+
+        self.log.info("Test unused(KEY) descriptors are preferred over active descriptors")
+        master_xpub = wallet.addhdkey()["xpub"]
+        assert_equal(
+            wallet.derivehdkey("m/87h", hdkey=master_xpub)["xpub"],
+            wallet.derivehdkey("m/87h")["xpub"],
+        )
+
+    def test_inactive_descriptor(self):
+        self.log.info("Test that the HD key of a used inactive descriptor is rejected")
+        # Mint a spendable descriptor in a throwaway wallet, so we can import it
+        # into the wallet under test and deactivate it there.
+        self.nodes[0].createwallet(wallet_name="hdkey_source")
+        source = self.nodes[0].get_wallet_rpc("hdkey_source")
+        desc = next(d["desc"] for d in source.listdescriptors(private=True)["descriptors"]
+                    if d["active"] and not d["internal"] and d["desc"].startswith("pkh("))
+
+        self.nodes[0].createwallet(wallet_name="inactive_descriptor", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc("inactive_descriptor")
+        request = {"desc": desc, "range": [0, 9], "timestamp": "now", "internal": False}
+        assert_equal(wallet.importdescriptors([{**request, "active": True}])[0]["success"], True)
+
+        # While the descriptor is active its HD key can be used for derivation.
+        xpub = wallet.gethdkeys(active_only=True)[0]["xpub"]
+        wallet.derivehdkey("m/87h", hdkey=xpub)
+
+        # Once deactivated the descriptor is neither active nor unused(KEY), so
+        # its HD key is no longer a candidate.
+        assert_equal(wallet.importdescriptors([{**request, "active": False}])[0]["success"], True)
+        assert_raises_rpc_error(
+            -5,
+            "HD key is not used by an active or unused(KEY) descriptor",
+            wallet.derivehdkey,
+            "m/87h",
+            hdkey=xpub,
+        )
+
+    def test_noprivs_blank(self):
+        self.log.info("Test derivehdkey on wallet without private keys")
+        self.nodes[0].createwallet(wallet_name="noprivs", disable_private_keys=True)
+        wallet = self.nodes[0].get_wallet_rpc("noprivs")
+        assert_raises_rpc_error(
+            -4,
+            "derivehdkey is not available for watch-only wallets",
+            wallet.derivehdkey,
+            "m/87h",
+        )
+
+        self.log.info("Test derivehdkey on blank wallet")
+        self.nodes[0].createwallet(wallet_name="blank", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc("blank")
+        assert_raises_rpc_error(
+            -5,
+            "No active or unused(KEY) descriptor found",
+            wallet.derivehdkey,
+            "m/87h",
+        )
+
+    def test_compare(self):
+        self.log.info(
+            "Compare with result of createwalletdescriptor")
+        self.nodes[0].createwallet(wallet_name="w1", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc("w1")
+        master_xpub = wallet.addhdkey()["xpub"]
+
+        # Derive xpub for legacy descriptor
+        xpub_info = wallet.derivehdkey("m/44h/1h/0h")
+
+        # Generate legacy descriptor
+        wallet.createwalletdescriptor(type="legacy", hdkey=master_xpub)
+
+        # Get the activate wpkh() receive descriptor
+        desc = list(filter(lambda d:
+                           d["active"] and not d["internal"] and d["desc"][0:3] == "pkh",
+                           wallet.listdescriptors()["descriptors"])
+                    )[0]["desc"]
+        self.log.debug(desc)
+
+        assert(xpub_info["origin"] in desc)
+        assert(xpub_info["xpub"] in desc)
+
+
+if __name__ == '__main__':
+    WalletDeriveHDKeyTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_descriptor.py b/depend/bitcoin/test/functional/wallet_descriptor.py
index 39b80bf7..c3597011 100755
--- a/depend/bitcoin/test/functional/wallet_descriptor.py
+++ b/depend/bitcoin/test/functional/wallet_descriptor.py
@@ -12,6 +12,9 @@
 import re
 
 from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
+from test_framework.messages import ser_string
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_not_equal,
@@ -172,7 +175,7 @@ def run_test(self):
         self.log.info("Test that unlock is needed when deriving only hardened keys in an encrypted wallet")
         with WalletUnlock(send_wrpc, "pass"):
             send_wrpc.importdescriptors([{
-                "desc": "wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/*h)#y4dfsj7n",
+                "desc": descsum_create(f"wpkh({ExtendedPrivateKey.generate().to_string()}/0h/*h)"),
                 "timestamp": "now",
                 "range": [0,10],
                 "active": True
@@ -268,6 +271,25 @@ def run_test(self):
         conn.close()
         assert_raises_rpc_error(-4, "Unexpected legacy entry in descriptor wallet found.", self.nodes[0].loadwallet, "crashme")
 
+        self.log.info("Test that loading descriptor wallet containing both unencrypted and encrypted keys for same descriptor fails to load")
+        wallet_name = "mixed_crypt"
+        self.nodes[0].createwallet(wallet_name)
+        self.nodes[0].unloadwallet(wallet_name)
+        wallet_db = self.nodes[0].wallets_path / wallet_name / self.wallet_data_filename
+        conn = sqlite3.connect(wallet_db)
+        with conn:
+            key_prefix = ser_string(b"walletdescriptorkey")
+            ckey_prefix = ser_string(b"walletdescriptorckey")
+            rows = conn.execute('SELECT key, value FROM main').fetchall()
+            key_rows = [(k, v) for k, v in rows if k.startswith(key_prefix)]
+            # Test the test, want to be sure there is at least one unencrypted key.
+            assert len(key_rows) >= 1
+            k, v = key_rows[0]
+            conn.execute('INSERT INTO main VALUES(?, ?)', (k.replace(key_prefix, ckey_prefix), v))
+        conn.close()
+        with self.nodes[0].assert_debug_log(["Wallet contains both unencrypted and encrypted keys"]):
+            assert_raises_rpc_error(-4, "Wallet corrupted", self.nodes[0].loadwallet, wallet_name)
+
         self.test_parent_descriptors()
 
 if __name__ == '__main__':
diff --git a/depend/bitcoin/test/functional/wallet_exported_watchonly.py b/depend/bitcoin/test/functional/wallet_exported_watchonly.py
new file mode 100755
index 00000000..e08f7bb8
--- /dev/null
+++ b/depend/bitcoin/test/functional/wallet_exported_watchonly.py
@@ -0,0 +1,303 @@
+#!/usr/bin/env python3
+# Copyright (c) 2025-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+import os
+
+from test_framework.descriptors import descsum_create
+from test_framework.key import H_POINT
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_not_equal,
+    assert_raises_rpc_error,
+)
+from test_framework.wallet_util import generate_keypair
+
+KEYPOOL_SIZE = 10
+
+class WalletExportedWatchOnly(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = True
+        self.num_nodes = 2
+        self.extra_args = [[], [f"-keypool={KEYPOOL_SIZE}"]]
+
+    def setup_network(self):
+        # Setup the nodes but don't connect them to each other
+        self.setup_nodes()
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
+    def export_and_restore(self, wallet, export_name):
+        export_path = os.path.join(self.export_path, f"{export_name}.dat")
+        res = wallet.exportwatchonlywallet(export_path)
+        assert_equal(res["exported_file"], export_path)
+        self.online.restorewallet(export_name, res["exported_file"])
+        return self.online.get_wallet_rpc(export_name)
+
+    def test_basic_export(self):
+        self.log.info("Test basic watchonly wallet export")
+        self.offline.createwallet("basic")
+        offline_wallet = self.offline.get_wallet_rpc("basic")
+
+        # Bad RPC args
+        assert_raises_rpc_error(-4, "Error: Export ", offline_wallet.exportwatchonlywallet, "")
+        assert_raises_rpc_error(-4, "Error: Export destination '.' already exists", offline_wallet.exportwatchonlywallet, ".")
+        assert_raises_rpc_error(-4, f"Error: Export destination '{self.export_path}' already exists", offline_wallet.exportwatchonlywallet, self.export_path)
+
+        # Export the watchonly wallet file and load onto online node
+        online_wallet = self.export_and_restore(offline_wallet, "basic_watchonly")
+
+        # Exporting watchonly from a watchonly also works
+        online_wallet2 = self.export_and_restore(online_wallet, "basic_watchonly2")
+
+        # Verify that the wallets have the same descriptors
+        addr = offline_wallet.getnewaddress()
+        assert_equal(addr, online_wallet.getnewaddress())
+        assert_equal(addr, online_wallet2.getnewaddress())
+        assert_equal(offline_wallet.listdescriptors()["descriptors"], online_wallet.listdescriptors()["descriptors"])
+        assert_equal(offline_wallet.listdescriptors()["descriptors"], online_wallet2.listdescriptors()["descriptors"])
+
+        # Verify that online wallet cannot spend, but offline can
+        self.funder.sendtoaddress(online_wallet.getnewaddress(), 10)
+        self.generate(self.online, 1, sync_fun=self.no_op)
+        assert_equal(online_wallet.getbalances()["mine"]["trusted"], 10)
+        assert_equal(offline_wallet.getbalances()["mine"]["trusted"], 0)
+        funds_addr = self.funder.getnewaddress()
+        send_res = online_wallet.send([{funds_addr: 5}])
+        assert_equal(send_res["complete"], False)
+        assert "psbt" in send_res
+        signed_psbt = offline_wallet.walletprocesspsbt(send_res["psbt"])["psbt"]
+        finalized = self.online.finalizepsbt(signed_psbt)["hex"]
+        self.online.sendrawtransaction(finalized)
+
+        # Verify that the change address is known to both wallets
+        dec_tx = self.online.decoderawtransaction(finalized)
+        for txout in dec_tx["vout"]:
+            if txout["scriptPubKey"]["address"] == funds_addr:
+                continue
+            assert_equal(online_wallet.getaddressinfo(txout["scriptPubKey"]["address"])["ismine"], True)
+            assert_equal(offline_wallet.getaddressinfo(txout["scriptPubKey"]["address"])["ismine"], True)
+
+        # Both wallets should agree on addresses generated past the end of the keypool
+        offline_wallet.getnewaddress()
+        offline_wallet.getrawchangeaddress()
+        for _ in range(KEYPOOL_SIZE * 2):
+            assert_equal(online_wallet.getnewaddress(), offline_wallet.getnewaddress())
+            assert_equal(online_wallet.getrawchangeaddress(), offline_wallet.getrawchangeaddress())
+
+        self.generate(self.online, 1, sync_fun=self.no_op)
+        offline_wallet.unloadwallet()
+        online_wallet.unloadwallet()
+
+    def test_export_with_address_book(self):
+        self.log.info("Test all address book entries appear in the exported wallet")
+        self.offline.createwallet("addrbook")
+        offline_wallet = self.offline.get_wallet_rpc("addrbook")
+
+        # Create some address book entries
+        receive_addr = offline_wallet.getnewaddress(label="addrbook_receive")
+        send_addr = self.funder.getnewaddress()
+        offline_wallet.setlabel(send_addr, "addrbook_send") # Sets purpose "send"
+
+        # Export the watchonly wallet file and load onto online node
+        online_wallet = self.export_and_restore(offline_wallet, "addrbook_watchonly")
+
+        # Verify the labels are in both wallets
+        for wallet in [online_wallet, offline_wallet]:
+            for purpose in ["receive", "send"]:
+                label = f"addrbook_{purpose}"
+                assert_equal(wallet.listlabels(purpose), [label])
+                addr = send_addr if purpose == "send" else receive_addr
+                assert_equal(wallet.getaddressesbylabel(label), {addr: {"purpose": purpose}})
+
+        offline_wallet.unloadwallet()
+        online_wallet.unloadwallet()
+
+    def test_export_with_txs_and_locked_coins(self):
+        self.log.info("Test all transactions and locked coins appear in the exported wallet")
+        self.offline.createwallet("txs")
+        offline_wallet = self.offline.get_wallet_rpc("txs")
+
+        # In order to make transactions in the offline wallet, briefly connect offline to online
+        self.connect_nodes(self.offline.index, self.online.index)
+        txids = [self.funder.sendtoaddress(offline_wallet.getnewaddress("funds"), i) for i in range(1, 4)]
+        self.generate(self.online, 1)
+        self.disconnect_nodes(self.offline.index, self.online.index)
+
+        # lock some coins
+        utxos = offline_wallet.listunspent()
+        persistent_lock = [{"txid": utxos[0]["txid"], "vout": utxos[0]["vout"]}]
+        temp_lock = [{"txid": utxos[1]["txid"], "vout": utxos[1]["vout"]}]
+        offline_wallet.lockunspent(unlock=False, transactions=persistent_lock, persistent=True)
+        offline_wallet.lockunspent(unlock=False, transactions=temp_lock, persistent=False)
+
+        # Export the watchonly wallet file and load onto online node
+        # There should not be a rescan as the nodes were at the same height
+        with self.online.assert_debug_log(expected_msgs=[], unexpected_msgs=["Rescanning last"]):
+            online_wallet = self.export_and_restore(offline_wallet, "txs_watchonly")
+
+        # Verify the transactions are in both wallets
+        for txid in txids:
+            assert_equal(online_wallet.gettransaction(txid), offline_wallet.gettransaction(txid))
+
+        # Verify the transactions are all output by listtransactions, in the same order
+        assert_equal(online_wallet.listtransactions(), offline_wallet.listtransactions())
+
+        # New transactions should be the newest (last) transaction in listtransactions
+        new_txid = self.funder.sendtoaddress(online_wallet.getnewaddress(), 1)
+        online_wallet.syncwithvalidationinterfacequeue()
+        assert_equal(online_wallet.listtransactions()[-1]["txid"], new_txid)
+
+        # Verify that the persistent locked coin is locked in both wallets
+        assert_equal(online_wallet.listlockunspent(), persistent_lock)
+        assert_equal(sorted(offline_wallet.listlockunspent(), key=lambda x: x["txid"]), sorted(persistent_lock + temp_lock, key=lambda x: x["txid"]))
+
+        offline_wallet.unloadwallet()
+        online_wallet.unloadwallet()
+
+    def test_export_imported_descriptors(self):
+        self.log.info("Test imported descriptors are exported to the watchonly wallet")
+        self.offline.createwallet("imports")
+        offline_wallet = self.offline.get_wallet_rpc("imports")
+
+        import_res = offline_wallet.importdescriptors(
+            [
+                # A single key, non-ranged
+                {"desc": descsum_create(f"pkh({generate_keypair(wif=True)[0]})"), "timestamp": "now"},
+                # hardened derivation
+                {"desc": descsum_create("sh(wpkh(tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg/0'/*'))"), "timestamp": "now", "active": True},
+                # multisig
+                {"desc": descsum_create("wsh(multi(1,tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/*,tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg/*))"), "timestamp": "now", "active": True, "internal": True},
+                # taproot multi scripts
+                {"desc": descsum_create(f"tr({H_POINT},{{pk(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/*),pk(tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg/0h/*)}})"), "timestamp": "now", "active": True},
+                # miniscript
+                {"desc": descsum_create(f"tr({H_POINT},or_b(pk(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/2/*),s:pk(tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg/1h/2/*)))"), "timestamp": "now", "active": True, "internal": True},
+            ]
+        )
+        assert_equal(all([r["success"] for r in import_res]), True)
+
+        # Export the watchonly wallet file and load onto online node
+        online_wallet = self.export_and_restore(offline_wallet, "imports_watchonly")
+
+        # Verify public descriptors are the same
+        assert_equal(offline_wallet.listdescriptors()["descriptors"], online_wallet.listdescriptors()["descriptors"])
+
+        # Verify all the addresses are the same
+        for address_type in ["legacy", "p2sh-segwit", "bech32", "bech32m"]:
+            for internal in [False, True]:
+                if internal:
+                    addr = offline_wallet.getrawchangeaddress(address_type=address_type)
+                    assert_equal(addr, online_wallet.getrawchangeaddress(address_type=address_type))
+                else:
+                    addr = offline_wallet.getnewaddress(address_type=address_type)
+                    assert_equal(addr, online_wallet.getnewaddress(address_type=address_type))
+                self.funder.sendtoaddress(addr, 1)
+        self.generate(self.online, 1, sync_fun=self.no_op)
+
+        # The hardened derivation should have KEYPOOL_SIZE - 1 remaining addresses
+        for _ in range(KEYPOOL_SIZE - 1):
+            online_wallet.getnewaddress(address_type="p2sh-segwit")
+        assert_raises_rpc_error(-12, "No addresses available", online_wallet.getnewaddress, address_type="p2sh-segwit")
+
+        # Verify that the offline wallet can sign and send
+        send_res = online_wallet.sendall([self.funder.getnewaddress()])
+        assert_equal(send_res["complete"], False)
+        assert "psbt" in send_res
+        signed_psbt = offline_wallet.walletprocesspsbt(send_res["psbt"])["psbt"]
+        finalized = self.online.finalizepsbt(signed_psbt)["hex"]
+        self.online.sendrawtransaction(finalized)
+
+        self.generate(self.online, 1, sync_fun=self.no_op)
+        offline_wallet.unloadwallet()
+        online_wallet.unloadwallet()
+
+    def test_avoid_reuse(self):
+        self.log.info("Test that the avoid reuse flag appears in the exported wallet")
+        self.offline.createwallet(wallet_name="avoidreuse", avoid_reuse=True)
+        offline_wallet = self.offline.get_wallet_rpc("avoidreuse")
+        assert_equal(offline_wallet.getwalletinfo()["avoid_reuse"], True)
+
+        # The avoid_reuse flag also sets some specific address book entries to track reused addresses
+        # In order for these to be set, a few transactions need to be made, so briefly connect offline to online
+        self.connect_nodes(self.offline.index, self.online.index)
+        addr = offline_wallet.getnewaddress()
+        self.funder.sendtoaddress(addr, 1)
+        self.generate(self.online, 1)
+        # Spend funds in order to mark addr as previously spent
+        offline_wallet.sendall([self.funder.getnewaddress()])
+        self.funder.sendtoaddress(addr, 1)
+        self.generate(self.online, 1)
+        assert_equal(offline_wallet.listunspent(addresses=[addr])[0]["reused"], True)
+        self.disconnect_nodes(self.offline.index, self.online.index)
+
+        # Export the watchonly wallet file and load onto online node
+        online_wallet = self.export_and_restore(offline_wallet, "avoidreuse_watchonly")
+
+        # check avoid_reuse is still set
+        assert_equal(online_wallet.getwalletinfo()["avoid_reuse"], True)
+        assert_equal(online_wallet.listunspent(addresses=[addr])[0]["reused"], True)
+
+        offline_wallet.unloadwallet()
+        online_wallet.unloadwallet()
+
+    def test_encrypted_wallet(self):
+        self.log.info("Test that a watchonly wallet can be exported from a locked wallet")
+        self.offline.createwallet(wallet_name="encrypted", passphrase="pass")
+        offline_wallet = self.offline.get_wallet_rpc("encrypted")
+        assert_equal(offline_wallet.getwalletinfo()["unlocked_until"], 0)
+
+        # Export the watchonly wallet file and load onto online node
+        online_wallet = self.export_and_restore(offline_wallet, "encrypted_watchonly")
+
+        # watchonly wallet does not have encryption because it doesn't have private keys
+        assert "unlocked_until" not in online_wallet.getwalletinfo()
+        # But it still has all of the public descriptors
+        assert_equal(offline_wallet.listdescriptors()["descriptors"], online_wallet.listdescriptors()["descriptors"])
+
+        offline_wallet.unloadwallet()
+        online_wallet.unloadwallet()
+
+    def test_export_blank_wallet(self):
+        self.log.info("Test that exporting a blank/no-private-key wallet returns an error")
+
+        # blank=True + disable_private_keys: wallet has no descriptors at all
+        self.offline.createwallet(wallet_name="blank_no_keys", blank=True, disable_private_keys=True)
+        blank_wallet = self.offline.get_wallet_rpc("blank_no_keys")
+        assert_equal(blank_wallet.listdescriptors()["descriptors"], [])
+        export_path = os.path.join(self.export_path, "blank_export.dat")
+        assert_raises_rpc_error(-4, "Wallet has no descriptors to export", blank_wallet.exportwatchonlywallet, export_path)
+        blank_wallet.unloadwallet()
+
+        # disable_private_keys only also results in a blank wallet (no descriptors)
+        self.offline.createwallet(wallet_name="no_keys_only", disable_private_keys=True)
+        no_keys_wallet = self.offline.get_wallet_rpc("no_keys_only")
+        assert_equal(no_keys_wallet.listdescriptors()["descriptors"], [])
+        assert_raises_rpc_error(-4, "Wallet has no descriptors to export", no_keys_wallet.exportwatchonlywallet, export_path)
+        no_keys_wallet.unloadwallet()
+
+    def run_test(self):
+        self.online = self.nodes[0]
+        self.offline = self.nodes[1]
+        self.funder = self.online.get_wallet_rpc(self.default_wallet_name)
+        self.export_path = os.path.join(self.options.tmpdir, "exported_wallets")
+        os.makedirs(self.export_path, exist_ok=True)
+
+        # Mine some blocks, and verify disconnected
+        self.generate(self.online, 101, sync_fun=self.no_op)
+        assert_not_equal(self.online.getbestblockhash(), self.offline.getbestblockhash())
+        assert_equal(self.online.getblockcount(), 101)
+        assert_equal(self.offline.getblockcount(), 0)
+
+        self.test_basic_export()
+        self.test_export_with_address_book()
+        self.test_export_with_txs_and_locked_coins()
+        self.test_export_imported_descriptors()
+        self.test_avoid_reuse()
+        self.test_encrypted_wallet()
+        self.test_export_blank_wallet()
+
+if __name__ == '__main__':
+    WalletExportedWatchOnly(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_fundrawtransaction.py b/depend/bitcoin/test/functional/wallet_fundrawtransaction.py
index a00e7e68..a35b2c80 100755
--- a/depend/bitcoin/test/functional/wallet_fundrawtransaction.py
+++ b/depend/bitcoin/test/functional/wallet_fundrawtransaction.py
@@ -11,6 +11,7 @@
 from test_framework.address import address_to_scriptpubkey
 
 from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.messages import (
     COIN,
     CTransaction,
@@ -294,6 +295,7 @@ def test_invalid_option(self):
         assert_equal(utx['txid'], dec_tx['vin'][0]['txid'])
 
         assert_raises_rpc_error(-8, "Unknown named parameter foo", self.nodes[2].fundrawtransaction, rawtx, foo='bar')
+        assert_raises_rpc_error(-3, "JSON value of type bool is not of expected type object", self.nodes[2].fundrawtransaction, rawtx, True)
 
         # reserveChangeKey was deprecated and is now removed
         assert_raises_rpc_error(-8, "Unknown named parameter reserveChangeKey", lambda: self.nodes[2].fundrawtransaction(hexstring=rawtx, reserveChangeKey=True))
@@ -612,12 +614,12 @@ def test_locked_wallet(self):
 
         with WalletUnlock(wallet, "test"):
             wallet.importdescriptors([{
-                'desc': descsum_create('wpkh(tprv8ZgxMBicQKsPdYeeZbPSKd2KYLmeVKtcFA7kqCxDvDR13MQ6us8HopUR2wLcS2ZKPhLyKsqpDL2FtL73LMHcgoCL7DXsciA8eX8nbjCR2eG/0h/*h)'),
+                'desc': descsum_create(f'wpkh({ExtendedPrivateKey.generate().to_string()}/0h/*h)'),
                 'timestamp': 'now',
                 'active': True
             },
             {
-                'desc': descsum_create('wpkh(tprv8ZgxMBicQKsPdYeeZbPSKd2KYLmeVKtcFA7kqCxDvDR13MQ6us8HopUR2wLcS2ZKPhLyKsqpDL2FtL73LMHcgoCL7DXsciA8eX8nbjCR2eG/1h/*h)'),
+                'desc': descsum_create(f'wpkh({ExtendedPrivateKey.generate().to_string()}/1h/*h)'),
                 'timestamp': 'now',
                 'active': True,
                 'internal': True
@@ -761,8 +763,7 @@ def test_watchonly(self):
         }]
         wwatch.importdescriptors(desc_import)
 
-        # Backward compatibility test (2nd params is includeWatching)
-        result = wwatch.fundrawtransaction(rawtx, True)
+        result = wwatch.fundrawtransaction(rawtx)
         res_dec = self.nodes[0].decoderawtransaction(result["hex"])
         assert_equal(len(res_dec["vin"]), 1)
         assert_equal(res_dec["vin"][0]["txid"], self.watchonly_utxo['txid'])
@@ -1176,10 +1177,10 @@ def test_add_inputs_default_value(self):
         tx = wallet.send(outputs=[{addr1: 8}], **options)
         assert tx["complete"]
         # Check that only the preset inputs were added to the tx
-        decoded_psbt_inputs = self.nodes[0].decodepsbt(tx["psbt"])['tx']['vin']
+        decoded_psbt_inputs = self.nodes[0].decodepsbt(tx["psbt"])["inputs"]
         assert_equal(len(decoded_psbt_inputs), 2)
         for input in decoded_psbt_inputs:
-            assert_equal(input["txid"], source_tx["txid"])
+            assert_equal(input["previous_txid"], source_tx["txid"])
 
         # Case (5), assert that inputs are added to the tx by explicitly setting add_inputs=true
         options = {"add_inputs": True, "add_to_wallet": True}
@@ -1218,10 +1219,10 @@ def test_add_inputs_default_value(self):
         })
         psbt_tx = wallet.walletcreatefundedpsbt(outputs=[{addr1: 8}], inputs=inputs, **options)
         # Check that only the preset inputs were added to the tx
-        decoded_psbt_inputs = self.nodes[0].decodepsbt(psbt_tx["psbt"])['tx']['vin']
+        decoded_psbt_inputs = self.nodes[0].decodepsbt(psbt_tx["psbt"])["inputs"]
         assert_equal(len(decoded_psbt_inputs), 2)
         for input in decoded_psbt_inputs:
-            assert_equal(input["txid"], source_tx["txid"])
+            assert_equal(input["previous_txid"], source_tx["txid"])
 
         # Case (5), 'walletcreatefundedpsbt' command
         # Explicit add_inputs=true, no preset inputs
diff --git a/depend/bitcoin/test/functional/wallet_hd.py b/depend/bitcoin/test/functional/wallet_hd.py
index c130c731..e5227e6f 100755
--- a/depend/bitcoin/test/functional/wallet_hd.py
+++ b/depend/bitcoin/test/functional/wallet_hd.py
@@ -7,10 +7,12 @@
 import shutil
 
 from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.descriptors import descsum_create
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     wallet_importprivkey,
+    assert_raises_rpc_error,
 )
 
 
@@ -25,6 +27,56 @@ def set_test_params(self):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
+    def test_addhdkey(self):
+        self.log.info("Test addhdkey")
+        def_wallet = self.nodes[0].get_wallet_rpc(self.default_wallet_name)
+        self.nodes[0].createwallet("hdkey")
+        wallet = self.nodes[0].get_wallet_rpc("hdkey")
+
+        assert_equal(len(wallet.gethdkeys()), 1)
+
+        wallet.addhdkey()
+        xpub_info = wallet.gethdkeys()
+        assert_equal(len(xpub_info), 2)
+        for x in xpub_info:
+            if len(x["descriptors"]) == 1 and x["descriptors"][0]["desc"].startswith("unused("):
+                break
+        else:
+            assert False, "Did not find HD key with no descriptors"
+
+        imp_xpub_info = def_wallet.gethdkeys(private=True)[0]
+        imp_xpub = imp_xpub_info["xpub"]
+        imp_xprv = imp_xpub_info["xprv"]
+
+        assert_raises_rpc_error(-5, "Extended public key (xpub) provided, but extended private key (xprv) is required", wallet.addhdkey, imp_xpub)
+        add_res = wallet.addhdkey(imp_xprv)
+        expected_unused_desc = descsum_create(f"unused({imp_xpub})")
+        assert_equal(add_res["xpub"], imp_xpub)
+        xpub_info = wallet.gethdkeys()
+        assert_equal(len(xpub_info), 3)
+        for x in xpub_info:
+            if x["xpub"] == imp_xpub:
+                assert_equal(len(x["descriptors"]), 1)
+                assert_equal(x["descriptors"][0]["desc"], expected_unused_desc)
+                break
+        else:
+            assert False, "Added HD key was not found in wallet"
+
+        for d in wallet.listdescriptors()["descriptors"]:
+            if d["desc"] == expected_unused_desc:
+                assert_equal(d["active"], False)
+                break
+        else:
+            assert False, "Added HD key's descriptor was not found in wallet"
+
+        assert_raises_rpc_error(-4, "HD key already exists", wallet.addhdkey, imp_xprv)
+
+    def test_addhdkey_noprivs(self):
+        self.log.info("Test addhdkey is not available for wallets without privkeys")
+        self.nodes[0].createwallet("hdkey_noprivs", disable_private_keys=True)
+        wallet = self.nodes[0].get_wallet_rpc("hdkey_noprivs")
+        assert_raises_rpc_error(-4, "addhdkey is not available for wallets without private keys", wallet.addhdkey)
+
     def run_test(self):
         # Make sure we use hd, keep masterkeyid
         hd_fingerprint = self.nodes[1].getaddressinfo(self.nodes[1].getnewaddress())['hdmasterfingerprint']
@@ -124,6 +176,8 @@ def run_test(self):
 
         assert_equal(keypath[0:14], "m/84h/1h/0h/1/")
 
+        self.test_addhdkey()
+        self.test_addhdkey_noprivs()
 
 if __name__ == '__main__':
     WalletHDTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_importdescriptors.py b/depend/bitcoin/test/functional/wallet_importdescriptors.py
index bfb25c63..78378e59 100755
--- a/depend/bitcoin/test/functional/wallet_importdescriptors.py
+++ b/depend/bitcoin/test/functional/wallet_importdescriptors.py
@@ -16,22 +16,28 @@
   and test the values returned."""
 
 import concurrent.futures
+import threading
 import time
 
-from test_framework.authproxy import JSONRPCException
+from test_framework.address import key_to_p2sh_p2wpkh, key_to_p2wpkh, script_to_p2wsh
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.script import SEQUENCE_LOCKTIME_TYPE_FLAG
+from test_framework.script_util import keys_to_multisig_script
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
+    JSONRPCException,
 )
 from test_framework.wallet_util import (
     get_generate_key,
     test_address,
 )
 
+MISSING_KEYS_WARNING = "Not all private keys provided. Some wallet functionality may return unexpected errors"
+
 class ImportDescriptorsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
@@ -46,7 +52,7 @@ def set_test_params(self):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
-    def test_importdesc(self, req, success, error_code=None, error_message=None, warnings=None, wallet=None):
+    def test_importdesc(self, req, success, global_error=False, error_code=None, error_message=None, warnings=None, wallet=None):
         """Run importdescriptors and assert success"""
         if warnings is None:
             warnings = []
@@ -54,6 +60,14 @@ def test_importdesc(self, req, success, error_code=None, error_message=None, war
         if wallet is not None:
             wrpc = wallet
 
+        if global_error and not success:
+            try:
+                result = wrpc.importdescriptors([req])
+            except JSONRPCException as e:
+                assert_equal(e.error["code"], error_code)
+                assert_equal(e.error["message"], error_message)
+                return
+
         result = wrpc.importdescriptors([req])
         observed_warnings = []
         if 'warnings' in result[0]:
@@ -65,6 +79,213 @@ def test_importdesc(self, req, success, error_code=None, error_message=None, war
             assert_equal(result[0]['error']['code'], error_code)
             assert_equal(result[0]['error']['message'], error_message)
 
+    def test_import_unused_key(self):
+        self.log.info("Test import of unused(KEY)")
+        self.nodes[0].createwallet(wallet_name="import_unused", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc("import_unused")
+
+        assert_equal(len(wallet.gethdkeys()), 0)
+
+        extended_key = ExtendedPrivateKey.generate()
+        xprv = extended_key.to_string()
+        xpub = extended_key.pubkey().to_string()
+        self.test_importdesc({"desc":descsum_create(f"unused({xpub})"),
+                              "timestamp": "now"},
+                              success=False,
+                              error_code=-4,
+                              error_message='Cannot import descriptor without private keys to a wallet with private keys enabled',
+                              wallet=wallet)
+        self.test_importdesc({"timestamp": "now", "desc": descsum_create(f"unused({xprv})")},
+                             success=True,
+                             wallet=wallet)
+        hdkeys = wallet.gethdkeys()
+        assert_equal(len(hdkeys), 1)
+        assert_equal(hdkeys[0]["xpub"], xpub)
+        wallet.unloadwallet()
+
+    def test_import_unused_key_existing(self):
+        self.log.info("Test import of unused(KEY) with existing KEY")
+        self.nodes[0].createwallet(wallet_name="import_existing_unused")
+        wallet = self.nodes[0].get_wallet_rpc("import_existing_unused")
+
+        hdkeys = wallet.gethdkeys(private=True)
+        assert_equal(len(hdkeys), 1)
+        xprv = hdkeys[0]["xprv"]
+
+        self.test_importdesc({"timestamp": "now", "desc": descsum_create(f"unused({xprv})")},
+                             success=False,
+                             error_code=-4,
+                             error_message="Cannot import an unused() descriptor when its private key is already in the wallet",
+                             wallet=wallet)
+        wallet.unloadwallet()
+
+    def test_import_unused_noprivs(self):
+        self.log.info("Test import of unused(KEY) to wallet without privkeys")
+        self.nodes[0].createwallet(wallet_name="import_unused_noprivs", disable_private_keys=True)
+        wallet = self.nodes[0].get_wallet_rpc("import_unused_noprivs")
+
+        xpub = ExtendedPrivateKey.generate().pubkey().to_string()
+        self.test_importdesc({"timestamp": "now", "desc": descsum_create(f"unused({xpub})")},
+                             success=False,
+                             error_code=-4,
+                             error_message="Cannot import unused() to wallet without private keys enabled",
+                             wallet=wallet)
+        wallet.unloadwallet()
+
+    def test_per_item_errors_are_reported_in_order(self):
+        self.log.info("Test that import results are in the same order as the original request")
+        self.nodes[0].createwallet(wallet_name="test_order_import", blank=True)
+        wallet = self.nodes[0].get_wallet_rpc('test_order_import')
+        whitespace_pubkey = f" {get_generate_key().pubkey}"
+        cases = [
+            ({
+                "timestamp": "now"
+            }, [False, "Descriptor not found."]),
+            ({
+                "desc": descsum_create(f"pkh({get_generate_key().privkey})"),
+                "timestamp": 1,
+                "label": "Valid descriptor 1",
+            }, [True]),
+            ({
+                "desc": descsum_create(f"pkh({get_generate_key().privkey})"),
+                "timestamp": "now",
+                "internal": True,
+            }, [True]),
+            ({
+                "desc": descsum_create(f"pkh({get_generate_key().pubkey})"),
+                "timestamp": "now",
+                "label": "Invalid descriptor 2",
+                "internal": True,
+            }, [False, "Internal addresses should not have a label"]),
+            ({
+                "desc": descsum_create(f"pkh({whitespace_pubkey})"),
+                "timestamp": "now",
+                "internal": True,
+            }, [False, f"pkh(): Key '{whitespace_pubkey}' is invalid due to whitespace"]),
+        ]
+
+        descriptors, expected = map(list, zip(*cases))
+        results = wallet.importdescriptors(descriptors)
+        for i, result in enumerate(results):
+            assert_equal(result["success"], expected[i][0])
+            if not result["success"]:
+                assert_equal(result["error"]["message"], expected[i][1])
+
+    def test_rescan_fails_import(self):
+        xpriv = ExtendedPrivateKey.generate().to_string()
+
+        self.log.info("Test importdescriptors fails when wallet is already rescanning")
+        wallet_name = "rescan_wallet"
+        self.nodes[0].createwallet(wallet_name=wallet_name, blank=True)
+        other_desc = descsum_create("pkh(" + get_generate_key().privkey + ")")
+
+        w_import = self.nodes[0].create_new_rpc_connection(mode="AUTHPROXY") / f"wallet/{wallet_name}"
+
+        with concurrent.futures.ThreadPoolExecutor(max_workers=2) as thread:
+            w_rescan = self.nodes[0].create_new_rpc_connection(mode="AUTHPROXY") / f"wallet/{wallet_name}"
+            w_conflict = self.nodes[0].create_new_rpc_connection(mode="AUTHPROXY") / f"wallet/{wallet_name}"
+            # Use an xprv with timestamp=0 and a large key-range to trigger a slow full rescan that stays in-flight
+            slow_desc = [{"desc": descsum_create("pkh(" + xpriv + "/0h/*h)"),
+            "timestamp": 0, "range": [0, 10000]}]
+            conflicting_desc = [{"desc": descsum_create("pkh(" + xpriv + "/1h/*h)"),
+            "timestamp": 0, "range": [0, 10000]}]
+            num_relevant_blocks = 1000
+            self.generatetoaddress(self.nodes[0], num_relevant_blocks, self.nodes[0].deriveaddresses(slow_desc[0]['desc'], [0, 0])[0])
+            self.generatetoaddress(self.nodes[0], num_relevant_blocks, self.nodes[0].deriveaddresses(conflicting_desc[0]['desc'], [0, 0])[0])
+
+            start = threading.Barrier(3)
+
+            def import_after_barrier(wallet, descriptors):
+                start.wait(timeout=10)
+                return wallet.importdescriptors(descriptors)
+
+            imports = [
+                thread.submit(import_after_barrier, w_rescan, slow_desc),
+                thread.submit(import_after_barrier, w_conflict, conflicting_desc),
+            ]
+            start.wait(timeout=10)
+
+            # One importdescriptor call must hold WalletRescanReserver while the other fails immediately.
+            num_errors = 0
+            num_success = 0
+            for future in concurrent.futures.as_completed(imports, timeout=30 * self.options.timeout_factor):
+                try:
+                    assert_equal(future.result(), [{'success': True}])
+                    num_success += 1
+                except JSONRPCException as e:
+                    assert_equal(e.error["code"], -4)
+                    assert_equal(e.error["message"], "Wallet is currently rescanning. Abort existing rescan or wait.")
+                    num_errors += 1
+
+            assert_equal(num_success, 1)
+            assert_equal(num_errors, 1)
+
+        # After the rescan finishes, any importdescriptors should succeed.
+        result = w_import.importdescriptors([{"desc": other_desc, "timestamp": "now"}])
+        assert_equal(result[0]['success'], True)
+
+        self.log.info("Aborting an importdescriptors rescan should fail the RPC call")
+        wallet_name = "abort_import_wallet"
+        self.nodes[0].createwallet(wallet_name, blank=True)
+
+        with concurrent.futures.ThreadPoolExecutor(max_workers=1) as thread:
+            w_import = self.nodes[0].create_new_rpc_connection(mode="AUTHPROXY") / f"wallet/{wallet_name}"
+            abort_rpc = self.nodes[0].create_new_rpc_connection(mode="AUTHPROXY") / f"wallet/{wallet_name}"
+            descriptor = [{"desc": descsum_create("pkh(" + xpriv + "/2h/*h)"),
+            "timestamp": 0, "range": [0, 4000]}]
+
+            importing = thread.submit(w_import.importdescriptors, descriptor)
+
+            # Keep trying because an abort before ScanForWalletTransactions starts
+            # is reset when the scan loop begins.
+            abort_succeeded = False
+            abort_deadline = time.time() + 30 * self.options.timeout_factor
+            while not importing.done() and time.time() < abort_deadline:
+                abort_succeeded = abort_rpc.abortrescan() or abort_succeeded
+
+            assert_equal(abort_succeeded, True)
+            try:
+                importing.result(timeout=30 * self.options.timeout_factor)
+                raise AssertionError("importdescriptors unexpectedly succeeded")
+            except JSONRPCException as e:
+                assert_equal(e.error["code"], -1)
+                assert_equal(e.error["message"], "Rescan aborted by user.")
+
+    def test_musig_private_key_warnings(self, xprv1, acc_xprv2, acc_xpub2, derivation_path):
+        self.log.info("Testing importdescriptors MuSig private key warnings")
+
+        self.nodes[1].createwallet(wallet_name="musig_import_warnings", blank=True)
+        wallet = self.nodes[1].get_wallet_rpc("musig_import_warnings")
+        res = wallet.importdescriptors([
+            {
+                "desc": descsum_create(f"rawtr(musig({xprv1}/{derivation_path}/0,{acc_xprv2}/1))"),
+                "timestamp": "now",
+            },
+            {
+                "desc": descsum_create(f"rawtr(musig({xprv1}/{derivation_path}/2,{acc_xpub2}/3))"),
+                "timestamp": "now",
+            },
+            {
+                "desc": descsum_create(f"rawtr(musig({xprv1}/{derivation_path},{acc_xprv2})/0/*)"),
+                "timestamp": "now",
+                "range": [0, 1],
+            },
+            {
+                "desc": descsum_create(f"rawtr(musig({xprv1}/{derivation_path},{acc_xpub2})/1/*)"),
+                "timestamp": "now",
+                "range": [0, 1],
+            },
+        ])
+
+        assert_equal(res[0]["success"], True)
+        assert "warnings" not in res[0]
+        assert_equal(res[1]["success"], True)
+        assert_equal(res[1]["warnings"], [MISSING_KEYS_WARNING])
+        assert_equal(res[2]["success"], True)
+        assert "warnings" not in res[2]
+        assert_equal(res[3]["success"], True)
+        assert_equal(res[3]["warnings"], [MISSING_KEYS_WARNING])
+
     def run_test(self):
         self.log.info('Setting up wallets')
         self.nodes[0].createwallet(wallet_name='w0', disable_private_keys=False)
@@ -90,6 +311,25 @@ def run_test(self):
                              error_code=-8,
                              error_message='Descriptor not found.')
 
+        # Test import fails if one timestamp is invalid or missing
+        self.log.info("Import should fail if timestamp is missing or an invalid timestamp is present in the request")
+        key = get_generate_key()
+        import_request = {"desc": descsum_create("pkh(" + key.pubkey + ")"), "label": "Descriptor import test"}
+        self.test_importdesc(import_request,
+            success=False,
+            global_error=True,
+            error_code=-3,
+            error_message="Missing required timestamp field for key")
+
+        import_request = {"desc": descsum_create("pkh(" + key.pubkey + ")"),
+            "timestamp": "this_is_not_a_valid_timestamp",
+            "label": "Descriptor import test"}
+        self.test_importdesc(import_request,
+            success=False,
+            global_error=True,
+            error_code=-3,
+            error_message='Expected number or "now" timestamp value for key. got type string')
+
         # # Test importing of a P2PKH descriptor
         key = get_generate_key()
         self.log.info("Should import a p2pkh descriptor")
@@ -206,10 +446,12 @@ def run_test(self):
                      ismine=False)
 
         # # Test ranged descriptors
-        xpriv = "tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg"
-        xpub = "tpubD6NzVbkrYhZ4YNXVQbNhMK1WqguFsUXceaVJKbmno2aZ3B6QfbMeraaYvnBSGpV3vxLyTTK9DYT1yoEck4XUScMzXoQ2U2oSmE2JyMedq3H"
-        addresses = ["2N7yv4p8G8yEaPddJxY41kPihnWvs39qCMf", "2MsHxyb2JS3pAySeNUsJ7mNnurtpeenDzLA"] # hdkeypath=m/0'/0'/0' and 1'
-        addresses += ["bcrt1qrd3n235cj2czsfmsuvqqpr3lu6lg0ju7scl8gn", "bcrt1qfqeppuvj0ww98r6qghmdkj70tv8qpchehegrg8"] # wpkh subscripts corresponding to the above addresses
+        extended_key = ExtendedPrivateKey.generate()
+        xpriv = extended_key.to_string()
+        xpub = extended_key.pubkey().to_string()
+        pubkeys = [extended_key.derive_path(f"m/0'/0'/{i}'").pubkey().pubkey.get_bytes() for i in range(2)]
+        addresses = [key_to_p2sh_p2wpkh(pubkey) for pubkey in pubkeys] # hdkeypath=m/0'/0'/0' and 1'
+        addresses += [key_to_p2wpkh(pubkey) for pubkey in pubkeys] # wpkh subscripts corresponding to the above addresses
         desc = "sh(wpkh(" + xpub + "/0/0/*" + "))"
 
         self.log.info("Ranged descriptors cannot have labels")
@@ -447,25 +689,43 @@ def run_test(self):
         wmulti_priv = self.nodes[1].get_wallet_rpc("wmulti_priv")
         assert_equal(wmulti_priv.getwalletinfo()['keypoolsize'], 0)
 
-        xprv1 = 'tprv8ZgxMBicQKsPevADjDCWsa6DfhkVXicu8NQUzfibwX2MexVwW4tCec5mXdCW8kJwkzBRRmAay1KZya4WsehVvjTGVW6JLqiqd8DdZ4xSg52'
-        acc_xpub1 = 'tpubDCJtdt5dgJpdhW4MtaVYDhG4T4tF6jcLR1PxL43q9pq1mxvXgMS9Mzw1HnXG15vxUGQJMMSqCQHMTy3F1eW5VkgVroWzchsPD5BUojrcWs8'  # /84'/0'/0'
-        chg_xpub1 = 'tpubDCXqdwWZcszwqYJSnZp8eARkxGJfHAk23KDxbztV4BbschfaTfYLTcSkSJ3TN64dRqwa1rnFUScsYormKkGqNbbPwkorQimVevXjxzUV9Gf'  # /84'/1'/0'
-        xprv2 = 'tprv8ZgxMBicQKsPdSNWUhDiwTScDr6JfkZuLshTRwzvZGnMSnGikV6jxpmdDkC3YRc4T3GD6Nvg9uv6hQg73RVv1EiTXDZwxVbsLugVHU8B1aq'
-        acc_xprv2 = 'tprv8gVCsmRAxVSxyUpsL13Y7ZEWBFPWbgS5E2MmFVNGuANrknvmmn2vWnmHvU8AwEFYzR2ji6EeZLSCLVacsYkvor3Pcb5JY5FGcevqTwYvdYx'
-        acc_xpub2 = 'tpubDDBF2BTR6s8drwrfDei8WxtckGuSm1cyoKxYY1QaKSBFbHBYQArWhHPA6eJrzZej6nfHGLSURYSLHr7GuYch8aY5n61tGqgn8b4cXrMuoPH'
-        chg_xpub2 = 'tpubDCYfZY2ceyHzYzMMVPt9MNeiqtQ2T7Uyp9QSFwYXh8Vi9iJFYXcuphJaGXfF3jUQJi5Y3GMNXvM11gaL4txzZgNGK22BFAwMXynnzv4z2Jh'
-        xprv3 = 'tprv8ZgxMBicQKsPeonDt8Ka2mrQmHa61hQ5FQCsvWBTpSNzBFgM58cV2EuXNAHF14VawVpznnme3SuTbA62sGriwWyKifJmXntfNeK7zeqMCj1'
-        acc_xpub3 = 'tpubDCsWoW1kuQB9kG5MXewHqkbjPtqPueRnXju7uM2NK7y3JYb2ajAZ9EiuZXNNuE4661RAfriBWhL8UsnAPpk8zrKKnZw1Ug7X4oHgMdZiU4E'
-        chg_xpub3 = 'tpubDC6UGqnsQStngYuGD4MKsMy7eD1Yg9NTJfPdvjdG2JE5oZ7EsSL3WHg4Gsw2pR5K39ZwJ46M1wZayhedVdQtMGaUhq5S23PH6fnENK3V1sb'
-
-        self.test_importdesc({"desc":"wsh(multi(2," + xprv1 + "/84h/0h/0h/*," + xprv2 + "/84h/0h/0h/*," + xprv3 + "/84h/0h/0h/*))#m2sr93jn",
+        derivation_path = "84h/0h/0h"
+        change_derivation_path = "84h/1h/0h"
+        extended_key_1 = ExtendedPrivateKey.generate()
+        xprv1 = extended_key_1.to_string()
+        xprv1_fingerprint = extended_key_1._fingerprint().hex()
+        acc_xpub1_key = extended_key_1.derive_path(derivation_path).pubkey()
+        acc_xpub1 = acc_xpub1_key.to_string()
+        chg_xpub1_key = extended_key_1.derive_path(change_derivation_path).pubkey()
+        chg_xpub1 = chg_xpub1_key.to_string()
+
+        extended_key_2 = ExtendedPrivateKey.generate()
+        xprv2 = extended_key_2.to_string()
+        xprv2_fingerprint = extended_key_2._fingerprint().hex()
+        acc_xprv2 = extended_key_2.derive_path(derivation_path).to_string()
+        acc_xpub2_key = extended_key_2.derive_path(derivation_path).pubkey()
+        acc_xpub2 = acc_xpub2_key.to_string()
+        chg_xpub2_key = extended_key_2.derive_path(change_derivation_path).pubkey()
+        chg_xpub2 = chg_xpub2_key.to_string()
+
+        extended_key_3 = ExtendedPrivateKey.generate()
+        xprv3 = extended_key_3.to_string()
+        xprv3_fingerprint = extended_key_3._fingerprint().hex()
+        acc_xpub3_key = extended_key_3.derive_path(derivation_path).pubkey()
+        acc_xpub3 = acc_xpub3_key.to_string()
+        chg_xpub3_key = extended_key_3.derive_path(change_derivation_path).pubkey()
+        chg_xpub3 = chg_xpub3_key.to_string()
+
+        self.test_musig_private_key_warnings(xprv1, acc_xprv2, acc_xpub2, derivation_path)
+
+        self.test_importdesc({"desc": descsum_create(f"wsh(multi(2,{xprv1}/{derivation_path}/*,{xprv2}/{derivation_path}/*,{xprv3}/{derivation_path}/*))"),
                             "active": True,
                             "range": 1000,
                             "next_index": 0,
                             "timestamp": "now"},
                             success=True,
                             wallet=wmulti_priv)
-        self.test_importdesc({"desc":"wsh(multi(2," + xprv1 + "/84h/1h/0h/*," + xprv2 + "/84h/1h/0h/*," + xprv3 + "/84h/1h/0h/*))#q3sztvx5",
+        self.test_importdesc({"desc": descsum_create(f"wsh(multi(2,{xprv1}/{change_derivation_path}/*,{xprv2}/{change_derivation_path}/*,{xprv3}/{change_derivation_path}/*))"),
                             "active": True,
                             "internal" : True,
                             "range": 1000,
@@ -475,11 +735,16 @@ def run_test(self):
                             wallet=wmulti_priv)
 
         assert_equal(wmulti_priv.getwalletinfo()['keypoolsize'], 1001) # Range end (1000) is inclusive, so 1001 addresses generated
+
         addr = wmulti_priv.getnewaddress('', 'bech32') # uses receive 0
-        assert_equal(addr, 'bcrt1qdt0qy5p7dzhxzmegnn4ulzhard33s2809arjqgjndx87rv5vd0fq2czhy8') # Derived at m/84'/0'/0'/0
+        expected_addr = script_to_p2wsh(keys_to_multisig_script([k.derive_path("m/0").pubkey.get_bytes() for k in [acc_xpub1_key, acc_xpub2_key, acc_xpub3_key]], k=2))
+        assert_equal(addr, expected_addr) # Derived at m/84'/0'/0'/0
+
         change_addr = wmulti_priv.getrawchangeaddress('bech32') # uses change 0
-        assert_equal(change_addr, 'bcrt1qt9uhe3a9hnq7vajl7a094z4s3crm9ttf8zw3f5v9gr2nyd7e3lnsy44n8e') # Derived at m/84'/1'/0'/0
+        expected_change_addr = script_to_p2wsh(keys_to_multisig_script([k.derive_path("m/0").pubkey.get_bytes() for k in [chg_xpub1_key, chg_xpub2_key, chg_xpub3_key]], k=2))
+        assert_equal(change_addr, expected_change_addr)  # Derived at m/84'/1'/0'/0
         assert_equal(wmulti_priv.getwalletinfo()['keypoolsize'], 1000)
+
         txid = w0.sendtoaddress(addr, 10)
         self.generate(self.nodes[0], 6)
         send_txid = wmulti_priv.sendtoaddress(w0.getnewaddress(), 8) # uses change 1
@@ -491,14 +756,14 @@ def run_test(self):
         wmulti_pub = self.nodes[1].get_wallet_rpc("wmulti_pub")
         assert_equal(wmulti_pub.getwalletinfo()['keypoolsize'], 0)
 
-        self.test_importdesc({"desc":"wsh(multi(2,[7b2d0242/84h/0h/0h]" + acc_xpub1 + "/*,[59b09cd6/84h/0h/0h]" + acc_xpub2 + "/*,[e81a0532/84h/0h/0h]" + acc_xpub3 +"/*))#tsry0s5e",
+        self.test_importdesc({"desc": descsum_create(f"wsh(multi(2,[{xprv1_fingerprint}/{derivation_path}]{acc_xpub1}/*,[{xprv2_fingerprint}/{derivation_path}]{acc_xpub2}/*,[{xprv3_fingerprint}/{derivation_path}]{acc_xpub3}/*))"),
                             "active": True,
                             "range": 1000,
                             "next_index": 0,
                             "timestamp": "now"},
                             success=True,
                             wallet=wmulti_pub)
-        self.test_importdesc({"desc":"wsh(multi(2,[7b2d0242/84h/1h/0h]" + chg_xpub1 + "/*,[59b09cd6/84h/1h/0h]" + chg_xpub2 + "/*,[e81a0532/84h/1h/0h]" + chg_xpub3 + "/*))#c08a2rzv",
+        self.test_importdesc({"desc": descsum_create(f"wsh(multi(2,[{xprv1_fingerprint}/{change_derivation_path}]{chg_xpub1}/*,[{xprv2_fingerprint}/{change_derivation_path}]{chg_xpub2}/*,[{xprv3_fingerprint}/{change_derivation_path}]{chg_xpub3}/*))"),
                             "active": True,
                             "internal" : True,
                             "range": 1000,
@@ -509,9 +774,13 @@ def run_test(self):
 
         assert_equal(wmulti_pub.getwalletinfo()['keypoolsize'], 1000) # The first one was already consumed by previous import and is detected as used
         addr = wmulti_pub.getnewaddress('', 'bech32') # uses receive 1
-        assert_equal(addr, 'bcrt1qp8s25ckjl7gr6x2q3dx3tn2pytwp05upkjztk6ey857tt50r5aeqn6mvr9') # Derived at m/84'/0'/0'/1
+        expected_addr = script_to_p2wsh(keys_to_multisig_script([k.derive_path("m/1").pubkey.get_bytes() for k in [acc_xpub1_key, acc_xpub2_key, acc_xpub3_key]], k=2))
+        assert_equal(addr, expected_addr) # Derived at m/84'/0'/0'/1
+        assert_equal(wmulti_pub.getaddressinfo(addr)["desc"].count(f"{derivation_path}/1"), 3) # Derived at m/84h/0h/0h/1 for all three keys
         change_addr = wmulti_pub.getrawchangeaddress('bech32') # uses change 2
-        assert_equal(change_addr, 'bcrt1qp6j3jw8yetefte7kw6v5pc89rkgakzy98p6gf7ayslaveaxqyjusnw580c') # Derived at m/84'/1'/0'/2
+        expected_change_addr = script_to_p2wsh(keys_to_multisig_script([k.derive_path("m/2").pubkey.get_bytes() for k in [chg_xpub1_key, chg_xpub2_key, chg_xpub3_key]], k=2))
+        assert_equal(change_addr, expected_change_addr)  # Derived at m/84'/1'/0'/2
+        assert_equal(wmulti_pub.getaddressinfo(change_addr)["desc"].count(f"{change_derivation_path}/2"), 3) # Derived at m/84h/1h/0h/1 for all three keys
         assert send_txid in self.nodes[0].getrawmempool(True)
         assert send_txid in (x['txid'] for x in wmulti_pub.listunspent(0))
         assert_equal(wmulti_pub.getwalletinfo()['keypoolsize'], 999)
@@ -534,14 +803,14 @@ def run_test(self):
         wmulti_priv1 = self.nodes[1].get_wallet_rpc("wmulti_priv1")
         res = wmulti_priv1.importdescriptors([
         {
-            "desc": descsum_create("wsh(multi(2," + xprv1 + "/84h/0h/0h/*,[59b09cd6/84h/0h/0h]" + acc_xpub2 + "/*,[e81a0532/84h/0h/0h]" + acc_xpub3 + "/*))"),
+            "desc": descsum_create(f"wsh(multi(2,{xprv1}/{derivation_path}/*,[{xprv2_fingerprint}/{derivation_path}]{acc_xpub2}/*,[{xprv3_fingerprint}/{derivation_path}]{acc_xpub3}/*))"),
             "active": True,
             "range": 1000,
             "next_index": 0,
             "timestamp": "now"
         },
         {
-            "desc": descsum_create("wsh(multi(2," + xprv1 + "/84h/1h/0h/*,[59b09cd6/84h/1h/0h]" + chg_xpub2 + "/*,[e81a0532/84h/1h/0h]" + chg_xpub3 + "/*))"),
+            "desc": descsum_create(f"wsh(multi(2,{xprv1}/{change_derivation_path}/*,[{xprv2_fingerprint}/{change_derivation_path}]{chg_xpub2}/*,[{xprv3_fingerprint}/{change_derivation_path}]{chg_xpub3}/*))"),
             "active": True,
             "internal" : True,
             "range": 1000,
@@ -549,22 +818,22 @@ def run_test(self):
             "timestamp": "now"
         }])
         assert_equal(res[0]['success'], True)
-        assert_equal(res[0]['warnings'][0], 'Not all private keys provided. Some wallet functionality may return unexpected errors')
+        assert_equal(res[0]['warnings'][0], MISSING_KEYS_WARNING)
         assert_equal(res[1]['success'], True)
-        assert_equal(res[1]['warnings'][0], 'Not all private keys provided. Some wallet functionality may return unexpected errors')
+        assert_equal(res[1]['warnings'][0], MISSING_KEYS_WARNING)
 
         self.nodes[1].createwallet(wallet_name='wmulti_priv2', blank=True)
         wmulti_priv2 = self.nodes[1].get_wallet_rpc('wmulti_priv2')
         res = wmulti_priv2.importdescriptors([
         {
-            "desc": descsum_create("wsh(multi(2,[7b2d0242/84h/0h/0h]" + acc_xpub1 + "/*," + xprv2 + "/84h/0h/0h/*,[e81a0532/84h/0h/0h]" + acc_xpub3 + "/*))"),
+            "desc": descsum_create(f"wsh(multi(2,[{xprv1_fingerprint}/{derivation_path}]{acc_xpub1}/*,{xprv2}/{derivation_path}/*,[{xprv3_fingerprint}/{derivation_path}]{acc_xpub3}/*))"),
             "active": True,
             "range": 1000,
             "next_index": 0,
             "timestamp": "now"
         },
         {
-            "desc": descsum_create("wsh(multi(2,[7b2d0242/84h/1h/0h]" + chg_xpub1 + "/*," + xprv2 + "/84h/1h/0h/*,[e81a0532/84h/1h/0h]" + chg_xpub3 + "/*))"),
+            "desc": descsum_create(f"wsh(multi(2,[{xprv1_fingerprint}/{change_derivation_path}]{chg_xpub1}/*,{xprv2}/{change_derivation_path}/*,[{xprv3_fingerprint}/{change_derivation_path}]{chg_xpub3}/*))"),
             "active": True,
             "internal" : True,
             "range": 1000,
@@ -572,9 +841,9 @@ def run_test(self):
             "timestamp": "now"
         }])
         assert_equal(res[0]['success'], True)
-        assert_equal(res[0]['warnings'][0], 'Not all private keys provided. Some wallet functionality may return unexpected errors')
+        assert_equal(res[0]['warnings'][0], MISSING_KEYS_WARNING)
         assert_equal(res[1]['success'], True)
-        assert_equal(res[1]['warnings'][0], 'Not all private keys provided. Some wallet functionality may return unexpected errors')
+        assert_equal(res[1]['warnings'][0], MISSING_KEYS_WARNING)
 
         rawtx = self.nodes[1].createrawtransaction([utxo], {w0.getnewaddress(): 9.999})
         tx_signed_1 = wmulti_priv1.signrawtransactionwithwallet(rawtx)
@@ -586,8 +855,9 @@ def run_test(self):
         self.log.info("We can create and use a huge multisig under P2WSH")
         self.nodes[1].createwallet(wallet_name='wmulti_priv_big', blank=True)
         wmulti_priv_big = self.nodes[1].get_wallet_rpc('wmulti_priv_big')
-        xkey = "tprv8ZgxMBicQKsPeZSeYx7VXDDTs3XrTcmZQpRLbAeSQFCQGgKwR4gKpcxHaKdoTNHniv4EPDJNdzA3KxRrrBHcAgth8fU5X4oCndkkxk39iAt/*"
-        xkey_int = "tprv8ZgxMBicQKsPeZSeYx7VXDDTs3XrTcmZQpRLbAeSQFCQGgKwR4gKpcxHaKdoTNHniv4EPDJNdzA3KxRrrBHcAgth8fU5X4oCndkkxk39iAt/1/*"
+        xprv = ExtendedPrivateKey.generate().to_string()
+        xkey = f"{xprv}/*"
+        xkey_int = f"{xprv}/1/*"
         res = wmulti_priv_big.importdescriptors([
         {
             "desc": descsum_create(f"wsh(sortedmulti(20,{(xkey + ',') * 19}{xkey}))"),
@@ -653,7 +923,7 @@ def run_test(self):
         wmulti_priv3 = self.nodes[1].get_wallet_rpc("wmulti_priv3")
         res = wmulti_priv3.importdescriptors([
             {
-                "desc": descsum_create("wsh(multi(2," + xprv1 + "/84h/0h/0h/*,[59b09cd6/84h/0h/0h]" + acc_xpub2 + "/*,[e81a0532/84h/0h/0h]" + acc_xpub3 + "/*))"),
+                "desc": descsum_create(f"wsh(multi(2,{xprv1}/{derivation_path}/*,[{xprv2_fingerprint}/{derivation_path}]{acc_xpub2}/*,[{xprv3_fingerprint}/{derivation_path}]{acc_xpub3}/*))"),
                 "active": True,
                 "range": 1000,
                 "next_index": 0,
@@ -662,7 +932,7 @@ def run_test(self):
         assert_equal(res[0]['success'], True)
         res = wmulti_priv3.importdescriptors([
             {
-                "desc": descsum_create("wsh(multi(2," + xprv1 + "/84h/0h/0h/*,[59b09cd6/84h/0h/0h]" + acc_xprv2 + "/*,[e81a0532/84h/0h/0h]" + acc_xpub3 + "/*))"),
+                "desc": descsum_create(f"wsh(multi(2,{xprv1}/{derivation_path}/*,[{xprv2_fingerprint}/{derivation_path}]{acc_xprv2}/*,[{xprv3_fingerprint}/{derivation_path}]{acc_xpub3}/*))"),
                 "active": True,
                 "range": 1000,
                 "next_index": 0,
@@ -676,7 +946,7 @@ def run_test(self):
         self.nodes[1].sendrawtransaction(tx['hex'])
 
         self.log.info("Combo descriptors cannot be active")
-        self.test_importdesc({"desc": descsum_create("combo(tpubDCJtdt5dgJpdhW4MtaVYDhG4T4tF6jcLR1PxL43q9pq1mxvXgMS9Mzw1HnXG15vxUGQJMMSqCQHMTy3F1eW5VkgVroWzchsPD5BUojrcWs8/*)"),
+        self.test_importdesc({"desc": descsum_create(f"combo({ExtendedPrivateKey.generate().pubkey().to_string()}/*)"),
                               "active": True,
                               "range": 1,
                               "timestamp": "now"},
@@ -685,7 +955,7 @@ def run_test(self):
                               error_message="Combo descriptors cannot be set to active")
 
         self.log.info("Descriptors with no type cannot be active")
-        self.test_importdesc({"desc": descsum_create("pk(tpubDCJtdt5dgJpdhW4MtaVYDhG4T4tF6jcLR1PxL43q9pq1mxvXgMS9Mzw1HnXG15vxUGQJMMSqCQHMTy3F1eW5VkgVroWzchsPD5BUojrcWs8/*)"),
+        self.test_importdesc({"desc": descsum_create(f"pk({ExtendedPrivateKey.generate().pubkey().to_string()}/*)"),
                               "active": True,
                               "range": 1,
                               "timestamp": "now"},
@@ -709,6 +979,19 @@ def run_test(self):
         self.nodes[0].createwallet("encrypted_wallet", blank=True, passphrase="passphrase")
         encrypted_wallet = self.nodes[0].get_wallet_rpc("encrypted_wallet")
 
+        self.log.info("Wallet must be unlocked to import a descriptor")
+        assert_raises_rpc_error(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.",
+            encrypted_wallet.importdescriptors, [descriptor])
+
+        self.log.info("A locked wallet rejects an empty importdescriptors request")
+        assert_raises_rpc_error(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.",
+            encrypted_wallet.importdescriptors, [])
+
+        self.log.info("An unlocked wallet accepts an empty importdescriptors request")
+        self.nodes[0].createwallet("unencrypted_wallet", blank=True)
+        unencrypted_wallet = self.nodes[0].get_wallet_rpc("unencrypted_wallet")
+        assert_equal(unencrypted_wallet.importdescriptors([]), [])
+
         descriptor["timestamp"] = 0
         descriptor["next_index"] = 0
 
@@ -822,5 +1105,11 @@ def run_test(self):
             )
 
 
+        self.test_import_unused_key()
+        self.test_import_unused_key_existing()
+        self.test_import_unused_noprivs()
+        self.test_per_item_errors_are_reported_in_order()
+        self.test_rescan_fails_import()
+
 if __name__ == '__main__':
     ImportDescriptorsTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_importprunedfunds.py b/depend/bitcoin/test/functional/wallet_importprunedfunds.py
index 95e2a5b3..6c1c6406 100755
--- a/depend/bitcoin/test/functional/wallet_importprunedfunds.py
+++ b/depend/bitcoin/test/functional/wallet_importprunedfunds.py
@@ -25,6 +25,7 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 2
+        self.extra_args = [["-deprecatedrpc=removeprunedfunds"]] * 2
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
diff --git a/depend/bitcoin/test/functional/wallet_keypool.py b/depend/bitcoin/test/functional/wallet_keypool.py
index 78c760db..7ec2d353 100755
--- a/depend/bitcoin/test/functional/wallet_keypool.py
+++ b/depend/bitcoin/test/functional/wallet_keypool.py
@@ -7,6 +7,8 @@
 from decimal import Decimal
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.util import (
     assert_equal,
     assert_not_equal,
@@ -32,39 +34,39 @@ def run_test(self):
         nodes[0].walletpassphrase('test', 10)
         nodes[0].importdescriptors([
             {
-                "desc": "wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/*h)#y4dfsj7n",
+                "desc": descsum_create(f"wpkh({ExtendedPrivateKey.generate().to_string()}/0h/*h)"),
                 "timestamp": "now",
                 "range": [0,0],
                 "active": True
             },
             {
-                "desc": "pkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1h/*h)#a0nyvl0k",
+                "desc": descsum_create(f"pkh({ExtendedPrivateKey.generate().to_string()}/1h/*h)"),
                 "timestamp": "now",
                 "range": [0,0],
                 "active": True
             },
             {
-                "desc": "sh(wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/2h/*h))#lmeu2axg",
+                "desc": descsum_create(f"sh(wpkh({ExtendedPrivateKey.generate().to_string()}/2h/*h))"),
                 "timestamp": "now",
                 "range": [0,0],
                 "active": True
             },
             {
-                "desc": "wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/3h/*h)#jkl636gm",
+                "desc": descsum_create(f"wpkh({ExtendedPrivateKey.generate().to_string()}/3h/*h)"),
                 "timestamp": "now",
                 "range": [0,0],
                 "active": True,
                 "internal": True
             },
             {
-                "desc": "pkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/4h/*h)#l3crwaus",
+                "desc": descsum_create(f"pkh({ExtendedPrivateKey.generate().to_string()}/4h/*h)"),
                 "timestamp": "now",
                 "range": [0,0],
                 "active": True,
                 "internal": True
             },
             {
-                "desc": "sh(wpkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/5h/*h))#qg8wa75f",
+                "desc": descsum_create(f"sh(wpkh({ExtendedPrivateKey.generate().to_string()}/5h/*h))"),
                 "timestamp": "now",
                 "range": [0,0],
                 "active": True,
diff --git a/depend/bitcoin/test/functional/wallet_listdescriptors.py b/depend/bitcoin/test/functional/wallet_listdescriptors.py
index 98938f1b..945f7295 100755
--- a/depend/bitcoin/test/functional/wallet_listdescriptors.py
+++ b/depend/bitcoin/test/functional/wallet_listdescriptors.py
@@ -10,12 +10,14 @@
 from test_framework.descriptors import (
     descsum_create,
 )
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_not_equal,
     assert_equal,
     assert_raises_rpc_error,
 )
+from test_framework.wallet_util import generate_keypair
 
 
 class ListDescriptorsTest(BitcoinTestFramework):
@@ -55,9 +57,11 @@ def run_test(self):
         assert_equal(descriptor_strings, sorted(descriptor_strings))
 
         self.log.info('Test descriptors with hardened derivations are listed in importable form.')
-        xprv = 'tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg'
-        xpub_acc = 'tpubDCMVLhErorrAGfApiJSJzEKwqeaf2z3NrkVMxgYQjZLzMjXMBeRw2muGNYbvaekAE8rUFLftyEar4LdrG2wXyyTJQZ26zptmeTEjPTaATts'
+        extended_key = ExtendedPrivateKey.generate()
+        xprv = extended_key.to_string()
+        xprv_fingerprint = extended_key._fingerprint().hex()
         hardened_path = '/84h/1h/0h'
+        xpub_acc = extended_key.derive_path(f"m{hardened_path}").pubkey().to_string()
         wallet = node.get_wallet_rpc('w2')
         wallet.importdescriptors([{
             'desc': descsum_create('wpkh(' + xprv + hardened_path + '/0/*)'),
@@ -66,7 +70,7 @@ def run_test(self):
         expected = {
             'wallet_name': 'w2',
             'descriptors': [
-                {'desc': descsum_create('wpkh([80002067' + hardened_path + ']' + xpub_acc + '/0/*)'),
+                {'desc': descsum_create('wpkh([' + xprv_fingerprint + hardened_path + ']' + xpub_acc + '/0/*)'),
                  'timestamp': TIME_GENESIS_BLOCK,
                  'active': False,
                  'range': [0, 0],
@@ -129,15 +133,20 @@ def run_test(self):
         self.log.info('Test taproot descriptor do not have mixed hardened derivation marker')
         node.createwallet(wallet_name='w5', descriptors=True, disable_private_keys=True)
         wallet = node.get_wallet_rpc('w5')
+        derivation_path = "/48'/1'/0'/2'"
+        xprvs = [ExtendedPrivateKey.generate() for _ in range(0, 2)]
+        xprv_fingerprints = [xprv._fingerprint().hex() for xprv in xprvs]
+        desc_xpubs = [xprv.derive_path(f"m{derivation_path}").pubkey().to_string() for xprv in xprvs]
         wallet.importdescriptors([{
-            'desc': "tr([1dce71b2/48'/1'/0'/2']tpubDEeP3GefjqbaDTTaVAF5JkXWhoFxFDXQ9KuhVrMBViFXXNR2B3Lvme2d2AoyiKfzRFZChq2AGMNbU1qTbkBMfNv7WGVXLt2pnYXY87gXqcs/0/*,and_v(v:pk([c658b283/48'/1'/0'/2']tpubDFL5wzgPBYK5pZ2Kh1T8qrxnp43kjE5CXfguZHHBrZSWpkfASy5rVfj7prh11XdqkC1P3kRwUPBeX7AHN8XBNx8UwiprnFnEm5jyswiRD4p/0/*),older(65535)))#xl20m6md",
+            'desc': descsum_create(f"tr([{xprv_fingerprints[0]}{derivation_path}]{desc_xpubs[0]}/0/*,and_v(v:pk([{xprv_fingerprints[1]}{derivation_path}]{desc_xpubs[1]}/0/*),older(65535)))"),
             'timestamp': TIME_GENESIS_BLOCK,
         }])
+        derivation_path_alternate = "/48h/1h/0h/2h"
         expected = {
             'wallet_name': 'w5',
             'descriptors': [
                 {'active': False,
-                 'desc': 'tr([1dce71b2/48h/1h/0h/2h]tpubDEeP3GefjqbaDTTaVAF5JkXWhoFxFDXQ9KuhVrMBViFXXNR2B3Lvme2d2AoyiKfzRFZChq2AGMNbU1qTbkBMfNv7WGVXLt2pnYXY87gXqcs/0/*,and_v(v:pk([c658b283/48h/1h/0h/2h]tpubDFL5wzgPBYK5pZ2Kh1T8qrxnp43kjE5CXfguZHHBrZSWpkfASy5rVfj7prh11XdqkC1P3kRwUPBeX7AHN8XBNx8UwiprnFnEm5jyswiRD4p/0/*),older(65535)))#m4uznndk',
+                 'desc': descsum_create(f'tr([{xprv_fingerprints[0]}{derivation_path_alternate}]{desc_xpubs[0]}/0/*,and_v(v:pk([{xprv_fingerprints[1]}{derivation_path_alternate}]{desc_xpubs[1]}/0/*),older(65535)))'),
                  'timestamp': TIME_GENESIS_BLOCK,
                  'range': [0, 0],
                  'next': 0,
@@ -150,16 +159,22 @@ def run_test(self):
         node.createwallet(wallet_name='w6', blank=True)
         wallet = node.get_wallet_rpc('w6')
 
+        xprvs = []
+        xpubs = []
+        for _ in range(0, 8):
+            xprvs.append(ExtendedPrivateKey.generate().to_string())
+            xpubs.append(ExtendedPrivateKey.generate().pubkey().to_string())
+
+        _, pubkey_bytes = generate_keypair()
+        pubkey = pubkey_bytes.hex()
+
         expected_descs = {
-            descsum_create('tr(' + node.get_deterministic_priv_key().key +
-                ',{pk(03cdabb7f2dce7bfbd8a0b9570c6fd1e712e5d64045e9d6b517b3d5072251dc204)' +
-                ',pk([d34db33f/44h/0h/0h]tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/0)})'),
-            descsum_create('wsh(and_v(v:ripemd160(095ff41131e5946f3c85f79e44adbcf8e27e080e),multi(1,' + node.get_deterministic_priv_key().key +
-                ',tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/0)))'),
-            descsum_create('tr(03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,pk(musig(tprv8ZgxMBicQKsPeNLUGrbv3b7qhUk1LQJZAGMuk9gVuKh9sd4BWGp1eMsehUni6qGb8bjkdwBxCbgNGdh2bYGACK5C5dRTaif9KBKGVnSezxV,tpubD6NzVbkrYhZ4XcACN3PEwNjRpR1g4tZjBVk5pdMR2B6dbd3HYhdGVZNKofAiFZd9okBserZvv58A6tBX4pE64UpXGNTSesfUW7PpW36HuKz)/7/8/*))'),
-            descsum_create('tr(03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,pk(musig(tprv8ZgxMBicQKsPeNLUGrbv3b7qhUk1LQJZAGMuk9gVuKh9sd4BWGp1eMsehUni6qGb8bjkdwBxCbgNGdh2bYGACK5C5dRTaif9KBKGVnSezxV/10,tpubD6NzVbkrYhZ4XcACN3PEwNjRpR1g4tZjBVk5pdMR2B6dbd3HYhdGVZNKofAiFZd9okBserZvv58A6tBX4pE64UpXGNTSesfUW7PpW36HuKz/11)/*))'),
-            descsum_create('tr(03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,{pk(musig(tpubD6NzVbkrYhZ4Wo2WcFSgSqRD9QWkGxddo6WSqsVBx7uQ8QEtM7WncKDRjhFEexK119NigyCsFygA4b7sAPQxqebyFGAZ9XVV1BtcgNzbCRR,tprv8ZgxMBicQKsPen4PGtDwURYnCtVMDejyE8vVwMGhQWfVqB2FBPdekhTacDW4vmsKTsgC1wsncVqXiZdX2YFGAnKoLXYf42M78fQJFzuDYFN)/12/*),pk(musig(tprv8ZgxMBicQKsPeNLUGrbv3b7qhUk1LQJZAGMuk9gVuKh9sd4BWGp1eMsehUni6qGb8bjkdwBxCbgNGdh2bYGACK5C5dRTaif9KBKGVnSezxV,tpubD6NzVbkrYhZ4XWb6fGPjyhgLxapUhXszv7ehQYrQWDgDX4nYWcNcbgWcM2RhYo9s2mbZcfZJ8t5LzYcr24FK79zVybsw5Qj3Rtqug8jpJMy)/13/*)})'),
-            descsum_create('tr(03dff1d77f2a671c5f36183726db2341be58feae1da2deced843240f7b502ba659,{pk(musig(tpubD6NzVbkrYhZ4Wo2WcFSgSqRD9QWkGxddo6WSqsVBx7uQ8QEtM7WncKDRjhFEexK119NigyCsFygA4b7sAPQxqebyFGAZ9XVV1BtcgNzbCRR,tpubD6NzVbkrYhZ4Wc3i6L6N1Pp7cyVeyMcdLrFGXGDGzCfdCa5F4Zs3EY46N72Ws8QDEUYBVwXfDfda2UKSseSdU1fsBegJBhGCZyxkf28bkQ6)/12/*),pk(musig(tprv8ZgxMBicQKsPeNLUGrbv3b7qhUk1LQJZAGMuk9gVuKh9sd4BWGp1eMsehUni6qGb8bjkdwBxCbgNGdh2bYGACK5C5dRTaif9KBKGVnSezxV,tpubD6NzVbkrYhZ4XWb6fGPjyhgLxapUhXszv7ehQYrQWDgDX4nYWcNcbgWcM2RhYo9s2mbZcfZJ8t5LzYcr24FK79zVybsw5Qj3Rtqug8jpJMy)/13/*)})')
+            descsum_create(f'tr({node.get_deterministic_priv_key().key},{{pk({pubkey}),pk([d34db33f/44h/0h/0h]{xpubs[0]}/0)}})'),
+            descsum_create(f'wsh(and_v(v:ripemd160(095ff41131e5946f3c85f79e44adbcf8e27e080e),multi(1,{node.get_deterministic_priv_key().key},{xpubs[1]}/0)))'),
+            descsum_create(f'tr({pubkey},pk(musig({xprvs[0]},{xpubs[2]})/7/8/*))'),
+            descsum_create(f'tr({pubkey},pk(musig({xprvs[1]}/10,{xpubs[3]}/11)/*))'),
+            descsum_create(f'tr({pubkey},{{pk(musig({xpubs[4]},{xprvs[2]})/12/*),pk(musig({xprvs[3]},{xpubs[4]})/13/*)}})'),
+            descsum_create(f'tr({pubkey},{{pk(musig({xpubs[5]},{xpubs[6]})/12/*),pk(musig({xprvs[4]},{xpubs[7]})/13/*)}})')
         }
 
         descs_to_import = []
diff --git a/depend/bitcoin/test/functional/wallet_listreceivedby.py b/depend/bitcoin/test/functional/wallet_listreceivedby.py
index a1339da3..f7a08ebd 100755
--- a/depend/bitcoin/test/functional/wallet_listreceivedby.py
+++ b/depend/bitcoin/test/functional/wallet_listreceivedby.py
@@ -101,6 +101,17 @@ def run_test(self):
         res = self.nodes[1].listreceivedbyaddress(0, True, True, other_addr)
         assert_equal(len(res), 0)
 
+        self.log.info("listreceivedbyaddress and listreceivedbylabel exclude not owned addresses")
+        # setlabel assigns a "send" purpose when the wallet doesn't own the address.
+        send_label = "external-address"
+        external_addr = self.nodes[0].getnewaddress(send_label)
+        self.nodes[1].setlabel(external_addr, send_label)
+        assert_equal(self.nodes[1].getaddressinfo(external_addr)["ismine"], False)
+        assert_array_result(self.nodes[1].listreceivedbyaddress(minconf=0, include_empty=True),
+                            {"address": external_addr}, {}, True)
+        assert_array_result(self.nodes[1].listreceivedbylabel(minconf=0, include_empty=True),
+                            {"label": send_label}, {}, True)
+
         self.log.info("getreceivedbyaddress Test")
 
         # Send from node 0 to 1
diff --git a/depend/bitcoin/test/functional/wallet_listtransactions.py b/depend/bitcoin/test/functional/wallet_listtransactions.py
index 714e6594..f48f0cfc 100755
--- a/depend/bitcoin/test/functional/wallet_listtransactions.py
+++ b/depend/bitcoin/test/functional/wallet_listtransactions.py
@@ -11,15 +11,13 @@
 
 from test_framework.blocktools import MAX_FUTURE_BLOCK_TIME
 from test_framework.descriptors import descsum_create
-from test_framework.messages import (
-    COIN,
-    tx_from_hex,
-)
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_not_equal,
     assert_array_result,
     assert_equal,
+    assert_greater_than,
     assert_raises_rpc_error,
     find_vout_for_address,
 )
@@ -31,7 +29,6 @@ def set_test_params(self):
         self.num_nodes = 3
         # whitelist peers to speed up tx relay / mempool sync
         self.noban_tx_relay = True
-        self.extra_args = [["-walletrbf=0"]] * self.num_nodes
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
@@ -97,126 +94,13 @@ def run_test(self):
                             {"category": "receive", "amount": Decimal("0.44")},
                             {"txid": txid})
 
-        self.run_rbf_opt_in_test()
         self.run_externally_generated_address_test()
         self.run_coinjoin_test()
         self.run_invalid_parameters_test()
         self.test_op_return()
+        self.test_alternate_witness_tx()
         self.test_from_me_status_change()
 
-    def run_rbf_opt_in_test(self):
-        """Test the opt-in-rbf flag for sent and received transactions."""
-
-        def is_opt_in(node, txid):
-            """Check whether a transaction signals opt-in RBF itself."""
-            rawtx = node.getrawtransaction(txid, 1)
-            for x in rawtx["vin"]:
-                if x["sequence"] < 0xfffffffe:
-                    return True
-            return False
-
-        def get_unconfirmed_utxo_entry(node, txid_to_match):
-            """Find an unconfirmed output matching a certain txid."""
-            utxo = node.listunspent(0, 0)
-            for i in utxo:
-                if i["txid"] == txid_to_match:
-                    return i
-            return None
-
-        self.log.info("Test txs w/o opt-in RBF (bip125-replaceable=no)")
-        # Chain a few transactions that don't opt in.
-        txid_1 = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1)
-        assert not is_opt_in(self.nodes[0], txid_1)
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_1}, {"bip125-replaceable": "no"})
-        self.sync_mempools()
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_1}, {"bip125-replaceable": "no"})
-
-        # Tx2 will build off tx1, still not opting in to RBF.
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[0], txid_1)
-        assert_equal(utxo_to_use["safe"], True)
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[1], txid_1)
-        assert_equal(utxo_to_use["safe"], False)
-
-        # Create tx2 using createrawtransaction
-        inputs = [{"txid": utxo_to_use["txid"], "vout": utxo_to_use["vout"]}]
-        outputs = {self.nodes[0].getnewaddress(): 0.999}
-        tx2 = self.nodes[1].createrawtransaction(inputs=inputs, outputs=outputs, replaceable=False)
-        tx2_signed = self.nodes[1].signrawtransactionwithwallet(tx2)["hex"]
-        txid_2 = self.nodes[1].sendrawtransaction(tx2_signed)
-
-        # ...and check the result
-        assert not is_opt_in(self.nodes[1], txid_2)
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_2}, {"bip125-replaceable": "no"})
-        self.sync_mempools()
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_2}, {"bip125-replaceable": "no"})
-
-        self.log.info("Test txs with opt-in RBF (bip125-replaceable=yes)")
-        # Tx3 will opt-in to RBF
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[0], txid_2)
-        inputs = [{"txid": txid_2, "vout": utxo_to_use["vout"]}]
-        outputs = {self.nodes[1].getnewaddress(): 0.998}
-        tx3 = self.nodes[0].createrawtransaction(inputs, outputs)
-        tx3_modified = tx_from_hex(tx3)
-        tx3_modified.vin[0].nSequence = 0
-        tx3 = tx3_modified.serialize().hex()
-        tx3_signed = self.nodes[0].signrawtransactionwithwallet(tx3)['hex']
-        txid_3 = self.nodes[0].sendrawtransaction(tx3_signed)
-
-        assert is_opt_in(self.nodes[0], txid_3)
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_3}, {"bip125-replaceable": "yes"})
-        self.sync_mempools()
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_3}, {"bip125-replaceable": "yes"})
-
-        # Tx4 will chain off tx3.  Doesn't signal itself, but depends on one
-        # that does.
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[1], txid_3)
-        inputs = [{"txid": txid_3, "vout": utxo_to_use["vout"]}]
-        outputs = {self.nodes[0].getnewaddress(): 0.997}
-        tx4 = self.nodes[1].createrawtransaction(inputs=inputs, outputs=outputs, replaceable=False)
-        tx4_signed = self.nodes[1].signrawtransactionwithwallet(tx4)["hex"]
-        txid_4 = self.nodes[1].sendrawtransaction(tx4_signed)
-
-        assert not is_opt_in(self.nodes[1], txid_4)
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable": "yes"})
-        self.sync_mempools()
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable": "yes"})
-
-        self.log.info("Test tx with unknown RBF state (bip125-replaceable=unknown)")
-        # Replace tx3, and check that tx4 becomes unknown
-        tx3_b = tx3_modified
-        tx3_b.vout[0].nValue -= int(Decimal("0.004") * COIN)  # bump the fee
-        tx3_b = tx3_b.serialize().hex()
-        tx3_b_signed = self.nodes[0].signrawtransactionwithwallet(tx3_b)['hex']
-        txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, 0)
-        assert is_opt_in(self.nodes[0], txid_3b)
-
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable": "unknown"})
-        self.sync_mempools()
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable": "unknown"})
-
-        self.log.info("Test bip125-replaceable status with gettransaction RPC")
-        for n in self.nodes[0:2]:
-            assert_equal(n.gettransaction(txid_1)["bip125-replaceable"], "no")
-            assert_equal(n.gettransaction(txid_2)["bip125-replaceable"], "no")
-            assert_equal(n.gettransaction(txid_3)["bip125-replaceable"], "yes")
-            assert_equal(n.gettransaction(txid_3b)["bip125-replaceable"], "yes")
-            assert_equal(n.gettransaction(txid_4)["bip125-replaceable"], "unknown")
-
-        self.log.info("Test bip125-replaceable status with listsinceblock")
-        for n in self.nodes[0:2]:
-            txs = {tx['txid']: tx['bip125-replaceable'] for tx in n.listsinceblock()['transactions']}
-            assert_equal(txs[txid_1], "no")
-            assert_equal(txs[txid_2], "no")
-            assert_equal(txs[txid_3], "yes")
-            assert_equal(txs[txid_3b], "yes")
-            assert_equal(txs[txid_4], "unknown")
-
-        self.log.info("Test mined transactions are no longer bip125-replaceable")
-        self.generate(self.nodes[0], 1)
-        assert txid_3b not in self.nodes[0].getrawmempool()
-        assert_equal(self.nodes[0].gettransaction(txid_3b)["bip125-replaceable"], "no")
-        assert_equal(self.nodes[0].gettransaction(txid_4)["bip125-replaceable"], "unknown")
-
     def run_externally_generated_address_test(self):
         """Test behavior when receiving address is not in the address book."""
 
@@ -361,5 +245,127 @@ def test_from_me_status_change(self):
             assert "fee" in tx_info
             assert_equal(any(detail["category"] == "send" for detail in tx_info["details"]), True)
 
+    def check_tx_variants(self, wallet, txid, canonical_tx_hex, canonical_wtxid, alternate_wtxids):
+        """Assert gettransaction and listtransactions report tx variants properly"""
+        tx_info = wallet.gettransaction(txid)
+        assert_equal(tx_info["hex"], canonical_tx_hex)
+        assert_equal(tx_info["wtxid"], canonical_wtxid)
+        # alternate_wtxids lists the other variants, never the canonical one
+        assert canonical_wtxid not in tx_info["alternate_wtxids"]
+        assert_equal(set(tx_info["alternate_wtxids"]), set(alternate_wtxids))
+
+        # listtransactions exposes the same alternate_wtxids field as gettransaction
+        list_entry = next(entry for entry in wallet.listtransactions() if entry["txid"] == txid)
+        assert_equal(list_entry["alternate_wtxids"], tx_info["alternate_wtxids"])
+
+    # Returns the finalized psbt transaction and its wtxid
+    def finalize_tx_variant(self, wallet, psbt, spend_path):
+        # First check the expected spend path is being used
+        sig_field = {"script": "taproot_script_path_sigs", "key": "taproot_key_path_sig"}
+        present, absent = sig_field[spend_path], sig_field["key" if spend_path == "script" else "script"]
+        psbt_input = self.nodes[0].decodepsbt(psbt)["inputs"][0]
+        assert present in psbt_input and absent not in psbt_input
+
+        # Then finalize and decode
+        tx = wallet.finalizepsbt(psbt)["hex"]
+        return tx, wallet.decoderawtransaction(tx)["hash"]
+
+    def test_alternate_witness_tx(self):
+        self.log.info("Test gettransaction and listtransactions report alternate witnesses and canonical variant")
+        self.nodes[0].createwallet("altwit")
+        default_wallet = self.nodes[0].get_wallet_rpc(self.default_wallet_name)
+        wallet = self.nodes[0].get_wallet_rpc("altwit")
+
+        xprvs = [ExtendedPrivateKey.generate() for _ in range(0, 2)]
+        xpubs = [xprv.pubkey() for xprv in xprvs]
+
+        # Import a taproot descriptor with script paths
+        desc = descsum_create(f"tr({xpubs[0].to_string()}/*,pk({xprvs[1].to_string()}/*))")
+        assert_equal(wallet.importdescriptors([{"desc": desc, "active": True, "timestamp": "now"}])[0]["success"], True)
+        default_wallet.sendtoaddress(wallet.getnewaddress(address_type="bech32m"), 1)
+        self.generate(self.nodes[0], 1, sync_fun=self.no_op)
+        # Isolate node0 for later reorg coverage
+        self.disconnect_nodes(0, 1)
+        self.disconnect_nodes(0, 2)
+
+        # Create output psbt
+        psbt = wallet.walletcreatefundedpsbt(outputs=[{default_wallet.getnewaddress(): 0.5}])["psbt"]
+
+        # Create a script path spend and relay it. With only one variant known it
+        # is trivially canonical and has no alternates
+        self.log.info("Test the only known variant is canonical with no alternates")
+        script_path_psbt = wallet.walletprocesspsbt(psbt=psbt, finalize=False)["psbt"]
+        script_path_tx, script_path_wtxid = self.finalize_tx_variant(wallet, script_path_psbt, spend_path="script")
+        txid = self.nodes[0].sendrawtransaction(script_path_tx)
+        self.check_tx_variants(wallet, txid, script_path_tx, script_path_wtxid, alternate_wtxids=[])
+
+        # Make a key path spend separate from the wallet
+        key_path_desc = descsum_create(f"tr({xprvs[0].to_string()}/*,pk({xpubs[1].to_string()}/*))")
+        key_path_psbt = self.nodes[0].descriptorprocesspsbt(psbt=psbt, descriptors=[{"desc": key_path_desc}], finalize=False)["psbt"]
+        key_path_tx, key_path_wtxid = self.finalize_tx_variant(wallet, key_path_psbt, spend_path="key")
+
+        # Ensure variants share the same txid but differ in wtxid, and the key path is the lighter of the two
+        assert_equal(txid, self.nodes[0].decoderawtransaction(key_path_tx)["txid"])
+        assert_not_equal(script_path_wtxid, key_path_wtxid)
+        assert_greater_than(
+            self.nodes[0].decoderawtransaction(script_path_tx)["weight"],
+            self.nodes[0].decoderawtransaction(key_path_tx)["weight"],
+        )
+
+        # The wallet only learns the key path witness from a block (the mempool
+        # holds one transaction per txid). Mine the key path: a confirmed variant
+        # is canonical, with the script path now listed as its alternate.
+        block = self.generateblock(self.nodes[0], default_wallet.getnewaddress(), [key_path_tx], sync_fun=self.no_op)["hash"]
+        self.check_tx_variants(wallet, txid, key_path_tx, key_path_wtxid, alternate_wtxids=[script_path_wtxid])
+
+        # Reorg that block out so both variants are known and unconfirmed. With no
+        # confirmation to force the choice, the lighter key path is canonical.
+        self.log.info("Test the lighter variant is canonical when both are known and unconfirmed")
+        self.nodes[0].invalidateblock(block)
+        self.nodes[0].syncwithvalidationinterfacequeue()
+        assert_equal(wallet.gettransaction(txid)["confirmations"], 0)
+        self.check_tx_variants(wallet, txid, key_path_tx, key_path_wtxid, alternate_wtxids=[script_path_wtxid])
+
+        # The canonical choice and alternates survive a wallet reload
+        wallet.unloadwallet()
+        self.nodes[0].loadwallet("altwit")
+        self.check_tx_variants(wallet, txid, key_path_tx, key_path_wtxid, alternate_wtxids=[script_path_wtxid])
+
+        # Now confirm the heavier script path instead, on a longer competing chain
+        # from node1, and reconnect so node0 reorgs onto it. The confirmed variant
+        # is canonical even though it is the heavier one.
+        self.log.info("Test a confirmed variant is canonical even when it is the heavier one")
+        self.generate(self.nodes[1], 3, sync_fun=self.no_op)
+        block = self.generateblock(self.nodes[1], default_wallet.getnewaddress(), [script_path_tx], sync_fun=self.no_op)["hash"]
+        self.connect_nodes(0, 1)
+        self.connect_nodes(0, 2)
+        self.sync_all()
+        self.check_tx_variants(wallet, txid, script_path_tx, script_path_wtxid, alternate_wtxids=[key_path_wtxid])
+
+        # The confirmed-canonical choice survive a reload
+        wallet.unloadwallet()
+        self.nodes[0].loadwallet("altwit")
+        self.check_tx_variants(wallet, txid, script_path_tx, script_path_wtxid, alternate_wtxids=[key_path_wtxid])
+
+        self.log.info("Test canonical reverts to the lighter variant when the confirmed one is reorged out")
+        # Both variants are unconfirmed again, so the lighter key path is canonical once more
+        self.disconnect_nodes(0, 1)
+        self.disconnect_nodes(0, 2)
+        self.nodes[0].invalidateblock(block)
+        self.nodes[0].syncwithvalidationinterfacequeue()
+        assert_equal(wallet.gettransaction(txid)["confirmations"], 0)
+        self.check_tx_variants(wallet, txid, key_path_tx, key_path_wtxid, alternate_wtxids=[script_path_wtxid])
+
+        # listsinceblock "removed" entries reflect the wallet's current CWalletTx, not a
+        # snapshot of the detached block. The detached block contained the heavier script
+        # path variant, but "wtxid" reports the current canonical (key path) variant and
+        # the script path variant appears under "alternate_wtxids". A future improvement
+        # could track which specific variant was in the detached block and report that.
+        removed = next(e for e in wallet.listsinceblock(block)["removed"] if e["txid"] == txid)
+        assert_equal(removed["confirmations"], 0)
+        assert_equal(removed["wtxid"], key_path_wtxid)
+        assert_equal(removed["alternate_wtxids"], [script_path_wtxid])
+
+
 if __name__ == '__main__':
     ListTransactionsTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_migration.py b/depend/bitcoin/test/functional/wallet_migration.py
index d4489eaa..093fc886 100755
--- a/depend/bitcoin/test/functional/wallet_migration.py
+++ b/depend/bitcoin/test/functional/wallet_migration.py
@@ -5,6 +5,7 @@
 """Test Migrating a wallet from legacy to descriptor."""
 from contextlib import suppress
 from pathlib import Path
+import json
 import os.path
 import random
 import shutil
@@ -62,12 +63,14 @@ def setup_nodes(self):
         self.start_nodes()
         self.init_wallet(node=0)
 
-    def assert_is_sqlite(self, wallet_name):
+    def assert_is_sqlite(self, wallet_name, wallet_loaded = True):
         wallet_file_path = self.master_node.wallets_path / wallet_name / self.wallet_data_filename
         with open(wallet_file_path, 'rb') as f:
             file_magic = f.read(16)
             assert_equal(file_magic, b'SQLite format 3\x00')
-        assert_equal(self.master_node.get_wallet_rpc(wallet_name).getwalletinfo()["format"], "sqlite")
+        # if the wallet is not loaded we can't ask the node about it
+        if wallet_loaded:
+            assert_equal(self.master_node.get_wallet_rpc(wallet_name).getwalletinfo()["format"], "sqlite")
 
     def assert_is_bdb(self, wallet_name):
         with open(self.master_node.wallets_path / wallet_name / self.wallet_data_filename, "rb") as f:
@@ -181,6 +184,15 @@ def check_last_hardened(conn):
         return migrate_info, wallet
 
     def test_basic(self):
+        # Update listtransctions' output from old nodes to be compatible
+        def listtransactions_compatibility(list):
+            deprecated_keys = {"bip125-replaceable"}
+            for obj in list:
+                for key in deprecated_keys:
+                    obj.pop(key)
+                obj["alternate_wtxids"] = []
+            return list
+
         default = self.master_node.get_wallet_rpc(self.default_wallet_name)
 
         self.log.info("Test migration of a basic keys only wallet without balance")
@@ -236,7 +248,7 @@ def test_basic(self):
 
         basic1_migrate, basic1 = self.migrate_and_get_rpc("basic1")
         assert_equal(basic1.getbalance(), bal)
-        self.assert_list_txs_equal(basic1.listtransactions(), txs)
+        self.assert_list_txs_equal(basic1.listtransactions(), listtransactions_compatibility(txs))
 
         self.log.info("Test backup file can be successfully restored")
         self.old_node.restorewallet("basic1_restored", basic1_migrate['backup_path'])
@@ -244,7 +256,7 @@ def test_basic(self):
         basic1_restored_wi = basic1_restored.getwalletinfo()
         assert_equal(basic1_restored_wi['balance'], bal)
         assert_equal(basic1_restored.listaddressgroupings(), addr_gps)
-        self.assert_list_txs_equal(basic1_restored.listtransactions(), txs)
+        self.assert_list_txs_equal(listtransactions_compatibility(basic1_restored.listtransactions()), txs)
 
         # restart master node and verify that everything is still there
         self.restart_node(0)
@@ -274,7 +286,7 @@ def test_basic(self):
         # Now migrate and test that we still have the same balance/transactions
         _, basic2 = self.migrate_and_get_rpc("basic2")
         assert_equal(basic2.getbalance(), basic2_balance)
-        self.assert_list_txs_equal(basic2.listtransactions(), basic2_txs)
+        self.assert_list_txs_equal(basic2.listtransactions(), listtransactions_compatibility(basic2_txs))
 
         # Now test migration on a descriptor wallet
         self.log.info("Test \"nothing to migrate\" when the user tries to migrate a loaded wallet with no legacy data")
@@ -599,57 +611,6 @@ def test_unloaded_by_path(self):
 
         assert_equal(bals, wallet.getbalances())
 
-    def test_wallet_with_relative_path(self):
-        self.log.info("Test migration of a wallet that isn't loaded, specified by a relative path")
-
-        # Get the nearest common path of both nodes' wallet paths.
-        common_parent = os.path.commonpath([self.master_node.wallets_path, self.old_node.wallets_path])
-
-        # This test assumes that the relative path from each wallet directory to the common path is identical.
-        assert_equal(os.path.relpath(common_parent, start=self.master_node.wallets_path), os.path.relpath(common_parent, start=self.old_node.wallets_path))
-
-        wallet_name = "relative"
-        absolute_path = os.path.abspath(os.path.join(common_parent, wallet_name))
-        relative_name = os.path.relpath(absolute_path, start=self.master_node.wallets_path)
-
-        wallet = self.create_legacy_wallet(relative_name)
-        # listwalletdirs only returns wallets in the wallet directory
-        assert {"name": relative_name} not in wallet.listwalletdir()["wallets"]
-        assert relative_name in wallet.listwallets()
-
-        default = self.master_node.get_wallet_rpc(self.default_wallet_name)
-        addr = wallet.getnewaddress()
-        txid = default.sendtoaddress(addr, 1)
-        self.generate(self.master_node, 1)
-        bals = wallet.getbalances()
-        bals["mine"]["nonmempool"] = Decimal('0.0')
-
-        migrate_res, wallet = self.migrate_and_get_rpc(relative_name)
-
-        # Check that the wallet was migrated, knows the right txid, and has the right balance.
-        assert wallet.gettransaction(txid)
-        assert_equal(bals, wallet.getbalances())
-
-        # The migrated wallet should not be in the wallet dir, but should be in the list of wallets.
-        info = wallet.getwalletinfo()
-
-        walletdirlist = wallet.listwalletdir()
-        assert {"name": info["walletname"]} not in walletdirlist["wallets"]
-
-        walletlist = wallet.listwallets()
-        assert info["walletname"] in walletlist
-
-        # Check that old node can restore from the backup.
-        self.old_node.restorewallet("relative_restored", migrate_res['backup_path'])
-        wallet = self.old_node.get_wallet_rpc("relative_restored")
-        assert wallet.gettransaction(txid)
-        del bals["mine"]["nonmempool"]
-        assert_equal(bals, wallet.getbalances())
-
-        info = wallet.getwalletinfo()
-        assert_equal(info["descriptors"], False)
-        assert_equal(info["format"], "bdb")
-
     def test_wallet_with_path(self, wallet_path):
         self.log.info("Test migrating a wallet with the following path/name: %s", wallet_path)
         # the wallet data is actually inside of path/that/ends/
@@ -1122,53 +1083,6 @@ def test_failed_migration_cleanup(self):
         # Check the wallet we tried to migrate is still BDB
         self.assert_is_bdb("failed")
 
-    def test_failed_migration_cleanup_relative_path(self):
-        self.log.info("Test that a failed migration with a relative path is cleaned up")
-
-        # Get the nearest common path of both nodes' wallet paths.
-        common_parent = os.path.commonpath([self.master_node.wallets_path, self.old_node.wallets_path])
-
-        # This test assumes that the relative path from each wallet directory to the common path is identical.
-        assert_equal(os.path.relpath(common_parent, start=self.master_node.wallets_path), os.path.relpath(common_parent, start=self.old_node.wallets_path))
-
-        wallet_name = "relativefailure"
-        absolute_path = os.path.abspath(os.path.join(common_parent, wallet_name))
-        relative_name = os.path.relpath(absolute_path, start=self.master_node.wallets_path)
-
-        wallet = self.create_legacy_wallet(relative_name)
-
-        # Make a copy of the wallet with the solvables wallet name so that we are unable
-        # to create the solvables wallet when migrating, thus failing to migrate
-        wallet.unloadwallet()
-        solvables_path = os.path.join(common_parent, f"{wallet_name}_solvables")
-
-        shutil.copytree(self.old_node.wallets_path / relative_name, solvables_path)
-        original_shasum = sha256sum_file(os.path.join(solvables_path, "wallet.dat"))
-
-        self.old_node.loadwallet(relative_name)
-
-        # Add a multisig so that a solvables wallet is created
-        wallet.addmultisigaddress(2, [wallet.getnewaddress(), get_generate_key().pubkey])
-        wallet.importaddress(get_generate_key().p2pkh_addr)
-
-        self.old_node.unloadwallet(relative_name)
-        assert_raises_rpc_error(-4, "Failed to create database", self.master_node.migratewallet, relative_name)
-
-        assert all(wallet not in self.master_node.listwallets() for wallet in [f"{wallet_name}", f"{wallet_name}_watchonly", f"{wallet_name}_solvables"])
-
-        assert not (self.master_node.wallets_path / f"{wallet_name}_watchonly").exists()
-        # Since the file in failed_solvables is one that we put there, migration shouldn't touch it
-        assert os.path.exists(solvables_path)
-        new_shasum = sha256sum_file(os.path.join(solvables_path , "wallet.dat"))
-        assert_equal(original_shasum, new_shasum)
-
-        # Check the wallet we tried to migrate is still BDB
-        datfile = os.path.join(absolute_path, "wallet.dat")
-        with open(datfile, "rb") as f:
-            data = f.read(16)
-            _, _, magic = struct.unpack("QII", data)
-            assert_equal(magic, BTREE_MAGIC)
-
     def test_blank(self):
         self.log.info("Test that a blank wallet is migrated")
         wallet = self.create_legacy_wallet("blank", blank=True)
@@ -1591,6 +1505,134 @@ def test_taproot(self):
         assert_equal(watchonly.getaddressinfo(tr_addr)["ismine"], True)
         assert_equal(watchonly.getaddressinfo(tr_script_addr)["ismine"], True)
 
+    def test_no_load_after_migration(self):
+        self.log.info("Test migration with load_wallet disabled")
+        default = self.master_node.get_wallet_rpc(self.default_wallet_name)
+
+        wallet_name = "no_load_after_migration"
+        wallet = self.create_legacy_wallet(wallet_name)
+        addr = wallet.getnewaddress()
+        txid = default.sendtoaddress(addr, 1)
+        self.generate(self.master_node, 1)
+        bals = wallet.getbalances()
+
+        # Copy wallet from old node to master node
+        self.old_node.unloadwallet(wallet_name)
+        shutil.copytree(
+            self.old_node.wallets_path / wallet_name,
+            self.master_node.wallets_path / wallet_name,
+            dirs_exist_ok=True,
+        )
+
+        migrate_info = self.master_node.migratewallet(wallet_name=wallet_name, load_wallet=False)
+
+        # The wallet should NOT be loaded after migration
+        assert wallet_name not in self.master_node.listwallets()
+
+        # The returned wallet_name should be populated correctly
+        assert_equal(migrate_info["wallet_name"], wallet_name)
+
+        # The backup path should be reported and exist on disk
+        assert os.path.exists(migrate_info["backup_path"])
+
+        # The migrated wallet files should be on disk in SQLite format
+        self.assert_is_sqlite(wallet_name, wallet_loaded = False)
+
+        # Load the wallet and verify its state is correct after migration
+        self.master_node.loadwallet(wallet_name)
+        loaded_wallet = self.master_node.get_wallet_rpc(wallet_name)
+        info = loaded_wallet.getwalletinfo()
+        assert_equal(info["descriptors"], True)
+        assert_equal(info["format"], "sqlite")
+        loaded_wallet.gettransaction(txid)
+        assert_equal(loaded_wallet.getbalance(), bals["mine"]["trusted"])
+        loaded_wallet.unloadwallet()
+
+    def test_no_load_unnamed_wallet_does_not_autoload(self):
+        self.log.info("Test no-load migration of unnamed wallet suppresses default autoload")
+        self.master_node = self.nodes[0]
+        self.old_node = self.nodes[1]
+
+        wallet = self.create_legacy_wallet("", load_on_startup=False)
+        wallet.unloadwallet()
+
+        self.stop_node(0)
+
+        def remove_wallet_setting(node):
+            settings_path = node.chain_path / "settings.json"
+            if not settings_path.exists():
+                return
+            with settings_path.open(encoding="utf8") as settings_file:
+                settings = json.load(settings_file)
+            settings.pop("wallet", None)
+            with settings_path.open("w", encoding="utf8") as settings_file:
+                json.dump(settings, settings_file, indent=4)
+                settings_file.write("\n")
+
+        remove_wallet_setting(self.master_node)
+        (self.master_node.wallets_path / "wallet.dat").unlink(missing_ok=True)
+        shutil.copyfile(self.old_node.wallets_path / "wallet.dat", self.master_node.wallets_path / "wallet.dat")
+        self.start_node(0)
+
+        assert_equal(self.master_node.listwallets(), [])
+
+        migrate_info = self.master_node.migratewallet(wallet_name="", load_wallet=False)
+        assert_equal(migrate_info["wallet_name"], "")
+        backup_path = Path(migrate_info["backup_path"])
+        assert "" not in self.master_node.listwallets()
+
+        with (self.master_node.chain_path / "settings.json").open(encoding="utf8") as settings_file:
+            wallet_setting_after_migration = json.load(settings_file).get("wallet")
+
+        self.restart_node(0)
+        wallets_after_restart = self.master_node.listwallets()
+
+        assert "" not in wallets_after_restart
+
+        self.clear_default_wallet(backup_path)
+        self.master_node.loadwallet(self.default_wallet_name, load_on_startup=True)
+
+        assert_equal(wallet_setting_after_migration, [])
+
+    def test_no_load_reports_auxiliary_wallet_names(self):
+        self.log.info("Test no-load migration reports auxiliary wallet names")
+        wallet_name = "no_load_auxiliary_names"
+        wallet = self.create_legacy_wallet(wallet_name)
+
+        wallet.importaddress(address=self.master_node.get_wallet_rpc(self.default_wallet_name).getnewaddress(), rescan=False)
+        _, pubkey = generate_keypair(compressed=True, wif=True)
+        wallet.addmultisigaddress(nrequired=1, keys=[pubkey.hex()])
+
+        # Simulate that the wallet was created by the master node with an old version
+        # so it should already know the wallet prior migration. Set load_on_startup true,
+        # to simulate that the wallet was automatically being loaded on each restart.
+        self.master_node.createwallet(wallet_name=wallet_name, load_on_startup=True)
+        self.master_node.unloadwallet(wallet_name)
+        self.cleanup_folder(self.master_node.wallets_path / wallet_name)
+        with (self.master_node.chain_path / "settings.json").open(encoding="utf8") as settings_file:
+            assert wallet_name in json.load(settings_file).get("wallet", [])
+
+        self.old_node.unloadwallet(wallet_name)
+        shutil.copytree(self.old_node.wallets_path / wallet_name, self.master_node.wallets_path / wallet_name)
+
+        migrate_info = self.master_node.migratewallet(wallet_name=wallet_name, load_wallet=False)
+
+        assert_equal(migrate_info["wallet_name"], wallet_name)
+        assert_equal(migrate_info["watchonly_name"], f"{wallet_name}_watchonly")
+        assert_equal(migrate_info["solvables_name"], f"{wallet_name}_solvables")
+        assert wallet_name not in self.master_node.listwallets()
+        assert f"{wallet_name}_watchonly" not in self.master_node.listwallets()
+        assert f"{wallet_name}_solvables" not in self.master_node.listwallets()
+
+        # Migrate wallet with load_wallet=False should have overwritten the wallet settings
+        # and the load_on_startup setting must removed.
+        with (self.master_node.chain_path / "settings.json").open(encoding="utf8") as settings_file:
+            startup_wallets = json.load(settings_file).get("wallet", [])
+        assert wallet_name not in startup_wallets
+        assert f"{wallet_name}_watchonly" not in startup_wallets
+        assert f"{wallet_name}_solvables" not in startup_wallets
+
+
     def test_solvable_no_privs(self):
         self.log.info("Test migrating a multisig that we do not have any private keys for")
         wallet = self.create_legacy_wallet("multisig_noprivs")
@@ -1642,7 +1684,7 @@ def test_loading_failure_after_migration(self):
         self.connect_nodes(1, 0)
 
     def unsynced_wallet_on_pruned_node_fails(self):
-        self.log.info("Test migration of an unsynced wallet on a pruned node fails gracefully")
+        self.log.info("Test migration of an unsynced wallet on a pruned node fails gracefully if loadwallet is set")
         wallet = self.create_legacy_wallet("", load_on_startup=False)
         last_wallet_synced_block = wallet.getwalletinfo()['lastprocessedblock']['height']
         wallet.unloadwallet()
@@ -1669,8 +1711,45 @@ def unsynced_wallet_on_pruned_node_fails(self):
         backup_path = self.master_node.wallets_path / f"default_wallet_{mocked_time}.legacy.bak"
         assert backup_path.exists()
 
+        self.log.info("Test migration of an unsynced wallet on a pruned node does not fails if loadwallet is not set")
+        self.master_node.migratewallet("", load_wallet=False)
+        # The wallet should NOT be loaded after migration
+        assert "" not in self.master_node.listwallets()
+        # Load the wallet should fail
+        assert_raises_rpc_error(-4, "last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)", self.master_node.loadwallet, filename="")
+
         self.clear_default_wallet(backup_path)
 
+    @staticmethod
+    def erase_bdb_record(wallet_dat_path, key):
+        data = bytearray(wallet_dat_path.read_bytes())
+        idx = data.find(key)
+        assert idx != -1, f"{key!r} not found in wallet.dat"
+
+        for i in range(idx, idx + len(key)):
+            data[i] = 0
+
+        wallet_dat_path.write_bytes(data)
+
+    def test_missing_bestblock(self):
+        self.log.info("Test migrating legacy BDB wallet without bestblock record")
+        wallet_name = "nobestblock"
+        wallet = self.create_legacy_wallet(wallet_name)
+        wallet.unloadwallet()
+
+        # Erase block locator records like if this would be a pre-#152 wallet
+        self.erase_bdb_record(self.old_node.wallets_path / wallet_name / "wallet.dat", b"bestblock_nomerkle")
+        self.erase_bdb_record(self.old_node.wallets_path / wallet_name / "wallet.dat", b"bestblock")
+
+        shutil.copytree(self.old_node.wallets_path / wallet_name, self.master_node.wallets_path / wallet_name, dirs_exist_ok=True)
+        # Migrate, checking that rescan occurs
+        with self.master_node.assert_debug_log(expected_msgs=["Rescanning"], unexpected_msgs=[]):
+            self.master_node.migratewallet(wallet_name)
+
+        wallet = self.master_node.get_wallet_rpc(wallet_name)
+        info = wallet.getwalletinfo()
+        assert_equal(info["descriptors"], True)
+        assert_equal(info["format"], "sqlite")
 
     def run_test(self):
         self.master_node = self.nodes[0]
@@ -1687,13 +1766,11 @@ def run_test(self):
         self.test_encrypted()
         self.test_nonexistent()
         self.test_unloaded_by_path()
-        self.test_wallet_with_relative_path()
-        self.test_wallet_with_path("path/to/mywallet/")
-        self.test_wallet_with_path("path/that/ends/in/..")
+        self.test_wallet_with_path("path/to/trailing/")
+        self.test_wallet_with_path("path/to/mywallet")
 
         migration_failure_cases = [
             "",
-            "../",
             os.path.abspath(self.master_node.datadir_path / "absolute_path"),
             "normallynamedwallet"
         ]
@@ -1708,7 +1785,6 @@ def run_test(self):
         self.test_conflict_txs()
         self.test_hybrid_pubkey()
         self.test_failed_migration_cleanup()
-        self.test_failed_migration_cleanup_relative_path()
         self.test_avoidreuse()
         self.test_preserve_tx_extra_info()
         self.test_blank()
@@ -1718,8 +1794,12 @@ def run_test(self):
         self.test_disallowed_p2wsh()
         self.test_miniscript()
         self.test_taproot()
+        self.test_no_load_after_migration()
+        self.test_no_load_unnamed_wallet_does_not_autoload()
+        self.test_no_load_reports_auxiliary_wallet_names()
         self.test_solvable_no_privs()
         self.test_loading_failure_after_migration()
+        self.test_missing_bestblock()
 
         # Note: After this test the first 250 blocks of 'master_node' are pruned
         self.unsynced_wallet_on_pruned_node_fails()
diff --git a/depend/bitcoin/test/functional/wallet_multisig_descriptor_psbt.py b/depend/bitcoin/test/functional/wallet_multisig_descriptor_psbt.py
index a3236a22..d80770a2 100755
--- a/depend/bitcoin/test/functional/wallet_multisig_descriptor_psbt.py
+++ b/depend/bitcoin/test/functional/wallet_multisig_descriptor_psbt.py
@@ -13,65 +13,68 @@
     assert_equal,
 )
 
+from test_framework.descriptors import descsum_create
+
 
 class WalletMultisigDescriptorPSBTTest(BitcoinTestFramework):
     def set_test_params(self):
-        self.num_nodes = 3
+        self.num_nodes = 1
         self.setup_clean_chain = True
-        self.wallet_names = []
-        self.extra_args = [["-keypool=100"]] * self.num_nodes
+        self.extra_args = [["-keypool=100"]]
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
     @staticmethod
     def _get_xpub(wallet):
-        """Extract the wallet's xpubs using `listdescriptors` and pick the one from the `pkh` descriptor since it's least likely to be accidentally reused (legacy addresses)."""
-        pkh_descriptor = next(filter(lambda d: d["desc"].startswith("pkh(") and not d["internal"], wallet.listdescriptors()["descriptors"]))
+        """Derive an xpub at m/44h/1h/0h using `derivehdkey`. This derivation matches the `pkh` descriptor since it's least likely to be accidentally reused (legacy addresses)."""
+        # Ideally we would use m/87h/1h/0h but the wallet currently can't sign
+        # for a derivation path that's not used in one of its descriptors.
+        hdkey_info = wallet.derivehdkey("m/44h/1h/0h")
         # Keep all key origin information (master key fingerprint and all derivation steps) for proper support of hardware devices
         # See section 'Key origin identification' in 'doc/descriptors.md' for more details...
-        # Replace the change index with the multipath convention
-        return pkh_descriptor["desc"].split("pkh(")[1].split(")")[0].replace("/0/*", "/<0;1>/*")
+        return f"{hdkey_info['origin']}{hdkey_info['xpub']}/<0;1>/*"
 
     @staticmethod
     def _check_psbt(psbt, to, value, multisig):
         """Helper function for any of the N participants to check the psbt with decodepsbt and verify it is OK before signing."""
-        tx = multisig.decodepsbt(psbt)["tx"]
+        decoded = multisig.decodepsbt(psbt)
         amount = 0
-        for vout in tx["vout"]:
-            address = vout["scriptPubKey"]["address"]
+        for psbt_out in decoded["outputs"]:
+            address = psbt_out["script"]["address"]
             assert_equal(multisig.getaddressinfo(address)["ischange"], address != to)
             if address == to:
-                amount += vout["value"]
+                amount += psbt_out["amount"]
         assert_approx(amount, float(value), vspan=0.001)
 
     def participants_create_multisigs(self, xpubs):
         """The multisig is created by importing the following descriptors. The resulting wallet is watch-only and every participant can do this."""
-        for i, node in enumerate(self.nodes):
-            node.createwallet(wallet_name=f"{self.name}_{i}", blank=True, disable_private_keys=True)
-            multisig = node.get_wallet_rpc(f"{self.name}_{i}")
-            multisig_desc = f"wsh(sortedmulti({self.M},{','.join(xpubs)}))"
-            checksum = multisig.getdescriptorinfo(multisig_desc)["checksum"]
+        for i in range(self.N):
+            self.node.createwallet(wallet_name=f"{self.name}_{i}", blank=True, disable_private_keys=True)
+            multisig = self.node.get_wallet_rpc(f"{self.name}_{i}")
+            desc = descsum_create(f"wsh(sortedmulti({self.M},{','.join(xpubs)}))")
+            self.log.debug(desc)
             result = multisig.importdescriptors([
-                {  # Multipath descriptor expands to receive and change
-                    "desc": f"{multisig_desc}#{checksum}",
+                {
+                    "desc": desc,
                     "active": True,
                     "timestamp": "now",
-                }
+                },
             ])
             assert all(r["success"] for r in result)
             yield multisig
 
     def run_test(self):
         self.M = 2
-        self.N = self.num_nodes
+        self.N = 3
+        self.node = self.nodes[0]
         self.name = f"{self.M}_of_{self.N}_multisig"
         self.log.info(f"Testing {self.name}...")
 
         participants = {
             # Every participant generates an xpub. The most straightforward way is to create a new descriptor wallet.
             # This wallet will be the participant's `signer` for the resulting multisig. Avoid reusing this wallet for any other purpose (for privacy reasons).
-            "signers": [node.get_wallet_rpc(node.createwallet(wallet_name=f"participant_{self.nodes.index(node)}")["name"]) for node in self.nodes],
+            "signers": [self.node.get_wallet_rpc(self.node.createwallet(wallet_name=f"participant_{i}")["name"]) for i in range(self.N)],
             # After participants generate and exchange their xpubs they will each create their own watch-only multisig.
             # Note: these multisigs are all the same, this just highlights that each participant can independently verify everything on their own node.
             "multisigs": []
@@ -94,13 +97,13 @@ def run_test(self):
 
         self.log.info("Get a mature utxo to send to the multisig...")
         coordinator_wallet = participants["signers"][0]
-        self.generatetoaddress(self.nodes[0], 101, coordinator_wallet.getnewaddress())
+        self.generatetoaddress(self.node, 101, coordinator_wallet.getnewaddress())
 
         deposit_amount = 6.15
         multisig_receiving_address = participants["multisigs"][0].getnewaddress()
         self.log.info("Send funds to the resulting multisig receiving address...")
         coordinator_wallet.sendtoaddress(multisig_receiving_address, deposit_amount)
-        self.generate(self.nodes[0], 1)
+        self.generate(self.node, 1)
         for participant in participants["multisigs"]:
             assert_approx(participant.getbalance(), deposit_amount, vspan=0.001)
 
@@ -121,11 +124,12 @@ def run_test(self):
 
         self.log.info("Finally, collect the signed PSBTs with combinepsbt, finalizepsbt, then broadcast the resulting transaction...")
         combined = coordinator_wallet.combinepsbt(psbts)
+        self.log.debug(coordinator_wallet.analyzepsbt(combined))
         finalized = coordinator_wallet.finalizepsbt(combined)
         coordinator_wallet.sendrawtransaction(finalized["hex"])
 
         self.log.info("Check that balances are correct after the transaction has been included in a block.")
-        self.generate(self.nodes[0], 1)
+        self.generate(self.node, 1)
         assert_approx(participants["multisigs"][0].getbalance(), deposit_amount - value, vspan=0.001)
         assert_equal(participants["signers"][self.N - 1].getbalance(), value)
 
@@ -140,7 +144,7 @@ def run_test(self):
         coordinator_wallet.sendrawtransaction(psbt["hex"])
 
         self.log.info("Check that balances are correct after the transaction has been included in a block.")
-        self.generate(self.nodes[0], 1)
+        self.generate(self.node, 1)
         assert_approx(participants["multisigs"][0].getbalance(), deposit_amount - (value * 2), vspan=0.001)
         assert_equal(participants["signers"][self.N - 1].getbalance(), value * 2)
 
diff --git a/depend/bitcoin/test/functional/wallet_multiwallet.py b/depend/bitcoin/test/functional/wallet_multiwallet.py
index 5b9a23b5..db865281 100755
--- a/depend/bitcoin/test/functional/wallet_multiwallet.py
+++ b/depend/bitcoin/test/functional/wallet_multiwallet.py
@@ -12,7 +12,6 @@
 import shutil
 import stat
 
-from test_framework.authproxy import JSONRPCException
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.test_node import ErrorMatch
@@ -20,7 +19,7 @@
     assert_equal,
     assert_raises_rpc_error,
     ensure_for,
-    get_rpc_proxy,
+    JSONRPCException,
 )
 
 got_loading_error = False
@@ -87,6 +86,8 @@ def run_test(self):
 
         assert_equal(node.listwalletdir(), {'wallets': [{'name': self.default_wallet_name, "warnings": []}]})
 
+        self.test_invalid_wallet_names()
+
         # check wallet.dat is created
         self.stop_nodes()
         assert_equal(os.path.isfile(wallet_dir(node, self.default_wallet_name, self.wallet_data_filename)), True)
@@ -326,7 +327,7 @@ def test_loading(self, node, wallet_names):
         self.log.info("Concurrent wallet loading")
         threads = []
         for _ in range(3):
-            n = node.cli if self.options.usecli else get_rpc_proxy(node.url, 1, timeout=600, coveragedir=node.coverage_dir)
+            n = node.create_new_rpc_connection()
             t = Thread(target=test_load_unload, args=(n, wallet_names[2]))
             t.start()
             threads.append(t)
@@ -458,6 +459,21 @@ def test_lock_file_closed(self, node):
         node.unloadwallet(wallet)
         self.nodes[1].loadwallet(wallet)
 
+    def test_invalid_wallet_names(self):
+        self.log.info("Test weird paths are not allowed as wallet names")
+        NON_NORMALIZED = ["bad/./path", "bad/../path", "/bad/./path", "/bad/../path", "../", "./", "./wallet", "../wallets/../wallets/wallet"]
+        for name in NON_NORMALIZED:
+            assert_raises_rpc_error(-4, "Wallet name given as a path must be normalized", self.nodes[0].createwallet, name)
+
+        INVALID_RELPATH = ["../wallets/wallet", "..", "."]
+        for name in INVALID_RELPATH:
+            assert_raises_rpc_error(-4, "Wallet name given as a relative path cannot begin with ./ or ../", self.nodes[0].createwallet, name)
+
+        INVALID_ROOT = ["/"]
+        if platform.system() == "Windows":
+            INVALID_ROOT.extend(["C:\\", "C:"])
+        for name in INVALID_ROOT:
+            assert_raises_rpc_error(-4, "Wallet name cannot be the root path", self.nodes[0].createwallet, name)
 
 if __name__ == '__main__':
     MultiWalletTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_musig.py b/depend/bitcoin/test/functional/wallet_musig.py
index 0e3e4377..fbf0558e 100755
--- a/depend/bitcoin/test/functional/wallet_musig.py
+++ b/depend/bitcoin/test/functional/wallet_musig.py
@@ -12,6 +12,7 @@
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
+    assert_not_equal,
 )
 
 PRIVKEY_RE = re.compile(r"^tr\((.+?)/.+\)#.{8}$")
@@ -111,6 +112,31 @@ def setup_musig_scenario(self, pat):
 
         return wallets, psbt
 
+    def assert_musig_signer_data(self, first, second, different_field):
+        assert_equal(first["participant_pubkey"], second["participant_pubkey"])
+        assert_equal(first["aggregate_pubkey"], second["aggregate_pubkey"])
+        if "leaf_hash" in first:
+            assert_equal(first["leaf_hash"], second["leaf_hash"])
+        else:
+            assert "leaf_hash" not in second
+
+        assert_not_equal(first[different_field], second[different_field])
+
+    def assert_musig_aggregate_in_script(self, signer_data, pattern, psbtin):
+        pubkey = signer_data["aggregate_pubkey"][2:]
+        if "pkh" in pattern or "pk_h" in pattern:
+            pubkey = hash160(bytes.fromhex(pubkey)).hex()
+        if pubkey in psbtin["witness_utxo"]["scriptPubKey"]["hex"]:
+            return
+        elif "taproot_scripts" in psbtin:
+            for leaf_scripts in psbtin["taproot_scripts"]:
+                if pubkey in leaf_scripts["script"]:
+                    break
+            else:
+                assert False, "Aggregate pubkey not seen as output key, or in any scripts"
+        else:
+            assert False, "Aggregate pubkey not seen as output key or internal key"
+
     def test_failure_case_1(self, comment, pat):
         self.log.info(f"Testing {comment}")
         wallets, psbt = self.setup_musig_scenario(pat)
@@ -247,66 +273,55 @@ def test_success_case(self, comment, pattern, sighash_type=None, scriptpath=Fals
                     part_pks.remove(deriv_path["pubkey"])
             assert_equal(len(part_pks), 0)
 
+        # Run 2 signing sessions simultaneously to verify no nonce reuse
         # Add pubnonces
         nonce_psbts = []
+        nonce_psbts2 = []
         for i, wallet in enumerate(wallets):
             if nosign_wallets and i in nosign_wallets:
                 continue
-            proc = wallet.walletprocesspsbt(psbt=psbt, sighashtype=sighash_type)
-            assert_equal(proc["complete"], False)
-            nonce_psbts.append(proc["psbt"])
+            for psbt_list in [nonce_psbts, nonce_psbts2]:
+                proc = wallet.walletprocesspsbt(psbt=psbt, sighashtype=sighash_type)
+                assert_equal(proc["complete"], False)
+                psbt_list.append(proc["psbt"])
 
         comb_nonce_psbt = self.nodes[0].combinepsbt(nonce_psbts)
+        comb_nonce_psbt2 = self.nodes[0].combinepsbt(nonce_psbts2)
 
         dec_psbt = self.nodes[0].decodepsbt(comb_nonce_psbt)
-        assert_equal(len(dec_psbt["inputs"][0]["musig2_pubnonces"]), expected_pubnonces)
-        for pn in dec_psbt["inputs"][0]["musig2_pubnonces"]:
-            pubkey = pn["aggregate_pubkey"][2:]
-            if "pkh" in pattern or "pk_h" in pattern:
-                pubkey = hash160(bytes.fromhex(pubkey)).hex()
-            if pubkey in dec_psbt["inputs"][0]["witness_utxo"]["scriptPubKey"]["hex"]:
-                continue
-            elif "taproot_scripts" in dec_psbt["inputs"][0]:
-                for leaf_scripts in dec_psbt["inputs"][0]["taproot_scripts"]:
-                    if pubkey in leaf_scripts["script"]:
-                        break
-                else:
-                    assert False, "Aggregate pubkey for pubnonce not seen as output key, or in any scripts"
-            else:
-                assert False, "Aggregate pubkey for pubnonce not seen as output key or internal key"
+        dec_psbt2 = self.nodes[0].decodepsbt(comb_nonce_psbt2)
+        assert_equal(len(dec_psbt["inputs"][0]["musig2_pubnonces"]), len(dec_psbt2["inputs"][0]["musig2_pubnonces"]), expected_pubnonces)
+        for pn, pn2 in zip(dec_psbt["inputs"][0]["musig2_pubnonces"], dec_psbt2["inputs"][0]["musig2_pubnonces"]):
+            self.assert_musig_signer_data(pn, pn2, "pubnonce")
+            self.assert_musig_aggregate_in_script(pn, pattern, dec_psbt["inputs"][0])
 
         # Add partial sigs
         psig_psbts = []
+        psig_psbts2 = []
         for i, wallet in enumerate(wallets):
             if nosign_wallets and i in nosign_wallets:
                 continue
-            proc = wallet.walletprocesspsbt(psbt=comb_nonce_psbt, sighashtype=sighash_type)
-            assert_equal(proc["complete"], False)
-            psig_psbts.append(proc["psbt"])
+            for psbt, psbt_list in [(comb_nonce_psbt, psig_psbts), (comb_nonce_psbt2, psig_psbts2)]:
+                proc = wallet.walletprocesspsbt(psbt=psbt, sighashtype=sighash_type)
+                assert_equal(proc["complete"], False)
+                psbt_list.append(proc["psbt"])
 
         comb_psig_psbt = self.nodes[0].combinepsbt(psig_psbts)
+        comb_psig_psbt2 = self.nodes[0].combinepsbt(psig_psbts2)
 
         dec_psbt = self.nodes[0].decodepsbt(comb_psig_psbt)
-        assert_equal(len(dec_psbt["inputs"][0]["musig2_partial_sigs"]), expected_partial_sigs)
-        for ps in dec_psbt["inputs"][0]["musig2_partial_sigs"]:
-            pubkey = ps["aggregate_pubkey"][2:]
-            if "pkh" in pattern or "pk_h" in pattern:
-                pubkey = hash160(bytes.fromhex(pubkey)).hex()
-            if pubkey in dec_psbt["inputs"][0]["witness_utxo"]["scriptPubKey"]["hex"]:
-                continue
-            elif "taproot_scripts" in dec_psbt["inputs"][0]:
-                for leaf_scripts in dec_psbt["inputs"][0]["taproot_scripts"]:
-                    if pubkey in leaf_scripts["script"]:
-                        break
-                else:
-                    assert False, "Aggregate pubkey for partial sig not seen as output key or in any scripts"
-            else:
-                assert False, "Aggregate pubkey for partial sig not seen as output key"
+        dec_psbt2 = self.nodes[0].decodepsbt(comb_psig_psbt2)
+        assert_equal(len(dec_psbt["inputs"][0]["musig2_partial_sigs"]), len(dec_psbt2["inputs"][0]["musig2_partial_sigs"]), expected_partial_sigs)
+        for ps, ps2 in zip(dec_psbt["inputs"][0]["musig2_partial_sigs"], dec_psbt2["inputs"][0]["musig2_partial_sigs"]):
+            self.assert_musig_signer_data(ps, ps2, "partial_sig")
+            self.assert_musig_aggregate_in_script(ps, pattern, dec_psbt["inputs"][0])
 
         # Non-participant aggregates partial sigs and send
         finalized = self.nodes[0].finalizepsbt(psbt=comb_psig_psbt, extract=False)
-        assert_equal(finalized["complete"], True)
+        finalized2 = self.nodes[0].finalizepsbt(psbt=comb_psig_psbt2, extract=False)
+        assert_equal(finalized["complete"], finalized2["complete"], True)
         witness = self.nodes[0].decodepsbt(finalized["psbt"])["inputs"][0]["final_scriptwitness"]
+        assert_not_equal(witness, self.nodes[0].decodepsbt(finalized2["psbt"])["inputs"][0]["final_scriptwitness"])
         if scriptpath:
             assert_greater_than(len(witness), 1)
         else:
diff --git a/depend/bitcoin/test/functional/wallet_resendwallettransactions.py b/depend/bitcoin/test/functional/wallet_resendwallettransactions.py
index 1b15fa17..b72c79d3 100755
--- a/depend/bitcoin/test/functional/wallet_resendwallettransactions.py
+++ b/depend/bitcoin/test/functional/wallet_resendwallettransactions.py
@@ -5,8 +5,6 @@
 """Test that the wallet resends transactions periodically."""
 import time
 
-from decimal import Decimal
-
 from test_framework.blocktools import (
     create_block,
 )
@@ -16,8 +14,6 @@
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
-    get_fee,
-    try_rpc,
 )
 
 # 36 hours is the upper limit of the resend timer, see CWallet::SetNextResend()
@@ -83,72 +79,47 @@ def run_test(self):
             peer_second.wait_for_broadcast([txid])
 
         self.log.info("Chain of unconfirmed not-in-mempool txs are rebroadcast")
-        # This tests that the node broadcasts the parent transaction before the child transaction.
-        # To test that scenario, we need a method to reliably get a child transaction placed
-        # in mapWallet positioned before the parent. We cannot predict the position in mapWallet,
-        # but we can observe it using listreceivedbyaddress and other related RPCs.
-        #
-        # So we will create the child transaction, use listreceivedbyaddress to see what the
-        # ordering of mapWallet is, if the child is not before the parent, we will create a new
-        # child (via bumpfee) and remove the old child (via removeprunedfunds) until we get the
-        # ordering of child before parent.
-        child_inputs = [{"txid": txid, "vout": 0}]
-        child_txid = node.sendall(recipients=[addr], inputs=child_inputs)["txid"]
-        # Get the child tx's info for manual bumping
-        child_tx_info = node.gettransaction(txid=child_txid, verbose=True)
-        child_output_value = child_tx_info["decoded"]["vout"][0]["value"]
-        # Include an additional 1 vbyte buffer to handle when we have a smaller signature
-        additional_child_fee = get_fee(child_tx_info["decoded"]["vsize"] + 1, Decimal(0.00001100))
-        while True:
-            txids = node.listreceivedbyaddress(minconf=0, address_filter=addr)[0]["txids"]
-            if txids == [child_txid, txid]:
-                break
-            # Manually bump the tx
-            # The inputs and the output address stay the same, just changing the amount for the new fee
-            child_output_value -= additional_child_fee
-            bumped_raw = node.createrawtransaction(inputs=child_inputs, outputs=[{addr: child_output_value}])
-            bumped = node.signrawtransactionwithwallet(bumped_raw)
-            bumped_txid = node.decoderawtransaction(bumped["hex"])["txid"]
-            # Sometimes we will get a signature that is a little bit shorter than we expect which causes the
-            # feerate to be a bit higher, then the followup to be a bit lower. This results in a replacement
-            # that can't be broadcast. We can just skip that and keep grinding.
-            if try_rpc(-26, "insufficient fee, rejecting replacement", node.sendrawtransaction, bumped["hex"]):
-                continue
-            # The scheduler queue creates a copy of the added tx after
-            # send/bumpfee and re-adds it to the wallet (undoing the next
-            # removeprunedfunds). So empty the scheduler queue:
+        # We cannot predict the ordering in mapWallet of parent and child, so
+        # try a few times to get both.
+        evict_time = 0
+        for _ in range(10):
+            child_inputs = [{"txid": txid, "vout": 0}]
+            child_txid = node.sendall(recipients=[addr], inputs=child_inputs)["txid"]
+            # Get the child tx's info for manual bumping
+            entry_time = node.getmempoolentry(child_txid)["time"]
+
+            # tx must be at least 5 minutes older than the last block to be rebroadcast
+            block_time = entry_time + 5 * 60 + 1
+            node.setmocktime(block_time)
+            block = create_block(int(node.getbestblockhash(), 16), height=node.getblockcount() + 1, ntime=block_time)
+            block.solve()
+            node.submitblock(block.serialize().hex())
+            # Set correct m_best_block_time, which is used in ResubmitWalletTransactions
             node.syncwithvalidationinterfacequeue()
-            node.removeprunedfunds(child_txid)
-            child_txid = bumped_txid
-        entry_time = node.getmempoolentry(child_txid)["time"]
-
-        # tx must be at least 5 minutes older than the last block to be rebroadcast
-        block_time = entry_time + 6 * 60
-        node.setmocktime(block_time)
-        block = create_block(int(node.getbestblockhash(), 16), height=node.getblockcount() + 1, ntime=block_time)
-        block.solve()
-        node.submitblock(block.serialize().hex())
-        # Set correct m_best_block_time, which is used in ResubmitWalletTransactions
-        node.syncwithvalidationinterfacequeue()
-
-        evict_time = block_time + 60 * 60 * DEFAULT_MEMPOOL_EXPIRY_HOURS + 5
-        # Flush out currently scheduled resubmit attempt now so that there can't be one right between eviction and check.
-        with node.assert_debug_log(['resubmit 2 unconfirmed transactions'], timeout=2):
-            node.setmocktime(evict_time)
-            node.mockscheduler(60)
-
-        # Evict these txs from the mempool
-        indep_send = node.send(outputs=[{node.getnewaddress(): 1}], inputs=[indep_utxo])
-        node.getmempoolentry(indep_send["txid"])
-        assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, txid)
-        assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, child_txid)
 
-        # Rebroadcast and check that parent and child are both in the mempool
-        with node.assert_debug_log(['resubmit 2 unconfirmed transactions'], timeout=2):
-            node.setmocktime(evict_time + RESEND_TIMER_LIMIT)
-            node.mockscheduler(60)
-        node.getmempoolentry(txid)
-        node.getmempoolentry(child_txid)
+            evict_time = block_time + 60 * 60 * DEFAULT_MEMPOOL_EXPIRY_HOURS + 5
+            # Flush out currently scheduled resubmit attempt now so that there can't be one right between eviction and check.
+            with node.assert_debug_log(['resubmit 2 unconfirmed transactions'], timeout=2):
+                node.setmocktime(evict_time)
+                node.mockscheduler(60)
+
+            # Evict these txs from the mempool
+            indep_send = node.send(outputs=[{node.getnewaddress(): 1}], inputs=[indep_utxo])
+            node.getmempoolentry(indep_send["txid"])
+            assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, txid)
+            assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, child_txid)
+
+            # Rebroadcast and check that parent and child are both in the mempool
+            with node.assert_debug_log(['resubmit 2 unconfirmed transactions'], timeout=2):
+                node.setmocktime(evict_time + RESEND_TIMER_LIMIT)
+                node.mockscheduler(60)
+            node.getmempoolentry(txid)
+            node.getmempoolentry(child_txid)
+
+            # clear mempool
+            self.generate(node, 1, sync_fun=self.no_op)
+            parent_utxo, indep_utxo = node.listunspent()[:2]
+            txid = node.send(outputs=[{addr: 1}], inputs=[parent_utxo])["txid"]
 
         self.log.info("Test rebroadcast of transactions received by others")
         # clear mempool
diff --git a/depend/bitcoin/test/functional/wallet_send.py b/depend/bitcoin/test/functional/wallet_send.py
index 213c4756..8440044f 100755
--- a/depend/bitcoin/test/functional/wallet_send.py
+++ b/depend/bitcoin/test/functional/wallet_send.py
@@ -7,8 +7,8 @@
 from decimal import Decimal, getcontext
 from itertools import product
 
-from test_framework.authproxy import JSONRPCException
 from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_not_equal,
@@ -18,6 +18,7 @@
     assert_greater_than_or_equal,
     assert_raises_rpc_error,
     count_bytes,
+    JSONRPCException,
 )
 from test_framework.wallet_util import (
     calculate_input_weight,
@@ -31,10 +32,7 @@ def set_test_params(self):
         # whitelist peers to speed up tx relay / mempool sync
         self.noban_tx_relay = True
         self.supports_cli = False
-        self.extra_args = [
-            ["-walletrbf=1", "-datacarriersize=16"],
-            ["-walletrbf=1", "-datacarriersize=16"]
-        ]
+        self.extra_args = [["-datacarriersize=16"]] * self.num_nodes
         getcontext().prec = 8 # Satoshi precision for Decimal
 
     def skip_test_if_missing_module(self):
@@ -170,7 +168,6 @@ def test_send(self, from_wallet, to_wallet=None, amount=None, data=None,
             # Ensure transaction exists in the wallet:
             tx = from_wallet.gettransaction(res["txid"])
             assert tx
-            assert_equal(tx["bip125-replaceable"], "yes" if replaceable else "no")
             if nonmempool:
                 assert_raises_rpc_error(-5, "No such mempool transaction", from_wallet.getrawtransaction, res["txid"])
                 assert from_wallet.getbalances()["mine"]["nonmempool"] < 0
@@ -208,8 +205,9 @@ def run_test(self):
         # w2 contains the private keys for w3
         self.nodes[1].createwallet(wallet_name="w2", blank=True)
         w2 = self.nodes[1].get_wallet_rpc("w2")
-        xpriv = "tprv8ZgxMBicQKsPfHCsTwkiM1KT56RXbGGTqvc2hgqzycpwbHqqpcajQeMRZoBD35kW4RtyCemu6j34Ku5DEspmgjKdt2qe4SvRch5Kk8B8A2v"
-        xpub = "tpubD6NzVbkrYhZ4YkEfMbRJkQyZe7wTkbTNRECozCtJPtdLRn6cT1QKb8yHjwAPcAr26eHBFYs5iLiFFnCbwPRsncCKUKCfubHDMGKzMVcN1Jg"
+        extendedkey = ExtendedPrivateKey.generate()
+        xpriv = extendedkey.to_string()
+        xpub = extendedkey.pubkey().to_string()
         w2.importdescriptors([{
             "desc": descsum_create("wpkh(" + xpriv + "/0/0/*)"),
             "timestamp": "now",
@@ -395,10 +393,10 @@ def run_test(self):
         assert res["complete"]
         res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=False, change_address=change_address, change_position=0)
         assert res["complete"]
-        assert_equal(self.nodes[0].decodepsbt(res["psbt"])["tx"]["vout"][0]["scriptPubKey"]["address"], change_address)
+        assert_equal(self.nodes[0].decodepsbt(res["psbt"])["outputs"][0]["script"]["address"], change_address)
         res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=False, change_type="legacy", change_position=0)
         assert res["complete"]
-        change_address = self.nodes[0].decodepsbt(res["psbt"])["tx"]["vout"][0]["scriptPubKey"]["address"]
+        change_address = self.nodes[0].decodepsbt(res["psbt"])["outputs"][0]["script"]["address"]
         assert change_address[0] in ("m", "n")
 
         self.log.info("Set lock time...")
@@ -434,14 +432,6 @@ def run_test(self):
         res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, inputs=[utxo1], add_to_wallet=False)
         assert res["complete"]
 
-        self.log.info("Replaceable...")
-        res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=True, replaceable=True)
-        assert res["complete"]
-        assert_equal(self.nodes[0].gettransaction(res["txid"])["bip125-replaceable"], "yes")
-        res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=True, replaceable=False)
-        assert res["complete"]
-        assert_equal(self.nodes[0].gettransaction(res["txid"])["bip125-replaceable"], "no")
-
         self.log.info("Subtract fee from output")
         self.test_send(from_wallet=w0, to_wallet=w1, amount=1, subtract_fee_from_outputs=[0])
 
@@ -498,11 +488,9 @@ def run_test(self):
         assert signed["complete"]
 
         dec = self.nodes[0].decodepsbt(signed["psbt"])
-        for i, txin in enumerate(dec["tx"]["vin"]):
-            if txin["txid"] == ext_utxo["txid"] and txin["vout"] == ext_utxo["vout"]:
-                input_idx = i
+        for psbt_in in dec["inputs"]:
+            if psbt_in["previous_txid"] == ext_utxo["txid"] and psbt_in["previous_vout"] == ext_utxo["vout"]:
                 break
-        psbt_in = dec["inputs"][input_idx]
         scriptsig_hex = psbt_in["final_scriptSig"]["hex"] if "final_scriptSig" in psbt_in else ""
         witness_stack_hex = psbt_in["final_scriptwitness"] if "final_scriptwitness" in psbt_in else None
         input_weight = calculate_input_weight(scriptsig_hex, witness_stack_hex)
diff --git a/depend/bitcoin/test/functional/wallet_sendall.py b/depend/bitcoin/test/functional/wallet_sendall.py
index 1977a1e2..dec7173c 100755
--- a/depend/bitcoin/test/functional/wallet_sendall.py
+++ b/depend/bitcoin/test/functional/wallet_sendall.py
@@ -18,12 +18,11 @@
 # Decorator to reset activewallet to zero utxos
 def cleanup(func):
     def wrapper(self):
-        try:
-            func(self)
-        finally:
-            if 0 < self.wallet.getbalances()["mine"]["trusted"]:
-                self.wallet.sendall([self.remainder_target])
-            assert_equal(0, self.wallet.getbalances()["mine"]["trusted"]) # wallet is empty
+        func(self)
+
+        if 0 < self.wallet.getbalances()["mine"]["trusted"]:
+            self.wallet.sendall([self.remainder_target])
+        assert_equal(0, self.wallet.getbalances()["mine"]["trusted"]) # wallet is empty
     return wrapper
 
 class SendallTest(BitcoinTestFramework):
@@ -59,8 +58,8 @@ def add_utxos(self, amounts):
         return self.wallet.getbalances()["mine"]["trusted"]
 
     # Helper schema for success cases
-    def test_sendall_success(self, sendall_args, remaining_balance = 0):
-        sendall_tx_receipt = self.wallet.sendall(sendall_args)
+    def test_sendall_success(self, sendall_args, remaining_balance = 0, *, options=None):
+        sendall_tx_receipt = self.wallet.sendall(sendall_args, options=options)
         self.generate(self.nodes[0], 1)
         # wallet has remaining balance (usually empty)
         assert_equal(remaining_balance, self.wallet.getbalances()["mine"]["trusted"])
@@ -308,9 +307,9 @@ def sendall_watchonly_specific_inputs(self):
         decoded = self.nodes[0].decodepsbt(psbt)
         assert_equal(len(decoded["inputs"]), 1)
         assert_equal(len(decoded["outputs"]), 1)
-        assert_equal(decoded["tx"]["vin"][0]["txid"], utxo["txid"])
-        assert_equal(decoded["tx"]["vin"][0]["vout"], utxo["vout"])
-        assert_equal(decoded["tx"]["vout"][0]["scriptPubKey"]["address"], self.remainder_target)
+        assert_equal(decoded["inputs"][0]["previous_txid"], utxo["txid"])
+        assert_equal(decoded["inputs"][0]["previous_vout"], utxo["vout"])
+        assert_equal(decoded["outputs"][0]["script"]["address"], self.remainder_target)
 
     @cleanup
     def sendall_with_minconf(self):
@@ -436,7 +435,7 @@ def sendall_does_ancestor_aware_funding(self):
     def sendall_anti_fee_sniping(self):
         self.log.info("Testing sendall does anti-fee-sniping when locktime is not specified")
         self.add_utxos([10,11])
-        tx_from_wallet = self.test_sendall_success(sendall_args = [self.remainder_target])
+        tx_from_wallet = self.test_sendall_success(sendall_args = [self.remainder_target], options={"replaceable":False})
 
         # the locktime should be within 100 blocks of the
         # block height
diff --git a/depend/bitcoin/test/functional/wallet_signer.py b/depend/bitcoin/test/functional/wallet_signer.py
index 4b8e6388..896169d4 100755
--- a/depend/bitcoin/test/functional/wallet_signer.py
+++ b/depend/bitcoin/test/functional/wallet_signer.py
@@ -120,6 +120,21 @@ def test_valid_signer(self):
             result = hww.walletdisplayaddress(address)
             assert_equal(result, {"address": address})
 
+        assert_raises_rpc_error(
+            -4,
+            "Error: sendtoaddress and sendmany are not supported for wallets with external signers; use send instead",
+            hww.sendtoaddress,
+            self.nodes[0].getnewaddress(),
+            0.01,
+        )
+        assert_raises_rpc_error(
+            -4,
+            "Error: sendtoaddress and sendmany are not supported for wallets with external signers; use send instead",
+            hww.sendmany,
+            "",
+            {self.nodes[0].getnewaddress(): 0.01},
+        )
+
         # Handle error thrown by script
         self.set_mock_result(self.nodes[1], "2")
         assert_raises_rpc_error(-1, 'RunCommandParseJSON error',
diff --git a/depend/bitcoin/test/functional/wallet_startup.py b/depend/bitcoin/test/functional/wallet_startup.py
index fe35ee12..2c5fb259 100755
--- a/depend/bitcoin/test/functional/wallet_startup.py
+++ b/depend/bitcoin/test/functional/wallet_startup.py
@@ -6,12 +6,17 @@
 
 Verify that a bitcoind node can maintain list of wallets loading on startup
 """
+import os
 import shutil
+import stat
 import uuid
 
+
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
+    assert_raises_rpc_error,
+    is_dir_writable,
 )
 
 
@@ -38,6 +43,27 @@ def create_unnamed_wallet(self, **kwargs):
         shutil.move(self.nodes[0].wallets_path / wallet_name / "wallet.dat", self.nodes[0].wallets_path / "wallet.dat")
         (self.nodes[0].wallets_path / wallet_name).rmdir()
 
+    def test_load_unwritable_wallet(self, node):
+        self.log.info("Test wallet load failure due to non-writable directory")
+        wallet_name = "bad_permissions"
+
+        node.createwallet(wallet_name)
+        node.unloadwallet(wallet_name)
+
+        dir_path = node.wallets_path / wallet_name
+        original_dir_perms = dir_path.stat().st_mode
+        os.chmod(dir_path, original_dir_perms & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH))
+
+        if is_dir_writable(dir_path):
+            self.log.warning("Skipping load non-writable directory test: unable to enforce read-only permissions")
+        else:
+            # Ensure we don't load a wallet located in a non-writable directory.
+            # The node will crash later on if we cannot write to disk.
+            assert_raises_rpc_error(-4, f"SQLiteDatabase: Failed to open database in directory '{str(dir_path)}': directory is not writable", node.loadwallet, wallet_name)
+
+        # Reset directory permissions for cleanup
+        dir_path.chmod(original_dir_perms)
+
     def run_test(self):
         self.log.info('Should start without any wallets')
         assert_equal(self.nodes[0].listwallets(), [])
@@ -67,5 +93,7 @@ def run_test(self):
         self.restart_node(0)
         assert_equal(set(self.nodes[0].listwallets()), set(('w2', 'w3')))
 
+        self.test_load_unwritable_wallet(self.nodes[0])
+
 if __name__ == '__main__':
     WalletStartupTest(__file__).main()
diff --git a/depend/bitcoin/test/functional/wallet_taproot.py b/depend/bitcoin/test/functional/wallet_taproot.py
index 7bd5d9a5..b312d4e1 100755
--- a/depend/bitcoin/test/functional/wallet_taproot.py
+++ b/depend/bitcoin/test/functional/wallet_taproot.py
@@ -9,10 +9,11 @@
 
 from decimal import Decimal
 from test_framework.address import output_key_to_p2tr
-from test_framework.key import H_POINT
+from test_framework.key import H_POINT, compute_xonly_pubkey
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 from test_framework.descriptors import descsum_create
+from test_framework.extendedkey import ExtendedPrivateKey
 from test_framework.script import (
     CScript,
     MAX_PUBKEYS_PER_MULTI_A,
@@ -23,141 +24,6 @@
 )
 from test_framework.segwit_addr import encode_segwit_address
 
-# xprvs/xpubs, and m/* derived x-only pubkeys (created using independent implementation)
-KEYS = [
-    {
-        "xprv": "tprv8ZgxMBicQKsPeNLUGrbv3b7qhUk1LQJZAGMuk9gVuKh9sd4BWGp1eMsehUni6qGb8bjkdwBxCbgNGdh2bYGACK5C5dRTaif9KBKGVnSezxV",
-        "xpub": "tpubD6NzVbkrYhZ4XqNGAWGWSzmxGWFwVjVTjZxh2fioKbVYi7Jx8fdbprVWsdW7mHwqjchBVas8TLZG4Xwuz4RKU4iaCqiCvoSkFCzQptqk5Y1",
-        "pubs": [
-            "83d8ee77a0f3a32a5cea96fd1624d623b836c1e5d1ac2dcde46814b619320c18",
-            "a30253b018ea6fca966135bf7dd8026915427f24ccf10d4e03f7870f4128569b",
-            "a61e5749f2f3db9dc871d7b187e30bfd3297eea2557e9be99897ea8ff7a29a21",
-            "8110cf482f66dc37125e619d73075af932521724ffc7108309e88f361efe8c8a",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPe98QUPieXy5KFPVjuZNpcC9JY7K7buJEm8nWvJogK4kTda7eLjK9U4PnMNbSjEkpjDJazeBZ4rhYNYD7N6GEdaysj1AYSb5",
-        "xpub": "tpubD6NzVbkrYhZ4XcACN3PEwNjRpR1g4tZjBVk5pdMR2B6dbd3HYhdGVZNKofAiFZd9okBserZvv58A6tBX4pE64UpXGNTSesfUW7PpW36HuKz",
-        "pubs": [
-            "f95886b02a84928c5c15bdca32784993105f73de27fa6ad8c1a60389b999267c",
-            "71522134160685eb779857033bfc84c7626f13556154653a51dd42619064e679",
-            "48957b4158b2c5c3f4c000f51fd2cf0fd5ff8868ebfb194256f5e9131fc74bd8",
-            "086dda8139b3a84944010648d2b674b70447be3ae59322c09a4907bc80be62c1",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPe3ZJmcj9aJ2EPZJYYCh6Lp3v82p75wspgaXmtDZ2RBtkAtWcGnW2VQDzMHQPBkCKMoYTqh1RfJKjv4PcmWVR7KqTpjsdboN",
-        "xpub": "tpubD6NzVbkrYhZ4XWb6fGPjyhgLxapUhXszv7ehQYrQWDgDX4nYWcNcbgWcM2RhYo9s2mbZcfZJ8t5LzYcr24FK79zVybsw5Qj3Rtqug8jpJMy",
-        "pubs": [
-            "9fa5ffb68821cf559001caa0577eeea4978b29416def328a707b15e91701a2f7",
-            "8a104c54cd34acba60c97dd8f1f7abc89ba9587afd88dc928e91aca7b1c50d20",
-            "13ba6b252a4eb5ef31d39cb521724cdab19a698323f5c17093f28fb1821d052f",
-            "f6c2b4863fd5ba1ba09e3a890caed8b75ffbe013ebab31a06ab87cd6f72506af",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPdKziibn63Rm6aNzp7dSjDnufZMStXr71Huz7iihCRpbZZZ6Voy5HyuHCWx6foHMipzMzUq4tZrtkZ24DJwz5EeNWdsuwX5h",
-        "xpub": "tpubD6NzVbkrYhZ4Wo2WcFSgSqRD9QWkGxddo6WSqsVBx7uQ8QEtM7WncKDRjhFEexK119NigyCsFygA4b7sAPQxqebyFGAZ9XVV1BtcgNzbCRR",
-        "pubs": [
-            "03a669ea926f381582ec4a000b9472ba8a17347f5fb159eddd4a07036a6718eb",
-            "bbf56b14b119bccafb686adec2e3d2a6b51b1626213590c3afa815d1fd36f85d",
-            "2994519e31bbc238a07d82f85c9832b831705d2ee4a2dbb477ecec8a3f570fe5",
-            "68991b5c139a4c479f8c89d6254d288c533aefc0c5b91fac6c89019c4de64988",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPen4PGtDwURYnCtVMDejyE8vVwMGhQWfVqB2FBPdekhTacDW4vmsKTsgC1wsncVqXiZdX2YFGAnKoLXYf42M78fQJFzuDYFN",
-        "xpub": "tpubD6NzVbkrYhZ4YF6BAXtXsqCtmv1HNyvsoSXHDsJzpnTtffH1onTEwC5SnLzCHPKPebh2i7Gxvi9kJNADcpuSmH8oM3rCYcHVtdXHjpYoKnX",
-        "pubs": [
-            "aba457d16a8d59151c387f24d1eb887efbe24644c1ee64b261282e7baebdb247",
-            "c8558b7caf198e892032d91f1a48ee9bdc25462b83b4d0ac62bb7fb2a0df630e",
-            "8a4bcaba0e970685858d133a4d0079c8b55bbc755599e212285691eb779ce3dc",
-            "b0d68ada13e0d954b3921b88160d4453e9c151131c2b7c724e08f538a666ceb3",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPd91vCgRmbzA13wyip2RimYeVEkAyZvsEN5pUSB3T43SEBxPsytkxb42d64W2EiRE9CewpJQkzR8HKHLV8Uhk4dMF5yRPaTv",
-        "xpub": "tpubD6NzVbkrYhZ4Wc3i6L6N1Pp7cyVeyMcdLrFGXGDGzCfdCa5F4Zs3EY46N72Ws8QDEUYBVwXfDfda2UKSseSdU1fsBegJBhGCZyxkf28bkQ6",
-        "pubs": [
-            "9b4d495b74887815a1ff623c055c6eac6b6b2e07d2a016d6526ebac71dd99744",
-            "8e971b781b7ce7ab742d80278f2dfe7dd330f3efd6d00047f4a2071f2e7553cb",
-            "b811d66739b9f07435ccda907ec5cd225355321c35e0a7c7791232f24cf10632",
-            "4cd27a5552c272bc80ba544e9cc6340bb906969f5e7a1510b6cef9592683fbc9",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPdEhLRxxwzTv2t18j7ruoffPeqAwVA2qXJ2P66RaMZLUWQ85SjoA7xPxdSgCB9UZ72m65qbnaLPtFTfHVP3MEmkpZk1Bv8RT",
-        "xpub": "tpubD6NzVbkrYhZ4Whj8KcdYPsa9T2efHC6iExzS7gynaJdv8WdripPwjq6NaH5gQJGrLmvUwHY1smhiakUosXNDTEa6qfKUQdLKV6DJBre6XvQ",
-        "pubs": [
-            "d0c19def28bb1b39451c1a814737615983967780d223b79969ba692182c6006b",
-            "cb1d1b1dc62fec1894d4c3d9a1b6738e5ff9c273a64f74e9ab363095f45e9c47",
-            "245be588f41acfaeb9481aa132717db56ee1e23eb289729fe2b8bde8f9a00830",
-            "5bc4ad6d6187fa82728c85a073b428483295288f8aef5722e47305b5872f7169",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPcxbqxzcMAwQpiCD8x6qaZEJTxdKxw4w9GuMzDACTD9yhEsHGfqQcfYX4LivosLDDngTykYEp9JnTdcqY7cHqU8PpeFFKyV3",
-        "xpub": "tpubD6NzVbkrYhZ4WRddreGwaM4wHDj57S2V8XuFF9NGMLjY7PckqZ23PebZR1wGA4w84uX2vZphdZVsnREjij1ibYjEBTaTVQCEZCLs4xUDapx",
-        "pubs": [
-            "065cc1b92bd99e5a3e626e8296a366b2d132688eb43aea19bc14fd8f43bf07fb",
-            "5b95633a7dda34578b6985e6bfd85d83ec38b7ded892a9b74a3d899c85890562",
-            "dc86d434b9a34495c8e845b969d51f80d19a8df03b400353ffe8036a0c22eb60",
-            "06c8ffde238745b29ae8a97ae533e1f3edf214bba6ec58b5e7b9451d1d61ec19",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPe6zLoU8MTTXgsdJVNBErrYGpoGwHf5VGvwUzdNc7NHeCSzkJkniCxBhZWujXjmD4HZmBBrnr3URgJjM6GxRgMmEhLdqNTWG",
-        "xpub": "tpubD6NzVbkrYhZ4Xa28h7nwrsBoSepRXWRmRqsc5nyb5MHfmRjmFmRhYnG4d9dC7uxixN5AfsEv1Lz3mCAuWvERyvPgKozHUVjfo8EG6foJGy7",
-        "pubs": [
-            "d826a0a53abb6ffc60df25b9c152870578faef4b2eb5a09bdd672bbe32cdd79b",
-            "939365e0359ff6bc6f6404ee220714c5d4a0d1e36838b9e2081ede217674e2ba",
-            "4e8767edcf7d3d90258cfbbea01b784f4d2de813c4277b51279cf808bac410a2",
-            "d42a2c280940bfc6ede971ae72cde2e1df96c6da7dab06a132900c6751ade208",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPeB5o5oCsN2dVxM2mtJiYERQEBRc4JNwC1DFGYaEdNkmh8jJYVPU76YhkFoRoWTdh1p3yQGykG8TfDW34dKgrgSx28gswUyL",
-        "xpub": "tpubD6NzVbkrYhZ4Xe7aySsTmSHcXNYi3duSoj11TweMiejaqhW3Ay4DZFPZJses4sfpk4b9VHRhn8v4cKTMjugMM3hqXcqSSmRdiW8QvASXjfY",
-        "pubs": [
-            "e360564b2e0e8d06681b6336a29d0750210e8f34afd9afb5e6fd5fe6dba26c81",
-            "76b4900f00a1dcce463b6d8e02b768518fce4f9ecd6679a13ad78ea1e4815ad3",
-            "5575556e263c8ed52e99ab02147cc05a738869afe0039911b5a60a780f4e43d2",
-            "593b00e2c8d4bd6dda0fd9e238888acf427bb4e128887fd5a40e0e9da78cbc01",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPfEH6jHemkGDjZRnAaKFJVGH8pQU638E6SdbX9hxit1tK2sfFPfL6KS7v8FfUKxstbfEpzSymbdfBM9Y5UkrxErF9fJaKLK3",
-        "xpub": "tpubD6NzVbkrYhZ4YhJtcwKN9fsr8TJ6jeSD4Zsv6vWPTQ2VH7rHn6nK4WWBCzKK7FkdVVwm3iztCU1UmStY4hX6gRbBmp9UzK9C59dQEzeXS12",
-        "pubs": [
-            "7631cacec3343052d87ef4d0065f61dde82d7d2db0c1cc02ef61ef3c982ea763",
-            "c05e44a9e735d1b1bef62e2c0d886e6fb4923b2649b67828290f5cacc51c71b7",
-            "b33198b20701afe933226c92fd0e3d51d3f266f1113d864dbd026ae3166ef7f2",
-            "f99643ac3f4072ee4a949301e86963a9ca0ad57f2ef29f6b84fda037d7cac85b",
-        ]
-    },
-    {
-        "xprv": "tprv8ZgxMBicQKsPdNWU38dT6aGxtqJR4oYS5kPpLVBcuKiiu7gqTYqMMqhUG6DP7pPahzPQu36sWSmeLCP1C4AwqcR5FX2RyRoZfd4B8pAnSdX",
-        "xpub": "tpubD6NzVbkrYhZ4WqYFvnJ3Vyw5TrpME8jLf3zbd1DvKbX7jbwc5wewYLKLSFRzZWV6hZj7XhsXAy7fhE5jB25DiWyNM3ztXbsXHRVCrp5BiPY",
-        "pubs": [
-            "2258b1c3160be0864a541854eec9164a572f094f7562628281a8073bb89173a7",
-            "83df59d0a5c951cdd62b7ab225a62079f48d2a333a86e66c35420d101446e92e",
-            "2a654bf234d819055312f9ca03fad5836f9163b09cdd24d29678f694842b874a",
-            "aa0334ab910047387c912a21ec0dab806a47ffa38365060dbc5d47c18c6e66e7",
-        ]
-    },
-    {
-        "xprv": "tprv8mGPkMVz5mZuJDnC2NjjAv7E9Zqa5LCgX4zawbZu5nzTtLb5kGhPwycX4H1gtW1f5ZdTKTNtQJ61hk71F2TdcQ93EFDTpUcPBr98QRji615",
-        "xpub": "tpubDHxRtmYEE9FaBgoyv2QKaKmLibMWEfPb6NbNE7cCW4nripqrNfWz8UEPEPbHCrakwLvwFfsqoaf4pjX4gWStp4nECRf1QwBKPkLqnY8pHbj",
-        "pubs": [
-            "00a9da96087a72258f83b338ef7f0ea8cbbe05da5f18f091eb397d1ecbf7c3d3",
-            "b2749b74d51a78f5fe3ebb3a7c0ff266a468cade143dfa265c57e325177edf00",
-            "6b8747a6bbe4440d7386658476da51f6e49a220508a7ec77fe7bccc3e7baa916",
-            "4674bf4d9ebbe01bf0aceaca2472f63198655ecf2df810f8d69b38421972318e",
-        ]
-    }
-]
-
-
 def key(hex_key):
     """Construct an x-only pubkey from its hex representation."""
     return bytes.fromhex(hex_key)
@@ -384,12 +250,21 @@ def do_test_psbt(self, comment, pattern, privmap, treefn, keys_pay, keys_change)
 
     def do_test(self, comment, pattern, privmap, treefn):
         nkeys = len(privmap)
-        keys = random.sample(KEYS, nkeys * 4)
+        keys = random.sample(self.keys, nkeys * 4)
         self.do_test_addr(comment, pattern, privmap, treefn, keys[0:nkeys])
         self.do_test_sendtoaddress(comment, pattern, privmap, treefn, keys[0:nkeys], keys[nkeys:2*nkeys])
         self.do_test_psbt(comment, pattern, privmap, treefn, keys[2*nkeys:3*nkeys], keys[3*nkeys:4*nkeys])
 
+    def generate_test_keys(self):
+        xprvs = [ExtendedPrivateKey.generate() for _ in range(0, 13)]
+        return [{
+            "xprv": xprv.to_string(),
+            "xpub": xprv.pubkey().to_string(),
+            "pubs": [compute_xonly_pubkey(xprv.derive_path(f"m/{i}").key.get_bytes())[0].hex() for i in range(0, 4)]
+        } for xprv in xprvs]
+
     def run_test(self):
+        self.keys = self.generate_test_keys()
         self.nodes[0].createwallet(wallet_name="boring")
         self.boring = self.nodes[0].get_wallet_rpc("boring")
 
diff --git a/depend/bitcoin/test/functional/wallet_txn_clone.py b/depend/bitcoin/test/functional/wallet_txn_clone.py
index de9fe17f..f4ca1071 100755
--- a/depend/bitcoin/test/functional/wallet_txn_clone.py
+++ b/depend/bitcoin/test/functional/wallet_txn_clone.py
@@ -17,7 +17,6 @@
 class TxnMallTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 3
-        self.supports_cli = False
         self.extra_args = [[] for i in range(self.num_nodes)]
 
     def skip_test_if_missing_module(self):
diff --git a/depend/bitcoin/test/functional/wallet_v3_txs.py b/depend/bitcoin/test/functional/wallet_v3_txs.py
index 446dc086..8ba422f2 100755
--- a/depend/bitcoin/test/functional/wallet_v3_txs.py
+++ b/depend/bitcoin/test/functional/wallet_v3_txs.py
@@ -6,7 +6,6 @@
 
 from decimal import Decimal, getcontext
 
-from test_framework.authproxy import JSONRPCException
 from test_framework.messages import (
     COIN,
     CTransaction,
@@ -28,6 +27,7 @@
     assert_equal,
     assert_greater_than,
     assert_raises_rpc_error,
+    JSONRPCException,
 )
 
 from test_framework.mempool_util import (
@@ -38,28 +38,27 @@
 # sweep alice and bob's wallets and clear the mempool
 def cleanup(func):
     def wrapper(self, *args):
-        try:
-            self.generate(self.nodes[0], 1)
-            func(self, *args)
-        finally:
-            self.generate(self.nodes[0], 1)
-            for wallet in [self.alice, self.bob]:
-                txs = set(tx["txid"] for tx in wallet.listtransactions("*", 1000) if tx["confirmations"] == 0 and not tx["abandoned"])
-                for tx in txs:
-                    wallet.abandontransaction(tx)
-                try:
-                    wallet.sendall([self.charlie.getnewaddress()])
-                except JSONRPCException as e:
-                    assert "Total value of UTXO pool too low to pay for transaction" in e.error['message']
-            self.generate(self.nodes[0], 1)
-
-            for wallet in [self.alice, self.bob]:
-                balance = wallet.getbalances()["mine"]
-                for balance_type in ["untrusted_pending", "trusted", "immature", "nonmempool"]:
-                    assert_equal(balance[balance_type], 0)
-
-            assert_equal(self.alice.getrawmempool(), [])
-            assert_equal(self.bob.getrawmempool(), [])
+        self.generate(self.nodes[0], 1)
+        func(self, *args)
+
+        self.generate(self.nodes[0], 1)
+        for wallet in [self.alice, self.bob]:
+            txs = set(tx["txid"] for tx in wallet.listtransactions("*", 1000) if tx["confirmations"] == 0 and not tx["abandoned"])
+            for tx in txs:
+                wallet.abandontransaction(tx)
+            try:
+                wallet.sendall([self.charlie.getnewaddress()])
+            except JSONRPCException as e:
+                assert "Total value of UTXO pool too low to pay for transaction" in e.error['message']
+        self.generate(self.nodes[0], 1)
+
+        for wallet in [self.alice, self.bob]:
+            balance = wallet.getbalances()["mine"]
+            for balance_type in ["untrusted_pending", "trusted", "immature", "nonmempool"]:
+                assert_equal(balance[balance_type], 0)
+
+        assert_equal(self.alice.getrawmempool(), [])
+        assert_equal(self.bob.getrawmempool(), [])
 
     return wrapper
 
@@ -448,7 +447,7 @@ def createpsbt_v3(self):
 
         outputs = {self.alice.getnewaddress() : 10}
         psbt = self.charlie.createpsbt(inputs=[], outputs=outputs, version=3)
-        assert_equal(self.charlie.decodepsbt(psbt)["tx"]["version"], 3)
+        assert_equal(self.charlie.decodepsbt(psbt)["tx_version"], 3)
 
     @cleanup
     def send_v3(self):
@@ -526,7 +525,7 @@ def walletcreatefundedpsbt_v3(self):
 
         outputs = {self.alice.getnewaddress() : 10}
         psbt = self.charlie.walletcreatefundedpsbt(inputs=[], outputs=outputs, version=3)["psbt"]
-        assert_equal(self.charlie.decodepsbt(psbt)["tx"]["version"], 3)
+        assert_equal(self.charlie.decodepsbt(psbt)["tx_version"], 3)
 
     @cleanup
     def sendall_truc_weight_limit(self):
diff --git a/depend/bitcoin/test/fuzz/test_runner.py b/depend/bitcoin/test/fuzz/test_runner.py
index 503acdc1..91df295f 100755
--- a/depend/bitcoin/test/fuzz/test_runner.py
+++ b/depend/bitcoin/test/fuzz/test_runner.py
@@ -101,7 +101,7 @@ def main():
     configfile = os.path.abspath(os.path.dirname(__file__)) + "/../config.ini"
     config.read_file(open(configfile))
 
-    if not config["components"].getboolean("ENABLE_FUZZ_BINARY"):
+    if not config.getboolean("components", "ENABLE_FUZZ_BINARY"):
         logging.error("Must have fuzz executable built")
         sys.exit(1)
 
diff --git a/depend/bitcoin/test/lint/README.md b/depend/bitcoin/test/lint/README.md
index 08703ab8..d060df11 100644
--- a/depend/bitcoin/test/lint/README.md
+++ b/depend/bitcoin/test/lint/README.md
@@ -56,7 +56,7 @@ or `--help`:
 | `py_lint` | [ruff](https://github.com/astral-sh/ruff)
 | markdown link check | [mlc](https://github.com/becheran/mlc)
 
-In use versions and install instructions are available in the [CI setup](../../ci/lint/01_install.sh).
+Dependency versions and installation instructions are available in the [CI setup](../../ci/lint/01_install.sh) and the [lint_imagefile](../../ci/lint_imagefile) (for tools where an OCI imagefile exists).
 
 Please be aware that on Linux distributions all dependencies are usually available as packages, but could be outdated.
 
diff --git a/depend/bitcoin/test/lint/commit-script-check.sh b/depend/bitcoin/test/lint/commit-script-check.sh
index af7a0d2f..08fed219 100755
--- a/depend/bitcoin/test/lint/commit-script-check.sh
+++ b/depend/bitcoin/test/lint/commit-script-check.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Copyright (c) 2017-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.
@@ -41,8 +41,12 @@ for commit in $(git rev-list --reverse "$1"); do
         else
             echo "Running script for: $commit" >&2
             echo "$SCRIPT" >&2
-            (eval "$SCRIPT")
-            git --no-pager diff --exit-code "$commit" && echo "OK" >&2 || (echo "Failed" >&2; false) || RET=1
+            if bash -o errexit -o nounset -o pipefail -c "$SCRIPT" && git --no-pager diff --exit-code "$commit"; then
+                echo "OK" >&2
+            else
+                echo "Failed" >&2
+                RET=1
+            fi
         fi
         git reset --quiet --hard HEAD
      else
diff --git a/depend/bitcoin/test/lint/lint-includes.py b/depend/bitcoin/test/lint/lint-includes.py
index 18f47240..328946d8 100755
--- a/depend/bitcoin/test/lint/lint-includes.py
+++ b/depend/bitcoin/test/lint/lint-includes.py
@@ -21,7 +21,6 @@
                 ] + SHARED_EXCLUDED_SUBTREES
 
 EXPECTED_BOOST_INCLUDES = [
-                           "boost/cstdlib.hpp",
                            "boost/multi_index/detail/hash_index_iterator.hpp",
                            "boost/multi_index/hashed_index.hpp",
                            "boost/multi_index/identity.hpp",
@@ -71,7 +70,11 @@ def find_included_cpps():
         if e.returncode > 1:
             raise e
 
-    return included_cpps
+    # Exception: `#include <moc_*.cpp>` statements in src/qt source files are permitted.
+    # See:
+    # - https://doc.qt.io/qt-6/moc.html
+    # - https://cmake.org/cmake/help/latest/prop_tgt/AUTOMOC.html
+    return [i for i in included_cpps if not re.match(r"src/qt/[^:]+\.cpp:#include <moc_[^<>:]+\.cpp>$", i)]
 
 
 def find_extra_boosts():
diff --git a/depend/bitcoin/test/lint/lint-python.py b/depend/bitcoin/test/lint/lint-python.py
index fd1a8495..d8d6f44f 100755
--- a/depend/bitcoin/test/lint/lint-python.py
+++ b/depend/bitcoin/test/lint/lint-python.py
@@ -20,9 +20,9 @@
 
 DEPS = ['lief', 'mypy', 'pyzmq']
 
-# Only .py files in test/functional and contrib/devtools have type annotations
+# Only .py files in test/functional and contrib/(devtools|guix) have type annotations
 # enforced.
-MYPY_FILES_ARGS = ['git', 'ls-files', 'test/functional/*.py', 'contrib/devtools/*.py']
+MYPY_FILES_ARGS = ['git', 'ls-files', 'test/functional/*.py', 'contrib/devtools/*.py', 'contrib/guix/*.py']
 
 
 def check_dependencies():
diff --git a/depend/bitcoin/test/lint/lint-tests.py b/depend/bitcoin/test/lint/lint-tests.py
index c7354bc4..10015e6d 100755
--- a/depend/bitcoin/test/lint/lint-tests.py
+++ b/depend/bitcoin/test/lint/lint-tests.py
@@ -13,12 +13,12 @@
 import sys
 
 
-def grep_boost_fixture_test_suite():
+def grep_boost_test_suites():
     command = [
         "git",
         "grep",
         "-E",
-        r"^BOOST_FIXTURE_TEST_SUITE\(",
+        r"^(BOOST_FIXTURE_TEST_SUITE|BOOST_AUTO_TEST_SUITE)\(",
         "--",
         "src/ipc/test/**.cpp",
         "src/test/**.cpp",
@@ -27,11 +27,12 @@ def grep_boost_fixture_test_suite():
     return subprocess.check_output(command, text=True)
 
 
-def check_matching_test_names(test_suite_list):
+def main():
+    test_suite_list = grep_boost_test_suites().splitlines()
     not_matching = [
         x
         for x in test_suite_list
-        if re.search(r"/(.*?)\.cpp:BOOST_FIXTURE_TEST_SUITE\(\1(_[a-z0-9]+)?, .*\)", x) is None
+        if re.search(r"/(.*?)\.cpp:(?:BOOST_FIXTURE_TEST_SUITE|BOOST_AUTO_TEST_SUITE)\(\1(_[a-z0-9]+)?[,)]", x) is None
     ]
     if len(not_matching) > 0:
         not_matching = "\n".join(not_matching)
@@ -42,46 +43,7 @@ def check_matching_test_names(test_suite_list):
             f"{not_matching}\n"
         )
         print(error_msg)
-        return 1
-    return 0
-
-
-def get_duplicates(input_list):
-    """
-    From https://stackoverflow.com/a/9835819
-    """
-    seen = set()
-    dupes = set()
-    for x in input_list:
-        if x in seen:
-            dupes.add(x)
-        else:
-            seen.add(x)
-    return dupes
-
-
-def check_unique_test_names(test_suite_list):
-    output = [re.search(r"\((.*?),", x) for x in test_suite_list]
-    output = [x.group(1) for x in output if x is not None]
-    output = get_duplicates(output)
-    output = sorted(list(output))
-
-    if len(output) > 0:
-        output = "\n".join(output)
-        error_msg = (
-            "Test suite names must be unique. The following test suite names\n"
-            f"appear to be used more than once:\n\n{output}"
-        )
-        print(error_msg)
-        return 1
-    return 0
-
-
-def main():
-    test_suite_list = grep_boost_fixture_test_suite().splitlines()
-    exit_code = check_matching_test_names(test_suite_list)
-    exit_code |= check_unique_test_names(test_suite_list)
-    sys.exit(exit_code)
+        sys.exit(1)
 
 
 if __name__ == "__main__":
diff --git a/depend/bitcoin/test/lint/test_runner/src/lint_py.rs b/depend/bitcoin/test/lint/test_runner/src/lint_py.rs
index 7c5c0dae..6a97da6a 100644
--- a/depend/bitcoin/test/lint/test_runner/src/lint_py.rs
+++ b/depend/bitcoin/test/lint/test_runner/src/lint_py.rs
@@ -9,51 +9,6 @@ use crate::util::{check_output, get_pathspecs_default_excludes, git, LintResult}
 
 pub fn lint_py_lint() -> LintResult {
     let bin_name = "ruff";
-    let checks = format!(
-        "--select={}",
-        [
-            "B006", // mutable-argument-default
-            "B008", // function-call-in-default-argument
-            "E101", // indentation contains mixed spaces and tabs
-            "E401", // multiple imports on one line
-            "E402", // module level import not at top of file
-            "E701", // multiple statements on one line (colon)
-            "E702", // multiple statements on one line (semicolon)
-            "E703", // statement ends with a semicolon
-            "E711", // comparison to None should be 'if cond is None:'
-            "E713", // test for membership should be "not in"
-            "E714", // test for object identity should be "is not"
-            "E721", // do not compare types, use "isinstance()"
-            "E722", // do not use bare 'except'
-            "E742", // do not define classes named "l", "O", or "I"
-            "E743", // do not define functions named "l", "O", or "I"
-            "F401", // module imported but unused
-            "F402", // import module from line N shadowed by loop variable
-            "F403", // 'from foo_module import *' used; unable to detect undefined names
-            "F404", // future import(s) name after other statements
-            "F405", // foo_function may be undefined, or defined from star imports: bar_module
-            "F406", // "from module import *" only allowed at module level
-            "F407", // an undefined __future__ feature name was imported
-            "F541", // f-string without any placeholders
-            "F601", // dictionary key name repeated with different values
-            "F602", // dictionary key variable name repeated with different values
-            "F621", // too many expressions in an assignment with star-unpacking
-            "F631", // assertion test is a tuple, which are always True
-            "F632", // use ==/!= to compare str, bytes, and int literals
-            "F811", // redefinition of unused name from line N
-            "F821", // undefined name 'Foo'
-            "F822", // undefined name name in __all__
-            "F823", // local variable name … referenced before assignment
-            "F841", // local variable 'foo' is assigned to but never used
-            "PLE",  // Pylint errors
-            "W191", // indentation contains tabs
-            "W291", // trailing whitespace
-            "W292", // no newline at end of file
-            "W293", // blank line contains whitespace
-            "W605", // invalid escape sequence "x"
-        ]
-        .join(",")
-    );
     let files = check_output(
         git()
             .args(["ls-files", "--", "*.py"])
@@ -61,7 +16,7 @@ pub fn lint_py_lint() -> LintResult {
     )?;
 
     let mut cmd = Command::new(bin_name);
-    cmd.args(["check", &checks]).args(files.lines());
+    cmd.arg("check").args(files.lines());
 
     match cmd.status() {
         Ok(status) if status.success() => Ok(()),
diff --git a/depend/bitcoin/test/sanitizer_suppressions/lsan b/depend/bitcoin/test/sanitizer_suppressions/lsan
index ddd61b60..8c2873c0 100644
--- a/depend/bitcoin/test/sanitizer_suppressions/lsan
+++ b/depend/bitcoin/test/sanitizer_suppressions/lsan
@@ -1,4 +1,3 @@
 # Suppress warnings triggered in dependencies
-leak:libQt6Widgets
-leak:QDBusConnectionPrivate
-leak:QLayoutPrivate
+leak:test_bitcoin-qt
+leak:bitcoin-qt
diff --git a/depend/bitcoin/test/sanitizer_suppressions/tsan b/depend/bitcoin/test/sanitizer_suppressions/tsan
index 66157101..34004c67 100644
--- a/depend/bitcoin/test/sanitizer_suppressions/tsan
+++ b/depend/bitcoin/test/sanitizer_suppressions/tsan
@@ -3,11 +3,6 @@
 #
 # https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
 
-# deadlock (TODO fix)
-# To reproduce, see:
-# https://github.com/bitcoin/bitcoin/issues/19303#issuecomment-1514926359
-deadlock:Chainstate::ConnectTip
-
 # Intentional deadlock in tests
 deadlock:sync_tests::potential_deadlock_detected
 
diff --git a/depend/bitcoin/test/sanitizer_suppressions/ubsan b/depend/bitcoin/test/sanitizer_suppressions/ubsan
index ad604e63..d2102f0d 100644
--- a/depend/bitcoin/test/sanitizer_suppressions/ubsan
+++ b/depend/bitcoin/test/sanitizer_suppressions/ubsan
@@ -19,6 +19,7 @@ implicit-integer-sign-change:*/include/c++/
 implicit-integer-sign-change:*/new_allocator.h
 implicit-integer-sign-change:*/qarraydata.h
 implicit-integer-sign-change:crc32c/
+implicit-integer-sign-change:BytewiseComparatorImpl::FindShortSuccessor
 implicit-integer-sign-change:minisketch/
 implicit-integer-sign-change:secp256k1/
 implicit-signed-integer-truncation:*/include/c++/
@@ -60,6 +61,7 @@ implicit-integer-sign-change:crypto/
 implicit-integer-sign-change:TxConfirmStats::removeTx
 implicit-integer-sign-change:EvalScript
 implicit-signed-integer-truncation:crypto/
+implicit-unsigned-integer-truncation:SaltedCoinsCacheHasher::operator()
 implicit-unsigned-integer-truncation:crypto/
 shift-base:arith_uint256.cpp
 shift-base:crypto/
diff --git a/depend/bitcoin/test/sanitizer_suppressions/valgrind.supp b/depend/bitcoin/test/sanitizer_suppressions/valgrind.supp
index 8bcad914..27bbce83 100644
--- a/depend/bitcoin/test/sanitizer_suppressions/valgrind.supp
+++ b/depend/bitcoin/test/sanitizer_suppressions/valgrind.supp
@@ -12,7 +12,7 @@
 #       --error-limit=no build/bin/test_bitcoin
 #
 # Note that suppressions may depend on OS and/or library versions.
-# Tested on Debian Trixie system libs,
+# Tested on Ubuntu 26.04 system libs,
 # * using clang (only x86_64, see https://bugs.kde.org/show_bug.cgi?id=485276),
 # * and GCC (only -O1, see https://bugs.kde.org/show_bug.cgi?id=472329),
 # without gui (because it only passes with a DEBUG=1 depends build).
diff --git a/depend/bitcoin/vcpkg.json b/depend/bitcoin/vcpkg.json
index 49906808..25001905 100644
--- a/depend/bitcoin/vcpkg.json
+++ b/depend/bitcoin/vcpkg.json
@@ -1,10 +1,9 @@
 {
-  "$comment": "The builtin-baseline corresponds to 2025.08.27 Release",
+  "$comment": "The builtin-baseline corresponds to 2026-07-29 Release",
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-  "builtin-baseline": "120deac3062162151622ca4860575a33844ba10b",
+  "builtin-baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d",
   "dependencies": [
-    "boost-multi-index",
-    "libevent"
+    "boost-multi-index"
   ],
   "default-features": [
     "qt",
@@ -40,7 +39,10 @@
     "wallet": {
       "description": "Enable wallet (SQLite)",
       "dependencies": [
-        "sqlite3"
+        {
+          "name": "sqlite3",
+          "default-features": false
+        }
       ]
     },
     "zeromq": {
@@ -49,12 +51,5 @@
         "zeromq"
       ]
     }
-  },
-  "overrides": [
-    {
-      "$comment": "Newer unreleased libevent versions cause https://github.com/bitcoin/bitcoin/issues/30096",
-      "name": "libevent",
-      "version": "2.1.12#7"
-    }
-  ]
+  }
 }
diff --git a/kernel/block_header.go b/kernel/block_header.go
index 9e2770e2..f3994c91 100644
--- a/kernel/block_header.go
+++ b/kernel/block_header.go
@@ -37,11 +37,15 @@ func newBlockHeader(ptr *C.btck_BlockHeader, fromOwned bool) *BlockHeader {
 // NewBlockHeader creates a new block header from raw serialized header data.
 //
 // Parameters:
-//   - rawHeader: Serialized block header data
+//   - rawHeader: Non-nil pointer to 80 bytes of serialized block header data
 //
-// Returns an error if the header data is malformed, invalid length, or cannot be parsed.
-func NewBlockHeader(rawHeader []byte) (*BlockHeader, error) {
-	ptr := C.btck_block_header_create(unsafe.Pointer(unsafe.SliceData(rawHeader)), C.size_t(len(rawHeader)))
+// Returns an error if deserialization fails.
+func NewBlockHeader(rawHeader *[80]byte) (*BlockHeader, error) {
+	if rawHeader == nil {
+		panic("rawHeader must not be nil")
+	}
+
+	ptr := C.btck_block_header_create(unsafe.Pointer(rawHeader), C.size_t(80))
 	if ptr == nil {
 		return nil, &InternalError{"Failed to create block header from bytes"}
 	}
diff --git a/kernel/block_header_test.go b/kernel/block_header_test.go
index 4cda89a4..7f6cd5e2 100644
--- a/kernel/block_header_test.go
+++ b/kernel/block_header_test.go
@@ -2,41 +2,19 @@ package kernel
 
 import (
 	"encoding/hex"
-	"errors"
 	"testing"
 )
 
 // genesisHeaderHex is the Bitcoin mainnet genesis block header (80 bytes)
 const genesisHeaderHex = "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c"
 
-func TestInvalidBlockHeaderData(t *testing.T) {
-	tests := []struct {
-		name string
-		data []byte
-	}{
-		{"invalid bytes", []byte{0x00, 0x01, 0x02}},
-		{"nil slice", nil},
-		{"too short", make([]byte, 79)},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			_, err := NewBlockHeader(tt.data)
-			var internalErr *InternalError
-			if !errors.As(err, &internalErr) {
-				t.Errorf("Expected InternalError, got %v", err)
-			}
-		})
-	}
-}
-
 func TestBlockHeader(t *testing.T) {
 	headerBytes, err := hex.DecodeString(genesisHeaderHex)
 	if err != nil {
 		t.Fatalf("Failed to decode genesis header hex: %v", err)
 	}
 
-	header, err := NewBlockHeader(headerBytes)
+	header, err := NewBlockHeader((*[80]byte)(headerBytes))
 	if err != nil {
 		t.Fatalf("NewBlockHeader() error = %v", err)
 	}
diff --git a/kernel/chainstate_manager.go b/kernel/chainstate_manager.go
index 889ec478..e95c6925 100644
--- a/kernel/chainstate_manager.go
+++ b/kernel/chainstate_manager.go
@@ -138,31 +138,27 @@ func (cm *ChainstateManager) ProcessBlock(block *Block) (ok bool, newBlock bool)
 // Parameters:
 //   - header: Block header to validate
 //
-// Returns a BlockValidationError if the header fails validation. The error contains
-// detailed validation state information accessible via BlockValidationError.GetState().
+// Returns the validation state whether the header is valid or invalid. An error is
+// returned only if the kernel cannot produce a validation state.
 //
 // Example:
 //
-//	err := chainman.ProcessBlockHeader(header)
+//	state, err := chainman.ProcessBlockHeader(header)
 //	if err != nil {
-//	    var validationErr *BlockValidationError
-//	    if errors.As(err, &validationErr) {
-//	        state := validationErr.GetState()
-//	        fmt.Printf("Validation failed: mode=%v, result=%v\n",
-//	            state.ValidationMode(), state.ValidationResult())
-//	    }
+//	    return err
 //	}
-func (cm *ChainstateManager) ProcessBlockHeader(header *BlockHeader) error {
-	state := NewBlockValidationState()
-	result := C.btck_chainstate_manager_process_block_header(
+//	fmt.Printf("Validation result: mode=%v, result=%v\n",
+//	    state.ValidationMode(), state.ValidationResult())
+func (cm *ChainstateManager) ProcessBlockHeader(header *BlockHeader) (*BlockValidationState, error) {
+	statePtr := C.btck_chainstate_manager_process_block_header(
 		(*C.btck_ChainstateManager)(cm.ptr),
 		(*C.btck_BlockHeader)(header.ptr),
-		(*C.btck_BlockValidationState)(state.handle.ptr),
 	)
-	if result != 0 {
-		return &BlockValidationError{State: state}
+	if statePtr == nil {
+		return nil, &InternalError{"Failed to process block header"}
 	}
-	return nil
+
+	return newBlockValidationState(statePtr, true), nil
 }
 
 // GetActiveChain returns the currently active best-known chain.
diff --git a/kernel/chainstate_manager_test.go b/kernel/chainstate_manager_test.go
index 6a3ef9eb..f977002e 100644
--- a/kernel/chainstate_manager_test.go
+++ b/kernel/chainstate_manager_test.go
@@ -311,21 +311,20 @@ func (s *ChainstateManagerTestSuite) Setup(t *testing.T) {
 			t.Fatalf("Failed to decode block %d hex: %v", i+1, err)
 		}
 
-		blockHeader, err := NewBlockHeader(blockBytes)
+		blockHeader, err := NewBlockHeader((*[80]byte)(blockBytes))
 		if err != nil {
 			t.Fatalf("NewBlockHeader() failed for block %d: %v", i+1, err)
 		}
 		defer blockHeader.Destroy()
 
-		err = manager.ProcessBlockHeader(blockHeader)
+		state, err := manager.ProcessBlockHeader(blockHeader)
 		if err != nil {
-			var validationErr *BlockValidationError
-			if errors.As(err, &validationErr) {
-				state := validationErr.GetState()
-				t.Fatalf("ProcessBlockHeader() validation failed for block %d: mode=%v, result=%v", i+1, state.ValidationMode(), state.ValidationResult())
-			}
 			t.Fatalf("ProcessBlockHeader() failed for block %d: %v", i+1, err)
 		}
+		defer state.Destroy()
+		if state.ValidationMode() != ValidationStateValid {
+			t.Fatalf("ProcessBlockHeader() validation failed for block %d: mode=%v, result=%v", i+1, state.ValidationMode(), state.ValidationResult())
+		}
 
 		block, err := NewBlock(blockBytes)
 		if err != nil {
diff --git a/kernel/errors.go b/kernel/errors.go
index 5c8b27f4..1298faa3 100644
--- a/kernel/errors.go
+++ b/kernel/errors.go
@@ -65,62 +65,3 @@ func (e *ScriptVerifyError) Error() string {
 }
 
 func (e *ScriptVerifyError) isKernelError() {}
-
-// BlockValidationError represents a block or header validation failure with detailed state information.
-type BlockValidationError struct {
-	State *BlockValidationState
-}
-
-func (e *BlockValidationError) Error() string {
-	if e.State == nil {
-		return "Block validation failed"
-	}
-	mode := e.State.ValidationMode()
-	result := e.State.ValidationResult()
-	return "Block validation failed: mode=" + validationModeString(mode) + ", result=" + blockValidationResultString(result)
-}
-
-func (e *BlockValidationError) isKernelError() {}
-
-// GetState returns the validation state containing detailed error information.
-func (e *BlockValidationError) GetState() *BlockValidationState {
-	return e.State
-}
-
-func validationModeString(mode ValidationMode) string {
-	switch mode {
-	case ValidationStateValid:
-		return "valid"
-	case ValidationStateInvalid:
-		return "invalid"
-	case ValidationStateError:
-		return "error"
-	default:
-		return "unknown"
-	}
-}
-
-func blockValidationResultString(result BlockValidationResult) string {
-	switch result {
-	case BlockResultUnset:
-		return "unset"
-	case BlockConsensus:
-		return "consensus"
-	case BlockCachedInvalid:
-		return "cached_invalid"
-	case BlockInvalidHeader:
-		return "invalid_header"
-	case BlockMutated:
-		return "mutated"
-	case BlockMissingPrev:
-		return "missing_prev"
-	case BlockInvalidPrev:
-		return "invalid_prev"
-	case BlockTimeFuture:
-		return "time_future"
-	case BlockHeaderLowWork:
-		return "header_low_work"
-	default:
-		return "unknown"
-	}
-}