Merge #121: Sync with the main repo

Pull request description:

  Sync with the main repo up to bitcoin/bitcoin@7190de9.

  **Note 1**
  The bitcoin/bitcoin@7190de9 was chosen to sync to make this PR manageable to review. The next commit in the main repo introduces a sophisticated conflicts which needs some special treatment.

  **Note 2**
  To make next syncs easier, a few groups of commits were rearranged when they were applied back.

  _Group A_
  before:
  - 63e623c _"build, qml: Add qtdeclarative module"_
  - 47c2e63 _"build, qml: Add qtquickcontrols2 module"_
  - 1de8556 _"build, qt: Apply workaround for Qt build system bug for riscv64"_
  - 6c58ae5 _"qml, doc: Add import QtQuick.Layouts"_
  - 641f2a5 _"doc: Drop unneeded runtime dependencies"_

  after:
  - 3fc6ec8 _"depends, qml: Add Qt 5.15.3 Declarative module"_
  - c983645 _"depends, qml: Add Qt 5.15.3 Quick Controls 2 module"_
  - 7902e08 _"build, qml: Update bitcoin_qt.m4 with QML paths and plugins"_
  - 46af006 _"qml: Import static plugins"_
  - d51ac6c _"doc, qml: Update runtime dependencies"_
  - ae5a391 _"qml: Add import QtQuick.Layouts"_

  _Group B_
  before:
  - b8413e5 _"qml: Add qInstallMessageHandler"_
  - 055e5c7 _"qml: Drop erroneous `#include <QStringLiteral>`"_

  after:
  - d0a2ce6 _"qml: Add qInstallMessageHandler"_

  _Group C_
  before:
  - 6cb9fed _"ci, qml: Add required Qt Quick dev packages"_
  - ea4f68a _"ci: Replace bionic with hirsute for system Qt 5.15.2"_

  after:
  - a92f553 _"ci, qml: Add required Qt Quick dev packages"_

  **Note 3**
  Commits:
  - 719e1f9 _"ci: temporarily disable failing ci task"_
  - 651dd65 _"build, qml: Fix compiling with GCC 11"_

  have been effectively dropped as they are no longer required.

  **Note 4**
  A new commit 229c56b _"ci: Fix Win64 task"_ were added.

  **Note 5**
  Errors in the ["previous releases..."](https://cirrus-ci.com/task/4752772586274816) CI task were solved by clearing CI cache.

  ---

  #### Guix builds:
  ```
  $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
  787ea22c1cba508827ce1f68d3b5645d0a7c0cabe2d04536c8fae6b9cf119c16  guix-build-229c56b3d90c/output/aarch64-linux-gnu/SHA256SUMS.part
  6ee44b279593d8647c96d43a5855b5fec9f736e219d99d5e7478382c8e785161  guix-build-229c56b3d90c/output/aarch64-linux-gnu/bitcoin-229c56b3d90c-aarch64-linux-gnu-debug.tar.gz
  fc5142bbee75be4e3d50714ee578943a6e61943ee67c037ade78a763b7ad8fde  guix-build-229c56b3d90c/output/aarch64-linux-gnu/bitcoin-229c56b3d90c-aarch64-linux-gnu.tar.gz
  134f91d9b6aca45121087bbe12468b712b7e4171d92cc475800d5baaff7f2261  guix-build-229c56b3d90c/output/arm-linux-gnueabihf/SHA256SUMS.part
  7220fa47fb8dc9f77ad988e6e57da3e9a5448ce8e2dda810162e90c719c2f844  guix-build-229c56b3d90c/output/arm-linux-gnueabihf/bitcoin-229c56b3d90c-arm-linux-gnueabihf-debug.tar.gz
  a2dde664a055ae34eca1b39a1b6f57f93499dad7c9fa23e10e9e69b6eb9de54e  guix-build-229c56b3d90c/output/arm-linux-gnueabihf/bitcoin-229c56b3d90c-arm-linux-gnueabihf.tar.gz
  a44d56f3720e064fe189dea3db4bc3a5bb09641bc2d19da64fe14ea8e61ce6aa  guix-build-229c56b3d90c/output/arm64-apple-darwin/SHA256SUMS.part
  b10309a84595bd991dcca098fad17e79c234f55ae3773fcccd535d19556c4938  guix-build-229c56b3d90c/output/arm64-apple-darwin/bitcoin-229c56b3d90c-arm64-apple-darwin-unsigned.dmg
  655c8562a8246b66bfae8e37a96c15d2b424751b2b2ed6a1c47ce49bd3e4a927  guix-build-229c56b3d90c/output/arm64-apple-darwin/bitcoin-229c56b3d90c-arm64-apple-darwin-unsigned.tar.gz
  f9de01b39b0b0b81fe26f347e13d2496ada04a5d35ab2e1bd8d477dc2713f9d4  guix-build-229c56b3d90c/output/arm64-apple-darwin/bitcoin-229c56b3d90c-arm64-apple-darwin.tar.gz
  54b65495a9ea44c924807babe2c33fbad38e826047860d9338c37509d395c822  guix-build-229c56b3d90c/output/dist-archive/bitcoin-229c56b3d90c.tar.gz
  c08b72fe9e74aac842ab99cad909dd8ef87a1e9fda377cec166dfaab7d5de13c  guix-build-229c56b3d90c/output/powerpc64-linux-gnu/SHA256SUMS.part
  c1c69f324bc016874973a21c79c90d861243bace655ca54fe921ed7edf948129  guix-build-229c56b3d90c/output/powerpc64-linux-gnu/bitcoin-229c56b3d90c-powerpc64-linux-gnu-debug.tar.gz
  3e809e29d35855b331a32f2ff33df4896bd522fe57b754803cd5dffdf98d94fb  guix-build-229c56b3d90c/output/powerpc64-linux-gnu/bitcoin-229c56b3d90c-powerpc64-linux-gnu.tar.gz
  7ac1aac7a2ddf1010a11afb878d6d0c241c0c1a3f5a15f7089581fffd24ce406  guix-build-229c56b3d90c/output/powerpc64le-linux-gnu/SHA256SUMS.part
  73017251c9c00d72f7d5276f7ec8431682f49e2e59f9d8639505d8a6acbb8b10  guix-build-229c56b3d90c/output/powerpc64le-linux-gnu/bitcoin-229c56b3d90c-powerpc64le-linux-gnu-debug.tar.gz
  81bab40a6d5f71f6d9f5a0a9d6f6aedfa0194738cc87214bf72a299e10a77f87  guix-build-229c56b3d90c/output/powerpc64le-linux-gnu/bitcoin-229c56b3d90c-powerpc64le-linux-gnu.tar.gz
  7f3263abc0de641cd5cab29e4257ee4d740a995876c2adbc8e2163e9c9889fac  guix-build-229c56b3d90c/output/riscv64-linux-gnu/SHA256SUMS.part
  5b07bb4ee2bec25e6a503d78d4cbc847eb6da2a521b03a15c9e05529fb522621  guix-build-229c56b3d90c/output/riscv64-linux-gnu/bitcoin-229c56b3d90c-riscv64-linux-gnu-debug.tar.gz
  309899e2d7f9fa96de84b5c77c65cba31e4cde8e7ed2d90f100f78459c5b73f7  guix-build-229c56b3d90c/output/riscv64-linux-gnu/bitcoin-229c56b3d90c-riscv64-linux-gnu.tar.gz
  f2f9b9f3e0934d2f9bdee7667812f0eefa3fd56bcbf3879ae7992084e38b3a01  guix-build-229c56b3d90c/output/x86_64-apple-darwin/SHA256SUMS.part
  02a927161f15e1c766c4cfb007e280eb77ba651e818c74a63d0c780498ff9fce  guix-build-229c56b3d90c/output/x86_64-apple-darwin/bitcoin-229c56b3d90c-x86_64-apple-darwin-unsigned.dmg
  8bb2bfe96eafdbf50bdebdf73f355f9b56d410ea1d317a195b03c8872a74398b  guix-build-229c56b3d90c/output/x86_64-apple-darwin/bitcoin-229c56b3d90c-x86_64-apple-darwin-unsigned.tar.gz
  d547fd75d8b1c8275ef1007221ee8ee98a7ef5cd8a341bd9049c6502ace477f1  guix-build-229c56b3d90c/output/x86_64-apple-darwin/bitcoin-229c56b3d90c-x86_64-apple-darwin.tar.gz
  7e142a98140612b5fcc8a298348d7e452c2d1b58fe6d356c3a66baf9397db5fe  guix-build-229c56b3d90c/output/x86_64-linux-gnu/SHA256SUMS.part
  113bb237f595110d712194aeb480fed2db2f94e31ebfe087ba638f73ce2efe71  guix-build-229c56b3d90c/output/x86_64-linux-gnu/bitcoin-229c56b3d90c-x86_64-linux-gnu-debug.tar.gz
  69e963b6a184751be8bad3df280e0d15c437da2c5a66cfc23b7cbf3ea09f7727  guix-build-229c56b3d90c/output/x86_64-linux-gnu/bitcoin-229c56b3d90c-x86_64-linux-gnu.tar.gz
  5aa4a8ef55a511475975006e820f6f6e47ba5d961c26562f6673a3edd567146b  guix-build-229c56b3d90c/output/x86_64-w64-mingw32/SHA256SUMS.part
  9cd6abdbe502e1b96b5a98e5aff5bd17882024153dcf037188c931f96dab86b9  guix-build-229c56b3d90c/output/x86_64-w64-mingw32/bitcoin-229c56b3d90c-win64-debug.zip
  0aa6fbf091fa49615c9f392ab9da2a41788b57740da28f712f1c27acaad9952d  guix-build-229c56b3d90c/output/x86_64-w64-mingw32/bitcoin-229c56b3d90c-win64-setup-unsigned.exe
  a1ddd861d6a006c1083b44dd29adc8ca5f0881f8a89187ffc812d70414fe9b3d  guix-build-229c56b3d90c/output/x86_64-w64-mingw32/bitcoin-229c56b3d90c-win64-unsigned.tar.gz
  3d76a1103a4242cb5a31f8b4a4b2f297948ef4e6cb99967e8adf923d0c7f3b6d  guix-build-229c56b3d90c/output/x86_64-w64-mingw32/bitcoin-229c56b3d90c-win64.zip
  ```

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/121)
  [![macOS](https://img.shields.io/badge/OS-macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/121)
  [![Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/121)

ACKs for top commit:
  jarolrod:
    ACK 229c56b

Tree-SHA512: aed1914d5fba9b6e69c762852d4f471a2378977e69179026eaf550a317c9bac68940f84debdc5ab957c527d74faaa4ea867182b06ea0f85ad322852be3e8698a

Author: hebasto

.cirrus.yml

@@ -2,6 +2,7 @@ env:  # Global defaults
   PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y"
   MAKEJOBS: "-j10"
   TEST_RUNNER_PORT_MIN: "14000"  # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
+  CI_FAILFAST_TEST_LEAVE_DANGLING: "1"  # Cirrus CI does not care about dangling process and setting this variable avoids killing the CI script itself on error
   CCACHE_SIZE: "200M"
   CCACHE_DIR: "/tmp/ccache_dir"
   CCACHE_NOHASHDIR: "1"  # Debug info might contain a stale path if the build dir changes, but this is fine
@@ -71,6 +72,19 @@ task:
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
 
+task:
+  name: 'tidy [jammy]'
+  << : *GLOBAL_TASK_TEMPLATE
+  container:
+    image: ubuntu:jammy
+    cpu: 2
+    memory: 5G
+  # For faster CI feedback, immediately schedule the linters
+  << : *CREDITS_TEMPLATE
+  env:
+    << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
+    FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
+
 task:
   name: "Win64 native [msvc]"
   << : *FILTER_TEMPLATE
@@ -82,14 +96,17 @@ task:
   env:
     PATH: 'C:\jom;C:\Python39;C:\Python39\Scripts;C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin;%PATH%'
     PYTHONUTF8: 1
-    CI_VCPKG_TAG: '2021.05.12'
+    CI_VCPKG_TAG: '2022.04.12'
     VCPKG_DOWNLOADS: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\downloads'
     VCPKG_DEFAULT_BINARY_CACHE: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
-    QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip'
-    QT_LOCAL_PATH: 'C:\qt-everywhere-src-5.15.2.zip'
-    QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.2'
+    CCACHE_DIR: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
+    WRAPPED_CL: 'C:\Users\ContainerAdministrator\AppData\Local\Temp\cirrus-ci-build\ci\test\wrapped-cl.bat'
+    QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
+    QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.3.zip'
+    QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.3'
     QTBASEDIR: 'C:\Qt_static'
     x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
+    QT_CONFIGURE_COMMAND: '..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml'
     IgnoreWarnIntDirInTempDetected: 'true'
   merge_script:
     - git config --global user.email "[email protected]"
@@ -104,7 +121,7 @@ task:
     folder: "%QTBASEDIR%"
     reupload_on_changes: false
     fingerprint_script:
-      - echo %QT_DOWNLOAD_URL%
+      - echo %QT_DOWNLOAD_URL% %QT_CONFIGURE_COMMAND%
       - msbuild -version
     populate_script:
       - curl -L -o C:\jom.zip http://download.qt.io/official_releases/jom/jom.zip
@@ -116,7 +133,7 @@ task:
       - cd %QT_SOURCE_DIR%
       - mkdir build
       - cd build
-      - ..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml -prefix %QTBASEDIR%
+      - '%QT_CONFIGURE_COMMAND% -prefix %QTBASEDIR%'
       - jom
       - jom install
   vcpkg_tools_cache:
@@ -130,12 +147,17 @@ task:
     reupload_on_changes: true
     fingerprint_script:
       - echo %CI_VCPKG_TAG%
+      - type build_msvc\vcpkg.json
       - msbuild -version
     populate_script:
       - mkdir %VCPKG_DEFAULT_BINARY_CACHE%
-  install_python_script:
+  ccache_cache:
+    folder: '%CCACHE_DIR%'
+  install_tools_script:
+    - choco install --yes --no-progress ccache
     - choco install --yes --no-progress python3 --version=3.9.6
     - pip install zmq
+    - ccache --version
     - python -VV
   install_vcpkg_script:
     - cd ..
@@ -147,9 +169,12 @@ task:
     - .\vcpkg integrate install
     - .\vcpkg version
   build_script:
+    - '%x64_NATIVE_TOOLS%'
     - cd %CIRRUS_WORKING_DIR%
+    - ccache --zero-stats
     - python build_msvc\msvc-autogen.py
-    - msbuild build_msvc\bitcoin.sln -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
+    - msbuild build_msvc\bitcoin.sln -property:CLToolExe=%WRAPPED_CL% -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
+    - ccache --show-stats
   unit_tests_script:
     - src\test_bitcoin.exe -l test_suite
     - src\bench_bitcoin.exe > NUL
@@ -176,11 +201,11 @@ task:
     QEMU_USER_CMD: ""  # Disable qemu and run the test natively
 
 task:
-  name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [focal]'
+  name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]'
   << : *GLOBAL_TASK_TEMPLATE
   alias: win64
   container:
-    image: ubuntu:focal
+    image: ubuntu:jammy
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     FILE_ENV: "./ci/test/00_setup_env_win64.sh"
@@ -189,23 +214,23 @@ task:
   insecure_win_gui_artifacts:
     path: "insecure_win_gui.exe"
 
-#task:
-#  name: '32-bit + dash [gui] [CentOS 8]'
-#  << : *GLOBAL_TASK_TEMPLATE
-#  container:
-#    image: centos:8
-#  env:
-#    << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
-#    PACKAGE_MANAGER_INSTALL: "yum install -y"
-#    FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
+task:
+  name: '32-bit + dash [gui] [CentOS 8]'
+  << : *GLOBAL_TASK_TEMPLATE
+  container:
+    image: quay.io/centos/centos:stream8
+  env:
+    << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
+    PACKAGE_MANAGER_INSTALL: "yum install -y"
+    FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
 
 task:
-  name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [hirsute]'
+  name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bullseye]'
   previous_releases_cache:
     folder: "releases"
   << : *GLOBAL_TASK_TEMPLATE
   container:
-    image: ubuntu:hirsute
+    image: debian:bullseye
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
@@ -242,11 +267,10 @@ task:
     MAKEJOBS: "-j4"  # Avoid excessive memory use
 
 task:
-  name: '[fuzzer,address,undefined,integer, no depends] [focal]'
-  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH
+  name: '[fuzzer,address,undefined,integer, no depends] [jammy]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
-    image: ubuntu:focal
+    image: ubuntu:jammy
     cpu: 4  # Increase CPU and memory to avoid timeout
     memory: 16G
   env:
@@ -265,13 +289,13 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
 
 task:
-  name: '[no wallet] [bionic]'
+  name: '[no wallet, libbitcoinkernel] [bionic]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
     image: ubuntu:bionic
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
-    FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
+    FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
 
 task:
   name: 'macOS 10.15 [gui, no tests] [focal]'
@@ -284,7 +308,7 @@ task:
   container:
     image: ubuntu:focal
   env:
-    MACOS_SDK: "Xcode-12.1-12A7403-extracted-SDK-with-libcxx-headers"
+    MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     FILE_ENV: "./ci/test/00_setup_env_mac.sh"
   copy_artifacts_script:
@@ -299,9 +323,9 @@ task:
   brew_install_script:
     - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
   << : *GLOBAL_TASK_TEMPLATE
-  osx_instance:
+  macos_instance:
     # Use latest image, but hardcode version to avoid silent upgrades (and breaks)
-    image: monterey-xcode-13.2  # https://cirrus-ci.org/guide/macOS
+    image: monterey-xcode-13.3  # https://cirrus-ci.org/guide/macOS
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     CI_USE_APT_INSTALL: "no"

.gitignore

@@ -9,6 +9,7 @@ src/bitcoin-gui
 src/bitcoin-node
 src/bitcoin-tx
 src/bitcoin-util
+src/bitcoin-chainstate
 src/bitcoin-wallet
 src/test/fuzz/fuzz
 src/test/test_bitcoin
@@ -150,3 +151,5 @@ osx_volname
 dist/
 
 /guix-build-*
+
+/ci/scratch/

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[bitcoin.qt-translation-022x]
+[bitcoin.qt-translation-023x]
 file_filter = src/qt/locale/bitcoin_<lang>.xlf
 source_file = src/qt/locale/bitcoin_en.xlf
 source_lang = en

CONTRIBUTING.md

@@ -12,8 +12,8 @@ revolves around a meritocracy where contributors earn trust from the developer
 community over time. Nevertheless, some hierarchy is necessary for practical
 purposes. As such, there are repository "maintainers" who are responsible for
 merging pull requests, as well as a "lead maintainer" who is responsible for the
-release cycle as well as overall merging, moderation and appointment of
-maintainers.
+[release cycle](/doc/release-process.md) as well as overall merging, moderation
+and appointment of maintainers.
 
 Getting Started
 ---------------
@@ -153,7 +153,8 @@ the pull request affects. Valid areas as:
   - `test`, `qa` or `ci` for changes to the unit tests, QA tests or CI code
   - `util` or `lib` for changes to the utils or libraries
   - `wallet` for changes to the wallet code
-  - `build` for changes to the GNU Autotools or reproducible builds
+  - `build` for changes to the GNU Autotools or MSVC builds
+  - `guix` for changes to the GUIX reproducible builds
 
 Examples:
 
@@ -189,9 +190,14 @@ in the body of the pull request to indicate tasks are pending.
 
 At this stage, one should expect comments and review from other contributors. You
 can add more commits to your pull request by committing them locally and pushing
-to your fork until you have satisfied all feedback.
+to your fork.
 
-Note: Code review is a burdensome but important part of the development process, and as such, certain types of pull requests are rejected. In general, if the **improvements** do not warrant the **review effort** required, the PR has a high chance of being rejected. It is up to the PR author to convince the reviewers that the changes warrant the review effort, and if reviewers are "Concept NACK'ing" the PR, the author may need to present arguments and/or do research backing their suggested changes.
+You are expected to reply to any review comments before your pull request is
+merged. You may update the code or reject the feedback if you do not agree with
+it, but you should express so in a reply. If there is outstanding feedback and
+you are not actively working on it, your pull request may be closed.
+
+Please refer to the [peer review](#peer-review) section below for more details.
 
 ### Squashing Commits
 
@@ -322,6 +328,14 @@ maintainers take into account the peer review when determining if there is
 consensus to merge a pull request (remember that discussions may have been
 spread out over GitHub, mailing list and IRC discussions).
 
+Code review is a burdensome but important part of the development process, and
+as such, certain types of pull requests are rejected. In general, if the
+**improvements** do not warrant the **review effort** required, the PR has a
+high chance of being rejected. It is up to the PR author to convince the
+reviewers that the changes warrant the review effort, and if reviewers are
+"Concept NACK'ing" the PR, the author may need to present arguments and/or do
+research backing their suggested changes.
+
 #### Conceptual Review
 
 A review can be a conceptual review, where the reviewer leaves a comment
@@ -422,11 +436,6 @@ https://github.com/bitcoin/bitcoin/pull/16189).
 Also see the [backport.py script](
 https://github.com/bitcoin-core/bitcoin-maintainer-tools#backport).
 
-Release Policy
---------------
-
-The project leader is the release manager for each Bitcoin Core release.
-
 Copyright
 ---------
 

Makefile.am

@@ -38,7 +38,6 @@ OSX_APP=Bitcoin-Qt.app
 OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
 OSX_DMG = $(OSX_VOLNAME).dmg
 OSX_TEMP_ISO = $(OSX_DMG:.dmg=).temp.iso
-OSX_BACKGROUND_IMAGE=$(top_srcdir)/contrib/macdeploy/background.tiff
 OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
 OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
@@ -48,7 +47,8 @@ DIST_CONTRIB = \
 	       $(top_srcdir)/test/sanitizer_suppressions/tsan \
 	       $(top_srcdir)/test/sanitizer_suppressions/ubsan \
 	       $(top_srcdir)/contrib/linearize/linearize-data.py \
-	       $(top_srcdir)/contrib/linearize/linearize-hashes.py
+	       $(top_srcdir)/contrib/linearize/linearize-hashes.py \
+	       $(top_srcdir)/contrib/signet/miner
 
 DIST_SHARE = \
   $(top_srcdir)/share/genbuild.sh \
@@ -64,7 +64,6 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
   $(top_srcdir)/doc/README_windows.txt
 
 OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
-  $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
   $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
 
 COVERAGE_INFO = $(COV_TOOL_WRAPPER) baseline.info \
@@ -130,28 +129,17 @@ $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
 deploydir: $(OSX_DMG)
 else !BUILD_DARWIN
 APP_DIST_DIR=$(top_builddir)/dist
-APP_DIST_EXTRAS=$(APP_DIST_DIR)/.background/background.tiff $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications
 
-$(APP_DIST_DIR)/Applications:
-	@rm -f $@
-	@cd $(@D); $(LN_S) /Applications $(@F)
-
-$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
-
-$(OSX_TEMP_ISO): $(APP_DIST_EXTRAS)
+$(OSX_TEMP_ISO): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
 	$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
 
 $(OSX_DMG): $(OSX_TEMP_ISO)
 	$(DMG) dmg "$<" "$@"
 
-$(APP_DIST_DIR)/.background/background.tiff:
-	$(MKDIR_P) $(@D)
-	cp $(OSX_BACKGROUND_IMAGE) $@
-
 $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
 	INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
 
-deploydir: $(APP_DIST_EXTRAS)
+deploydir: $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
 endif !BUILD_DARWIN
 
 appbundle: $(OSX_APP_BUILT)

REVIEWERS

@@ -18,12 +18,11 @@
 
 
 # Maintainers
+#   @achow101
 #   @fanquake
 #   @hebasto
-#   @jonasschnelli
 #   @laanwj
 #   @marcofalke
-#   @meshcollider
 #   @sipa
 
 # Docs