Merge #131: Sync with the main repo

Pull request description:

  Sync with the main repo up to the latest bitcoin/bitcoin@37633d2, which includes bitcoin-core/gui#602.

  No conflicts :)

  #### Guix builds on `arm64`:
  ```
  # find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
  fef5b12d92485e5bf3344a3e8f2271422151c58cb181ba6965f51b3406515175  guix-build-708323f6023d/output/arm-linux-gnueabihf/SHA256SUMS.part
  0460a13c7687f7f7ff582d305a74ca5fe9fa472fc1fdbcd8e027ec14be9da8f3  guix-build-708323f6023d/output/arm-linux-gnueabihf/bitcoin-708323f6023d-arm-linux-gnueabihf-debug.tar.gz
  8db3f95f873e73ff8fffa05e2f7cd6a0b19a7c2b577e96e674edb85605489beb  guix-build-708323f6023d/output/arm-linux-gnueabihf/bitcoin-708323f6023d-arm-linux-gnueabihf.tar.gz
  4d17e2b98fcbb945c8f251eb24c9496f6ad0df3a6ade7a1e61ed240e9979465c  guix-build-708323f6023d/output/arm64-apple-darwin/SHA256SUMS.part
  6c3c6b0cec8021063f1d553ccdf43946139ffb0dd4eaaf132be9058d65e9c474  guix-build-708323f6023d/output/arm64-apple-darwin/bitcoin-708323f6023d-arm64-apple-darwin-unsigned.dmg
  cabb7747ac6ec060eb71a092a43056dd6430ed21554af36ba20de551118b796d  guix-build-708323f6023d/output/arm64-apple-darwin/bitcoin-708323f6023d-arm64-apple-darwin-unsigned.tar.gz
  826c4d7f7edb220a7973b6260905f4fb3e58dd9aaf2567fe7cffd46bfc71f662  guix-build-708323f6023d/output/arm64-apple-darwin/bitcoin-708323f6023d-arm64-apple-darwin.tar.gz
  3014169f0610e14e3feb547e49d2ccb7a027852321151b7f00abd79d0a09bc9e  guix-build-708323f6023d/output/dist-archive/bitcoin-708323f6023d.tar.gz
  1642a1509809e97cc677ca5c4b369a9cadcb419da2d0af58020dc5aec9a7ac24  guix-build-708323f6023d/output/powerpc64-linux-gnu/SHA256SUMS.part
  31a5d1690dbb79d538f0f58e62d697654b632a0b84fee4d946ebf9f0d1a6a518  guix-build-708323f6023d/output/powerpc64-linux-gnu/bitcoin-708323f6023d-powerpc64-linux-gnu-debug.tar.gz
  4be716159f7559e85a12e014b9b01ed120c4b3af3ae54724ba44193fc0b47da5  guix-build-708323f6023d/output/powerpc64-linux-gnu/bitcoin-708323f6023d-powerpc64-linux-gnu.tar.gz
  7b9fbe3238e1a6408d7adfac90e39f97b18fd35a2be9898702eb5eb45b476773  guix-build-708323f6023d/output/powerpc64le-linux-gnu/SHA256SUMS.part
  0625815bd3f46224c475e43a033d0cda505c8eb7a8dfc0b6024283f4c4ce1fea  guix-build-708323f6023d/output/powerpc64le-linux-gnu/bitcoin-708323f6023d-powerpc64le-linux-gnu-debug.tar.gz
  a97627fdbbb943543abbf603dfb73f728fb2a0d7e7e06cce7d169dbbc74fe6ea  guix-build-708323f6023d/output/powerpc64le-linux-gnu/bitcoin-708323f6023d-powerpc64le-linux-gnu.tar.gz
  ac4f48f933308b7ad6cb9c6cf280eff13d4de1770ab184535e0149e40d23c98b  guix-build-708323f6023d/output/riscv64-linux-gnu/SHA256SUMS.part
  1a864557c76def163ca54b398ea7eef66af65ee40287d15aa079f98fb55ac89c  guix-build-708323f6023d/output/riscv64-linux-gnu/bitcoin-708323f6023d-riscv64-linux-gnu-debug.tar.gz
  d02afae96e21cd857e79dd3a90d2dec37a5000a3b13078f4f9e9021c05e13256  guix-build-708323f6023d/output/riscv64-linux-gnu/bitcoin-708323f6023d-riscv64-linux-gnu.tar.gz
  e674990b30dfc6c16fe4b80336aedc330e4a4843bda603cd29799b039525acfe  guix-build-708323f6023d/output/x86_64-apple-darwin/SHA256SUMS.part
  0507bad74eb3126d1afa31feb914dcb5da0dd74f0b7a4dfca1c957f9a8a9df4c  guix-build-708323f6023d/output/x86_64-apple-darwin/bitcoin-708323f6023d-x86_64-apple-darwin-unsigned.dmg
  8547a4fe6fb716049d6eb7a0c726ac04402f25356ebeb9bf00ed83d0d0715c80  guix-build-708323f6023d/output/x86_64-apple-darwin/bitcoin-708323f6023d-x86_64-apple-darwin-unsigned.tar.gz
  33e566ae6da0a983e76cbbf4c78706bc9bd4175fecd94ed4144ae3e4a8c9f58b  guix-build-708323f6023d/output/x86_64-apple-darwin/bitcoin-708323f6023d-x86_64-apple-darwin.tar.gz
  afa8afc89d9fe15da66e45e579c89668f3fde5aa50d00b56e97375eda0902fa6  guix-build-708323f6023d/output/x86_64-linux-gnu/SHA256SUMS.part
  fe858930f4dee66f026ed536426328117e6dd8c50b1748cd9145e937ea16f7f7  guix-build-708323f6023d/output/x86_64-linux-gnu/bitcoin-708323f6023d-x86_64-linux-gnu-debug.tar.gz
  d84466c0a5a102127dba8eef2f78fa24d80280362d7fb30ba9cec8ab407797cb  guix-build-708323f6023d/output/x86_64-linux-gnu/bitcoin-708323f6023d-x86_64-linux-gnu.tar.gz
  05e378131c684d18279a9db0382a05601fd41c3bf9efcf4e5bb0c7b964afa72e  guix-build-708323f6023d/output/x86_64-w64-mingw32/SHA256SUMS.part
  a007d0e4588f04afb5c8ed5e5d9585b865f343debcace61707acc8545b64d699  guix-build-708323f6023d/output/x86_64-w64-mingw32/bitcoin-708323f6023d-win64-debug.zip
  ad5164a5a9de501d8238e7aff0c1a597c6f99cc3be8f514f3c52bdb50a182c3c  guix-build-708323f6023d/output/x86_64-w64-mingw32/bitcoin-708323f6023d-win64-setup-unsigned.exe
  abcc4f45b45c6590e8d08ee5a044d1537b635c61b8febf2938f3b489ebbf1140  guix-build-708323f6023d/output/x86_64-w64-mingw32/bitcoin-708323f6023d-win64-unsigned.tar.gz
  0b0d0ad32ef19a9fbb9106e87b0b20aa029164245c23158cceb30b1dfbbff344  guix-build-708323f6023d/output/x86_64-w64-mingw32/bitcoin-708323f6023d-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/131)
  [![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/131)
  [![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/131)

ACKs for top commit:
  jarolrod:
    ACK 708323f

Tree-SHA512: 57bbb812bb31daca6fa569765a4d525efdffeb34b8fcb6540c83cbacd20df8c56979e1626c15bc37e01086f83c13b9e73723cf6a40b0e5143466487fe174d553

Author: hebasto

.cirrus.yml

@@ -337,7 +337,7 @@ task:
   << : *BASE_TEMPLATE
   android_sdk_cache:
     folder: "depends/SDKs/android"
-    fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.1.7779620"
+    fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
   depends_sources_cache:
     folder: "depends/sources"
     fingerprint_script: git rev-list -1 HEAD ./depends

CONTRIBUTING.md

@@ -216,9 +216,9 @@ Please update the resulting commit message, if needed. It should read as a
 coherent message. In most cases, this means not just listing the interim
 commits.
 
-If you have problems with squashing or other git workflows, you can enable
-"Allow edits from maintainers" in the right-hand sidebar of the GitHub web
-interface and ask for help in the pull request.
+If your change contains a merge commit, the above workflow may not work and you
+will need to remove the merge commit first. See the next section for details on
+how to rebase.
 
 Please refrain from creating several pull requests for the same change.
 Use the pull request that is already open (or was created earlier) to amend
@@ -231,7 +231,9 @@ pull request to pull request.
 ### Rebasing Changes
 
 When a pull request conflicts with the target branch, you may be asked to rebase it on top of the current target branch.
-The `git rebase` command will take care of rebuilding your commits on top of the new base.
+
+    git fetch https://github.com/bitcoin/bitcoin  # Fetch the latest upstream commit
+    git rebase FETCH_HEAD  # Rebuild commits on top of the new base
 
 This project aims to have a clean git history, where code changes are only made in non-merge commits. This simplifies
 auditability because merge commits can be assumed to not contain arbitrary code changes. Merge commits should be signed,

build_msvc/common.init.vcxproj.in

@@ -90,7 +90,7 @@
       <AdditionalOptions>/utf-8 /Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4018;4244;4267;4334;4715;4805;4834</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISABLE_DESIGNATED_INITIALIZER_ERRORS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src;..\..\src\minisketch\include;..\..\src\univalue\include;..\..\src\secp256k1\include;..\..\src\leveldb\include;..\..\src\leveldb\helpers\memenv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

ci/lint/06_script.sh

@@ -22,7 +22,7 @@ test/lint/git-subtree-check.sh src/univalue
 test/lint/git-subtree-check.sh src/leveldb
 test/lint/git-subtree-check.sh src/crc32c
 test/lint/check-doc.py
-test/lint/lint-all.py
+test/lint/all-lint.py
 
 if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; then
     # Sanity check only the last few commits to get notified of missing sigs,

ci/test/00_setup_env_android.sh

@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export HOST=aarch64-linux-android
-export PACKAGES="clang llvm unzip openjdk-8-jdk gradle"
+export PACKAGES="unzip openjdk-8-jdk gradle"
 export CONTAINER_NAME=ci_android
 export DOCKER_NAME_TAG="ubuntu:focal"
 
@@ -16,8 +16,8 @@ export RUN_FUNCTIONAL_TESTS=false
 
 export ANDROID_API_LEVEL=28
 export ANDROID_BUILD_TOOLS_VERSION=28.0.3
-export ANDROID_NDK_VERSION=23.1.7779620
-export ANDROID_TOOLS_URL=https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip
+export ANDROID_NDK_VERSION=23.2.8568313
+export ANDROID_TOOLS_URL=https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip
 export ANDROID_HOME="${DEPENDS_DIR}/SDKs/android"
 export ANDROID_NDK_HOME="${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}"
 export DEP_OPTS="ANDROID_SDK=${ANDROID_HOME} ANDROID_NDK=${ANDROID_NDK_HOME} ANDROID_API_LEVEL=${ANDROID_API_LEVEL} ANDROID_TOOLCHAIN_BIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/"

ci/test/05_before_script.sh

@@ -31,9 +31,9 @@ if [ -n "$ANDROID_HOME" ] && [ ! -d "$ANDROID_HOME" ]; then
   if [ ! -f "$ANDROID_TOOLS_PATH" ]; then
     CI_EXEC curl --location --fail "${ANDROID_TOOLS_URL}" -o "$ANDROID_TOOLS_PATH"
   fi
-  CI_EXEC mkdir -p "${ANDROID_HOME}/cmdline-tools"
-  CI_EXEC unzip -o "$ANDROID_TOOLS_PATH" -d "${ANDROID_HOME}/cmdline-tools"
-  CI_EXEC "yes | ${ANDROID_HOME}/cmdline-tools/tools/bin/sdkmanager --install \"build-tools;${ANDROID_BUILD_TOOLS_VERSION}\" \"platform-tools\" \"platforms;android-${ANDROID_API_LEVEL}\" \"ndk;${ANDROID_NDK_VERSION}\""
+  CI_EXEC mkdir -p "$ANDROID_HOME"
+  CI_EXEC unzip -o "$ANDROID_TOOLS_PATH" -d "$ANDROID_HOME"
+  CI_EXEC "yes | ${ANDROID_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=\"${ANDROID_HOME}\" --install \"build-tools;${ANDROID_BUILD_TOOLS_VERSION}\" \"platform-tools\" \"platforms;android-${ANDROID_API_LEVEL}\" \"ndk;${ANDROID_NDK_VERSION}\""
 fi
 
 if [ -z "$NO_DEPENDS" ]; then

ci/test/06_script_a.sh

@@ -6,18 +6,20 @@
 
 export LC_ALL=C.UTF-8
 
+BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST"
+if [ -z "$NO_WERROR" ]; then
+  BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
+fi
+
 if [ -n "$ANDROID_TOOLS_URL" ]; then
   CI_EXEC make distclean || true
   CI_EXEC ./autogen.sh
-  CI_EXEC ./configure "$BITCOIN_CONFIG" --prefix="${DEPENDS_DIR}/aarch64-linux-android" || ( (CI_EXEC cat config.log) && false)
+  CI_EXEC ./configure "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (CI_EXEC cat config.log) && false)
   CI_EXEC "make $MAKEJOBS && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk"
   exit 0
 fi
 
-BITCOIN_CONFIG_ALL="--enable-external-signer --enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
-if [ -z "$NO_WERROR" ]; then
-  BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
-fi
+BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
 CI_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
 
 if [ -n "$CONFIG_SHELL" ]; then

ci/test/06_script_b.sh

@@ -41,6 +41,9 @@ if [ "${RUN_TIDY}" = "true" ]; then
   CI_EXEC "python3 ${DIR_IWYU}/include-what-you-use/iwyu_tool.py"\
           " src/compat"\
           " src/init"\
+          " src/policy/feerate.cpp"\
+          " src/policy/packages.cpp"\
+          " src/policy/settings.cpp"\
           " src/rpc/fees.cpp"\
           " src/rpc/signmessage.cpp"\
           " -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"

configure.ac

@@ -935,10 +935,7 @@ if test "$use_hardening" != "no"; then
   AX_CHECK_COMPILE_FLAG([-Wstack-protector], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
   AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
 
-  dnl -fcf-protection used with Clang 7 causes ld to emit warnings:
-  dnl ld: error: ... <corrupt x86 feature size: 0x8>
-  dnl Use CHECK_LINK_FLAG & --fatal-warnings to ensure we won't use the flag in this case.
-  AX_CHECK_LINK_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"], [], [$LDFLAG_WERROR])
+  AX_CHECK_COMPILE_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"])
 
   case $host in
     *mingw*)
@@ -1457,6 +1454,10 @@ if test "$use_boost" = "yes"; then
   dnl we don't use multi_index serialization
   BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION"
 
+  if test "$enable_debug" = "yes" || test "$enable_fuzz" = "yes"; then
+    BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE"
+  fi
+
   if test "$suppress_external_warnings" != "no"; then
     BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
   fi

doc/build-openbsd.md

@@ -34,7 +34,7 @@ It is not necessary to build wallet functionality to run either `bitcoind` or `b
 `sqlite3` is required to support [descriptor wallets](descriptors.md).
 
 ``` bash
-pkg_add install sqlite3
+pkg_add sqlite3
 ```
 
 ###### Legacy Wallet Support