Merge #6903: backport: bitcoin#25285, bitcoin#25298, bitcoin#25331, bitcoin#25445, bitcoin#25638, bitcoin#25691, bitcoin#25699, bitcoin#25809, bitcoin#25976, bitcoin#26079

312e438 Merge bitcoin#25976: QA: rpc_blockchain: Test output of getblock verbosity 0, False, and True (MacroFake)
aba4757 Merge bitcoin#26079: Revert "doc: note that brew installed qt is not supported" (fanquake)
cd31ec6 Merge bitcoin#25809: build: add test_bitcoin.exe to win installer, don't install entire docs/ dir (fanquake)
f90a43f Merge bitcoin#25699: scripted-diff: Replace NullUniValue with UniValue::VNULL (fanquake)
3f34f20 Merge bitcoin#25691: RPC: Document "asm" and "hex" fields for scripts & fix getblock help (MacroFake)
d60848b partial Merge bitcoin#25331: Add HashWriter without ser-type and ser-version and use it where possible (fanquake)
a412dae Merge bitcoin#25638: refactor: Use chainman() helper consistently in ChainImpl (MacroFake)
3a7297c Merge bitcoin#25285: Add AutoFile without ser-type and ser-version and use it where possible (fanquake)
47e5043 Merge bitcoin#25445: test: Return new_utxo from create_self_transfer in MiniWallet (MacroFake)
928ead8 Merge bitcoin#25298: doc: Fix command in "OpenBSD Build Guide" (MacroFake)

Pull request description:

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

  Backport bitcoin#25331 is partial due to several missing usages of CHashWritter in non-existing yet taproot code.
  Though, it's time to do it, because most of backports prior to 25331 is done and it helps to reduce conflicts for further backports that may use HashWritter instead.

  ## How Has This Been Tested?
  Run unit & functional tests

  ## 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 312e438
  kwvg:
    utACK 312e438

Tree-SHA512: 1c8b5d8eb66903c38da1b905a79e4c7fd271b2150ab02c8010955af8e2c377cd44c7a1dc8c2602b5853d7c28c4d31f10dbe5126e2e9b83a915bfaa88c196d6c4

Author: PastaPastaPasta

Makefile.am

@@ -22,6 +22,7 @@ endif
 
 BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
 BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
+BITCOIN_TEST_BIN=$(top_builddir)/src/test/$(BITCOIN_TEST_NAME)$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
 BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
 BITCOIN_WALLET_BIN=$(top_builddir)/src/$(BITCOIN_WALLET_TOOL_NAME)$(EXEEXT)
@@ -76,6 +77,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
 	$(MKDIR_P) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
+	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TEST_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release

configure.ac

@@ -31,6 +31,7 @@ fi
 
 BITCOIN_DAEMON_NAME=dashd
 BITCOIN_GUI_NAME=dash-qt
+BITCOIN_TEST_NAME=test_dash
 BITCOIN_CLI_NAME=dash-cli
 BITCOIN_TX_NAME=dash-tx
 BITCOIN_WALLET_TOOL_NAME=dash-wallet
@@ -1932,6 +1933,7 @@ AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
 AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
 AC_SUBST(BITCOIN_DAEMON_NAME)
 AC_SUBST(BITCOIN_GUI_NAME)
+AC_SUBST(BITCOIN_TEST_NAME)
 AC_SUBST(BITCOIN_CLI_NAME)
 AC_SUBST(BITCOIN_TX_NAME)
 AC_SUBST(BITCOIN_WALLET_TOOL_NAME)

doc/build-openbsd.md

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

doc/build-osx.md

@@ -109,14 +109,6 @@ Skip if you don't intend to use the GUI.
 brew install qt@5
 ```
 
-Ensure that the `qt@5` package is installed, not the `qt` package.
-If 'qt' is installed, the build process will fail.
-if installed, remove the `qt` package with the following command:
-
-``` bash
-brew uninstall qt
-```
-
 Note: Building with Qt binaries downloaded from the Qt website is not officially supported.
 See the notes in [#7714](https://github.com/dashpay/dash/issues/7714).
 

share/setup.nsi.in

@@ -80,8 +80,7 @@ Section -Main SEC0000
     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@
-    SetOutPath $INSTDIR\doc
-    File /r /x Makefile* @abs_top_srcdir@/doc\*.*
+    File @abs_top_builddir@/release/@BITCOIN_TEST_NAME@@EXEEXT@
     SetOutPath $INSTDIR
     WriteRegStr HKCU "${REGKEY}\Components" Main 1
 SectionEnd
@@ -129,7 +128,6 @@ Section /o -un.Main UNSEC0000
     Delete /REBOOTOK $INSTDIR\COPYING.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
     RMDir /r /REBOOTOK $INSTDIR\daemon
-    RMDir /r /REBOOTOK $INSTDIR\doc
     DeleteRegValue HKCU "${REGKEY}\Components" Main
 SectionEnd
 

src/crypto/muhash.cpp

@@ -298,7 +298,7 @@ void Num3072::ToBytes(unsigned char (&out)[BYTE_SIZE]) {
 Num3072 MuHash3072::ToNum3072(Span<const unsigned char> in) {
     unsigned char tmp[Num3072::BYTE_SIZE];
 
-    uint256 hashed_in = (CHashWriter(SER_DISK, 0) << in).GetSHA256();
+    uint256 hashed_in{(HashWriter{} << in).GetSHA256()};
     static_assert(sizeof(tmp) % ChaCha20Aligned::BLOCKLEN == 0);
     ChaCha20Aligned{MakeByteSpan(hashed_in)}.Keystream(MakeWritableByteSpan(tmp));
     Num3072 out{tmp};
@@ -319,7 +319,7 @@ void MuHash3072::Finalize(uint256& out) noexcept
     unsigned char data[Num3072::BYTE_SIZE];
     m_numerator.ToBytes(data);
 
-    out = (CHashWriter(SER_DISK, 0) << data).GetSHA256();
+    out = (HashWriter{} << data).GetSHA256();
 }
 
 MuHash3072& MuHash3072::operator*=(const MuHash3072& mul) noexcept

src/flat-database.h

@@ -49,9 +49,9 @@ class CFlatDB
         uint256 hash = Hash(ssObj);
         ssObj << hash;
 
-        // open output file, and associate with CAutoFile
+        // open output file, and associate with AutoFile
         FILE *file = fsbridge::fopen(pathDB, "wb");
-        CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
+        AutoFile fileout{file};
         if (fileout.IsNull()) {
             return error("%s: Failed to open file %s", __func__, fs::PathToString(pathDB));
         }
@@ -76,9 +76,9 @@ class CFlatDB
         //LOCK(objToLoad.cs);
 
         const auto start{SteadyClock::now()};
-        // open input file, and associate with CAutoFile
+        // open input file, and associate with AutoFile
         FILE *file = fsbridge::fopen(pathDB, "rb");
-        CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
+        AutoFile filein{file};
         if (filein.IsNull()) {
             // It is not actually error, maybe it's a first initialization of core.
             return ReadResult::FileError;

src/hash.cpp

@@ -82,9 +82,9 @@ uint256 SHA256Uint256(const uint256& input)
     return result;
 }
 
-CHashWriter TaggedHash(const std::string& tag)
+HashWriter TaggedHash(const std::string& tag)
 {
-    CHashWriter writer(SER_GETHASH, 0);
+    HashWriter writer{};
     uint256 taghash;
     CSHA256().Write((const unsigned char*)tag.data(), tag.size()).Finalize(taghash.begin());
     writer << taghash << taghash;

src/hash.h

@@ -242,12 +242,12 @@ unsigned int MurmurHash3(unsigned int nHashSeed, Span<const unsigned char> vData
 
 void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]);
 
-/** Return a CHashWriter primed for tagged hashes (as specified in BIP 340).
+/** Return a HashWriter primed for tagged hashes (as specified in BIP 340).
  *
  * The returned object will have SHA256(tag) written to it twice (= 64 bytes).
  * A tagged hash can be computed by feeding the message into this object, and
- * then calling CHashWriter::GetSHA256().
+ * then calling HashWriter::GetSHA256().
  */
-CHashWriter TaggedHash(const std::string& tag);
+HashWriter TaggedHash(const std::string& tag);
 
 #endif // BITCOIN_HASH_H

src/index/blockfilterindex.cpp

@@ -167,7 +167,7 @@ bool BlockFilterIndex::CommitInternal(CDBBatch& batch)
     }
 
     // Flush current filter file to disk.
-    CAutoFile file(m_filter_fileseq->Open(pos), SER_DISK, CLIENT_VERSION);
+    AutoFile file{m_filter_fileseq->Open(pos)};
     if (file.IsNull()) {
         return error("%s: Failed to open filter file %d", __func__, pos.nFile);
     }
@@ -181,7 +181,7 @@ bool BlockFilterIndex::CommitInternal(CDBBatch& batch)
 
 bool BlockFilterIndex::ReadFilterFromDisk(const FlatFilePos& pos, const uint256& hash, BlockFilter& filter) const
 {
-    CAutoFile filein(m_filter_fileseq->Open(pos, true), SER_DISK, CLIENT_VERSION);
+    AutoFile filein{m_filter_fileseq->Open(pos, true)};
     if (filein.IsNull()) {
         return false;
     }
@@ -211,7 +211,7 @@ size_t BlockFilterIndex::WriteFilterToDisk(FlatFilePos& pos, const BlockFilter&
 
     // If writing the filter would overflow the file, flush and move to the next one.
     if (pos.nPos + data_size > MAX_FLTR_FILE_SIZE) {
-        CAutoFile last_file(m_filter_fileseq->Open(pos), SER_DISK, CLIENT_VERSION);
+        AutoFile last_file{m_filter_fileseq->Open(pos)};
         if (last_file.IsNull()) {
             LogPrintf("%s: Failed to open filter file %d\n", __func__, pos.nFile);
             return 0;
@@ -237,7 +237,7 @@ size_t BlockFilterIndex::WriteFilterToDisk(FlatFilePos& pos, const BlockFilter&
         return 0;
     }
 
-    CAutoFile fileout(m_filter_fileseq->Open(pos), SER_DISK, CLIENT_VERSION);
+    AutoFile fileout{m_filter_fileseq->Open(pos)};
     if (fileout.IsNull()) {
         LogPrintf("%s: Failed to open filter file %d\n", __func__, pos.nFile);
         return 0;