Merge #6916: backport: bitcoin#23703, bitcoin#24860, bitcoin#25642, bitcoin#25650, bitcoin#25760, bitcoin#25829, bitcoin#25869, bitcoin#26589

2ff28c6 Merge bitcoin#26589: test: small fixups/improvements for get_previous_releases.py (MarcoFalke)
5db1752 Merge bitcoin#25782: test: check that `verifymessage` RPC fails for non-P2PKH addresses (Andrew Chow)
b838b60 Merge bitcoin#25869: wallet: remove UNKNOWN type from OUTPUT_TYPES array (Andrew Chow)
f093843 Merge bitcoin#25642: Don't wrap around when deriving an extended key at a too large depth (Andrew Chow)
4d0373f Merge bitcoin#25760: rest: clean-up for `mempool` endpoints (MacroFake)
46a187a Merge bitcoin#25650: script: default to necessary tags in `test/get_previous_releases.py` (MacroFake)
e378eeb Merge bitcoin#23703: scripted-diff: Use named args in RPC docs (fanquake)
6531d8f Merge bitcoin#25829: build: include share/rpcauth in release tarball (fanquake)
0beeb91 Merge bitcoin#25709: script: actually trigger the optimization in BuildScript (MacroFake)
7601680 Merge bitcoin#24860: Miniscript integration follow-ups (fanquake)

Pull request description:

  ## What was done?
  Regular backports from Bitcoin Core v24

  ## How Has This Been Tested?
  1. Run unit & functional tests.
  2. Run `test/get_previous_releases.py -b` - it works

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone

ACKs for top commit:
  UdjinM6:
    utACK 2ff28c6

Tree-SHA512: 0503b053823f3c0b5c52caa21b1419d36037f31e6e3bde0bec27b432f50e0d8ed7d16195f891fd814cc5da0b5b23cf1b694b28ba0c4503f317b09d89e5c9f881

Author: PastaPastaPasta

ci/dash/test_integrationtests.sh

@@ -20,10 +20,10 @@ fi
 
 export LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib
 
-if [ -n "$PREVIOUS_RELEASES_TO_DOWNLOAD" ]; then
-  echo "Downloading previous releases: $PREVIOUS_RELEASES_TO_DOWNLOAD"
+if [ "$DOWNLOAD_PREVIOUS_RELEASES" = "true" ]; then
+  echo "Downloading previous releases..."
   # shellcheck disable=SC2086
-  ./test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" ${PREVIOUS_RELEASES_TO_DOWNLOAD}
+  ./test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR"
 fi
 
 cd "build-ci/dashcore-$BUILD_TARGET"

ci/test/00_setup_env_native_qt5.sh

@@ -14,5 +14,5 @@ export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude fe
 export RUN_UNIT_TESTS_SEQUENTIAL="true"
 export RUN_UNIT_TESTS="false"
 export GOAL="install"
-export PREVIOUS_RELEASES_TO_DOWNLOAD="v0.12.1.5 v0.15.0.0 v0.16.1.1 v0.17.0.3 v18.2.2 v19.3.0 v20.1.1 v21.1.1"
+export DOWNLOAD_PREVIOUS_RELEASES="true"
 export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports LDFLAGS=-static-libstdc++ --with-boost-process"

ci/test/05_before_script.sh

@@ -30,6 +30,6 @@ if [ -z "$NO_DEPENDS" ]; then
   fi
   CI_EXEC "$SHELL_OPTS" make "$MAKEJOBS" -C depends HOST="$HOST" "$DEP_OPTS" LOG=1
 fi
-if [ -n "$PREVIOUS_RELEASES_TO_DOWNLOAD" ]; then
-  CI_EXEC test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" "${PREVIOUS_RELEASES_TO_DOWNLOAD}"
+if [ "$DOWNLOAD_PREVIOUS_RELEASES" = "true" ]; then
+  CI_EXEC test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR"
 fi

contrib/guix/libexec/build.sh

@@ -357,6 +357,8 @@ mkdir -p "$DISTSRC"
         # has not been run before buildling, this file will be a stub
         cp "${DISTSRC}/contrib/debian/examples/dash.conf" "${DISTNAME}/"
 
+        cp -r "${DISTSRC}/share/rpcauth" "${DISTNAME}/share/"
+
         # Finally, deterministically produce {non-,}debug binary tarballs ready
         # for release
         case "$HOST" in

share/setup.nsi.in

@@ -75,6 +75,9 @@ Section -Main SEC0000
     File @abs_top_builddir@/release/@BITCOIN_GUI_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@/contrib/debian/examples/dash.conf
+    SetOutPath $INSTDIR\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@
@@ -127,6 +130,8 @@ Section /o -un.Main UNSEC0000
     Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
     Delete /REBOOTOK $INSTDIR\COPYING.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
+    Delete /REBOOTOK $INSTDIR\dash.conf
+    RMDir /r /REBOOTOK $INSTDIR\share
     RMDir /r /REBOOTOK $INSTDIR\daemon
     DeleteRegValue HKCU "${REGKEY}\Components" Main
 SectionEnd

src/Makefile.test.include

@@ -321,7 +321,7 @@ test_fuzz_fuzz_SOURCES = \
  test/fuzz/locale.cpp \
  test/fuzz/merkleblock.cpp \
  test/fuzz/message.cpp \
- test/fuzz/miniscript_decode.cpp \
+ test/fuzz/miniscript.cpp \
  test/fuzz/minisketch.cpp \
  test/fuzz/muhash.cpp \
  test/fuzz/multiplication_overflow.cpp \

src/key.cpp

@@ -341,6 +341,7 @@ ECDHSecret CKey::ComputeBIP324ECDHSecret(const EllSwiftPubKey& their_ellswift, c
 }
 
 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);

src/key.h

@@ -135,7 +135,7 @@ class CKey
     bool SignCompact(const uint256& hash, std::vector<unsigned char>& vchSig) const;
 
     //! Derive BIP32 child key.
-    bool Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const;
+    [[nodiscard]] bool Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const;
 
     /**
      * Verify thoroughly whether a private key and a public key match.
@@ -186,7 +186,7 @@ struct CExtKey {
 
     void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
-    bool Derive(CExtKey& out, unsigned int nChild) const;
+    [[nodiscard]] bool Derive(CExtKey& out, unsigned int nChild) const;
     CExtPubKey Neuter() const;
     void SetSeed(Span<const std::byte> seed);
 };

src/outputtype.cpp

@@ -18,7 +18,7 @@
 static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";
 static const std::string OUTPUT_TYPE_STRING_UNKNOWN = "unknown";
 
-const std::array<OutputType, 2> OUTPUT_TYPES = {OutputType::LEGACY, OutputType::UNKNOWN};
+const std::array<OutputType, 1> OUTPUT_TYPES = {OutputType::LEGACY};
 
 bool ParseOutputType(const std::string& type, OutputType& output_type)
 {

src/outputtype.h

@@ -18,7 +18,7 @@ enum class OutputType {
     UNKNOWN,
 };
 
-extern const std::array<OutputType, 2> OUTPUT_TYPES;
+extern const std::array<OutputType, 1> OUTPUT_TYPES;
 
 [[nodiscard]] bool ParseOutputType(const std::string& str, OutputType& output_type);
 const std::string& FormatOutputType(OutputType type);