Merge branch 'develop' of https://github.com/dashpay/dash into develop

Author: PastaPastaPasta

contrib/containers/ci/ci-slim.Dockerfile

@@ -1,6 +1,6 @@
 # Builder for cppcheck
 FROM debian:bookworm-slim AS cppcheck-builder
-ARG CPPCHECK_VERSION=2.13.0
+ARG CPPCHECK_VERSION=2.17.1
 RUN set -ex; \
     apt-get update && apt-get install -y --no-install-recommends \
         curl \

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/cachemultimap.h

@@ -150,10 +150,10 @@ class CacheMultiMap
         if(mit == mapIndex.end()) {
             return;
         }
-        it_map_t& mapIt = mit->second;
+        const it_map_t& mapIt = mit->second;
 
-        for(it_map_it it = mapIt.begin(); it != mapIt.end(); ++it) {
-            listItems.erase(it->second);
+        for (const auto& it : mapIt) {
+            listItems.erase(it.second);
         }
 
         mapIndex.erase(mit);

src/chainparams.cpp

@@ -855,7 +855,8 @@ class CRegTestParams : public CChainParams {
         assert(genesis.hashMerkleRoot == uint256S("0xe0028eb9648db56b1ac77cf090b99048a8007e2bb64b68f092c03c7f56a662c7"));
 
         vFixedSeeds.clear(); //!< Regtest mode doesn't have any fixed seeds.
-        vSeeds.clear();      //!< Regtest mode doesn't have any DNS seeds.
+        vSeeds.clear();
+        vSeeds.emplace_back("dummySeed.invalid.");
 
         fDefaultConsistencyChecks = true;
         fRequireStandard = true;