Merge dashpay#7036: backport: bitcoin#23006, bitcoin#23212, bitcoin#23500, bitcoin#23521, bitcoin#23686, bitcoin#23927, bitcoin#24367, bitcoin#26358

19aed94 Merge bitcoin#23006: multiprocess: Add new bitcoin-gui, bitcoin-qt, bitcoin-wallet init implementations (MarcoFalke)
d01f33e fix: enable namespaces for mypy while version is too old (Konstantin Akimov)
53b12e5 Merge bitcoin#23212: lint: enable mypy import checking (Konstantin Akimov)
ffc9892 Merge bitcoin#23927: rpc: Pruning nodes can not fetch blocks before syncing past their height (Andrew Chow)
33f9b14 Merge bitcoin#26358: doc: Rearrange a few lines in the dependency graph of libraries (MacroFake)
dcbc646 Merge bitcoin#24367: User-facing content and codebase doc fixups from transifex translator feedback (laanwj)
e143ba2 partial Merge bitcoin#23521: test: refactor: dedup code by taking use of `create_block` parameters (MarcoFalke)
4736353 Merge bitcoin#23686: test: fix `interface_bitcoin_cli.py --descriptors` and add to test runner (MarcoFalke)
082e406 Merge bitcoin#23500: doc: fix typos (MarcoFalke)

Pull request description:

  ## What was done?
  Regular backports from Bitcoin Core v23; have been missing or blocked till now.

  ## 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 _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 19aed94

Tree-SHA512: 7eb7c68ed4bda0396d2ebb7748ed5a7dd8bfc3935960b98efe8f1745c731c3b2bc12680093bf5671a4790f571e2ab86336174c93167c4afb120f821ecc426dce

Author: PastaPastaPasta

contrib/devtools/circular-dependencies.py

@@ -5,7 +5,7 @@
 
 import sys
 import re
-from multiprocess import Pool
+from multiprocess import Pool # type: ignore[import]
 from typing import Dict, List, Set
 
 MAPPING = {

contrib/devtools/optimize-pngs.py

@@ -10,7 +10,8 @@
 import sys
 import subprocess
 import hashlib
-from PIL import Image  # pip3 install Pillow
+# pip3 install Pillow
+from PIL import Image # type: ignore[import]
 
 def file_hash(filename):
     '''Return hash of raw file contents'''

doc/design/libraries.md

@@ -37,7 +37,7 @@ Note: libbitcoin_kernel is a subject to be backported & dashified.
 
 ```mermaid
 
-%%{ init : { "flowchart" : { "curve" : "linear" }}}%%
+%%{ init : { "flowchart" : { "curve" : "basis" }}}%%
 
 graph TD;
 
@@ -53,18 +53,19 @@ dash-qt[dash-qt]-->libbitcoin_wallet;
 dash-wallet[dash-wallet]-->libbitcoin_wallet;
 dash-wallet[dash-wallet]-->libbitcoin_wallet_tool;
 
-libbitcoin_cli-->libbitcoin_common;
 libbitcoin_cli-->libbitcoin_util;
+libbitcoin_cli-->libbitcoin_common;
 
-libbitcoin_common-->libbitcoin_util;
 libbitcoin_common-->libdash_consensus;
+libbitcoin_common-->libbitcoin_util;
 
 libbitcoin_kernel-->libdash_consensus;
 libbitcoin_kernel-->libbitcoin_util;
 
-libbitcoin_node-->libbitcoin_common;
 libbitcoin_node-->libdash_consensus;
+libbitcoin_node-->libbitcoin_common;
 libbitcoin_node-->libbitcoin_kernel;
+libbitcoin_node-->libbitcoin_common;
 libbitcoin_node-->libbitcoin_util;
 
 libbitcoinqt-->libbitcoin_common;
@@ -73,8 +74,8 @@ libbitcoinqt-->libbitcoin_util;
 libbitcoin_wallet-->libbitcoin_common;
 libbitcoin_wallet-->libbitcoin_util;
 
-libbitcoin_wallet_tool-->libbitcoin_util;
 libbitcoin_wallet_tool-->libbitcoin_wallet;
+libbitcoin_wallet_tool-->libbitcoin_util;
 
 classDef bold stroke-width:2px, font-weight:bold, font-size: smaller;
 class dash-qt,dashd,dash-cli,dash-wallet bold

src/Makefile.am

@@ -1090,6 +1090,7 @@ dash_tx_LDADD += $(BACKTRACE_LIBS) $(GMP_LIBS)
 
 # dash-wallet binary #
 dash_wallet_SOURCES = bitcoin-wallet.cpp
+dash_wallet_SOURCES += init/bitcoin-wallet.cpp
 dash_wallet_CPPFLAGS = $(bitcoin_bin_cppflags)
 dash_wallet_CXXFLAGS = $(bitcoin_bin_cxxflags)
 dash_wallet_LDFLAGS = $(bitcoin_bin_ldflags)

src/Makefile.qt.include

@@ -424,15 +424,15 @@ bitcoin_qt_libtoolflags = $(AM_LIBTOOLFLAGS) --tag CXX
 
 qt_dash_qt_CPPFLAGS = $(bitcoin_qt_cppflags)
 qt_dash_qt_CXXFLAGS = $(bitcoin_qt_cxxflags)
-qt_dash_qt_SOURCES = $(bitcoin_qt_sources) init/bitcoind.cpp
+qt_dash_qt_SOURCES = $(bitcoin_qt_sources) init/bitcoin-qt.cpp
 qt_dash_qt_LDADD = $(bitcoin_qt_ldadd)
 qt_dash_qt_LDFLAGS = $(bitcoin_qt_ldflags)
 qt_dash_qt_LIBTOOLFLAGS = $(bitcoin_qt_libtoolflags)
 
 dash_gui_CPPFLAGS = $(bitcoin_qt_cppflags)
 dash_gui_CXXFLAGS = $(bitcoin_qt_cxxflags)
-dash_gui_SOURCES = $(bitcoin_qt_sources) init/bitcoind.cpp
-dash_gui_LDADD = $(bitcoin_qt_ldadd)
+dash_gui_SOURCES = $(bitcoin_qt_sources) init/bitcoin-gui.cpp
+dash_gui_LDADD = $(bitcoin_qt_ldadd) $(LIBBITCOIN_IPC) $(LIBBITCOIN_UTIL) $(LIBMULTIPROCESS_LIBS)
 dash_gui_LDFLAGS = $(bitcoin_qt_ldflags)
 dash_gui_LIBTOOLFLAGS = $(bitcoin_qt_libtoolflags)
 

src/Makefile.qttest.include

@@ -33,7 +33,7 @@ qt_test_test_dash_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_
   $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(BOOST_CPPFLAGS)
 
 qt_test_test_dash_qt_SOURCES = \
-  init/bitcoind.cpp \
+  init/bitcoin-qt.cpp \
   qt/test/apptests.cpp \
   qt/test/optiontests.cpp \
   qt/test/rpcnestedtests.cpp \

src/bitcoin-wallet.cpp

@@ -9,6 +9,7 @@
 #include <chainparams.h>
 #include <chainparamsbase.h>
 #include <compat/compat.h>
+#include <interfaces/init.h>
 #include <logging.h>
 #include <util/strencodings.h>
 #include <clientversion.h>
@@ -100,6 +101,13 @@ MAIN_FUNCTION
     util::WinCmdLineArgs winArgs;
     std::tie(argc, argv) = winArgs.get();
 #endif
+
+    int exit_status;
+    std::unique_ptr<interfaces::Init> init = interfaces::MakeWalletInit(argc, argv, exit_status);
+    if (!init) {
+        return exit_status;
+    }
+
     SetupEnvironment();
     RandomInit();
     try {

src/init/bitcoin-gui.cpp

@@ -0,0 +1,52 @@
+// Copyright (c) 2021 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/chain.h>
+#include <interfaces/coinjoin.h>
+#include <interfaces/echo.h>
+#include <interfaces/init.h>
+#include <interfaces/ipc.h>
+#include <interfaces/node.h>
+#include <interfaces/wallet.h>
+#include <node/context.h>
+#include <util/system.h>
+
+#include <memory>
+
+namespace init {
+namespace {
+const char* EXE_NAME = "dash-gui";
+
+class BitcoinGuiInit : public interfaces::Init
+{
+public:
+    BitcoinGuiInit(const char* arg0) : m_ipc(interfaces::MakeIpc(EXE_NAME, arg0, *this))
+    {
+        m_node.args = &gArgs;
+        m_node.init = this;
+    }
+    std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
+    std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
+    std::unique_ptr<interfaces::CoinJoin::Loader> makeCoinJoinLoader() override
+    {
+        return interfaces::MakeCoinJoinLoader(m_node);
+    }
+    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain, interfaces::CoinJoin::Loader& coinjoin_loader) override
+    {
+        return MakeWalletLoader(chain, *Assert(m_node.args), m_node, coinjoin_loader);
+    }
+    std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
+    interfaces::Ipc* ipc() override { return m_ipc.get(); }
+    node::NodeContext m_node;
+    std::unique_ptr<interfaces::Ipc> m_ipc;
+};
+} // namespace
+} // namespace init
+
+namespace interfaces {
+std::unique_ptr<Init> MakeGuiInit(int argc, char* argv[])
+{
+    return std::make_unique<init::BitcoinGuiInit>(argc > 0 ? argv[0] : "");
+}
+} // namespace interfaces

src/init/bitcoin-qt.cpp

@@ -0,0 +1,47 @@
+// Copyright (c) 2021 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/chain.h>
+#include <interfaces/coinjoin.h>
+#include <interfaces/echo.h>
+#include <interfaces/init.h>
+#include <interfaces/node.h>
+#include <interfaces/wallet.h>
+#include <node/context.h>
+#include <util/system.h>
+
+#include <memory>
+
+namespace init {
+namespace {
+class BitcoinQtInit : public interfaces::Init
+{
+public:
+    BitcoinQtInit()
+    {
+        m_node.args = &gArgs;
+        m_node.init = this;
+    }
+    std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
+    std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
+    std::unique_ptr<interfaces::CoinJoin::Loader> makeCoinJoinLoader() override
+    {
+        return interfaces::MakeCoinJoinLoader(m_node);
+    }
+    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain, interfaces::CoinJoin::Loader& coinjoin_loader) override
+    {
+        return MakeWalletLoader(chain, *Assert(m_node.args), m_node, coinjoin_loader);
+    }
+    std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
+    node::NodeContext m_node;
+};
+} // namespace
+} // namespace init
+
+namespace interfaces {
+std::unique_ptr<Init> MakeGuiInit(int argc, char* argv[])
+{
+    return std::make_unique<init::BitcoinQtInit>();
+}
+} // namespace interfaces

src/init/bitcoin-wallet.cpp

@@ -0,0 +1,12 @@
+// Copyright (c) 2021 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>
+
+namespace interfaces {
+std::unique_ptr<Init> MakeWalletInit(int argc, char* argv[], int& exit_status)
+{
+    return std::make_unique<Init>();
+}
+} // namespace interfaces